Bug#692122: More info

2012-11-21 Thread Charlie Smotherman 
/debian/conf/ampache1.conf
/home/charlie/amp/new/debian/conf/ampache1.conf
--- /home/charlie/amp/old/debian/conf/ampache1.conf 1969-12-31
18:00:00.0 -0600
+++ /home/charlie/amp/new/debian/conf/ampache1.conf 2012-11-12
22:35:50.0 -0600
@@ -0,0 +1,6 @@
+Alias /ampache /usr/share/ampache/www
+
+Directory /usr/share/ampache/www
+   Options FollowSymLinks
+   AllowOverride All
+/Directory
diff -rupN /home/charlie/amp/old/debian/conf/ampache.conf
/home/charlie/amp/new/debian/conf/ampache.conf
--- /home/charlie/amp/old/debian/conf/ampache.conf  2012-05-29
21:37:21.0 -0500
+++ /home/charlie/amp/new/debian/conf/ampache.conf  1969-12-31
18:00:00.0 -0600
@@ -1,6 +0,0 @@
-Alias /ampache /usr/share/ampache/www
-
-Directory /usr/share/ampache/www
-   Options FollowSymLinks
-   AllowOverride All
-/Directory
diff -rupN /home/charlie/amp/old/debian/control
/home/charlie/amp/new/debian/control
--- /home/charlie/amp/old/debian/control2012-06-02 12:29:18.0 
-0500
+++ /home/charlie/amp/new/debian/control2012-11-19 18:16:09.0 
-0600
@@ -11,7 +11,7 @@ Architecture: all
 Depends: ${misc:Depends},
  debconf (= 0.5) | debconf-2.0,
  libapache2-mod-php5 | php5,
- ampache-common (= 3.6-git408e713+dfsg-1),
+ ampache-common (= 3.6-rzb2497+dfsg-0ubuntu1),
  php5-cli,
  php5-mysql,
  php5-xmlrpc,
@@ -21,7 +21,8 @@ Depends: ${misc:Depends},
  libphp-phpmailer,
  libphp-snoopy,
  ttf-freefont
-Conflicts: ampache-themes-3.3.3.5a-1
+Replaces: ampache ( 3.6-git408e713+dfsg-1)
+Breaks: ampache ( 3.6-git408e713+dfsg-1)
 Recommends: apache2-mpm-prefork | apache2-mpm-itk, ampache-themes (= 3.6.1-2)
 Suggests: php5-gd, phpmyadmin, mysql-server, eyed3, faad, vorbis-tools
 Description: web-based audio file management system
