[Glibc-bsd-commits] r3330 - in trunk: kfreebsd-9/debian kfreebsd-9/debian/source zfsutils/debian zfsutils/debian/source

Guillem Jover guillem at alioth.debian.org
Thu May 26 03:01:24 UTC 2011


Author: guillem
Date: 2011-05-26 03:01:23 +0000 (Thu, 26 May 2011)
New Revision: 3330

Added:
   trunk/kfreebsd-9/debian/source/
   trunk/kfreebsd-9/debian/source/format
   trunk/zfsutils/debian/source/
   trunk/zfsutils/debian/source/format
Removed:
   trunk/kfreebsd-9/debian/README.source
   trunk/zfsutils/debian/README.source
Modified:
   trunk/kfreebsd-9/debian/changelog
   trunk/kfreebsd-9/debian/control.in
   trunk/kfreebsd-9/debian/rules
   trunk/zfsutils/debian/changelog
   trunk/zfsutils/debian/control
   trunk/zfsutils/debian/rules
Log:
Switch to source format ?\226?\128?\1563.0 (quilt)?\226?\128?\157

Remove quilt from Build-Depends.
Remove patch target in debian/rules.
Remove now unneeded README.source.


Deleted: trunk/kfreebsd-9/debian/README.source
===================================================================
--- trunk/kfreebsd-9/debian/README.source	2011-05-26 02:53:11 UTC (rev 3329)
+++ trunk/kfreebsd-9/debian/README.source	2011-05-26 03:01:23 UTC (rev 3330)
@@ -1,57 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source.  Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To configure quilt to use debian/patches instead of patches, you want
-either to export QUILT_PATCHES=debian/patches in your environment
-or use this snippet in your ~/.quiltrc:
-
-    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
-        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
-                export QUILT_PATCHES=debian/patches
-        fi
-    done
-
-To get the fully patched source after unpacking the source package, cd to
-the root level of the source package and run:
-
-    quilt push -a
-
-The last patch listed in debian/patches/series will become the current
-patch.
-
-To add a new set of changes, first run quilt push -a, and then run:
-
-    quilt new <patch>
-
-where <patch> is a descriptive name for the patch, used as the filename in
-debian/patches.  Then, for every file that will be modified by this patch,
-run:
-
-    quilt add <file>
-
-before editing those files.  You must tell quilt with quilt add what files
-will be part of the patch before making changes or quilt will not work
-properly.  After editing the files, run:
-
-    quilt refresh
-
-to save the results as a patch.
-
-Alternately, if you already have an external patch and you just want to
-add it to the build system, run quilt push -a and then:
-
-    quilt import -P <patch> /path/to/patch
-    quilt push -a
-
-(add -p 0 to quilt import if needed). <patch> as above is the filename to
-use in debian/patches.  The last quilt push -a will apply the patch to
-make sure it works properly.
-
-To remove an existing patch from the list of patches that will be applied,
-run:
-
-    quilt delete <patch>
-
-You may need to run quilt pop -a to unapply patches first before running
-this command.

Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog	2011-05-26 02:53:11 UTC (rev 3329)
+++ trunk/kfreebsd-9/debian/changelog	2011-05-26 03:01:23 UTC (rev 3330)
@@ -2,6 +2,10 @@
 
   [ Guillem Jover ]
   * Now using Standards-Version 3.9.2 (no changes needed).
+  * Switch to source format “3.0 (quilt)”.
+    - Remove quilt from Build-Depends.
+    - Remove patch target in debian/rules.
+    - Remove now unneeded README.source.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Sat, 19 Feb 2011 23:01:52 +0100
 

Modified: trunk/kfreebsd-9/debian/control.in
===================================================================
--- trunk/kfreebsd-9/debian/control.in	2011-05-26 02:53:11 UTC (rev 3329)
+++ trunk/kfreebsd-9/debian/control.in	2011-05-26 03:01:23 UTC (rev 3330)
@@ -5,7 +5,7 @@
 Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>
 Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/kfreebsd-@major@/
 Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/kfreebsd-@major@/
