[Pkg-sql-ledger-commit] r361 - ledger-smb/trunk/debian

[pkg-sql-ledger-commit-owner at lists.alioth.debian.org]

Author: jame-guest
Date: 2011-12-26 01:29:37 +0000 (Mon, 26 Dec 2011)
New Revision: 361

Modified:
   ledger-smb/trunk/debian/ledgersmb.postinst
   ledger-smb/trunk/debian/ledgersmb.postrm
   ledger-smb/trunk/debian/rules
Log:
Do not use dpkg-statoverride in debian/statoverride to set permissions.

Modified: ledger-smb/trunk/debian/ledgersmb.postinst
===================================================================
--- ledger-smb/trunk/debian/ledgersmb.postinst	2011-12-26 00:57:58 UTC (rev 360)
+++ ledger-smb/trunk/debian/ledgersmb.postinst	2011-12-26 01:29:37 UTC (rev 361)
@@ -20,22 +20,6 @@
 
 case "$1" in
     configure)
-    #   Remove if present then install the stat setting for /etc/ledgersmb
-    dpkg-statoverride --remove /etc/ledgersmb >/dev/null 2>&1 || true
-    dpkg-statoverride --update --add www-data www-data 2755 /etc/ledgersmb
-
-    #   Remove if present then install the stat setting for /etc/ledgersmb/images
-    dpkg-statoverride --remove /etc/ledgersmb/images >/dev/null 2>&1 || true
-    dpkg-statoverride --update --add www-data www-data 2755 /etc/ledgersmb/images
-
-    #   Remove if present then install the stat setting for /etc/ledgersmb/images/demo
-    dpkg-statoverride --remove /etc/ledgersmb/images/demo >/dev/null 2>&1 || true
-    dpkg-statoverride --update --add www-data www-data 2755 /etc/ledgersmb/images/demo
-
-    #   Remove if present then install the stat setting for /etc/ledgersmb/templates
-    dpkg-statoverride --remove /etc/ledgersmb/templates >/dev/null 2>&1 || true
-    dpkg-statoverride --update --add www-data www-data 2755 /etc/ledgersmb/templates
-
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: ledger-smb/trunk/debian/ledgersmb.postrm
===================================================================
--- ledger-smb/trunk/debian/ledgersmb.postrm	2011-12-26 00:57:58 UTC (rev 360)
+++ ledger-smb/trunk/debian/ledgersmb.postrm	2011-12-26 01:29:37 UTC (rev 361)
@@ -20,15 +20,16 @@
 
 
 case "$1" in
-    purge|remove)
-    #   Remove the stat setting for /etc/ledgersmb/*
+    upgrade|purge|remove)
+    #   Remove the stats setting for /etc/ledgersmb/*, as dpkg-statoverride
+    # is no longer being used in debian/postinst to set it.  (Remote later.)
     dpkg-statoverride --remove /etc/ledgersmb >/dev/null 2>&1 || true
     dpkg-statoverride --remove /etc/ledgersmb/images >/dev/null 2>&1 || true
     dpkg-statoverride --remove /etc/ledgersmb/images/demo >/dev/null 2>&1 || true
     dpkg-statoverride --remove /etc/ledgersmb/templates* >/dev/null 2>&1 || true
     ;;
 
-    upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    failed-upgrade|abort-install|abort-upgrade|disappear)
     ;;
 
     *)

Modified: ledger-smb/trunk/debian/rules
===================================================================
--- ledger-smb/trunk/debian/rules	2011-12-26 00:57:58 UTC (rev 360)
+++ ledger-smb/trunk/debian/rules	2011-12-26 01:29:37 UTC (rev 361)
@@ -75,8 +75,12 @@
 	dh_compress
 	dh_fixperms
     #   Set default user:group & permissions for etc/ledgersmb
+	chown -R www-data:www-data $(LSMBDIR)/etc/ledgersmb
 	chmod 0600 $(LSMBDIR)/etc/ledgersmb/*.conf
-	chown -R www-data:www-data $(LSMBDIR)/etc/ledgersmb
+	chmod 2755 $(LSMBDIR)/etc/ledgersmb
+	chmod 2755 $(LSMBDIR)/etc/ledgersmb/images
+	chmod 2755 $(LSMBDIR)/etc/ledgersmb/images/demo
+	chmod 2755 $(LSMBDIR)/etc/ledgersmb/templates
     # Corrections to file permissions in the package build directory.
 	chmod +x $(LSMBDIR)/scripts/*.pl
 	chmod -x $(LSMBDIR)/locale/po/*