[Pkg-kde-commits] rev 1017 - people/chrsmrtn/cdbs-experimental
Christopher Martin
chrsmrtn-guest@costa.debian.org
Fri, 22 Apr 2005 14:19:59 +0000
Author: chrsmrtn-guest
Date: 2005-04-22 14:19:58 +0000 (Fri, 22 Apr 2005)
New Revision: 1017
Added:
people/chrsmrtn/cdbs-experimental/simple-patchsys.mk
Modified:
people/chrsmrtn/cdbs-experimental/debian-qt-kde.mk
Log:
Remove crappy uu rules, and instead use a slightly
patched simple-patchsys.mk, as per allee's very helpful
suggestion.
Modified: people/chrsmrtn/cdbs-experimental/debian-qt-kde.mk
===================================================================
--- people/chrsmrtn/cdbs-experimental/debian-qt-kde.mk 2005-04-22 14:17:10 UTC (rev 1016)
+++ people/chrsmrtn/cdbs-experimental/debian-qt-kde.mk 2005-04-22 14:19:58 UTC (rev 1017)
@@ -91,18 +91,4 @@
fi
rm -f debian/stamp-cvs-make
-apply-patches:
- for i in $(CURDIR)/debian/patches/*.diff.uu ; do \
- cd $(CURDIR)/debian/patches ; \
- uudecode $$i ; \
- cd $(CURDIR) ; \
- patch -N -p1 < "$${i%%.uu}" ; \
- touch debian/stamp-patched ; \
- done
-
-clean:: reverse-patches
- for i in $(CURDIR)/debian/patches/*.diff.uu ; do \
- rm -f "$${i%%.uu}" ; \
- done
-
endif
Added: people/chrsmrtn/cdbs-experimental/simple-patchsys.mk
===================================================================
--- people/chrsmrtn/cdbs-experimental/simple-patchsys.mk 2005-04-22 14:17:10 UTC (rev 1016)
+++ people/chrsmrtn/cdbs-experimental/simple-patchsys.mk 2005-04-22 14:19:58 UTC (rev 1017)
@@ -0,0 +1,148 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2002,2003 Colin Walters <walters@debian.org>
+# Description: A sample patch system which uses separate files in debian/patches
+# Patch suffix is specified by DEB_PATCH_SUFFIX. Defaults to .patch.
+#
+# 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
+_cdbs_rules_patchsys := 1
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifeq ($(_cdbs_included_patchsys),)
+_cdbs_included_patchsys := 1
+
+_cdbs_patch_system_apply_rule := apply-patches
+_cdbs_patch_system_unapply_rule := reverse-patches
+
+DEB_PATCH_SUFFIX ?= .diff .diff.gz .diff.bz2 .diff.uu .patch .patch.gz .patch.bz2 .patch.uu
+DEB_PATCHDIRS ?= debian/patches
+close_parenthesis ?= )
+DEB_PATCHES := $(shell\
+for dir in $(DEB_PATCHDIRS) ; do \
+ for file in $$dir/* ; do \
+ for suffix in $(DEB_PATCH_SUFFIX) ; do \
+ case $$file in *$$suffix$(close_parenthesis) echo $$file ;; esac ; \
+ done ; \
+ done ; \
+done)
+
+# if we have any patches, check if some are patching config.{guess,sub,rpath}
+# and print a warning
+ifneq (, $(DEB_PATCHES))
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), patchutils
+evil_patches_that_do_nasty_things := $(shell\
+if lsdiff=`which lsdiff` ; then \
+ $$lsdiff -H $(DEB_PATCHES) \
+ | egrep "/config\.(guess|sub|rpath)$$" | tr "\n" " " ; \
+fi)
+ifneq (, $(evil_patches_that_do_nasty_things))
+$(warning ** WARNING **: The following patches are modifiing auto-updated files. Please exclude the following files from your patch: $(evil_patches_that_do_nasty_things))
+endif
+endif
+
+post-patches:: apply-patches
+
+clean:: reverse-patches
+ rm -f debian/patches/*.log
+
+# The patch subsystem
+apply-patches: pre-build debian/stamp-patched
+debian/stamp-patched: $(DEB_PATCHES)
+debian/stamp-patched reverse-patches:
+ $(MAKE) -f debian/rules reverse-config
+ @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 \
+ case $$patch in \
+ *.gz) cat=zcat ;; \
+ *.bz2) cat=bzcat ;; \
+ *.uu) cat="uudecode -o -" ;; \
+ *) cat=cat ;; \
+ esac; \
+ 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 [ "$(DEB_PATCHDIRS_READONLY)" = "yes" ] ; then \
+ logfile="/dev/null" ; \
+ else \
+ logfile="$$patch.level-$$level.log" ; \
+ fi ; \
+ if $$cat $$patch | patch -d $(DEB_SRCDIR) $$reverse -E --dry-run -p$$level 1>$$logfile 2>&1; then \
+ if $$cat $$patch | patch -d $(DEB_SRCDIR) $$reverse -E --no-backup-if-mismatch -V never -p$$level 1>$$logfile 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..."; \
+ echo -n "$$level..."; \
+ if [ "$(DEB_PATCHDIRS_READONLY)" = "yes" ] ; then \
+ logfile="/dev/null" ; \
+ else \
+ logfile="$$patch.log" ; \
+ fi ; \
+ if $$cat $$patch | patch -d $(DEB_SRCDIR) $$reverse -E --no-backup-if-mismatch -V never -p$$level 1>$$logfile 2>&1; then \
+ touch debian/stamp-patch-$$(basename $$patch); \
+ echo "success."; \
+ else \
+ echo "failure:"; \
+ cat $$logfile; \
+ if test -z "$$reverse"; then exit 1; fi; \
+ fi; \
+ fi; \
+ done
+ if [ "$@" = "debian/stamp-patched" ] ; then touch debian/stamp-patched ; \
+ elif [ "$@" = "reverse-patches" ] ; then rm -f debian/stamp-patch* ; \
+ fi
+ $(MAKE) -f debian/rules update-config
+
+endif
+
+endif