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

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

Author: lyz-guest
Date: 2008-05-26 22:42:48 +0000 (Mon, 26 May 2008)
New Revision: 181

Modified:
   ledger-smb/trunk/debian/docs
   ledger-smb/trunk/debian/patches/10_makify.dpatch
   ledger-smb/trunk/debian/rules
Log:
Patch edits for proper building, updated docs



Modified: ledger-smb/trunk/debian/docs
===================================================================
--- ledger-smb/trunk/debian/docs	2008-05-22 07:35:27 UTC (rev 180)
+++ ledger-smb/trunk/debian/docs	2008-05-26 22:42:48 UTC (rev 181)
@@ -1,6 +1,7 @@
 BUGS
 CONTRIBUTORS
 COMPATABILITY
+INSTALL
 README.translations
 TODO
 UPGRADE

Modified: ledger-smb/trunk/debian/patches/10_makify.dpatch
===================================================================
--- ledger-smb/trunk/debian/patches/10_makify.dpatch	2008-05-22 07:35:27 UTC (rev 180)
+++ ledger-smb/trunk/debian/patches/10_makify.dpatch	2008-05-26 22:42:48 UTC (rev 181)
@@ -42,7 +42,7 @@
 @@ -0,0 +1,13 @@
 +PACKAGE = ledgersmb
 +
-+FILES = $(shell ls ledgersmb*.css)
++FILES = $(shell ls ledger-smb*.css)
 +
 +all:
 +
@@ -140,11 +140,11 @@
 @@ -0,0 +1,36 @@
 +PACKAGE = ledgersmb
 +
-+SUBDIRS = bin doc drivers LedgerSMB locale sql css contrib utils
++SUBDIRS = bin doc drivers LedgerSMB locale sql templates css contrib utils
 +
 +LIB_FILES = favicon.ico login.pl menu.ini \
 +	    ledgersmb.conf.default VERSION index.html \
-+	    ledgersmb.png ledgersmb.gif ledgersmb_small.png \
++	    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
@@ -163,15 +163,15 @@
 +	cp $(CFG_FILES) $(DESTDIR)/etc/ledgersmb
 +	cd $(DESTDIR)/usr/share/ledgersmb ; \
 +	ln -sf /etc/ledgersmb/pos.conf.pl ; \
-+	ln -sf /var/lib/ledgersmb/images
++	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)/var/lib/ledgersmb/images
-+	mkdir -p $(DESTDIR)/var/lib/ledgersmb/images/demo
-+	cp $(DESTDIR)/var/lib/ledgersmb/templates/demo/*.[^ht]* $(DESTDIR)/var/lib/ledgersmb/images
-+	cp $(DESTDIR)/var/lib/ledgersmb/templates/demo/*.[^ht]* $(DESTDIR)/var/lib/ledgersmb/images/demo
-+	chown -R www-data:www-data $(DESTDIR)/var/lib/ledgersmb/templates
++	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
@@ -205,13 +205,13 @@
 +clean:
 +
 +install:
-+	mkdir -p $(DESTDIR)/var/lib/ledgersmb/templates
-+	cp -a $(FILES) $(DESTDIR)/var/lib/ledgersmb/templates
-+	cp -a demo $(DESTDIR)/var/lib/ledgersmb/templates
-+	chown -R www-data:www-data $(DESTDIR)/var/lib/ledgersmb/templates
-+	ln -sf /var/lib/ledgersmb/templates $(DESTDIR)/usr/share/ledgersmb/
-+	find $(DESTDIR)/var/lib/ledgersmb/templates -type f -exec chmod 644 '{}' \;
-+	find $(DESTDIR)/var/lib/ledgersmb/templates -type d -exec chmod 755 '{}' \;
++	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 f -exec chmod 644 '{}' \;
++	find $(DESTDIR)/etc/ledgersmb/templates -type d -exec chmod 755 '{}' \;
 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

Modified: ledger-smb/trunk/debian/rules
===================================================================
--- ledger-smb/trunk/debian/rules	2008-05-22 07:35:27 UTC (rev 180)
+++ ledger-smb/trunk/debian/rules	2008-05-26 22:42:48 UTC (rev 181)
@@ -9,13 +9,25 @@
 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:
+build-stamp: configure-stamp
 	dh_testdir
 
-	touch build-stamp
+        # Add here commands to compile the package.
+	$(MAKE)
+        #docbook-to-man debian/ledgersmb.sgml > ledgersmb.1
 
+	touch $@
+
 clean: unpatch
 	dh_testdir
 	dh_testroot
@@ -40,7 +52,7 @@
 	    ledgersmb.conf.default > ledgersmb.conf
 	
 
-	
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/ledgersmb
 	chown www-data:www-data $(CURDIR)/debian/ledgersmb/etc/ledgersmb/*
 	chmod 0600 $(CURDIR)/debian/ledgersmb/etc/ledgersmb/*
 	chmod +x $(CURDIR)/debian/ledgersmb/usr/share/ledgersmb/upgrade-templates.pl