[Pkg-sql-ledger-discussion] Re: sql-ledger needing help

Gerardo Reynoso greynoso at tindes.com
Sat Dec 3 04:37:34 UTC 2005 

On Friday 02 December 2005 17:24, Gerardo Reynoso wrote:
> I will wait for your advice while beginning to work out some of the stuff
> clear to me y now.

I have achieved to produce a 2.6.3 deb package with changes already on a svn 
branch (branches/greynosoc-branch).

I am attaching a svn diff file showing the changes made until now. I hope you 
can take a look at the changes and coach me.

By the wat I thougth I have changed svn scripts to notify commits, I have no 
trecived any notification, have you? I think I will need to look these 
changes again.

Regards

GRC
-------------- next part --------------
Index: debian/control
===================================================================
--- debian/control	(.../trunk)	(revision 85)
+++ debian/control	(.../branches/greynosoc-branch)	(working copy)
@@ -11,7 +11,7 @@
 Depends: ${perl:Depends}, apache | httpd, libdbd-pg-perl
 Suggests: tetex-extra, postgresql
 Description: A web based double-entry accounting program
- Accounting data is stored in a SQL Server, for the display any text or
+ Accounting data is stored in an SQL Server, for the display any text or
  GUI browser can be used. The entire system is linked through a chart
  of accounts. Each item in inventory is linked to revenue, expense,
  inventory and tax accounts. When you sell and purchase goods and
Index: debian/sql-ledger-enable
===================================================================
--- debian/sql-ledger-enable	(.../trunk)	(revision 85)
+++ debian/sql-ledger-enable	(.../branches/greynosoc-branch)	(working copy)
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# Activate SQL-Ledger in apache configuration.  Small helper script
-# to reduce the chance of typos.
-#
-# This should be rewritten to follow the info in
-# <URL:http://deb.riseup.net/mail/buffy/mail-clients/apache/> or
-# <URL:http://www.opal.dhs.org/involved/debian/apache/>, before it
-# is enabled.
-
-if [ -d /etc/apache/conf.d ] ; then # Debian/Sarge or later
-    echo "info: Detected apache for Debian/Sarge or later"
-    httpdconf=/etc/apache/conf.d/sql-ledger.conf
-else
-    echo "info: Detected apache for Debian/Woody or earlier"
-    httpdconf=/etc/apache/httpd.conf
-fi
-
-includeline="Include /etc/sql-ledger/sql-ledger-httpd.conf"
-
-if grep -q "^$includeline" $httpdconf ; then
-    echo "info: SQL-Ledger is already enabled in $httpdconf"
-else
-    echo "$includeline" >> $httpdconf
-    echo "info: Content of $httpdconf is updated."
-    echo "info: Please restart apache for this change to take effect."
-    echo "info: Remember that there might be no admin password set at"
-    echo "info: the moment, and the installation is open for everyone."
-fi
Index: debian/compat
===================================================================
--- debian/compat	(.../trunk)	(revision 0)
+++ debian/compat	(.../branches/greynosoc-branch)	(revision 88)
@@ -0,0 +1 @@
+4
Index: debian/postinst
===================================================================
--- debian/postinst	(.../trunk)	(revision 85)
+++ debian/postinst	(.../branches/greynosoc-branch)	(working copy)
@@ -6,4 +6,34 @@
   chown -R www-data:www-data css
 )
 
+
+#
+# Activate SQL-Ledger in apache configuration.  Small helper script
+# to reduce the chance of typos.
+#
+# This should be rewritten to follow the info in
+# <URL:http://deb.riseup.net/mail/buffy/mail-clients/apache/> or
+# <URL:http://www.opal.dhs.org/involved/debian/apache/>, before it
+# is enabled.
+
+if [ -d /etc/apache/conf.d ] ; then # Debian/Sarge or later
+    echo "info: Detected apache for Debian/Sarge or later"
+    httpdconf=/etc/apache/conf.d/sql-ledger.conf
+else
+    echo "info: Detected apache for Debian/Woody or earlier"
+    httpdconf=/etc/apache/httpd.conf
+fi
+
+includeline="Include /etc/sql-ledger/sql-ledger-httpd.conf"
+
+if grep -q "^$includeline" $httpdconf ; then
+    echo "info: SQL-Ledger is already enabled in $httpdconf"
+else
+    echo "$includeline" >> $httpdconf
+    echo "info: Content of $httpdconf is updated."
+    echo "info: Please restart apache for this change to take effect."
+    echo "info: Remember that there might be no admin password set at"
+    echo "info: the moment, and the installation is open for everyone."
+fi
+
 #DEBHELPER#
