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

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

Author: hertzog
Date: 2006-03-12 16:55:34 +0000 (Sun, 12 Mar 2006)
New Revision: 114

Modified:
   trunk/debian/changelog
   trunk/debian/patches/10makefiles.dpatch
   trunk/debian/rules
Log:
New upstream release. Generate default sql-ledger.conf from the upstream
config file.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-03-01 13:00:21 UTC (rev 113)
+++ trunk/debian/changelog	2006-03-12 16:55:34 UTC (rev 114)
@@ -1,3 +1,12 @@
+sql-ledger (2.6.7-1) unstable; urgency=low
+
+  [ Raphael Hertzog ]
+  * New upstream release.
+  * Generate sql-ledger.conf based on sql-ledger.conf.default from upstream.
+    Closes: #296293
+
+ -- Raphael Hertzog <hertzog at debian.org>  Sun, 12 Mar 2006 16:49:55 +0000
+
 sql-ledger (2.6.6-2) UNRELEASED; urgency=low
 
   [ Raphael Hertzog ]
@@ -8,7 +17,7 @@
     mean time. Indirectly closes: #354781
 
   [ Finn-Arne Johansen ]
-  * We now have enough manpower it seem (Closes #320442)
+  * We now have enough manpower it seem (Closes: #320442)
 
  -- Finn-Arne Johansen <faj at bzz.no>  Fri, 10 Feb 2006 20:24:58 +0100
 

Modified: trunk/debian/patches/10makefiles.dpatch
===================================================================
--- trunk/debian/patches/10makefiles.dpatch	2006-03-01 13:00:21 UTC (rev 113)
+++ trunk/debian/patches/10makefiles.dpatch	2006-03-12 16:55:34 UTC (rev 114)
@@ -232,54 +232,3 @@
 +  AddHandler cgi-script .pl
 +  Options ExecCGI Includes FollowSymlinks
 +</Directory>
---- sql-ledger-2.2.6.orig/sql-ledger.conf
-+++ sql-ledger-2.2.6/sql-ledger.conf
-@@ -0,0 +1,48 @@
-+use vars qw($userspath $spool $memberfile $templates $sendmail $language $sid $latex %printer $gzip);
-+
-+# path to user configuration files
-+$userspath = "/var/lib/sql-ledger/users";
-+
-+# spool directory for batch printing
-+$spool = "spool";
-+
-+# templates base directory
-+$templates = "templates";
-+
-+# member file
-+$memberfile = "/var/lib/sql-ledger/users/members";
-+
-+# location of sendmail
-+$sendmail = "| /usr/sbin/sendmail -t";
-+
-+# set language for login and admin
-+$language = "";
-+
-+# Oracle
-+#$sid = "T80509";
-+#$ENV{"ORACLE_HOME"} = "/usr/local/oracle";
-+
-+# if you have latex installed set to 1
-+$latex = 1;
-+
-+# available printers
-+%printer = ( Laserjet	=> 'lpr -Plaserjet',
-+             Laser	=> 'lpr -Plaser'
-+            );
-+
-+# program to use for file compression
-+$gzip = "gzip -S .gz";
-+
-+# if the server can't find gzip, latex, dvips or pdflatex, add the path
-+$ENV{PATH} .= ":/usr/local/bin";
-+
-+# on mac os X using Fink's Perl libs, add the path
-+#$ENV{PERL5LIB} .= ":/sw/lib/perl5";
-+
-+# DB2, Default dataset is expected to be LEDGER
-+#$ENV{DB2INSTANCE} = "db2inst1";
-+#$ENV{DB2_HOME} = "/opt/IBM/db2/V8.1/";
-+
-+
-+1;
-+

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2006-03-01 13:00:21 UTC (rev 113)
+++ trunk/debian/rules	2006-03-12 16:55:34 UTC (rev 114)
@@ -30,6 +30,7 @@
 
 	# Add here commands to clean up after the build process.
 	#-$(MAKE) clean
+	rm -f sql-ledger.conf
 
 	dh_clean
 
@@ -40,6 +41,10 @@
 	dh_installdirs
 
 	# Add here commands to install the package into debian/sql-ledger.
+	sed -e 's|^\$$userspath = .*$$|$$userspath = "/var/lib/sql-ledger/users";|' \
+	    -e 's|^\$$memberfile = .*$$|$$memberfile = "/var/lib/sql-ledger/users/members";|' \
+	sql-ledger.conf.default > sql-ledger.conf
+	
 	$(MAKE) install DESTDIR=$(DESTDIR)
 	# Install lintian overrides
 	mkdir -p $(DESTDIR)/usr/share/lintian/overrides/