[Glibc-bsd-commits] r1595 - trunk/posixtestsuite/debian

Wed Jun 14 06:03:06 UTC 2006

Author: guillem
Date: 2006-06-14 06:03:05 +0000 (Wed, 14 Jun 2006)
New Revision: 1595

Added:
   trunk/posixtestsuite/debian/patch.mk
Modified:
   trunk/posixtestsuite/debian/changelog
   trunk/posixtestsuite/debian/compat
   trunk/posixtestsuite/debian/control
   trunk/posixtestsuite/debian/rules
Log:
* New upstream release.
  - Do not leave "sigpause/4.1.test" process running after finishing.
    (Closes: #303365)
* Upgrade to debhelper compat version 5.
* Switch from cdbs to debhelper.


Modified: trunk/posixtestsuite/debian/changelog
===================================================================

--- trunk/posixtestsuite/debian/changelog	2006-06-13 17:28:17 UTC (rev 1594)
+++ trunk/posixtestsuite/debian/changelog	2006-06-14 06:03:05 UTC (rev 1595)
@@ -1,3 +1,13 @@
+posixtestsuite (1.5.1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    - Do not leave "sigpause/4.1.test" process running after finishing.
+      (Closes: #303365)
+  * Upgrade to debhelper compat version 5.
+  * Switch from cdbs to debhelper.
+
+ -- Guillem Jover <guillem at debian.org>  Wed, 14 Jun 2006 09:02:06 +0300
+
 posixtestsuite (1.4.3-2) unstable; urgency=low
 
   * New Maintainer Team. (Closes: #314668)
@@ -4,7 +14,7 @@
   * Clean debian/copyright.
   * Bump Standards-Version to 3.6.2 (no changes needed).
 
- -- Guillem Jover <guillem at debian.org>  Mon,  4 Jul 2005 00:46:08 +0300
+ -- Guillem Jover <guillem at debian.org>  Sun,  5 Jun 2005 17:03:47 +0300
 
 posixtestsuite (1.4.3-1) unstable; urgency=low
 

Modified: trunk/posixtestsuite/debian/compat
===================================================================
--- trunk/posixtestsuite/debian/compat	2006-06-13 17:28:17 UTC (rev 1594)
+++ trunk/posixtestsuite/debian/compat	2006-06-14 06:03:05 UTC (rev 1595)
@@ -1 +1 @@
-4
+5

Modified: trunk/posixtestsuite/debian/control
===================================================================
--- trunk/posixtestsuite/debian/control	2006-06-13 17:28:17 UTC (rev 1594)
+++ trunk/posixtestsuite/debian/control	2006-06-14 06:03:05 UTC (rev 1595)
@@ -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: cdbs, debhelper (>= 4.1.0), expect
+Build-Depends-Indep: debhelper (>= 5), expect
 Standards-Version: 3.6.2
 
 Package: posixtestsuite

Added: trunk/posixtestsuite/debian/patch.mk
===================================================================
--- trunk/posixtestsuite/debian/patch.mk	2006-06-13 17:28:17 UTC (rev 1594)
+++ trunk/posixtestsuite/debian/patch.mk	2006-06-14 06:03:05 UTC (rev 1595)
@@ -0,0 +1,93 @@
+# -*- 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
+

Modified: trunk/posixtestsuite/debian/rules
===================================================================
--- trunk/posixtestsuite/debian/rules	2006-06-13 17:28:17 UTC (rev 1594)
+++ trunk/posixtestsuite/debian/rules	2006-06-14 06:03:05 UTC (rev 1595)
@@ -1,13 +1,53 @@
 #!/usr/bin/make -f
+#
+# $Id$
+#
 
-DEB_TAR_SRCDIR := posixtestsuite-1.4.3
+include debian/patch.mk
 
-build/posix-testsuite:: apply-patches
-	if test -e /lib/libsem.* ; then \
-		echo "-lsem" >> $(DEB_SRCDIR)/LDFLAGS ; \
-	fi
+build: patch
+	dh_testdir
+	
+	$(MAKE)
 
-include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/tarball.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+clean::
+	dh_testdir
+	dh_testroot
+	
+	-$(MAKE) clean
+	
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/posixtestsuite
+
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installdocs
+#	dh_installexamples
+	dh_installman
+#	dh_installinfo
+	dh_installchangelogs
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary-arch: build install
+	# Nothing to do.
+
+binary: binary-indep binary-arch
+
+.PHONY: build clean binary-indep binary-arch binary install
+


