diff -u subversion-1.6.3dfsg/debian/changelog subversion-1.6.3dfsg/debian/changelog --- subversion-1.6.3dfsg/debian/changelog +++ subversion-1.6.3dfsg/debian/changelog @@ -1,3 +1,16 @@ +subversion (1.6.3dfsg-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: LP: #406245 + - 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. + + -- Bhavani Shankar Wed, 29 Jul 2009 12:36:50 +0530 + subversion (1.6.3dfsg-1) unstable; urgency=low * New upstream release. @@ -7,6 +20,25 @@ -- 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. @@ -32,6 +64,22 @@ -- 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. @@ -51,6 +99,22 @@ -- 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 @@ -66,6 +130,21 @@ -- 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. @@ -80,6 +159,21 @@ -- 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. @@ -107,6 +201,22 @@ -- 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 @@ -186,6 +296,19 @@ -- 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) @@ -226,6 +349,94 @@ -- 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. @@ -244,6 +455,16 @@ -- 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 ] @@ -256,6 +477,39 @@ -- 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 ] @@ -496,6 +750,21 @@ -- 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] @@ -535,6 +804,15 @@ -- 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 ] @@ -670,6 +948,28 @@ -- 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 ] @@ -716,6 +1016,14 @@ -- 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 ] @@ -762,6 +1070,14 @@ -- 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 @@ -892,6 +1208,12 @@ -- 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) @@ -911,6 +1233,12 @@ -- 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 @@ -969,6 +1297,32 @@ -- 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. @@ -1959,0 +2314 @@ + diff -u subversion-1.6.3dfsg/debian/rules subversion-1.6.3dfsg/debian/rules --- subversion-1.6.3dfsg/debian/rules +++ subversion-1.6.3dfsg/debian/rules @@ -56,7 +56,8 @@ 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 \ @@ -66,6 +67,14 @@ $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 + confflags := \ --prefix=/usr \ --mandir=\$${prefix}/share/man \ @@ -92,7 +101,7 @@ 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 @@ -160,6 +169,9 @@ 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 $@ @@ -182,6 +194,9 @@ check-swig-py: $(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 @@ -190,11 +205,20 @@ # 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 $(call allpy, \ $(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 \ @@ -233,7 +257,9 @@ 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 @@ -248,6 +274,8 @@ # these are (re)generated by autogen.sh $(RM) subversion/bindings/swig/proxy/*.swg $(RM) configure build/libtool.m4 build/ltmain.sh + $(RM) subversion/po/subversion.pot + $(RM) -r debian/tmp-dbg $(RM) debian/stamp-* debian/stamp-install-common: @@ -308,6 +336,19 @@ 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 +383,13 @@ endif dh_install -s + # 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 - ) + mv debian/python-subversion/usr/lib/libsvn_swig_py*d-1.so.* \ + debian/python-subversion-dbg/usr/lib/ + find debian/python-subversion -name '*_d.so' | xargs rm -f + install -m644 tools/client-side/bash_completion \ debian/subversion/etc/bash_completion.d/subversion @@ -381,7 +429,11 @@ $(call fix_shebangs_in, debian/*/usr/share/doc/*/examples) dh_installchangelogs -s CHANGES dh_fixperms -s - dh_strip -s + dh_strip -s -Npython-subversion -Npython-subversion-dbg + DH_COMPAT=5 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 diff -u subversion-1.6.3dfsg/debian/control subversion-1.6.3dfsg/debian/control --- subversion-1.6.3dfsg/debian/control +++ subversion-1.6.3dfsg/debian/control @@ -1,7 +1,8 @@ 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, @@ -9,12 +10,12 @@ libsasl2-dev, apache2-threaded-dev, libsqlite3-dev (>= 3.4), libgnome-keyring-dev, libdbus-1-dev, quilt, doxygen, autotools-dev, autoconf, libtool, swig, - python-all-dev, python-support, + python-all-dev, python-all-dbg, python-support, perl, libperl-dev, ruby1.8, ruby1.8-dev, - java-gcj-compat-dev [!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.5) -XS-Python-Version: 2.4, 2.5, 2.6 +XS-Python-Version: 2.5, 2.6 Homepage: http://subversion.tigris.org/ Vcs-Svn: svn://svn.debian.org/pkg-subversion/trunk Vcs-Browser: http://svn.debian.org/wsvn/pkg-subversion/trunk/ @@ -86,12 +87,26 @@ Replaces: libsvn0 (<< 1.2.3dfsg1-1), python2.3-subversion, python2.4-subversion Provides: ${python:Provides} +Suggests: python-subversion-dbg 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 +Depends: python-subversion (= ${Source-Version}), python-dbg, ${shlibs:Depends} +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 @@ -127,7 +142,7 @@ Provides: libsvn-javahl Section: java Architecture: any -Depends: gij | java5-runtime-headless, libsvn1 (= ${binary:Version}) +Depends: default-jre-headless | java5-runtime-headless, libsvn1 (= ${binary:Version}) Description: Java bindings for Subversion This is a set of Java classes which provide the functionality of libsvn, the Subversion libraries. It is useful if you want to, for diff -u subversion-1.6.3dfsg/debian/patches/series subversion-1.6.3dfsg/debian/patches/series --- subversion-1.6.3dfsg/debian/patches/series +++ subversion-1.6.3dfsg/debian/patches/series @@ -1,6 +1,5 @@ build-fixes entropy -java-build last-changed-date-charset no-extra-libs no-extra-libs-2 diff -u subversion-1.6.3dfsg/debian/patches/python-builds subversion-1.6.3dfsg/debian/patches/python-builds --- subversion-1.6.3dfsg/debian/patches/python-builds +++ subversion-1.6.3dfsg/debian/patches/python-builds @@ -9,14 +9,17 @@ @DPATCH@ --- a/Makefile.in +++ b/Makefile.in -@@ -113,6 +113,7 @@ +@@ -113,8 +113,9 @@ APACHE_LDFLAGS = @APACHE_LDFLAGS@ SWIG = @SWIG@ +PYTHON_INCLUDES = @PYTHON_INCLUDES@ SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@ -I$(SWIG_SRC_DIR)/python/libsvn_swig_py - SWIG_PY_COMPILE = @SWIG_PY_COMPILE@ +-SWIG_PY_COMPILE = @SWIG_PY_COMPILE@ ++SWIG_PY_COMPILE = @SWIG_PY_COMPILE@ SWIG_PY_LINK = @SWIG_PY_LINK@ + SWIG_PY_LIBS = @SWIG_PY_LIBS@ + SWIG_PL_INCLUDES = @SWIG_PL_INCLUDES@ --- a/build/ac-macros/swig.m4 +++ b/build/ac-macros/swig.m4 @@ -93,7 +93,8 @@