@@ -42,7 +43,7 @@ Breaks: ampache ( 3.6-git408e713+dfsg-
 Suggests: ampache, php5-gd, phpmyadmin, mysql-server, eyed3, faad, vorbis-tools
 Description: web-based audio file management system common files
  This package provides common files for Ampache. This package is server
- independent and is intended for users who whish to use other web servers,
+ independent and is intended for users who wish to use other web servers,
  virtual enviroments, or LXC's to deploy Ampache.
  .
  Ampache is a web-based audio file manager implemented with PHP and
diff -rupN /home/charlie/amp/old/debian/patches/01_logrotate.patch
/home/charlie/amp/new/debian/patches/01_logrotate.patch
--- /home/charlie/amp/old/debian/patches/01_logrotate.patch 2012-06-02
22:52:03.0 -0500
+++ /home/charlie/amp/new/debian/patches/01_logrotate.patch 1969-12-31
18:00:00.0 -0600
@@ -1,16 +0,0 @@
-Description: Removed date from log file name, it confuses logrotate.
-Author: Charlie Smotherman cj...@cableone.net
-
-Index: ampache-3.6-git408e713+dfsg/lib/log.lib.php
-===
 ampache-3.6-git408e713+dfsg.orig/lib/log.lib.php   2012-06-02
13:15:46.0 -0500
-+++ ampache-3.6-git408e713+dfsg/lib/log.lib.php2012-06-02
21:39:53.0 -0500
-@@ -41,7 +41,7 @@
-   $log_name   = $log_name ? $log_name : 'ampache';
-   $username   = $username ? $username : 'ampache';
-
--  $log_filename   = Config::get('log_path') . /$log_name.$log_day.log;
-+  $log_filename   = Config::get('log_path') . /$log_name.log;
-   $log_line   = $log_time [$username] ($event_name) - 
$event_description \n;
-
-   // Do the deed
diff -rupN /home/charlie/amp/old/debian/patches/series
/home/charlie/amp/new/debian/patches/series
--- /home/charlie/amp/old/debian/patches/series 2012-06-02
21:40:33.0 -0500
+++ /home/charlie/amp/new/debian/patches/series 2012-11-12
22:48:07.0 -0600
@@ -1,2 +1 @@
-01_logrotate.patch
 02_nonfree_font.patch

I fear this big of a change would not be accepted by the release team
this late in the freeze, if this is the case please remove ampache
from testing.

Best regards
-- 
Charlie Smotherman


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/cal_xwdc4emzvj2y9zxsjqvju4tsovq7djbvgts9xfjwkyzz...@mail.gmail.com

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-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/CAL_XWdDCYs0U7tO=lvwgaza56uhqo51-ql_pqeweqgykuee...@mail.gmail.com

Bug#692121: RM: rhythmbox-ampache/0.11.1-1

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

Please remove rhythmbox-ampache as it is not fit for release

-- 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)


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20121102064637.1260.44586.reportbug@eagle

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

Re: Pre-upload approval for Rhythmbox-ampache RC #646642

2012-10-30 Thread Charlie Smotherman 
On Mon, Oct 15, 2012 at 5:34 AM, Charlie Smotherman cj...@cableone.net wrote:
 Dear Release Team,

 With regard to bug #646642, the current state of the rhythmbox-ampache
 plugin is unusable.  With the major changes to the rhythmbox API the
 rhythmbox-ampache plugin had to almost be totally rewritten.

 I have attached a debdiff of the changes.  Would these changes be
 appropriate for inclusion into wheezy, or would it be more appropriate
 to remove rhythmbox-ampache from testing and upload the new version
 post-release?

 http://mentors.debian.net/debian/pool/main/r/rhythmbox-ampache/rhythmbox-ampache_0.11.1+svn34-1.dsc


Dear Release Team,

Has there been any movement on this?

Best Regards
Charlie Smotherman


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/CAL_XWdB8tXxFLNXAkG-1YWd=a2qrskhq3bw6hatb0ti5t6d...@mail.gmail.com

Re: Pre-upload approval for Rhythmbox-ampache RC #646642

2012-10-30 Thread Charlie Smotherman 
On Tue, Oct 30, 2012 at 5:48 AM, Adam D. Barratt
a...@adam-barratt.org.uk wrote:
 On 30.10.2012 10:13, Charlie Smotherman wrote:

 On Tue, Oct 30, 2012 at 4:27 AM, Adam D. Barratt
 a...@adam-barratt.org.uk wrote:

 That's unlikely, given that there's no sign of the mail you quote above
 ever
 having reached debian-release@ (it's not in the web archive either
 afaict).

 You mentioned that you attached a debdiff. The most common issue in these
 cases is that the mail ends up being over lists.d.o's size limits, which
 means it's not posted to the list; it's also often a sign that the
 debdiff
 is too big. :)

 Regards,

 Adam


 There is a debdiff attached to #646642.  So how should we proceed?


 Keeping the discussion on-list would be a good start. :-p

Whoops, sorry I just hit the reply button :)


 You could gzip the debdiff, which would probably get it under the list
 server limit. On the whole, opening bugs rather than just mailing
 debian-release is also useful.


FWIW I am not a DD so RB-ampache has not been uploaded to unstable
yet, so IMHO an unblock bug is not appropriate as described in Rule
#7 at [1], hence that is why I am sending mails instead of a unblock
bug.  I am trying to follow Rule #2.

