[pkg-horde] [SCM] Debian Horde Packages repository: nag2 package branch, debian-sid, updated. c4e752bdde04f7992c9e9df708148024f3a0b9b9

[Mathieu Parent]

The following commit has been merged in the debian-sid branch:
commit efc884d59aeb944b178f2ba5c13ebc205ebd23e3
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Mon Jan 4 10:45:23 2010 +0100

    Replace config symlink by update-alternatives
    
    to allow configuration packages

diff --git a/debian/changelog b/debian/changelog
index 1173bb9..76a4ca7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,13 @@
-nag2 (2.3.4+debian0-1) UNRELEASED; urgency=low
+nag2 (2.3.4+debian0-1) unstable; urgency=low
 
   * New upstream release
   * Repack to remove external JS libs
   * Added check for upstream JS libs
   * Added me to uploaders
+  * Replace config symlink by update-alternatives to allow configuration
+    packages
 
- -- Mathieu Parent <sathieu at debian.org>  Mon, 04 Jan 2010 10:36:11 +0100
+ -- Mathieu Parent <sathieu at debian.org>  Mon, 04 Jan 2010 10:45:21 +0100
 
 nag2 (2.3.2-1) unstable; urgency=low
 
diff --git a/debian/nag2.postinst b/debian/nag2.postinst
new file mode 100644
index 0000000..14ca743
--- /dev/null
+++ b/debian/nag2.postinst
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    configure)
+        update-alternatives --install /usr/share/horde3/nag/config nag2-config /etc/horde/nag2 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/nag2.prerm b/debian/nag2.prerm
new file mode 100644
index 0000000..e4ab716
--- /dev/null
+++ b/debian/nag2.prerm
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    remove)
+        update-alternatives --remove nag2-config /etc/horde/nag2
+    ;;
+
+    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 25cb55c..b73f644 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,7 +43,8 @@ install: build
 	cp config/conf.xml debian/nag2/etc/horde/nag2/
 	touch debian/nag2/etc/horde/nag2/conf.php
 	#chown www-data:root debian/nag2/etc/horde/nag2/conf.php
-	dh_link etc/horde/nag2 usr/share/horde3/nag/config
+	#### nag expects configuration in config subdir, an update-alternatives
+	#### symlink is created in maintainer's script to comply with FHS
 
 	#### create htaccess  to restrict acess by web ####
 	echo "Deny from all" > debian/nag2/etc/horde/nag2/.htaccess

-- 
Debian Horde Packages repository: nag2 package