[med-svn] r3818 - trunk/packages/libgenome/trunk/debian

[Andreas Tille]

Author: tille
Date: 2009-08-25 10:04:43 +0000 (Tue, 25 Aug 2009)
New Revision: 3818

Modified:
   trunk/packages/libgenome/trunk/debian/changelog
   trunk/packages/libgenome/trunk/debian/rules
Log:
Live with the broken d-devlibdeps dependency resolving for the moment (see #374049)


Modified: trunk/packages/libgenome/trunk/debian/changelog
===================================================================
--- trunk/packages/libgenome/trunk/debian/changelog	2009-08-25 07:28:25 UTC (rev 3817)
+++ trunk/packages/libgenome/trunk/debian/changelog	2009-08-25 10:04:43 UTC (rev 3818)
@@ -1,7 +1,8 @@
 libgenome (1.3.1-2) unstable; urgency=low
 
-  * Removed d-shlibs hack to prevent dependency from g++-4.1 lib which
-    seems to be not necessary any more
+  * Stop using d-shlibs hack which was intended to prevent dependency
+    from g++-4.1 lib.  The dependency is *really* stupid but the hack
+    was intended to be temporary and no really good solution.
   * Standards-Version: 3.8.3 (no changes needed)
   * Removed quilt Build-Depends
   * Added missing ${misc:Depends}

Modified: trunk/packages/libgenome/trunk/debian/rules
===================================================================
--- trunk/packages/libgenome/trunk/debian/rules	2009-08-25 07:28:25 UTC (rev 3817)
+++ trunk/packages/libgenome/trunk/debian/rules	2009-08-25 10:04:43 UTC (rev 3818)
@@ -16,7 +16,7 @@
 	# /bin/sh debian/debug/
 	mv debian/tmp/usr/include/*/* debian/tmp/usr/include/
 	# cp -a doc/html/* debian/tmp/usr/share/doc/html
-	d-shlibmove \
+	d-shlibmove --override s/libstdc++6-dev// \
 	            --commit \
 		    --movedev "debian/tmp/usr/include/$(name)" usr/include/$(name)-$(version) \
 		    --movedev "$(name)-$(version).pc" usr/share/pkgconfig \