martin f. krafft: Prepare package for quilt

Martin F. Krafft madduck at alioth.debian.org
Wed Apr 29 09:13:24 UTC 2009


Module: mdadm
Branch: build
Commit: d355f4f59c1e0d437eeff86c276bf3428689ae4b
URL:    http://git.debian.org/?p=pkg-mdadm/mdadm.git;a=commit;h=d355f4f59c1e0d437eeff86c276bf3428689ae4b

Author: martin f. krafft <madduck at debian.org>
Date:   Wed Apr 29 09:24:53 2009 +0200

Prepare package for quilt

Signed-off-by: martin f. krafft <madduck at debian.org>

---

 debian/changelog |    2 ++
 debian/control   |    2 +-
 debian/rules     |    9 +++++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 98bfa22..ee5f156 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ mdadm (2.6.9-2) unstable; urgency=low
     thanks to Jan Hudec (closes: #519999).
   * Remove Mario Joußen from the uploaders list, since his email started
     bouncing.
+  * Prepare mdadm source to use quilt, with the long-term goal to switch to
+    TopGit, once I find the time.
 
  -- martin f. krafft <madduck at debian.org>  Sun, 26 Apr 2009 16:08:28 +0200
 
diff --git a/debian/control b/debian/control
index a2b5cc9..6eccc18 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: admin
 Priority: optional
 Maintainer: Debian mdadm maintainers <pkg-mdadm-devel at lists.alioth.debian.org>
 Uploaders: martin f. krafft <madduck at debian.org>
-Build-Depends: debhelper (>= 6), po-debconf, groff-base, docbook-to-man
+Build-Depends: debhelper (>= 6), po-debconf, groff-base, docbook-to-man, quilt
 Standards-Version: 3.8.1
 Vcs-Git: git://git.debian.org/git/pkg-mdadm/mdadm
 Vcs-Browser: http://git.debian.org/?p=pkg-mdadm/mdadm.git
diff --git a/debian/rules b/debian/rules
index d2a08e5..67aacda 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,11 @@
 
 #export DH_VERBOSE=1
 
+#TG_BRANCHES="..."
+
+include /usr/share/quilt/quilt.make
+#-include /usr/share/topgit/tg2quilt.mk
+
 CXFLAGS = -ggdb
 CXFLAGS_UDEB := $(CXFLAGS) -fomit-frame-pointer
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -23,7 +28,7 @@ debian/mdadm-startall.8: debian/mdadm-startall.sgml
 	docbook-to-man $< > $@
 
 build: configure build-stamp
-build-stamp: debian/mdadm-startall.8
+build-stamp: patch debian/mdadm-startall.8
 	dh_testdir
 	$(MAKE) -f debian/rules mdadm.udeb DEBIAN=yes
 	$(MAKE) clean
@@ -43,7 +48,7 @@ mdadm: configure
 	$(MAKE) $(FLAGS) all
 .PHONY: mdadm
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp




More information about the pkg-mdadm-commits mailing list