Hello again, Silly me forgot to attach the debdiff. Here it comes..
Martin -- Martin Pitt | http://www.piware.de Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org)
diff -Nru postgresql-common-134/debian/changelog postgresql-common-134wheezy1/debian/changelog --- postgresql-common-134/debian/changelog 2012-07-26 21:29:48.000000000 +0200 +++ postgresql-common-134wheezy1/debian/changelog 2012-10-03 22:30:36.000000000 +0200 @@ -1,3 +1,20 @@ +postgresql-common (134wheezy1) unstable; urgency=low + + * debian/control: Switch Vcs-Bzr: to wheezy branch. + * pg_ctlcluster: Fix log output to stderr if the log file started out being + empty. Cherry-picked from trunk r1204. + * pg_buildext: Fix supported-versions not to die when the last version is + not supported. Cherry-picked from trunk r1199. + * debian/maintscripts-functions: Only try to remove the tsearch_data + directory if it already exists. Thanks Peter Palfrader. Cherry-picked from + trunk r1211. (Closes: #688105) + * As debian/supported-versions is also used at build-time, add a + build-dependency on lsb-release for lsb_release to be available. Also, + print supported versions from debian/rules for easier debugging. + Cherry-picked from trunk r1206/r1207. + + -- Martin Pitt <mp...@debian.org> Wed, 03 Oct 2012 22:30:36 +0200 + postgresql-common (134) unstable; urgency=low * debian/backport-ppa: Fix syntax error. diff -Nru postgresql-common-134/debian/control postgresql-common-134wheezy1/debian/control --- postgresql-common-134/debian/control 2012-07-25 06:32:33.000000000 +0200 +++ postgresql-common-134wheezy1/debian/control 2012-10-03 22:28:31.000000000 +0200 @@ -4,9 +4,10 @@ Maintainer: Debian PostgreSQL Maintainers <pkg-postgresql-pub...@lists.alioth.debian.org> Uploaders: Martin Pitt <mp...@debian.org>, Christoph Berg <m...@debian.org>, Peter Eisentraut <pet...@debian.org> Standards-Version: 3.9.3 -Vcs-Bzr: http://bzr.debian.org/bzr/pkg-postgresql/postgresql-common/trunk/ -Vcs-Browser: http://anonscm.debian.org/loggerhead/pkg-postgresql/postgresql-common/trunk -Build-Depends: debhelper (>= 7.0.50~) +Vcs-Bzr: http://bzr.debian.org/bzr/pkg-postgresql/postgresql-common/wheezy/ +Vcs-Browser: http://anonscm.debian.org/loggerhead/pkg-postgresql/postgresql-common/wheezy +Build-Depends: debhelper (>= 7.0.50~), + lsb-release XS-Testsuite: autopkgtest Package: postgresql-common diff -Nru postgresql-common-134/debian/maintscripts-functions postgresql-common-134wheezy1/debian/maintscripts-functions --- postgresql-common-134/debian/maintscripts-functions 2011-08-08 11:52:41.000000000 +0200 +++ postgresql-common-134wheezy1/debian/maintscripts-functions 2012-10-03 22:25:57.000000000 +0200 @@ -15,7 +15,9 @@ } _remove_tsearch() { - find /usr/share/postgresql/$1/tsearch_data -type l \( -name '*.dict' -o -name '*.affix' \) -exec rm '{}' \; + if [ -e /usr/share/postgresql/$1/tsearch_data ]; then + find /usr/share/postgresql/$1/tsearch_data -type l \( -name '*.dict' -o -name '*.affix' \) -exec rm '{}' \; + fi } # arguments: <major version> <most recently configured package version> diff -Nru postgresql-common-134/debian/rules postgresql-common-134wheezy1/debian/rules --- postgresql-common-134/debian/rules 2012-07-25 06:41:10.000000000 +0200 +++ postgresql-common-134wheezy1/debian/rules 2012-10-03 22:27:11.000000000 +0200 @@ -20,6 +20,7 @@ dh_installinit --name=postgresql -u'defaults 19 21' -r override_dh_gencontrol: + debian/supported-versions dh_gencontrol -ppostgresql-server-dev-all -- -Vserver-dev-all-depends="$(shell for v in `debian/supported-versions`; do echo "postgresql-server-dev-$$v,"; done)" # the versionless metapackages need to have version numbers which match diff -Nru postgresql-common-134/pg_buildext postgresql-common-134wheezy1/pg_buildext --- postgresql-common-134/pg_buildext 2012-06-19 17:40:03.000000000 +0200 +++ postgresql-common-134wheezy1/pg_buildext 2012-10-03 22:24:54.000000000 +0200 @@ -68,7 +68,7 @@ [ -e $srcdir/debian/pgversions ] || die "$srcdir/debian/pgversions not found" for v in `/usr/share/postgresql-common/supported-versions` do - grep -q "^$v" $srcdir/debian/pgversions && echo $v + if grep -q "^$v" $srcdir/debian/pgversions ; then echo $v ; fi done } diff -Nru postgresql-common-134/pg_ctlcluster postgresql-common-134wheezy1/pg_ctlcluster --- postgresql-common-134/pg_ctlcluster 2012-07-25 06:28:07.000000000 +0200 +++ postgresql-common-134wheezy1/pg_ctlcluster 2012-10-03 22:20:59.000000000 +0200 @@ -221,7 +221,7 @@ } if (!$success) { - if ($logsize) { + if ($currlogsize) { print STDERR "The PostgreSQL server failed to start. Please check the log output:\n"; open LOG, $info{'logfile'} or error "Could not open log file " . $info{'logfile'};