Dear Release-Team,
Please consider unblocking ampache-3.6-git408e713+dfsg-3 which is
currently in unstable. This upload fixes RC bug #688436, I have
attached a debdiff of the changes made.
Best regards
--
Charlie Smotherman
diff -Nru ampache-3.6-git408e713+dfsg/debian/ampache.postrm
ampache-3.6-git408e713+dfsg/debian/ampache.postrm
--- ampache-3.6-git408e713+dfsg/debian/ampache.postrm 2012-06-07
00:44:04.000000000 -0500
+++ ampache-3.6-git408e713+dfsg/debian/ampache.postrm 2012-09-22
16:59:04.000000000 -0500
@@ -4,21 +4,11 @@
. /usr/share/debconf/confmodule
-rm_log(){
- if [ -d /var/log/ampache ]; then
- rm -rf /var/log/ampache
- fi
-}
-
-rm_logr(){
- if [ -f /etc/logrotate.d/ampache ]; then
- rm -f /etc/logrotate.d/ampache
- fi
-}
-
-rm_cron(){
- if [ -f /etc/cron.daily/ampache ]; then
- rm -f /etc/cron.daily/ampache
+#ampache.conf is left behind during purge so remove it manually this way
+#everything is removed on purge.
+ampconf_rm(){
+ if [ -e /etc/ampache/ampache.conf ]; then
+ rm -f /etc/ampache/ampache.conf
fi
}
@@ -32,25 +22,15 @@
db_get ampache/restart_webserver || true
re_start="$RET"
if [ "$re_start" = "false" ]; then
- rm_log
- rm_logr
- rm_cron
+ printf "Please restart the web server manually."
elif [ "$re_start" = "true" ]; then
- rm_log
- rm_logr
- rm_cron
+ ampconf_rm
restart_server
else
printf "unable to de-configure ampache, please do so
manually.\n"
fi
fi
-if [ "$1" = "purge" ]; then
- if [ -d /etc/ampache ]; then
- rm -rf /etc/ampache
- fi
-fi
-
#DEBHELPER#
exit 0
diff -Nru ampache-3.6-git408e713+dfsg/debian/changelog
ampache-3.6-git408e713+dfsg/debian/changelog
--- ampache-3.6-git408e713+dfsg/debian/changelog 2012-06-07
01:01:21.000000000 -0500
+++ ampache-3.6-git408e713+dfsg/debian/changelog 2012-09-22
09:21:57.000000000 -0500
@@ -1,3 +1,10 @@
+ampache (3.6-git408e713+dfsg-3) unstable; urgency=low
+
+ * Remove statements in debian/ampache.postrm that manually remove conffiles,
+ log files on remove and purge. Closes: #688436
+
+ -- Charlie Smotherman <[email protected]> Sat, 22 Sep 2012 14:24:41 -0500
+
ampache (3.6-git408e713+dfsg-2) unstable; urgency=low
* Added functions to ampache.postrm so it is formated similar to
