diff options
| -rw-r--r-- | debian/changelog | 13 | ||||
| -rw-r--r-- | debian/compat | 2 | ||||
| -rw-r--r-- | debian/control | 5 | ||||
| -rw-r--r-- | debian/copyright | 11 | ||||
| -rw-r--r-- | debian/liblz-dev.examples | 2 | ||||
| -rw-r--r-- | debian/liblz-dev.install | 8 | ||||
| -rw-r--r-- | debian/liblz-dev.install.in | 4 | ||||
| -rw-r--r-- | debian/liblz1.install | 2 | ||||
| -rw-r--r-- | debian/liblz1.install.in | 1 | ||||
| -rwxr-xr-x | debian/rules | 27 |
10 files changed, 61 insertions, 14 deletions
diff --git a/debian/changelog b/debian/changelog index ebd318b..eea032a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +lzlib (1.3-1) unstable; urgency=low + + * Merging upstream version 1.3. + * Updating to debhelper version 9. + * Updating to standards version 3.9.3. + * Updating years in copyright. + * Updating copyright file machine-readable format version 1.0. + * Updating debhelper example file. + + -- Daniel Baumann <daniel.baumann@progress-technologies.net> Mon, 16 Apr 2012 08:26:27 +0000 + lzlib (1.2-1) unstable; urgency=low * Using compression level 9 also for binary packages. @@ -76,7 +87,7 @@ lzlib (0.9-1) unstable; urgency=low lzlib (0.8-1) unstable; urgency=low - * Adding explicit debian source version 1.0 until switch to 3.0. + * Adding explicit source version 1.0 until switch to 3.0. * Updating year in copyright file. * Merging upstream version 0.8. * Updating year in copyright file. diff --git a/debian/compat b/debian/compat index 45a4fb7..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/debian/control b/debian/control index 0e60e82..acc16e8 100644 --- a/debian/control +++ b/debian/control @@ -2,13 +2,14 @@ Source: lzlib Section: libs Priority: optional Maintainer: Daniel Baumann <daniel.baumann@progress-technologies.net> -Build-Depends: debhelper (>= 8), texinfo -Standards-Version: 3.9.2 +Build-Depends: debhelper (>= 9), texinfo +Standards-Version: 3.9.3 Homepage: http://www.nongnu.org/lzip/lzlib.html Package: liblz1 Section: libs Architecture: any +Pre-Depends: ${multiarch:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} Description: data compressor based on the LZMA algorithm (library) The lzlib compression library provides in-memory LZMA compression and diff --git a/debian/copyright b/debian/copyright index f914bf4..02cd0e9 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,13 +1,18 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: lzlib +Upstream-Contact: lzip-bug@nongnu.org +Source: http://download.savannah.gnu.org/releases/lzip/ + Files: * -Copyright: (C) 2006-2011 Antonio Diaz Diaz <ant_diaz@teleline.es> +Copyright: (C) 2006-2012 Antonio Diaz Diaz <ant_diaz@teleline.es> License: GPL-3+ Files: arg_parser.* -Copyright: (C) 2006-2011 Antonio Diaz Diaz <ant_diaz@teleline.es> +Copyright: (C) 2006-2012 Antonio Diaz Diaz <ant_diaz@teleline.es> License: GPL-3+ with exception Files: debian/* -Copyright: (C) 2009-2011 Daniel Baumann <daniel.baumann@progress-technologies.net> +Copyright: (C) 2009-2012 Daniel Baumann <daniel.baumann@progress-technologies.net> License: GPL-3+ License: GPL-3+ diff --git a/debian/liblz-dev.examples b/debian/liblz-dev.examples index 2783442..e241137 100644 --- a/debian/liblz-dev.examples +++ b/debian/liblz-dev.examples @@ -1 +1 @@ -main.cc +main.c diff --git a/debian/liblz-dev.install b/debian/liblz-dev.install index 35739da..3873b2b 100644 --- a/debian/liblz-dev.install +++ b/debian/liblz-dev.install @@ -1,4 +1,4 @@ -/usr/include -/usr/lib/*.a -/usr/lib/*.so -/usr/share/info +usr/include +usr/lib/i386-linux-gnu/*.a +usr/lib/i386-linux-gnu/*.so +usr/share/info diff --git a/debian/liblz-dev.install.in b/debian/liblz-dev.install.in new file mode 100644 index 0000000..f7bb199 --- /dev/null +++ b/debian/liblz-dev.install.in @@ -0,0 +1,4 @@ +usr/include +usr/lib/@DEB_HOST_MULTIARCH@/*.a +usr/lib/@DEB_HOST_MULTIARCH@/*.so +usr/share/info diff --git a/debian/liblz1.install b/debian/liblz1.install index 49cc562..2b7a24e 100644 --- a/debian/liblz1.install +++ b/debian/liblz1.install @@ -1 +1 @@ -/usr/lib/*.so.* +usr/lib/i386-linux-gnu/*.so.* diff --git a/debian/liblz1.install.in b/debian/liblz1.install.in new file mode 100644 index 0000000..8d0a62e --- /dev/null +++ b/debian/liblz1.install.in @@ -0,0 +1 @@ +usr/lib/@DEB_HOST_MULTIARCH@/*.so.* diff --git a/debian/rules b/debian/rules index dd9624c..80c7431 100755 --- a/debian/rules +++ b/debian/rules @@ -1,16 +1,34 @@ #!/usr/bin/make -f +SHELL := sh -e + +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + %: dh ${@} +override_dh_auto_clean: + dh_auto_clean + + for _FILE in debian/*.install.in; \ + do \ + rm -f debian/$$(basename $${_FILE} .in); \ + sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' \ + $${_FILE} > debian/$$(basename $${_FILE} .in); \ + done + override_dh_auto_configure: - dh_auto_configure -- --enable-shared --libdir=\$${prefix}/lib + dh_auto_configure -- --enable-shared --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) override_dh_auto_install: dh_auto_install -- LDCONFIG=/bin/true # adding missing symlink +ifeq ($(DEB_HOST_MULTIARCH),) ln -s liblz.so.1.1 debian/tmp/usr/lib/liblz.so +else + ln -s liblz.so.1.1 debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/liblz.so +endif # removing unused files rm -f debian/tmp/usr/share/info/dir* @@ -18,6 +36,13 @@ override_dh_auto_install: override_dh_builddeb: dh_builddeb -- -Zgzip -z9 +override_dh_gencontrol: +ifeq ($(DEB_HOST_MULTIARCH),) + dh_gencontrol +else + dh_gencontrol -- -Vmultiarch:Pre-Depends="multiarch-support" +endif + override_dh_install: dh_install --fail-missing |