[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#775347: unblock (pre-approval): fusiondirectory/1.0.8.2-3



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please consider unblocking planned upload of package fusiondirectory.

+  * debian/fusiondirectory.postrm:
+    + Fix handling Apache2's config file. Don't manipulate gosa.conf, but
+      fusiondirectory.conf on bin:package purgal. (Closes: #775336).

-> Obviously, Benoit and/or me missed that we made a copy+paste bug when
adopting package scripts from the gosa package. (How embarrassing...).

+  * debian/fusiondirectory.{dirs,prerm,postrm}:
+    + Perform spooling and cache data cleanup on every package removal in
+      .prerm, not via .postrm only when purging. This let's fusiondirectory
+      src:package pass the piuparts install/purgal test. (Closes: #767823).
+

-> A piuparts issue had been reported for package purgal.

This upload fixes both issues (I tested direct installation and piuparts).

light+love,
Mike


unblock fusiondirectory/1.0.8.2-3

-- System Information:
Debian Release: 8.0
  APT prefers stable
  APT policy: (990, 'stable'), (500, 'testing-updates'), (500, 'testing-proposed-updates'), (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: sysvinit (via /sbin/init)
diff -Nru fusiondirectory-1.0.8.2/debian/changelog fusiondirectory-1.0.8.2/debian/changelog
--- fusiondirectory-1.0.8.2/debian/changelog	2014-10-25 18:53:37.000000000 +0200
+++ fusiondirectory-1.0.8.2/debian/changelog	2015-01-14 15:04:39.000000000 +0100
@@ -1,3 +1,15 @@
+fusiondirectory (1.0.8.2-3) unstable; urgency=medium
+
+  * debian/fusiondirectory.postrm:
+    + Fix handling Apache2's config file. Don't manipulate gosa.conf, but
+      fusiondirectory.conf on bin:package purgal. (Closes: #775336).
+  * debian/fusiondirectory.{dirs,prerm,postrm}:
+    + Perform spooling and cache data cleanup on every package removal in
+      .prerm, not via .postrm only when purging. This let's fusiondirectory
+      src:package pass the piuparts install/purgal test. (Closes: #767823).
+
+ -- Mike Gabriel <sunweaver@debian.org>  Wed, 14 Jan 2015 15:03:36 +0100
+
 fusiondirectory (1.0.8.2-2) unstable; urgency=medium
 
   [ Benoit Mortier ]
diff -Nru fusiondirectory-1.0.8.2/debian/fusiondirectory.dirs fusiondirectory-1.0.8.2/debian/fusiondirectory.dirs
--- fusiondirectory-1.0.8.2/debian/fusiondirectory.dirs	2014-08-08 11:06:26.000000000 +0200
+++ fusiondirectory-1.0.8.2/debian/fusiondirectory.dirs	2015-01-14 14:59:16.000000000 +0100
@@ -5,4 +5,5 @@
 var/cache/fusiondirectory/tmp
 var/cache/fusiondirectory/fai
 var/cache/fusiondirectory/template
+var/cache/fusiondirectory/locale
 var/spool/fusiondirectory
diff -Nru fusiondirectory-1.0.8.2/debian/fusiondirectory.postrm fusiondirectory-1.0.8.2/debian/fusiondirectory.postrm
--- fusiondirectory-1.0.8.2/debian/fusiondirectory.postrm	2014-09-15 19:27:03.000000000 +0200
+++ fusiondirectory-1.0.8.2/debian/fusiondirectory.postrm	2015-01-14 14:59:30.000000000 +0100
@@ -7,23 +7,10 @@
 case "$1" in
 	remove|purge)
 
-	# Purge here
-	if [ "$1" = "purge" ] ; then
-		if [ -d /var/spool/fusiondirectory ] ; then
-			echo "Removing /var/spool/fusiondirectory as requested."
-			rm -Rf /var/spool/fusiondirectory
-		fi
-
-		if [ -d /var/cache/fusiondirectory ] ; then
-			echo "Removing /var/cache/fusiondirectory as requested."
-			rm -Rf /var/chache/fusiondirectory
-		fi
-	fi
-
 	if [ -d /etc/apache2/conf.d ]; then
 		# Remove FusionDirectory include
-		if [ -L /etc/apache2/conf.d/gosa.conf ]; then
-			rm -f /etc/apache2/conf.d/gosa.conf
+		if [ -L /etc/apache2/conf.d/fusiondirectory.conf ]; then
+			rm -f /etc/apache2/conf.d/fusiondirectory.conf
 		fi
 
 		# Restart servers
@@ -39,13 +26,13 @@
 	if [ -d /etc/apache2/conf-available ] ; then
 		if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
 			. /usr/share/apache2/apache2-maintscript-helper
-			apache2_invoke disconf gosa
-		elif [ -L /etc/apache2/conf-enabled/gosa.conf ]; then
-			rm -f /etc/apache2/conf-enabled/gosa.conf
+			apache2_invoke disconf fusiondirectory
+		elif [ -L /etc/apache2/conf-enabled/fusiondirectory.conf ]; then
+			rm -f /etc/apache2/conf-enabled/fusiondirectory.conf
 		fi
 
-		if [ -L /etc/apache2/conf-available/gosa.conf ]; then
-			rm -f /etc/apache2/conf-available/gosa.conf
+		if [ -L /etc/apache2/conf-available/fusiondirectory.conf ]; then
+			rm -f /etc/apache2/conf-available/fusiondirectory.conf
 		fi
 
 		# Finally restart servers
diff -Nru fusiondirectory-1.0.8.2/debian/fusiondirectory.prerm fusiondirectory-1.0.8.2/debian/fusiondirectory.prerm
--- fusiondirectory-1.0.8.2/debian/fusiondirectory.prerm	1970-01-01 01:00:00.000000000 +0100
+++ fusiondirectory-1.0.8.2/debian/fusiondirectory.prerm	2015-01-14 13:39:37.000000000 +0100
@@ -0,0 +1,39 @@
+#! /bin/sh
+# prerm script for FusionDirectory
+#
+
+set -e
+
+case "$1" in
+	remove)
+
+	if [ -d /var/spool/fusiondirectory ] ; then
+		echo "Removing /var/spool/fusiondirectory as requested."
+		rm -Rf /var/spool/fusiondirectory
+	fi
+
+	if [ -d /var/cache/fusiondirectory ] ; then
+		echo "Removing cache data from /var/cache/fusiondirectory as requested."
+		rm -f  /var/cache/fusiondirectory/class.cache
+		rm -Rf /var/cache/fusiondirectory/tmp/*
+		rm -Rf /var/cache/fusiondirectory/fai/*
+		rm -Rf /var/cache/fusiondirectory/template/*
+		rm -Rf /var/cache/fusiondirectory/locale/*
+	fi
+
+	;;
+	deconfigure|upgrade|failed-upgrade)
+
+	:
+
+	;;
+	*) echo "$0: didn't understand being called with \`$1'" 1>&2
+
+	exit 1
+
+	;;
+esac
+
+#DEBHELPER#
+
+exit 0

Reply to: