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.000000000 -0600 +++
> ampache-3.5.4/debian/patches/debian-changes-3.5.4-7 2010-08-16
> 22:24:38.000000000 -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.000000000 -0500
+++ ampache-3.5.4/debian/ampache.postinst 2010-08-15 22:17:57.000000000 -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.000000000 -0500
+++ ampache-3.5.4/debian/changelog 2010-08-17 06:52:04.000000000 -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.000000000 -0600
+++ ampache-3.5.4/debian/patches/debian-changes-3.5.4-7 2010-08-17 07:46:31.000000000 -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 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: <YYYY-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';
diff -Nru ampache-3.5.4/debian/patches/series ampache-3.5.4/debian/patches/series
--- ampache-3.5.4/debian/patches/series 1969-12-31 18:00:00.000000000 -0600
+++ ampache-3.5.4/debian/patches/series 2010-08-17 06:21:26.000000000 -0500
@@ -0,0 +1 @@
+debian-changes-3.5.4-7
