The following commit has been merged in the lenny-backports branch:
commit fb3bbc6f16be7e011235b03434bdebe1652ebb18
Merge: 8475d505774a6e4d6634602df42730167cae30a1
173519ef36e948bbb3b7faaa5b576164777d315e
Author: Gerfried Fuchs <[email protected]>
Date: Thu Dec 16 10:43:40 2010 +0100
Merge commit 'v2.10.69' into lenny-backports
diff --combined debian/changelog
index cfc87d1,4348154..ead7e91
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,450 +1,458 @@@
+ devscripts (2.10.69) unstable; urgency=low
+
+ [ James Vega ]
+ * po4a: Add targets to transform translated POD/DocBook files into man
+ pages. (Closes: #597782)
+ * Include command list in localized devscripts.1. (Closes: #597906)
+ * Fix a couple markup issues in source files for generated man pages.
+ * bts: Don't send an empty email when --no-action is given. (Closes:
+ #600822)
+
+ [ David Prévot ]
+ * Update French translation. (Closes: #599234, #600033)
+
+ [ Patrick Schoenfeld ]
+ * Replace occurences of old FSF address with the FSF recommendation
+ what should be written inside of source files.
+ (Closes: #502512)
+
+ -- James Vega <[email protected]> Thu, 21 Oct 2010 07:36:42 -0400
+
+ devscripts (2.10.68) unstable; urgency=low
+
+ [ James Vega ]
+ * dget: Fix parsing of apt-cache and sources.list when given only a package
+ name. (Closes: #594904)
+ * debchange:
+ + Remove EOL Ubuntu release Intrepid. Add new development release Natty.
+ (Closes: #593659)
+ + Remove Etch and add Squeeze as backports targets. Lenny is still the
+ default bpo target.
+ * rmadison: Change Backports URL to backports.debian.org. (Closes: #595714)
+
+ [ Luk Claes ]
+ * Adjust rmadison documentation for move of accessible projectb mirror
+ from merkel to ries.
+
+ -- James Vega <[email protected]> Wed, 08 Sep 2010 18:46:35 -0400
+
+ devscripts (2.10.67) unstable; urgency=low
+
+ * debcommit: Use the first detected changelog instead of the last. (Closes:
+ #591368)
+ * debsnap: Remove use of pure-perl specific functions from JSON module.
+ (Closes: #591392)
+ * debchange: Clarify how the TZ environment variable affects debchange.
+ Based on a patch by Rolf Leggewie. (LP: #330430)
+
+ -- James Vega <[email protected]> Sat, 14 Aug 2010 12:02:17 -0400
+
+ devscripts (2.10.66) unstable; urgency=low
+
+ [ James Vega ]
+ * bts:
+ + Fix ability to clear all tags on a bug. (Closes: #539688)
+ + Detect invalid characters in usertags. (Closes: #590930)
+ + Allow specifying multiple tag modifiers (+, -, =) in one usertag stanza.
+ * rc-alert: Add missing hyphens and correct formatting in the man page.
+ Based on a patch by Salvatore Bonaccorso. (Closes: #589607)
+ * checkbashisms: Allow kill & trap XSI-isms unless --posix is given, as per
+ Policy 3.9.1.0. (Closes: #486823)
+ * debchange: Add --[no]multimaint-merge option, corresponding to the
+ DEBCHANGE_MULTIMAINT_MERGE configuration variable. (Closes: #590842)
+ * licensecheck: Add .pas, .inc, .dtd., .xsl, and .mod files to the default
+ check list. (Closes: #534988, #591305)
+ * build-rdeps: Escape regular expression metacharacters in package names.
+ (Closes: #590832)
+ * Build-Depends on po4a (>= 0.40) so po4a recognizes .TQ macro.
+
+ [ Cyril Brulebois ]
+ * uscan: Get rid of extra quoting in dpkg --compare-versions calls.
+ (Closes: #590178)
+
+ [ Carsten Hey ]
+ * debsign: Add options --re-sign and --no-re-sign to let the user choose
+ whether an already signed file should be resigned. (Closes: #580821)
+
+ -- James Vega <[email protected]> Mon, 02 Aug 2010 01:31:38 -0400
+
+ devscripts (2.10.65.1) unstable; urgency=low
+
+ * debc:
+ + Call changelog_parse correctly. (Closes: #588947)
+ + Update bash completion to complete *.changes files and package names.
+ Thanks to Stefano Rivera for the patch. (Closes: #584703)
+
+ -- James Vega <[email protected]> Tue, 13 Jul 2010 20:10:09 -0400
+
+ devscripts (2.10.65) unstable; urgency=low
+
+ [ James Vega ]
+ * Remove mergechanges from the set of commands which use completion of
+ package names. (Closes: #578167)
+ * bts:
+ + Use sendmail to send mails with extra headers when $(DEB)EMAIL aren't
+ present. (Closes: #577564)
+ + Document that $(DEB)EMAIL must be in the environment to send email using
+ either --mutt or --smtp-host. (Closes: #578334)
+ + Cleanup the help output and add some options which were only documented
+ in the man page.
+ + Allow specifying multiple tag modifiers (+, -, =) in one tag stanza.
+ (Closes: #578118)
+ + Document the valid values for the status key in the select command.
+ (Closes: #583067)
+ * debsnap:
+ + Iterate over the list of files listed for a hash until we find one that
+ matches the requested package. (Closes: #584734)
+ + Warn and move on to the next file if no files are present for a given
+ hash or none match the requested package. (Closes: #587265)
+ + Handle error responses from snapshot.debian.org. (Closes: #587217)
+ + Use the basename of the file being downloaded as the name under which to
+ save it. (Closes: #584735)
+ + Do not remove the destination directory when --force is given. (Closes:
+ #587517)
+ * Remove --ignore-dirname options (and deprecation notices) from all
+ scripts. 6.5 years is long enough to stop using that option.
+ * diff2patches: Document the patch naming scheme and use of “debian/” as the
+ destination directory when “debian/patches/” doesn't exist. (Closes:
+ #552693)
+ * mk-build-deps:
+ + Add options to build packages which depend on solely Build-Depends or
+ Build-Depends-Indep. (Closes: #498898)
+ + Include build-essential in Depends. (Closes: #565889)
+ * debi: Use “dpkg -O” instead of parsing dpkg-query's output to upgrade only
+ packages which are already installed. (Closes: #563390)
+ * debcheckout: Specifically call out that Debian hosts are already handled
+ in DEBCHECKOUT_AUTH_URLS' description. Thanks to martin f. krafft for the
+ suggested wording. (Closes: #530581)
+ * debchange: When running “dch -r”, use <dist>-backports if a backports
+ upload is detected. (Closes: #588502)
+ * uupdate: Use “0ubuntu1” for the Debian revision of the version number when
+ running uupdate on Ubuntu systems. Based on a patch by Guillaume Martres.
+ (Closes: #577998)
+ * Ship French man pages in UTF-8 now that #196762 is fixed.
+
+ [ Martin Zobel-Helas ]
+ * Remove svk from Recommends, it is no longer in the archive. (Closes:
+ #581224)
+
+ [ Raphael Geissert ]
+ * checkbashisms:
+ + Makefile handling:
+ - Simplify make variables as shell variables. (Closes: #535368)
+ - Convert all $$ to $.
+ - Recognize SHELL setting in Makefile when being set as an override.
+ - Ignore make's '-' for ignore errors.
+ - Fix some false positives due to target names.
+ + Detect incorrect use of ^ instead of ! for negation in pattern matching
+ collections. (Closes: #497489)
+ + Detect use of {post,pre}{increment,decrement} in arithmetic expansion.
+ (Closes: #572006)
+ + Detect use of Bash's “printf -v var ...” or the %b and %q format
+ specifiers.
+ + Detect use of the Bash's “coproc” keyword.
+ + Detect use of Bash's “;;&” and ”;&” operators.
+ + Add support for handling line continuations. (Closes: #531327)
+ + Fix a false positive with file redirection.
+ + Fix handling of indented heredoc delimiters.
+ + Fix some parsing of quoted strings.
+ + Detect use of exponentiation.
+ + Detect use of the 'jobs' built-in.
+ + Detect use of command with options other than “-p”.
+ + Fix a false positive with redirection to an fd specified via a variable.
+ + Detect unexpected EOF for unclosed heredocs, quoted strings, and line
+ continuations.
+
+ [ Simon McVittie ]
+ * mk-build-deps:
+ + Build an Arch: any package if any of the Build-Depends have architecture
+ requirements. (Closes: #580600)
+ + Allow specifying for which architecture to build the package.
+
+ [ Charles Plessy ]
+ * debchange: Add “--team” support. (Closes: #588714)
+
+ -- James Vega <[email protected]> Mon, 12 Jul 2010 23:22:08 -0400
+
+ devscripts (2.10.64) unstable; urgency=low
+
+ [ Stefano Zacchiroli ]
+ * devscripts.1: generic documentation for $DEBEMAIL and $DEBFULLNAME
+
+ [ James Vega ]
+ * Devscripts::Versort: Correct _versort so the lists it returns aren't
+ shorter than the ones passed in to _versort. (Closes: #577654)
+ * debcheckout: Switch from using the Switch module to Perl 5.10's switch
+ feature.
+
+ -- James Vega <[email protected]> Tue, 13 Apr 2010 23:46:10 -0400
+
+ devscripts (2.10.63) unstable; urgency=low
+
+ [ Christoph Berg ]
+ * debcheckout: inject extra slash in "hg ssh://hg.debian.org//" URLs so
+ paths are not based in the user's $HOME.
+
+ [ James Vega ]
+ * Devscripts::Versort:
+ + Restore previous behavior of versort not performing a check on whether
+ the version is a valid Debian version. (Closes: #577043)
+ + Re-add deb_versort which ensures the versions are valid Debian versions.
+ * debian/control:
+ + Require dpkg-dev >= 1.15.4.1 since we're using bits of the new Perl API.
+ + Add libjson-perl to Build-Depends so we can syntax check debsnap.
+ * debcheckout: Use $DEBEMAIL/$DEBFULLNAME to set username in .hg/hgrc.
+
+ [ David Paleino ]
+ * debsnap: rewritten from scratch in Perl, use snapshot.debian.org
+ and its JSON API (Closes: #530416)
+
+ [ Thorsten Glaser ]
+ * debsign: Convert to a Debian Policy §10.4 shell script. (Closes: #577251)
+
+ -- James Vega <[email protected]> Mon, 12 Apr 2010 23:56:40 -0400
+
+ 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)
+
+ -- James Vega <[email protected]> Mon, 05 Apr 2010 23:00:39 -0400
+
+ devscripts (2.10.61) unstable; urgency=low
+
+ * bts: Correct the address used to email the submitter when using the "bts
+ done" command.
+
+ -- James Vega <[email protected]> Sat, 02 Jan 2010 22:20:19 -0500
+
+ devscripts (2.10.60) unstable; urgency=low
+
+ The "Welcome to the New Year" release.
+
+ [ James Vega ]
+ * checkbashisms: Detect use of {x..z} expansion. Thanks to Raphael
+ Geissert. (Closes: #560774)
+ * who-uploads: Show usage if no arguments are given. Thanks to Kumar
+ Appaiah. (Closes: #560955)
+ * uscan:
+ + Add missing escape of '\' in man page. Thanks to Marco Túlio Gontijo
+ for the patch. (Closes: #562587)
+ + Add missing verb in description of FTP syntax. Thanks to Marco Túlio
+ Gontijo for the patch. (Closes: #562586)
+ * annotate-output: Allow specifying a timestamp format. (Closes: #539720)
+ * bts:
+ + Always include "thanks" at the end of the control block. (Closes:
+ #542962)
+ + Allow specifying which fields will be shown by "bts status". (Closes:
+ #499283, #323782)
+ + Add "verbose" option to "bts status", which will also show fields that
+ don't have a set value.
+ + Add "done" command which sends a close command as well as Ccing the bug
+ submitter. (Closes: #482751)
+ * build-rdeps:
+ + Add --origin option to specify which origin to use.
+ + Use the Release file to determine which Sources file(s) to search for
+ the given origin. Thanks to Michael Schutte for the patch. (Closes:
+ #545115)
+
+ [ Patrick Schoenfeld ]
+ * licensecheck: Add support for some common variants of the WTFPL
+
+ [ Ryan Niebur ]
+ * deb-reversion: Fix use with recent dpkg-dev, thanks to Salvatore
+ Bonaccorso (Closes: #559702)
+
+ [ Adam D. Barratt ]
+ * Bump Standards-Version to 3.8.3. No changes required.
+ * build-rdeps: Correct spelling error in manpage ("ommitted" -> "omitted").
+ * checkbashisms: Correct spelling error in manpage ("preceeded" ->
+ "preceded").
+ * decbommit: Correct spelling error in manpage ("commiting" ->
+ "committing").
+
+ -- James Vega <[email protected]> Fri, 01 Jan 2010 23:30:33 -0500
+
+ devscripts (2.10.59) unstable; urgency=low
+
+ [ James Vega ]
+ * debrelease: Do not use .svn/deb-layout to determine debsdir if --debs-dir
+ was used. (Closes: #558172)
+ * checkbashisms: Fix a false positive detection of ". $(foo bar)/baz" as
+ attempting to pass arguments to a sourced script. (Closes: #557639)
+
+ [ Joachim Breitner ]
+ * debcommit: Add support for having only debian/ under a svn, cvs or darcs
+ VCS (Closes: #450878)
+
+ -- James Vega <[email protected]> Tue, 01 Dec 2009 00:16:53 -0500
+
+ devscripts (2.10.58) unstable; urgency=low
+
+ * who-uploads: Correct the argument to wget's -O option. Thanks to
+ Yves-Alexis Perez for the patch. (Closes: #557507)
+
+ -- James Vega <[email protected]> Sun, 22 Nov 2009 09:16:03 -0500
+
+ devscripts (2.10.57) unstable; urgency=low
+
+ [ James Vega ]
+ * debcommit: Fix gathering of "Closes" with dpkg >= 1.15.5.2. (Closes:
+ #557318)
+
+ [ Ben Finney ]
+ * Tighten default dirname regex to match a version only if it contains
+ at least one character: ‘PACKAGE(-.+)?’. (Closes: #521126)
+
+ -- James Vega <[email protected]> Sat, 21 Nov 2009 18:01:28 -0500
+
+ devscripts (2.10.56) unstable; urgency=low
+
+ [ Adam D. Barratt ]
+ * debchange: Update the list of known Ubuntu distributions, adding
+ lucid (lynx) and removing gutsy.
+
+ [ James Vega ]
+ * mk-build-deps:
+ + Use Pod::Usage to generate the --help message. This keeps the message
+ in sync with the POD instead of keeping two different texts in sync.
+ (Closes: #548245)
+ + Skip comment/blank lines when parsing the control file. (Closes:
+ #549402)
+ * debchange:
+ + Based on a scan of the lintian lab, add '.', '!', and ':' to the set of
+ punctuation characters we strip from the distribution name when we parse
+ an "Upload to ..." line. (Closes: #548171)
+ + Consistently use “--nomainttrailer” in the manpage. (Closes: #544351)
+ * debuild:
+ + Recognize dpkg-source's -z/-Z options. (Closes: #553205)
+ + Remove references to pbuilder-satisfydepends. Suggest mk-build-deps
+ instead. (Closes: #446318)
+ * debcommit:
+ + Handle the split up of Dpkg::Changelog in Dpkg 1.15.5.2.
+ + Use Dpkg::Changelog::Parse, if available, instead of shelling out to
+ dpkg-parsechangelog.
+ + Remove use of deprecated L<> markup for pod2man.
+ * who-uploads: Set a 30 second timeout when invoking wget instead of using
+ wget's default 900 second timeout. (Closes: #541732)
+ * debsign: Update the dcut reference to point to ftp.upload.debian.org
+ instead of ftp-master.debian.org.
+ * debrelease:
+ + Support using buildArea from .svn/deb-layout. (Closes: #456226)
+ + Change to the package root directory before verifying the existence of
+ debsdir.
+ * bts: Remove use of deprecated L<> markup for pod2man.
+
+ [ Ryan Niebur ]
+ * add w3m to suggests for grep-excuses -w, check for it at runtime too
+ (Closes: #551516)
+ * mk-build-deps: allow passing options to the command in
+ MKBUILDDEPS_TOOL. Setting MKBUILDDEPS_TOOL="aptitude --schedule-
+ only" in ~/.devscripts should work now. (Closes: #547164)
+ * mergechanges:
+ + if both input files have the same file listed but with
+ different checksums, keep the first and get rid of the one from the
+ second.
+ + make trailing whitespace consistent with how 'normal'
+ .changes file are
+
+ [ Patrick Schoenfeld ]
+ * debchange:
+ + Include patch from Mathieu Parent to allow --newversion to be mixed
+ together with --package. (Closes: #549469)
+
+ [ Stefano Zacchiroli ]
+ * debcheckout: Set user.name and user.email in the checked out repository if
+ it is a git repo. (Closes: #555025)
+
+ -- James Vega <[email protected]> Fri, 20 Nov 2009 00:28:13 -0500
+
+devscripts (2.10.55~bpo50+1) lenny-backports; urgency=high
+
+ * Urgency "high" for uscan security update fix
+ * Rebuild for lenny-backports.
+ * Remove sensible-utils from Recommends as it doesn't exist in lenny.
+
+ -- Adam D. Barratt <[email protected]> Fri, 11 Sep 2009 15:00:17
+0100
+
devscripts (2.10.55) unstable; urgency=high
* Urgency "high" for security fix fix
diff --combined debian/control
index 4d5f491,e2466e8..22dda68
--- a/debian/control
+++ b/debian/control
@@@ -3,27 -3,27 +3,27 @@@ Section: deve
Priority: optional
Maintainer: Devscripts Devel Team <[email protected]>
Uploaders: Julian Gilbey <[email protected]>, Joey Hess <[email protected]>,
Mohammed Adnène Trojette <[email protected]>, Christoph Berg <[email protected]>,
Stefano Zacchiroli <[email protected]>, James Vega <[email protected]>, Martin
Zobel-Helas <[email protected]>, Adam D. Barratt <[email protected]>, Luk
Claes <[email protected]>, Patrick Schoenfeld <[email protected]>, Ryan
Niebur <[email protected]>
- Standards-Version: 3.8.2
+ Standards-Version: 3.8.4
Build-Depends: perl, debhelper (>= 6.0.0), docbook-xsl, libtimedate-perl,
libfile-desktopentry-perl, libterm-size-perl, liburi-perl, libwww-perl,
- po4a (>= 0.31), xsltproc
- Vcs-Browser: http://svn.debian.org/wsvn/devscripts/trunk/
- Vcs-Svn: svn://svn.debian.org/devscripts/trunk
+ po4a (>= 0.40), xsltproc, libjson-perl
+ Vcs-Browser: http://git.debian.org/?p=devscripts/devscripts.git
+ Vcs-Git: git://git.debian.org/devscripts/devscripts.git
Package: devscripts
Architecture: any
- Conflicts: kdesdk-scripts (<< 4:3.5.6-2)
- Depends: dpkg-dev, perl, ${shlibs:Depends}, ${misc:Depends}
+ Depends: dpkg-dev (>= 1.15.4.1), perl, ${shlibs:Depends}, ${misc:Depends}
Recommends: at, curl | wget, dctrl-tools, debian-keyring, debian-maintainers,
dput | dupload, equivs, fakeroot, gnupg, libauthen-sasl-perl,
libcrypt-ssleay-perl, libparse-debcontrol-perl, libsoap-lite-perl,
libterm-size-perl, libtimedate-perl, liburi-perl, libwww-perl,
- libyaml-syck-perl, lintian, lsb-release, bsd-mailx | mailx | mailutils,
+ libyaml-syck-perl, lintian, lsb-release, bsd-mailx | mailx,
man-db, patch, patchutils, ssh-client, strace, unzip, wdiff, www-browser,
- subversion | cvs | svk | tla | bzr | git-core | mercurial, lzma
+ subversion | cvs | darcs | tla | bzr | git-core | mercurial, lzma,
- xz-utils, sensible-utils, libjson-perl
++ xz-utils, libjson-perl
Suggests: build-essential, cvs-buildpackage, devscripts-el, gnuplot,
libfile-desktopentry-perl, libnet-smtp-ssl-perl (>= 1.01-2), mutt,
- svn-buildpackage
+ svn-buildpackage, w3m
Description: scripts to make the life of a Debian Package maintainer easier
Contains the following scripts, dependencies/recommendations shown in
brackets afterwards:
@@@ -33,7 -33,7 +33,7 @@@
- archpath: print tla/Bazaar package names [tla | bazaar]
- bts: a command-line tool for manipulating the BTS [www-browser,
libauthen-sasl-perl, libnet-smtp-ssl-perl, libsoap-lite-perl, libwww-perl,
- bsd-mailx | mailx | mailutils]
+ bsd-mailx | mailx]
- build-rdeps: Searches for all packages that build-depend on a
given package [dctrl-tools]
- chdist: tool to easily play with several distributions [dctrl-tools]
@@@ -60,9 -60,9 +60,9 @@@
[libparse-debcontrol-perl, libsoap-lite-perl, lsb-release]
- debcheckout: checkout the development repository of a Debian package
- debclean: purge a Debian source tree [fakeroot]
- - debcommit: commit changes to cvs, svn, svk, tla, bzr, git, or hg, basing
- commit message on changelog
- [cvs | subversion | svk | tla | bzr | git-core | mercurial]
+ - debcommit: commit changes to cvs, darcs, svn, svk, tla, bzr, git, or hg,
+ basing commit message on changelog
+ [cvs | darcs | subversion | svk | tla | bzr | git-core | mercurial]
- debdiff: compare two versions of a Debian package to check for
added and removed files [wdiff, patchutils]
- debi: install a just-built package
@@@ -72,7 -72,8 +72,8 @@@
the rest of the package to be present; can sign the pair remotely
or fetch the pair from a remote machine for signing [gnupg,
debian-keyring, ssh-client]
- - debsnap: grab packages from http://snapshot.debian.net [wget]
+ - debsnap: grab packages from http://snapshot.debian.org [libwww-perl,
+ libjson-perl]
- debuild: wrapper to build a package without having to su or worry
about how to invoke dpkg to build using fakeroot. Also deals
with common environment problems, umask etc. [fakeroot,
@@@ -91,11 -92,11 +92,11 @@@
.changes or .dsc files [gnupg, debian-keyring, libdigest-md5-perl]
- getbuildlog: download package build logs from Debian auto-builders [wget]
- grep-excuses: grep the update_excuses.html file for your packages
- [libterm-size-perl, wget]
+ [libterm-size-perl, wget, w3m]
- licensecheck: attempt to determine the license of source files
- list-unreleased: searches for unreleased packages
- manpage-alert: locate binaries without corresponding manpages [man-db]
- - mass-bug: mass-file bug reports [bsd-mailx | mailx | mailutils]
+ - mass-bug: mass-file bug reports [bsd-mailx | mailx]
- mergechanges: merge .changes files from a package built on different
architectures
- mk-build-deps: Given a package name and/or control file, generate a binary
@@@ -107,7 -108,7 +108,7 @@@
- plotchangelog: view a nice plot of the data in a changelog file
[libtimedate-perl, gnuplot]
- pts-subscribe: subscribe to the PTS for a limited period of time
- [bsd-mailx | mailx | mailutils, at]
+ [bsd-mailx | mailx, at]
- rc-alert: list installed packages which have release-critical bugs [wget]
- rmadison: remotely query the Debian archive database about packages
[wget | curl, liburi-perl]
@@@ -118,7 -119,7 +119,7 @@@
transitions for which uploads to unstable are currently blocked
[libwww-perl, libyaml-syck-perl]
- uscan: scan upstream sites for new releases of packages
- [libcrypt-ssleay-perl, libwww-perl, unzip, lzma]
+ [libcrypt-ssleay-perl, libwww-perl, unzip, lzma, xz-utils]
- uupdate: integrate upstream changes into a source package [patch]
- whodepends: check which maintainers' packages depend on a package
- who-uploads: determine the most recent uploaders of a package to the
Debian
diff --combined scripts/debcheckout.pl
index eedab38,f8a2328..5f7ef4e
--- a/scripts/debcheckout.pl
+++ b/scripts/debcheckout.pl
@@@ -1,7 -1,7 +1,7 @@@
#!/usr/bin/perl -w
#
# debcheckout: checkout the development repository of a Debian package
- # Copyright (C) 2007-2008 Stefano Zacchiroli <[email protected]>
+ # Copyright (C) 2007-2009 Stefano Zacchiroli <[email protected]>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@@ -18,7 -18,7 +18,7 @@@
#
# Created: Tue, 14 Aug 2007 10:20:55 +0200
-# Last-Modified: $Date$
+# Last-Modified: $Date: 2009-08-30 05:39:55 +0100 (Sun, 30 Aug 2009) $
=head1 NAME
@@@ -160,8 -160,9 +160,9 @@@ for authenticated mode (see B<-a>) hav
References to matching substrings in the replacement texts are
allowed as usual in Perl by the means of $1, $2, ... and so on.
- Using this setting users can specify how to enable authenticated mode
- for repositories hosted on non well-known machines.
+ This setting can be used to enable authenticated mode for most repositories
+ out there. Note that the Debian repositories on S<alioth.debian.org>
+ (S<$vcs.debian.org>) are implicitly defined.
Here is a sample snippet suitable for the configuration files:
@@@ -189,8 -190,9 +190,9 @@@ debcheckout and this manpage have been
=cut
+ use feature 'switch';
use strict;
- use Switch;
+ use warnings;
use Getopt::Long;
use Pod::Usage;
use File::Basename;
@@@ -348,12 -350,17 +350,17 @@@ sub set_destdir(@$$)
my ($repo_type, $destdir, @cmd) = @_;
$destdir =~ s|^-d\s*||;
- switch ($repo_type) {
- case "cvs" { my $module = pop @cmd;
- push @cmd, ("-d", $destdir, $module);
+ given ($repo_type) {
+ when ("cvs") {
+ my $module = pop @cmd;
+ push @cmd, ("-d", $destdir, $module);
+ }
+ when (/^(bzr|darcs|git|hg|svn)$/) {
+ push @cmd, $destdir;
+ }
+ default {
+ die "sorry, don't know how to set the destination directory for
$repo_type repositories (patches welcome!)\n";
}
- case /^(bzr|darcs|git|hg|svn)$/ { push @cmd, $destdir; }
- else { die "sorry, don't know how to set the destination directory for
$repo_type repositories (patches welcome!)\n"; }
}
return @cmd;
}
@@@ -383,12 -390,12 +390,12 @@@ sub set_auth($$$$)
$user_local =~ s|(.*)(@)|$1|;
my $user_url = $url;
- switch ($repo_type) {
- case "bzr" {
+ given ($repo_type) {
+ when ("bzr") {
$url =~
s|^[\w+]+://(bzr\.debian\.org)/(.*)|bzr+ssh://$user$1/bzr/$2|;
$url =~
s[^\w+://(?:(bazaar|code)\.)?(launchpad\.net/.*)][bzr+ssh://${user}bazaar.$2];
}
- case "darcs" {
+ when ("darcs") {
if ($url =~ m|(~)|) {
$user_url =~ s|^\w+://(darcs\.debian\.org)/(~)(.*?)/.*|$3|;
die "the local user '$user_local' doesn't own the personal
repository '$url'\n"
@@@ -398,7 -405,7 +405,7 @@@
$url =~ s|^\w+://(darcs\.debian\.org)/(.*)|$user$1:/$2|;
}
}
- case "git" {
+ when ("git") {
if ($url =~ m%(/users/|~)%) {
$user_url =~ s|^\w+://(git\.debian\.org)/git/users/(.*?)/.*|$2|;
$user_url =~ s|^\w+://(git\.debian\.org)/~(.*?)/.*|$2|;
@@@ -408,14 -415,19 +415,19 @@@
$url =~
s|^\w+://(git\.debian\.org)/git/users/.*?/(.*)|git+ssh://$user$1/~/public_git/$2|;
$url =~
s|^\w+://(git\.debian\.org)/~.*?/(.*)|git+ssh://$user$1/~/public_git/$2|;
} else {
- $url =~ s|^\w+://(git\.debian\.org/.*)|git+ssh://$user$1|;
+ $url =~
s|^\w+://(git\.debian\.org)/(?:git/)?(.*)|git+ssh://$user$1/git/$2|;
}
}
- case "hg" { $url =~ s|^\w+://(hg\.debian\.org/.*)|ssh://$user$1|; }
- case "svn" {
+ # "hg ssh://" needs an extra slash so paths are not based in the user's
$HOME
+ when ("hg") {
+ $url =~ s|^\w+://(hg\.debian\.org/)|ssh://$user$1/|;
+ }
+ when ("svn") {
$url =~ s|^\w+://(svn\.debian\.org)/(.*)|svn+ssh://$user$1/svn/$2|;
}
- else { die "sorry, don't know how to enable authentication for
$repo_type repositories (patches welcome!)\n"; }
+ default {
+ die "sorry, don't know how to enable authentication for $repo_type
repositories (patches welcome!)\n";
+ }
}
if ($url eq $old_url) { # last attempt: try with user-defined rules
$url = user_set_auth($repo_type, $url);
@@@ -431,8 -443,8 +443,8 @@@ sub munge_url($$
{
my ($repo_type, $repo_url) = @_;
- switch ($repo_type) {
- case 'bzr' {
+ given ($repo_type) {
+ when ('bzr') {
# bzr.d.o explicitly doesn't run a smart server. Need to use
nosmart
$repo_url =~
s|^http://(bzr\.debian\.org)/(.*)|nosmart+http://$1/$2|;
}
@@@ -445,20 -457,20 +457,20 @@@ sub checkout_repo($$$)
my ($repo_type, $repo_url, $destdir) = @_;
my @cmd;
- switch ($repo_type) {
- case "arch" { @cmd = ("tla", "grab", $repo_url); } # XXX ???
- case "bzr" { @cmd = ("bzr", "branch", $repo_url); }
- case "cvs" {
+ given ($repo_type) {
+ when ("arch") { @cmd = ("tla", "grab", $repo_url); } # XXX ???
+ when ("bzr") { @cmd = ("bzr", "branch", $repo_url); }
+ when ("cvs") {
$repo_url =~ s|^-d\s*||;
my ($root, $module) = split /\s+/, $repo_url;
$module ||= '';
@cmd = ("cvs", "-d", $root, "checkout", $module);
}
- case "darcs" { @cmd = ("darcs", "get", $repo_url); }
- case "git" { @cmd = ("git", "clone", $repo_url); }
- case "hg" { @cmd = ("hg", "clone", $repo_url); }
- case "svn" { @cmd = ("svn", "co", $repo_url); }
- else { die "unsupported version control system '$repo_type'.\n"; }
+ when ("darcs") { @cmd = ("darcs", "get", $repo_url); }
+ when ("git") { @cmd = ("git", "clone", $repo_url); }
+ when ("hg") { @cmd = ("hg", "clone", $repo_url); }
+ when ("svn") { @cmd = ("svn", "co", $repo_url); }
+ default { die "unsupported version control system '$repo_type'.\n"; }
}
@cmd = set_destdir($repo_type, $destdir, @cmd) if length $destdir;
print "@cmd ...\n";
@@@ -495,8 -507,8 +507,8 @@@ sub checkout_files($$$$)
return 1;
}
- switch ($repo_type) {
- case "arch" {
+ given ($repo_type) {
+ when ("arch") {
# If we've already retrieved a copy of the repository,
# reuse it
if (!length($tempdir)) {
@@@ -520,7 -532,7 +532,7 @@@
return 1;
}
}
- case "cvs" {
+ when ("cvs") {
if (!length($tempdir)) {
if (!($tempdir = tempdir( "debcheckoutXXXX", TMPDIR => 1,
CLEANUP => 1 ))) {
print STDERR
@@@ -558,7 -570,7 +570,7 @@@
}
}
}
- case /(svn|bzr)/ {
+ when (/(svn|bzr)/) {
@cmd = ($repo_type, "cat", "$repo_url/$file");
print "@cmd > $dir/" . basename($file) . " ... \n";
if (! open CAT, '-|', @cmd) {
@@@ -576,7 -588,7 +588,7 @@@
print OUTPUT $content;
close OUTPUT;
}
- case /(darcs|hg)/ {
+ when (/(darcs|hg)/) {
# Subtly different but close enough
if (have_lwp) {
print "Attempting to retrieve $file via HTTP ...\n";
@@@ -629,7 -641,7 +641,7 @@@
return 1;
}
}
- case "git" {
+ when ("git") {
# If there isn't a browse URL (either because the package
# doesn't ship one, or because we were called with a URL,
# try a common pattern for gitweb
@@@ -724,7 -736,9 +736,9 @@@
close OUTPUT;
}
}
- else { die "unsupported version control system '$repo_type'.\n"; }
+ default {
+ die "unsupported version control system '$repo_type'.\n";
+ }
}
}
@@@ -900,7 -914,7 +914,7 @@@ EO
close B;
} else {
print STDERR
- "failed to open branch.conf to add push_location: $...@\n";
+ "failed to open branch.conf to add push_location: $!\n";
}
} elsif ($repo_type eq 'git') {
my $tg_info = tg_info($repo_url);
@@@ -914,6 -928,10 +928,10 @@@
$rc = $? >> 8;
print STDERR "TopGit population failed\n" if $rc != 0;
}
+ system("cd $wcdir && git config user.name \"$ENV{'DEBFULLNAME'}\"")
+ if (defined($ENV{'DEBFULLNAME'}));
+ system("cd $wcdir && git config user.email \"$ENV{'DEBEMAIL'}\"")
+ if (defined($ENV{'DEBEMAIL'}));
if (length $git_track) {
my @heads;
if ($git_track eq '*') {
@@@ -938,8 -956,20 +956,20 @@@
system($cmd);
}
}
+ } elsif ($repo_type eq 'hg') {
+ my $username = '';
+ $username .= " $ENV{'DEBFULLNAME'}" if (defined($ENV{'DEBFULLNAME'}));
+ $username .= " <$ENV{'DEBEMAIL'}>" if (defined($ENV{'DEBEMAIL'}));
+ if ($username) {
+ if (open(HGRC, '>>', "$destdir/.hg/hgrc")) {
+ print HGRC "[ui]\nusername =$username\n";
+ close HGRC;
+ } else {
+ print STDERR
+ "failed to open hgrc to set username: $!\n";
+ }
+ }
}
-
exit($rc);
}
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
