tags 637569 + patch
tags 637568 + patch
tags 637555 + patch
thanks

On 2011-08-12 18:55 +0200, Sven Joachim wrote:

> Package: liblockfile-dev
> Version: 1.09-2
> Severity: wishlist
>
> I think multiple version of liblockfile-dev could be co-installable if
>
> - files are compressed with "gzip -n"
> - liblockfile.a is moved to /usr/lib/$DEB_HOST_MULTIARCH
>
> Will probably send a patch soon.

Attached (with the trivial patches for #637555 and #637568 as well).
Note that "NMU" is just there to please lintian, I have no intention to
actually NMU your package. :-)

Cheers,
       Sven

diff -Nru liblockfile-1.09/debian/changelog liblockfile-1.09/debian/changelog
--- liblockfile-1.09/debian/changelog   2011-08-12 09:35:40.000000000 +0200
+++ liblockfile-1.09/debian/changelog   2011-08-12 19:05:16.000000000 +0200
@@ -1,3 +1,12 @@
+liblockfile (1.09-2.1) unstable; urgency=low
+
+  * NMU.
+  * Add Breaks/Replaces against old liblockfile1 versions (closes: #637555)
+  * Mark liblockfile-bin as Multi-Arch: foreign (closes: #637568)
+  * Convert liblockfile-dev to Multi-Arch: same (closes: #637569)
+
+ -- Sven Joachim <svenj...@gmx.de>  Fri, 12 Aug 2011 18:55:44 +0200
+
 liblockfile (1.09-2) unstable; urgency=high
 
   * fix debian/files botchup (fixes: #637465)
diff -Nru liblockfile-1.09/debian/control liblockfile-1.09/debian/control
--- liblockfile-1.09/debian/control     2011-08-12 09:32:54.000000000 +0200
+++ liblockfile-1.09/debian/control     2011-08-12 18:58:57.000000000 +0200
@@ -20,7 +20,10 @@
 Section: utils
 Priority: standard
 Architecture: any
+Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: liblockfile1 (<< 1.09-2)
+Breaks: liblockfile1 (<< 1.09-2)
 Description: binaries that come with liblockfile
  This package contains the command-line utility ``dotlockfile''.
 
@@ -28,6 +31,7 @@
 Section: libdevel
 Priority: optional
 Architecture: any
+Multi-Arch: same
 Depends: liblockfile1 (=${binary:Version})
 Description: Development library for liblockfile
  This is a development library for liblockfile. It includes headers and
diff -Nru liblockfile-1.09/debian/rules liblockfile-1.09/debian/rules
--- liblockfile-1.09/debian/rules       2011-08-12 09:34:51.000000000 +0200
+++ liblockfile-1.09/debian/rules       2011-08-12 18:57:01.000000000 +0200
@@ -110,10 +110,10 @@
        install -o root -m 644 lockfile.h maillock.h $(tmp)/usr/include
        ln -s liblockfile.so.$(SOVER) \
                $(tmp)/usr/lib/$(DEB_HOST_MULTIARCH)/liblockfile.so
-       install -o root -m 644 liblockfile.a $(tmp)/usr/lib
+       install -o root -m 644 liblockfile.a 
$(tmp)/usr/lib/$(DEB_HOST_MULTIARCH)
        install -o root -m 644 maillock.3 $(tmp)/usr/share/man/man3
        install -o root -m 644 lockfile_create.3 $(tmp)/usr/share/man/man3
-       gzip -9f $(tmp)/usr/share/man/*/*
+       gzip -9fn $(tmp)/usr/share/man/*/*
        ln -sf lockfile_create.3.gz 
$(tmp)/usr/share/man/man3/lockfile_check.3.gz
        ln -sf lockfile_create.3.gz 
$(tmp)/usr/share/man/man3/lockfile_touch.3.gz
        ln -sf lockfile_create.3.gz 
$(tmp)/usr/share/man/man3/lockfile_remove.3.gz
@@ -123,7 +123,7 @@
                $(tmp)/usr/share/doc/liblockfile-dev/changelog.Debian
        install -o root -m 644 Changelog \
                $(tmp)/usr/share/doc/liblockfile-dev/changelog
-       gzip -9f $(tmp)/usr/share/doc/liblockfile-dev/*
+       gzip -9fn $(tmp)/usr/share/doc/liblockfile-dev/*
        install -o root -m 644 COPYRIGHT \
                $(tmp)/usr/share/doc/liblockfile-dev/copyright
        $(do_md5sums)

Reply via email to