r1189 - in /trunk/packages/vim/debian: README.quilt changelog rules

jamessan at users.alioth.debian.org jamessan at users.alioth.debian.org
Tue Feb 5 05:17:05 UTC 2008


Author: jamessan
Date: Tue Feb  5 05:17:05 2008
New Revision: 1189

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1189
Log:
* debian/rules:
  - Add patch/unpatch targets.
  - Fix how quilt is invoked so it doesn't use the local user's settings.
    Thanks to Teemu Likonen for the patch.  (Closes: #463775)

Modified:
    trunk/packages/vim/debian/README.quilt
    trunk/packages/vim/debian/changelog
    trunk/packages/vim/debian/rules

Modified: trunk/packages/vim/debian/README.quilt
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/README.quilt?rev=1189&op=diff
==============================================================================
--- trunk/packages/vim/debian/README.quilt (original)
+++ trunk/packages/vim/debian/README.quilt Tue Feb  5 05:17:05 2008
@@ -31,7 +31,7 @@
   How to add a new quilt patch
   ----------------------------
 
-    0) unpack the vim sources:    fakeroot debian/rules extract
+    0) unpack the vim sources:    debian/rules extract
 
     1) position yourself in the patch stack at the patch after which you
        would like to add the new one:    quilt push <reference_patchname>

Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=1189&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Tue Feb  5 05:17:05 2008
@@ -17,6 +17,10 @@
       if 1) only one filename was given when invoking Vim and another Vim
       instance is editing it or 2) a swapfile for a file exists.  (Closes:
       #316541)
+  * debian/rules:
+    - Add patch/unpatch targets.
+    - Fix how quilt is invoked so it doesn't use the local user's settings.
+      Thanks to Teemu Likonen for the patch.  (Closes: #463775)
 
  -- James Vega <jamessan at debian.org>  Sun, 27 Jan 2008 22:19:48 -0500
 

Modified: trunk/packages/vim/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/rules?rev=1189&op=diff
==============================================================================
--- trunk/packages/vim/debian/rules (original)
+++ trunk/packages/vim/debian/rules Tue Feb  5 05:17:05 2008
@@ -6,6 +6,8 @@
 DEB_HOST_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
 
 BUILDER := $(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$LOGNAME@$$(cat /etc/mailname 2> /dev/null))}})
+
+QUILT := QUILT_PATCHES=patches quilt --quiltrc=/dev/null
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
   CFLAGS+=-O0
@@ -144,6 +146,11 @@
 # nothing to do per default
 all:
 
+patch: patch-stamp
+patch-stamp: extract-stamp
+	$(QUILT) push -a || test $$? = 2
+	touch $@
+
 extract: extract-stamp
 extract-stamp: $(foreach s,$(SOURCES),extract-stamp-$(s))
 	if [ ! -L vim -o "`readlink vim`" != "$(SRCDIR)" ]; then \
@@ -153,7 +160,6 @@
 	  echo "applying upstream patch: $$f" ;\
 	  cat upstream/patches/$$f | patch -s -d$(SRCDIR) -p0 ;\
 	done
-	quilt push -a || test $$? = 2
 	@echo "replacing upstream po files with our own"
 	cp $(wildcard runtime/lang/po/*) vim/src/po
 	touch $@
@@ -170,13 +176,15 @@
 	unzip -d $(SRCDIR) upstream/tarballs/$(*).zip
 	touch $@
 
-clean: $(foreach v,$(VARIANTS),clean-$(v))
+unpatch:
+	$(QUILT) pop -a -R || test $$? = 2
+	rm -rf .pc patch-stamp
+
+clean: $(foreach v,$(VARIANTS),clean-$(v)) unpatch
 	dh_testdir
 	dh_testroot
 	rm -f extract-stamp* build-stamp* install-stamp* configure-stamp*
 	rm -f debian/helpztags.1
-	quilt pop -a || test $$? = 2
-	rm -rf .pc
 	rm -rf $(SRCDIR)
 	rm -rf debian/policy/vim-policy.html
 	rm -f debian/policy/vim-policy.txt
@@ -209,7 +217,7 @@
 	done
 	rm -f debian/lintian/$*
 
-build: extract
+build: extract patch
 build: build-stamp
 build-stamp: $(foreach v,$(VARIANTS),build-stamp-$(v))
 	$(MAKE) -C $(SRCDIR)/runtime/doc html # gen html docs (destroys tags)
@@ -500,7 +508,7 @@
 	dh_builddeb
 
 binary: beginlog binary-indep binary-arch endlog
-.PHONY: extract clean build install uninstall binary-indep binary-arch binary
+.PHONY: patch unpatch extract clean build install uninstall binary-indep binary-arch binary
 
 .PHONY: beginlog endlog
 beginlog:




More information about the pkg-vim-maintainers mailing list