Package: svn-buildpackage
Version: 0.6.1
Severity: normal
Tags: patch
I've begun maintaining sitecopy, which uses an epoch in its version number.
When doing an svn-upgrade to go from the current Debian release
(1:0.11.4-6) to the next upstream release (0.12.0), the final debchange
command failed due to the (apparently) lower version number that was
attempted (0.12.0-1, rather than 1:0.12.0-1). I used the enclosed
patches to fix the problem.
The patch to SDCommon.pm adds the epoch to the version scan in sub init,
and adds the $epoch variable to the module. The patch for svn-upgrade
takes that $epoch string and prepends it to the $version (if $epoch is
necessary).
--- SDCommon.pm.orig 2005-04-20 16:04:47.000000000 -0500
+++ SDCommon.pm 2005-04-20 16:04:44.000000000 -0500
@@ -244,16 +244,17 @@
# }
if( (-f "debian/changelog" &&
- `head -n1 debian/changelog` =~ /^(\S+)\s*\((.+)\)/
+ `head -n1 debian/changelog` =~ /^(\S+)\s*\(((\d+):)?(.+)\)/
)
||
(-f "../debian/changelog" && chdir ".." &&
- `head -n1 debian/changelog` =~ /^(\S+)\s*\((.+)\)/
+ `head -n1 debian/changelog` =~ /^(\S+)\s*\(((\d+):)?(.+)\)/
)
)
{
$package=$1;
- $upVersion=$2;
+ $upVersion=$4;
+ $epoch=$3;
$tagVersion=$upVersion;
if(!$force_debian) {
$upVersion=~s/^.*://;
--- svn-upgrade.orig 2005-04-20 16:05:00.000000000 -0500
+++ svn-upgrade 2005-04-21 00:59:52.000000000 -0500
@@ -35,6 +35,7 @@
my $opt_force;
my $opt_clean;
my $version;
+my $epoch;
my $verbose;
my $keep_removed;
my $quiet="-q";
@@ -103,6 +104,7 @@
#$tagVersion=$SDCommon::tagVersion;
$upVersion=$SDCommon::upVersion;
$package =$SDCommon::package;
+$epoch =$SDCommon::epoch;
needs_tagsUrl;
needs_upsTagUrl if !$mergemode;
needs_upsCurrentUrl if !$mergemode;
@@ -273,5 +275,7 @@
}
withecho("rm", "-rf", $tmpdir) if(length($tmpdir));
+$version = join ':', $epoch, $version if $epoch
+
withecho "debchange -D UNRELEASED -v \"$version-1\" \"(NOT RELEASED YET) New
upstream release\"";
print "Done! Last commit pending, please execute manually.\n";
-- System Information:
Debian Release: 3.1
APT prefers testing
APT policy: (500, 'testing')
Architecture: i386 (i686)
Kernel: Linux 2.4.27-2-386
Locale: LANG=en_US, LC_CTYPE=en_US (charmap=ISO-8859-1)
Versions of packages svn-buildpackage depends on:
ii devscripts 2.8.10 Scripts to make the life of a Debi
ii perl 5.8.4-8 Larry Wall's Practical Extraction
ii subversion 1.1.3-2 advanced version control system (a
ii subversion-tools 1.1.3-2 assorted tools related to Subversi
-- no debconf information
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
