[med-svn] [Git][med-team/libchado-perl][master] 7 commits: debhelper 11

Andreas Tille gitlab at salsa.debian.org
Thu Sep 27 19:53:18 BST 2018 

Andreas Tille pushed to branch master at Debian Med / libchado-perl


Commits:
c29b2b7c by Andreas Tille at 2018-09-27T18:22:27Z
debhelper 11

- - - - -
68971f86 by Andreas Tille at 2018-09-27T18:24:44Z
Point Vcs fields to salsa.debian.org

- - - - -
1259f2f1 by Andreas Tille at 2018-09-27T18:24:44Z
Standards-Version: 4.2.1

- - - - -
887ff247 by Andreas Tille at 2018-09-27T18:30:30Z
Fix perl interpreter path

- - - - -
a6aab66c by Andreas Tille at 2018-09-27T18:37:00Z
Do not parse d/changelog

- - - - -
6e8424cc by Andreas Tille at 2018-09-27T18:49:43Z
Fix permissions, Do not include installation docs

- - - - -
25205888 by Andreas Tille at 2018-09-27T18:52:07Z
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/compat
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+libchado-perl (1.31-5) unstable; urgency=medium
+
+  * debhelper 11
+  * Point Vcs fields to salsa.debian.org
+  * Standards-Version: 4.2.1
+  * Fix perl interpreter path
+  * Do not parse d/changelog
+  * Fix permissions
+  * Do not include installation docs
+
+ -- Andreas Tille <tille at debian.org>  Thu, 27 Sep 2018 20:49:54 +0200
+
 libchado-perl (1.31-4) unstable; urgency=medium
 
   * Move packaging from SVN to Git


=====================================
debian/compat
=====================================
@@ -1 +1 @@
-10
+11


=====================================
debian/control
=====================================
@@ -6,7 +6,7 @@ Uploaders: Scott Cain <scain at cpan.org>,
            Andreas Tille <tille at debian.org>
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 10)
+Build-Depends: debhelper (>= 11~)
 Build-Depends-Indep: perl,
                      libclass-dbi-pg-perl,
                      libxml-libxslt-perl,
@@ -29,9 +29,9 @@ Build-Depends-Indep: perl,
                      libsql-translator-perl,
                      libdbix-dbstag-perl,
                      libmodule-build-perl
-Standards-Version: 4.1.0
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/libchado-perl.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/libchado-perl.git
+Standards-Version: 4.2.1
+Vcs-Browser: https://salsa.debian.org/med-team/libchado-perl
+Vcs-Git: https://salsa.debian.org/med-team/libchado-perl.git
 Homepage: http://gmod.org/wiki/Chado
 
 Package: libchado-perl


=====================================
debian/rules
=====================================
@@ -1,10 +1,10 @@
 #!/usr/bin/make -f
 
-pkg := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
+include /usr/share/dpkg/default.mk
 
 #export GMOD_ROOT=/usr/share/gmod/chado
-export GMOD_ROOT=$(CURDIR)/debian/$(pkg)/usr/share/gmod/chado
-export CHAOS_HOME=$(CURDIR)/debian/$(pkg)/usr/share/gmod/chaos
+export GMOD_ROOT=$(CURDIR)/debian/$(DEB_SOURCE)/usr/share/gmod/chado
+export CHAOS_HOME=$(CURDIR)/debian/$(DEB_SOURCE)/usr/share/gmod/chaos
 export CHADO_DB_NAME=gmod-chado
 export PREFIX=/usr
 
@@ -12,47 +12,61 @@ export PREFIX=/usr
 	dh $@ --buildsystem=perl_makemaker
 
 override_dh_auto_configure:
-	perl Makefile.PL INSTALL_BASE=/usr  DBNAME=$(CHADO_DB_NAME) DBUSER=chado DBPASS=chado DBHOST=localhost DBPORT=5432 GMOD_ROOT=$(GMOD_ROOT) DBDRIVER=PostgreSQL RECONFIGURE=1 SIMPLE=Y LOCAL_TMP=$(CURDIR)/debian/$(pkg)/tmp
+	perl Makefile.PL INSTALL_BASE=/usr  DBNAME=$(CHADO_DB_NAME) DBUSER=chado DBPASS=chado DBHOST=localhost DBPORT=5432 GMOD_ROOT=$(GMOD_ROOT) DBDRIVER=PostgreSQL RECONFIGURE=1 SIMPLE=Y LOCAL_TMP=$(CURDIR)/debian/$(DEB_SOURCE)/tmp
 
 override_dh_install:
 	dh_install -O--buildsystem=perl_makemaker