-Build-Depends: debhelper (>= 5.0.0), bzip2, quilt, sharutils, flex-old | flex,
+Build-Depends: debhelper (>= 5.0.0), bzip2, sharutils, flex-old | flex,
  freebsd-buildutils (>= 8.1-2) [!kfreebsd-any] | freebsd-buildutils (>= 7) [kfreebsd-any],
  gcc-4.3, libdb-dev,
  libbsd-dev, libsbuf-dev

Modified: trunk/kfreebsd-9/debian/rules
===================================================================
--- trunk/kfreebsd-9/debian/rules	2011-05-26 02:53:11 UTC (rev 3329)
+++ trunk/kfreebsd-9/debian/rules	2011-05-26 03:01:23 UTC (rev 3330)
@@ -41,8 +41,6 @@
 MAKE		:= make MACHINE_ARCH=$(kfreebsd_cpu) CC=gcc-4.3 WERROR=
 PATH		:= $(CURDIR)/config:/usr/lib/freebsd:$(PATH)
 
-include /usr/share/quilt/quilt.make
-
 get-orig-source:
 	rm -rf $(ORIG_DIR)
 	for i in sys usr.sbin/config ; do \
@@ -67,7 +65,7 @@
 		done ; \
 	done
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -rf src kfreebsd-source-* flavor-* config
@@ -81,8 +79,6 @@
 
 src: src-stamp
 src-stamp:
-	QUILT_PATCHES=$(QUILT_PATCH_DIR) quilt --quiltrc /dev/null push -a || test $$? = 2
-
 	mkdir $(CURDIR)/src
 	cp -af $(CURDIR)/sys $(CURDIR)/usr.sbin $(CURDIR)/src
 

Added: trunk/kfreebsd-9/debian/source/format
===================================================================
--- trunk/kfreebsd-9/debian/source/format	                        (rev 0)
+++ trunk/kfreebsd-9/debian/source/format	2011-05-26 03:01:23 UTC (rev 3330)
@@ -0,0 +1 @@
+3.0 (quilt)

Deleted: trunk/zfsutils/debian/README.source
===================================================================
--- trunk/zfsutils/debian/README.source	2011-05-26 02:53:11 UTC (rev 3329)
+++ trunk/zfsutils/debian/README.source	2011-05-26 03:01:23 UTC (rev 3330)
@@ -1,57 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source.  Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To configure quilt to use debian/patches instead of patches, you want
-either to export QUILT_PATCHES=debian/patches in your environment
-or use this snippet in your ~/.quiltrc:
-
-    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
-        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
-                export QUILT_PATCHES=debian/patches
-        fi
-    done
-
-To get the fully patched source after unpacking the source package, cd to
-the root level of the source package and run:
-
-    quilt push -a
-
-The last patch listed in debian/patches/series will become the current
-patch.
-
-To add a new set of changes, first run quilt push -a, and then run:
-
-    quilt new <patch>
-
-where <patch> is a descriptive name for the patch, used as the filename in
-debian/patches.  Then, for every file that will be modified by this patch,
-run:
-
-    quilt add <file>
-
-before editing those files.  You must tell quilt with quilt add what files
-will be part of the patch before making changes or quilt will not work
-properly.  After editing the files, run:
-
-    quilt refresh
-
-to save the results as a patch.
-
-Alternately, if you already have an external patch and you just want to
-add it to the build system, run quilt push -a and then:
-
-    quilt import -P <patch> /path/to/patch
-    quilt push -a
-
-(add -p 0 to quilt import if needed). <patch> as above is the filename to
-use in debian/patches.  The last quilt push -a will apply the patch to
-make sure it works properly.
-
-To remove an existing patch from the list of patches that will be applied,
-run:
-
-    quilt delete <patch>
-
-You may need to run quilt pop -a to unapply patches first before running
-this command.

Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog	2011-05-26 02:53:11 UTC (rev 3329)
+++ trunk/zfsutils/debian/changelog	2011-05-26 03:01:23 UTC (rev 3330)
@@ -12,6 +12,12 @@
     Closes: #618592.
   * Bump to Standards-Version 3.9.2 (no changes).
 
+  [ Guillem Jover ]
+  * Switch to source format “3.0 (quilt)”.
+    - Remove quilt from Build-Depends.
+    - Remove patch target in debian/rules.
+    - Remove now unneeded README.source.
+
  -- Aurelien Jarno <aurel32 at debian.org>  Fri, 22 Apr 2011 17:29:09 +0200
 
 zfsutils (8.1-4) unstable; urgency=low

