[Glibc-bsd-commits] r1915 - in trunk/posixtestsuite/debian: .
patches
Guillem Jover
guillem at alioth.debian.org
Thu Apr 19 23:14:23 UTC 2007
Author: guillem
Date: 2007-04-19 23:14:22 +0000 (Thu, 19 Apr 2007)
New Revision: 1915
Added:
trunk/posixtestsuite/debian/patches/series
Removed:
trunk/posixtestsuite/debian/patch.mk
Modified:
trunk/posixtestsuite/debian/changelog
trunk/posixtestsuite/debian/control
trunk/posixtestsuite/debian/rules
Log:
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.
Modified: trunk/posixtestsuite/debian/changelog
===================================================================
--- trunk/posixtestsuite/debian/changelog 2007-04-10 12:24:41 UTC (rev 1914)
+++ trunk/posixtestsuite/debian/changelog 2007-04-19 23:14:22 UTC (rev 1915)
@@ -1,6 +1,11 @@
posixtestsuite (1.5.1-2) UNRELEASED; urgency=low
* Fix FSF's copyright address.
+ * 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 at debian.org> Wed, 14 Jun 2006 11:12:42 +0300
Modified: trunk/posixtestsuite/debian/control
===================================================================
--- trunk/posixtestsuite/debian/control 2007-04-10 12:24:41 UTC (rev 1914)
+++ trunk/posixtestsuite/debian/control 2007-04-19 23:14:22 UTC (rev 1915)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
Uploaders: Guillem Jover <guillem at debian.org>, Aurelien Jarno <aurel32 at debian.org>
-Build-Depends-Indep: debhelper (>= 5), expect
+Build-Depends-Indep: debhelper (>= 5), quilt (>= 0.40), expect
Standards-Version: 3.7.2
Package: posixtestsuite
Deleted: trunk/posixtestsuite/debian/patch.mk
===================================================================
--- trunk/posixtestsuite/debian/patch.mk 2007-04-10 12:24:41 UTC (rev 1914)
+++ trunk/posixtestsuite/debian/patch.mk 2007-04-19 23:14:22 UTC (rev 1915)
@@ -1,93 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2002,2003 Colin Walters <walters at debian.org>
-#
-# Modified by Guillem Jover <guillem at 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
-
-clean:: 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
-
Added: trunk/posixtestsuite/debian/patches/series
===================================================================
--- trunk/posixtestsuite/debian/patches/series 2007-04-10 12:24:41 UTC (rev 1914)
+++ trunk/posixtestsuite/debian/patches/series 2007-04-19 23:14:22 UTC (rev 1915)
@@ -0,0 +1,3 @@
+00_find_warnings.patch -p0
+01_gnu.patch -p0
+02_expect.diff -p0
Modified: trunk/posixtestsuite/debian/rules
===================================================================
--- trunk/posixtestsuite/debian/rules 2007-04-10 12:24:41 UTC (rev 1914)
+++ trunk/posixtestsuite/debian/rules 2007-04-19 23:14:22 UTC (rev 1915)
@@ -3,7 +3,7 @@
# $Id$
#
-include debian/patch.mk
+include /usr/share/quilt/quilt.make
build: patch
dh_testdir
More information about the Glibc-bsd-commits
mailing list