The RB-ampache plugin has been almost totally rewritten so the changes
are very intrusive.  I was just wondering if the release team
considers these intrusive changes appropriate or not.  If not I was
going to file a removal request, if yes then I will go through the
process of finding a DD to upload it and then file an unblock bug

Attached is the zipped debdiff, hopefully it will make it through this time.

[1] http://release.debian.org/wheezy/freeze_policy.html

Best regards
-- 
Charlie Smotherman


RB-ampache_debdiff.txt.tar.gz
Description: GNU Zip compressed data

Freeze Exception for Ampache

2012-09-23 Thread Charlie Smotherman 
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.0 -0500
+++ ampache-3.6-git408e713+dfsg/debian/ampache.postrm   2012-09-22 
16:59:04.0 -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/changelog2012-06-07 
01:01:21.0 -0500
+++ ampache-3.6-git408e713+dfsg/debian/changelog2012-09-22 
09:21:57.0 -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 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

Re: Ampache Translation freeze exception

2010-10-28 Thread Charlie Smotherman 
On Wed, Oct 27, 2010 at 12:09 PM, Mehdi Dogguy me...@dogguy.org wrote:
 On 27/10/2010 08:01, Charlie Smotherman wrote:
 Release Team,

 I would like to request a freeze exception for ampache-3.5.4-9 to add
 cs.po and vi.po

 Attached is a debdiff of the changes.


 The debdiff looks ok. Please upload and let us know once the pacakge has
 been accepted.

 Best regards

 Charlie Smotherman

 --
 Mehdi Dogguy مهدي الدڤي
 http://dogguy.org/


Uploaded

Best regards
Charlie Smotherman


--
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/aanlktiksv5u5fzbca9n0r18xgbf9h3nknprqoshlo...@mail.gmail.com

Ampache Translation freeze exception

2010-10-27 Thread Charlie Smotherman 
Release Team,

I would like to request a freeze exception for ampache-3.5.4-9 to add
cs.po and vi.po

Attached is a debdiff of the changes.

Best regards

Charlie Smotherman


8to9-diff
Description: Binary data

quickplay removal

2010-10-22 Thread Charlie Smotherman 
Dear Release Team,

Please remove quickplay from testing.  Upstream is essentially dead
and has no plans of updating the code even though he has been
contacted several times about fixing bugs that are not listed in the
BTS. This removal will also make room for the Viridian player which
does the same thing as quickplay.  Viridian has a very active upstream
and is much more feature rich than quickplay.

I have already requested removal from the ftp-masters in Bug#599494.

Best regards
Charlie Smotherman


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/aanlktinxh=7yeejxawhd_87sbeh=6ndq8_bh8nsus...@mail.gmail.com

Re: Freeze exception for Ampache

2010-09-22 Thread Charlie Smotherman 
 That looks much better; thanks.  Please feel free to upload that
 version.

 Regards,

 Adam

Uploaded :)

Best regards
Charlie Smotherman


--
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/aanlktik2x2pyxnrnp803cmkhtcn+hybzsyf6ds6bj...@mail.gmail.com

Re: Freeze exception for Ampache

2010-09-21 Thread Charlie Smotherman 
On Tue, Sep 21, 2010 at 4:19 PM, Adam D. Barratt
a...@adam-barratt.org.uk wrote:
 Thanks, although it's not quite in the right place; as I said, possibly
 my fault for not making it clear in the first place.  The if block
 surrounds the entire webserver restart section, so the fi should be
 (except with proper re-intending):

 diff -Nru -w ampache-3.5.4/debian/ampache.postrm 
 ampache-3.5.4/debian/ampache.postrm
 --- ampache-3.5.4/debian/ampache.postrm 2010-08-02 05:06:51.0 +0100
 +++ ampache-3.5.4/debian/ampache.postrm 2010-09-11 18:15:29.0 +0100
 @@ -53,6 +54,7 @@
        fi
    done
  fi
 +fi

  if [ $1 = purge ]; then
     #This is needed to remove user added content.

