[Python-modules-commits] r13599 - in packages/shiboken/trunk/debian (3 files)

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

    Date: Thursday, June 24, 2010 @ 15:26:12
  Author: odyx-guest
Revision: 13599

Final tweaks, patch update and release

Modified:
  packages/shiboken/trunk/debian/changelog
  packages/shiboken/trunk/debian/patches/use_original_sparsehash.patch
  packages/shiboken/trunk/debian/rules

Modified: packages/shiboken/trunk/debian/changelog
===================================================================
--- packages/shiboken/trunk/debian/changelog	2010-06-24 14:38:50 UTC (rev 13598)
+++ packages/shiboken/trunk/debian/changelog	2010-06-24 15:26:12 UTC (rev 13599)
@@ -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 11:30:34 +0200
+ -- Didier Raboud <didier at raboud.com>  Thu, 24 Jun 2010 16:49:50 +0200
 
 shiboken (0.3.2-1) unstable; urgency=low
 

Modified: packages/shiboken/trunk/debian/patches/use_original_sparsehash.patch
===================================================================
--- packages/shiboken/trunk/debian/patches/use_original_sparsehash.patch	2010-06-24 14:38:50 UTC (rev 13598)
+++ packages/shiboken/trunk/debian/patches/use_original_sparsehash.patch	2010-06-24 15:26:12 UTC (rev 13599)
@@ -5,9 +5,9 @@
 Last-Updated: 2010-02-12
 Index: shiboken/libshiboken/CMakeLists.txt
 ===================================================================
---- shiboken.orig/libshiboken/CMakeLists.txt	2010-06-06 18:09:32.000000000 +0200
-+++ shiboken/libshiboken/CMakeLists.txt	2010-06-06 18:09:36.000000000 +0200
-@@ -26,7 +26,7 @@
+--- shiboken.orig/libshiboken/CMakeLists.txt	2010-06-24 15:34:57.000000000 +0200
++++ shiboken/libshiboken/CMakeLists.txt	2010-06-24 15:34:57.000000000 +0200
+@@ -37,7 +37,7 @@
  
  include_directories(${CMAKE_CURRENT_SOURCE_DIR}
                      ${PYTHON_INCLUDE_PATH}

Modified: packages/shiboken/trunk/debian/rules
===================================================================
--- packages/shiboken/trunk/debian/rules	2010-06-24 14:38:50 UTC (rev 13598)
+++ packages/shiboken/trunk/debian/rules	2010-06-24 15:26:12 UTC (rev 13599)
@@ -98,34 +98,36 @@
 
 #### DEBIAN INSTALL ####
 
-override_dh_install: override_dh_install_2
+override_dh_install: override_dh_install_done
 
-override_dh_install_1:
+override_dh_install_real:
+	# Install the debug variant
+	dh_install --sourcedir=debian/tmp-dbg -pshiboken-dbg
+	
+	# Install the other variants
+	dh_install --list-missing --remaining-packages
+
+override_dh_install_done: override_dh_install_real
 	# Setup the default version symbolic links
-	$(shell ln -s libshiboken_generator`echo -py${DEFAULT_PY} | sed -e 's/\.//g' -`.so \
-	              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 )
+	$(shell ln -sf libshiboken_generator`echo -py${DEFAULT_PY} | sed -e 's/\.//g' -`.so \
+	               debian/shiboken/usr/lib/generatorrunner/libshiboken_generator.so )
+	$(shell ln -sf libshiboken`echo -py${DEFAULT_PY} | sed -e 's/\.//g' -`.so \
+	               debian/libshiboken-dev/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 )
+	$(shell ln -sf libshiboken_generator`echo -py${DEFAULT_PY} | sed -e 's/\.//g' -`_d.so \
+	               debian/shiboken-dbg/usr/lib/generatorrunner/libshiboken_generator_d.so )
+	$(shell ln -sf libshiboken`echo -py${DEFAULT_PY} | sed -e 's/\.//g' -`_d.so \
+	               debian/shiboken-dbg/usr/lib/libshiboken_d.so )
 
-override_dh_install_2: override_dh_install_1
-	dh_install --list-missing -pshiboken-dbg --sourcedir=debian/tmp-dbg
-	dh_install --list-missing --remaining-packages
-
 #### 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
 
 #### Docs ####
 binary: binary-arch binary-indep;
 
-binary-indep:
+binary-indep: binary-arch
 	# Build docs
 	make -C doc html
 	dh binary-indep