From 3b522097fa9595110a0db971649efa0bb8b9fe9f Mon Sep 17 00:00:00 2001 From: Stéphane Raimbault Date: Thu, 10 Oct 2013 20:06:07 +0200 Subject: [PATCH] Sync packaging with official from Debian (closes #134) --- debian/changelog | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- debian/compat | 2 +- debian/control | 39 +++++++++++++++------------------------ debian/copyright | 44 +++++++++++++++++++++++--------------------- debian/libmodbus-dev.docs | 2 +- debian/libmodbus-dev.install | 4 ++-- debian/libmodbus5.install | 2 +- debian/rules | 26 ++++++-------------------- 8 files changed, 117 insertions(+), 71 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4f37901..26943de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,71 @@ +libmodbus (3.0.5-1) unstable; urgency=low + + * New upstream release + * Refresh 01-add-length-checks.patch, as most changes have been superseded + upstream + + -- Ivo De Decker Mon, 07 Oct 2013 20:50:25 +0200 + +libmodbus (3.0.4-1) unstable; urgency=low + + * New upstream release + * Update standards-version to 3.9.4 (no changes) + * Enable parallel build + * Enable verbose build to show compiler flags to build log checks + * Update watch file to filter out unstable versions + + -- Ivo De Decker Sun, 30 Jun 2013 12:25:01 +0200 + +libmodbus (3.0.3-4) unstable; urgency=low + + * Upload to unstable + * Update watch file, thanks to Bart Martens + + -- Ivo De Decker Mon, 13 May 2013 21:07:59 +0200 + +libmodbus (3.0.3-3) experimental; urgency=low + + * Fix watch file + * Switch to debhelper + * Remove Build-Depends on cdbs + * Multiarch support + + -- Ivo De Decker Sun, 11 Nov 2012 19:16:34 +0100 + +libmodbus (3.0.3-2) experimental; urgency=low + + * Install upstream changelog correctly. + + -- Ivo De Decker Sat, 09 Jun 2012 16:26:41 +0200 + +libmodbus (3.0.3-1) unstable; urgency=low + + * Acknowledge NMU, thanks to Roland Stigge and Josef Holzmayr + * New upstream release + * Update standards-version to 3.9.3 (no changes) + * Move to debhelper compatibility level 9 + * Add symbols file + * Add watch file + + -- Ivo De Decker Sat, 26 May 2012 14:19:39 +0200 + +libmodbus (3.0.2-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Added patch: Fix crash by adding length checks (Closes: #664740) + thanks to Josef Holzmayr + + -- Roland Stigge Fri, 30 Mar 2012 09:45:51 +0200 + +libmodbus (3.0.2-1) unstable; urgency=low + + * New upstream release + * Update standards-version to 3.9.2 (no changes) + * Use dh-autoreconf + * Update copyright years + + -- Ivo De Decker Mon, 20 Feb 2012 17:18:27 +0100 + libmodbus (3.0.1-2) unstable; urgency=low * Initial Debian release @@ -65,4 +133,3 @@ libmodbus (2.0.0-1) hardy; urgency=low * Initial release. -- Stéphane Raimbault Wed, 14 May 2008 22:30:53 +0200 - diff --git a/debian/compat b/debian/compat index 1e8b314..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -6 +9 diff --git a/debian/control b/debian/control index ce52346..3dda995 100644 --- a/debian/control +++ b/debian/control @@ -1,40 +1,31 @@ Source: libmodbus Priority: extra -Maintainer: Ivo De Decker -Standards-Version: 3.9.1 +Maintainer: Ivo De Decker +Standards-Version: 3.9.4 Section: libs -Build-Depends: debhelper (>= 6), cdbs (>= 0.4.43), autotools-dev, libtool, asciidoc, xmlto +Build-Depends: debhelper (>= 9), asciidoc, xmlto, dh-autoreconf Homepage: http://libmodbus.org/ Package: libmodbus5 -Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: A Modbus library - libmodbus is a C library designed to provide a fast and robust implementation - of the Modbus protocol. It runs on Linux, Mac OS X, FreeBSD, QNX and Windows. - . - This package contains the libmodbus shared library. - -Package: libmodbus-dbg -Section: debug -Priority: extra -Architecture: any -Depends: libmodbus5 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Description: A Modbus library (debugging symbols) - libmodbus is a C library designed to provide a fast and robust implementation - of the Modbus protocol. It runs on Linux, Mac OS X, FreeBSD, QNX and Windows. +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same +Description: library for the Modbus protocol + A Modbus library written in C, to send/receive data with a device which + respects the Modbus protocol. This library can use a serial port or an + Ethernet connection. . - This package contains debugging symbols for libmodbus. + This package contains the shared library. Package: libmodbus-dev Section: libdevel Architecture: any Depends: libmodbus5 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Description: A Modbus library - libmodbus is a C library designed to provide a fast and robust implementation - of the Modbus protocol. It runs on Linux, Mac OS X, FreeBSD, QNX and Windows. +Description: development files for the Modbus protocol library + A Modbus library written in C, to send/receive data with a device which + respects the Modbus protocol. This library can use a serial port or an + Ethernet connection. . - This package contains libraries, header files and developer documentation - needed for developing software which uses the libmodbus library. + This package contains the development files. diff --git a/debian/copyright b/debian/copyright index def8d65..8f48f48 100644 --- a/debian/copyright +++ b/debian/copyright @@ -9,49 +9,51 @@ Upstream Author: Copyright: - + License for libmodbus: - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by the + Free Software Foundation; either version 2.1 of the License, or (at your + option) any later version. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + for more details. - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + You should have received a copy of the GNU Lesser General Public License + along with this library; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -On Debian systems, the complete text of the GNU General Public License -can be found in /usr/share/common-licenses/LGPL-2.1 + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/LGPL-2.1 License for the tests: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . + along with this program. If not, see . -On Debian systems, the complete text of the GNU General Public License version 3 -can be found in "/usr/share/common-licenses/GPL-3". +On Debian systems, the complete text of the GNU General +Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". The Debian packaging is: - Copyright (C) 2008-20011 Stéphane Raimbault - Copyright (C) 2011 Ivo De Decker + Copyright (C) 2008-2011 Stéphane Raimbault + Copyright (C) 2011-2012 Ivo De Decker and is licensed under the LGPL version 2.1 or later, see "/usr/share/common-licenses/LGPL-2.1". + + diff --git a/debian/libmodbus-dev.docs b/debian/libmodbus-dev.docs index b55b0f6..d8964d2 100644 --- a/debian/libmodbus-dev.docs +++ b/debian/libmodbus-dev.docs @@ -1 +1 @@ -MIGRATION README.md +MIGRATION README.md AUTHORS diff --git a/debian/libmodbus-dev.install b/debian/libmodbus-dev.install index 197100b..96acdee 100644 --- a/debian/libmodbus-dev.install +++ b/debian/libmodbus-dev.install @@ -1,3 +1,3 @@ debian/tmp/usr/include/modbus/* -debian/tmp/usr/lib/libmodbus.so -debian/tmp/usr/lib/pkgconfig/libmodbus.pc +debian/tmp/usr/lib/*/libmodbus.so +debian/tmp/usr/lib/*/pkgconfig/libmodbus.pc diff --git a/debian/libmodbus5.install b/debian/libmodbus5.install index 3ca6930..b3ea764 100644 --- a/debian/libmodbus5.install +++ b/debian/libmodbus5.install @@ -1 +1 @@ -debian/tmp/usr/lib/libmodbus.so.* +debian/tmp/usr/lib/*/libmodbus.so.* diff --git a/debian/rules b/debian/rules index 2800271..4455405 100755 --- a/debian/rules +++ b/debian/rules @@ -1,23 +1,9 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/autotools.mk +%: + dh $@ --with autoreconf --parallel -DEB_DH_STRIP_ARGS := --dbg-package=libmodbus-dbg +override_dh_installchangelogs: + dh_installchangelogs NEWS -makebuilddir:: - ./autogen.sh - -clean:: - rm -f Makefile.in - rm -f aclocal.m4 - rm -f config.guess - rm -f config.h.in - rm -f config.sub - rm -f configure - rm -f depcomp - rm -f install-sh - rm -f ltmain.sh - rm -f missing - rm -f src/Makefile.in - rm -f tests/Makefile.in - rm -f doc/Makefile.in +override_dh_auto_configure: + dh_auto_configure -- --disable-silent-rules -- libgit2 0.21.4