[med-svn] r5940 - trunk/packages/arb/trunk/debian

[Andreas Tille]

Author: tille
Date: 2011-02-09 12:35:37 +0000 (Wed, 09 Feb 2011)
New Revision: 5940

Modified:
   trunk/packages/arb/trunk/debian/arb-common.install
   trunk/packages/arb/trunk/debian/rules
Log:
Get some valid packages at least, needs to verify content and whether program is really working


Modified: trunk/packages/arb/trunk/debian/arb-common.install
===================================================================
--- trunk/packages/arb/trunk/debian/arb-common.install	2011-02-09 10:31:13 UTC (rev 5939)
+++ trunk/packages/arb/trunk/debian/arb-common.install	2011-02-09 12:35:37 UTC (rev 5940)
@@ -11,8 +11,7 @@
 lib/pts                               var/lib/arb
 lib/arb_default/*                     usr/lib/arb/lib/arb_default
 lib/help                              usr/lib/arb/lib
-lib/ARB.pm                            usr/lib/arb/lib
-GDEHELP/HELP_GEN/*                    usr/lib/arb/GDEHELP
+PERL2ARB/ARB.pm                       usr/lib/arb/lib
 lib/config.Linux                      usr/lib/arb/lib
 debian/bin/arb_create_debian_conffile usr/lib/arb/SH
 lib/nas/names.dat*                    var/lib/arb/nas

Modified: trunk/packages/arb/trunk/debian/rules
===================================================================
--- trunk/packages/arb/trunk/debian/rules	2011-02-09 10:31:13 UTC (rev 5939)
+++ trunk/packages/arb/trunk/debian/rules	2011-02-09 12:35:37 UTC (rev 5940)
@@ -70,7 +70,8 @@
 	rm -fr $(DIRSTOREMOVE)
 	for dtc in $(DIRSTOCLEAN); do if [ -d $${dtc} ] ; then cd $${dtc}; make clean ; fi; done
 
-override_dh_auto_install:
+override_dh_install:
+	dh_install
 	# remove files from arb package which are in arb-nas
 	if [ -s debian/arb-nas.install ] ; then \
 	    for arbfile in `sed 's?^bin/\([^[:space:]]\+\)[[:space:]]\+\(.\+\)?debian/$(pkg)/\2/\1?' debian/arb-nas.install | grep debian/$(arb)` ; do \
@@ -90,8 +91,10 @@
 
 
 override_dh_strip:
-	# Fix rpath issue
-	chrpath --delete debian/libarb/usr/lib/arb/lib/ARB.so
+	# Fix rpath issue (once libarb is installed)
+	if [ -e debian/libarb/usr/lib/arb/lib/ARB.so ] ; then \
+	    chrpath --delete debian/libarb/usr/lib/arb/lib/ARB.so ; \
+	fi
 	dh_strip
 
 override_dh_shlibdeps: