Commit 3b522097fa9595110a0db971649efa0bb8b9fe9f

Authored by Stéphane Raimbault
1 parent 074ba153

Sync packaging with official from Debian (closes #134)

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