[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#608707: unblock: libnih/1.0.2-2



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: freeze-exception

Please unblock package libnih

libnih currently ships the library development files in /lib.

The recent discussion on debian-devel [1] showed that this is not
desirable and even violates the FHS, thus could be considered RC.

I've prepared a updated package where I also drops the libtool la
files, which has been a release goal. Both libnih-dev and
libnih-dbus-dev ship a pkg-config file and no other libtool la files
are referencing libnih.la or libnih-dbus.la, so this should be safe.

The changelog reads:

libnih (1.0.2-2) unstable; urgency=low

  * Install library development files to /usr/lib and not /lib.
  * Remove libtool *.la files as there are no reverse dependencies referencing
    them.
  * Bump Standards-Version to 3.9.1. No further changes.

 -- Michael Biebl <biebl@debian.org>  Sun, 02 Jan 2011 21:09:40 +0100


The complete debdiff is attached.

Cheers,
Michael

unblock libnih/1.0.2-2

[1] http://lists.debian.org/debian-devel/2011/01/msg00021.html

-- System Information:
Debian Release: 6.0
  APT prefers unstable
  APT policy: (500, 'unstable'), (200, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.32-5-686 (SMP w/1 CPU core)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru libnih-1.0.2/debian/changelog libnih-1.0.2/debian/changelog
--- libnih-1.0.2/debian/changelog	2010-06-13 23:37:08.000000000 +0200
+++ libnih-1.0.2/debian/changelog	2011-01-02 21:10:45.000000000 +0100
@@ -1,3 +1,12 @@
+libnih (1.0.2-2) unstable; urgency=low
+
+  * Install library development files to /usr/lib and not /lib.
+  * Remove libtool *.la files as there are no reverse dependencies referencing
+    them.
+  * Bump Standards-Version to 3.9.1. No further changes.
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 02 Jan 2011 21:09:40 +0100
+
 libnih (1.0.2-1) unstable; urgency=low
 
   * Initial upload to Debian. Closes: #585071
diff -Nru libnih-1.0.2/debian/control libnih-1.0.2/debian/control
--- libnih-1.0.2/debian/control	2010-06-13 23:37:08.000000000 +0200
+++ libnih-1.0.2/debian/control	2011-01-02 21:10:45.000000000 +0100
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Michael Biebl <biebl@debian.org>
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Build-Depends: debhelper (>= 7.3.15), pkg-config (>= 0.22), libdbus-1-dev (>= 1.2.16), libexpat1-dev (>= 2.0.0), dbus (>= 1.2.16)
 Vcs-Git: git://git.debian.org/git/collab-maint/libnih.git
 Vcs-Browser: http://git.debian.org/?p=collab-maint/libnih.git;a=summary
diff -Nru libnih-1.0.2/debian/gbp.conf libnih-1.0.2/debian/gbp.conf
--- libnih-1.0.2/debian/gbp.conf	1970-01-01 01:00:00.000000000 +0100
+++ libnih-1.0.2/debian/gbp.conf	2011-01-02 21:10:45.000000000 +0100
@@ -0,0 +1,2 @@
+[DEFAULT]
+pristine-tar = True
diff -Nru libnih-1.0.2/debian/libnih1.install libnih-1.0.2/debian/libnih1.install
--- libnih-1.0.2/debian/libnih1.install	2010-06-13 23:37:08.000000000 +0200
+++ libnih-1.0.2/debian/libnih1.install	2011-01-02 21:10:45.000000000 +0100
@@ -1 +1 @@
-lib/libnih.so.*
+usr/lib/libnih.so.* lib/
diff -Nru libnih-1.0.2/debian/libnih-dbus1.install libnih-1.0.2/debian/libnih-dbus1.install
--- libnih-1.0.2/debian/libnih-dbus1.install	2010-06-13 23:37:08.000000000 +0200
+++ libnih-1.0.2/debian/libnih-dbus1.install	2011-01-02 21:10:45.000000000 +0100
@@ -1 +1 @@
-lib/libnih-dbus.so.*
+usr/lib/libnih-dbus.so.* lib/
diff -Nru libnih-1.0.2/debian/libnih-dbus-dev.install libnih-1.0.2/debian/libnih-dbus-dev.install
--- libnih-1.0.2/debian/libnih-dbus-dev.install	2010-06-13 23:37:08.000000000 +0200
+++ libnih-1.0.2/debian/libnih-dbus-dev.install	2011-01-02 21:10:45.000000000 +0100
@@ -1,6 +1,4 @@
-lib/libnih-dbus.a
-lib/libnih-dbus.la
-lib/libnih-dbus.so
+usr/lib/libnih-dbus.a
 usr/include/libnih-dbus.h
-usr/include/nih-dbus
+usr/include/nih-dbus/
 usr/lib/pkgconfig/libnih-dbus.pc
diff -Nru libnih-1.0.2/debian/libnih-dev.install libnih-1.0.2/debian/libnih-dev.install
--- libnih-1.0.2/debian/libnih-dev.install	2010-06-13 23:37:08.000000000 +0200
+++ libnih-1.0.2/debian/libnih-dev.install	2011-01-02 21:10:45.000000000 +0100
@@ -1,7 +1,5 @@
-lib/libnih.a
-lib/libnih.la
-lib/libnih.so
+usr/lib/libnih.a
 usr/include/libnih.h
-usr/include/nih
+usr/include/nih/
 usr/lib/pkgconfig/libnih.pc
 usr/share/aclocal/libnih.m4
diff -Nru libnih-1.0.2/debian/rules libnih-1.0.2/debian/rules
--- libnih-1.0.2/debian/rules	2010-06-13 23:37:08.000000000 +0200
+++ libnih-1.0.2/debian/rules	2011-01-02 21:10:45.000000000 +0100
@@ -16,5 +16,9 @@
 endif
 
 override_dh_auto_configure:
-	dh_auto_configure -- CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
-		--libdir=/lib
+	dh_auto_configure -- CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+
+override_dh_link:
+	dh_link -plibnih-dev lib/$$(basename $$(readlink debian/tmp/usr/lib/libnih.so)) usr/lib/libnih.so
+	dh_link -plibnih-dbus-dev lib/$$(basename $$(readlink debian/tmp/usr/lib/libnih-dbus.so)) usr/lib/libnih-dbus.so
+	dh_link --remaining-packages

Reply to: