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

pkg-sql-ledger-commit-owner at lists.alioth.debian.org pkg-sql-ledger-commit-owner at lists.alioth.debian.org
Fri Feb 3 10:21:21 UTC 2006 

Author: hertzog
Date: 2006-02-03 10:21:20 +0000 (Fri, 03 Feb 2006)
New Revision: 110

Added:
   trunk/debian/NEWS.Debian
Removed:
   trunk/debian/patches/40imagepath.dpatch
Modified:
   trunk/debian/TODO
   trunk/debian/changelog
   trunk/debian/dirs
   trunk/debian/patches/00list
   trunk/debian/patches/10makefiles.dpatch
   trunk/debian/postinst
   trunk/debian/rules
Log:
Move everything from /usr/lib/sql-ledger to /usr/share/sql-ledger.


Added: trunk/debian/NEWS.Debian
===================================================================
--- trunk/debian/NEWS.Debian	2006-01-20 19:54:16 UTC (rev 109)
+++ trunk/debian/NEWS.Debian	2006-02-03 10:21:20 UTC (rev 110)
@@ -0,0 +1,10 @@
+sql-ledger (2.6.6-2) unstable; urgency=low
+
+  * SQL-Ledger is now installed in /usr/share/sql-ledger instead of
+    /usr/lib/sql-ledger. The default apache configuration has been
+    correspondingly updated. Please update the path if you have
+    other instances configured in Apache. A temporary symlink
+    has been put in place to avoid potential breakages, but it will
+    be removed one day.
+
+ -- Raphael Hertzog <hertzog at debian.org>  Fri, 20 Jan 2006 19:52:39 +0000

Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO	2006-01-20 19:54:16 UTC (rev 109)
+++ trunk/debian/TODO	2006-02-03 10:21:20 UTC (rev 110)
@@ -2,9 +2,6 @@
 - postinst doesn't handle well apache2. It tries to create /etc/apache/httpd.conf 
   => Make use of "wwwconfig-common" to be nicer about apache configuration ?
 
-1/ Install everything below /usr/share/sql-ledger/ instead of
-/usr/lib/sql-ledger/.
-
 1/ Improve README.Debian to provide reliable secure instructions.
 
 2/ Automatize as much as possible:

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-01-20 19:54:16 UTC (rev 109)
+++ trunk/debian/changelog	2006-02-03 10:21:20 UTC (rev 110)
@@ -1,3 +1,14 @@
+sql-ledger (2.6.6-2) UNRELEASED; urgency=low
+
+  [ Raphael Hertzog ]
+  * Move all files below /usr/share/sql-ledger instead of /usr/lib/sql-ledger.
+    This is for better FHS conformance. Thus drop the imagepath patch.
+    Modified debian/patches/10makefiles.patch accordingly. Added a NEWS.Debian
+    to inform the admin of the change and put a compatibility symlink in the
+    mean time.
+
+ -- Raphael Hertzog <hertzog at debian.org>  Fri,  3 Feb 2006 09:54:15 +0000
+
 sql-ledger (2.6.6-1) unstable; urgency=low
 
   [ Raphael Hertzog ]

Modified: trunk/debian/dirs
===================================================================
--- trunk/debian/dirs	2006-01-20 19:54:16 UTC (rev 109)
+++ trunk/debian/dirs	2006-02-03 10:21:20 UTC (rev 110)
@@ -1,5 +1,3 @@
 etc/sql-ledger
-usr/lib/sql-ledger
-usr/sbin
 usr/share/sql-ledger
 var/lib/sql-ledger

Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2006-01-20 19:54:16 UTC (rev 109)
+++ trunk/debian/patches/00list	2006-02-03 10:21:20 UTC (rev 110)
@@ -2,5 +2,4 @@
 # List of patches to apply.
 #
 10makefiles
-40imagepath
 45crosslink

