[Pkg-sql-ledger-commit] r268 - in ledger-smb/trunk/debian: . patches
pkg-sql-ledger-commit-owner at lists.alioth.debian.org
pkg-sql-ledger-commit-owner at lists.alioth.debian.org
Tue Oct 4 22:08:53 UTC 2011
Author: jame-guest
Date: 2011-10-04 22:08:52 +0000 (Tue, 04 Oct 2011)
New Revision: 268
Added:
ledger-smb/trunk/debian/patches/05_confdir.patch
ledger-smb/trunk/debian/patches/10_makify.patch
ledger-smb/trunk/debian/patches/15_httpdconf.patch
ledger-smb/trunk/debian/patches/series
Removed:
ledger-smb/trunk/debian/patches/00list
ledger-smb/trunk/debian/patches/05_confdir.dpatch
ledger-smb/trunk/debian/patches/10_makify.dpatch
ledger-smb/trunk/debian/patches/15_httpdconf.dpatch
Modified:
ledger-smb/trunk/debian/README.source
ledger-smb/trunk/debian/control
ledger-smb/trunk/debian/rules
Log:
Changing patching system from dpatch to quilt.
Modified: ledger-smb/trunk/debian/README.source
===================================================================
--- ledger-smb/trunk/debian/README.source 2011-10-04 18:49:23 UTC (rev 267)
+++ ledger-smb/trunk/debian/README.source 2011-10-04 22:08:52 UTC (rev 268)
@@ -2,8 +2,61 @@
relevant tagged version from the SVN repository and then creating
the archive from that.
-This package uses dpatch to manage all modifications to the upstream
+This package uses quilt to manage all modifications to the upstream
source. Changes are stored in the source package as diffs in
debian/patches and applied during the build.
-See /usr/share/doc/dpatch/README.source.gz for a detailed explanation.
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+ for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+ if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+ export QUILT_PATCHES=debian/patches
+ break
+ fi
+ done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+ quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+ quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches. Then, for every file that will be modified by this patch,
+run:
+
+ quilt add <file>
+
+before editing those files. You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly. After editing the files, run:
+
+ quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+ quilt import -P <patch> /path/to/patch
+ quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches. The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+ quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.
Modified: ledger-smb/trunk/debian/control
===================================================================
--- ledger-smb/trunk/debian/control 2011-10-04 18:49:23 UTC (rev 267)
+++ ledger-smb/trunk/debian/control 2011-10-04 22:08:52 UTC (rev 268)
@@ -6,7 +6,7 @@
Seneca Cunningham <tetragon at ledgersmb.org>,
Michael C. Schultheiss <schultmc at debian.org>,
Robert James Clay <jame at rocasa.us>
-Build-Depends: debhelper (>= 7.0.50), dpatch
+Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.40)
Standards-Version: 3.9.1
Homepage: http://www.ledgersmb.org/
Vcs-Svn: svn://svn.debian.org/pkg-sql-ledger/ledger-smb/trunk
Deleted: ledger-smb/trunk/debian/patches/00list
===================================================================
--- ledger-smb/trunk/debian/patches/00list 2011-10-04 18:49:23 UTC (rev 267)
+++ ledger-smb/trunk/debian/patches/00list 2011-10-04 22:08:52 UTC (rev 268)
@@ -1,3 +0,0 @@
-05_confdir
-10_makify
-15_httpdconf
Deleted: ledger-smb/trunk/debian/patches/05_confdir.dpatch
===================================================================
--- ledger-smb/trunk/debian/patches/05_confdir.dpatch 2011-10-04 18:49:23 UTC (rev 267)
+++ ledger-smb/trunk/debian/patches/05_confdir.dpatch 2011-10-04 22:08:52 UTC (rev 268)
@@ -1,61 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_confdir.dpatch by <seneca at localhost.localdomain>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Change default directories
-
- at DPATCH@
-
-diff -Naur ledgersmb-1.2.3-new/LedgerSMB/Sysconfig.pm ledgersmb-1.2.3-dirty/LedgerSMB/Sysconfig.pm
---- ledgersmb-1.2.3-new/LedgerSMB/Sysconfig.pm 2007-04-12 18:43:00.000000000 -0400
-+++ ledgersmb-1.2.3-dirty/LedgerSMB/Sysconfig.pm 2007-04-16 00:01:23.000000000 -0400
-@@ -28,13 +28,13 @@
- );
-
- # if you have latex installed set to 1
--$latex = 1;
-+$latex = 0;
-
- # spool directory for batch printing
--$spool = "spool";
-+$spool = "/var/lib/ledgersmb/spool";
-
- # path to user configuration files
--$userspath = "users";
-+$userspath = "/var/lib/ledgersmb/users";
-
- # templates base directory
- $templates = "/etc/ledgersmb/templates";
-@@ -46,7 +46,7 @@
- $backuppath = $tempdir;
-
- # member file
--$memberfile = "users/members";
-+$memberfile = "/var/lib/ledgersmb/users/members";
-
- # location of sendmail
- $sendmail = "/usr/sbin/sendmail -t";
-@@ -62,19 +62,18 @@
- $check_max_invoices = 5;
-
- # program to use for file compression
--$gzip = "gzip -S .gz";
-+$gzip = "/bin/gzip -S .gz";
-
- # Path to the translation files
--$localepath = 'locale/po';
-+$localepath = '/usr/share/ledgersmb/locale/po';
-
- # available printers
- %printer = (
-- Laser => 'lpr -Plaser',
-- Epson => 'lpr -PEpson',
-+ lpr => 'lpr',
- );
-
- my %config;
--read_config( 'ledgersmb.conf' => %config ) or die;
-+read_config( '/etc/ledgersmb/ledgersmb.conf' => %config ) or die;
-
- # We should clean this code up for 1.3 :-) Chris T.
-
Added: ledger-smb/trunk/debian/patches/05_confdir.patch
===================================================================
--- ledger-smb/trunk/debian/patches/05_confdir.patch (rev 0)
+++ ledger-smb/trunk/debian/patches/05_confdir.patch 2011-10-04 22:08:52 UTC (rev 268)
@@ -0,0 +1,54 @@
+Author: <seneca at localhost.localdomain>
+Description: Change default directories
+--- ledgersmb-1.2.25.orig/LedgerSMB/Sysconfig.pm
++++ ledgersmb-1.2.25/LedgerSMB/Sysconfig.pm
+@@ -30,13 +30,13 @@
+ );
+
+ # if you have latex installed set to 1
+-$latex = 1;
++$latex = 0;
+
+ # spool directory for batch printing
+-$spool = "spool";
++$spool = "/var/lib/ledgersmb/spool";
+
+ # path to user configuration files
+-$userspath = "users";
++$userspath = "/var/lib/ledgersmb/users";
+
+ # templates base directory
+ $templates = "templates";
+@@ -48,7 +48,7 @@
+ $backuppath = $tempdir;
+
+ # member file
+-$memberfile = "users/members";
++$memberfile = "/var/lib/ledgersmb/users/members";
+
+ # location of sendmail
+ $sendmail = "/usr/sbin/sendmail -t";
+@@ -64,19 +64,18 @@
+ $check_max_invoices = 5;
+
+ # program to use for file compression
+-$gzip = "gzip -S .gz";
++$gzip = "/bin/gzip -S .gz";
+
+ # Path to the translation files
+-$localepath = 'locale/po';
++$localepath = '/usr/share/ledgersmb/locale/po';
+
+ # available printers
+ %printer = (
+- Laser => 'lpr -Plaser',
+- Epson => 'lpr -PEpson',
++ lpr => 'lpr',
+ );
+
+ my %config;
+-read_config( 'ledgersmb.conf' => %config ) or die;
++read_config( '/etc/ledgersmb/ledgersmb.conf' => %config ) or die;
+
+ # We should clean this code up for 1.3 :-) Chris T.
+
Deleted: ledger-smb/trunk/debian/patches/10_makify.dpatch
===================================================================
--- ledger-smb/trunk/debian/patches/10_makify.dpatch 2011-10-04 18:49:23 UTC (rev 267)
+++ ledger-smb/trunk/debian/patches/10_makify.dpatch 2011-10-04 22:08:52 UTC (rev 268)
@@ -1,227 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_makify.dpatch by <seneca at localhost.localdomain>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adds Makefiles
-
- at DPATCH@
-
-diff -Naur ledgersmb/bin/Makefile ledgersmb-1.1.99beta1-new/bin/Makefile
---- ledgersmb/bin/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ ledgersmb-1.1.99beta1-new/bin/Makefile 2006-11-13 17:11:04.000000000 -0500
-@@ -0,0 +1,13 @@
-+PACKAGE = ledgersmb
-+
-+FILES = $(shell ls *.pl)
-+
-+all:
-+
-+clean:
-+
-+install:
-+ mkdir -p $(DESTDIR)/usr/share/ledgersmb/bin/custom
-+ cp $(FILES) $(DESTDIR)/usr/share/ledgersmb/bin
-+ find $(DESTDIR)/usr/share/ledgersmb/bin -type d -exec chmod 755 '{}' \;
-+ find $(DESTDIR)/usr/share/ledgersmb/bin -type f -exec chmod 644 '{}' \;
-diff -Naur ledgersmb/contrib/Makefile ledgersmb-1.1.99beta1-new/contrib/Makefile
---- ledgersmb/contrib/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ ledgersmb-1.1.99beta1-new/contrib/Makefile 2006-11-13 17:14:01.000000000 -0500
-@@ -0,0 +1,9 @@
-+PACKAGE = ledgersmb
-+
-+all:
-+
-+clean:
-+
-+install:
-+ mkdir -p $(DESTDIR)/usr/share/doc/ledgersmb/contrib
-+ cp -r * $(DESTDIR)/usr/share/doc/ledgersmb/contrib
-diff -Naur ledgersmb/css/Makefile ledgersmb-1.1.99beta1-new/css/Makefile
---- ledgersmb/css/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ ledgersmb-1.1.99beta1-new/css/Makefile 2006-11-13 17:02:56.000000000 -0500
-@@ -0,0 +1,13 @@
-+PACKAGE = ledgersmb
-+
-+FILES = $(shell ls ledger-smb*.css)
-+
-+all:
-+
-+clean:
-+
-+install:
-+ mkdir -p $(DESTDIR)/var/lib/ledgersmb/css
-+ cp $(FILES) $(DESTDIR)/var/lib/ledgersmb/css
-+ chmod 644 $(DESTDIR)/var/lib/ledgersmb/css/*
-+ ln -sf /var/lib/ledgersmb/css $(DESTDIR)/usr/share/ledgersmb
-diff -Naur ledgersmb/doc/Makefile ledgersmb-1.1.99beta1-new/doc/Makefile
---- ledgersmb/doc/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ ledgersmb-1.1.99beta1-new/doc/Makefile 2006-11-13 17:58:52.000000000 -0500
-@@ -0,0 +1,18 @@
-+PACKAGE = ledgersmb
-+
-+FILES = $(shell ls | grep -v Makefile | grep -v COPYING | grep -v COPYRIGHT)
-+SUBDIRS = API manual database samples
-+
-+all:
-+
-+clean:
-+
-+install:
-+ mkdir -p $(DESTDIR)/usr/share/ledgersmb/doc
-+ cp LedgerSMB-manual.pdf $(DESTDIR)/usr/share/ledgersmb/doc
-+ mkdir -p $(DESTDIR)/usr/share/doc/ledgersmb
-+ cp -a $(FILES) $(DESTDIR)/usr/share/doc/ledgersmb
-+ cp -a API $(DESTDIR)/usr/share/doc/ledgersmb
-+ cp -a manual $(DESTDIR)/usr/share/doc/ledgersmb
-+ cp -a database $(DESTDIR)/usr/share/doc/ledgersmb
-+ cp -a samples $(DESTDIR)/usr/share/doc/ledgersmb
-diff -Naur ledgersmb/drivers/Makefile ledgersmb-1.1.99beta1-new/drivers/Makefile
---- ledgersmb/drivers/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ ledgersmb-1.1.99beta1-new/drivers/Makefile 2006-11-13 17:12:33.000000000 -0500
-@@ -0,0 +1,10 @@
-+PACKAGE = ledgersmb
-+
-+all:
-+
-+clean:
-+
-+install:
-+ mkdir -p $(DESTDIR)/usr/share/ledgersmb/drivers
-+ cp *.pl $(DESTDIR)/usr/share/ledgersmb/drivers
-+ chmod 644 $(DESTDIR)/usr/share/ledgersmb/drivers/*
-diff -Naur ledgersmb/LedgerSMB/Makefile ledgersmb-1.1.99beta1-new/LedgerSMB/Makefile
---- ledgersmb/LedgerSMB/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ ledgersmb-1.1.99beta1-new/LedgerSMB/Makefile 2006-11-13 18:03:13.000000000 -0500
-@@ -0,0 +1,16 @@
-+PACKAGE = ledgersmb
-+
-+FILES := $(shell ls *.pm)
-+
-+all:
-+
-+clean:
-+
-+install:
-+ mkdir -p $(DESTDIR)/usr/share/ledgersmb/LedgerSMB
-+ cp -r $(FILES) $(DESTDIR)/usr/share/ledgersmb/LedgerSMB
-+ cp -r Taxes $(DESTDIR)/usr/share/ledgersmb/LedgerSMB
-+ cp -r Session $(DESTDIR)/usr/share/ledgersmb/LedgerSMB
-+ cp -r CreditCard $(DESTDIR)/usr/share/ledgersmb/LedgerSMB
-+ find $(DESTDIR)/usr/share/ledgersmb/LedgerSMB -type f -exec chmod 644 '{}' \;
-+ find $(DESTDIR)/usr/share/ledgersmb/LedgerSMB -type d -exec chmod 755 '{}' \;
-diff -Naur ledgersmb/locale/Makefile ledgersmb-1.1.99beta1-new/locale/Makefile
---- ledgersmb/locale/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ ledgersmb-1.1.99beta1-new/locale/Makefile 2006-11-13 16:56:15.000000000 -0500
-@@ -0,0 +1,21 @@
-+PACKAGE = ledgersmb
-+
-+LOCALES = $(shell ls po/*)
-+
-+localedir = /usr/share/ledgersmb/locale
-+dlocaledir = $(DESTDIR)$(localedir)
-+srctopdir := $(shell pwd)/..
-+
-+all:
-+
-+clean:
-+
-+install:
-+ mkdir -p $(dlocaledir)/po
-+ mkdir -p $(dlocaledir)/html
-+ cp po/* $(dlocaledir)/po
-+ cp html/*.html $(dlocaledir)/html
-+ cp LedgerSMB.pot $(dlocaledir)
-+ cp *.html $(dlocaledir)
-+ find $(dlocaledir) -type d -exec chmod 755 '{}' \;
-+ find $(dlocaledir) -type f -exec chmod 644 '{}' \;
-diff -Naur ledgersmb/Makefile ledgersmb-1.1.99beta1-new/Makefile
---- ledgersmb/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ ledgersmb-1.1.99beta1-new/Makefile 2006-11-13 18:19:16.000000000 -0500
-@@ -0,0 +1,36 @@
-+PACKAGE = ledgersmb
-+
-+SUBDIRS = bin doc drivers LedgerSMB locale sql templates css contrib utils
-+
-+LIB_FILES = favicon.ico menu.ini \
-+ ledgersmb.conf.default VERSION index.html \
-+ ledger-smb.png ledger-smb.gif ledger-smb_small.png \
-+ $(shell ls *.pl | grep -v -E '(pos\.conf)\.pl')
-+
-+CFG_FILES = ledgersmb.conf ledgersmb-httpd.conf pos.conf.pl
-+
-+all:
-+
-+install:
-+ mkdir -p $(DESTDIR)/usr/share/ledgersmb
-+ cp $(LIB_FILES) $(DESTDIR)/usr/share/ledgersmb
-+
-+ set -e ; for subdir in $(SUBDIRS) ; do \
-+ $(MAKE) -C $$subdir $@ ; \
-+ done
-+
-+ mkdir -p $(DESTDIR)/etc/ledgersmb
-+ cp $(CFG_FILES) $(DESTDIR)/etc/ledgersmb
-+ cd $(DESTDIR)/usr/share/ledgersmb ; \
-+ ln -sf /etc/ledgersmb/pos.conf.pl ; \
-+ ln -sf /etc/ledgersmb/images
-+ mkdir -p $(DESTDIR)/var/lib/ledgersmb/spool
-+ chown www-data:www-data $(DESTDIR)/var/lib/ledgersmb/spool
-+
-+ mkdir -p $(DESTDIR)/etc/ledgersmb/images
-+ mkdir -p $(DESTDIR)/etc/ledgersmb/images/demo
-+ cp $(DESTDIR)/etc/ledgersmb/templates/demo/*.[^ht]* $(DESTDIR)/etc/ledgersmb/images
-+ cp $(DESTDIR)/etc/ledgersmb/templates/demo/*.[^ht]* $(DESTDIR)/etc/ledgersmb/images/demo
-+ chown -R www-data:www-data $(DESTDIR)/etc/ledgersmb/templates
-+
-+clean:
-diff -Naur ledgersmb/sql/Makefile ledgersmb-1.1.99beta1-new/sql/Makefile
---- ledgersmb/sql/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ ledgersmb-1.1.99beta1-new/sql/Makefile 2006-11-13 17:06:48.000000000 -0500
-@@ -0,0 +1,14 @@
-+PACKAGE = ledgersmb
-+
-+FILES = *.sql
-+
-+all:
-+
-+clean:
-+
-+install:
-+ mkdir -p $(DESTDIR)/usr/share/ledgersmb/sql/legacy
-+ cp $(FILES) $(DESTDIR)/usr/share/ledgersmb/sql
-+ cp -r legacy $(DESTDIR)/usr/share/ledgersmb/sql
-+ find $(DESTDIR)/usr/share/ledgersmb/sql -type f -exec chmod 644 '{}' \;
-+ find $(DESTDIR)/usr/share/ledgersmb/sql -type d -exec chmod 755 '{}' \;
-diff -Naur ledgersmb/templates/Makefile ledgersmb-1.1.99beta1-new/templates/Makefile
---- ledgersmb/templates/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ ledgersmb-1.1.99beta1-new/templates/Makefile 2006-11-13 17:11:20.000000000 -0500
-@@ -0,0 +1,16 @@
-+PACKAGE = ledgersmb
-+
-+FILES = *.html *.tex *.txt
-+
-+all:
-+
-+clean:
-+
-+install:
-+ mkdir -p $(DESTDIR)/etc/ledgersmb/templates
-+ cp -a $(FILES) $(DESTDIR)/etc/ledgersmb/templates
-+ cp -a demo $(DESTDIR)/etc/ledgersmb/templates
-+ chown -R www-data:www-data $(DESTDIR)/etc/ledgersmb/templates
-+ ln -sf /etc/ledgersmb/templates $(DESTDIR)/usr/share/ledgersmb/
-+ find $(DESTDIR)/etc/ledgersmb/templates -type d -exec chmod 755 '{}' \;
-+ find $(DESTDIR)/etc/ledgersmb/templates -type f -exec chmod 644 '{}' \;
-diff -Naur ledgersmb/utils/Makefile ledgersmb-1.1.99beta1-new/utils/Makefile
---- ledgersmb/utils/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ ledgersmb-1.1.99beta1-new/utils/Makefile 2006-11-13 17:14:17.000000000 -0500
-@@ -0,0 +1,9 @@
-+PACKAGE = ledgersmb
-+
-+all:
-+
-+clean:
-+
-+install:
-+ mkdir -p $(DESTDIR)/usr/share/doc/ledgersmb/utils
-+ cp -r * $(DESTDIR)/usr/share/doc/ledgersmb/utils
Added: ledger-smb/trunk/debian/patches/10_makify.patch
===================================================================
--- ledger-smb/trunk/debian/patches/10_makify.patch (rev 0)
+++ ledger-smb/trunk/debian/patches/10_makify.patch 2011-10-04 22:08:52 UTC (rev 268)
@@ -0,0 +1,210 @@
+Author: <seneca at localhost.localdomain>
+Description: Adds Makefiles
+--- /dev/null
++++ ledgersmb-1.2.25/bin/Makefile
+@@ -0,0 +1,13 @@
++PACKAGE = ledgersmb
++
++FILES = $(shell ls *.pl)
++
++all:
++
++clean:
++
++install:
++ mkdir -p $(DESTDIR)/usr/share/ledgersmb/bin/custom
++ cp $(FILES) $(DESTDIR)/usr/share/ledgersmb/bin
++ find $(DESTDIR)/usr/share/ledgersmb/bin -type d -exec chmod 755 '{}' \;
++ find $(DESTDIR)/usr/share/ledgersmb/bin -type f -exec chmod 644 '{}' \;
+--- /dev/null
++++ ledgersmb-1.2.25/contrib/Makefile
+@@ -0,0 +1,9 @@
++PACKAGE = ledgersmb
++
++all:
++
++clean:
++
++install:
++ mkdir -p $(DESTDIR)/usr/share/doc/ledgersmb/contrib
++ cp -r * $(DESTDIR)/usr/share/doc/ledgersmb/contrib
+--- /dev/null
++++ ledgersmb-1.2.25/css/Makefile
+@@ -0,0 +1,13 @@
++PACKAGE = ledgersmb
++
++FILES = $(shell ls ledger-smb*.css)
++
++all:
++
++clean:
++
++install:
++ mkdir -p $(DESTDIR)/var/lib/ledgersmb/css
++ cp $(FILES) $(DESTDIR)/var/lib/ledgersmb/css
++ chmod 644 $(DESTDIR)/var/lib/ledgersmb/css/*
++ ln -sf /var/lib/ledgersmb/css $(DESTDIR)/usr/share/ledgersmb
+--- /dev/null
++++ ledgersmb-1.2.25/doc/Makefile
+@@ -0,0 +1,18 @@
++PACKAGE = ledgersmb
++
++FILES = $(shell ls | grep -v Makefile | grep -v COPYING | grep -v COPYRIGHT)
++SUBDIRS = API manual database samples
++
++all:
++
++clean:
++
++install:
++ mkdir -p $(DESTDIR)/usr/share/ledgersmb/doc
++ cp LedgerSMB-manual.pdf $(DESTDIR)/usr/share/ledgersmb/doc
++ mkdir -p $(DESTDIR)/usr/share/doc/ledgersmb
++ cp -a $(FILES) $(DESTDIR)/usr/share/doc/ledgersmb
++ cp -a API $(DESTDIR)/usr/share/doc/ledgersmb
++ cp -a manual $(DESTDIR)/usr/share/doc/ledgersmb
++ cp -a database $(DESTDIR)/usr/share/doc/ledgersmb
++ cp -a samples $(DESTDIR)/usr/share/doc/ledgersmb
+--- /dev/null
++++ ledgersmb-1.2.25/drivers/Makefile
+@@ -0,0 +1,10 @@
++PACKAGE = ledgersmb
++
++all:
++
++clean:
++
++install:
++ mkdir -p $(DESTDIR)/usr/share/ledgersmb/drivers
++ cp *.pl $(DESTDIR)/usr/share/ledgersmb/drivers
++ chmod 644 $(DESTDIR)/usr/share/ledgersmb/drivers/*
+--- /dev/null
++++ ledgersmb-1.2.25/LedgerSMB/Makefile
+@@ -0,0 +1,16 @@
++PACKAGE = ledgersmb
++
++FILES := $(shell ls *.pm)
++
++all:
++
++clean:
++
++install:
++ mkdir -p $(DESTDIR)/usr/share/ledgersmb/LedgerSMB
++ cp -r $(FILES) $(DESTDIR)/usr/share/ledgersmb/LedgerSMB
++ cp -r Taxes $(DESTDIR)/usr/share/ledgersmb/LedgerSMB
++ cp -r Session $(DESTDIR)/usr/share/ledgersmb/LedgerSMB
++ cp -r CreditCard $(DESTDIR)/usr/share/ledgersmb/LedgerSMB
++ find $(DESTDIR)/usr/share/ledgersmb/LedgerSMB -type f -exec chmod 644 '{}' \;
++ find $(DESTDIR)/usr/share/ledgersmb/LedgerSMB -type d -exec chmod 755 '{}' \;
+--- /dev/null
++++ ledgersmb-1.2.25/locale/Makefile
+@@ -0,0 +1,21 @@
++PACKAGE = ledgersmb
++
++LOCALES = $(shell ls po/*)
++
++localedir = /usr/share/ledgersmb/locale
++dlocaledir = $(DESTDIR)$(localedir)
++srctopdir := $(shell pwd)/..
++
++all:
++
++clean:
++
++install:
++ mkdir -p $(dlocaledir)/po
++ mkdir -p $(dlocaledir)/html
++ cp po/* $(dlocaledir)/po
++ cp html/*.html $(dlocaledir)/html
++ cp LedgerSMB.pot $(dlocaledir)
++ cp *.html $(dlocaledir)
++ find $(dlocaledir) -type d -exec chmod 755 '{}' \;
++ find $(dlocaledir) -type f -exec chmod 644 '{}' \;
+--- /dev/null
++++ ledgersmb-1.2.25/Makefile
+@@ -0,0 +1,36 @@
++PACKAGE = ledgersmb
++
++SUBDIRS = bin doc drivers LedgerSMB locale sql templates css contrib utils
++
++LIB_FILES = favicon.ico menu.ini \
++ ledgersmb.conf.default VERSION index.html \
++ ledger-smb.png ledger-smb.gif ledger-smb_small.png \
++ $(shell ls *.pl | grep -v -E '(pos\.conf)\.pl')
++
++CFG_FILES = ledgersmb.conf ledgersmb-httpd.conf pos.conf.pl
++
++all:
++
++install:
++ mkdir -p $(DESTDIR)/usr/share/ledgersmb
++ cp $(LIB_FILES) $(DESTDIR)/usr/share/ledgersmb
++
++ set -e ; for subdir in $(SUBDIRS) ; do \
++ $(MAKE) -C $$subdir $@ ; \
++ done
++
++ mkdir -p $(DESTDIR)/etc/ledgersmb
++ cp $(CFG_FILES) $(DESTDIR)/etc/ledgersmb
++ cd $(DESTDIR)/usr/share/ledgersmb ; \
++ ln -sf /etc/ledgersmb/pos.conf.pl ; \
++ ln -sf /etc/ledgersmb/images
++ mkdir -p $(DESTDIR)/var/lib/ledgersmb/spool
++ chown www-data:www-data $(DESTDIR)/var/lib/ledgersmb/spool
++
++ mkdir -p $(DESTDIR)/etc/ledgersmb/images
++ mkdir -p $(DESTDIR)/etc/ledgersmb/images/demo
++ cp $(DESTDIR)/etc/ledgersmb/templates/demo/*.[^ht]* $(DESTDIR)/etc/ledgersmb/images
++ cp $(DESTDIR)/etc/ledgersmb/templates/demo/*.[^ht]* $(DESTDIR)/etc/ledgersmb/images/demo
++ chown -R www-data:www-data $(DESTDIR)/etc/ledgersmb/templates
++
++clean:
+--- /dev/null
++++ ledgersmb-1.2.25/sql/Makefile
+@@ -0,0 +1,14 @@
++PACKAGE = ledgersmb
++
++FILES = *.sql
++
++all:
++
++clean:
++
++install:
++ mkdir -p $(DESTDIR)/usr/share/ledgersmb/sql/legacy
++ cp $(FILES) $(DESTDIR)/usr/share/ledgersmb/sql
++ cp -r legacy $(DESTDIR)/usr/share/ledgersmb/sql
++ find $(DESTDIR)/usr/share/ledgersmb/sql -type f -exec chmod 644 '{}' \;
++ find $(DESTDIR)/usr/share/ledgersmb/sql -type d -exec chmod 755 '{}' \;
+--- /dev/null
++++ ledgersmb-1.2.25/templates/Makefile
+@@ -0,0 +1,16 @@
++PACKAGE = ledgersmb
++
++FILES = *.html *.tex *.txt
++
++all:
++
++clean:
++
++install:
++ mkdir -p $(DESTDIR)/etc/ledgersmb/templates
++ cp -a $(FILES) $(DESTDIR)/etc/ledgersmb/templates
++ cp -a demo $(DESTDIR)/etc/ledgersmb/templates
++ chown -R www-data:www-data $(DESTDIR)/etc/ledgersmb/templates
++ ln -sf /etc/ledgersmb/templates $(DESTDIR)/usr/share/ledgersmb/
++ find $(DESTDIR)/etc/ledgersmb/templates -type d -exec chmod 755 '{}' \;
++ find $(DESTDIR)/etc/ledgersmb/templates -type f -exec chmod 644 '{}' \;
+--- /dev/null
++++ ledgersmb-1.2.25/utils/Makefile
+@@ -0,0 +1,9 @@
++PACKAGE = ledgersmb
++
++all:
++
++clean:
++
++install:
++ mkdir -p $(DESTDIR)/usr/share/doc/ledgersmb/utils
++ cp -r * $(DESTDIR)/usr/share/doc/ledgersmb/utils
Deleted: ledger-smb/trunk/debian/patches/15_httpdconf.dpatch
===================================================================
--- ledger-smb/trunk/debian/patches/15_httpdconf.dpatch 2011-10-04 18:49:23 UTC (rev 267)
+++ ledger-smb/trunk/debian/patches/15_httpdconf.dpatch 2011-10-04 22:08:52 UTC (rev 268)
@@ -1,83 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 15_httpdconf.dpatch by <seneca at localhost.localdomain>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Changing paths in Apache config
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' ledgersmb-1.2.24~/ledgersmb-httpd.conf ledgersmb-1.2.24/ledgersmb-httpd.conf
---- ledgersmb-1.2.24~/ledgersmb-httpd.conf 2011-07-05 07:11:33.000000000 -0400
-+++ ledgersmb-1.2.24/ledgersmb-httpd.conf 2011-10-01 16:24:46.000000000 -0400
-@@ -1,7 +1,7 @@
-
--Alias /ledgersmb WORKING_DIR
-+Alias /ledgersmb /usr/share/ledgersmb/
-
--<Directory WORKING_DIR>
-+<Directory /usr/share/ledgersmb>
- AllowOverride All
- AddHandler cgi-script .pl
- Options ExecCGI Includes FollowSymlinks
-@@ -13,22 +13,22 @@
- </Files>
- </Directory>
-
--<Directory WORKING_DIR/users>
-+<Directory /usr/share/ledgersmb/users>
- Order Deny,Allow
- Deny from All
- </Directory>
-
--<Directory WORKING_DIR/bin>
-+<Directory /usr/share/ledgersmb/bin>
- Order Deny,Allow
- Deny from All
- </Directory>
-
--<Directory WORKING_DIR/utils>
-+<Directory /usr/share/ledgersmb/utils>
- Order Deny,Allow
- Deny from All
- </Directory>
-
--<Directory WORKING_DIR/LedgerSMB>
-+<Directory /usr/share/ledgersmb/LedgerSMB>
- Order Deny,Allow
- Deny from All
- </Directory>
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' ledgersmb-1.2.24~/ledgersmb-httpd.conf.rej ledgersmb-1.2.24/ledgersmb-httpd.conf.rej
---- ledgersmb-1.2.24~/ledgersmb-httpd.conf.rej 1969-12-31 19:00:00.000000000 -0500
-+++ ledgersmb-1.2.24/ledgersmb-httpd.conf.rej 2011-10-01 16:23:19.000000000 -0400
-@@ -0,0 +1,32 @@
-+--- ledgersmb-httpd.conf 2007-02-23 00:44:50.000000000 -0500
-++++ ledgersmb-httpd.conf 2007-02-19 20:46:47.000000000 -0500
-+@@ -13,27 +13,12 @@
-+ </Files>
-+ </Directory>
-+
-+-<Directory WORKING_DIR/users>
-++<Directory /usr/share/ledgersmb/bin>
-+ Order Deny,Allow
-+ Deny from All
-+ </Directory>
-+
-+-<Directory WORKING_DIR/bin>
-+- Order Deny,Allow
-+- Deny from All
-+-</Directory>
-+-
-+-<Directory WORKING_DIR/utils>
-+- Order Deny,Allow
-+- Deny from All
-+-</Directory>
-+-
-+-<Directory WORKING_DIR/spool>
-+- Order Deny,Allow
-+- Deny from All
-+-</Directory>
-+-
-+-<Directory WORKING_DIR/LedgerSMB>
-++<Directory /usr/share/ledgersmb/LedgerSMB>
-+ Order Deny,Allow
-+ Deny from All
-+ </Directory>
Added: ledger-smb/trunk/debian/patches/15_httpdconf.patch
===================================================================
--- ledger-smb/trunk/debian/patches/15_httpdconf.patch (rev 0)
+++ ledger-smb/trunk/debian/patches/15_httpdconf.patch 2011-10-04 22:08:52 UTC (rev 268)
@@ -0,0 +1,76 @@
+Author: <seneca at localhost.localdomain>
+Description: Changing paths in Apache config
+--- ledgersmb-1.2.25.orig/ledgersmb-httpd.conf
++++ ledgersmb-1.2.25/ledgersmb-httpd.conf
+@@ -1,7 +1,7 @@
+
+-Alias /ledgersmb WORKING_DIR
++Alias /ledgersmb /usr/share/ledgersmb/
+
+-<Directory WORKING_DIR>
++<Directory /usr/share/ledgersmb>
+ AllowOverride All
+ AddHandler cgi-script .pl
+ Options ExecCGI Includes FollowSymlinks
+@@ -13,22 +13,22 @@
+ </Files>
+ </Directory>
+
+-<Directory WORKING_DIR/users>
++<Directory /usr/share/ledgersmb/users>
+ Order Deny,Allow
+ Deny from All
+ </Directory>
+
+-<Directory WORKING_DIR/bin>
++<Directory /usr/share/ledgersmb/bin>
+ Order Deny,Allow
+ Deny from All
+ </Directory>
+
+-<Directory WORKING_DIR/utils>
++<Directory /usr/share/ledgersmb/utils>
+ Order Deny,Allow
+ Deny from All
+ </Directory>
+
+-<Directory WORKING_DIR/LedgerSMB>
++<Directory /usr/share/ledgersmb/LedgerSMB>
+ Order Deny,Allow
+ Deny from All
+ </Directory>
+--- /dev/null
++++ ledgersmb-1.2.25/ledgersmb-httpd.conf.rej
+@@ -0,0 +1,32 @@
++--- ledgersmb-httpd.conf 2007-02-23 00:44:50.000000000 -0500
+++++ ledgersmb-httpd.conf 2007-02-19 20:46:47.000000000 -0500
++@@ -13,27 +13,12 @@
++ </Files>
++ </Directory>
++
++-<Directory WORKING_DIR/users>
+++<Directory /usr/share/ledgersmb/bin>
++ Order Deny,Allow
++ Deny from All
++ </Directory>
++
++-<Directory WORKING_DIR/bin>
++- Order Deny,Allow
++- Deny from All
++-</Directory>
++-
++-<Directory WORKING_DIR/utils>
++- Order Deny,Allow
++- Deny from All
++-</Directory>
++-
++-<Directory WORKING_DIR/spool>
++- Order Deny,Allow
++- Deny from All
++-</Directory>
++-
++-<Directory WORKING_DIR/LedgerSMB>
+++<Directory /usr/share/ledgersmb/LedgerSMB>
++ Order Deny,Allow
++ Deny from All
++ </Directory>
Added: ledger-smb/trunk/debian/patches/series
===================================================================
--- ledger-smb/trunk/debian/patches/series (rev 0)
+++ ledger-smb/trunk/debian/patches/series 2011-10-04 22:08:52 UTC (rev 268)
@@ -0,0 +1,3 @@
+05_confdir.patch
+10_makify.patch
+15_httpdconf.patch
Modified: ledger-smb/trunk/debian/rules
===================================================================
--- ledger-smb/trunk/debian/rules 2011-10-04 18:49:23 UTC (rev 267)
+++ ledger-smb/trunk/debian/rules 2011-10-04 22:08:52 UTC (rev 268)
@@ -3,14 +3,14 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
DESTDIR = $(CURDIR)/debian/ledgersmb
INSTALL = install
configure: configure-stamp
-configure-stamp: patch-stamp
+configure-stamp: $(QUILT_STAMPFN)
dh_testdir
# Add here commands to configure the package.
More information about the Pkg-sql-ledger-commit
mailing list