[pkg-horde] [SCM] Debian Horde Packages repository: mnemo2 package branch, debian-sid, updated. 700838a9b17c8d736706c66428bf38e6c30a4e95

[Mathieu Parent]

The following commit has been merged in the debian-sid branch:
commit 700838a9b17c8d736706c66428bf38e6c30a4e95
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Mon Dec 21 18:46:18 2009 +0100

    New upstream release.
    
    * Added a check in debian/rules to make sure that external libs are not
      in the orig.tar.gz
    * Replace config symlink by update-alternatives to allow configuration
      packages
    * Added me to uploaders

diff --git a/debian/changelog b/debian/changelog
index 17d40a8..097fe6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+mnemo2 (2.2.3+debian0-1) UNRELEASED; urgency=low
+
+  * New upstream release. 
+  * Added a check in debian/rules to make sure that external libs are not
+    in the orig.tar.gz
+  * Replace config symlink by update-alternatives to allow configuration
+    packages
+  * Added me to uploaders 
+
+ -- Mathieu Parent <sathieu at debian.org>  Mon, 21 Dec 2009 18:41:33 +0100
+
 mnemo2 (2.2.1-1) unstable; urgency=low
 
   * New upstream release. 
diff --git a/debian/control b/debian/control
index 6730fe5..184f57d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: mnemo2
 Section: web
 Priority: optional
 Maintainer: Horde Maintainers <pkg-horde-hackers at lists.alioth.debian.org>
-Uploaders: Ola Lundqvist <opal at debian.org>, Lionel Elie Mamane <lmamane at debian.org>, Gregory Colpart <reg at debian.org>
+Uploaders: Ola Lundqvist <opal at debian.org>, Lionel Elie Mamane <lmamane at debian.org>, Gregory Colpart <reg at debian.org>, Mathieu Parent <sathieu at debian.org>
 Build-Depends: debhelper (>= 5)
 Vcs-Git: git://git.debian.org/pkg-horde/mnemo2.git
 Vcs-Browser: http://git.debian.org/?p=pkg-horde/mnemo2.git
diff --git a/debian/mnemo2.postinst b/debian/mnemo2.postinst
new file mode 100644
index 0000000..5c4e842
--- /dev/null
+++ b/debian/mnemo2.postinst
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    configure)
+        update-alternatives --install /usr/share/horde3/mnemo/config mnemo2-config /etc/horde/mnemo2 1
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
+
diff --git a/debian/mnemo2.prerm b/debian/mnemo2.prerm
new file mode 100644
index 0000000..7799f8b
--- /dev/null
+++ b/debian/mnemo2.prerm
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    remove)
+        update-alternatives --remove mnemo2-config /etc/horde/mnemo2
+    ;;
+
+    upgrade|deconfigure|failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
+
diff --git a/debian/rules b/debian/rules
index 1a5e686..607ff3f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ configure-stamp:
 	dh_testdir
 	touch configure-stamp
 
-build: build-stamp
+build: check-external-libs build-stamp
 
 build-stamp: configure-stamp 
 	dh_testdir
@@ -43,7 +43,8 @@ install: build
 	cp config/conf.xml debian/mnemo2/etc/horde/mnemo2/
 	touch debian/mnemo2/etc/horde/mnemo2/conf.php
 	#chown www-data:root debian/mnemo2/etc/horde/mnemo2/conf.php
-	dh_link etc/horde/mnemo2 usr/share/horde3/mnemo/config
+	#### kronolith expects configuration in config subdir, an update-alternatives
+	#### symlink is created in maintainer's scripts to comply with FHS
 
 	#### change made for program run with no problems ###
 	cat config/prefs.php.dist | \
@@ -105,4 +106,15 @@ binary-indep: build install
 	dh_builddeb
 
 binary: binary-indep binary-arch
+
+check-external-libs:
+	if [ -e js/prototype.js ] || [ -e js/src/prototype.js ]; then \
+	      echo ""; \
+	      echo " **                                  **"; \
+	      echo " **  tar contains external files!    **"; \
+	      echo " **                                  **"; \
+	      echo ""; \
+	      exit 1; \
+	  fi
+
 .PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/debian/watch b/debian/watch
index 6c2f885..e42e1e6 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
-version=2
-http://ftp.horde.org/pub/mnemo/mnemo-h3-([\d\.]*)\.tar\.gz
+version=3
+opts=dversionmangle=s/\+debian\d$// \
+  http://ftp.horde.org/pub/mnemo/mnemo-h3-([\d\.]*)\.tar\.gz

-- 
Debian Horde Packages repository: mnemo2 package