doooh, gotcha how silly of me :)

New debdiff attached

http://vollmer.kicks-ass.net/amp/ampache_3.5.4-8.dsc


amp-8.1-diff
Description: Binary data

Re: Freeze exception for Ampache

2010-09-19 Thread Charlie Smotherman 
On Sun, Sep 19, 2010 at 10:44 AM, Adam D. Barratt
a...@adam-barratt.org.uk wrote:
 On Fri, 2010-09-17 at 14:33 -0500, Charlie Smotherman wrote:
 On Sat, 2010-09-11 at 20:30 +0100, Adam D. Barratt wrote:
 I have applied the changes you have suggested.  Thx :)
 I have tried to keep changes to a minimum but after release I plan to
 use a state engine for the debconf questions so if the answers to the
 questions is no the installation will exit gracefully.

 The postrm fix appears to be missing the final fi; the indentation's
 now also confusing, but that's possibly my fault for providing a diff
 which didn't re-indent to make it clearer where the changes were.


Done, Inserted missing fi'.
Done, I went ahead and fixed the indentation throughout the entire
postrm, sorry for the noise in the diff.

  fwiw, I also found the wording of the configure and restart the web
  server question slightly confusing, as it suggests that the
  configuration will be performed in any case and only the restarting will
  not be done automatically.

 What would you suggest?
 Is it to late in the release cycle to request this from the translation
 team or should this wait until after release?

 Reading it through again it's not quite as confusing as I remember. :)
 It would be good to make it clearer, but I'm not sure there's any great
 rush.

I will work on this to make it clearer in squeeze +1.

I will also be adding  a debconf template stating that the webserver
is not configured for ampache and that it needs to be done manually,
and exit gracefully if the answer to the debconf
ampache/webserver_restart question is no, for squeeze +1.

Attached is a debdiff of the changes.

The new package can be grabbed at

http://vollmer.kicks-ass.net/amp/ampache_3.5.4-8.dsc

Best regards
Charlie


amp--diff
Description: Binary data

Freeze exception for Ampache

2010-09-17 Thread Charlie Smotherman 
I sent this mail approx a week ago.  I just checked the debian-release
mailing list archives and it has still not shown up on the list, so I am
resending this mail.  If you have already received this mail please
forgive the noise

On Sat, 2010-09-11 at 20:30 +0100, Adam D. Barratt wrote:
Adam,
Sorry it has taken so long to get back to you, but grandchild #8 decided
she needed to come into the world so I have been doing the grandpa
thing :)

 The attached debdiff (generated with -w to reduce the noise due to
 indentation changes) implements both of these changes and modifies the
 postinst to only configure the webserver when called with configure,
 not also with upgrade.

I have applied the changes you have suggested.  Thx :)
I have tried to keep changes to a minimum but after release I plan to
use a state engine for the debconf questions so if the answers to the
questions is no the installation will exit gracefully.

 fwiw, I also found the wording of the configure and restart the web
 server question slightly confusing, as it suggests that the
 configuration will be performed in any case and only the restarting will
 not be done automatically.

What would you suggest?
Is it to late in the release cycle to request this from the translation
team or should this wait until after release?

The new package can be found at

http://vollmer.kicks-ass.net/amp/ampache_3.5.4-8.dsc

Best regards
Charlie Smotherman


--
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/aanlkti=9n8fsxu07n9a8xtqgayn3yngurbrxa5qkx...@mail.gmail.com

Re: Ampache Freeze exception

2010-08-18 Thread Charlie Smotherman 
On Tue, 2010-08-17 at 18:56 +0100, Adam D. Barratt wrote:
 On Tue, 2010-08-17 at 11:15 -0500, Charlie Smotherman wrote:
 [...]
   On Mon, 16 Aug 2010 23:15:32 -0500
   Charlie Smotherman cj...@cableone.net wrote:
