r17981 - in /desktop/experimental/pygtk/debian: changelog python-gtk2-doc.preinst rules
lool at users.alioth.debian.org
lool at users.alioth.debian.org
Thu Dec 25 16:44:38 UTC 2008
Author: lool
Date: Thu Dec 25 16:44:38 2008
New Revision: 17981
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17981
Log:
* Don't purge /usr/share/doc/python-gtk2-doc/examples/demos during first
configuration.
* Rework patch and config.sub/.guess handling: backup config.guess and .sub,
call quilt instead of relying on cdbs' quilt patchsys, restore
config.guess and .sub after unpatching. This avoids config.guess and
.subin the diff, and allows control over fully working and fully patched
trees.
* List install-clean $(PYVERS:%=install-%) $(PYVERS:%=dbg-install-%) in
.PHONY.
Modified:
desktop/experimental/pygtk/debian/changelog
desktop/experimental/pygtk/debian/python-gtk2-doc.preinst
desktop/experimental/pygtk/debian/rules
Modified: desktop/experimental/pygtk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/changelog?rev=17981&op=diff
==============================================================================
--- desktop/experimental/pygtk/debian/changelog (original)
+++ desktop/experimental/pygtk/debian/changelog Thu Dec 25 16:44:38 2008
@@ -2,6 +2,15 @@
* Pass PYTHON to $(MAKE) runs for robustness in case of timestamp skews; see
#509192; thanks Colin Watson for the original patch.
+ * Don't purge /usr/share/doc/python-gtk2-doc/examples/demos during first
+ configuration.
+ * Rework patch and config.sub/.guess handling: backup config.guess and .sub,
+ call quilt instead of relying on cdbs' quilt patchsys, restore
+ config.guess and .sub after unpatching. This avoids config.guess and
+ .subin the diff, and allows control over fully working and fully patched
+ trees.
+ * List install-clean $(PYVERS:%=install-%) $(PYVERS:%=dbg-install-%) in
+ .PHONY.
-- Loic Minier <lool at dooz.org> Fri, 19 Dec 2008 15:15:52 +0100
Modified: desktop/experimental/pygtk/debian/python-gtk2-doc.preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/python-gtk2-doc.preinst?rev=17981&op=diff
==============================================================================
--- desktop/experimental/pygtk/debian/python-gtk2-doc.preinst (original)
+++ desktop/experimental/pygtk/debian/python-gtk2-doc.preinst Thu Dec 25 16:44:38 2008
@@ -1,8 +1,8 @@
#!/bin/sh
set -e
-if dpkg --compare-versions "$2" lt "2.13.0-1"; then
- rm -rf /usr/share/doc/python-gtk2-doc/examples/demos
+if dpkg --compare-versions "$2" lt-nl "2.13.0-1"; then
+ rm -rf /usr/share/doc/python-gtk2-doc/examples/demos
fi
#DEBHELPER#
Modified: desktop/experimental/pygtk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/rules?rev=17981&op=diff
==============================================================================
--- desktop/experimental/pygtk/debian/rules (original)
+++ desktop/experimental/pygtk/debian/rules Thu Dec 25 16:44:38 2008
@@ -1,6 +1,5 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
@@ -21,14 +20,36 @@
.PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp
-guessub-stamp:
- cp config.sub config.sub.back
- cp config.guess config.guess.back
- cp -f /usr/share/misc/config.sub config.sub
- cp -f /usr/share/misc/config.guess config.guess
+# how to call quilt
+QUILT := QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null
+
+patch-stamp:
+ dh_testdir
+ # apply patches
+ $(QUILT) push -a || test $$? = 2
+ # backup the original files to restore them in the clean target
+ [ ! -r config.sub ] || \
+ (cp config.sub config.sub.orig && \
+ cp /usr/share/misc/config.sub config.sub)
+ [ ! -r config.guess ] || \
+ (cp config.guess config.guess.orig && \
+ cp /usr/share/misc/config.guess config.guess)
touch $@
-build-%/configure-stamp: apply-patches guessub-stamp
+patch: patch-stamp
+
+unpatch:
+ rm -f patch-stamp
+ # restore files from backup (before unpatching)
+ [ ! -r config.sub.orig ] || \
+ cp config.sub.orig config.sub
+ [ ! -r config.guess.orig ] || \
+ cp config.guess.orig config.guess
+ # unapply patches, if any
+ $(QUILT) pop -a || test $$? = 2
+ rm -rf .pc
+
+build-%/configure-stamp: patch-stamp
dh_testdir
mkdir -p build-$*
cd build-$* && \
@@ -42,7 +63,7 @@
xvfb-run -s -noreset $(MAKE) -C build-$* check
touch $@
-dbg-build-%/configure-stamp:
+dbg-build-%/configure-stamp: patch-stamp
dh_testdir
mkdir -p dbg-build-$*
cd dbg-build-$* && \
@@ -113,14 +134,12 @@
mv $$i $$(dirname $$i)/$${b}_d.so; \
done
-clean:: reverse-patches
+clean::
dh_testdir
dh_testroot
- rm -Rf debian/tmp-*
- rm -Rf build-* dbg-build-*
- -mv config.sub.back config.sub
- -mv config.guess.back config.guess
- rm -f guessub-stamp
+ rm -rf debian/tmp-*
+ rm -rf build-* dbg-build-*
+ $(MAKE) -f debian/rules unpatch
dh_clean
# Build architecture-independent files here.
@@ -130,7 +149,7 @@
dh_installdocs -i
dh_installexamples -i
find debian/python-gtk2-doc/usr/share/doc -name '*.py[co]' -delete
- dh_installchangelogs ChangeLog -i
+ dh_installchangelogs -i ChangeLog
dh_link -i
dh_compress -i -X.py -X.glade
dh_fixperms -i
@@ -149,7 +168,7 @@
dh_installdocs -s
dh_installexamples -s
dh_installchangelogs ChangeLog -s
- dh_strip -s --dbg-package=python-gtk2-dbg
+ dh_strip -s -Npython-gtk2-dbg --dbg-package=python-gtk2-dbg
rm -rf debian/python-gtk2-dbg/usr/share/doc/python-gtk2-dbg
ln -s python-gtk2 debian/python-gtk2-dbg/usr/share/doc/python-gtk2-dbg
dh_link -s
@@ -163,4 +182,4 @@
dh_builddeb -s
binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: patch unpatch build install-clean $(PYVERS:%=install-%) $(PYVERS:%=dbg-install-%) clean binary-indep binary-arch binary install
More information about the pkg-gnome-commits
mailing list