[med-svn] r12352 - trunk/packages/gmod/chado/trunk/debian

[Olivier Sallou]

Author: osallou
Date: 2012-10-09 13:00:00 +0000 (Tue, 09 Oct 2012)
New Revision: 12352

Modified:
   trunk/packages/gmod/chado/trunk/debian/changelog
   trunk/packages/gmod/chado/trunk/debian/postinst
   trunk/packages/gmod/chado/trunk/debian/rules
Log:
fix permissions on files for bug 689111

Modified: trunk/packages/gmod/chado/trunk/debian/changelog
===================================================================
--- trunk/packages/gmod/chado/trunk/debian/changelog	2012-10-09 10:28:19 UTC (rev 12351)
+++ trunk/packages/gmod/chado/trunk/debian/changelog	2012-10-09 13:00:00 UTC (rev 12352)
@@ -1,3 +1,12 @@
+libchado-perl (1.22-4) UNRELEASED; urgency=low
+
+  * debian/rules: fix permissions on gmod-chado file
+    and remove unneeded file load.conf (Closes: #689111).
+  * debian/postinst: fix permissions on pgpass file
+    (Closes: #689111). 
+
+ -- root <root at genouest.org>  Tue, 09 Oct 2012 14:27:37 +0200
+
 libchado-perl (1.22-3) unstable; urgency=low
 
   * debian/patches/remove_pl_extension.patch:

Modified: trunk/packages/gmod/chado/trunk/debian/postinst
===================================================================
--- trunk/packages/gmod/chado/trunk/debian/postinst	2012-10-09 10:28:19 UTC (rev 12351)
+++ trunk/packages/gmod/chado/trunk/debian/postinst	2012-10-09 13:00:00 UTC (rev 12352)
@@ -47,8 +47,9 @@
 	  perl Makefile.PL update GMOD_ROOT=/usr/share/gmod/chado DBNAME=$CHADO_DB_NAME  DBUSER=$DBUSER DBPASS=$DBPASS DBHOST=$DBHOST DBPORT=$DBPORT DBDRIVER=PostgreSQL  SIMPLE=Y RECONFIGURE=1 LOCAL_TMP=$CHADOTMP &> /dev/null
 	  rm -rf $CHADOTMP
 	  export PATH=$PATH:/usr/share/gmod/chado/bin
+	  touch /usr/share/gmod/chado/pgpass
+          chmod 0600 /usr/share/gmod/chado/pgpass
 	  echo "*:*:*:$DBUSER:$DBPASS" > /usr/share/gmod/chado/pgpass
-	  chmod 0600 /usr/share/gmod/chado/pgpass
 	  export PGPASSFILE=/usr/share/gmod/chado/pgpass
 	  # Need to detect with testdb if access to db is ok or need to be configured
 	  perl /usr/share/gmod/chado/bin/testdb.pl

Modified: trunk/packages/gmod/chado/trunk/debian/rules
===================================================================
--- trunk/packages/gmod/chado/trunk/debian/rules	2012-10-09 10:28:19 UTC (rev 12351)
+++ trunk/packages/gmod/chado/trunk/debian/rules	2012-10-09 13:00:00 UTC (rev 12352)
@@ -16,6 +16,7 @@
 
 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
@@ -51,3 +52,7 @@
 
 override_dh_auto_test:
 	echo "Skipping tests to avoid db access"
+
+override_dh_fixperms:
+	dh_fixperms
+	chmod 600 debian/$(pkg)/etc/gmod/gmod-chado.conf