[Python-modules-commits] r13591 - in packages/shiboken/trunk/debian (4 files)

[odyx-guest at users.alioth.debian.org]

    Date: Thursday, June 24, 2010 @ 09:30:45
  Author: odyx-guest
Revision: 13591

releasing version 0.3.2-2

Added:
  packages/shiboken/trunk/debian/shiboken-dbg.install
Modified:
  packages/shiboken/trunk/debian/changelog
  packages/shiboken/trunk/debian/rules
  packages/shiboken/trunk/debian/shiboken-dbg.lintian-overrides

Modified: packages/shiboken/trunk/debian/changelog
===================================================================
--- packages/shiboken/trunk/debian/changelog	2010-06-24 08:36:52 UTC (rev 13590)
+++ packages/shiboken/trunk/debian/changelog	2010-06-24 09:30:45 UTC (rev 13591)
@@ -7,7 +7,7 @@
   * Fix the Hurd FTBFS by importing u_4bab9a8_fix_Hurd_FTBFS.patch from
     upstream.
 
- -- Didier Raboud <didier at raboud.com>  Thu, 24 Jun 2010 09:15:49 +0200
+ -- Didier Raboud <didier at raboud.com>  Thu, 24 Jun 2010 11:30:34 +0200
 
 shiboken (0.3.2-1) unstable; urgency=low
 

Modified: packages/shiboken/trunk/debian/rules
===================================================================
--- packages/shiboken/trunk/debian/rules	2010-06-24 08:36:52 UTC (rev 13590)
+++ packages/shiboken/trunk/debian/rules	2010-06-24 09:30:45 UTC (rev 13591)
@@ -98,7 +98,7 @@
 
 #### DEBIAN INSTALL ####
 
-override_dh_install: override_dh_install_3
+override_dh_install: override_dh_install_2
 
 override_dh_install_1:
 	# Setup the default version symbolic links
@@ -106,23 +106,21 @@
 	              debian/tmp/usr/lib/generatorrunner/libshiboken_generator.so )
 	$(shell ln -s libshiboken`echo -py${DEFAULT_PY} | sed -e 's/\.//g' -`.so \
 	              debian/tmp/usr/lib/libshiboken.so )
+	# Setup the debug default version symbolic links
+	$(shell ln -s libshiboken_generator`echo -py${DEFAULT_PY} | sed -e 's/\.//g' -`_d.so \
+	              debian/tmp-dbg/usr/lib/generatorrunner/libshiboken_generator_d.so )
+	$(shell ln -s libshiboken`echo -py${DEFAULT_PY} | sed -e 's/\.//g' -`_d.so \
+	              debian/tmp-dbg/usr/lib/libshiboken_d.so )
 
 override_dh_install_2: override_dh_install_1
-	# Do the legacy install for the rest
-	dh_install --list-missing
-	# Prepare dirs for debug
-	mkdir -p debian/shiboken-dbg/usr/lib/generatorrunner/ 
+	dh_install --list-missing -pshiboken-dbg --sourcedir=debian/tmp-dbg
+	dh_install --list-missing --remaining-packages
 
-override_dh_install_3: override_dh_install_2
-	# Move the debug build to the correct package
-	$(shell rename 's/debian\/tmp-dbg/debian\/shiboken-dbg/' \
-	               debian/tmp-dbg/usr/lib/libshiboken*_d.so* debian/tmp-dbg/usr/lib/generatorrunner/*_d.so )
-
 #### Shared libs ####
 override_dh_makeshlibs:
 	# Package shiboken ships a usr/lib/generatorrunner/*.so plugin. No shared libs in there.
 	# Debug package shouldn't be depended upon
-	dh_makeshlibs -Nshiboken -Nshiboken-dbg
+	dh_makeshlibs -Nshiboken
 
 #### Docs ####
 binary: binary-arch binary-indep;

Added: packages/shiboken/trunk/debian/shiboken-dbg.install
===================================================================
--- packages/shiboken/trunk/debian/shiboken-dbg.install	                        (rev 0)
+++ packages/shiboken/trunk/debian/shiboken-dbg.install	2010-06-24 09:30:45 UTC (rev 13591)
@@ -0,0 +1,2 @@
+usr/lib/*.so*
+usr/lib/generatorrunner/*.so

Modified: packages/shiboken/trunk/debian/shiboken-dbg.lintian-overrides
===================================================================
--- packages/shiboken/trunk/debian/shiboken-dbg.lintian-overrides	2010-06-24 08:36:52 UTC (rev 13590)
+++ packages/shiboken/trunk/debian/shiboken-dbg.lintian-overrides	2010-06-24 09:30:45 UTC (rev 13591)
@@ -2,3 +2,7 @@
 package-name-doesnt-match-sonames
 # Nobody should depend on them
 no-symbols-control-file
+# We ship the convenience symlinks
+non-dev-pkg-with-shlib-symlink
+# Leftarounds
+unused-shlib-entry-in-control-file