I have prepared a updated version of ampache which fixes RC bugs
#593181, and #593182.  Attached is a diff of the proposed changes.
 [...]
  http://mentors.debian.net/debian/pool/main/a/ampache/ampache_3.5.4-7.dsc  
 
 Please go ahead and let us know once the package has been accepted.

Done

Best regards 
Charlie Smotherman


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/1282151708.11478.11.ca...@debian

Re: Ampache Freeze exception

2010-08-17 Thread Charlie Smotherman 
On Tue, 2010-08-17 at 07:59 +0100, Neil Williams wrote:
 On Mon, 16 Aug 2010 23:15:32 -0500
 Charlie Smotherman cj...@cableone.net wrote:
 
  Dear Release Team,
  
  I have prepared a updated version of ampache which fixes RC bugs
  #593181, and #593182.  Attached is a diff of the proposed changes.
  
  http://mentors.debian.net/debian/pool/main/a/ampache/ampache_3.5.4-7.dsc 
  
  Best regards
  
  Charlie Smotherman
 
 -Build-Depends: debhelper (= 7.0.50), po-debconf
 +Build-Depends: debhelper (= 7.0.50), po-debconf, quilt (= 0.46-7)
  Standards-Version: 3.9.1
  
  Package: ampache
 diff -Nru ampache-3.5.4/debian/patches/debian-changes-3.5.4-7
 ampache-3.5.4/debian/patches/debian-changes-3.5.4-7
 --- ampache-3.5.4/debian/patches/debian-changes-3.5.4-7
 1969-12-31 18:00:00.0 -0600 +++
 ampache-3.5.4/debian/patches/debian-changes-3.5.4-7   2010-08-16
 22:24:38.0 -0500 @@ -0,0 +1,390 @@ +Description: Upstream
 changes introduced in version 3.5.4-7
 + This patch has been created by dpkg-source during the package build.
 + Here's the last changelog entry, hopefully it gives details on why
 + those changes were made:
 
 You've used dpkg-source to create the patch and then specified quilt as
 a Build-Depends? Yet in the actual source package, you've still
 declared source format 3.0 (quilt). You don't add a build-depends on
 quilt when using dpkg-source in quilt mode unless you are doing some
 unusual stuff with quilt - this package doesn't.
 
 http://wiki.debian.org/Projects/DebSrc3.0#Doesa3.0.28quilt.29sourcepackageneedtobuild-dependonquilt.3F
 
 That leaves you with all the .pc content in the diff.
 
 http://man.he.net/man1/dpkg-source
 
 Ask your sponsor or on debian-mentors if you're unsure but this diff is
 a mess. Source Format 3.0 was meant to avoid the need to add an entire
 patch system merely to fix release-critical bugs - you've missed the
 point somewhere.
 
Neil,

Sorry, thanks for the education, attached is a new diff.

http://mentors.debian.net/debian/pool/main/a/ampache/ampache_3.5.4-7.dsc  

Charlie

