[Pkg-sql-ledger-commit] r98 - in trunk/debian: . patches
pkg-sql-ledger-discusssion at lists.alioth.debian.org
pkg-sql-ledger-discusssion at lists.alioth.debian.org
Fri Jan 6 11:21:26 UTC 2006
Author: hertzog
Date: 2006-01-06 11:21:26 +0000 (Fri, 06 Jan 2006)
New Revision: 98
Modified:
trunk/debian/changelog
trunk/debian/patches/10makefiles.dpatch
trunk/debian/patches/40imagepath.dpatch
trunk/debian/patches/45crosslink.dpatch
trunk/debian/rules
Log:
Close one more "new upstream release" bug in changelog.
Reworked debian/rules and patches to be able to use the upstream tarball
as .orig.tar.gz.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-01-05 01:05:52 UTC (rev 97)
+++ trunk/debian/changelog 2006-01-06 11:21:26 UTC (rev 98)
@@ -1,7 +1,7 @@
-sql-ledger (2.6.4-1) UNRELEASED; urgency=low
+sql-ledger (2.6.4-1) unstable; urgency=low
[ Raphael Hertzog ]
- * New upstream version.
+ * New upstream version. Closes: #346195
* Added all members of the team in the Uploaders field (myself included).
* Build-Depends on debhelper >= 4 since we use debian/compat with level 4.
* Remove rsync build dependency (seems useless).
@@ -10,6 +10,9 @@
* Update 10makefiles.dpatch because new modules have been added in the
upstream source package. Make it generate the list of modules
automatically.
+ * Reworked debian/rules so that we can have an .orig.tar.gz which is
+ the exact copy provided by upstream. Keep dpatch to apply patches
+ at build time however.
-- Raphael Hertzog <hertzog at debian.org> Wed, 4 Jan 2006 23:12:35 +0000
Modified: trunk/debian/patches/10makefiles.dpatch
===================================================================
--- trunk/debian/patches/10makefiles.dpatch 2006-01-05 01:05:52 UTC (rev 97)
+++ trunk/debian/patches/10makefiles.dpatch 2006-01-06 11:21:26 UTC (rev 98)
@@ -13,8 +13,8 @@
exit 1
fi
case "$1" in
- -patch) ( cd BUILD/sql-ledger && patch $patch_opts -p1 ) < $0 ;;
- -unpatch) ( cd BUILD/sql-ledger && patch $patch_opts -p1 -R ) < $0 ;;
+ -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;;
Modified: trunk/debian/patches/40imagepath.dpatch
===================================================================
--- trunk/debian/patches/40imagepath.dpatch 2006-01-05 01:05:52 UTC (rev 97)
+++ trunk/debian/patches/40imagepath.dpatch 2006-01-06 11:21:26 UTC (rev 98)
@@ -13,8 +13,8 @@
exit 1
fi
case "$1" in
- -patch) ( cd BUILD/sql-ledger && patch $patch_opts -p1 ) < $0 ;;
- -unpatch) ( cd BUILD/sql-ledger && patch $patch_opts -p1 -R ) < $0 ;;
+ -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;;
Modified: trunk/debian/patches/45crosslink.dpatch
===================================================================
--- trunk/debian/patches/45crosslink.dpatch 2006-01-05 01:05:52 UTC (rev 97)
+++ trunk/debian/patches/45crosslink.dpatch 2006-01-06 11:21:26 UTC (rev 98)
@@ -14,8 +14,8 @@
exit 1
fi
case "$1" in
- -patch) ( cd BUILD/sql-ledger && patch $patch_opts -p1 ) < $0 ;;
- -unpatch) ( cd BUILD/sql-ledger && patch $patch_opts -p1 -R ) < $0 ;;
+ -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;;
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2006-01-05 01:05:52 UTC (rev 97)
+++ trunk/debian/rules 2006-01-06 11:21:26 UTC (rev 98)
@@ -3,52 +3,33 @@
include /usr/share/dpatch/dpatch.make
-TARBALL_VERSION = 2.6.4
-
-DEB_TARBALL = sql-ledger-$(TARBALL_VERSION).tar.gz
-
DESTDIR = $(CURDIR)/debian/sql-ledger
INSTALL = install
-build-tree = $(CURDIR)/BUILD
-
-unpack: unpack-stamp
-unpack-stamp: $(DEB_TARBALL)
- touch unpack-stamp
-
-$(DEB_TARBALL): $(DEB_TARBALL)-stamp
-$(DEB_TARBALL)-stamp:
- mkdir -p $(build-tree)
- cd $(build-tree) && tar -zxf $(CURDIR)/$(DEB_TARBALL)
- touch $@
-
configure: configure-stamp
-configure-stamp: unpack patch-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) -C $(build-tree)/sql-ledger
- #/usr/bin/docbook-to-man debian/sql-ledger.sgml > sql-ledger.1
+ $(MAKE)
touch build-stamp
clean: unpatch
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp unpack-stamp $(DEB_TARBALL)-stamp
- rm -rf $(build-tree)
+ rm -f build-stamp configure-stamp
# Add here commands to clean up after the build process.
- #-$(MAKE) -C $(build-tree)/sql-ledger clean
+ #-$(MAKE) clean
dh_clean
@@ -59,7 +40,7 @@
dh_installdirs
# Add here commands to install the package into debian/sql-ledger.
- $(MAKE) -C $(build-tree)/sql-ledger install DESTDIR=$(DESTDIR)
+ $(MAKE) install DESTDIR=$(DESTDIR)
# Build architecture-independent files here.
@@ -74,8 +55,6 @@
dh_installdocs
dh_installexamples
dh_installmenu
-# dh_installlogrotate
-# dh_installinit
dh_installcron
dh_installman
dh_installinfo
@@ -98,7 +77,7 @@
debian/copyright: unpack patch-stamp
cat debian/copyright.pre > debian/copyright
set -e ; \
- for file in $(build-tree)/sql-ledger/locale/*/COPYING ; do \
+ 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 ; \
More information about the Pkg-sql-ledger-commit
mailing list