diff options
-rw-r--r-- | debian/changelog | 411 | ||||
-rw-r--r-- | debian/compat | 1 | ||||
-rw-r--r-- | debian/control | 34 | ||||
-rw-r--r-- | debian/copyright | 16 | ||||
-rw-r--r-- | debian/patchsys-quilt.mk | 125 | ||||
-rw-r--r-- | debian/quilt.debbuild.mk | 293 | ||||
-rw-r--r-- | debian/quilt.docs | 3 | ||||
-rw-r--r-- | debian/quilt.install | 13 | ||||
-rw-r--r-- | debian/quilt.make | 24 | ||||
-rwxr-xr-x | debian/rules | 32 |
10 files changed, 0 insertions, 952 deletions
diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 607799f..0000000 --- a/debian/changelog +++ /dev/null @@ -1,411 +0,0 @@ -quilt (0.43-1) unstable; urgency=low - - * New upstream release - - bin/guards.in: s/ocnfiguration/configuration/ - (Closes: #341518) - - doc/quilt.1.in: Document common options to all commands - (Closes: #334408) - - -- Martin Quinson <mquinson@debian.org> Thu, 1 Dec 2005 14:38:10 +0100 - -quilt (0.42-1) unstable; urgency=low - - * New upstream release. - - New commands: - annotate: to see which patch modify which line of a file - header: to print or change the patch header - rename: to rename patches - - New options: - {diff,refresh} --no-index: suppress Index: lines in patch - delete -n: delete the next patch after topmost - --version: print the program version - - Rework the german translation (Closes: #313827). - * [Makefile.in]: in Debian, the docdir is /usr/share/doc/quilt, without - the version number. (Closes: #321155) - * Use the full path to /usr/sbin/sendmail (Closes: #318924) - * Add text and html versions of the pdf documentation (Closes: #320294) - Build-dep on hevea and lynx to get it working. Damn, that's huge deps - - -- Martin Quinson <mquinson@debian.org> Wed, 29 Jun 2005 18:52:42 +0200 - -quilt (0.40-6) unstable; urgency=low - - [patchsys-quilt.mk] - * Don't call update-config after reverting patches. (Closes: #299010) - - -- Martin Quinson <mquinson@debian.org> Wed, 29 Jun 2005 18:52:42 +0200 - -quilt (0.40-5) unstable; urgency=low - - [Packaging] - * Do not automatically generate debian/control.in since it is now - forbidden by policy. - [quilt.debbuild.mk] - * also cleanup arch cruft from debian dirs (patch stolen from cdbs) - * Pass the -nd flag to wget when fetching upstream source to avoid - by all means creating a dirctory structure. - - -- Martin Quinson <mquinson@debian.org> Wed, 29 Jun 2005 10:36:57 +0200 - -quilt (0.40-4) unstable; urgency=low - - * Do depend on patchutils only when using cdbs - (dependency moved from control.in to patchsys-quilt.mk) - * quilt.debuild.mk: Also cleanup svn stuff from debian dirs - - -- Martin Quinson <mquinson@debian.org> Sun, 22 May 2005 11:23:27 +0200 - -quilt (0.40-3) unstable; urgency=low - - * Depend on patchutils (>= 0.2.25) since we use lsdiff -H to fix #295913 - - -- Martin Quinson <mquinson@debian.org> Fri, 13 May 2005 18:43:23 +0200 - -quilt (0.40-2) unstable; urgency=low - - * Add /usr/share/quilt/quilt.debbuild.mk to ease the build from the cvs - of debian packages using quilt. Read its header for documentation. - - -- Martin Quinson <mquinson@debian.org> Thu, 12 May 2005 23:02:13 +0200 - -quilt (0.40-1) unstable; urgency=low - - * New upstream version - * Add /usr/share/quilt/quilt.make for the ones not using CDBS. - The "patch" and "unpatch" targets are implemented. - - -- Martin Quinson <mquinson@debian.org> Wed, 11 May 2005 15:51:51 +0200 - -quilt (0.39-3) unstable; urgency=low - - * Add a word in the man page about how to display compressed pdf files - since this non-bug got reported twice now (Closes: #304848). - - -- Martin Quinson <mquinson@debian.org> Tue, 26 Apr 2005 16:02:16 +0200 - -quilt (0.39-2) unstable; urgency=low - - * Pass -p $opt_strip_level option to diffstat in refresh command. - (Closes: #298785) - * fixes from upstream cvs: - - Add a missing "exit 1" to quilt/fold.in when no patches are applied. - - typo in graph help message. - - -- Martin Quinson <mquinson@debian.org> Wed, 23 Mar 2005 11:10:07 +0100 - -quilt (0.39-1) unstable; urgency=low - - * New upstream release. - 0.38 were mostly bugfixes, and those bugs were also reported against - debian package, so I had to steal most of the cvs content already. - 0.39 is also mainly bugfixes. There is a new "mail" command I didn't - test yet. ;) - - * Refuse to add symlinks into patches since we fail to backup them - properly. (Closes: #294424). Will be in 0.40 ;) - * Take care of the lost souls patching their config.* files. - Cdbs updates them automatically. Thanks to Robert Millan for detecting - the issue (in cdbs) and proposing a fix (in quilt). (Closes: #295913). - - This implies a versionned depend on cdbs (>=0.4.27-1) for using packages, - since part of the fix is in there. quilt itself suggests this version. - - -- Martin Quinson <mquinson@debian.org> Thu, 24 Feb 2005 13:51:10 +0100 - -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. - (Closes: #285322) - - -- Martin Quinson <mquinson@debian.org> Mon, 13 Dec 2004 14:54:25 +0100 - -quilt (0.37-1) unstable; urgency=low - - * New upstream release(s. I missed the 0.36, sorry): - - "quilt new" now work from a sub-dir (instead of creating a new - patches/ dir in the current one). - - allow to list all modified files (within patch ranges). - - japaneese translation. - - touch files after they are restored to not confuse make and friends. - - various bug fixes. - * Fix a bashism in patchsys-quilt.mk (Closes: #275253) - * Useless cleanup in debian/rules (Closes: #268967) - * Acknoledge NMU. Thanks Matt! (Closes: #264053) - * Use my Debian address as maintainer. - * Fix two typos in description. Thanks Matt (Kraii) ! (Closes: #266195) - - -- Martin Quinson <martin.quinson@tuxfamily.org> Wed, 8 Dec 2004 16:12:21 +0100 - -quilt (0.35-1.1) unstable; urgency=low - - * NMU at maintainer's request - * Add ${shlibs:Depends} to debian/control:Depends (Closes: #264053) - - -- Matt Zimmerman <mdz@debian.org> Fri, 6 Aug 2004 18:41:46 -0700 - -quilt (0.35-1) unstable; urgency=low - - * New upstream version. - - bash completion made usable (even out of Debian). - - New configuration variables: QUILT_<command>_ARGS amongst others. - - Reintroduction of the diffstat feature (--diffstat option of refresh). - - Setting QUILT_PATCHES_PREFIX asks quilt to display the full path to - the patches instead of the patch names (for copy/paste). - - Ability to specify the type of patch, and the context length (-u, -U - num, -c, and -C num options of diff and refresh). - - Syntax highlighting (--color option of diff). - - Various bug fixes. - - -- Martin Quinson <martin.quinson@tuxfamily.org> Thu, 15 Jul 2004 15:06:43 -0700 - -quilt (0.34-2) unstable; urgency=low - - * [patchsys-quilt.mk] Fix a stupid bug preventing to work on empty - patch series - - -- Martin Quinson <martin.quinson@tuxfamily.org> Fri, 11 Jun 2004 10:45:08 -0700 - -quilt (0.34-1) unstable; urgency=low - - * New upstream release. - - Backward compatibility of .pc directory implemented - * Get ride of the now useless big fat warning in NEWS.Debian about that. - * Use the manpage generated by the upstream makefile, and remove the - one embeeded in the debian dir. - - -- Martin Quinson <martin.quinson@tuxfamily.org> Thu, 10 Jun 2004 16:35:00 -0700 - -quilt (0.33-1) unstable; urgency=low - - * New upstream release. - - Return exit status 2 when commands go beyond the series (push when - already on top, and so on) - - Bunch of bug fixes. - * [patchsys-quilt.mk] quilt return 2 when there was nothing to do. - - -- Martin Quinson <martin.quinson@tuxfamily.org> Tue, 8 Jun 2004 11:54:58 -0700 - -quilt (0.32-3) unstable; urgency=low - - * push exits 0 when no patch is to be pushed. - - -- Martin Quinson <martin.quinson@tuxfamily.org> Thu, 3 Jun 2004 08:46:23 -0700 - -quilt (0.32-2) unstable; urgency=low - - * Use relative link for debian/patches. Closes: #242342 - * Specify we want to use gawk since mawk causes trouble. Closes: #251972. - * Add an entry to NEWS.Debian warning about the breakage in opened tree - occuring between 0.30 and 0.32 versions. At least people using - apt-listchanges will be warned about that. It looks like the best we can - do for now. - * pop exits 0 when no patch is to be removed. - - -- Martin Quinson <martin.quinson@tuxfamily.org> Tue, 1 Jun 2004 11:41:51 -0700 - -quilt (0.32-1) unstable; urgency=low - - * New upstream release. - - It is now possible to use quilt from within sub-directories of the - working tree. Quilt will automatically find the root of the tree. - - New 'graph' command to display neat graphics of patch dependencies. - - 'fork' semantic reverted to previous one: the forked patch is the - topmost one, not the next in the series. - - documentation update. - - man page (provided by your servitor ;) - * Fix a typo in output of setup -l. Closes #236933 - * Rephrase package description. Closes #236221 - - -- Martin Quinson <martin.quinson@tuxfamily.org> Fri, 19 Mar 2004 10:00:03 -0800 - -quilt (0.30-4) unstable; urgency=low - - * patchsys-quilt.mk: - Various improvements from David Kimdon. Closes: #234449 - - rm debian/stamp-patch in reverse-patches (instead of clean) so that this - target can be called directly. - - Make those rules usable along with the cdbs tarball.mk ones. - - remove a dupplicated useless line - - -- Martin Quinson <martin.quinson@tuxfamily.org> Wed, 25 Feb 2004 10:22:39 -0800 - -quilt (0.30-3) unstable; urgency=low - - * Add a man page from the upstream CVS. Closes: #219318 - - -- Martin Quinson <martin.quinson@tuxfamily.org> Mon, 23 Feb 2004 08:43:08 -0800 - -quilt (0.30-2) unstable; urgency=low - - * [debian/control] - - Remove the dependency on bash since it's an essential package. - - Upgrade the dependency on debhelper to (>= 4.1.0) as requested by cdbs. - * [debian/quilt.install] - - Reput quilt.pdf in the package back, and make sure it won't disapear - anymore. - - -- Martin Quinson <martin.quinson@tuxfamily.org> Mon, 2 Feb 2004 16:45:12 -0800 - -quilt (0.30-1) unstable; urgency=low - - * New upstream release. - * Fix the URL of the project (Closes #223387). - * add a dependency on gawk (Closes #227111). - - -- Martin Quinson <martin.quinson@tuxfamily.org> Fri, 30 Jan 2004 16:10:23 -0800 - -quilt (0.29-3) unstable; urgency=low - - * force the shell to be bash, since we use tons of bashism - - -- Martin Quinson <martin.quinson@tuxfamily.org> Mon, 24 Nov 2003 11:24:15 +0100 - -quilt (0.29-2) unstable; urgency=low - - * Add the patchsys-quilt.mk file achieving the integration of quilt within - cdbs. - * Install the upstream changelog under the changelog.gz name. - * Remove several files left over in the debian/ dir. - * Bump standard-version to 3.6.1.0: convert all control files to utf8. - - -- Martin Quinson <martin.quinson@tuxfamily.org> Mon, 24 Nov 2003 10:24:15 +0100 - -quilt (0.29-1) unstable; urgency=low - - * New upstream version. - * Repackage to use cdbs. - - -- Martin Quinson <martin.quinson@tuxfamily.org> Thu, 20 Nov 2003 11:04:34 +0100 - -quilt (0.25-4) unstable; urgency=low - - * Various cleanup in the packaging (like removing a `pwd` in the debian/rules) - - -- Martin Quinson <martin.quinson@tuxfamily.org> Thu, 6 Nov 2003 16:27:15 +0100 - -quilt (0.25-3) unstable; urgency=low - - * Do not invoke autoconf during the build process since I do not change this file. - That way, autobuilder will be happy even without build-depend (Closes: #217055). - - -- Martin Quinson <martin.quinson@tuxfamily.org> Fri, 31 Oct 2003 00:18:43 +0100 - -quilt (0.25-2) unstable; urgency=low - - * Do not install anything under /usr/share/doc/quilt-version/ - Thanks to Daniel Jacobowitz for reporting that bug. - - -- Martin Quinson <martin.quinson@tuxfamily.org> Fri, 12 Sep 2003 08:18:29 +0200 - -quilt (0.25-1) unstable; urgency=low - - * New upstream release. - * Set LC_ALL to C during the build so that the README.gz becomes in - english and not french. Thanks to Jan-Benedict Glaw for reporting that - issue. - - -- Martin Quinson <martin.quinson@tuxfamily.org> Tue, 9 Sep 2003 08:30:52 +0200 - -quilt (0.24-1) unstable; urgency=low - - * New upstream release - * debquilt.mk: Makefile chunk to manage debian packages using quilt - - -- Martin Quinson <martin.quinson@tuxfamily.org> Thu, 26 Jun 2003 15:26:16 +0200 - -quilt (0.23-1) unstable; urgency=low - - * New upstream release - * Hardcode location of bash - - -- Martin Quinson <martin.quinson@tuxfamily.org> Wed, 9 Apr 2003 09:54:30 +0200 - -quilt (0.22-1) unstable; urgency=low - - * New upstream release - - -- Martin Quinson <martin.quinson@tuxfamily.org> Fri, 14 Feb 2003 14:12:31 +0100 - -quilt (0.21-2) unstable; urgency=low - - * Fight lintian warnings and error: - - Format copyright file properly - - Don't depend on essential packages - - Change Build-Depends-Indep: to Build-Depends: since the package is - now arch-dependent. - - Update to lastest standards - * The documentation did move one more time. - - -- Martin Quinson <martin.quinson@tuxfamily.org> Fri, 31 Jan 2003 09:21:03 +0100 - -quilt (0.21-1) unstable; urgency=low - - * New upstream release. - * Change from architecture: all to architecture: any, since we now have a - compiled C programm. - * Add the new documentation provided. - - -- Martin Quinson <martin.quinson@tuxfamily.org> Wed, 29 Jan 2003 10:19:31 +0100 - -quilt (0.11-1) unstable; urgency=low - - * New upstream release. New upstream author. Developement moved to savannah. - * Some functionnalities were removed, but all the scripts are much more robust now. - - -- Martin Quinson <martin.quinson@tuxfamily.org> Sat, 18 Jan 2003 23:36:29 +0100 - -quilt (0.8.1-1) unstable; urgency=low - - * New upstream release - * Should now work if installed in /usr/lib or if unpacked in the current - directory. - - -- Martin Quinson <martin.quinson@tuxfamily.org> Wed, 11 Dec 2002 09:31:28 +0100 - -quilt (0.8-1) unstable; urgency=low - - * New upstream release - - -- Martin Quinson <martin.quinson@tuxfamily.org> Wed, 6 Nov 2002 22:48:32 +0100 - -quilt (0.6-1) unstable; urgency=low - - * New upstream release - - -- Martin Quinson <martin.quinson@tuxfamily.org> Wed, 6 Nov 2002 22:48:32 +0100 - -quilt (0.4-1) unstable; urgency=low - - * Initial Release. - - -- Martin Quinson <martin.quinson@tuxfamily.org> Tue, 29 Oct 2002 09:29:20 +0100 - -# -*- coding: utf-8 -*- diff --git a/debian/compat b/debian/compat deleted file mode 100644 index b8626c4..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/debian/control b/debian/control deleted file mode 100644 index 7d0db99..0000000 --- a/debian/control +++ /dev/null @@ -1,34 +0,0 @@ -# -*- coding: utf-8 -*- - -Source: quilt -Section: devel -Priority: optional -Maintainer: Martin Quinson <mquinson@debian.org> -Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0), gettext, hevea, lynx -Standards-Version: 3.6.1.0 - -Package: quilt -Architecture: any -Depends: patch, diffstat, bzip2, gettext, gawk, ${shlibs:Depends} -Suggests: ccache -Description: Tool to work with series of patches - Quilt manages a series of patches by keeping track of the changes - each of them makes. They are logically organized as a stack, and you can - apply, un-apply, refresh them easily by traveling into the stack (push/pop). - . - Quilt is good for managing additional patches applied to a package received - as a tarball or maintained in another version control system. The stacked - organization proved to be efficient for the management of very large patch - sets (more than hundred patches). As matter of fact, it was designed by and - for linux kernel hackers (Andrew Morton, from the -mm branch, is the - original author), and its main use by the current upstream maintainer is to - manage the (hundreds of) patches against the kernel made for the SUSE - distribution. - . - This package completely integrates into the CDBS, allowing maintainers - using this new paradigm for their packaging script to benefit of the quilt - comfort when editing their diff against upstream. The package also provide - some basic support for the fool not using CDBS (yet). - . - http://savannah.nongnu.org/projects/quilt is the current best approximation - of an upstream homepage. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 87164f7..0000000 --- a/debian/copyright +++ /dev/null @@ -1,16 +0,0 @@ -# -*- coding: utf-8 -*- -This package was debianized by Martin Quinson <mquinson@blaise.ens-lyon.fr> on -Tue, 29 Oct 2002 09:29:20 +0100. - -It was downloaded from: - -https://savannah.nongnu.org/projects/quilt/ - -Upstream Authors: - Andrew Morton <akpm@digeo.com> - Andreas Gruenbacher <agruen@suse.de> - -Copyright: - -These scripts are released under the GPL, available on any Debian box at: -/usr/share/common-licenses/GPL diff --git a/debian/patchsys-quilt.mk b/debian/patchsys-quilt.mk deleted file mode 100644 index f485a99..0000000 --- a/debian/patchsys-quilt.mk +++ /dev/null @@ -1,125 +0,0 @@ -# -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2003 Martin Quinson <martin.quinson@tuxfamily.org> -# Description: An advanced patch system based on the quilt facilities. -# please refere to the documentation of the quilt package for more information. -# -# Used variables for configuration: -# - -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2, or (at -# your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -# 02111-1307 USA. - -ifndef _cdbs_bootstrap -_cdbs_scripts_path ?= /usr/lib/cdbs -_cdbs_rules_path ?= /usr/share/cdbs/1/rules -_cdbs_class_path ?= /usr/share/cdbs/1/class -endif - -ifndef _cdbs_rules_patchsys_quilt -_cdbs_rules_patchsys_quilt := 1 - -ifdef _cdbs_rules_patchsys -$(error cannot load two patch systems at the same time) -endif - -include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) - -DEB_SRCDIR ?= . - -_cdbs_patch_system_apply_rule := apply-patches -_cdbs_patch_system_unapply_rule := reverse-patches - -# DEB_PATCHDIRS: directory containing your source file for patches. -DEB_PATCHDIRS = $(shell pwd)/debian/patches - -# DEB_QUILT_PATCHDIR_LINK -# By default, quilt expects to find the patch files into the /patches directory. -# Since it is often more pleasant to place them into /debian/patches, a link -# is created by this makefile chunk to fix it. -# In the case where you already have a /patches directory in your package, -# redefine this variable to somewhere else, and set QUILT_PATCHES in your -# $HOME/.quiltrc (so that quilt knows where to search for this) -DEB_QUILT_PATCHDIR_LINK = patches - -# 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 - -# Build-Dep on patchutils to check for fool souls patching config.* files -# This is a Bad Thing since cdbs updates those files automatically. -# (code stolen from cdbs itself, in dpatch.mk) - -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), patchutils (>= 0.2.25) - -# target reverse-config, which we use, don't exist in old cdbs -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.27-1) - -evil_patches_that_do_nasty_things := $(shell \ -if lsdiff=`which lsdiff` ; then \ - patchlist=`$(DEB_QUILT_CMD) series \ - | sed 's|^|$(if $(DEB_QUILT_PATCHDIR_LINK),$(DEB_QUILT_PATCHDIR_LINK)/)|' \ - | tr "\n" " "`; \ - if [ "x$$patchlist" != x ] ; then \ - $$lsdiff -H $$patchlist \ - | grep "/config\.\(guess\|sub\|rpath\)$$" | tr "\n" " " ; \ - fi;\ -fi) -ifneq (, $(evil_patches_that_do_nasty_things)) -$(warning WARNING: The following patches are modifying auto-updated files. This can result in serious trouble: $(evil_patches_that_do_nasty_things)) -endif - - -post-patches:: apply-patches - -clean:: reverse-patches - -# The patch subsystem -apply-patches: pre-build debian/stamp-patched -debian/stamp-patched: - # reverse-config must be first - $(MAKE) -f debian/rules reverse-config - - if [ -n "$(DEB_QUILT_PATCHDIR_LINK)" ] ; then \ - if [ -L $(DEB_SRCDIR)/$(DEB_QUILT_PATCHDIR_LINK) ] ; then : ; else \ - (cd $(DEB_SRCDIR); ln -s $(DEB_PATCHDIRS) $(DEB_QUILT_PATCHDIR_LINK)) ; \ - fi ; \ - fi - # quilt exits with 2 as return when there was nothing to do. - # That's not an error here (but it's usefull to break loops in crude scripts) - $(DEB_QUILT_CMD) push -a || test $$? = 2 - touch debian/stamp-patched - - $(MAKE) -f debian/rules update-config - # update-config must be last - -reverse-patches: - # reverse-config must be first - $(MAKE) -f debian/rules reverse-config - - if [ -d "$(DEB_SRCDIR)" ] ; then \ - $(DEB_QUILT_CMD) pop -a -R || test $$? = 2 ; \ - fi - if [ -n "$(DEB_QUILT_PATCHDIR_LINK)" ] ; then \ - if [ -L $(DEB_SRCDIR)/$(DEB_QUILT_PATCHDIR_LINK) ] ; then \ - rm $(DEB_SRCDIR)/$(DEB_QUILT_PATCHDIR_LINK) ; \ - fi ; \ - fi - rm -rf $(DEB_SRCDIR)/.pc - rm -f debian/stamp-patch* - -endif diff --git a/debian/quilt.debbuild.mk b/debian/quilt.debbuild.mk deleted file mode 100644 index 3f007f4..0000000 --- a/debian/quilt.debbuild.mk +++ /dev/null @@ -1,293 +0,0 @@ -# -# This makefile chunk is intended to ease my work on packages. I hope it can -# reveal useful to other people too. But if you see some cruft here and -# there, you'll know why ;) -# -# Several of the package I work on (shadow, most of the pkg-grid alioth -# project) use quilt to manage diff onto upstream tarball. -# -# We only store the debian directory in the SCM since all changes must be -# done as patch managed by quilt. -# -# This makefile is intended to be copied in the directory containing the -# debian/ tree. It can: -# -# - Download the upstream tarball and open it on need -# * Define the SITE variable to tell it where to search for it (with wget) -# * The package name is guessed from the current directory, but can be -# explicitly given as the PKG variable. -# * The verion number must be given as VER variable -# -# - Copy the debian directory onto the working directory -# (yeah, cp debian/ $(PKG)-$(VER)/debian. I see you're following) -# -# - Build the package, capturing the output with script -# -# - Ensure that just after the package build, we have such a link: -# $(PKG)-$(VER)/debian/patches -> debian/patches -# So, changes to the patches with quilt gets saved out of the -# $(PKG)-$(VER) tree, which can be erased at any time without loss. -# Of course, just before the build, the makefile ensures that this link -# is replaced by a copy of the debian/patches directory to make -# dpkg-buildpackage happy - -# TARGETS: -# -# deb: Do what's documented above. -# -# debsign: don't add -us -uc to dpkg-buildpackage invocation -# check-complet: for multi-binary packages, make sure that all the content -# of debian/tmp gets moved away [to the right place] by dh_install -# check-lintian: -# check-linda: -# check: all of the check-* above -# scan or watch: watch for new upstream tarballs - -# VARIABLES which you can use to configure stuff: -# -# PKG: package name (defaults to the current directory name) -# VER: package version (defaults to the changelog entry in debian/changelog) -# UP_TAR: name of the tarfile, as called upstream -# Defaults to $(PKG)-$(UP_VER).tar.gz where UP_VER is VER without -nn part -# Useful to get it downloaded and/or opened automatically -# EXTRA_OPEN_CMD: what to do after untarring upstream tarball. -# When upstream tarball doesn't contain a gentle $(PKG)-$(UP_VER) as -# expected by dpkg-buildpackage, do this: -# EXTRA_OPEN_CMD=mv the_funky_dir_name_given_upstream $(PKG)-$(UP_VER) -# SITE: where to get the upstream tarball (we do "wget $(SITE)/$(UP_TAR)") -# - -# CAVEATS: -# -# - $(PKG)-$(VER) is not considered as precious at all. Don't change -# anything in it. In particular, don't change $(PKG)-$(VER)/debian files. - -############## -### That's it. -### The actual makefile chunk follows, but you shouldn't need to dig into it -############## - -PKG?=$(shell pwd |sed 's|.*/||') -VER?=$(shell dpkg-parsechangelog -ldebian/changelog|grep '^Version'|sed -e 's/[^ ]* //' -e 's/[^:]://') -UP_VER=$(shell echo $(VER)|sed 's/-.*$$//') -UP_TAR?=$(PKG)-$(UP_VER).tar.gz - -######################################################## -##################### BUILD TARGET ##################### -######################################################## - -deb:: $(PKG)-$(UP_VER) stamp-debdir $(PKG)_$(UP_VER).orig.tar.gz - @echo XXXXXXXXXXX Build the deb - rm -rf $(PKG)-$(UP_VER)/debian/patches - @if [ -e debian/patches ] ; then \ - echo "cp -r debian/patches $(PKG)-$(UP_VER)/debian"; \ - cp -r debian/patches $(PKG)-$(UP_VER)/debian; \ - fi - -cd $(PKG)-$(UP_VER) && script -c "dpkg-buildpackage -rfakeroot -uc -us" ../build.log - @if [ -e debian/patches ] ; then \ - rm -rf $(PKG)-$(UP_VER)/debian/patches ; \ - echo "Link patches/ to ../debian/patches" ; \ - cd $(PKG)-$(UP_VER)/debian ; \ - ln -s ../../debian/patches .; \ - fi - -debsign:: $(PKG)-$(UP_VER) stamp-debdir $(PKG)_$(UP_VER).orig.tar.gz - @echo XXXXXXXXXXX Build the deb - rm -rf $(PKG)-$(UP_VER)/debian/patches - @if [ -e debian/patches ] ; then \ - echo "cp -r debian/patches $(PKG)-$(UP_VER)/debian"; \ - cp -r debian/patches $(PKG)-$(UP_VER)/debian; \ - fi - cd $(PKG)-$(UP_VER) && script -c "dpkg-buildpackage -rfakeroot" ../build.log - @if [ -e debian/patches ] ; then \ - rm -rf $(PKG)-$(UP_VER)/debian/patches ; \ - echo "Link patches/ to ../debian/patches" ; \ - cd $(PKG)-$(UP_VER)/debian ; \ - ln -s ../../debian/patches .; \ - fi - -$(PKG)-$(UP_VER):: $(UP_TAR) - @echo XXXXXXXXXXX Open the tarball - rm -rf $(PKG)-$(UP_VER) - tar xfz $(UP_TAR) - $(EXTRA_OPEN_CMD) - -$(UP_TAR):: - @echo XXXXXXXXXXX Download the tarball - @if test -e $(UP_TAR) ; then \ - echo "Tarball found; no download needed."; \ - else \ - if test "x$(SITE)" = x ; then \ - echo "Unable to download $(UP_TAR) since no SITE is provided";\ - echo "Either edit Makefile or download the tarball yourself";\ - exit 1;\ - else \ - wget -nd $(SITE)/$(UP_TAR);\ - fi\ - fi - -stamp-debdir: FORCE - @echo XXXXXXXXXXX Put the debian dir in position - rm -rf $(PKG)-$(UP_VER)/debian - cp -Lr debian $(PKG)-$(UP_VER)/debian - for i in CVS .svn \{arch\} .arch-ids ; do \ - find $(PKG)-$(UP_VER)/debian -type d -name $$i | xargs rm -rf ; \ - done - for i in .cvsignore svn-commit.tmp .arch-inventory ; do \ - find $(PKG)-$(UP_VER)/debian -type f -name $$i | xargs rm -f ; \ - done - touch stamp-debdir - -$(PKG)_$(UP_VER).orig.tar.gz: $(UP_TAR) - @echo XXXXXXXXXXX Copy the orig.tar.gz - cp $(UP_TAR) $(PKG)_$(UP_VER).orig.tar.gz - -FORCE: - -######################################################## -##################### CHECK TARGET ##################### -######################################################## -check-complet: FORCE - @echo XXXXXXXXXXX Check the package for completness - @for file in `find $(PKG)-$(UP_VER)/debian/tmp -type f|\ - sed 's|$(PKG)-$(UP_VER)/debian/tmp/||'` ; do \ - where=`find $(PKG)-$(UP_VER)/debian/*|\ - grep -v '$(PKG)-$(UP_VER)/debian/tmp'|\ - grep $$file|\ - sed -e "s|$(PKG)-$(UP_VER)/debian/||" \ - -e 's|\([^/]*\)/.*|\1|' `; \ - if [ "x$$where" = x ] ; then \ - base=`basename $$file`; \ - where=`find $(PKG)-$(UP_VER)/debian/*|\ - grep -v '$(PKG)-$(UP_VER)/debian/tmp'|\ - grep $$base|\ - sed -e "s|$(PKG)-$(UP_VER)/debian/||" `; \ - if [ "x$$where" = x ] ; then \ - echo "Not Found $$file"; \ - else \ - echo "NOT FOUND $$file (beside $$where)"; \ - fi \ - else \ - echo Found $$file in $$where >/dev/null; \ - fi;\ - done - -check-relocation: FORCE - @echo XXXXXXXXXXX Check the relocation of the package - @for pkg in `grep Package $(PKG)-$(UP_VER)/debian/control|\ - sed 's|Package: ||'` ; do \ - echo "XXX check $$pkg"; \ - LC_ALL=C grep -r $(PWD) $(PKG)-$(UP_VER)/debian/$$pkg |\ - while read line ; do \ - if echo $$line|grep -q 'Binary file' >/dev/null ; then \ - name=`echo $$line|sed 's/Binary file \([^ ]*\) .*$$/\1/'`; \ - echo " Binary $$name =>";\ - strings $$name |grep $(PWD)|\ - grep -v '.c$$'|sed 's/^/ /';\ - else \ - echo " $$line"; \ - fi; \ - done; \ - done - -check-relocation-old: FORCE - @echo XXXXXXXXXXX Check the relocation of the package - @for pkg in `grep Package $(PKG)-$(UP_VER)/debian/control|\ - sed 's|Package: ||'` ; do \ - echo "XXX check $$pkg"; \ - LC_ALL=C grep -r $(PWD) $(PKG)-$(UP_VER)/debian/$$pkg|\ - sed 's/^/ /';\ - done - -check-lintian: FORCE - @echo XXXXXXXXXXX Check the package with lintian - lintian -i *.deb - lintian -i *.dsc - -check-linda: FORCE - @echo XXXXXXXXXXX Check the package with linda - linda -i *.deb - linda -i *.dsc - -check: check-complet check-linda check-lintian - -########################################################## -##################### REMOTE TARGETS ##################### -########################################################## -HOST ?= veloce.inria.fr -remote-real: FORCE - @echo XXXXXXXXXXX Build on $(HOST) - @if [ `ls *.dsc |wc -l` -gt 1 ] ; then \ - echo "There is several dsc files. Please cleanup"; \ - exit 1; \ - fi - files=`cat *.dsc| \ - grep-dctrl -s Files -e -FSource . -n| \ - sed 's/^.*[^ ] *[^ ]* *\([^ ]*\)$$/\1/'`" "`ls *.dsc` ;\ - ssh $(HOST) "rm -rf ~/remotebuild;mkdir ~/remotebuild" ; \ - scp $$files $(HOST):~/remotebuild; \ - ssh $(HOST) "cd remotebuild;dpkg-source -x *.dsc; cd $(PKG)-*; dpkg-buildpackage -rfakeroot -us -uc -B"; \ - scp $(HOST):~/remotebuild/*.deb .; \ - scp $(HOST):~/remotebuild/*.changes .; -# dput local `ssh $(HOST) "cd ~/remotebuild; ls *.changes"` - @echo ok; -# gpg --decrypt - 2>/dev/null |\ - -alpha: FORCE - HOST=veloce.inria.fr $(MAKE) remote-real - -ppc: FORCE - HOST=valnure.cs.ucsb.edu $(MAKE) remote-real - -sparc: FORCE - HOST=sperm.cs.ucsb.edu $(MAKE) remote-real - -sync: FORCE - make -C ~/public_html publish - -remote: alpha ppc sparc sync - - -######################################################## -##################### CLEAN TARGET ##################### -######################################################## - -clean-dsc: FORCE - @echo XXXXXXXXXXX Clean the old versions - @while [ `ls *.dsc |wc -l` -gt 1 -o `ls *.changes |wc -l` -gt 1 ] ; do \ - if [ `ls *.changes |wc -l` -gt 1 ] ; then \ - echo "XXX Cleanup binaries";ls;\ - changes=`ls *.changes|head -1`; \ - list=`grep-dctrl -s Files -n . $$changes|\ - sed 's/^ *//'|\ - cut -d' ' -f5|\ - grep -v '\.dsc$$'`;\ - rm -i $$list $$changes; \ - fi; \ - \ - if [ `ls *.dsc |wc -l` -gt 1 ] ; then \ - echo "XXX Cleanup source";ls;\ - dsc=`ls *.dsc|head -1`; \ - list=`grep-dctrl -s Files -n . $$dsc|\ - sed 's/^ *//'|\ - cut -d' ' -f3|\ - grep -v '\.orig\.tar\.gz$$'`; \ - rm -i $$list $$dsc; \ - fi; \ - done - -clean: clean-dsc - @echo XXXXXXXXXXX Clean the stamps - rm -rf stamp-* - -maintainerclean: clean - rm -rf *.deb *.diff.gz *.dsc *.changes *.upload - rm -rf $(PKG)_$(UP_VER).orig.tar.gz $(PKG)-$(UP_VER) - -scan watch: - uscan --check-dirname-regex 'PACKAGE' --check-dirname-level 2 --report - -.PHONY: FORCE scan watch clean clean-dsc -ifneq (,$(wildcard makefile.override)) -include makefile.override -endif diff --git a/debian/quilt.docs b/debian/quilt.docs deleted file mode 100644 index 0228508..0000000 --- a/debian/quilt.docs +++ /dev/null @@ -1,3 +0,0 @@ -AUTHORS -TODO - diff --git a/debian/quilt.install b/debian/quilt.install deleted file mode 100644 index 318179a..0000000 --- a/debian/quilt.install +++ /dev/null @@ -1,13 +0,0 @@ -etc/bash_completion.d/quilt -usr/bin/* -usr/lib/quilt/* -usr/share/doc/quilt-*/* usr/share/doc/quilt/ -usr/share/locale/* -usr/share/man/* -usr/share/quilt/* -../quilt.debbuild.mk usr/share/quilt -../quilt.make usr/share/quilt -../patchsys-quilt.mk /usr/share/cdbs/1/rules/ - -../../doc/quilt.html usr/share/doc/quilt -../../doc/quilt.txt usr/share/doc/quilt diff --git a/debian/quilt.make b/debian/quilt.make deleted file mode 100644 index f9fe718..0000000 --- a/debian/quilt.make +++ /dev/null @@ -1,24 +0,0 @@ -# -# This file tries to mimick /usr/share/dpatch/dpatch.make -# - -# -*- Makefile -*-, you silly Emacs! -# vim: set ft=make: - -# QUILT_STAMPFN: stamp file to use -QUILT_STAMPFN ?= stamp-patched - -# QUILT_PATCH_DIR: where the patches live -QUILT_PATCH_DIR ?= debian/patches - -patch: $(QUILT_STAMPFN) -$(QUILT_STAMPFN): - # quilt exits with 2 as return when there was nothing to do. - # That's not an error here (but it's usefull to break loops in crude scripts) - QUILT_PATCHES=$(QUILT_PATCH_DIR) quilt push -a || test $$? = 2 - touch debian/$(QUILT_STAMPFN) - -unpatch: - QUILT_PATCHES=$(QUILT_PATCH_DIR) quilt pop -a -R || test $$? = 2 - rm -rf .pc debian/$(QUILT_STAMPFN) - diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 4ffeca4..0000000 --- a/debian/rules +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/make -f -# -*- mode: makefile; coding: utf-8 -*- - -# $Id: rules,v 1.16 2005/12/01 13:45:35 mquinson Exp $ - -# Import Common Debian Build System (CDBS). -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/autotools.mk - -# Here is a badly nammed changelog file -DEB_INSTALL_CHANGELOGS_ALL = quilt.changes - -# installing under debian/tmp... -DEB_MAKE_ENVVARS := BUILD_ROOT=$(CURDIR)/debian/tmp LC_ALL=C - -# ... and moving it to the right dir using dh_install -DEB_DH_INSTALL_SOURCEDIR := debian/tmp - -# force awk to be gawk, since mawk causes trouble -# also specify the full path to sendmail, as requested by policy -DEB_CONFIGURE_EXTRA_FLAGS := --with-awk=/usr/bin/gawk --with-mta=/usr/sbin/sendmail - -# distribute a text version of the doc for fool souls -common-build-arch:: - mkdir doc/tmp || true - cd doc/tmp; LC_ALL=C hevea ../main.tex ; LC_ALL=C hevea ../main.tex; LC_ALL=C hevea ../main.tex - cp doc/tmp/main.html doc/quilt.html - LC_ALL=C perl -e '$$/ = undef; $$f=<>; $$f =~ s|<A[^>]*?HREF="[^"]*#[^"]*">(.*?)</A>|$$1|msg; print $$f;' < doc/tmp/main.html > doc/tmp/tmp.html - LC_ALL=C lynx doc/tmp/tmp.html -dump > doc/quilt.txt - -clean:: - rm -rf doc/quilt.txt doc/quilt.html doc/tmp |