Your message dated Thu, 21 Apr 2005 14:32:20 -0400
with message-id <[EMAIL PROTECTED]>
and subject line Bug#305626: fixed in svn-buildpackage 0.6.7
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--------------------------------------
Received: (at submit) by bugs.debian.org; 21 Apr 2005 06:17:54 +0000
>From [EMAIL PROTECTED] Wed Apr 20 23:17:53 2005
Return-path: <[EMAIL PROTECTED]>
Received: from ms-smtp-02.texas.rr.com (ms-smtp-02-eri0.texas.rr.com)
[24.93.47.41]
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1DOV0b-0002FX-00; Wed, 20 Apr 2005 23:17:53 -0700
Received: from localhost.localdomain (cpe-66-25-48-63.houston.res.rr.com
[66.25.48.63])
by ms-smtp-02-eri0.texas.rr.com (8.12.10/8.12.7) with ESMTP id
j3L6Hoe1014192
for <[EMAIL PROTECTED]>; Thu, 21 Apr 2005 01:17:50 -0500 (CDT)
Received: from rsnellenberger by localhost.localdomain with local (Exim 4.50)
id 1DOUtm-0001L1-G3
for [EMAIL PROTECTED]; Thu, 21 Apr 2005 01:10:50 -0500
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Reed Snellenberger <[EMAIL PROTECTED]>
To: Debian Bug Tracking System <[EMAIL PROTECTED]>
Subject: svn-buildpackage: svn-upgrade doesn't properly handle versions with
epochs
X-Mailer: reportbug 3.8
Date: Thu, 21 Apr 2005 01:10:50 -0500
Message-Id: <[EMAIL PROTECTED]>
X-Virus-Scanned: Symantec AntiVirus Scan Engine
Delivered-To: [EMAIL PROTECTED]
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-8.0 required=4.0 tests=BAYES_00,HAS_PACKAGE
autolearn=no version=2.60-bugs.debian.org_2005_01_02
X-Spam-Level:
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
---------------------------------------
Received: (at 305626-close) by bugs.debian.org; 21 Apr 2005 18:41:53 +0000
>From [EMAIL PROTECTED] Thu Apr 21 11:41:52 2005
Return-path: <[EMAIL PROTECTED]>
Received: from newraff.debian.org [208.185.25.31] (mail)
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1DOgca-0005Rf-00; Thu, 21 Apr 2005 11:41:52 -0700
Received: from katie by newraff.debian.org with local (Exim 3.35 1 (Debian))
id 1DOgTM-0005vO-00; Thu, 21 Apr 2005 14:32:20 -0400
From: Eduard Bloch <[EMAIL PROTECTED]>
To: [EMAIL PROTECTED]
X-Katie: $Revision: 1.55 $
Subject: Bug#305626: fixed in svn-buildpackage 0.6.7
Message-Id: <[EMAIL PROTECTED]>
Sender: Archive Administrator <[EMAIL PROTECTED]>
Date: Thu, 21 Apr 2005 14:32:20 -0400
Delivered-To: [EMAIL PROTECTED]
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-6.0 required=4.0 tests=BAYES_00,HAS_BUG_NUMBER
autolearn=no version=2.60-bugs.debian.org_2005_01_02
X-Spam-Level:
Source: svn-buildpackage
Source-Version: 0.6.7
We believe that the bug you reported is fixed in the latest version of
svn-buildpackage, which is due to be installed in the Debian FTP archive:
svn-buildpackage_0.6.7.dsc
to pool/main/s/svn-buildpackage/svn-buildpackage_0.6.7.dsc
svn-buildpackage_0.6.7.tar.gz
to pool/main/s/svn-buildpackage/svn-buildpackage_0.6.7.tar.gz
svn-buildpackage_0.6.7_all.deb
to pool/main/s/svn-buildpackage/svn-buildpackage_0.6.7_all.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Eduard Bloch <[EMAIL PROTECTED]> (supplier of updated svn-buildpackage package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Thu, 21 Apr 2005 20:16:44 +0200
Source: svn-buildpackage
Binary: svn-buildpackage
Architecture: source all
Version: 0.6.7
Distribution: unstable
Urgency: low
Maintainer: Eduard Bloch <[EMAIL PROTECTED]>
Changed-By: Eduard Bloch <[EMAIL PROTECTED]>
Description:
svn-buildpackage - helper programs to maintain Debian packages with Subversion
Closes: 305626
Changes:
svn-buildpackage (0.6.7) unstable; urgency=low
.
* respecting epoch numbers in svn-upgrade, patch by Reed
Snellenberger <rsnellenberger AT houston.rr.com> (closes: #305626)
Files:
fecc00db3ee024be51bf064328577b8b 552 devel extra svn-buildpackage_0.6.7.dsc
0889ee877597547c69a84c2b71a2548d 41876 devel extra
svn-buildpackage_0.6.7.tar.gz
2e2e1e512692a2ed377d58a1eaed8177 170286 devel extra
svn-buildpackage_0.6.7_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCZ+5n4QZIHu3wCMURAmeBAJ9F5MzQ1B/r1G8NVADQ3+DRyCVKsACeMrt7
3R9zu5djzm3upPd6JVbja1I=
=Dg5T
-----END PGP SIGNATURE-----
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
