Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: pu
Subversion's transition to the non-versioned ruby-svn package didn't make it into Wheezy. Since ruby1.8 is planning on being removed for Jessie, the libsvn-ruby1.8 → ruby-svn transition should be backported to Wheezy so there's an upgrade path to what will be Jessie's ruby-svn (built with something other than ruby1.8) package. In addition, libsvn-dev contains a broken /usr/lib/$arch/libsvnjavahl-1.so symlink (#711911) which is trivial to fix. The attached debdiff contains both of these changes. Does this seem reasonable? Cheers, -- James GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy <james...@debian.org>
diffstat for subversion_1.6.17dfsg-4+deb7u4 subversion_1.6.17dfsg-4+deb7u5
debian/libsvn-ruby1.8.install | 2 --
debian/libsvn-ruby1.8.links | 1 +
debian/libsvn-ruby1.8.lintian-overrides | 2 --
debian/libsvn-ruby1.8.postinst | 12 ++++++++++++
debian/ruby-svn.install | 2 ++
debian/ruby-svn.lintian-overrides | 2 ++
subversion-1.6.17dfsg/debian/changelog | 9 +++++++++
subversion-1.6.17dfsg/debian/control | 13 ++++++++-----
subversion-1.6.17dfsg/debian/rules | 5 +++--
9 files changed, 37 insertions(+), 11 deletions(-)
diff -u subversion-1.6.17dfsg/debian/control subversion-1.6.17dfsg/debian/control
--- subversion-1.6.17dfsg/debian/control
+++ subversion-1.6.17dfsg/debian/control
@@ -100,7 +100,7 @@
Recommends: python-subversion (>= 1.5), libsvn-perl (>= 1.5),
libconfig-inifiles-perl, liburi-perl,
exim4 | mail-transport-agent, xsltproc, rsync
-Suggests: libsvn-ruby1.8
+Suggests: ruby-svn
Description: Assorted tools related to Subversion
This package includes miscellaneous tools for use with Subversion
clients and servers:
@@ -144,22 +144,25 @@
manipulates a Subversion repository or working copy. See the
'subversion' package for more information.
-Package: libsvn-ruby1.8
+Package: ruby-svn
Section: ruby
Architecture: any
Multi-Arch: same
Pre-Depends: multiarch-support
+Breaks: libsvn-ruby1.8 (<< 1.6.17dfsg-4+deb7u5)
Depends: ruby1.8, ${shlibs:Depends}, ${misc:Depends}
+Replaces: libsvn-ruby1.8 (<< 1.6.17dfsg-4+deb7u5)
Description: Ruby bindings for Subversion
This is a set of Ruby interfaces to libsvn, the Subversion libraries.
It is useful if you want to, for example, write a Ruby script that
manipulates a Subversion repository or working copy. See the
'subversion' package for more information.
-Package: libsvn-ruby
-Section: ruby
+Package: libsvn-ruby1.8
+Section: oldlibs
+Priority: extra
Architecture: all
-Depends: libsvn-ruby1.8, ${misc:Depends}
+Depends: ruby-svn, ${misc:Depends}
Description: Ruby bindings for Subversion (dummy package)
This is a dummy package to install the Subversion library bindings for
the default version of Ruby.
reverted:
--- subversion-1.6.17dfsg/debian/libsvn-ruby1.8.lintian-overrides
+++ subversion-1.6.17dfsg.orig/debian/libsvn-ruby1.8.lintian-overrides
@@ -1,2 +0,0 @@
-# nobody but us will ever link to this, so we don't ship a shlibs file
-no-shlibs-control-file usr/lib/*/libsvn_swig_ruby-1.so.*
diff -u subversion-1.6.17dfsg/debian/rules subversion-1.6.17dfsg/debian/rules
--- subversion-1.6.17dfsg/debian/rules
+++ subversion-1.6.17dfsg/debian/rules
@@ -118,7 +118,7 @@
rb_defs := SWIG_RB_SITE_LIB_DIR=$(shell $(RUBY) -rrbconfig -e "print RbConfig::CONFIG['vendordir']")
rb_defs += SWIG_RB_SITE_ARCH_DIR=$(shell $(RUBY) -rrbconfig -e "print RbConfig::CONFIG['vendorarchdir']")
else
- DH_OPTIONS += -Nlibsvn-ruby -Nlibsvn-$(RUBY)
+ DH_OPTIONS += -Nruby-svn -Nlibsvn-$(RUBY)
RUBY := fooby
endif
@@ -346,13 +346,14 @@
cd debian/tmp/$(libdir); for lib in ra fs auth swig; do \
$(RM) libsvn_$${lib}_*.so libsvn_$${lib}_*.la; \
done
- cd debian/tmp/$(libdir); $(RM) libsvn_swig*.a libsvnjavahl.a libsvnjavahl.la
+ cd debian/tmp/$(libdir); $(RM) libsvn_swig*.a libsvnjavahl-1.a libsvnjavahl-1.la
# Intermediate hack, until we can remove the rest of the .la files.
sed -i "/dependency_libs/s/=.*/=''/" debian/tmp/$(libdir)/*.la
dh_install -s
ifdef DEB_OPT_WITH_JAVAHL
mkdir -p debian/libsvn-java/$(libdir)
mv debian/libsvn-java/usr/lib/jni debian/libsvn-java/$(libdir)/
+ $(RM) debian/libsvn-dev/$(libdir)/libsvnjavahl-1.so
endif
ln -s libsvn_ra_neon-1.so.1 debian/libsvn1/$(libdir)/libsvn_ra_dav-1.so.1
reverted:
--- subversion-1.6.17dfsg/debian/libsvn-ruby1.8.install
+++ subversion-1.6.17dfsg.orig/debian/libsvn-ruby1.8.install
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/*/libsvn_swig_ruby*.so.*
-debian/tmp/usr/lib/ruby
diff -u subversion-1.6.17dfsg/debian/changelog subversion-1.6.17dfsg/debian/changelog
--- subversion-1.6.17dfsg/debian/changelog
+++ subversion-1.6.17dfsg/debian/changelog
@@ -1,3 +1,12 @@
+subversion (1.6.17dfsg-4+deb7u5) UNRELEASED; urgency=low
+
+ * rules: Fix removal of libsvnjavahl-1.a/.la/.so from libsvn-dev. (Closes:
+ #711911)
+ * Make libsvn-ruby1.8 a transitional package to ruby-svn, to allow an
+ upgrade path to Jessie.
+
+ -- James McCoy <james...@debian.org> Tue, 07 Jan 2014 21:38:17 -0500
+
subversion (1.6.17dfsg-4+deb7u4) wheezy; urgency=low
* Non-maintainer upload.
only in patch2:
unchanged:
--- subversion-1.6.17dfsg.orig/debian/ruby-svn.lintian-overrides
+++ subversion-1.6.17dfsg/debian/ruby-svn.lintian-overrides
@@ -0,0 +1,2 @@
+# nobody but us will ever link to this, so we don't ship a shlibs file
+no-shlibs-control-file usr/lib/*/libsvn_swig_ruby-1.so.*
only in patch2:
unchanged:
--- subversion-1.6.17dfsg.orig/debian/ruby-svn.install
+++ subversion-1.6.17dfsg/debian/ruby-svn.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/*/libsvn_swig_ruby*.so.*
+debian/tmp/usr/lib/ruby
only in patch2:
unchanged:
--- subversion-1.6.17dfsg.orig/debian/libsvn-ruby1.8.postinst
+++ subversion-1.6.17dfsg/debian/libsvn-ruby1.8.postinst
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+pkgdir=/usr/share/doc/libsvn-ruby1.8
+if [ -d $pkgdir ] && [ ! -L $pkgdir ]; then
+ if rmdir $pkgdir; then
+ ln -sf /usr/share/doc/ruby-svn $pkgdir
+ fi
+fi
+
+#DEBHELPER#
only in patch2:
unchanged:
--- subversion-1.6.17dfsg.orig/debian/libsvn-ruby1.8.links
+++ subversion-1.6.17dfsg/debian/libsvn-ruby1.8.links
@@ -0,0 +1 @@
+usr/share/doc/ruby-svn usr/share/doc/libsvn-ruby1.8
signature.asc
Description: Digital signature
