[med-svn] r5522 - trunk/packages/freeicd/trunk/debian

[Eric Maeker]

Author: ericmaeker-guest
Date: 2010-11-29 17:37:34 +0000 (Mon, 29 Nov 2010)
New Revision: 5522

Modified:
   trunk/packages/freeicd/trunk/debian/freeicd.lintian-overrides
   trunk/packages/freeicd/trunk/debian/rules
Log:
Some test for rpath management

Modified: trunk/packages/freeicd/trunk/debian/freeicd.lintian-overrides
===================================================================
--- trunk/packages/freeicd/trunk/debian/freeicd.lintian-overrides	2010-11-29 17:00:53 UTC (rev 5521)
+++ trunk/packages/freeicd/trunk/debian/freeicd.lintian-overrides	2010-11-29 17:37:34 UTC (rev 5522)
@@ -9,9 +9,9 @@
 #    package. In that case, place those private shared libraries in
 #    /usr/lib/<package>.
 # This is actually the case and so the lintian error is a false alarm
-freeicd: binary-or-shlib-defines-rpath ./usr/bin/freeicd plugins
-freeicd: binary-or-shlib-defines-rpath ./usr/lib/freeicd/libAggregation.so.1.0.0 plugins
-freeicd: binary-or-shlib-defines-rpath ./usr/lib/freeicd/libExtensionSystem.so.1.0.0 plugins
-freeicd: binary-or-shlib-defines-rpath ./usr/lib/freeicd/libTranslationUtils.so.1.0.0 plugins
-freeicd: binary-or-shlib-defines-rpath ./usr/lib/freeicd/libUtils.so.1.0.0 plugins
-freeicd: binary-or-shlib-defines-rpath ./usr/lib/freeicd/libquazip.so.1.0.0 plugins
+#freeicd: binary-or-shlib-defines-rpath ./usr/bin/freeicd plugins
+#freeicd: binary-or-shlib-defines-rpath ./usr/lib/freeicd/libAggregation.so.1.0.0 plugins
+#freeicd: binary-or-shlib-defines-rpath ./usr/lib/freeicd/libExtensionSystem.so.1.0.0 plugins
+#freeicd: binary-or-shlib-defines-rpath ./usr/lib/freeicd/libTranslationUtils.so.1.0.0 plugins
+#freeicd: binary-or-shlib-defines-rpath ./usr/lib/freeicd/libUtils.so.1.0.0 plugins
+#freeicd: binary-or-shlib-defines-rpath ./usr/lib/freeicd/libquazip.so.1.0.0 plugins

Modified: trunk/packages/freeicd/trunk/debian/rules
===================================================================
--- trunk/packages/freeicd/trunk/debian/rules	2010-11-29 17:00:53 UTC (rev 5521)
+++ trunk/packages/freeicd/trunk/debian/rules	2010-11-29 17:37:34 UTC (rev 5522)
@@ -5,7 +5,7 @@
 
 override_dh_auto_configure:
 	lrelease global_resources/translations/*.ts
-	qmake-qt4 -r -config release "CONFIG+=LINUX_INTEGRATED" "INSTALL_ROOT_PATH=$(CURDIR)/debian/tmp/usr/" freeicd.pro
+	qmake-qt4 -r -config release "LOWERED_APPNAME=freeicd" "CONFIG+=LINUX_INTEGRATED" "INSTALL_ROOT_PATH=$(CURDIR)/debian/tmp/usr/" freeicd.pro
 
 # Upstream does not seem to provide a proper clean target - clean up here
 override_dh_auto_clean:
@@ -34,8 +34,8 @@
 
 	dh_install --autodest
 
-override_dh_shlibdeps::
-	LD_LIBRARY_PATH=debian/tmp/usr/lib/freeicd dh_shlibdeps -l/usr/lib/freeicd
+#override_dh_shlibdeps::
+#	LD_LIBRARY_PATH=debian/tmp/usr/lib/freeicd dh_shlibdeps -l/usr/lib/freeicd
 
 override_dh_installdeb:
 	# remove extra license file