Index: debian/patches/10makefiles.dpatch
===================================================================
--- debian/patches/10makefiles.dpatch	(.../trunk)	(revision 85)
+++ debian/patches/10makefiles.dpatch	(.../branches/greynosoc-branch)	(working copy)
@@ -29,7 +29,7 @@
 +
 +MODULES = admin.pl login.pl arap.pl arapprn.pl ap.pl ar.pl ca.pl cp.pl ct.pl gl.pl ic.pl \
 +          ir.pl is.pl oe.pl pe.pl rc.pl rp.pl am.pl io.pl pos.pl ps.pl pw.pl bp.pl hr.pl
-+SUBDIRS = js lynx mozilla
++SUBDIRS = lynx mozilla
 +
 +all:
 +
Index: debian/patches/40imagepath.dpatch
===================================================================
--- debian/patches/40imagepath.dpatch	(.../trunk)	(revision 85)
+++ debian/patches/40imagepath.dpatch	(.../branches/greynosoc-branch)	(working copy)
@@ -22,29 +22,29 @@
 
 exit 0
 @DPATCH@
-diff -ur sql-ledger-2.4.5/bin/mozilla/am.pl BUILD/sql-ledger/bin/mozilla/am.pl
---- sql-ledger-2.4.5/bin/mozilla/am.pl	Fri Nov  5 04:53:55 2004
-+++ sql-ledger/bin/mozilla/am.pl	Mon Nov 29 20:37:08 2004
-@@ -2349,7 +2349,7 @@
- 
+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></a>
+-<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-2.4.5/bin/mozilla/admin.pl	Tue Nov 23 22:56:46 2004
-+++ sql-ledger/bin/mozilla/admin.pl	Sat Nov 27 21:35:55 2004
-@@ -104,7 +104,7 @@
- 
+--- 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.png border=0>&trade;</a>
+
+-<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
Index: debian/changelog
===================================================================
--- debian/changelog	(.../trunk)	(revision 85)
+++ debian/changelog	(.../branches/greynosoc-branch)	(working copy)
@@ -1,3 +1,28 @@
+sql-ledger (2.6.3-1) unstable; urgency=low
+
+  * New upstream version available (Closes: #303604)
+  * Updated debian/patches/40imagepath.dpatch to avoid patch rejection
+  * Removed reference to script debian/sql-ledger-enable on
+    debian/rules
+  * Removed reference to js directory from file
+    debian/patches/10makefiles.dpatch as this directory was removed
+    upstream.
+
+ -- Gerardo Reynoso <greynoso at tindes.com>  Fri,  2 Dec 2005 21:00:26 -0600
+
+sql-ledger (2.4.9-3) UNRELEASED; urgency=low
+
+  * Move contents of debian/sql-ledger-enable into debian/postinst to avoid
+    lintian/linda warning about missing man page
+
+ -- Gerardo Reynoso <greynoso at tindes.com>  Fri,  2 Dec 2005 20:25:42 -0600
+
+sql-ledger (2.4.9-2) UNRELEASED; urgency=low
+
+  * package description typo(s) and the like (Closes: #300043)
+
+ -- Gerardo Reynoso <greynoso at tindes.com>  Fri,  2 Dec 2005 20:08:19 -0600
+
 sql-ledger (2.4.9-1) UNRELEASED; urgency=low
 
   * New upstream release. (Closes: #303604)
Index: debian/rules
===================================================================
--- debian/rules	(.../trunk)	(revision 85)
+++ debian/rules	(.../branches/greynosoc-branch)	(working copy)
@@ -2,11 +2,12 @@
 # GNU copyright 2004 by Petter Reinholdtsen
 
 # This is the debhelper compatibility version to use.
-export DH_COMPAT=3
+# compat level updated on file debian/compat - greynoso at tindes.com
+# export DH_COMPAT=3
 
 include /usr/share/dpatch/dpatch.make
 
-TARBALL_VERSION = 2.4.9
+TARBALL_VERSION = 2.6.3
 
 DEB_TARBALL = sql-ledger-$(TARBALL_VERSION).tar.gz
 
@@ -64,9 +65,7 @@
 	# Add here commands to install the package into debian/sql-ledger.
 	$(MAKE) -C $(build-tree)/sql-ledger install DESTDIR=$(DESTDIR)
 
-	$(INSTALL) debian/sql-ledger-enable $(DESTDIR)/usr/sbin/
 
-
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.

Property changes on: debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

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