[Pkg-sql-ledger-commit] r459 - in ledger-smb/trunk/debian: . patches

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

Author: jame-guest
Date: 2012-03-15 20:06:40 +0000 (Thu, 15 Mar 2012)
New Revision: 459

Modified:
   ledger-smb/trunk/debian/patches/05_confdir.patch
   ledger-smb/trunk/debian/rules
Log:
Move patching of ledgersmb.conf.default to patches/05_confdir.patch.

Modified: ledger-smb/trunk/debian/patches/05_confdir.patch
===================================================================
--- ledger-smb/trunk/debian/patches/05_confdir.patch	2012-03-14 20:22:37 UTC (rev 458)
+++ ledger-smb/trunk/debian/patches/05_confdir.patch	2012-03-15 20:06:40 UTC (rev 459)
@@ -3,7 +3,7 @@
 Index: ledgersmb/LedgerSMB/Sysconfig.pm
 ===================================================================
 --- ledgersmb.orig/LedgerSMB/Sysconfig.pm	2011-12-12 07:12:13.000000000 -0500
-+++ ledgersmb/LedgerSMB/Sysconfig.pm	2012-03-09 09:23:13.000000000 -0500
++++ ledgersmb/LedgerSMB/Sysconfig.pm	2012-03-15 15:54:19.000000000 -0400
 @@ -56,20 +56,20 @@
  our $cookie_name = "LedgerSMB-1.3";
  
@@ -38,3 +38,30 @@
  
  our $no_db_str = 'database';
  our $log_level = 'ERROR';
+Index: ledgersmb/ledgersmb.conf.default
+===================================================================
+--- ledgersmb.orig/ledgersmb.conf.default	2011-12-12 07:12:13.000000000 -0500
++++ ledgersmb/ledgersmb.conf.default	2012-03-15 15:59:03.000000000 -0400
+@@ -47,16 +47,16 @@
+ 
+ [paths]
+ # spool directory for batch printing
+-spool      = spool
++spool      = /var/lib/ledgersmb/spool
+ # path to user configuration files
+-userspath  = users
++userspath  = /var/lib/ledgersmb/users
+ # templates base directory
+-templates  = templates
++templates  = /etc/ledgersmb/templates
+ # images base directory
+-images  = images
++images  = /usr/share/ledgersmb/images
+ # member file
+-memberfile = users/members
+-localepath = locale/po
++memberfile = /var/lib/ledgersmb/users/members
++localepath = /usr/share/ledgersmb/locale/po
+ 
+ [programs]
+ # program to use for file compression

Modified: ledger-smb/trunk/debian/rules
===================================================================
--- ledger-smb/trunk/debian/rules	2012-03-14 20:22:37 UTC (rev 458)
+++ ledger-smb/trunk/debian/rules	2012-03-15 20:06:40 UTC (rev 459)
@@ -8,10 +8,7 @@
     # Per upstream; remove these empty directories if present, as they are not
     # needed for an installed LedgerSMB directory.
 	rm -rf LedgerSMB/Assets LedgerSMB/Entity
-	sed -e 's|^spool      = .*$$|spool  = /var/lib/ledgersmb/spool|' \
-	    -e 's|^latex : 1$$|latex : 0|' \
-	    -e '/^localepath/d' \
-	    ledgersmb.conf.default > ledgersmb.conf
+	cp ledgersmb.conf.default ledgersmb.conf
 	cp ledgersmb-httpd.conf.template ledgersmb-httpd.conf
 	cp pos.conf.pl.template pos.conf.pl
 	dh_auto_configure