Your message dated Tue, 06 Apr 2010 04:27:58 +0000
with message-id <[email protected]>
and subject line Bug#573092: fixed in devscripts 2.10.62
has caused the Debian Bug report #573092,
regarding [debuild] provide access to epoch-less version in debuild's hooks
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 this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
573092: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=573092
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: devscripts
Version: 2.10.61
Severity: wishlist
Tags: patch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
It would be nice to have more variables available in debuild's hook
scripts. Today I wanted an epoch-less version -- and since $sversion
is already in the script it might as well be exposed :)
Find attached a quick patch against the version in git that make
$sversion and $uversion availbale for hooks.
Cheers,
gregor
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iQIcBAEBCAAGBQJLlWU8AAoJELs6aAGGSaoG1FAQAKDwfl+BRSM2ACcKeMc78YxW
eJ0DMc8cOqjMp6LB0Nc4bDC5LKNM4sf8Jdep7Clh87Ax+p7vfygwacUB3hqTDWMv
lGvqji2+lUuR3WnqDYF0rbsCVYviV9XXzJtK9FEc6oaeP21rvQeUXEIFtu1qF4H3
cjV+eszYhssaYOnVAQY0U7Y49UB9CU1muLjgKYir1JMgUJhANOrR22rk0REMlaFm
rn9oHIkEAF3gluBZWKeejQ1dSvicJJyqHboVmvprKKJe4KfBFAu5gqnkDVMxdqMQ
eO0urmqH7iq+pOxoW+E3acZ0ihSF0ghwoB9eHGzw8DEJyFghbXLXnuOlYQlXGnmb
pfSeCdEXoUX/a84KL/JziWnAaA7x+P8NI26lmFTG+QSB4KZiNnNAffr/t6/yl4+x
1ZaoicQt+wCCSxlF74GlJJI1Gu2DoITREO6j1YWymlVIHfZz7nBuA6ABstqMPsB4
NY0VAEmkew9LA9ASU/ylzVngFsZK/dxjObR2dq1BiwqMiDybvTYykEAbJ0q/LmKk
1+MHWP/1UmmrMfoFX0qblDJfaRdR3IeB3jyz+trYL86CsxCAF6kjbraCjeggC+pq
CtkiaYcw5WA6P4cmYOoIAQwjebETZFJeZ4DdNBsBtkVrecJIMGnzzkj5lCGPKggy
SUlCuyoVW91j0xLfVWL6
=xkng
-----END PGP SIGNATURE-----
diff --git a/scripts/debuild.1 b/scripts/debuild.1
index 2dae442..1749c41 100644
--- a/scripts/debuild.1
+++ b/scripts/debuild.1
@@ -197,7 +197,8 @@ for example, DEBUILD_SIGNING_HOOK='foo' (note the hyphens change into
underscores!) or as a command line option \fB\-\-signing\-hook-foo\fR.
The command will have certain percent substitutions made on it: %%
will be replaced by a single % sign, %p will be replaced by the
-package name, %v by the package version number, %a will be 1 if the
+package name, %v by the package version number, %s by the source version
+number, %u by the upstream version number. %a will be 1 if the
immediately following action is to be performed and 0 if not (for
example, in the dpkg-source hook, %a will become 1 if dpkg-source is
to be run and 0 if not). Then it will be handed to the shell to deal
diff --git a/scripts/debuild.pl b/scripts/debuild.pl
index 446c8b2..56f91b7 100755
--- a/scripts/debuild.pl
+++ b/scripts/debuild.pl
@@ -654,6 +654,8 @@ my $pkg = $changelog{'Source'};
fatal "no version number in changelog!"
unless exists $changelog{'Version'};
my $version = $changelog{'Version'};
+(my $sversion=$version) =~ s/^\d+://;
+(my $uversion=$sversion) =~ s/-[a-z0-9+\.]+$//i;
# Is the directory name acceptable?
if ($check_dirname_level == 2 or
@@ -963,10 +965,9 @@ if ($command_version eq 'dpkg') {
/^(.*)=(.*)$/ and $ENV{$1} = $2;
}
- # We need to do the arch, sversion, pv, pva stuff to figure out
+ # We need to do the arch, pv, pva stuff to figure out
# what the changes file will be called,
- my ($sversion, $uversion, $dsc, $changes, $build);
- my $arch;
+ my ($arch, $dsc, $changes, $build);
if ($sourceonly) {
$arch = 'source';
} else {
@@ -1344,7 +1345,7 @@ sub run_hook ($$) {
print STDERR " Running $hook-hook\n";
my $hookcmd = $hook{$hook};
$act = $act ? 1 : 0;
- my %per=("%"=>"%", "p"=>$pkg, "v"=>$version, "a"=>$act);
+ my %per=("%"=>"%", "p"=>$pkg, "v"=>$version, "s"=>$sversion, "u"=>$uversion, "a"=>$act);
$hookcmd =~ s/\%(.)/exists $per{$1} ? $per{$1} :
(warn ("Unrecognised \% substitution in hook: \%$1\n"), "\%$1")/eg;
--- End Message ---
--- Begin Message ---
Source: devscripts
Source-Version: 2.10.62
We believe that the bug you reported is fixed in the latest version of
devscripts, which is due to be installed in the Debian FTP archive:
devscripts_2.10.62.dsc
to main/d/devscripts/devscripts_2.10.62.dsc
devscripts_2.10.62.tar.gz
to main/d/devscripts/devscripts_2.10.62.tar.gz
devscripts_2.10.62_i386.deb
to main/d/devscripts/devscripts_2.10.62_i386.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.
James Vega <[email protected]> (supplier of updated devscripts 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: RIPEMD160
Format: 1.8
Date: Mon, 05 Apr 2010 23:00:39 -0400
Source: devscripts
Binary: devscripts
Architecture: source i386
Version: 2.10.62
Distribution: unstable
Urgency: low
Maintainer: Devscripts Devel Team <[email protected]>
Changed-By: James Vega <[email protected]>
Description:
devscripts - scripts to make the life of a Debian Package maintainer easier
Closes: 507776 521642 537367 559549 563901 563918 564075 564443 565159 568473
568615 569062 570138 573092 575554 575820 576287
Changes:
devscripts (2.10.62) unstable; urgency=low
.
[ James Vega ]
* debcommit:
+ Fix a regression where only debian/ changes were being committed in CVS
repos. Thanks to Thomas Parmelan for the patch. (Closes: #563918)
+ Change '~' in version numbers to '.' when tagging in git. Thanks to
Damyan Ivanov. (Closes: #564075)
+ Treat darcs similar to hg with respect to determining the commit
message. Fold a single change into one line and spawn an editor if
multiple changes are detected. (Closes: #563901)
+ Ensure the commit message presented to the user for editing always has
an EOL on the last line.
* rmadison:
+ Add http://qa.debian.org/cgi-madison/madison.cgi, shorthand "udd", as a
known madison URL.
+ Detect an existing '?' in a URL and use '&' to append more cgi
parameters. Thanks to Raphael Geissert.
* chdist:
+ Add "use strict" and update for compliance.
+ Use Dpkg::Version to perform version comparisons.
* Devscripts::Versort: Use Dpkg::Version::version_compare instead of
invoking “dpkg --compare-versions”.
* debian/control:
+ Update Vcs-* to point to the new Git repository.
+ Remove Conflicts on kdesdk-scripts from Etch.
+ Bump Standards-Version to 3.8.4 -- no changes necessary.
* dcmd: Allow capital letters for the section and priority fields. (Closes:
#565159)
* debcheckout: Ensure "/git/" is at the start of the URL's path when
performing an authenticated clone of an Alioth git repo.
* uupdate:
+ Fix a typo which caused redirection of stdout to a file name "@".
(Closes: #569062)
+ Add support for xz compressed archives/patches and 7z archives. Thanks
to Hideki Yamane for the patch. (Closes: #568615)
+ Clarify wording when neither a diff nor a debian.tar is found. (Closes:
#575820)
* Update descriptions of debcommit to include darcs as a supported VCS.
(Closes: #570138)
* debchange:
+ Add maverick as a valid distribution. Thanks to Benjamin Drung for the
patch. (Closes: #576287)
+ Treat a trailing '+' like a trailing '~' when incrementing the version
number. (Closes: #521642)
* debuild: Expose two new variables (epoch-less source version, and upstream
version) to hooks. Thanks to gregor herrmann for the patch. (Closes:
573092)
* checkbashisms: Detect more Bash builtins -- readarray, mapfile, enable.
(Closes: #568473)
* dd-list: Clarify that --dctrl simply changes the expected format of the
list of packages. Thanks to Adeodato Simó for the suggestion. (Partially
addresses #509983)
* Add bash completion of package names for various Devscripts commands.
Thanks to Simon Paillard for the patch. (Closes: #507776)
* Document in dscverify(1) that /usr/share/keyrings/debian-maintainers.gpg
is one of the default keyrings.
* dget: Add description of the use of dscverify to the description in the
man page. (Closes: #537367)
* Add support for working with/recognizing xz archives to debchange,
debdiff, debuild, uscan.
* Use standalone “set -e” lines in maintainer scripts.
* Add debian/source/format with "3.0 (native)".
.
[ Patrick Schoenfeld ]
* nmudiff: Fix "[nmudiff] please include --tagpending option" by applying the
patch from Gregor Herrmann. Thanks. (Closes: #559549)
* build-rdeps:
+ Add some documentation to the manpage, which emphasizes on the fact that
the tool has some external dependencies (namely apt Sources files)
+ Add a proper argument passing to test_for_valid_component() so that
it really gets the filename and not the Release file entry.
+ Add a check to test_for_valid_component() to test if a given Sources
file actually exists and otherwise print a more meaningful warning.
(Closes: #564443)
.
[ Adam D. Barratt ]
* debchange: Sanitise list of distributions. Remove {sarge,etch}-backports
and sarge-volatile, none of which accept uploads any more.
.
[ Martin Zobel-Helas ]
* checkbashisms: Fix typo spotted by Dann Frazier. (Closes: #575554)
Checksums-Sha1:
0b78b23782ac50495cbe5601226865bb03bad856 1429 devscripts_2.10.62.dsc
f0552fbafe76309d0b0307efe7cd6d2012ec1d7c 691740 devscripts_2.10.62.tar.gz
9b086e439adaf74b79f440f13a670dc3b70d6570 597912 devscripts_2.10.62_i386.deb
Checksums-Sha256:
14304814299e183313d3ae92a6b14b311330766cbdd102b83f459ded9f6d22b3 1429
devscripts_2.10.62.dsc
64cd533f6ece97535040eb435b35926a6b95b3ed65c43ea908b648fc409ec3e7 691740
devscripts_2.10.62.tar.gz
a98b0b8a49c551c7a9008bd6af2dae0c5c52ae25ed13015225cfbaa5a34761d4 597912
devscripts_2.10.62_i386.deb
Files:
ff3a5b0aa91757c2b6f7c5ae45d9c8c8 1429 devel optional devscripts_2.10.62.dsc
4b436cc26b3fcbf77a5beac52938c1d5 691740 devel optional
devscripts_2.10.62.tar.gz
c1185c14e52aabce206e722aee5c03fd 597912 devel optional
devscripts_2.10.62_i386.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iEYEAREDAAYFAku6pKEACgkQDb3UpmEybUDPVgCgiq6QBvI8SV3yMLKf/0/7mUPB
kYwAnRkv/WIIxYZxlFluLONfNJVJ+g85
=PkiY
-----END PGP SIGNATURE-----
--- End Message ---
