Package: svn-buildpackage
Version: 0.6.21
Severity: normal
Tags: patch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
svn-upgrade doesn't work for repositories that are created along the
lines of "layout 2" of svn-inject, i.e. if the upstream directory is
under $REPO/branches/upstream/$package/{v1,v2,current}, at least if
the paths are not in .svn/deb-layout
Find attached a quick patch that "enhances" to guessing algorithm of
/usr/share/svn-buildpackage/SDCommon.pm
Cheers,
gregor
- -- System Information:
Debian Release: lenny/sid
APT prefers unstable
APT policy: (990, 'unstable'), (500, 'experimental'), (500, 'testing'), (500,
'stable')
Architecture: i386 (i686)
Kernel: Linux 2.6.22.200707242123
Locale: LANG=C, [EMAIL PROTECTED] (charmap=ISO-8859-15)
Shell: /bin/sh linked to /bin/bash
Versions of packages svn-buildpackage depends on:
ii devscripts 2.10.6 Scripts to make the life of a Debi
ii file 4.21-2 Determines file type using "magic"
ii libsvn-perl 1.4.4dfsg1-1 Perl bindings for Subversion
ii liburi-perl 1.35.dfsg.1-1 Manipulates and accesses URI strin
ii perl 5.8.8-7 Larry Wall's Practical Extraction
ii subversion 1.4.4dfsg1-1 Advanced version control system
ii unp 1.0.12 unpack (almost) everything with on
ii wget 1.10.2-3 retrieves files from the web
svn-buildpackage recommends no packages.
- -- no debconf information
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFGqkiOOzKYnQDzz+QRApWGAKD2YnfFqkYZaCBRg8q5JejpjaZlSgCg/zT+
Bf0JpKzjhGqBANUP/HJRQCI=
=1Z3E
-----END PGP SIGNATURE-----
--- SDCommon.pm.orig 2007-07-27 21:10:55.000000000 +0200
+++ SDCommon.pm 2007-07-27 21:32:02.000000000 +0200
@@ -210,7 +210,8 @@
if($basedir=~/:\/\//) { # huch, URL was specified as $basedir?
print "W: $var not specified anywhere, looking in the local
repository...\n";
@testsvn=("$basedir/../$pre/$suf",
- "$basedir/../../$pre/$package/$suf");
+ "$basedir/../../$pre/$package/$suf",
+ "$basedir/../../$pre/$suf/$package");
}
else {
if($SDCommon::opt_verbose) {
@@ -243,6 +244,9 @@
}
sub needs_upsCurrentUrl {
such("branches","upstream/current", "upsCurrentUrl", url("."));
+ if( !defined $SDCommon::c{"upsCurrentUrl"} ) { # maybe layout 2?
+ such("branches/upstream","current", "upsCurrentUrl", url("."));
+ }
exwerror "upsCurrentUrl setting is required, but could not be found in
$cfgFile or repository tree." if (!defined $SDCommon::c{"upsCurrentUrl"});
}
sub needs_tagsUrl {
