diff options
| -rw-r--r-- | debian/changelog | 28 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/patchsys-quilt.mk | 3 | ||||
| -rwxr-xr-x | debian/rules | 6 |
4 files changed, 37 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 4fd19c6..a5797c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,31 @@ +quilt (0.37-5) unstable; urgency=low + + * Let cdbs track the build-dep automatically. + * Make sure people letting cdbs tracking the builddeps for them will get + the one on quilt when using the quilt patchsys. + Fix upstream bugs: + * Strip out the letters from the bash version before [numerical] comparison + (Closes: #288839) + * Make sure directories are completed with the trailing '/' (for further + completion) where quilt expects a file and refuses any directory. + (Closes: #281256) + + -- Martin Quinson <mquinson@debian.org> Thu, 6 Jan 2005 07:51:02 +0100 + +quilt (0.37-4) unstable; urgency=low + + * Fix the 'patches' command (print the patch names again). + (Closes: #286293). + + -- Martin Quinson <mquinson@debian.org> Thu, 23 Dec 2004 14:48:35 +0100 + +quilt (0.37-3) unstable; urgency=low + + * Fix extra trailing space in series file after quilt refresh. + (Closes: #285865) + + -- Martin Quinson <mquinson@debian.org> Thu, 16 Dec 2004 21:33:54 +0100 + quilt (0.37-2) unstable; urgency=low * Fix a quoting issue in bash_autocompletion. Patch from upstream CVS. diff --git a/debian/control b/debian/control index 1dc6c50..96e6c5d 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Source: quilt Section: devel Priority: optional Maintainer: Martin Quinson <mquinson@debian.org> -Build-Depends: debhelper (>= 4.1.0), cdbs, gettext +Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0), gettext Standards-Version: 3.6.1.0 Package: quilt diff --git a/debian/patchsys-quilt.mk b/debian/patchsys-quilt.mk index cae029e..50a1910 100644 --- a/debian/patchsys-quilt.mk +++ b/debian/patchsys-quilt.mk @@ -60,6 +60,9 @@ DEB_QUILT_SERIES = $(DEB_PATCHDIRS)/series # Internal variables, do not change it unless you know what you're doing DEB_QUILT_CMD = cd $(DEB_SRCDIR) && $(if $(DEB_QUILT_PATCHDIR_LINK),QUILT_PATCHES=$(DEB_QUILT_PATCHDIR_LINK)) quilt +# Declare Build-Dep of packages using this file onto quilt +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), quilt + post-patches:: apply-patches clean:: reverse-patches diff --git a/debian/rules b/debian/rules index b26b096..81ea47b 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,11 @@ #!/usr/bin/make -f # -*- mode: makefile; coding: utf-8 -*- -# $Id: rules,v 1.14 2004/12/08 19:04:26 mquinson Exp $ +# $Id: rules,v 1.15 2005/01/06 19:32:53 mquinson Exp $ + +# Let cdbs track the build-dep for me +debian/control:: debian/control.in debian/rules +DEB_AUTO_UPDATE_DEBIAN_CONTROL = yes # Import Common Debian Build System (CDBS). include /usr/share/cdbs/1/rules/debhelper.mk |