Modified: trunk/debian/patches/10makefiles.dpatch
===================================================================
--- trunk/debian/patches/10makefiles.dpatch	2006-01-20 19:54:16 UTC (rev 109)
+++ trunk/debian/patches/10makefiles.dpatch	2006-02-03 10:21:20 UTC (rev 110)
@@ -36,10 +36,10 @@
 +clean:
 +
 +install: 
-+	mkdir -p $(DESTDIR)/usr/lib/sql-ledger/bin
-+	cp -r $(SUBDIRS) $(DESTDIR)/usr/lib/sql-ledger/bin
++	mkdir -p $(DESTDIR)/usr/share/sql-ledger/bin
++	cp -r $(SUBDIRS) $(DESTDIR)/usr/share/sql-ledger/bin
 +
-+	cd $(DESTDIR)/usr/lib/sql-ledger ; \
++	cd $(DESTDIR)/usr/share/sql-ledger ; \
 +	for module in $(MODULES) ; do \
 +	  (cd bin/lynx ; ln -f ../mozilla/$$module) ;\
 +	done ;
@@ -71,8 +71,8 @@
 +clean:
 +
 +install: 
-+	mkdir -p $(DESTDIR)/usr/lib/sql-ledger/sql
-+	cp $(FILES) $(DESTDIR)/usr/lib/sql-ledger/sql
++	mkdir -p $(DESTDIR)/usr/share/sql-ledger/sql
++	cp $(FILES) $(DESTDIR)/usr/share/sql-ledger/sql
 --- sql-ledger-2.2.6.orig/templates/Makefile
 +++ sql-ledger-2.2.6/templates/Makefile
 @@ -0,0 +1,14 @@
@@ -88,7 +88,7 @@
 +	mkdir -p $(DESTDIR)/var/lib/sql-ledger/templates
 +	cp -a $(FILES) $(DESTDIR)/var/lib/sql-ledger/templates
 +	chown www-data:www-data $(DESTDIR)/var/lib/sql-ledger/templates
-+	ln -sf /var/lib/sql-ledger/templates $(DESTDIR)/usr/lib/sql-ledger/
++	ln -sf /var/lib/sql-ledger/templates $(DESTDIR)/usr/share/sql-ledger/
 +	
 --- sql-ledger-2.2.6.orig/css/Makefile
 +++ sql-ledger-2.2.6/css/Makefile
@@ -105,7 +105,7 @@
 +	mkdir -p $(DESTDIR)/var/lib/sql-ledger/css
 +	cp $(FILES) $(DESTDIR)/var/lib/sql-ledger/css
 +	chown -R www-data:www-data $(DESTDIR)/var/lib/sql-ledger/css
-+	ln -sf /var/lib/sql-ledger/css $(DESTDIR)/usr/lib/sql-ledger/
++	ln -sf /var/lib/sql-ledger/css $(DESTDIR)/usr/share/sql-ledger/
 --- sql-ledger-2.2.6.orig/users/Makefile
 +++ sql-ledger-2.2.6/users/Makefile
 @@ -0,0 +1,13 @@
@@ -121,7 +121,7 @@
 +	mkdir -p $(DESTDIR)/var/lib/sql-ledger/users
 +	cp -r $(FILES) $(DESTDIR)/var/lib/sql-ledger/users/
 +	chown www-data:www-data $(DESTDIR)/var/lib/sql-ledger/users
-+	ln -sf /var/lib/sql-ledger/users $(DESTDIR)/usr/lib/sql-ledger/
++	ln -sf /var/lib/sql-ledger/users $(DESTDIR)/usr/share/sql-ledger/
 --- sql-ledger-2.2.6.orig/SL/Makefile
 +++ sql-ledger-2.2.6/SL/Makefile
 @@ -0,0 +1,11 @@
@@ -134,8 +134,8 @@
 +clean:
 +
 +install:
-+	mkdir -p $(DESTDIR)/usr/lib/sql-ledger/SL
-+	cp -r $(FILES) $(DESTDIR)/usr/lib/sql-ledger/SL
++	mkdir -p $(DESTDIR)/usr/share/sql-ledger/SL
++	cp -r $(FILES) $(DESTDIR)/usr/share/sql-ledger/SL
 --- sql-ledger-2.2.6.orig/locale/Makefile
 +++ sql-ledger-2.2.6/locale/Makefile
 @@ -0,0 +1,43 @@
