[SCM] Debian packaging for sketch 3D line drawing software branch, master, updated. debian/0.2.183-1-16-g5ad45c6

David Bremner bremner at unb.ca
Sun Dec 19 03:37:47 UTC 2010


The following commit has been merged in the master branch:
commit 0cc12958b1b057bb215f15792f174fd3cb0c8b9a
Author: David Bremner <bremner at unb.ca>
Date:   Sat Dec 18 22:59:39 2010 -0400

    add export-patches rule, and update README.source

diff --git a/debian/README.source b/debian/README.source
index e245590..4162335 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -4,10 +4,27 @@ Building sketch for Debian
 The source package needs no special instructions; the discussion here
 is about working with the git repository.
 
-Patches are maintained on a separate branch (conventionally
-patch-queue/master for compatibility with gbp-pq).  The patches for
-version $epoch:$version are tagged 'patches/$version'. You can export
-them with the included script debian/export-patches.sh. 
+Patches are exported based on debian/source/git-patches; each line is
+an argument to git-format-patch. The variables $DEB_VERSION and
+$UPSTREAM_VERSION are the Debian and upstream version being exported.
+You can either use git-format-patch manually, or install gitpkg
+version 0.17 or later.
+
+1) To have the patches automatically exported at source package creation time
+
+  a) to setup gitpkg, run
+  
+     % git config gitpkg.deb-export-hook /usr/share/gitpkg/hooks/quilt-patches-deb-export-hook
+
+  b) run 
+    
+      % gitpkg master
+
+     to make a source package.
+
+2) To manually export patches, run
+
+       % ./debian/rules export-patches
 
 The original source tarballs are stored in the git repo using
 pristine-tar.  You can (optionally) check out the current tarball by
@@ -16,4 +33,4 @@ pristine-tar.  You can (optionally) check out the current tarball by
     # UPSTREAM should be the current upstream version
     pristine-tar checkout ../sketch_$(UPSTREAM).orig.tar.gz
 
- -- David Bremner <bremner at debian.org>, Thu, 16 Dec 2010 09:56:08 -0400
+ -- David Bremner <bremner at debian.org>, Sat, 18 Dec 2010 22:58:51 -0400
diff --git a/debian/rules b/debian/rules
index 1eeb116..88ff6f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,4 +31,11 @@ override_dh_auto_build:
 override_dh_auto_clean:
 	$(MAKE) clean
 
-
+PATCH_EXPORT_SCRIPT=/usr/share/gitpkg/hooks/quilt-patches-deb-export-hook
+
+export-patches: 
+	[ ! -r debian/patches ] || \
+	case  "$$(head -1 debian/patches/series)" in \
+	\#*$(notdir $(PATCH_EXPORT_SCRIPT))) ;; *) exit 1;; esac
+	rm -rf debian/patches
+	sh $(PATCH_EXPORT_SCRIPT)
\ No newline at end of file

-- 
Debian packaging for sketch 3D line drawing software



More information about the debian-science-commits mailing list