diff options
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | debian/control.in | 4 | ||||
| -rw-r--r-- | debian/patch.mk | 95 | ||||
| -rw-r--r-- | debian/patches/series | 4 | ||||
| -rwxr-xr-x | debian/rules | 2 |
5 files changed, 17 insertions, 98 deletions
diff --git a/debian/changelog b/debian/changelog index e720e69..7b037d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +inetutils (2:1.4.3+20060719-3) UNRELEASED; urgency=low + + * Switched to quilt: + - Add new debian/patches/series file. + - Add Build-Depends on 'quilt (>= 0.40)'. + - Include quilt.make from debian/rules. + - Remove now unused debian/patch.mk. + + -- Guillem Jover <guillem@debian.org> Tue, 3 Oct 2006 04:35:45 +0300 + inetutils (2:1.4.3+20060719-2) unstable; urgency=low * Avoid linking against libbsd for now. diff --git a/debian/control.in b/debian/control.in index 0004722..363571f 100644 --- a/debian/control.in +++ b/debian/control.in @@ -4,8 +4,8 @@ Priority: extra Maintainer: Guillem Jover <guillem@debian.org> Uploaders: Jeff Bailey <jbailey@nisa.net>, Marcus Brinkmann <brinkmd@debian.org> Standards-Version: 3.7.2 -Build-Depends: debhelper (>= 5), autoconf, automake1.9, texinfo, bison, - libreadline5-dev | libreadline-dev, libpam0g-dev, libopie-dev, zlib1g-dev +Build-Depends: debhelper (>= 5), quilt (>= 0.40), autoconf, automake1.9, + texinfo, bison, libreadline5-dev | libreadline-dev, libpam0g-dev, libopie-dev, zlib1g-dev Build-Conflicts: autoconf2.13, automake1.4 Package: inetutils-ftp diff --git a/debian/patch.mk b/debian/patch.mk deleted file mode 100644 index c8477cb..0000000 --- a/debian/patch.mk +++ /dev/null @@ -1,95 +0,0 @@ -# -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2002,2003 Colin Walters <walters@debian.org> -# -# Modified by Guillem Jover <guillem@debian.org>: -# Standalone system -# Honour DPATCHLEVEL -# Exit when trying to revert patches but no stamp-patch exists -# Provide a patch target -# -# Description: A sample patch system which uses separate files in debian/patches -# Patch names must end in .patch, currently. -# -# 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. - -DEB_SRCDIR ?= . -DEB_PATCHDIRS = debian/patches -DEB_PATCHES = $(foreach dir,$(DEB_PATCHDIRS),$(shell LC_COLLATE=C echo $(wildcard $(dir)/*.patch) $(wildcard $(dir)/*.diff))) - -patch: apply-patches - -unpatch: reverse-patches - rm -f debian/stamp-patch* - rm -f debian/patches/*.log - -# The patch subsystem -apply-patches: debian/stamp-patched -debian/stamp-patched: $(DEB_PATCHES) -debian/stamp-patched reverse-patches: - @echo "patches: $(DEB_PATCHES)" - @set -e ; reverse=""; patches="$(DEB_PATCHES)"; \ - if [ "$@" = "reverse-patches" ]; then \ - if [ ! -e debian/stamp-patched ]; then \ - echo "Not reversing not applied patches."; \ - exit 0; \ - fi; \ - reverse="-R"; \ - for patch in $$patches; do reversepatches="$$patch $$reversepatches"; done; \ - patches="$$reversepatches"; \ - fi; \ - for patch in $$patches; do \ - level=$$(head $$patch | egrep '^#DPATCHLEVEL=' | cut -f 2 -d '='); \ - reverse=""; \ - if [ "$@" = "reverse-patches" ]; then reverse="-R"; fi; \ - success=""; \ - if [ -z "$$level" ]; then \ - echo -n "Trying "; if test -n "$$reverse"; then echo -n "reversed "; fi; echo -n "patch $$patch at level "; \ - for level in 0 1 2; do \ - if test -z "$$success"; then \ - echo -n "$$level..."; \ - if cat $$patch | patch -d $(DEB_SRCDIR) $$reverse -E --dry-run -p$$level 1>$$patch.level-$$level.log 2>&1; then \ - if cat $$patch | patch -d $(DEB_SRCDIR) $$reverse -E --no-backup-if-mismatch -V never -p$$level 1>$$patch.level-$$level.log 2>&1; then \ - success=yes; \ - touch debian/stamp-patch-$$(basename $$patch); \ - echo "success."; \ - fi; \ - fi; \ - fi; \ - done; \ - if test -z "$$success"; then \ - if test -z "$$reverse"; then \ - echo "failure."; \ - exit 1; \ - else \ - echo "failure (ignored)."; \ - fi \ - fi; \ - else \ - echo -n "Trying patch $$patch at level $$level..."; \ - if cat $$patch | patch -d $(DEB_SRCDIR) $$reverse -E --no-backup-if-mismatch -V never -p$$level 1>$$patch.log 2>&1; then \ - touch debian/stamp-patch-$$(basename $$patch); \ - echo "success."; \ - else \ - echo "failure:"; \ - cat $$patch.log; \ - if test -z "$$reverse"; then exit 1; fi; \ - fi; \ - fi; \ - done - if [ "$@" = "debian/stamp-patched" ]; then touch debian/stamp-patched; fi - -.PHONY: patch clean apply-patches reverse-patches - diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..5e8fc3e --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,4 @@ +00_no_link_libbsd.patch -p0 +10_syslog_klog_doc.patch -p0 +22_syslogd_conf.patch -p1 +30_ping_suid_perms.patch -p0 diff --git a/debian/rules b/debian/rules index 1f66a53..3627aa7 100755 --- a/debian/rules +++ b/debian/rules @@ -27,7 +27,7 @@ mandir = usr/share/man man1dir = $(mandir)/man1 man8dir = $(mandir)/man8 -include debian/patch.mk +include /usr/share/quilt/quilt.make configure: configure.ac dh_testdir |