@@ -143,7 +143,7 @@
 +
 +LOCALES	= $(shell ls */LANGUAGE | cut -d/ -f1)
 +
-+localedir  = /usr/lib/sql-ledger/locale
++localedir  = /usr/share/sql-ledger/locale
 +dlocaledir = $(DESTDIR)$(localedir)
 +srctopdir := $(shell pwd)/..
 +
@@ -192,21 +192,21 @@
 +SUBDIRS = bin doc SL locale sql templates users css
 +
 +LIB_FILES = am.pl favicon.ico login.pl menu.ini setup.pl \
-+            sql-ledger.conf.default VERSION index.html
++            sql-ledger.conf.default VERSION index.html \
++            sql-ledger.png sql-ledger.gif
 +
-+SHR_FILES = sql-ledger.png sql-ledger.gif
 +
 +CFG_FILES = sql-ledger-httpd.conf sql-ledger.conf
 +
 +all:
 +
 +install: 
-+	mkdir -p $(DESTDIR)/usr/lib/sql-ledger
-+	cp  $(LIB_FILES) $(DESTDIR)/usr/lib/sql-ledger
 +	mkdir -p $(DESTDIR)/usr/share/sql-ledger
-+	cp $(SHR_FILES) $(DESTDIR)/usr/share/sql-ledger
++	cp  $(LIB_FILES) $(DESTDIR)/usr/share/sql-ledger
++	
++	
 +
-+	cd $(DESTDIR)/usr/lib/sql-ledger ; \
++	cd $(DESTDIR)/usr/share/sql-ledger ; \
 +	ln -f login.pl admin.pl ; \
 +	set -e ; for module in $(MODULES) ; do \
 +	  ln am.pl $$module ; \
@@ -224,11 +224,11 @@
 --- sql-ledger-2.2.6.orig/sql-ledger-httpd.conf
 +++ sql-ledger-2.2.6/sql-ledger-httpd.conf
 @@ -0,0 +1,8 @@
-+Alias /sql-ledger/images/ /usr/share/sql-ledger/
 +
-+Alias /sql-ledger/ /usr/lib/sql-ledger/
 +
-+<Directory /usr/lib/sql-ledger>
++Alias /sql-ledger/ /usr/share/sql-ledger/
++
++<Directory /usr/share/sql-ledger>
 +  AddHandler cgi-script .pl
 +  Options ExecCGI Includes FollowSymlinks
 +</Directory>

