diff -pruN 1.6.17dfsg-3/debian/changelog 1.6.17dfsg-3ubuntu3/debian/changelog --- 1.6.17dfsg-3/debian/changelog 2011-12-17 18:27:51.000000000 +0000 +++ 1.6.17dfsg-3ubuntu3/debian/changelog 2011-12-17 18:27:57.000000000 +0000 @@ -1,3 +1,28 @@ +subversion (1.6.17dfsg-3ubuntu3) precise; urgency=low + + * Build using dh_python2 + + -- Matthias Klose Sat, 17 Dec 2011 15:01:54 +0000 + +subversion (1.6.17dfsg-3ubuntu2) precise; urgency=low + + * Allow libserf-dev to satisfy serf build-dependency. + + -- Colin Watson Sun, 27 Nov 2011 19:02:00 +0000 + +subversion (1.6.17dfsg-3ubuntu1) precise; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Create pot file on build. + - Build a python-subversion-dbg package. + - Build-depend on default-jre-headless/-jdk. + - Do not apply java-build patch. + - debian/rules: Manually create the doxygen output directory, otherwise + we get weird build failures when running parallel builds. + * Re-enable the serf backend (LP: #830778). + + -- Colin Watson Sun, 27 Nov 2011 12:45:05 +0000 + subversion (1.6.17dfsg-3) unstable; urgency=medium * libapache2.preinst: Fix upgrade case from before 1.6.17dfsg-2. @@ -9,6 +34,20 @@ subversion (1.6.17dfsg-3) unstable; urge -- Peter Samuelson Sat, 19 Nov 2011 18:56:28 -0600 +subversion (1.6.17dfsg-2ubuntu1) precise; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Create pot file on build. + - Build a python-subversion-dbg package. + - Build-depend on default-jre-headless/-jdk. + - Do not apply java-build patch. + - debian/rules: Manually create the doxygen output directory, otherwise + we get weird build failures when running parallel builds. + - Disable the serf backend because serf is in universe. + * Sync up python-subversion-dbg control fields with python-subversion. + + -- Colin Watson Wed, 16 Nov 2011 16:08:09 +0000 + subversion (1.6.17dfsg-2) unstable; urgency=low * Standards-Version: 3.9.2. Also, multiarch. @@ -67,6 +106,74 @@ subversion (1.6.16dfsg-1) unstable; urge -- Peter Samuelson Thu, 03 Mar 2011 10:55:42 -0600 +subversion (1.6.12dfsg-4ubuntu6) precise; urgency=low + + * Rebuild for Perl 5.14. + + -- Colin Watson Wed, 16 Nov 2011 01:03:49 +0000 + +subversion (1.6.12dfsg-4ubuntu5) oneiric; urgency=low + + * SECURITY UPDATE: denial of service via baselined WebDAV resource + request + - debian/patches/CVE-2011-1752.patch: disallow GETs of baselined + versions of resources in subversion/mod_dav_svn/repos.c. + - CVE-2011-1752 + * SECURITY UPDATE: mod_dav_svn resource exhaustion via infinite loop + - debian/patches/CVE-2011-1783.patch: validate path in + subversion/libsvn_repos/authz.c. + - CVE-2011-1783 + * SECURITY UPDATE: mod_dav_svn permissions bypass via incorrect + resource URL + - debian/patches/CVE-2011-1921.patch: validate path in + subversion/mod_dav_svn/authz.c. + - CVE-2011-1921 + + -- Marc Deslauriers Fri, 05 Aug 2011 10:53:00 -0400 + +subversion (1.6.12dfsg-4ubuntu4) oneiric; urgency=low + + * Disable KWallet support on armel, again temporarily. + + -- Colin Watson Fri, 06 May 2011 14:21:16 +0100 + +subversion (1.6.12dfsg-4ubuntu3) oneiric; urgency=low + + * Temporarily disable Java and tests on armel to resolve a circular + build-depends loop in Oneiric. These will be re-enabled shortly. + + -- Colin Watson Fri, 06 May 2011 12:27:29 +0100 + +subversion (1.6.12dfsg-4ubuntu2) natty; urgency=low + + * SECURITY UPDATE: denial of service via request containing lock token + - debian/patches/CVE-2011-0715.patch: correctly handle locks being + passed when authn isn't enabled in subversion/mod_dav_svn/repos.c, + subversion/mod_dav_svn/version.c. + - CVE-2011-0715 + + -- Marc Deslauriers Mon, 21 Mar 2011 13:03:32 -0400 + +subversion (1.6.12dfsg-4ubuntu1) natty; urgency=low + + * Merge with Debian unstable. Remaining changes: + - Create pot file on build. + - Build a python-subversion-dbg package. + - (Build-)depend on default-jre-headless/-jdk. + - Do not apply java-build patch. + - debian/rules: Manually create the doxygen output directory, otherwise + we get weird build failures when running parallel builds. + - Disable the serf backend because serf is in universe. + - Don't override LD_LIBRARY_PATH completely but prepend to it as to not + break fakeroot. + - Fix FTBFS against Python 2.7 by disabling some problematic tests. + - debian/tools/Makefile: + + Add APR_LIBS and use it when linking svn-make-config + + svn_config_ensure() moved from libsvn_client/libsvn_client-1.la to + libsvn_subr/libsvn_subr-1.la. + + -- Michael Bienia Fri, 28 Jan 2011 14:14:19 +0100 + subversion (1.6.12dfsg-4) unstable; urgency=high * patches/loosen-sqlite-version-check: New patch: Relax the SQLite @@ -89,6 +196,44 @@ subversion (1.6.12dfsg-3) unstable; urge -- Peter Samuelson Wed, 22 Dec 2010 20:38:17 -0600 +subversion (1.6.12dfsg-2ubuntu3) natty; urgency=low + + * debian/tools/Makefile: add APR_LIBS and use it when linking + svn-make-config: + APR_LIBS = `apr-config --ldflags --link-ld --libs` + + -- Loïc Minier Sat, 20 Nov 2010 11:21:18 +0100 + +subversion (1.6.12dfsg-2ubuntu2) natty; urgency=low + + [ Barry Warsaw ] + * Fix FTBFS against Python 2.7 by disabling some problematic tests. + (LP: #670139) + + [ Loïc Minier ] + * Fix FTBFS in natty; LP: #670139; thanks Barry Warsaw. + - Don't override LD_LIBRARY_PATH completely but prepend to it as to not + break fakeroot. + - debian/tools/Makefile: svn_config_ensure() moved from + libsvn_client/libsvn_client-1.la to libsvn_subr/libsvn_subr-1.la. + + -- Barry Warsaw Fri, 12 Nov 2010 15:16:04 -0500 + +subversion (1.6.12dfsg-2ubuntu1) natty; urgency=low + + * Merge from debian unstable. Remaining changes: + - Create pot file on build. + - Build a python-subversion-dbg package. + - (Build-)depend on default-jre-headless/-jdk. + - Do not apply java-build patch. + - debian/rules: Manually create the doxygen output directory, otherwise + we get weird build failures when running parallel builds. + - Disable the serf backend because serf is in universe. + - Amend the XS-Python-Version line to ">= 2.4" rather than explicit + versions. + + -- Michael Vogt Mon, 18 Oct 2010 15:34:10 +0200 + subversion (1.6.12dfsg-2) unstable; urgency=medium * patches/cve-2010-3315: New patch for CVE-2010-3315, whereby, in rare @@ -99,6 +244,21 @@ subversion (1.6.12dfsg-2) unstable; urge -- Peter Samuelson Fri, 01 Oct 2010 12:11:10 -0500 +subversion (1.6.12dfsg-1ubuntu1) maverick; urgency=low + + * Merge from debian testing (LP: #600914), remaining changes: + - Create pot file on build. + - Build a python-subversion-dbg package. + - (Build-)depend on default-jre-headless/-jdk. + - Do not apply java-build patch. + - debian/rules: Manually create the doxygen output directory, otherwise + we get weird build failures when running parallel builds. + - Disable the serf backend because serf is in universe. + - Amend the XS-Python-Version line to ">= 2.4" rather than explicit + versions. + + -- Max Bowsher Fri, 02 Jul 2010 06:54:21 +0100 + subversion (1.6.12dfsg-1) unstable; urgency=medium * Urgency medium, as it (probably) fixes some FTBFS. @@ -139,6 +299,24 @@ subversion (1.6.9dfsg-1) unstable; urgen -- Peter Samuelson Wed, 27 Jan 2010 01:57:47 -0600 +subversion (1.6.6dfsg-2ubuntu1) lucid; urgency=low + + * Merge from debian unstable (LP: #483953). + Includes enabling kwallet support (LP: #481792, #466078). + Remaining changes: + - Create pot file on build. + - Build a python-subversion-dbg package. + - (Build-)depend on default-jre-headless/-jdk. + - Do not apply java-build patch. + - debian/rules: Manually create the doxygen output directory, otherwise + we get weird build failures when running parallel builds. + - Disable the serf backend because serf is in universe. + * Amend the XS-Python-Version line to ">= 2.4" rather than explicit + versions (only building for 2.6 in Lucid since that is the onl Python in + Lucid). + + -- Max Bowsher Fri, 11 Dec 2009 23:48:13 +0000 + subversion (1.6.6dfsg-2) unstable; urgency=low * Update svn-bisect (Closes: #535234), fix bugs, add features, @@ -181,6 +359,20 @@ subversion (1.6.6dfsg-1) unstable; urgen -- Peter Samuelson Thu, 22 Oct 2009 11:32:13 -0500 +subversion (1.6.5dfsg-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #406245), remaining changes: + - Create pot file on build. + - Build a python-subversion-dbg package. + - (Build-)depend on default-jre-headless/-jdk. + - Do not apply java-build patch. + - Don't build for python2.4, not in main. + - debian/rules: Manually create the doxygen output directory, otherwise + we get weird build failures when running parallel builds. + * Disable the serf backend because serf is in universe. + + -- Anders Kaseorg Mon, 24 Aug 2009 19:09:22 -0400 + subversion (1.6.5dfsg-1) unstable; urgency=low * New upstream release. @@ -211,6 +403,25 @@ subversion (1.6.3dfsg-1) unstable; urgen -- Peter Samuelson Tue, 14 Jul 2009 23:51:24 -0500 +subversion (1.6.1dfsg-1ubuntu2) karmic; urgency=low + + * debian/rules: Manually create the doxygen output directory, otherwise + we get weird build failures when running parallel builds. + + -- Steve Langasek Wed, 10 Jun 2009 05:43:50 +0000 + +subversion (1.6.1dfsg-1ubuntu1) karmic; urgency=low + + * Merge from Debian experimental, remaining changes: + - Create pot file on build. + - Build a python-subversion-dbg package. + - (Build-)depend on default-jre-headless/-jdk. + - Do not apply java-build patch. + - Don't build for python2.4, not in main. + * Fixes autodetection of neon. LP: #384715. + + -- Steve Langasek Tue, 09 Jun 2009 23:53:06 +0000 + subversion (1.6.1dfsg-1) experimental; urgency=low * New upstream release. @@ -236,6 +447,22 @@ subversion (1.6.0dfsg-1) experimental; u -- Peter Samuelson Fri, 27 Mar 2009 15:54:25 -0500 +subversion (1.5.6dfsg-1ubuntu1) karmic; urgency=low + + * Merge from Debian unstable, remaining changes: + - Create pot file on build. + - Build a python-subversion-dbg package. + - (Build-)depend on default-jre-headless/-jdk. + - Do not apply java-build patch. + - Do not build-depend on serf. The client can be compiled against either + libneon or libserf (or both), as they offer competing implementations. + serf is available in universe only. + - Don't build for python2.4, not in main. + - Build-depend on libdb4.7-dev instead of libdb4.6-dev, tracking + libaprutil. + + -- Steve Langasek Sat, 06 Jun 2009 22:57:04 +0000 + subversion (1.5.6dfsg-1) unstable; urgency=low * New upstream release. @@ -255,6 +482,22 @@ subversion (1.5.5dfsg1-1) experimental; -- Peter Samuelson Wed, 07 Jan 2009 23:24:53 -0600 +subversion (1.5.4dfsg1-1ubuntu2) jaunty; urgency=low + + * Build for python2.6. + + -- Matthias Klose Mon, 23 Feb 2009 17:39:04 +0100 + +subversion (1.5.4dfsg1-1ubuntu1) jaunty; urgency=low + + * Merge with Debian; remaining changes: + - Create pot file on build. + - Build a python-subversion-dbg package. + - (Build-)depend on default-jre-headless/-jdk. + - Do not apply java-build patch. + + -- Matthias Klose Mon, 17 Nov 2008 08:56:51 +0100 + subversion (1.5.4dfsg1-1) experimental; urgency=low * New upstream release @@ -270,6 +513,21 @@ subversion (1.5.3dfsg1-1) experimental; -- Peter Samuelson Fri, 10 Oct 2008 13:27:24 -0500 +subversion (1.5.1dfsg1-1ubuntu2) intrepid; urgency=low + + * (Build-)depend on default-jre-headless/-jdk. + * Do not apply java-build patch. + + -- Matthias Klose Thu, 31 Jul 2008 08:29:58 +0000 + +subversion (1.5.1dfsg1-1ubuntu1) intrepid; urgency=low + + * Merge with Debian; remaining changes: + - Create pot file on build. + - Build a python-subversion-dbg package. + + -- Matthias Klose Sun, 27 Jul 2008 11:21:14 +0200 + subversion (1.5.1dfsg1-1) unstable; urgency=low * New upstream release. @@ -284,6 +542,21 @@ subversion (1.5.1dfsg1-1) unstable; urge -- Peter Samuelson Thu, 24 Jul 2008 15:48:17 -0500 +subversion (1.5.0dfsg1-4ubuntu2) intrepid; urgency=low + + * Explicitely build-depend on libdb4.6-dev to match the db dependency + of libaprutil1-dev. + + -- Matthias Klose Mon, 07 Jul 2008 14:15:22 +0200 + +subversion (1.5.0dfsg1-4ubuntu1) intrepid; urgency=low + + * Merge with Debian; remaining changes: + - Create pot file on build. + - Build a python-subversion-dbg package. + + -- Matthias Klose Mon, 07 Jul 2008 13:44:50 +0200 + subversion (1.5.0dfsg1-4) unstable; urgency=medium * Work around bug where 'make javahl' is not -j-safe. @@ -311,6 +584,22 @@ subversion (1.5.0dfsg1-2) unstable; urge -- Peter Samuelson Mon, 30 Jun 2008 00:22:28 -0500 +subversion (1.5.0dfsg1-1ubuntu2) intrepid; urgency=low + + * Do not build-depend on serf. The client can be compiled against either + libneon or libserf (or both), as they offer competing implementations. + serf is available in universe only. + + -- Matthias Klose Tue, 24 Jun 2008 15:05:21 +0000 + +subversion (1.5.0dfsg1-1ubuntu1) intrepid; urgency=low + + * Merge with Debian; remaining changes: + - Create pot file on build. + - Build a python-subversion-dbg package. + + -- Matthias Klose Tue, 24 Jun 2008 14:13:13 +0200 + subversion (1.5.0dfsg1-1) experimental; urgency=low * New upstream release @@ -390,6 +679,19 @@ subversion (1.4.6dfsg1-3) unstable; urge -- Peter Samuelson Mon, 14 Apr 2008 11:08:22 -0500 +subversion (1.4.6dfsg1-2ubuntu1) hardy; urgency=low + + * Merge with Debian; remaining changes: + - Create pot file on build. + - Fix bashisms in tools/po/po-update.sh. + - Build for all supported python versions. + - Build a python-subversion-dbg package. + - debian/rules: Do not let the failed ruby swig tests fail the build. They + are currently broken, work in progress in Debian (Debian #453166). + - Drop hppa java support. + + -- Matthias Klose Tue, 11 Mar 2008 06:28:25 +0000 + subversion (1.4.6dfsg1-2) unstable; urgency=low * subversion.NEWS: Add a note about the db4.6 upgrade. (Closes: #465432) @@ -430,6 +732,94 @@ subversion (1.4.6dfsg1-1) unstable; urge -- Peter Samuelson Mon, 11 Feb 2008 23:49:02 -0600 +subversion (1.4.6dfsg1-0ubuntu1) hardy; urgency=low + + * Merge with Debian svn repository (trunk r823); remaining changes: + - Create pot file on build. + - Fix bashisms in tools/po/po-update.sh. + - Build for all supported python versions. + - Build a python-subversion-dbg package. + - debian/rules: Do not let the failed ruby swig tests fail the build. They + are currently broken, work in progress in Debian (Debian #453166). + - Drop hppa java support. + + -- Matthias Klose Wed, 30 Jan 2008 12:45:05 +0100 + +subversion (1.4.6dfsg1-1) unstable; urgency=low + + * New upstream version. + * Build with db 4.6, to match apr-util. + * patches/svn-clean-manpage: New patch, fix a small typo. (Closes: #441827) + * patches/neon27: New patch from upstream trunk to support neon 0.27. + - control: build-depend on libneon27-dev. + - rules: no longer --disable-neon-version-check. + * patches/ruby-newswig: Support swig 1.3.33. (Closes: #453166) + * patches/python-memleak: New patch to fix a serious memory leak in the + Python bindings. Thanks to Jelmer Vernooij. (Closes: #428755) + * control: Policy 3.7.3. + * control: spell 'Source-Version' as 'binary:Version' for political + correctness. (Or for clarity.) + * control: add appropriate Vcs-Svn and Vcs-Browser fields. + * control: subversion-tools Recommends: rsync. (Closes: #459023) + * patches/svn2cl: update svn2cl to 0.9 (from upstream trunk). + * patches/commit-email: use original 'sendmail' commit-email.pl mode, + rather than the direct SMTP feature. (Closes: #447824) + * rules: do not run 'dh_testroot' or 'make extraclean' in clean rule. + * rules: rewrite DEB_BUILD_OPTIONS support; remove 'notest' synonym, as + the world seems to be standardizing on 'nocheck'. + * rules: remove 'DEB_BUILD_OPTIONS=-j[N]' support, add support for the + new 'dpkg-buildpackage -j[N]' feature. + * rules: add an option to disable ruby bindings. Though it turns out + we don't need it ... yet. + + -- Peter Samuelson Mon, 11 Feb 2008 23:49:02 -0600 + +subversion (1.4.4dfsg1-1ubuntu5) hardy; urgency=medium + + * Add debian/patches/python-memleak: Fix major memory leak in the + Python bindings. Taken from Debian SVN head. (LP: #54253) + + -- Jelmer Vernooij Fri, 18 Jan 2008 01:28:28 +0100 + +subversion (1.4.4dfsg1-1ubuntu4) hardy; urgency=low + + * debian/control: + - libneon 26 -> 27. + - libdb 4.4 -> 4.6. + - Bump libaprutil1-dev build dependency to ensure that we build against + one that also links against db4.6. + * Add debian/patches/neon27: Fix configure tests for defining the + right version #defines for libneon27. Taken from Debian SVN head. + * Add debian/patches/ruby-newswig: Fix duplicate symbols in SWIG so that it + actually builds. Taken from Debian SVN head. (Debian #458771) + * debian/rules: Do not let the failed ruby swig tests fail the build. They + are currently broken, work in progress in Debian (Debian #453166). + + -- Martin Pitt Thu, 03 Jan 2008 10:16:24 +0100 + +subversion (1.4.4dfsg1-1ubuntu3) gutsy; urgency=low + + * Build separate libsvn_swig_py libraries for each python version. + LP: #91848. + + -- Matthias Klose Thu, 27 Sep 2007 11:10:46 +0200 + +subversion (1.4.4dfsg1-1ubuntu2) gutsy; urgency=low + + * Drop hppa java support for now + + -- LaMont Jones Mon, 13 Aug 2007 15:43:46 -0600 + +subversion (1.4.4dfsg1-1ubuntu1) gutsy; urgency=low + + * Merge with Debian; remaining changes: + - Create pot file on build. + - Fix bashisms in tools/po/po-update.sh. + - Build for all supported python versions. + - Build a python-subversion-dbg package. + + -- Matthias Klose Mon, 11 Jun 2007 11:24:52 +0200 + subversion (1.4.4dfsg1-1) unstable; urgency=low * New upstream version. @@ -448,6 +838,16 @@ subversion (1.4.4dfsg1-1) unstable; urge -- Peter Samuelson Thu, 07 Jun 2007 00:57:11 -0500 +subversion (1.4.3dfsg1-1ubuntu1) feisty; urgency=low + + * Merge from Debian experimental; remaining changes: + - Create pot file on build. + - Fix bashisms in tools/po/po-update.sh. + - Build for all supported python versions. + - Build a python-subversion-dbg package. + + -- Matthias Klose Tue, 20 Mar 2007 06:47:26 +0100 + subversion (1.4.3dfsg1-1) experimental; urgency=low [ Peter Samuelson ] @@ -460,6 +860,39 @@ subversion (1.4.3dfsg1-1) experimental; -- Peter Samuelson Thu, 25 Jan 2007 18:30:04 -0600 +subversion (1.4.2dfsg1-2ubuntu5) feisty; urgency=low + + * Build-depend on python-all-dev, python-all-dbg. + + -- Matthias Klose Sun, 18 Feb 2007 15:44:48 +0100 + +subversion (1.4.2dfsg1-2ubuntu4) feisty; urgency=low + + * Build a python-subversion-dbg package. + * Add modules for all supported python versions. + * Set Ubuntu maintainer address. + + -- Matthias Klose Sun, 18 Feb 2007 00:43:04 +0100 + +subversion (1.4.2dfsg1-2ubuntu3) feisty; urgency=low + + * Rebuild for python2.5 as the default python version. + + -- Matthias Klose Fri, 12 Jan 2007 13:18:35 +0000 + +subversion (1.4.2dfsg1-2ubuntu2) feisty; urgency=low + + * Fix bashisms in tools/po/po-update.sh. + + -- Matthias Klose Wed, 13 Dec 2006 20:29:01 +0100 + +subversion (1.4.2dfsg1-2ubuntu1) feisty; urgency=low + + * Merge with Debian unstable; remaining changes: + - Create pot file on build. + + -- Matthias Klose Wed, 13 Dec 2006 17:57:16 +0100 + subversion (1.4.2dfsg1-2) unstable; urgency=medium [ Peter Samuelson ] @@ -700,6 +1133,21 @@ subversion (1.3.2-4) unstable; urgency=l -- Troy Heber Mon, 17 Jul 2006 08:39:20 -0600 +subversion (1.3.2-3ubuntu2) edgy; urgency=low + + * Backport improved python bindings (Jelmer Vernooij), + cleanup patch and adapt for 1.3.2. Ubuntu #51304. + + -- Matthias Klose Wed, 4 Oct 2006 21:36:23 +0000 + +subversion (1.3.2-3ubuntu1) edgy; urgency=low + + * Merge from debian unstable, remaining changes: + - create pot file on build, + - python2.4. + + -- Scott James Remnant Mon, 10 Jul 2006 16:22:15 +0100 + subversion (1.3.2-3) unstable; urgency=low [ Troy Heber] @@ -739,6 +1187,15 @@ subversion (1.3.2-1) unstable; urgency=l -- Peter Samuelson Thu, 1 Jun 2006 04:10:19 -0500 +subversion (1.3.1-3ubuntu1) dapper; urgency=low + + * Merge new upstream version from Debian, UVF exception approved by mdz. + * Very (very, very) carefully merge our Java-related changes with Debian's + rather different Java changes to produce something that should work. + * Create a python2.4-subversion transitional package to smooth upgrades. + + -- Adam Conrad Mon, 8 May 2006 14:07:51 +1000 + subversion (1.3.1-3) unstable; urgency=medium [ Peter Samuelson ] @@ -874,6 +1331,28 @@ subversion (1.3.0-2) unstable; urgency=l -- Troy Heber Wed, 22 Feb 2006 08:18:12 -0700 +subversion (1.3.0-1ubuntu3) dapper; urgency=low + + * debian/rules: Create a POT file on package build + + -- Michael Vogt Fri, 5 May 2006 01:48:11 +0200 + +subversion (1.3.0-1ubuntu2) dapper; urgency=low + + * Reenable the build of libsvn-javahl, build using java-gcj-compat-dev. + * libsvn-javahl: Prefer gij over kaffe. + + -- Matthias Klose Thu, 23 Mar 2006 14:10:04 +0000 + +subversion (1.3.0-1ubuntu1) dapper; urgency=low + + * Merge with Debian by hand, bringing in shiny new upstream version. + * Disable the testsuite for the ruby bindings for now, as they are + failing obscurely, and "broken bindings are slightly better than + no bindings"; I will investigate the breakage later. + + -- Adam Conrad Tue, 17 Jan 2006 12:35:07 +1100 + subversion (1.3.0-1) experimental; urgency=low [ Peter, Guilherme ] @@ -920,6 +1399,14 @@ subversion (1.3.0-1) experimental; urgen -- Peter Samuelson Fri, 6 Jan 2006 03:28:16 -0600 +subversion (1.2.3dfsg1-3ubuntu1) dapper; urgency=low + + * Merge with the final Debian release of 1.2.3dfsg1-3, bringing in + fixes to the clean target, better documentation of the libdb4.3 + upgrade and build fixes to work with swig1.3_1.3.27. + + -- Adam Conrad Mon, 5 Dec 2005 01:26:14 +1100 + subversion (1.2.3dfsg1-3) unstable; urgency=low [ Peter Samuelson ] @@ -966,6 +1453,14 @@ subversion (1.2.3dfsg1-3) unstable; urge -- Peter Samuelson Fri, 2 Dec 2005 16:22:44 -0600 +subversion (1.2.3dfsg1-2ubuntu1) dapper; urgency=low + + * Roll this release from the Debian pkg-subversion SVN repo (Ubuntu #19334) + * Stop building python2.3 bindings, as python2.3 is leaving Ubuntu main. + * Disable the build of libsvn-javahl, since kaffe is in Ubuntu universe. + + -- Adam Conrad Sat, 26 Nov 2005 01:17:20 +1100 + subversion (1.2.3dfsg1-2) unstable; urgency=low * Use DH_OPTIONS=-Nlibsvn-javahl in debian/rules, rather than the @@ -1096,6 +1591,12 @@ subversion (1.2.3a-1) unstable; urgency= -- Guilherme de S. Pastore Fri, 9 Sep 2005 14:57:03 -0300 +subversion (1.2.0-1ubuntu1) breezy; urgency=low + + * Resynchronise with Debian. + + -- Michael Vogt Wed, 29 Jun 2005 13:09:32 +0200 + subversion (1.2.0-1) unstable; urgency=low * New upstream release. (Closes: #310474) @@ -1115,6 +1616,12 @@ subversion (1.2.0-1) unstable; urgency=l -- David Kimdon Wed, 8 Jun 2005 22:19:21 -0700 +subversion (1.1.4-2ubuntu1) breezy; urgency=low + + * Sync with Debian. + + -- Matthias Klose Wed, 25 May 2005 00:09:22 +0000 + subversion (1.1.4-2) unstable; urgency=high * Put call to dh_installdeb after call to dh_python. Fixes purge @@ -1173,6 +1680,32 @@ subversion (1.1.3-1) unstable; urgency=l -- David Kimdon Sat, 15 Jan 2005 14:12:54 -0800 +subversion (1.1.1-2ubuntu4) hoary; urgency=low + + * Build a python2.3-subversion package as well. + + -- Matthias Klose Tue, 17 May 2005 09:55:44 +0000 + +subversion (1.1.1-2ubuntu3) hoary; urgency=low + + * python2.4-subversion: Add conflict to python2.3-subversion. + Closes: #4957. + + -- Matthias Klose Mon, 10 Jan 2005 08:31:59 +0100 + +subversion (1.1.1-2ubuntu2) hoary; urgency=low + + * Tighten build dependency on python. + + -- Matthias Klose Fri, 17 Dec 2004 14:02:19 +0100 + +subversion (1.1.1-2ubuntu1) hoary; urgency=low + + * Build using python2.4. + * debian/control.m4: Fix generation of control file for PYVERSION != 2.3. + + -- Matthias Klose Wed, 15 Dec 2004 20:37:50 +0100 + subversion (1.1.1-2) unstable; urgency=low * Fix minor incompatability between 1.0 and 1.1 libraries. diff -pruN 1.6.17dfsg-3/debian/control 1.6.17dfsg-3ubuntu3/debian/control --- 1.6.17dfsg-3/debian/control 2011-12-17 18:27:51.000000000 +0000 +++ 1.6.17dfsg-3ubuntu3/debian/control 2011-12-17 18:27:57.000000000 +0000 @@ -1,20 +1,21 @@ Source: subversion Section: vcs Priority: optional -Maintainer: Peter Samuelson +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Peter Samuelson Uploaders: Troy Heber , Guilherme de S. Pastore -Build-Depends: debhelper, libneon27-gnutls-dev, libserf-0-0-dev (>= 0.3.0-0.2), zlib1g-dev, +Build-Depends: debhelper, libneon27-gnutls-dev, libserf-0-0-dev (>= 0.3.0-0.2) | libserf-dev (>= 0.3.0-0.2), zlib1g-dev, libapr1-dev, libaprutil1-dev, libdb4.8-dev, libsasl2-dev, apache2-threaded-dev, libsqlite3-dev (>= 3.4), libgnome-keyring-dev, libdbus-1-dev, kdelibs5-dev, quilt, doxygen, autotools-dev, autoconf, libtool, swig, - python-all-dev, python-support, + python-all-dev (>= 2.6.6-3~), python-all-dbg, perl, libperl-dev, ruby1.8, ruby1.8-dev, - gcj-jdk (>= 4:4.4) [!alpha !arm !hppa !m68k !mips !mipsel !hurd-i386], + default-jdk [!alpha !arm !hppa !m68k !mips !mipsel !hurd-i386], junit [!alpha !arm !hppa !m68k !mips !mipsel !hurd-i386] Build-Conflicts: libsvn-dev (<< 1.6) -XS-Python-Version: >= 2.4, << 3.0 +X-Python-Version: >= 2.4 Homepage: http://subversion.apache.org/ Vcs-Svn: svn://svn.debian.org/pkg-subversion/src/1.6.x/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-subversion/src/1.6.x/ @@ -85,14 +86,29 @@ Section: python Architecture: any Pre-Depends: multiarch-support Depends: subversion, ${shlibs:Depends}, ${python:Depends}, ${misc:Depends} +Suggests: python-subversion-dbg Provides: ${python:Provides} -XB-Python-Version: ${python:Versions} Description: Python bindings for Subversion This is a set of Python interfaces to libsvn, the Subversion libraries. It is useful if you want to, for example, write a Python script that manipulates a Subversion repository or working copy. See the 'subversion' package for more information. +Package: python-subversion-dbg +Priority: extra +Section: python +Architecture: any +Pre-Depends: multiarch-support +Depends: python-subversion (= ${binary:Version}), python-dbg, ${shlibs:Depends}, ${python:Depends}, ${misc:Depends} +Provides: ${python:Provides} +Description: Python bindings for Subversion (debug extension) + This is a set of Python interfaces to libsvn, the Subversion + libraries. It is useful if you want to, for example, write a Python + script that manipulates a Subversion repository or working copy. See + the 'subversion' package for more information. + . + This package contains the extension built for the python debug interpreter. + Package: subversion-tools Priority: extra Architecture: all diff -pruN 1.6.17dfsg-3/debian/patches/series 1.6.17dfsg-3ubuntu3/debian/patches/series --- 1.6.17dfsg-3/debian/patches/series 2011-12-17 18:27:51.000000000 +0000 +++ 1.6.17dfsg-3ubuntu3/debian/patches/series 2011-12-17 18:27:57.000000000 +0000 @@ -1,6 +1,5 @@ build-fixes entropy -java-build last-changed-date-charset no-extra-libs no-extra-libs-2 diff -pruN 1.6.17dfsg-3/debian/rules 1.6.17dfsg-3ubuntu3/debian/rules --- 1.6.17dfsg-3/debian/rules 2011-12-17 18:27:51.000000000 +0000 +++ 1.6.17dfsg-3ubuntu3/debian/rules 2011-12-17 18:27:57.000000000 +0000 @@ -57,7 +57,8 @@ fix_shebangs_in = \ PERL_DIR := $(DEB_BUILDDIR)/subversion/bindings/swig/perl/native PY_DIR := $(DEB_BUILDDIR)/subversion/bindings/swig/python -PYVERSIONS := $(shell pyversions -vi) +PYVERSIONS := $(shell pyversions -vr) +PYDEFAULT := $(shell pyversions -vd) allpy = \ set -e; for v in $(PYVERSIONS); do \ @@ -67,6 +68,14 @@ allpy = \ $1; \ done +allpydbg = \ + set -e; for v in $(PYVERSIONS); do \ + $(RM) $(PY_DIR); \ + ln -fs python$$v-dbg $(PY_DIR); \ + pylib=$$(python$$v -c 'from distutils import sysconfig; print sysconfig.get_python_lib()'); \ + $1; \ + done + libdir := /usr/lib/$(DEB_HOST_MULTIARCH) confflags := \ --prefix=/usr \ @@ -96,7 +105,7 @@ export DH_OPTIONS ifdef DEB_OPT_WITH_JAVAHL # jikes 1.22 cannot compile javahl. confflags += --enable-javahl --without-jikes \ - --with-jdk=/usr/lib/jvm/java-gcj \ + --with-jdk=/usr/lib/jvm/default-java \ --with-junit=/usr/share/java/junit.jar else DH_OPTIONS += -Nlibsvn-java @@ -164,6 +173,9 @@ debian/stamp-configure: $(QUILT_STAMPFN) for v in $(PYVERSIONS); do \ cp -la $(PY_DIR) $(PY_DIR)$$v; \ done + for v in $(PYVERSIONS); do \ + cp -la $(PY_DIR) $(PY_DIR)$$v-dbg; \ + done $(RM) -r $(PY_DIR) touch $@ @@ -186,6 +198,9 @@ check-swig-pl: debian/stamp-build-arch check-swig-py: debian/stamp-build-arch $(call allpy, \ $(MAKE_B) $@ PYTHON=python$$v PYVER=$$v $(check_defs)) + $(call allpydbg, \ + $(MAKE_B) $@ PYTHON=python$$v-dbg PYVER=$${v}_d \ + PYTHON_INCLUDES=-I/usr/include/python$${v}_d $(check_defs)) build-arch: debian/stamp-build-arch debian/stamp-build-arch: debian/stamp-configure @@ -194,6 +209,8 @@ debian/stamp-build-arch: debian/stamp-co # note: autogen-swig does not support -jN $(call allpy, $(MAKE_B) -j1 autogen-swig) + $(call allpydbg, $(MAKE_B) -j1 autogen-swig) + ln -sf python$(PYDEFAULT) $(PY_DIR) +$(MAKE_B) all tools # Run svn once, to make sure it populates $(HOME)/.subversion/* $(DEB_BUILDDIR)/subversion/svn/svn --version > /dev/null @@ -201,6 +218,12 @@ debian/stamp-build-arch: debian/stamp-co $(MAKE_B) swig-py PYTHON=python$$v PYVER=$$v \ PYTHON_INCLUDES=-I/usr/include/python$$v \ swig_pydir=$$pylib/libsvn swig_pydir_extra=$$pylib/svn) + $(call allpydbg, \ + $(MAKE_B) swig-py PYTHON=python$$v PYVER=$${v}_d \ + PYTHON_INCLUDES=-I/usr/include/python$${v}_d \ + EXTRA_SWIG_PY_CFLAGS=-O0 \ + swig_pydir=$$pylib/libsvn swig_pydir_extra=$$pylib/svn) + ln -sf python$(PYDEFAULT) $(PY_DIR) # note: swig-pl seems to have trouble with -jN +$(MAKE_B) -j1 swig-pl $(MAKE) -C $(PERL_DIR) all \ @@ -239,7 +262,9 @@ endif build-indep: debian/stamp-build-indep debian/stamp-build-indep: debian/stamp-configure + mkdir -p $(DEB_BUILDDIR)/doc/doxygen +$(MAKE_B) doc-api + $(MAKE) -C $(DEB_BUILDDIR) locale-gnu-pot touch $@ clean: unpatch @@ -255,6 +280,8 @@ clean: unpatch $(RM) subversion/bindings/swig/proxy/*.swg $(RM) configure build/ltmain.sh build/libtool.m4 build/lt*.m4 $(RM) build/config.sub build/config.guess + $(RM) subversion/po/subversion.pot + $(RM) -r debian/tmp-dbg $(RM) debian/stamp-* debian/stamp-install-indep: debian/stamp-build-indep @@ -304,6 +331,18 @@ debian/stamp-install-arch: debian/stamp- DESTDIR=$(CURDIR)/debian/tmp toolsdir=/usr/bin sed -i 's:/usr/lib/\([^/]*/\)?lib\([^ ]*\).la:-l\1:g' debian/tmp/usr/lib/*/*.la + $(call allpydbg, \ + $(MAKE_B) install-swig-py DESTDIR=$(CURDIR)/debian/tmp \ + PYTHON=python$$v-dbg PYVER=$${v}_d \ + PYTHON_INCLUDES=-I/usr/include/python$${v}_d \ + EXTRA_SWIG_PY_CFLAGS=-O0 \ + swig_pydir=$$pylib/libsvn swig_pydir_extra=$$pylib/svn) + for i in $$(find debian/tmp/usr/lib/python* -name '*.so'); do \ + b=$$(basename $$i .so); \ + mv $$i $$(dirname $$i)/$${b}_d.so; \ + done + find debian/tmp/usr/lib/python* \ + ! -type d ! -name '*.so' ! -name '*.so.*' | xargs -r rm -f $(call allpy, \ $(MAKE_B) install-swig-py DESTDIR=$(CURDIR)/debian/tmp \ PYTHON=python$$v PYVER=$$v \ @@ -342,6 +381,14 @@ ifdef DEB_OPT_WITH_JAVAHL endif ln -s libsvn_ra_neon-1.so.1 debian/libsvn1/$(libdir)/libsvn_ra_dav-1.so.1 + # move the python debug modules to the -dbg package + (cd debian/python-subversion && tar cf - $$(find -name '*_d.so')) \ + | (cd debian/python-subversion-dbg && tar xf - ) + mkdir -p debian/python-subversion-dbg/$(libdir) + mv debian/python-subversion/$(libdir)/libsvn_swig_py*d-1.so.* \ + debian/python-subversion-dbg/$(libdir)/ + find debian/python-subversion -name '*_d.so' | xargs rm -f + install -m644 tools/client-side/bash_completion \ debian/subversion/etc/bash_completion.d/subversion @@ -383,7 +430,11 @@ binary-arch: debian/stamp-install-arch dh_installchangelogs -s CHANGES dh_lintian -s dh_fixperms -s - dh_strip -s + dh_strip -s -Npython-subversion -Npython-subversion-dbg + dh_strip -ppython-subversion --dbg-package=python-subversion-dbg + rm -rf debian/python-subversion-dbg/usr/share/doc/python-subversion-dbg + ln -s python-subversion \ + debian/python-subversion-dbg/usr/share/doc/python-subversion-dbg dh_compress -s # dh_makeshlibs (1) creates shlibs/symbols files and (2) generates @@ -393,7 +444,7 @@ binary-arch: debian/stamp-install-arch $(RM) debian/libsvn-*/DEBIAN/shlibs debian/python-subversion/DEBIAN/shlibs $(RM) debian/libsvn-*/DEBIAN/symbols debian/python-subversion/DEBIAN/symbols dh_perl -s - dh_pysupport -s + dh_python2 -s dh_installdeb -s dh_shlibdeps -s -X_auth_ sed -i 's:libsvn-private\(, *\)\?::' debian/*.substvars