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

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

Author: jame-guest
Date: 2012-03-09 20:44:20 +0000 (Fri, 09 Mar 2012)
New Revision: 442

Modified:
   ledger-smb/trunk/debian/ledgersmb.install
   ledger-smb/trunk/debian/ledgersmb.postinst
   ledger-smb/trunk/debian/rules
Log:
Change how ledgersmb-httpd.conf is installed.

Modified: ledger-smb/trunk/debian/ledgersmb.install
===================================================================
--- ledger-smb/trunk/debian/ledgersmb.install	2012-03-09 15:00:34 UTC (rev 441)
+++ ledger-smb/trunk/debian/ledgersmb.install	2012-03-09 20:44:20 UTC (rev 442)
@@ -1,5 +1,6 @@
 *.conf etc/ledgersmb
 pos.conf.pl etc/ledgersmb
+ledgersmb-httpd.conf etc/apache2/conf.d
 favicon.ico usr/share/ledgersmb
 index.html usr/share/ledgersmb
 VERSION usr/share/ledgersmb

Modified: ledger-smb/trunk/debian/ledgersmb.postinst
===================================================================
--- ledger-smb/trunk/debian/ledgersmb.postinst	2012-03-09 15:00:34 UTC (rev 441)
+++ ledger-smb/trunk/debian/ledgersmb.postinst	2012-03-09 20:44:20 UTC (rev 442)
@@ -24,12 +24,6 @@
     if [ -d "/etc/apache2" ]; then
         # Only do these if this is the initial install.
         if [ "$2" = "" ]; then
-            # Install ledgersmb-httpd.conf if a copy is not already installed.
-            if [ -d "/etc/apache2/conf.d" ]; then
-                if [ ! -e "/etc/apache2/conf.d/ledgersmb-httpd.conf" ]; then
-                    cp /usr/share/doc/ledgersmb/examples/ledgersmb-httpd.conf.template /etc/apache2/conf.d/ledgersmb-httpd.conf
-                fi
-            fi
             # Enable Apache mod_rewrite
             if [ -x "`which a2enmod 2>/dev/null`" ]; then
                 a2enmod rewrite

Modified: ledger-smb/trunk/debian/rules
===================================================================
--- ledger-smb/trunk/debian/rules	2012-03-09 15:00:34 UTC (rev 441)
+++ ledger-smb/trunk/debian/rules	2012-03-09 20:44:20 UTC (rev 442)
@@ -13,6 +13,7 @@
 	    -e 's|^latex : 1$$|latex : 0|' \
 	    -e '/^localepath/d' \
 	    ledgersmb.conf.default > ledgersmb.conf
+	cp ledgersmb-httpd.conf.template ledgersmb-httpd.conf
 	cp pos.conf.pl.template pos.conf.pl
 	dh_auto_configure