[med-svn] r17381 - trunk/packages/gmod/gbrowse/trunk/debian

[Charles Plessy]

Author: plessy
Date: 2014-06-30 22:24:20 +0000 (Mon, 30 Jun 2014)
New Revision: 17381

Modified:
   trunk/packages/gmod/gbrowse/trunk/debian/changelog
   trunk/packages/gmod/gbrowse/trunk/debian/compat
   trunk/packages/gmod/gbrowse/trunk/debian/gbrowse-calign.dirs
   trunk/packages/gmod/gbrowse/trunk/debian/rules
Log:
Don't hardcode /usr/lib/perl5.

Closes: #752345
Thanks: gregor herrmann <gregoa at debian.org>



Modified: trunk/packages/gmod/gbrowse/trunk/debian/changelog
===================================================================
--- trunk/packages/gmod/gbrowse/trunk/debian/changelog	2014-06-30 20:10:43 UTC (rev 17380)
+++ trunk/packages/gmod/gbrowse/trunk/debian/changelog	2014-06-30 22:24:20 UTC (rev 17381)
@@ -1,3 +1,13 @@
+gbrowse (2.54+dfsg-2.1) UNRELEASED; urgency=medium
+
+  [ gregor herrmann ]
+  * Don't hardcode /usr/lib/perl5 (Closes: #752345).
+    - debian/rules: use $Config{vendorarch}
+    - debian/gbrowse-calign.dirs: use $Config{vendorarch} and make executable
+    - debian/compat: bump to 9
+
+ -- gregor herrmann <gregoa at debian.org>  Mon, 30 Jun 2014 23:07:52 +0200
+
 gbrowse (2.54+dfsg-2) unstable; urgency=low
 
   * Transition to apache 2.4 (Closes: #669830).

Modified: trunk/packages/gmod/gbrowse/trunk/debian/compat
===================================================================
--- trunk/packages/gmod/gbrowse/trunk/debian/compat	2014-06-30 20:10:43 UTC (rev 17380)
+++ trunk/packages/gmod/gbrowse/trunk/debian/compat	2014-06-30 22:24:20 UTC (rev 17381)
@@ -1 +1 @@
-8
+9

Modified: trunk/packages/gmod/gbrowse/trunk/debian/gbrowse-calign.dirs
===================================================================
--- trunk/packages/gmod/gbrowse/trunk/debian/gbrowse-calign.dirs	2014-06-30 20:10:43 UTC (rev 17380)
+++ trunk/packages/gmod/gbrowse/trunk/debian/gbrowse-calign.dirs	2014-06-30 22:24:20 UTC (rev 17381)
@@ -1,2 +1,9 @@
-usr/lib/perl5/auto/Bio/Graphics/Browser2/CAlign
-usr/lib/perl5/Bio/Graphics/Browser2/
+#!/usr/bin/perl -w
+
+use Config;
+
+my $vendorarch = substr($Config{vendorarch}, 1);
+
+print "$vendorarch/auto/Bio/Graphics/Browser2/CAlign\n";
+print "$vendorarch/Bio/Graphics/Browser2/\n";
+

Modified: trunk/packages/gmod/gbrowse/trunk/debian/rules
===================================================================
--- trunk/packages/gmod/gbrowse/trunk/debian/rules	2014-06-30 20:10:43 UTC (rev 17380)
+++ trunk/packages/gmod/gbrowse/trunk/debian/rules	2014-06-30 22:24:20 UTC (rev 17381)
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 GBROWSE_BUILD_OPTIONS = --conf=/etc/gbrowse --htdocs=/usr/share/gbrowse/htdocs --tmp=/var/cache/gbrowse --databases=/var/lib/gbrowse/databases --cgibin=/usr/lib/cgi-bin/gbrowse --www-user=www-data --registration_done=1 --persistent=/var/lib/gbrowse
+ARCHLIB := $(shell perl -MConfig -e 'print $$Config{vendorarch}')
 
 %: 
 	dh $@ --with apache2
@@ -8,6 +9,11 @@
 override_dh_auto_configure:
 	dh_auto_configure -- $(GBROWSE_BUILD_OPTIONS)
 
+override_dh_installdirs:
+	# svn(-buildpackage) seems to ignore the x bit
+	chmod +x debian/gbrowse-calign.dirs
+	dh_installdirs
+
 override_dh_auto_install:
 	./Build  --install_base=debian/gbrowse debianinstall
 	#./Build   apache_conf > debian/gbrowse/etc/gbrowse/gbrowse_apache2.conf
@@ -15,8 +21,8 @@
 	./Build  --install_base=debian/gbrowse install_slave
 	mv debian/gbrowse/lib/perl5/* debian/gbrowse/usr/share/perl5
 	# Remove arch dependant data
-	mv debian/gbrowse/usr/share/perl5/auto/Bio/Graphics/Browser2/CAlign/* debian/gbrowse-calign/usr/lib/perl5/auto/Bio/Graphics/Browser2/CAlign/
-	mv debian/gbrowse/usr/share/perl5/Bio/Graphics/Browser2/CAlign.pm debian/gbrowse-calign/usr/lib/perl5/Bio/Graphics/Browser2/CAlign.pm
+	mv debian/gbrowse/usr/share/perl5/auto/Bio/Graphics/Browser2/CAlign/* debian/gbrowse-calign$(ARCHLIB)/auto/Bio/Graphics/Browser2/CAlign/
+	mv debian/gbrowse/usr/share/perl5/Bio/Graphics/Browser2/CAlign.pm debian/gbrowse-calign$(ARCHLIB)/Bio/Graphics/Browser2/CAlign.pm
 	rm -rf debian/gbrowse/lib
 	rm -f debian/gbrowse/usr/share/doc/gbrowse/INSTALL
 	rm -f debian/gbrowse/usr/share/perl5/auto/GBrowse/.packlist