cdbs update
Would you accept the attached cdbs update (not yet uploaded)?
cdbs (0.4.47) UNRELEASED; urgency=medium
* Reverse patches before cleaning build directory (simple-patchsys.mk)
(closes: #387103)
* cdbs-edit-patch:
- Test directory after checking for help message (closes: #389503)
- Support patches ending in .diff (closes: #389508)
- Ensure exit status 0 in case of success (closes: #389929)
* Added XS-X-Vcs-Svn field
* Move dh_installinit to binary-fixup to make sure its postinst fragment
is the last (debhelper.mk) (closes: 386970)
diff -Nru --exclude '*svn*' /tmp/SS76bqOm0T/cdbs-0.4.46/1/rules/debhelper.mk.in /tmp/usdQVJ5tZY/cdbs-0.4.47/1/rules/debhelper.mk.in
--- /tmp/SS76bqOm0T/cdbs-0.4.46/1/rules/debhelper.mk.in 2006-06-06 21:20:00.000000000 +0200
+++ /tmp/usdQVJ5tZY/cdbs-0.4.47/1/rules/debhelper.mk.in 2006-09-30 01:28:36.000000000 +0200
@@ -158,7 +158,6 @@
dh_installinfo -p$(cdbs_curpkg) $(DEB_INSTALL_INFO_$(cdbs_curpkg))
dh_installmenu -p$(cdbs_curpkg) $(DEB_DH_INSTALL_MENU_ARGS)
dh_installcron -p$(cdbs_curpkg) $(DEB_DH_INSTALL_CRON_ARGS)
- dh_installinit -p$(cdbs_curpkg) $(if $(DEB_UPDATE_RCD_PARAMS),--update-rcd-params="$(call cdbs_strip_quotes,$(DEB_UPDATE_RCD_PARAMS))",$(if $(DEB_UPDATE_RCD_PARAMS_$(cdbs_curpkg)),--update-rcd-params="$(call cdbs_strip_quotes,$(DEB_UPDATE_RCD_PARAMS_$(cdbs_curpkg)))")) $(DEB_DH_INSTALLINIT_ARGS)
dh_installdebconf -p$(cdbs_curpkg) $(DEB_DH_INSTALLDEBCONF_ARGS)
dh_installemacsen -p$(cdbs_curpkg) $(if $(DEB_EMACS_PRIORITY),--priority=$(DEB_EMACS_PRIORITY)) $(if $(DEB_EMACS_FLAVOR),--flavor=$(DEB_EMACS_FLAVOR)) $(DEB_DH_INSTALLEMACSEN_ARGS)
dh_installcatalogs -p$(cdbs_curpkg) $(DEB_DH_INSTALLCATALOGS_ARGS)
@@ -199,6 +198,7 @@
dh_compress -p$(cdbs_curpkg) $(call cdbs_add_dashx,$(DEB_COMPRESS_EXCLUDE)) $(DEB_DH_COMPRESS_ARGS)
dh_fixperms -p$(cdbs_curpkg) $(call cdbs_add_dashx,$(DEB_FIXPERMS_EXCLUDE)) $(DEB_DH_FIXPERMS_ARGS)
$(if $(is_debug_package),,dh_makeshlibs -p$(cdbs_curpkg) $(DEB_DH_MAKESHLIBS_ARGS))
+ dh_installinit -p$(cdbs_curpkg) $(if $(DEB_UPDATE_RCD_PARAMS),--update-rcd-params="$(call cdbs_strip_quotes,$(DEB_UPDATE_RCD_PARAMS))",$(if $(DEB_UPDATE_RCD_PARAMS_$(cdbs_curpkg)),--update-rcd-params="$(call cdbs_strip_quotes,$(DEB_UPDATE_RCD_PARAMS_$(cdbs_curpkg)))")) $(DEB_DH_INSTALLINIT_ARGS)
# This rule is called right before building the binary .deb packages
# for each package, but after the binary-predeb hooks have been run.
diff -Nru --exclude '*svn*' /tmp/SS76bqOm0T/cdbs-0.4.46/1/rules/simple-patchsys.mk.in /tmp/usdQVJ5tZY/cdbs-0.4.47/1/rules/simple-patchsys.mk.in
--- /tmp/SS76bqOm0T/cdbs-0.4.46/1/rules/simple-patchsys.mk.in 2006-08-02 20:33:20.000000000 +0200
+++ /tmp/usdQVJ5tZY/cdbs-0.4.47/1/rules/simple-patchsys.mk.in 2006-09-26 21:55:21.000000000 +0200
@@ -59,7 +59,7 @@
post-patches:: apply-patches
-clean:: reverse-patches
+cleanbuilddir:: reverse-patches
for dir in $(DEB_PATCHDIRS) ; do \
rm -f $$dir/*.log ; \
done
diff -Nru --exclude '*svn*' /tmp/SS76bqOm0T/cdbs-0.4.46/debian/changelog /tmp/usdQVJ5tZY/cdbs-0.4.47/debian/changelog
--- /tmp/SS76bqOm0T/cdbs-0.4.46/debian/changelog 2006-08-03 20:08:29.000000000 +0200
+++ /tmp/usdQVJ5tZY/cdbs-0.4.47/debian/changelog 2006-09-30 01:28:31.000000000 +0200
@@ -1,3 +1,17 @@
+cdbs (0.4.47) UNRELEASED; urgency=medium
+
+ * Reverse patches before cleaning build directory (simple-patchsys.mk)
+ (closes: #387103)
+ * cdbs-edit-patch:
+ - Test directory after checking for help message (closes: #389503)
+ - Support patches ending in .diff (closes: #389508)
+ - Ensure exit status 0 in case of success (closes: #389929)
+ * Added XS-X-Vcs-Svn field
+ * Move dh_installinit to binary-fixup to make sure its postinst fragment
+ is the last (debhelper.mk) (closes: 386970)
+
+ -- Peter Eisentraut <petere@debian.org> Sat, 30 Sep 2006 01:28:10 +0200
+
cdbs (0.4.46) unstable; urgency=high
* Changed patch stamp file naming scheme to handle equally named patches
diff -Nru --exclude '*svn*' /tmp/SS76bqOm0T/cdbs-0.4.46/debian/control /tmp/usdQVJ5tZY/cdbs-0.4.47/debian/control
--- /tmp/SS76bqOm0T/cdbs-0.4.46/debian/control 2006-07-13 22:35:07.000000000 +0200
+++ /tmp/usdQVJ5tZY/cdbs-0.4.47/debian/control 2006-09-30 00:53:37.000000000 +0200
@@ -5,6 +5,7 @@
Build-Depends-Indep: debhelper (>= 5), graphviz, realpath, fakeroot, python-dev, python2.3, python2.4, libxml2-utils, xsltproc, docbook-xml, docbook-xsl, db2latex-xsl, tetex-extra, ant, kaffe, sharutils, gs-common
Uploaders: Jeff Bailey <jbailey@raspberryginger.com>, Jonas Smedegaard <dr@jones.dk>, Marc Dequènes (Duck) <Duck@DuckCorp.org>, Peter Eisentraut <petere@debian.org>
Standards-Version: 3.7.2
+XS-X-Vcs-Svn: svn://svn.debian.org/build-common/
Package: cdbs
Architecture: all
diff -Nru --exclude '*svn*' /tmp/SS76bqOm0T/cdbs-0.4.46/scripts/cdbs-edit-patch /tmp/usdQVJ5tZY/cdbs-0.4.47/scripts/cdbs-edit-patch
--- /tmp/SS76bqOm0T/cdbs-0.4.46/scripts/cdbs-edit-patch 2006-05-24 19:20:51.000000000 +0200
+++ /tmp/usdQVJ5tZY/cdbs-0.4.47/scripts/cdbs-edit-patch 2006-09-28 17:47:28.000000000 +0200
@@ -22,19 +22,23 @@
'
}
-dh_testdir
-
if [ -z "$1" ] || [ "$1" = "--help" ]; then
echo "Usage: $0 <patch name>"
exit 0
fi
+dh_testdir
+
SRCDIR=$(pwd)
-PATCHNAME=${1%.patch}.patch
TMP=$(mktemp -t -d cdbs-new-patch.XXXXXX)
TMP2=$(mktemp -t cdbs-old-patch-header.XXXXXX)
trap "rm -rf $TMP $TMP2" 0 1 2 3 9 11 13 15
+case $1 in
+ *.diff|*.patch) PATCHNAME=$1;;
+ *) PATCHNAME=$1.patch;;
+esac
+
ORIGDIR=$(basename $(pwd))
NEWDIR=$ORIGDIR.new
@@ -50,7 +54,7 @@
[ -e "debian/patches/$PATCHNAME" ] || touch "debian/patches/$PATCHNAME"
# remove all patches later than the one to edit
-for p in $(find debian/patches -type f -name "*.patch" | LC_COLLATE=C sort -r); do
+for p in $(find debian/patches -type f \( -name "*.diff" -o -name "*.patch" \) | LC_COLLATE=C sort -r); do
rm -f "$p"
pname=$(basename "$p")
[ "$pname" != "$PATCHNAME" ] || break
@@ -98,3 +102,5 @@
cd $TMP
diff -Nur $ORIGDIR $NEWDIR >> $SRCDIR/debian/patches/$PATCHNAME
fi
+
+exit 0
Reply to: