[Pkg-sql-ledger-commit] r480 - in trunk/debian: . patches
pkg-sql-ledger-commit-owner at lists.alioth.debian.org
pkg-sql-ledger-commit-owner at lists.alioth.debian.org
Tue Apr 3 16:42:07 UTC 2012
Author: hertzog
Date: 2012-04-03 16:42:07 +0000 (Tue, 03 Apr 2012)
New Revision: 480
Added:
trunk/debian/sql-ledger-httpd.conf
trunk/debian/sql-ledger.docs
trunk/debian/sql-ledger.install
Removed:
trunk/debian/patches/10makefiles
trunk/debian/sql-ledger.lintian-overrides
Modified:
trunk/debian/changelog
trunk/debian/create_utf8_locales.sh
trunk/debian/patches/series
trunk/debian/rules
trunk/debian/sql-ledger.links
Log:
Use debian/rules and debhelper to install everything instead of
patched-in makefile. Thus drop debian/patches/10makefiles.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2012-04-03 14:32:51 UTC (rev 479)
+++ trunk/debian/changelog 2012-04-03 16:42:07 UTC (rev 480)
@@ -4,6 +4,8 @@
* Updated Standards-Version to 3.9.3.
* Add a note in debian/NEWS explaining that upgrading requires manual
work.
+ * Use debian/rules and debhelper to install everything instead of
+ patched-in makefile. Thus drop debian/patches/10makefiles.
-- Raphaël Hertzog <hertzog at debian.org> Tue, 03 Apr 2012 15:33:16 +0200
Modified: trunk/debian/create_utf8_locales.sh
===================================================================
--- trunk/debian/create_utf8_locales.sh 2012-04-03 14:32:51 UTC (rev 479)
+++ trunk/debian/create_utf8_locales.sh 2012-04-03 16:42:07 UTC (rev 480)
@@ -17,6 +17,7 @@
# Copy the directory over, and then convert it
rm -rf "${locale}_utf"
cp -a $locale "${locale}_utf"
+ echo "${locale}_utf" >>generated
orig_charset=$(perl -ne "print \$1 if (/\((.*)\)/);" $locale/LANGUAGE)
if [ -z "$orig_charset" ]; then
echo "Warning: $locale/LANGUAGE doesn't specify charset, assume ISO-8859-1" >&2
Deleted: trunk/debian/patches/10makefiles
===================================================================
--- trunk/debian/patches/10makefiles 2012-04-03 14:32:51 UTC (rev 479)
+++ trunk/debian/patches/10makefiles 2012-04-03 16:42:07 UTC (rev 480)
@@ -1,214 +0,0 @@
-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>
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2012-04-03 14:32:51 UTC (rev 479)
+++ trunk/debian/patches/series 2012-04-03 16:42:07 UTC (rev 480)
@@ -1,3 +1,2 @@
# List of patches to apply.
-10makefiles
45crosslink
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2012-04-03 14:32:51 UTC (rev 479)
+++ trunk/debian/rules 2012-04-03 16:42:07 UTC (rev 480)
@@ -3,14 +3,31 @@
%:
dh $@
-override_dh_auto_clean:
- dh_auto_clean
- rm -f sql-ledger.conf
-
-override_dh_auto_install:
+override_dh_auto_build:
+ # Generate default configuration file
sed -e 's|^\$$userspath = .*$$|$$userspath = "/var/lib/sql-ledger/users";|' \
-e 's|^\$$memberfile = .*$$|$$memberfile = "/var/lib/sql-ledger/users/members";|' \
+ -e 's|^#$$latex = .*$$|$$latex = 1;|' \
sql-ledger.conf.default > sql-ledger.conf
+ # Build missing UTF-8 locale files
cd locale && sh ../debian/create_utf8_locales.sh
- dh_auto_install
+override_dh_auto_clean:
+ rm -f sql-ledger.conf
+ if [ -e locale/generated ]; then \
+ cd locale; \
+ rm -f $(cat locale/generated 2>/dev/null); \
+ fi
+
+override_dh_auto_install:
+ # No build system
+
+override_dh_install:
+ dh_install
+ # Drop unwanted license files
+ find debian/sql-ledger/usr/share/sql-ledger -name COPYING -print0 | xargs -0 rm -f
+
+override_dh_fixperms:
+ dh_fixperms
+ # Ensure webserver has the right on various files that must be editable
+ chown -R www-data:www-data debian/sql-ledger/var/lib/sql-ledger/*
Added: trunk/debian/sql-ledger-httpd.conf
===================================================================
--- trunk/debian/sql-ledger-httpd.conf (rev 0)
+++ trunk/debian/sql-ledger-httpd.conf 2012-04-03 16:42:07 UTC (rev 480)
@@ -0,0 +1,10 @@
+# Include this file in the virtual host where you want to enable
+# SQL-Ledger with an Apache directive like this one:
+# Include /etc/sql-ledger/sql-ledger-httpd.conf
+
+Alias /sql-ledger/ /usr/share/sql-ledger/
+
+<Directory /usr/share/sql-ledger>
+ AddHandler cgi-script .pl
+ Options ExecCGI Includes FollowSymlinks
+</Directory>
Added: trunk/debian/sql-ledger.docs
===================================================================
--- trunk/debian/sql-ledger.docs (rev 0)
+++ trunk/debian/sql-ledger.docs 2012-04-03 16:42:07 UTC (rev 480)
@@ -0,0 +1,3 @@
+doc/faq.html
+doc/README
+doc/UPGRADE
Added: trunk/debian/sql-ledger.install
===================================================================
--- trunk/debian/sql-ledger.install (rev 0)
+++ trunk/debian/sql-ledger.install 2012-04-03 16:42:07 UTC (rev 480)
@@ -0,0 +1,20 @@
+# Standard sql-ledger files
+sql-ledger.conf.default usr/share/sql-ledger/
+*.pl usr/share/sql-ledger/
+*.html usr/share/sql-ledger/
+*.ini usr/share/sql-ledger/
+*.ico usr/share/sql-ledger/
+VERSION usr/share/sql-ledger/
+bin usr/share/sql-ledger/
+SL usr/share/sql-ledger/
+sql usr/share/sql-ledger/
+images usr/share/sql-ledger/
+locale usr/share/sql-ledger/
+# Directories offloaded to /var/lib/sql-ledger and writable by www-data
+templates var/lib/sql-ledger/
+users var/lib/sql-ledger/
+spool var/lib/sql-ledger/
+css var/lib/sql-ledger/
+# Configuration files
+*.conf etc/sql-ledger/
+debian/sql-ledger-httpd.conf etc/sql-ledger/
Modified: trunk/debian/sql-ledger.links
===================================================================
--- trunk/debian/sql-ledger.links 2012-04-03 14:32:51 UTC (rev 479)
+++ trunk/debian/sql-ledger.links 2012-04-03 16:42:07 UTC (rev 480)
@@ -1 +1,6 @@
+etc/sql-ledger/sql-ledger.conf usr/share/sql-ledger/sql-ledger.conf
usr/share/sql-ledger usr/lib/sql-ledger
+var/lib/sql-ledger/templates usr/share/sql-ledger/templates
+var/lib/sql-ledger/spool usr/share/sql-ledger/spool
+var/lib/sql-ledger/users usr/share/sql-ledger/users
+var/lib/sql-ledger/css usr/share/sql-ledger/css
Deleted: trunk/debian/sql-ledger.lintian-overrides
===================================================================
--- trunk/debian/sql-ledger.lintian-overrides 2012-04-03 14:32:51 UTC (rev 479)
+++ trunk/debian/sql-ledger.lintian-overrides 2012-04-03 16:42:07 UTC (rev 480)
@@ -1,4 +0,0 @@
-# Lintian bug #348978
-# IMHO Hardlinks inside /usr/{lib,share}/<package> are not a problem
-sql-ledger binary: package-contains-hardlink
-
More information about the Pkg-sql-ledger-commit
mailing list