[Pkg-gnupg-commit] r372 - in /libgpg-error/trunk/debian: changelog libgpg-error-dev.install libgpg-error0.install libgpg-error0.install.in rules

[dleidert at users.alioth.debian.org]

Author: dleidert
Date: Thu Sep  5 20:27:39 2013
New Revision: 372

URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=372
Log:
* debian/libgpg-error0.install: Renamed to debian/libgpg-error0.install.in.
  Put libraries under /lib (closes: #720593).
* debian/libgpg-error-dev.install: Don't install .so link. We need to
  handle this via dh_link.
* debian/rules: Create .so link and install files between /usr/lib and /lib.

Added:
    libgpg-error/trunk/debian/libgpg-error0.install.in
      - copied, changed from r370, libgpg-error/trunk/debian/libgpg-error0.install
Removed:
    libgpg-error/trunk/debian/libgpg-error0.install
Modified:
    libgpg-error/trunk/debian/changelog
    libgpg-error/trunk/debian/libgpg-error-dev.install
    libgpg-error/trunk/debian/rules

Modified: libgpg-error/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnupg/libgpg-error/trunk/debian/changelog?rev=372&op=diff
==============================================================================
--- libgpg-error/trunk/debian/changelog	(original)
+++ libgpg-error/trunk/debian/changelog	Thu Sep  5 20:27:39 2013
@@ -1,8 +1,11 @@
 libgpg-error (1.12-0.2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
-  * debian/rules (override_dh_auto_configure): Put library under /lib
-    (closes: #720593).
+  * debian/libgpg-error0.install: Renamed to debian/libgpg-error0.install.in.
+    Put libraries under /lib (closes: #720593).
+  * debian/libgpg-error-dev.install: Don't install .so link. We need to
+    handle this via dh_link.
+  * debian/rules: Create .so link and install files between /usr/lib and /lib.
 
  -- Daniel Leidert <dleidert at debian.org>  Mon, 12 Aug 2013 23:14:05 +0200
 

Modified: libgpg-error/trunk/debian/libgpg-error-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnupg/libgpg-error/trunk/debian/libgpg-error-dev.install?rev=372&op=diff
==============================================================================
--- libgpg-error/trunk/debian/libgpg-error-dev.install	(original)
+++ libgpg-error/trunk/debian/libgpg-error-dev.install	Thu Sep  5 20:27:39 2013
@@ -1,5 +1,4 @@
 usr/bin/*
 usr/include/*
 usr/lib/*/libgpg-error.a
-usr/lib/*/libgpg-error.so
 usr/share/aclocal/*.m4

Copied: libgpg-error/trunk/debian/libgpg-error0.install.in (from r370, libgpg-error/trunk/debian/libgpg-error0.install)
URL: http://svn.debian.org/wsvn/pkg-gnupg/libgpg-error/trunk/debian/libgpg-error0.install.in?rev=372&op=diff
==============================================================================
--- libgpg-error/trunk/debian/libgpg-error0.install	(original)
+++ libgpg-error/trunk/debian/libgpg-error0.install.in	Thu Sep  5 20:27:39 2013
@@ -1,2 +1,2 @@
-usr/lib/*/libgpg-error.so.*
+usr/lib/@DEB_HOST_MULTIARCH@/libgpg-error.so.* lib/@DEB_HOST_MULTIARCH@/
 usr/share/locale

Modified: libgpg-error/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnupg/libgpg-error/trunk/debian/rules?rev=372&op=diff
==============================================================================
--- libgpg-error/trunk/debian/rules	(original)
+++ libgpg-error/trunk/debian/rules	Thu Sep  5 20:27:39 2013
@@ -17,9 +17,14 @@
 	    --enable-static \
 	    --disable-rpath \
 	    --infodir=\$${prefix}/share/info \
-	    --libdir=/lib/$(DEB_HOST_MULTIARCH)
+	    --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+
+override_dh_clean:
+	dh_clean debian/libgpg-error0.install
 
 override_dh_install:
+	sed -e"s, at DEB_HOST_MULTIARCH@,${DEB_HOST_MULTIARCH},g" \
+	    debian/libgpg-error0.install.in > debian/libgpg-error0.install
 	dh_install --list-missing
 
 override_dh_installchangelogs:
@@ -30,3 +35,6 @@
 
 override_dh_makeshlibs:
 	dh_makeshlibs -V --add-udeb=libgpg-error0-udeb
+
+override_dh_link:
+	dh_link -plibgpg-error-dev lib/$(DEB_HOST_MULTIARCH)/libgpg-error.so.0 usr/lib/$(DEB_HOST_MULTIARCH)/libgpg-error.so