To fix #688436 and #691433 properly and make piuparts happy this is what would need to be done.
diff -rupN /home/charlie/amp/old/debian/ampache-common.lintian-overrides /home/charlie/amp/new/debian/ampache-common.lintian-overrides --- /home/charlie/amp/old/debian/ampache-common.lintian-overrides 2012-06-02 22:51:50.000000000 -0500 +++ /home/charlie/amp/new/debian/ampache-common.lintian-overrides 1969-12-31 18:00:00.000000000 -0600 @@ -1,2 +0,0 @@ -#The empty dir is needed so we can symlink the prototype system lib into it. -ampache-common binary: package-contains-empty-directory usr/share/ampache/www/modules/prototype/ diff -rupN /home/charlie/amp/old/debian/ampache.cron.daily /home/charlie/amp/new/debian/ampache.cron.daily --- /home/charlie/amp/old/debian/ampache.cron.daily 2012-05-29 21:37:21.000000000 -0500 +++ /home/charlie/amp/new/debian/ampache.cron.daily 1969-12-31 18:00:00.000000000 -0600 @@ -1,31 +0,0 @@ -#!/bin/sh -############################################################################ -#This is ampaches daily cron job. This will add and clean your catalog -#every day. This only runs add and clean. Keeping performance in mine I -#have limited the default bahavior to be daily and to only use clean and add. -#Unless you are adding large amounts of music to your catalog clean and add -#run fairly quickly. -# -#You can override the update interval by creating your own -#crontab. Please see man crontab for an explanation of how to create -#your own crontab. -# -#You can also specify which catalog to run catalog_update.inc on. For -#example if you have a catlog named "music" #you can use -#"php /usr/share/ampache/www/bin/catalog_update.inc music -c -a" and this only -#update the catalog named "music". This way if you have multiple catalogs -#and are adding heavily to only one you can specify which catalog to run -#catalog_update.inc on. -# -#Usage: catalog_update.inc [CATALOG NAME] [-c|-v|-a|-g|-t] -#if no catalog name is given, catalog_update.inc will act on all availble -#catalogs. -# Default behavior is to do all -# -c Clean Catalogs -# -v Verify Catalogs -# -a Add to Catalogs -# -g Gather Art -# -t Generate Thumbnails -############################################################################ - -php /usr/share/ampache/www/bin/catalog_update.inc -a -c diff -rupN /home/charlie/amp/old/debian/ampache.dirs /home/charlie/amp/new/debian/ampache.dirs --- /home/charlie/amp/old/debian/ampache.dirs 2012-05-29 22:08:47.000000000 -0500 +++ /home/charlie/amp/new/debian/ampache.dirs 1969-12-31 18:00:00.000000000 -0600 @@ -1 +0,0 @@ -/var/log/ampache/old diff -rupN /home/charlie/amp/old/debian/ampache.install /home/charlie/amp/new/debian/ampache.install --- /home/charlie/amp/old/debian/ampache.install 2012-05-29 22:06:37.000000000 -0500 +++ /home/charlie/amp/new/debian/ampache.install 2012-11-19 10:37:29.000000000 -0600 @@ -1,2 +1,2 @@ -debian/conf/ampache.conf etc/apache2/conf.d +debian/conf/ampache1.conf etc/ampache diff -rupN /home/charlie/amp/old/debian/ampache.links /home/charlie/amp/new/debian/ampache.links --- /home/charlie/amp/old/debian/ampache.links 2012-06-02 12:22:49.000000000 -0500 +++ /home/charlie/amp/new/debian/ampache.links 2012-11-12 23:41:27.000000000 -0600 @@ -1,6 +1,4 @@ /etc/ampache/ampache.cfg.php /usr/share/ampache/www/config/ampache.cfg.php -/etc/cron.daily/ampache /etc/ampache/ampache.cron.daily -/etc/logrotate.d/ampache /etc/ampache/logrotate-ampache /usr/share/ampache/www/docs/CHANGELOG.gz /usr/share/doc/ampache/changelog.gz /usr/share/javascript/prototype/prototype.js /usr/share/ampache/www/modules/prototype/prototype.js diff -rupN /home/charlie/amp/old/debian/ampache.logrotate /home/charlie/amp/new/debian/ampache.logrotate --- /home/charlie/amp/old/debian/ampache.logrotate 2012-05-29 22:08:38.000000000 -0500 +++ /home/charlie/amp/new/debian/ampache.logrotate 1969-12-31 18:00:00.000000000 -0600 @@ -1,23 +0,0 @@ -/var/log/ampache/ampache.log { - daily - missingok - rotate 5 - compress - olddir=old - shred - postrotate - chown -R www-data:www-data /var/log/ampache - endscript -} - -/var/log/ampache/ampache-catalog.log { - daily - missingok - rotate 5 - compress - olddir=old - shred - postrotate - chown -R www-data:www-data /var/log/ampache - endscript -} diff -rupN /home/charlie/amp/old/debian/ampache.postinst /home/charlie/amp/new/debian/ampache.postinst --- /home/charlie/amp/old/debian/ampache.postinst 2012-06-07 00:35:41.000000000 -0500 +++ /home/charlie/amp/new/debian/ampache.postinst 2012-11-19 22:10:17.000000000 -0600 @@ -5,18 +5,13 @@ set -e . /usr/share/debconf/confmodule create_link(){ - if [ -e /etc/apache2/conf.d/ampache.conf ] && [ ! -e /etc/ampache/ampache.conf ]; then - ln -s /etc/apache2/conf.d/ampache.conf /etc/ampache/ampache.conf - printf "ampache.conf sym link created\n" + if [ -e /etc/ampache/ampache1.conf ]; then + if [ ! -h /etc/apache2/conf.d/ampache1.conf ]; then + ln -s /etc/ampache/ampache1.conf /etc/apache2/conf.d/ampache1.conf + printf "ampache.conf sym link created\n" + fi else - printf "Unable to make the ampache.cfg.php symlink, please create it manually\n" - fi -} - -create_log(){ - if [ -d /var/log/ampache ]; then - chmod 755 /var/log/ampache - chown www-data:www-data /var/log/ampache + printf "Unable to make the ampache.conf symlink, please create it manually\n" fi } @@ -32,10 +27,8 @@ if [ "$1" = "configure" ] || [ "$1" = "u re_start="$RET" if [ "$re_start" = "false" ]; then create_link - create_log elif [ "$re_start" = "true" ]; then create_link - create_log restart_server else printf "Something weird has happened, unable to configure ampache.\n" diff -rupN /home/charlie/amp/old/debian/ampache.postrm /home/charlie/amp/new/debian/ampache.postrm --- /home/charlie/amp/old/debian/ampache.postrm 2012-10-14 10:13:27.000000000 -0500 +++ /home/charlie/amp/new/debian/ampache.postrm 2012-11-20 11:06:33.000000000 -0600 @@ -4,22 +4,44 @@ set -e . /usr/share/debconf/confmodule -restart_server(){ - if [ -e /var/run/apache2.pid ]; then - service apache2 reload - fi -} -if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then +if [ "$1" = "remove" ]; then + #remove sym link + rm -f /etc/apache2/conf.d/ampache1.conf + rm -f /etc/apache2/conf.d/ampache.conf + rm -f /etc/ampache/ampache1.conf + #restart web server + db_get ampache/restart_webserver || true + re_start="$RET" + if [ "$re_start" = "false" ]; then + printf "Please restart the web server manually." + elif [ "$re_start" = "true" ]; then + if [ -e /var/run/apache2.pid ]; then + service apache2 reload + fi + else + printf "unable to de-configure ampache, please do so manually.\n" + fi +elif [ "$1" = "purge" ]; then + #insure everything is gone, this is needed to make piuparts happy. + rm -f /etc/apache2/conf.d/ampache1.conf + rm -f /etc/apache2/conf.d/ampache.conf + rm -rf /etc/ampache + rm -rf /usr/share/ampache + #restart the webserver db_get ampache/restart_webserver || true re_start="$RET" if [ "$re_start" = "false" ]; then printf "Please restart the web server manually." elif [ "$re_start" = "true" ]; then - restart_server + if [ -e /var/run/apache2.pid ]; then + service apache2 reload + fi else printf "unable to de-configure ampache, please do so manually.\n" fi +else + printf "whoops total postinst failure" fi #DEBHELPER# diff -rupN /home/charlie/amp/old/debian/ampache.preinst /home/charlie/amp/new/debian/ampache.preinst --- /home/charlie/amp/old/debian/ampache.preinst 2012-05-30 17:28:40.000000000 -0500 +++ /home/charlie/amp/new/debian/ampache.preinst 2012-11-20 11:05:52.000000000 -0600 @@ -10,7 +10,8 @@ if [ "$1" = "upgrade" ]; then if [ -f $AMPCFG ] && [ -h $WWW/config/ampache.cfg.php ]; then cp -a $AMPCFG /etc/ampache/ampache_$(date +%Y%m%d).cfg.php fi - #ensure ApacheAmpache is gone, if not the upgrade will fail. + + #insure ApacheAmpache is gone, if not the upgrade will fail. if [ -e /etc/apache2/sites-enabled/ApacheAmpache ]; then a2dissite ApacheAmache a2ensite default @@ -20,6 +21,13 @@ if [ "$1" = "upgrade" ]; then else printf "ampache.preinst: ApacheAmpache not present, nothing to do\n" fi + #make sure all of our stupidly added stuff is removed, thx piuparts. + rm -f /etc/logrotate.d/ampache + rm -f /etc/cron.daily/ampache + rm -f /etc/ampache/ampache.conf + rm -f /etc/ampache/lighttpd_ampache.conf + rm -f /etc/ampache/mythbuntu.ampache.conf + rm -f /etc/apache2/conf.d/ampache.conf fi #DEBHELPER# diff -rupN /home/charlie/amp/old/debian/ampache.prerm /home/charlie/amp/new/debian/ampache.prerm --- /home/charlie/amp/old/debian/ampache.prerm 2012-10-14 10:18:01.000000000 -0500 +++ /home/charlie/amp/new/debian/ampache.prerm 2012-11-19 22:07:14.000000000 -0600 @@ -1,7 +1,12 @@ -#!/bin/sh -e +#!/bin/sh + +set -e # This link is created on postinst, so must be removed explicitly. rm -f /etc/ampache/ampache.conf +rm -f /etc/apache2/conf.d/ampache.conf +rm -f /etc/cron.daily/ampache +rm -f /etc/logrotate.d/ampache #DEBHELPER# diff -rupN /home/charlie/amp/old/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.000000000 -0600 +++ /home/charlie/amp/new/debian/conf/ampache1.conf 2012-11-12 22:35:50.000000000 -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.000000000 -0500 +++ /home/charlie/amp/new/debian/conf/ampache.conf 1969-12-31 18:00:00.000000000 -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/control 2012-06-02 12:29:18.000000000 -0500 +++ /home/charlie/amp/new/debian/control 2012-11-19 18:16:09.000000000 -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.000000000 -0500 +++ /home/charlie/amp/new/debian/patches/01_logrotate.patch 1969-12-31 18:00:00.000000000 -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.000000000 -0500 -+++ ampache-3.6-git408e713+dfsg/lib/log.lib.php 2012-06-02 21:39:53.000000000 -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.000000000 -0500 +++ /home/charlie/amp/new/debian/patches/series 2012-11-12 22:48:07.000000000 -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-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org