[pkg-horde] [SCM] Debian Horde Packages repository: gollem package branch, debian-sid, updated. 18a786c0276a5ec4e8e09b677efb69a0035880ac

[Gregory Colpart]

The following commit has been merged in the debian-sid branch:
commit 9061f28e6493c265002518ce927a7b767e9f6f0c
Author: Gregory Colpart <reg at foulademer.gcolpart.com>
Date:   Sat May 2 13:27:42 2009 +0200

    Migration dpatch -> Git patches

diff --git a/debian/changelog b/debian/changelog
index 80722e2..ddde342 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 gollem (1.1-1) unstable; urgency=low
 
   * New upstream release. 
+  * Add "Git patches" stuff in debian/rules (migration from dpatch). 
 
- -- Gregory Colpart <reg at debian.org>  Sat, 02 May 2009 13:23:45 +0200
+ -- Gregory Colpart <reg at debian.org>  Sat, 02 May 2009 13:25:13 +0200
 
 gollem (1.0.3-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 3ec5a2f..3c06b0f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: web
 Priority: optional
 Maintainer: Horde Maintainers <pkg-horde-hackers at lists.alioth.debian.org>
 Uploaders: Gregory Colpart (evolix) <reg at evolix.fr>
-Build-Depends: debhelper (>= 4.0.0), dpatch
+Build-Depends: debhelper (>= 4.0.0)
 Standards-Version: 3.7.2
 
 Package: gollem
diff --git a/debian/patches/0001-Adjust-require-in-prefs.patch b/debian/patches/0001-Adjust-require-in-prefs.patch
new file mode 100644
index 0000000..6dce811
--- /dev/null
+++ b/debian/patches/0001-Adjust-require-in-prefs.patch
@@ -0,0 +1,26 @@
+From 43eac8b359ecb70af5fd6c37ec9f5d25241abadd Mon Sep 17 00:00:00 2001
+From: Gregory Colpart <reg at foulademer.gcolpart.com>
+Date: Sat, 2 May 2009 13:10:24 +0200
+Subject: [PATCH] Adjust require in prefs
+
+---
+ config/prefs.php.dist |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/config/prefs.php.dist b/config/prefs.php.dist
+index 1663644..416690c 100644
+--- a/config/prefs.php.dist
++++ b/config/prefs.php.dist
+@@ -6,7 +6,8 @@
+  */
+ 
+ // Make sure that constants are defined.
+-require_once dirname(__FILE__) . '/../lib/Gollem.php';
++ at define('GOLLEM_BASE', dirname(__FILE__) . '/..');
++require_once GOLLEM_BASE . '/lib/Gollem.php';
+ 
+ $prefGroups['display'] = array(
+     'column' => _("User Interface"),
+-- 
+1.6.2.4
+
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 1014f55..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01_prefs_require.dpatch
diff --git a/debian/patches/01_prefs_require.dpatch b/debian/patches/01_prefs_require.dpatch
deleted file mode 100755
index dbc8c38..0000000
--- a/debian/patches/01_prefs_require.dpatch
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_prefs_require.dpatch by  <roberto at familiasanchez.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix require_once directive in prefs.php
-
- at DPATCH@
-
---- gollem-1.0.orig/config/prefs.php.dist	2005-09-06 16:37:28.026708000 -0400
-+++ gollem-1.0/config/prefs.php.dist	2005-09-06 16:47:18.531853734 -0400
-@@ -6,7 +6,8 @@
-  */
- 
- // Make sure that constants are defined.
--require_once dirname(__FILE__) . '/../lib/Gollem.php';
-+ at define('GOLLEM_BASE', dirname(__FILE__) . '/..');
-+require_once GOLLEM_BASE . '/lib/Gollem.php';
- 
- $prefGroups['display'] = array(
-     'column' => _("User Interface"),
diff --git a/debian/rules b/debian/rules
index 9c7c42a..33f8d4f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,45 @@
 # List all Files and directories here that should not be copied to
 COPY_EXCLUDE=^(build-stamp|configure-stamp|config|COPYING|debian|docs|po|README|scripts|\{arch\})$
 
-configure: configure-stamp
+srcpkg = $(shell dpkg-parsechangelog | sed -ne 's/Source: *//p')
+srcver = $(shell dpkg-parsechangelog | sed -ne 's/Version: *\(.*:\)\?\(.*\)-.*$$/\2/p')
+
+#{{{ generic rules
+../$(srcpkg)_$(srcver).orig.tar.gz:
+	@if git rev-parse --git-dir >/dev/null 2>&1; then                 \
+	pristine-tar checkout $@;                                     \
+	fi
+
+check-tarball: ../$(srcpkg)_$(srcver).orig.tar.gz
+
+.PHONY: check-tarball
+
+#}}}
+#{{{ maintainer stuff
+
+refresh-patches: check-tarball
+	@dh_testdir
+	@echo 'refreshing debian/patches:'
+	@rm -rf '$(CURDIR)'/debian/patches
+	@mkdir -p '$(CURDIR)'/debian/patches
+	@cd '$(CURDIR)'/debian/patches && git format-patch upstream..upstream+patches
+	@echo .
+#}}}
+
+patch: patch-stamp check-tarball
+patch-stamp:
+	dh_testdir
+	set -e; test -e patch-stamp || \
+		for i in `ls -1 debian/patches/*.patch || :`; do patch -p1 <$$i > /dev/null; done
+	touch $@
+
+unpatch:
+	dh_testdir
+	set -e; ! test -e patch-stamp || \
+		for i in `ls -1r debian/patches/*.patch || :`; do patch -p1 -R <$$i > /dev/null; done
+	rm -f patch-stamp
+
+configure: configure-stamp patch
 configure-stamp: patch
 	dh_testdir
 	touch configure-stamp
@@ -17,19 +55,7 @@ build-stamp: configure-stamp
 	dh_testdir
 	touch build-stamp
 
-clean: clean-patched unpatch
-clean-patched:
-	dh_testdir
-	dh_testroot
-	dh_clean build-stamp configure-stamp
-
-patch: patch-stamp
-patch-stamp:
-	dpatch apply-all
-
-unpatch:
-	dpatch deapply-all
-	rm -rf patch-stamp debian/patched
+clean: unpatch
 
 install: build
 	dh_testdir

-- 
Debian Horde Packages repository: gollem package