diff -Nru ampache-3.5.4/debian/ampache.postinst ampache-3.5.4/debian/ampache.postinst
--- ampache-3.5.4/debian/ampache.postinst	2010-08-01 23:06:51.0 -0500
+++ ampache-3.5.4/debian/ampache.postinst	2010-08-15 22:17:57.0 -0500
@@ -26,9 +26,8 @@
 }
 
 apache_install() {
-webserver=$1
-if [ -d /etc/$webserver/conf.d ]  [ ! -h /etc/$webserver/conf.d/ampache.conf ]; then
-ln -s $AMP /etc/$webserver/conf.d/ampache.conf
+if [ ! -f /etc/apache2/conf.d/ampache.conf ]  [ ! -h /etc/apache2/conf.d/ampache.conf ]; then
+ln -s $AMP /etc/apache2/conf.d/ampache.conf
 if [ -f $ELCAMP ]; then
 rm -f $ELCAMP
 fi
diff -Nru ampache-3.5.4/debian/changelog ampache-3.5.4/debian/changelog
--- ampache-3.5.4/debian/changelog	2010-08-12 10:28:47.0 -0500
+++ ampache-3.5.4/debian/changelog	2010-08-17 06:52:04.0 -0500
@@ -1,3 +1,14 @@
+ampache (3.5.4-7) unstable; urgency=high
+
+  * Adjusted symlink creation in debian/postinst so it now works.
+Closes: #593181
+  * Upstream neglected to comment out the require once for
+/modules/pearxmlrpc/rpc.php which causes the inital login after the 
+completion of the web installer to fail due to php not being able to find
+/modules/pearxmlrpc/rpc.php.  Closes: #593182
+
+ -- Charlie Smotherman cj...@cableone.net  Sun, 17 Aug 2010 06:51:29 -0500
+
 ampache (3.5.4-6) unstable; urgency=high
 
   * Setting urgency to high as this fixes an RC bug.
diff -Nru ampache-3.5.4/debian/patches/debian-changes-3.5.4-7 ampache-3.5.4/debian/patches/debian-changes-3.5.4-7
--- ampache-3.5.4/debian/patches/debian-changes-3.5.4-7	1969-12-31 18:00:00.0 -0600
+++ ampache-3.5.4/debian/patches/debian-changes-3.5.4-7	2010-08-17 07:46:31.0 -0500
@@ -0,0 +1,43 @@
+Description: Upstream changes introduced in version 3.5.4-7
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ ampache (3.5.4-7) unstable; urgency=high
+ .
+   * Adjusted symlink creation in debian/postinst so it now works.
+ Closes: #593181
+   * Upstream neglected to comment out the require once for
+ /modules/pearxmlrpc/rpc.php which causes the inital login after the
+ completion of the web installer to fail due to php not being able to find
+ /modules/pearxmlrpc/rpc.php.  Closes: #593182
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Charlie Smotherman cj...@cableone.net
+Bug-Debian: http://bugs.debian.org/593181
+Bug-Debian: http://bugs.debian.org/593182
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: vendor|upstream|other, url of original patch
+Bug: url

Ampache Freeze exception

2010-08-16 Thread Charlie Smotherman 
Dear Release Team,

I have prepared a updated version of ampache which fixes RC bugs
#593181, and #593182.  Attached is a diff of the proposed changes.

http://mentors.debian.net/debian/pool/main/a/ampache/ampache_3.5.4-7.dsc 

Best regards

Charlie Smotherman
diff -Nru ampache-3.5.4/debian/ampache.postinst ampache-3.5.4/debian/ampache.postinst
--- ampache-3.5.4/debian/ampache.postinst	2010-08-01 23:06:51.0 -0500
+++ ampache-3.5.4/debian/ampache.postinst	2010-08-15 22:17:57.0 -0500
@@ -26,9 +26,8 @@
 }
 
 apache_install() {
-webserver=$1
-if [ -d /etc/$webserver/conf.d ]  [ ! -h /etc/$webserver/conf.d/ampache.conf ]; then
-ln -s $AMP /etc/$webserver/conf.d/ampache.conf
+if [ ! -f /etc/apache2/conf.d/ampache.conf ]  [ ! -h /etc/apache2/conf.d/ampache.conf ]; then
+ln -s $AMP /etc/apache2/conf.d/ampache.conf
 if [ -f $ELCAMP ]; then
 rm -f $ELCAMP
 fi
diff -Nru ampache-3.5.4/debian/changelog ampache-3.5.4/debian/changelog
--- ampache-3.5.4/debian/changelog	2010-08-12 10:28:47.0 -0500
+++ ampache-3.5.4/debian/changelog	2010-08-16 20:26:45.0 -0500
@@ -1,3 +1,15 @@
+ampache (3.5.4-7) unstable; urgency=high
+
+  * Added quilt patch system.
+  * Adjusted symlink creation in debian/postinst so it now works.
+Closes: #593181
+  * Upstream neglected to comment out the require once for
+/modules/pearxmlrpc/rpc.php which causes the inital login after the 
+completion of the web installer to fail due to php not being able to find
+/modules/pearxmlrpc/rpc.php.  Closes: #593182
+
+ -- Charlie Smotherman cj...@cableone.net  Sun, 16 Aug 2010 20:26:29 -0500
+
 ampache (3.5.4-6) unstable; urgency=high
 
   * Setting urgency to high as this fixes an RC bug.
diff -Nru ampache-3.5.4/debian/control ampache-3.5.4/debian/control
--- ampache-3.5.4/debian/control	2010-08-12 10:01:35.0 -0500
+++ ampache-3.5.4/debian/control	2010-08-15 22:15:03.0 -0500
@@ -5,7 +5,7 @@
 Vcs-Svn: https://svn.ampache.org/trunk
 Vcs-Browser: https://svn.ampache.org
 Homepage: http://www.ampache.org
-Build-Depends: debhelper (= 7.0.50), po-debconf
+Build-Depends: debhelper (= 7.0.50), po-debconf, quilt (= 0.46-7)
 Standards-Version: 3.9.1
 
 Package: ampache
diff -Nru ampache-3.5.4/debian/patches/debian-changes-3.5.4-7 ampache-3.5.4/debian/patches/debian-changes-3.5.4-7
--- ampache-3.5.4/debian/patches/debian-changes-3.5.4-7	1969-12-31 18:00:00.0 -0600
+++ ampache-3.5.4/debian/patches/debian-changes-3.5.4-7	2010-08-16 22:24:38.0 -0500
@@ -0,0 +1,390 @@
+Description: Upstream changes introduced in version 3.5.4-7
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ ampache (3.5.4-7) unstable; urgency=high
+ .
+   * Added quilt patch system.
+   * Adjusted symlink creation in debian/postinst so it now works.
+ Closes: #593181
+   * Upstream neglected to comment out the require once for
+ /modules/pearxmlrpc/rpc.php which causes the inital login after the
+ completion of the web installer to fail due to php not being able to find
+ /modules/pearxmlrpc/rpc.php.  Closes: #593182
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Charlie Smotherman cj...@cableone.net
+Bug-Debian: http://bugs.debian.org/593181
+Bug-Debian: http://bugs.debian.org/593182
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: vendor|upstream|other, url of original patch
+Bug: url in upstream bugtracker
+Bug-Debian: http://bugs.debian.org/bugnumber
+Bug-Ubuntu: https://launchpad.net/bugs/bugnumber
+Forwarded: no|not-needed|url proving that it has been forwarded
+Reviewed-By: name and email of someone who approved the patch
+Last-Update: -MM-DD
+
+--- ampache-3.5.4.orig/lib/init.php
 ampache-3.5.4/lib/init.php
+@@ -138,7 +138,7 @@ require_once $prefix . '/lib/xmlrpc.php'
+ require_once $prefix . '/lib/class/localplay.abstract.php';
+ require_once $prefix . '/lib/class/database_object.abstract.php'; 
+ require_once $prefix . '/lib/class/media.interface.php'; 
+-require_once $prefix . '/modules/pearxmlrpc/rpc.php';
++//require_once $prefix . '/modules/pearxmlrpc/rpc.php';
+ require_once $prefix . '/modules/getid3/getid3.php';
+ require_once $prefix . '/modules/nusoap/nusoap.php';
+ require_once $prefix . '/modules/infotools/Snoopy.class.php';
+--- /dev/null
 ampache-3.5.4/lib/debian/patches/series
+@@ -0,0 +1 @@
++init_php_fix
+--- /dev/null
 ampache-3.5.4/lib/debian/patches/init_php_fix
+@@ -0,0 +1,13 @@
++Index: lib/init.php
++===
++--- lib.orig/init.php	2010-08-16 21:08:57.0 -0500
+ lib/init.php	2010-08-16 21:09

Re: Bug#591984: Freeze exception for Ampache

2010-08-13 Thread Charlie Smotherman 
On Thu, 2010-08-12 at 20:19 +0100, Adam D. Barratt wrote:
 On Thu, 2010-08-12 at 10:50 -0500, Charlie Smotherman wrote:
  I have prepared an updated package of Ampache which fixes RC bug
  #591984, it can be found at
  
  http://mentors.debian.net/debian/pool/main/a/ampache/ampache_3.5.4-6.dsc 
  
  I would be appreciative if someone would sponsor this update or I can
  ping my usual sponsor if need be.  Thanks
 
 Please go ahead, and let us know once the package has been uploaded.
 
Done

Best regards
Charlie Smotherman


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/1281687763.7937.2.ca...@debian

Freeze exception for Ampache

2010-08-12 Thread Charlie Smotherman 
Dear Release Team, 

I have prepared an updated package of Ampache which fixes RC bug
#591984, it can be found at

http://mentors.debian.net/debian/pool/main/a/ampache/ampache_3.5.4-6.dsc 

I would be appreciative if someone would sponsor this update or I can
ping my usual sponsor if need be.  Thanks

Best regards

Charlie Smotherman
diff -Nru ampache-3.5.4/debian/changelog ampache-3.5.4/debian/changelog
--- ampache-3.5.4/debian/changelog	2010-08-02 12:59:25.0 -0500
+++ ampache-3.5.4/debian/changelog	2010-08-12 10:30:19.0 -0500
@@ -1,3 +1,15 @@
+ampache (3.5.4-6) unstable; urgency=high
+
+  * Setting urgency to high as this fixes an RC bug.
+  * Upstream has decided to remove pearxmlrpc and make the package
+depend on php5-xmlrpc. Closes: #591984
+  * debian/control
+- added php5-xmlrpc to Depends field.
+  * debian/rules
+- added -X option to remove /modules/pearxmlrpc
+
+ -- Charlie Smotherman cj...@cableone.net  Thu, 12 Aug 2010 09:59:36 -0500
+
 ampache (3.5.4-5) unstable; urgency=medium
 
   * Setting urgency to medium as this fixes an RC bug.
diff -Nru ampache-3.5.4/debian/control ampache-3.5.4/debian/control
--- ampache-3.5.4/debian/control	2010-08-02 04:46:26.0 -0500
+++ ampache-3.5.4/debian/control	2010-08-12 10:01:35.0 -0500
@@ -11,8 +11,8 @@
 Package: ampache
 Architecture: all
 Depends: debconf (= 0.5) | debconf-2.0, libapache2-mod-php5 | php5-cgi | php5,
- php5-mysql, php5-cli, php5-auth-pam, libphp-snoopy, libjs-prototype, 
- ttf-freefont, libnusoap-php, ${misc:Depends}
+ php5-mysql, php5-cli, php5-auth-pam, php5-xmlrpc, libphp-snoopy,
+ libjs-prototype, ttf-freefont, libnusoap-php, ${misc:Depends}
 Conflicts: ampache-themes-3.3.3.5a-1
 Recommends: apache2-mpm-prefork | lighttpd, eyed3, ampache-themes
 Suggests: php5-gd, phpmyadmin, mysql-server
diff -Nru ampache-3.5.4/debian/rules ampache-3.5.4/debian/rules
--- ampache-3.5.4/debian/rules	2010-08-01 23:25:11.0 -0500
+++ ampache-3.5.4/debian/rules	2010-08-12 09:58:07.0 -0500
@@ -6,4 +6,5 @@
 override_dh_install:
 	dh_install -XGPL-LICENSE -XINSTALL -XCOPYING -Xlicense -XLICENSE \
 	-Xreadme.windows.txt -Xprototype -XSnoopy -XFreeMono-Medium \
-	-Xgather-messages.sh -Xnusoap -Xxspf_jukebox.fla -Xxspf_jukebox.swf
+	-Xgather-messages.sh -Xnusoap -Xxspf_jukebox.fla -Xxspf_jukebox.swf \
+	-Xpearxmlrpc