Deleted: trunk/debian/patches/40imagepath.dpatch
===================================================================
--- trunk/debian/patches/40imagepath.dpatch	2006-01-20 19:54:16 UTC (rev 109)
+++ trunk/debian/patches/40imagepath.dpatch	2006-02-03 10:21:20 UTC (rev 110)
@@ -1,69 +0,0 @@
-#! /bin/sh -e
-## 40imagepath.dpatch by Petter Reinholdtsen <pere at hungry.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-##
-## DP: Correct path to logo and images
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-       -patch)   ( patch $patch_opts -p1 ) < $0 ;;
-       -unpatch) ( patch $patch_opts -p1 -R ) < $0 ;;
-        *)
-                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-                exit 1;;
-esac
-
-exit 0
- at DPATCH@
-diff -ur sql-ledger/bin/mozilla/am.pl BUILD/sql-ledger/bin/mozilla/am.pl
---- sql-ledger/bin/mozilla/am.pl        2005-12-02 21:37:33.000000000 -0600
-+++ BUILD/sql-ledger/bin/mozilla/am.pl  2005-12-02 21:47:18.000000000 -0600
-@@ -2523,7 +2523,7 @@
-
- </pre>
- <center>
--<a href="http://www.sql-ledger.org" target=_top><img src=sql-ledger.gif border=0>&trade;</a>
-+<a href="http://www.sql-ledger.org" target=_top><img src="images/sql-ledger.png" border=0></a>
- <h1 class=login>|.$locale->text('Version').qq| $form->{version}</h1>
-
- <p>
-diff -ur sql-ledger/bin/mozilla/admin.pl BUILD/sql-ledger/bin/mozilla/admin.pl
---- sql-ledger/bin/mozilla/admin.pl     2005-12-02 21:37:50.000000000 -0600
-+++ BUILD/sql-ledger/bin/mozilla/admin.pl       2005-12-02 21:49:27.000000000 -0600
-@@ -102,7 +102,7 @@
-
- <div align=center>
-
--<a href="http://www.sql-ledger.org"><img src=sql-ledger.gif border=0>&trade;</a>
-+<a href="http://www.sql-ledger.org"><img src="images/sql-ledger.png" border=0>&trade;</a>
- <h1 class=login>|.$locale->text('Version').qq| $form->{version}<p>|.$locale->text('Administration').qq|</h1>
-
- <form method=post action="$form->{script}" name=admin>
-diff -ur sql-ledger/bin/mozilla/login.pl BUILD/sql-ledger/bin/mozilla/login.pl
---- sql-ledger-2.4.5/bin/mozilla/login.pl	Fri Nov  5 05:15:38 2004
-+++ sql-ledger/bin/mozilla/login.pl	Sat Nov 27 21:24:48 2004
-@@ -109,7 +109,7 @@
- <center>
- <table class=login border=3 cellpadding=20>
-   <tr>
--    <td class=login align=center><a href="http://www.sql-ledger.org" target=_top><img src=sql-ledger.gif border=0>&trade;</a>
-+    <td class="login" align="center"><a href="http://www.sql-ledger.org" target=_top><img src="images/sql-ledger.png" border="0">&trade;</a>
- <h1 class=login align=center>|.$locale->text('Version').qq| $form->{version}
- </h1>
- 
-@@ -170,7 +170,7 @@
- <center>
- <table class=login border=3 cellpadding=20>
-   <tr>
--    <td class=login align=center><a href="http://www.sql-ledger.org" target=_top><img src=sql-ledger.gif border=0>&trade;</a>
-+    <td class="login" align="center"><a href="http://www.sql-ledger.org" target=_top><img src="images/sql-ledger.png" border="0">&trade;</a>
- <h1 class=login align=center>|.$locale->text('Version').qq| $form->{version}
- </h1>
- 

Modified: trunk/debian/postinst
===================================================================
--- trunk/debian/postinst	2006-01-20 19:54:16 UTC (rev 109)
+++ trunk/debian/postinst	2006-02-03 10:21:20 UTC (rev 110)
@@ -6,6 +6,11 @@
   chown -R www-data:www-data css
 )
 
+if ! test -L /usr/lib/sql-ledger; then
+    # Work around dpkg bug (can't replace dir by symlink itself)
+    (rmdir /usr/lib/sql-ledger && ln -sf /usr/share/sql-ledger /usr/lib/sql-ledger) || \
+    echo "WARNING: Unable to replace /usr/lib/sql-ledger by a symlink"
+fi
 
 #
 # Activate SQL-Ledger in apache configuration.  Small helper script

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2006-01-20 19:54:16 UTC (rev 109)
+++ trunk/debian/rules	2006-02-03 10:21:20 UTC (rev 110)
@@ -55,14 +55,14 @@
 	dh_testdir
 	dh_testroot
 #	dh_installdebconf	
-	dh_installdocs
+	dh_installdocs debian/NEWS.Debian
 	dh_installexamples
 	dh_installmenu
 	dh_installcron
 	dh_installman
 	dh_installinfo
 	dh_installchangelogs 
-	dh_link
+	dh_link /usr/share/sql-ledger /usr/lib/sql-ledger
 	dh_strip
 	dh_compress
 	dh_fixperms

More information about the Pkg-sql-ledger-commit mailing list