-	rm -f debian/$(pkg)/usr/share/gmod/chado/load/etc/load.conf
-	sed -i 's/SQLFILE=\/.*\/$(pkg)/SQLFILE=/' debian/$(pkg)/usr/share/gmod/chado/conf/gmod-chado.conf
-	sed -i 's/TMP=\/.*\/tmp/CONF=\/tmp/' debian/$(pkg)/usr/share/gmod/chado/conf/gmod.conf
-	sed -i 's/CONF=.*\/conf/CONF=\/etc\/gmod/' debian/$(pkg)/usr/share/gmod/chado/conf/gmod.conf
-	mv $(GMOD_ROOT)/conf/* debian/$(pkg)/etc/gmod/
+	rm -f debian/$(DEB_SOURCE)/usr/share/gmod/chado/load/etc/load.conf
+	sed -i 's/SQLFILE=\/.*\/$(DEB_SOURCE)/SQLFILE=/' debian/$(DEB_SOURCE)/usr/share/gmod/chado/conf/gmod-chado.conf
+	sed -i 's/TMP=\/.*\/tmp/CONF=\/tmp/' debian/$(DEB_SOURCE)/usr/share/gmod/chado/conf/gmod.conf
+	sed -i 's/CONF=.*\/conf/CONF=\/etc\/gmod/' debian/$(DEB_SOURCE)/usr/share/gmod/chado/conf/gmod.conf
+	mv $(GMOD_ROOT)/conf/* debian/$(DEB_SOURCE)/etc/gmod/
 	# Give exexution rights to perl scripts
-	find debian/$(pkg)/ -name *.pl		| xargs chmod 755
-	find debian/$(pkg)/ -name *.tmpl	| xargs chmod 644 
-	find debian/$(pkg)/ -name *.pm		| xargs chmod 644
-	find debian/$(pkg)/ -name *.pod		| xargs rm -f
-	find debian/$(pkg)/ -name .packlist 	| xargs rm -f
-	find debian/$(pkg)/ -name "*.sql"	| xargs chmod a-x
-	chmod 755 debian/$(pkg)/usr/share/gmod/chado/soi/t/t_soi_parse_intersect
-	chmod 755 debian/$(pkg)/usr/share/gmod/chado/src/chado/modules/audit/make_audit_ddl
-	mv debian/tmp/usr/bin/test* debian/$(pkg)/usr/share/gmod/chado/bin/
-	mv debian/tmp/usr/bin/gmod_chado* debian/$(pkg)/usr/share/gmod/chado/bin/
-	mv debian/tmp/usr/bin/config* debian/$(pkg)/usr/share/gmod/chado/bin/
-	mv debian/tmp/usr/bin/Auto* debian/$(pkg)/usr/share/gmod/chado/bin/
+	find debian/$(DEB_SOURCE)/ -name *.pl		| xargs chmod 755
+	find debian/$(DEB_SOURCE)/ -name *.tmpl	| xargs chmod 644 
+	find debian/$(DEB_SOURCE)/ -name *.pm		| xargs chmod 644
+	find debian/$(DEB_SOURCE)/ -name *.pod		| xargs rm -f
+	find debian/$(DEB_SOURCE)/ -name .packlist 	| xargs rm -f
+	find debian/$(DEB_SOURCE)/ -name "*.sql"	| xargs chmod a-x
+	chmod 755 debian/$(DEB_SOURCE)/usr/share/gmod/chado/soi/t/t_soi_parse_intersect
+	chmod 755 debian/$(DEB_SOURCE)/usr/share/gmod/chado/src/chado/modules/audit/make_audit_ddl
+	mv debian/tmp/usr/bin/test* debian/$(DEB_SOURCE)/usr/share/gmod/chado/bin/
+	mv debian/tmp/usr/bin/gmod_chado* debian/$(DEB_SOURCE)/usr/share/gmod/chado/bin/
+	mv debian/tmp/usr/bin/config* debian/$(DEB_SOURCE)/usr/share/gmod/chado/bin/
+	mv debian/tmp/usr/bin/Auto* debian/$(DEB_SOURCE)/usr/share/gmod/chado/bin/
 	mv debian/tmp/usr/bin/* debian/chado-utils/usr/share/gmod/chado/bin/
-	mv debian/tmp/usr/lib/perl5/* debian/$(pkg)/usr/share/perl5/
-	rm -rf debian/$(pkg)/usr/lib/perl5
-	mv debian/tmp/usr/man/man3 debian/$(pkg)/usr/share/man
+	mv debian/tmp/usr/lib/perl5/* debian/$(DEB_SOURCE)/usr/share/perl5/
+	rm -rf debian/$(DEB_SOURCE)/usr/lib/perl5
+	mv debian/tmp/usr/man/man3 debian/$(DEB_SOURCE)/usr/share/man
 	mv debian/tmp/usr/man/man1 debian/chado-utils/usr/share/man
-	cp debian/testdb.pl debian/$(pkg)/usr/share/gmod/chado/bin/
-	rm -rf debian/$(pkg)/usr/share/perl5/x86_64-linux-gnu-thread-multi
+	cp debian/testdb.pl debian/$(DEB_SOURCE)/usr/share/gmod/chado/bin/
+	rm -rf debian/$(DEB_SOURCE)/usr/share/perl5/x86_64-linux-gnu-thread-multi
 	# Needed for runtime configure
-	rm -rf debian/$(pkg)/usr/share/gmod/chado/lib
-	rm -rf debian/$(pkg)/usr/bin
-	rm -rf debian/$(pkg)/usr/lib
-	rm -rf debian/$(pkg)/usr/share/gmod/chado/load/logs
-	rm -rf debian/$(pkg)/usr/share/gmod/chado/tmp
+	rm -rf debian/$(DEB_SOURCE)/usr/share/gmod/chado/lib
+	rm -rf debian/$(DEB_SOURCE)/usr/bin
+	rm -rf debian/$(DEB_SOURCE)/usr/lib
+	rm -rf debian/$(DEB_SOURCE)/usr/share/gmod/chado/load/logs
+	rm -rf debian/$(DEB_SOURCE)/usr/share/gmod/chado/tmp
 	# Remove not required man pages for user (also contains pod2man errors and missing what-is)
-	rm -rf debian/$(pkg)/usr/share/man
+	rm -rf debian/$(DEB_SOURCE)/usr/share/man
+	# Fix perl interpreter path
+	for pl in `grep -Rl '#!/usr/bin/env[[:space:]]\+perl' debian/*/usr/*` ; do \
+	    sed -i '1s?^#!/usr/bin/env[[:space:]]\+perl?#!/usr/bin/perl?' $${pl} ; \
+	done
+
+override_dh_installdocs:
+	dh_installdocs
+	# remove installation doc
+	find debian -name "INSTALL.Chado*" -delete
 
 override_dh_auto_test:
 	echo "Skipping tests to avoid db access"
 
 override_dh_fixperms:
 	dh_fixperms
-	chmod 644 debian/$(pkg)/etc/gmod/gmod-chado.conf
+	chmod 644 debian/$(DEB_SOURCE)/etc/gmod/gmod-chado.conf
+	find debian -name create_so_bridge_command -exec chmod 644 \{\} \;
+	find debian -name Skip_tables.pm -exec chmod 644 \{\} \;
+	find debian -name "*.tt2" -exec chmod 644 \{\} \;
+	find debian -name "*.tmpl" -exec chmod 644 \{\} \;
+	
\ No newline at end of file



View it on GitLab: https://salsa.debian.org/med-team/libchado-perl/compare/18741b375174d13c616621706a0904f80d5fbb91...25205888724bd4aa8a39844b68f6d07ad21bfcc8

-- 
View it on GitLab: https://salsa.debian.org/med-team/libchado-perl/compare/18741b375174d13c616621706a0904f80d5fbb91...25205888724bd4aa8a39844b68f6d07ad21bfcc8
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20180927/4f0b9e06/attachment-0001.html>

More information about the debian-med-commit mailing list