[Pkg-sql-ledger-commit] r183 - in trunk/debian: . patches
pkg-sql-ledger-commit-owner at lists.alioth.debian.org
pkg-sql-ledger-commit-owner at lists.alioth.debian.org
Sun Jun 15 12:34:23 UTC 2008
Author: hertzog
Date: 2008-06-15 12:34:22 +0000 (Sun, 15 Jun 2008)
New Revision: 183
Added:
trunk/debian/README.source
trunk/debian/patches/10makefiles
trunk/debian/patches/45crosslink
trunk/debian/patches/series
trunk/debian/sql-ledger.links
Removed:
trunk/debian/patches/00list
trunk/debian/patches/05improve-sec-check.dpatch
trunk/debian/patches/10makefiles.dpatch
trunk/debian/patches/45crosslink.dpatch
Modified:
trunk/debian/changelog
trunk/debian/compat
trunk/debian/control
trunk/debian/rules
Log:
* New upstream release.
* Invoice printing now works with perl 5.10. Closes: #484455
* Use dh_lintian to install lintian overrides. Build-depend on
debhelper (>= 6.0.7) for this.
* Switch to quilt to manage patches. Ajust build-dependency and
debian/rules and debian/patches/* accordingly.
* Drop patch 05improve-sec-check which is merged upstream.
* Refresh all remaining patches.
* Switch to debhelper 7 and its associated rules file minimization.
Added: trunk/debian/README.source
===================================================================
--- trunk/debian/README.source (rev 0)
+++ trunk/debian/README.source 2008-06-15 12:34:22 UTC (rev 183)
@@ -0,0 +1,2 @@
+Please read /usr/share/doc/quilt/README.source to know how to apply
+and manage Debian specific patches on this package.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-05-27 01:34:56 UTC (rev 182)
+++ trunk/debian/changelog 2008-06-15 12:34:22 UTC (rev 183)
@@ -1,3 +1,17 @@
+sql-ledger (2.8.15-1) unstable; urgency=low
+
+ * New upstream release.
+ * Invoice printing now works with perl 5.10. Closes: #484455
+ * Use dh_lintian to install lintian overrides. Build-depend on
+ debhelper (>= 6.0.7) for this.
+ * Switch to quilt to manage patches. Ajust build-dependency and
+ debian/rules and debian/patches/* accordingly.
+ * Drop patch 05improve-sec-check which is merged upstream.
+ * Refresh all remaining patches.
+ * Switch to debhelper 7 and its associated rules file minimization.
+
+ -- Raphael Hertzog <hertzog at debian.org> Sun, 15 Jun 2008 12:04:31 +0200
+
sql-ledger (2.8.14-2) unstable; urgency=low
* Remove Finn-Arne Johansen from Maintainer field (on his request)
Modified: trunk/debian/compat
===================================================================
--- trunk/debian/compat 2008-05-27 01:34:56 UTC (rev 182)
+++ trunk/debian/compat 2008-06-15 12:34:22 UTC (rev 183)
@@ -1 +1 @@
-5
+7
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2008-05-27 01:34:56 UTC (rev 182)
+++ trunk/debian/control 2008-06-15 12:34:22 UTC (rev 183)
@@ -3,11 +3,11 @@
Priority: optional
Maintainer: Raphael Hertzog <hertzog at debian.org>
Uploaders: Petter Reinholdtsen <pere at debian.org>, Gerardo Reynoso <greynoso at tindes.com>
-Build-Depends: debhelper (>= 5), dpatch
+Build-Depends: debhelper (>= 7), quilt
Homepage: http://www.sql-ledger.com
Vcs-Svn: svn://svn.debian.org/pkg-sql-ledger/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-sql-ledger/trunk/?op=log
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
Package: sql-ledger
Architecture: all
Deleted: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list 2008-05-27 01:34:56 UTC (rev 182)
+++ trunk/debian/patches/00list 2008-06-15 12:34:22 UTC (rev 183)
@@ -1,6 +0,0 @@
-#
-# List of patches to apply.
-#
-05improve-sec-check
-10makefiles
-45crosslink
Deleted: trunk/debian/patches/05improve-sec-check.dpatch
===================================================================
--- trunk/debian/patches/05improve-sec-check.dpatch 2008-05-27 01:34:56 UTC (rev 182)
+++ trunk/debian/patches/05improve-sec-check.dpatch 2008-06-15 12:34:22 UTC (rev 183)
@@ -1,33 +0,0 @@
-#! /bin/sh -e
-## All lines beginning with `## DP:' are a description of the patch.
-##
-## DP: Improve security check (temporary patch, already merged upstream)
-
-[ -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 -p0 ) < $0 ;;
- -unpatch) ( patch $patch_opts -p0 -R ) < $0 ;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
- at DPATCH@
---- login.pl 2006-11-24 23:11:23.000000000 +0100
-+++ login.pl.new 2006-11-27 08:27:20.000000000 +0100
-@@ -71,7 +71,7 @@
-
- @scripts = qw(login.pl admin.pl custom_login.pl custom_admin.pl);
-
--if (grep !/$form{script}/, @scripts) {
-+if (grep !/^\Q$form{script}\E/, @scripts) {
- print "Content-Type: text/html\n\n" if $ENV{HTTP_USER_AGENT};
- print "\nAccess denied!\n";
- exit;
Copied: trunk/debian/patches/10makefiles (from rev 182, trunk/debian/patches/10makefiles.dpatch)
===================================================================
--- trunk/debian/patches/10makefiles (rev 0)
+++ trunk/debian/patches/10makefiles 2008-06-15 12:34:22 UTC (rev 183)
@@ -0,0 +1,214 @@
+Description: Add some makefiles to be able to copy the required files
+ in place without using the too invasive setup.pl.
+Forwarded-Upstream: not yet tried
+
+--- /dev/null
++++ sql-ledger-2.8.15/bin/Makefile
+@@ -0,0 +1,18 @@
++PACKAGE = sql-ledger
++
++# Assumption: only the menu/login/admin.pl differs between each directory
++MODULES = $(shell find mozilla/ -name '*.pl' | sed -e 's|mozilla/||' | grep -v menu.pl | grep -v login.pl | grep -v admin.pl)
++SUBDIRS = lynx mozilla
++
++all:
++
++clean:
++
++install:
++ mkdir -p $(DESTDIR)/usr/share/sql-ledger/bin
++ cp -r $(SUBDIRS) $(DESTDIR)/usr/share/sql-ledger/bin
++
++ cd $(DESTDIR)/usr/share/sql-ledger ; \
++ for module in $(MODULES) ; do \
++ (cd bin/lynx ; ln -f ../mozilla/$$module) ;\
++ done ;
+--- /dev/null
++++ sql-ledger-2.8.15/doc/Makefile
+@@ -0,0 +1,13 @@
++PACKAGE = sql-ledger
++
++FILES = $(shell ls * | grep -v Makefile | grep -v COPYING | grep -v COPYRIGHT)
++
++all:
++
++clean:
++
++install:
++ mkdir -p $(DESTDIR)/usr/share/doc/sql-ledger
++ cp -a $(FILES) $(DESTDIR)/usr/share/doc/sql-ledger
++
++#for ALL in locale/*/COPYING ; do HEAD=$(grep -n "# This program is free software" $ALL |cut -f1 -d:); let HEAD=$HEAD-1; head -$HEAD $ALL | tail +4 ; done | grep -v "^#$"
+--- /dev/null
++++ sql-ledger-2.8.15/sql/Makefile
+@@ -0,0 +1,11 @@
++PACKAGE = sql-ledger
++
++FILES = *.sql
++
++all:
++
++clean:
++
++install:
++ mkdir -p $(DESTDIR)/usr/share/sql-ledger/sql
++ cp $(FILES) $(DESTDIR)/usr/share/sql-ledger/sql
+--- /dev/null
++++ sql-ledger-2.8.15/templates/Makefile
+@@ -0,0 +1,14 @@
++PACKAGE = sql-ledger
++
++FILES = *.html *.tex *.txt *.eps *.png
++
++all:
++
++clean:
++
++install:
++ 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/share/sql-ledger/
++
+--- /dev/null
++++ sql-ledger-2.8.15/css/Makefile
+@@ -0,0 +1,13 @@
++PACKAGE = sql-ledger
++
++FILES = $(shell ls sql-ledger*.css)
++
++all:
++
++clean:
++
++install:
++ 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/share/sql-ledger/
+--- /dev/null
++++ sql-ledger-2.8.15/users/Makefile
+@@ -0,0 +1,13 @@
++PACKAGE = sql-ledger
++
++FILES = sql-ledger.eps sql-ledger.png
++
++all:
++
++clean:
++
++install:
++ 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/share/sql-ledger/
+--- /dev/null
++++ sql-ledger-2.8.15/SL/Makefile
+@@ -0,0 +1,11 @@
++PACKAGE = sql-ledger
++
++FILES := $(shell ls *.pm)
++
++all:
++
++clean:
++
++install:
++ mkdir -p $(DESTDIR)/usr/share/sql-ledger/SL
++ cp -r $(FILES) $(DESTDIR)/usr/share/sql-ledger/SL
+--- /dev/null
++++ sql-ledger-2.8.15/locale/Makefile
+@@ -0,0 +1,43 @@
++PACKAGE = sql-ledger
++
++LOCALES = $(shell ls */LANGUAGE | cut -d/ -f1)
++
++localedir = /usr/share/sql-ledger/locale
++dlocaledir = $(DESTDIR)$(localedir)
++srctopdir := $(shell pwd)/..
++
++all:
++
++clean:
++
++install:
++ mkdir -p $(dlocaledir)
++ set -e ; \
++ for lang in $(LOCALES) ; do \
++ mkdir -p $(dlocaledir)/$$lang ; \
++ for file in `find $$lang/. -type f | grep -v COPYING`; do \
++ if [ -f $$file ] ; then \
++ cp $$file $(dlocaledir)/$$lang/. ; \
++ fi ; \
++ done ; \
++ if [ -h $$lang/Num2text ] ; then \
++ ln -sf ../es/Num2text $(dlocaledir)/$$lang/Num2text ; \
++ elif [ -h $$lang/Num2text ] ; then \
++ cp $$lang/Num2text $(dlocaledir)/$$lang/. ; \
++ fi ; \
++ done
++
++ cp de/locales.pl $(dlocaledir)/de
++ set -e ; for lang in $(LOCALES) ; do \
++ if [ -d $(dlocaledir)/$$lang -a \
++ -f $(dlocaledir)/$$lang/LANGUAGE -a \
++ ! -f $(dlocaledir)/$$lang/locales.pl ] ; then \
++ ln -sf ../de/locales.pl $(dlocaledir)/$$lang/locales.pl ;\
++ fi ; \
++ done
++
++ set -e ; for lang in $(LOCALES) ; do \
++ (cd $(dlocaledir)/$$lang && \
++ perl -I $(srctopdir) ./locales.pl || exit 1) ; \
++ done
++
+--- /dev/null
++++ sql-ledger-2.8.15/Makefile
+@@ -0,0 +1,36 @@
++PACKAGE = sql-ledger
++
++# Assumption: all .pl except am/login/admin/setup are modules
++MODULES = $(shell ls *.pl | grep -v -E '(am|login|admin|setup)\.pl')
++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 \
++ images
++
++
++CFG_FILES = sql-ledger-httpd.conf sql-ledger.conf
++
++all:
++
++install:
++ mkdir -p $(DESTDIR)/usr/share/sql-ledger
++ cp -a $(LIB_FILES) $(DESTDIR)/usr/share/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 ; \
++ done ; \
++ ln -sf /etc/sql-ledger/sql-ledger.conf
++
++ set -e ; for subdir in $(SUBDIRS) ; do \
++ $(MAKE) -C $$subdir $@ ; \
++ done
++
++ mkdir -p $(DESTDIR)/etc/sql-ledger
++ cp $(CFG_FILES) $(DESTDIR)/etc/sql-ledger
++
++clean:
+--- /dev/null
++++ sql-ledger-2.8.15/sql-ledger-httpd.conf
+@@ -0,0 +1,8 @@
++
++
++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/10makefiles.dpatch
===================================================================
--- trunk/debian/patches/10makefiles.dpatch 2008-05-27 01:34:56 UTC (rev 182)
+++ trunk/debian/patches/10makefiles.dpatch 2008-06-15 12:34:22 UTC (rev 183)
@@ -1,234 +0,0 @@
-#! /bin/sh -e
-## 10makefiles.dpatch by Petter Reinholdtsen <pere at hungry.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-##
-## DP: Build/install rules for sql-ledger
-
-[ -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@
---- sql-ledger-2.2.6.orig/bin/Makefile
-+++ sql-ledger-2.2.6/bin/Makefile
-@@ -0,0 +1,18 @@
-+PACKAGE = sql-ledger
-+
-+# Assumption: only the menu/login/admin.pl differs between each directory
-+MODULES = $(shell find mozilla/ -name '*.pl' | sed -e 's|mozilla/||' | grep -v menu.pl | grep -v login.pl | grep -v admin.pl)
-+SUBDIRS = lynx mozilla
-+
-+all:
-+
-+clean:
-+
-+install:
-+ mkdir -p $(DESTDIR)/usr/share/sql-ledger/bin
-+ cp -r $(SUBDIRS) $(DESTDIR)/usr/share/sql-ledger/bin
-+
-+ cd $(DESTDIR)/usr/share/sql-ledger ; \
-+ for module in $(MODULES) ; do \
-+ (cd bin/lynx ; ln -f ../mozilla/$$module) ;\
-+ done ;
---- sql-ledger-2.2.6.orig/doc/Makefile
-+++ sql-ledger-2.2.6/doc/Makefile
-@@ -0,0 +1,13 @@
-+PACKAGE = sql-ledger
-+
-+FILES = $(shell ls * | grep -v Makefile | grep -v COPYING | grep -v COPYRIGHT)
-+
-+all:
-+
-+clean:
-+
-+install:
-+ mkdir -p $(DESTDIR)/usr/share/doc/sql-ledger
-+ cp -a $(FILES) $(DESTDIR)/usr/share/doc/sql-ledger
-+
-+#for ALL in locale/*/COPYING ; do HEAD=$(grep -n "# This program is free software" $ALL |cut -f1 -d:); let HEAD=$HEAD-1; head -$HEAD $ALL | tail +4 ; done | grep -v "^#$"
---- sql-ledger-2.2.6.orig/sql/Makefile
-+++ sql-ledger-2.2.6/sql/Makefile
-@@ -0,0 +1,11 @@
-+PACKAGE = sql-ledger
-+
-+FILES = *.sql
-+
-+all:
-+
-+clean:
-+
-+install:
-+ 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 @@
-+PACKAGE = sql-ledger
-+
-+FILES = *.html *.tex *.txt *.eps *.png
-+
-+all:
-+
-+clean:
-+
-+install:
-+ 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/share/sql-ledger/
-+
---- sql-ledger-2.2.6.orig/css/Makefile
-+++ sql-ledger-2.2.6/css/Makefile
-@@ -0,0 +1,13 @@
-+PACKAGE = sql-ledger
-+
-+FILES = $(shell ls sql-ledger*.css)
-+
-+all:
-+
-+clean:
-+
-+install:
-+ 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/share/sql-ledger/
---- sql-ledger-2.2.6.orig/users/Makefile
-+++ sql-ledger-2.2.6/users/Makefile
-@@ -0,0 +1,13 @@
-+PACKAGE = sql-ledger
-+
-+FILES = sql-ledger.eps sql-ledger.png
-+
-+all:
-+
-+clean:
-+
-+install:
-+ 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/share/sql-ledger/
---- sql-ledger-2.2.6.orig/SL/Makefile
-+++ sql-ledger-2.2.6/SL/Makefile
-@@ -0,0 +1,11 @@
-+PACKAGE = sql-ledger
-+
-+FILES := $(shell ls *.pm)
-+
-+all:
-+
-+clean:
-+
-+install:
-+ 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 @@
-+PACKAGE = sql-ledger
-+
-+LOCALES = $(shell ls */LANGUAGE | cut -d/ -f1)
-+
-+localedir = /usr/share/sql-ledger/locale
-+dlocaledir = $(DESTDIR)$(localedir)
-+srctopdir := $(shell pwd)/..
-+
-+all:
-+
-+clean:
-+
-+install:
-+ mkdir -p $(dlocaledir)
-+ set -e ; \
-+ for lang in $(LOCALES) ; do \
-+ mkdir -p $(dlocaledir)/$$lang ; \
-+ for file in `find $$lang/. -type f | grep -v COPYING`; do \
-+ if [ -f $$file ] ; then \
-+ cp $$file $(dlocaledir)/$$lang/. ; \
-+ fi ; \
-+ done ; \
-+ if [ -h $$lang/Num2text ] ; then \
-+ ln -sf ../es/Num2text $(dlocaledir)/$$lang/Num2text ; \
-+ elif [ -h $$lang/Num2text ] ; then \
-+ cp $$lang/Num2text $(dlocaledir)/$$lang/. ; \
-+ fi ; \
-+ done
-+
-+ cp de/locales.pl $(dlocaledir)/de
-+ set -e ; for lang in $(LOCALES) ; do \
-+ if [ -d $(dlocaledir)/$$lang -a \
-+ -f $(dlocaledir)/$$lang/LANGUAGE -a \
-+ ! -f $(dlocaledir)/$$lang/locales.pl ] ; then \
-+ ln -sf ../de/locales.pl $(dlocaledir)/$$lang/locales.pl ;\
-+ fi ; \
-+ done
-+
-+ set -e ; for lang in $(LOCALES) ; do \
-+ (cd $(dlocaledir)/$$lang && \
-+ perl -I $(srctopdir) ./locales.pl || exit 1) ; \
-+ done
-+
---- sql-ledger-2.2.6.orig/Makefile
-+++ sql-ledger-2.2.6/Makefile
-@@ -0,0 +1,36 @@
-+PACKAGE = sql-ledger
-+
-+# Assumption: all .pl except am/login/admin/setup are modules
-+MODULES = $(shell ls *.pl | grep -v -E '(am|login|admin|setup)\.pl')
-+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 \
-+ images
-+
-+
-+CFG_FILES = sql-ledger-httpd.conf sql-ledger.conf
-+
-+all:
-+
-+install:
-+ mkdir -p $(DESTDIR)/usr/share/sql-ledger
-+ cp -a $(LIB_FILES) $(DESTDIR)/usr/share/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 ; \
-+ done ; \
-+ ln -sf /etc/sql-ledger/sql-ledger.conf
-+
-+ set -e ; for subdir in $(SUBDIRS) ; do \
-+ $(MAKE) -C $$subdir $@ ; \
-+ done
-+
-+ mkdir -p $(DESTDIR)/etc/sql-ledger
-+ cp $(CFG_FILES) $(DESTDIR)/etc/sql-ledger
-+
-+clean:
---- 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/ /usr/share/sql-ledger/
-+
-+<Directory /usr/share/sql-ledger>
-+ AddHandler cgi-script .pl
-+ Options ExecCGI Includes FollowSymlinks
-+</Directory>
Copied: trunk/debian/patches/45crosslink (from rev 182, trunk/debian/patches/45crosslink.dpatch)
===================================================================
--- trunk/debian/patches/45crosslink (rev 0)
+++ trunk/debian/patches/45crosslink 2008-06-15 12:34:22 UTC (rev 183)
@@ -0,0 +1,25 @@
+Description: Add links between the normal login page and the admin login
+ page.
+Forwarded-Upsteam: tried on 2004-08-07 but Dieter refused as he prefers to
+ "hide" the admin login page from users.
+
+--- sql-ledger-2.8.15.orig/bin/mozilla/admin.pl
++++ sql-ledger-2.8.15/bin/mozilla/admin.pl
+@@ -104,6 +104,7 @@ function sf(){
+ <input type=hidden name=action value=login>
+ <input type=hidden name=path value=$form->{path}>
+ </table>
++<p><a href="login.pl">Normal login</a></p>
+
+ </form>
+
+--- sql-ledger-2.8.15.orig/bin/mozilla/login.pl
++++ sql-ledger-2.8.15/bin/mozilla/login.pl
+@@ -130,6 +130,7 @@ $sf
+ </td>
+ </tr>
+ </table>
++<p><a href="admin.pl">Administration login</a></p>
+
+ </body>
+ </html>
Deleted: trunk/debian/patches/45crosslink.dpatch
===================================================================
--- trunk/debian/patches/45crosslink.dpatch 2008-05-27 01:34:56 UTC (rev 182)
+++ trunk/debian/patches/45crosslink.dpatch 2008-06-15 12:34:22 UTC (rev 183)
@@ -1,48 +0,0 @@
-#! /bin/sh -e
-## 45crosslink.dpatch by Petter Reinholdtsen <pere at hungry.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-##
-## DP: Add links between admin and normal login pages.
-## DP: Sent upstream 2004-08-07.
-
-[ -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/admin.pl BUILD/sql-ledger/bin/mozilla/admin.pl
---- sql-ledger/bin/mozilla/admin.pl Tue Nov 23 22:56:46 2004
-+++ BUILD/sql-ledger/bin/mozilla/admin.pl Sun Nov 28 00:10:24 2004
-@@ -118,6 +118,7 @@
- <input type=hidden name=action value=login>
- <input type=hidden name=path value=$form->{path}>
- </table>
-+<p><a href="login.pl">Normal login</a></p>
-
- </form>
-
-Only in BUILD/sql-ledger/bin/mozilla: admin.pl~
-diff -ur sql-ledger/bin/mozilla/login.pl BUILD/sql-ledger/bin/mozilla/login.pl
---- sql-ledger/bin/mozilla/login.pl Fri Nov 5 05:15:38 2004
-+++ BUILD/sql-ledger/bin/mozilla/login.pl Sun Nov 28 00:11:45 2004
-@@ -143,6 +143,7 @@
- </td>
- </tr>
- </table>
-+<p><a href="admin.pl">Administration login</a></p>
-
- </body>
- </html>
Copied: trunk/debian/patches/series (from rev 182, trunk/debian/patches/00list)
===================================================================
--- trunk/debian/patches/series (rev 0)
+++ trunk/debian/patches/series 2008-06-15 12:34:22 UTC (rev 183)
@@ -0,0 +1,3 @@
+# List of patches to apply.
+10makefiles
+45crosslink
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2008-05-27 01:34:56 UTC (rev 182)
+++ trunk/debian/rules 2008-06-15 12:34:22 UTC (rev 183)
@@ -1,95 +1,29 @@
#!/usr/bin/make -f
-# GNU copyright 2004 by Petter Reinholdtsen
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
-DESTDIR = $(CURDIR)/debian/sql-ledger
+build: patch
+ dh build
-INSTALL = install
-
-configure: configure-stamp
-configure-stamp: patch-stamp
- dh_testdir
- # Add here commands to configure the package.
-
- touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE)
-
- touch build-stamp
-
clean: unpatch
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- # Add here commands to clean up after the build process.
- #-$(MAKE) clean
+ dh clean
rm -f sql-ledger.conf
- dh_clean
-
install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- 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/
- cp debian/sql-ledger.lintian-overrides $(DESTDIR)/usr/share/lintian/overrides/sql-ledger
+ dh install
-
# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir
- dh_testroot
-# dh_installdebconf
- dh_installdocs
- dh_installexamples
- dh_installmenu
- dh_installcron
- dh_installman
- dh_installinfo
- dh_installchangelogs
- dh_link /usr/share/sql-ledger /usr/lib/sql-ledger
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_perl
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+binary-indep: install
+ dh binary-indep
# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do by default.
+binary-arch: install
+ dh binary-arch
binary: binary-indep binary-arch
-# Generate new copyright file with the copyright info for each
-# translation as well as the package itself.
-debian/copyright: unpack patch-stamp
- cat debian/copyright.pre > debian/copyright
- set -e ; \
- for file in locale/*/COPYING ; do \
- HEAD=$$(grep -n '# This program is free software' $$file |cut -f1 -d:); \
- HEAD=`expr $$HEAD - 1`; \
- head -$$HEAD $$file | tail +4 ; \
- done | grep -v '^#$$' | sed -e 's/^#[ ]//' >> debian/copyright
- cat debian/copyright.post >> debian/copyright
-
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install
Added: trunk/debian/sql-ledger.links
===================================================================
--- trunk/debian/sql-ledger.links (rev 0)
+++ trunk/debian/sql-ledger.links 2008-06-15 12:34:22 UTC (rev 183)
@@ -0,0 +1 @@
+usr/share/sql-ledger usr/lib/sql-ledger
More information about the Pkg-sql-ledger-commit
mailing list