[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Subversion in backports



Hi Michael and Reinhard,

On Tue, Mar 16, 2010 at 02:36:45PM +0100, Reinhard Tartler wrote:
> AFAIR backporting subversion was rather straight forward to do.

Rather straight forward was not really the case, but I have
something that works for me.

I had to disable Java-support (javahl), since that brought me
into a dependency hell. The dependency on gcj-jdk needed me to
backport the gcc4.4 compiler too and I didn't want to go there.


> if you need something sponsored, feel free to pass me a link to
> your source package; I'll consider it then.

I do not know if you are interested in a not complete Subversion
backport. But to help others out that might have the same trouble
I have included a small patch and a brief description of what I
did:

  I first backported libserf-0-0, which was a trivial task. It
  simply built without any trouble at all.

  Next I removed the gcj-jdk dependency from debian/control and
  changed the dependency to libdb4.8-dev into libdb4.6-dev. The
  last thing I did was setting ENABLE_JAVAHL to 'no' in
  debian/rules.


-- 
$ cat ~/.signature
Freddy Spierenburg <freddy@telegraafnet.nl>  http://freddy.snarl.nl/
GnuPG: 0x7941D1E1=C948 5851 26D2 FA5C 39F1  E588 6F17 FD5D 7941 D1E1
$ # Please read http://www.ietf.org/rfc/rfc2015.txt before complain!
diff -Naur subversion-1.6.9dfsg-orig/debian/control subversion-1.6.9dfsg/debian/control
--- subversion-1.6.9dfsg-orig/debian/control	2010-03-17 16:50:23.000000000 +0000
+++ subversion-1.6.9dfsg/debian/control	2010-03-17 16:53:50.000000000 +0000
@@ -5,13 +5,12 @@
 Uploaders: Troy Heber <troyh@debian.org>,
            Guilherme de S. Pastore <gpastore@debian.org>
 Build-Depends: debhelper, libneon27-gnutls-dev, libserf-0-0-dev (>= 0.3.0-0.2), zlib1g-dev,
-               libapr1-dev, libaprutil1-dev, libdb4.8-dev,
+               libapr1-dev, libaprutil1-dev, libdb4.6-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,
                perl, libperl-dev, ruby1.8, ruby1.8-dev,
-               gcj-jdk (>= 4:4.4) [!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, 2.5, 2.6
diff -Naur subversion-1.6.9dfsg-orig/debian/rules subversion-1.6.9dfsg/debian/rules
--- subversion-1.6.9dfsg-orig/debian/rules	2010-03-17 16:50:23.000000000 +0000
+++ subversion-1.6.9dfsg/debian/rules	2010-03-17 16:53:33.000000000 +0000
@@ -18,7 +18,7 @@
 # Note: the Build-Depends line in debian/control must be kept in sync
 # with DISABLE_JAVAHL_ARCHS.
 
-ENABLE_JAVAHL        := yes
+ENABLE_JAVAHL        := no
 DISABLE_JAVAHL_ARCHS := alpha arm hppa m68k mips mipsel hurd-i386
 ifneq (,$(filter $(DEB_HOST_ARCH), $(DISABLE_JAVAHL_ARCHS)))
   ENABLE_JAVAHL :=

Attachment: signature.asc
Description: Digital signature


Reply to: