[pkg-horde] [SCM] Debian Horde Packages repository: sork-passwd-h3 package branch, debian-sid, updated. d3c0637edb225375ef897edf098f03f8f7dabfba

Gregory Colpart reg at foulademer.gcolpart.com
Sun May 31 21:20:27 UTC 2009


The following commit has been merged in the debian-sid branch:
commit 5a0bf6530998ff9e9e5e23caf74d68ac4b976f5a
Author: Gregory Colpart <reg at foulademer.gcolpart.com>
Date:   Sun May 31 19:12:40 2009 +0200

    Add git patch stuff and import patch from Lionel Elie Mamane

diff --git a/debian/patches/0001-Adapt-expect-script-to-passwd-is-the-shell-case.patch b/debian/patches/0001-Adapt-expect-script-to-passwd-is-the-shell-case.patch
new file mode 100644
index 0000000..963f1a2
--- /dev/null
+++ b/debian/patches/0001-Adapt-expect-script-to-passwd-is-the-shell-case.patch
@@ -0,0 +1,25 @@
+From 983e5210623aa83a356c9b690d3bdeab7fb59c2b Mon Sep 17 00:00:00 2001
+From: Gregory Colpart <reg at foulademer.gcolpart.com>
+Date: Sun, 31 May 2009 18:26:13 +0200
+Subject: [PATCH] Adapt expect script to "passwd is the shell" case
+
+---
+ config/backends.php.dist |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/config/backends.php.dist b/config/backends.php.dist
+index 860317c..4112e30 100644
+--- a/config/backends.php.dist
++++ b/config/backends.php.dist
+@@ -150,7 +150,7 @@ $backends['expect'] = array(
+     'params' => array(
+         'program' => '/usr/bin/expect',
+         'script' => dirname(__FILE__) . '/../scripts/passwd_expect',
+-        'params' => '-telnet -host localhost -output /tmp/passwd.log'
++        'params' => '-ssh -host localhost -output `tempfile --directory /tmp/ --prefix srkpw`'
+     )
+ );
+ 
+-- 
+1.6.3.1
+
diff --git a/debian/rules b/debian/rules
index ed6921c..b897ab0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,13 +7,61 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-build:
-#Nothing to do!
+srcpkg = $(shell dpkg-parsechangelog | sed -ne 's/Source: *//p')
+srcver = $(shell dpkg-parsechangelog | sed -ne 's/Version: *\(.*:\)\?\(.*\)-.*$$/\2/p')
 
-clean:
+#{{{ 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:
+	dh_testdir
+	touch configure-stamp
+
+build: build-stamp
+
+build-stamp: configure-stamp 
+	dh_testdir
+	touch build-stamp
+
+clean: unpatch
 	dh_testdir
 	dh_testroot
-	dh_clean
+	dh_clean build-stamp configure-stamp
 
 install: build
 	dh_testdir
@@ -48,4 +96,4 @@ binary-indep: build install
 	dh_builddeb
 
 binary: binary-indep
-.PHONY: build clean binary-arch binary-indep binary install configure
+.PHONY: patch unpatch build clean binary-arch binary-indep binary install configure

-- 
Debian Horde Packages repository: sork-passwd-h3 package



More information about the pkg-horde-hackers mailing list