Modified: trunk/zfsutils/debian/control
===================================================================
--- trunk/zfsutils/debian/control	2011-05-26 02:53:11 UTC (rev 3329)
+++ trunk/zfsutils/debian/control	2011-05-26 03:01:23 UTC (rev 3330)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
 Uploaders: Aurelien Jarno <aurel32 at debian.org>
-Build-Depends: debhelper (>= 7), quilt, freebsd-buildutils, libbsd-dev (>= 0.1.4),
+Build-Depends: debhelper (>= 7), freebsd-buildutils, libbsd-dev (>= 0.1.4),
  libc0.1-dev (>= 2.10), kfreebsd-kernel-headers (>= 0.51), libgeom-dev, libsbuf-dev,
  zlib1g-dev
 Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/zfsutils/

Modified: trunk/zfsutils/debian/rules
===================================================================
--- trunk/zfsutils/debian/rules	2011-05-26 02:53:11 UTC (rev 3329)
+++ trunk/zfsutils/debian/rules	2011-05-26 03:01:23 UTC (rev 3330)
@@ -62,46 +62,41 @@
 	tar -czf ../zfsutils_$(VERSION).orig.tar.gz $(ORIGDIR)
 	rm -rf $(ORIGDIR)
 
-patch: patch-stamp
-patch-stamp:
-	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-	touch $@
-
 build: build-libuutil build-libnvpair build-libzfs build-libumem build-libzpool build-zfsutils build-libavl
 
 build-libuutil: build-libuutil-stamp
-build-libuutil-stamp: patch
+build-libuutil-stamp:
 	$(PMAKE) -C $(CURDIR)/cddl/lib/libuutil
 	touch $@
 
 build-libnvpair: build-libnvpair-stamp
-build-libnvpair-stamp: patch
+build-libnvpair-stamp:
 	$(PMAKE) -C $(CURDIR)/cddl/lib/libnvpair
 	touch $@
 
 build-libumem: build-libumem-stamp
-build-libumem-stamp: patch
+build-libumem-stamp:
 	$(PMAKE) -C $(CURDIR)/cddl/lib/libumem
 	touch $@
 
 
 build-libzpool: build-libzpool-stamp
-build-libzpool-stamp: patch build-libavl build-libnvpair-stamp build-libumem
+build-libzpool-stamp: build-libavl build-libnvpair-stamp build-libumem
 	$(PMAKE) -C $(CURDIR)/cddl/lib/libzpool
 	touch $@
 
 build-libzfs: build-libzfs-stamp
-build-libzfs-stamp: patch build-libnvpair-stamp build-libuutil-stamp
+build-libzfs-stamp: build-libnvpair-stamp build-libuutil-stamp
 	$(PMAKE) -C $(CURDIR)/cddl/lib/libzfs
 	touch $@
 
 build-libavl: build-libavl-stamp
-build-libavl-stamp: patch
+build-libavl-stamp:
 	$(PMAKE) -C $(CURDIR)/cddl/lib/libavl
 	touch $@
 
 build-zfsutils: build-zfsutils-stamp
-build-zfsutils-stamp: patch build-libzfs-stamp build-libnvpair-stamp build-libuutil-stamp build-libumem build-libzpool
+build-zfsutils-stamp: build-libzfs-stamp build-libnvpair-stamp build-libuutil-stamp build-libumem build-libzpool
 	$(PMAKE) -C $(CURDIR)/cddl/sbin/zpool
 	$(PMAKE) -C $(CURDIR)/cddl/sbin/zfs
 
@@ -129,8 +124,6 @@
 	$(PMAKE) -C $(CURDIR)/cddl/usr.bin/ztest clean
 	$(PMAKE) -C $(CURDIR)/cddl/usr.bin/zinject clean
 
-	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
-	rm -rf .pc
 	rm -f *stamp
 	dh_clean
 

Added: trunk/zfsutils/debian/source/format
===================================================================
--- trunk/zfsutils/debian/source/format	                        (rev 0)
+++ trunk/zfsutils/debian/source/format	2011-05-26 03:01:23 UTC (rev 3330)
@@ -0,0 +1 @@
+3.0 (quilt)




More information about the Glibc-bsd-commits mailing list