Bug#692122: unblock: ampache/ampache-3.6-git408e713+dfsg-3.1

2012-11-12 Thread Charlie Smotherman
Julien, Hi

On Sun, Nov 11, 2012 at 11:30 AM, Julien Cristau jcris...@debian.org wrote:
 tag 692122 moreinfo
 kthxbye

 On Fri, Nov  2, 2012 at 02:17:00 -0500, Charlie Smotherman wrote:

 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.0 -0500
 +++ ampache-3.6-git408e713+dfsg/debian/ampache.postrm 2012-10-14 
 10:13:27.0 -0500
 @@ -4,24 +4,6 @@

  . /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
 - fi
 -}
 -

 Why is this removed entirely?  Surely you still need to clean things up
 in postrm purge?

  restart_server(){
   if [ -e /var/run/apache2.pid ]; then
   service apache2 reload
 @@ -32,25 +14,14 @@
   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.

 Why doesn't this have a newline?  (Why doesn't it use echo?)

   elif [ $re_start = true ]; then
 - rm_log
 - rm_logr
 - rm_cron
   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
 -

 That looks wrong.

  #DEBHELPER#

  exit 0

Thanks for the review :)

I have been looking at ampache a bit closer and I have found some
additional bugs.  With it this late in the freeze probably the
easiest/best thing to do is to remove ampache from testing so the
release can happen.  Apache is due to transition to 2.4 post release,
which I will have to do an upload for anyway.  That should give me
enough time to make piuparts happy.

Best regard
Charlie Smotherman


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#692122: unblock: ampache/ampache-3.6-git408e713+dfsg-3.1

2012-11-11 Thread Julien Cristau
tag 692122 moreinfo
kthxbye

On Fri, Nov  2, 2012 at 02:17:00 -0500, Charlie Smotherman wrote:

 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.0 -0500
 +++ ampache-3.6-git408e713+dfsg/debian/ampache.postrm 2012-10-14 
 10:13:27.0 -0500
 @@ -4,24 +4,6 @@
  
  . /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
 - fi
 -}
 -

Why is this removed entirely?  Surely you still need to clean things up
in postrm purge?

  restart_server(){
   if [ -e /var/run/apache2.pid ]; then
   service apache2 reload
 @@ -32,25 +14,14 @@
   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.

Why doesn't this have a newline?  (Why doesn't it use echo?)

   elif [ $re_start = true ]; then
 - rm_log
 - rm_logr
 - rm_cron
   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
 -

That looks wrong.

  #DEBHELPER#
  
  exit 0

Cheers,
Julien


signature.asc
Description: Digital signature


Bug#692122: unblock: ampache/ampache-3.6-git408e713+dfsg-3.1

2012-11-02 Thread Charlie Smotherman
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package ampache

Ampache has been NMU'd please unblock

unblock ampache/ampache-3.6-git408e713+dfsg-3.1

-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: i386 (i686)

Kernel: Linux 3.2.0-3-686-pae (SMP w/1 CPU core)
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.0 -0500
+++ ampache-3.6-git408e713+dfsg/debian/ampache.postrm	2012-10-14 10:13:27.0 -0500
@@ -4,24 +4,6 @@
 
 . /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
-	fi
-}
-
 restart_server(){
 	if [ -e /var/run/apache2.pid ]; then
 		service apache2 reload
@@ -32,25 +14,14 @@
 	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
 		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/ampache.prerm ampache-3.6-git408e713+dfsg/debian/ampache.prerm
--- ampache-3.6-git408e713+dfsg/debian/ampache.prerm	1969-12-31 18:00:00.0 -0600
+++ ampache-3.6-git408e713+dfsg/debian/ampache.prerm	2012-10-14 10:18:01.0 -0500
@@ -0,0 +1,8 @@
+#!/bin/sh -e
+
+# This link is created on postinst, so must be removed explicitly.
+rm -f /etc/ampache/ampache.conf
+
+#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.0 -0500
+++ ampache-3.6-git408e713+dfsg/debian/changelog	2012-10-14 10:15:09.0 -0500
@@ -1,3 +1,17 @@
+ampache (3.6-git408e713+dfsg-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Remove generated link in prerm.  Closes: #688436
+
+ -- Bas Wijnen wij...@debian.org  Sun, 14 Oct 2012 16:31:58 +0200
+
+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 cj...@cableone.net  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