Hello community, here is the log from the commit of package deb for openSUSE:Factory checked in at Wed Nov 25 15:23:30 CET 2009. -------- --- deb/deb.changes 2009-11-12 12:43:11.000000000 +0100 +++ /mounts/work_src_done/STABLE/deb/deb.changes 2009-11-25 13:25:38.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Nov 25 12:01:33 UTC 2009 - puzel@novell.com + +- update to dpkg-1.15.5.2, debhelper-7.4.8, devscripts-2.10.58 + - huge number of changelogs - please see appropriate changelogs + for details: + - /usr/share/doc/packages/deb/debhelper/changelog + - /usr/share/doc/packages/deb/dpkg/changelog + + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- debhelper_7.3.12.tar.bz2 devscripts_2.10.55.tar.bz2 dpkg_1.15.0.tar.bz2 New: ---- debhelper_7.4.8.tar.bz2 devscripts_2.10.58.tar.bz2 dpkg_1.15.5.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deb.spec ++++++ --- /var/tmp/diff_new_pack.vxHbZI/_old 2009-11-25 15:22:05.000000000 +0100 +++ /var/tmp/diff_new_pack.vxHbZI/_new 2009-11-25 15:22:05.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package deb (Version 1.15.0) +# spec file for package deb (Version 1.15.5.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,8 +17,8 @@ # norootforbuild -%define debhelper_ver 7.3.12 -%define devscripts_ver 2.10.55 +%define debhelper_ver 7.4.8 +%define devscripts_ver 2.10.58 Name: deb BuildRequires: gcc-c++ ncurses-devel texlive-latex update-alternatives zlib-devel @@ -32,8 +32,8 @@ Requires: perl = %{perl_version} Requires: cpio patch make html2text update-alternatives AutoReqProv: on -Version: 1.15.0 -Release: 14 +Version: 1.15.5.2 +Release: 1 Summary: Tools for Debian Packages Source: dpkg_%{version}.tar.bz2 Source1: debhelper_%{debhelper_ver}.tar.bz2 @@ -189,15 +189,6 @@ %files %defattr(-,root,root) %doc %{_docdir}/deb -%doc %{_mandir}/fr -%doc %{_mandir}/ja -%doc %{_mandir}/sv -%doc %{_mandir}/es -%doc %{_mandir}/pt_BR -%doc %{_mandir}/ru -%doc %{_mandir}/de -%doc %{_mandir}/pl -%doc %{_mandir}/hu %doc %{_mandir}/man*/* %dir %{_sysconfdir}/dpkg %config(noreplace) %{_sysconfdir}/dpkg/* ++++++ debhelper_7.3.12.tar.bz2 -> debhelper_7.4.8.tar.bz2 ++++++ ++++ 27402 lines of diff (skipped) ++++++ debhelper-no-localized-manpages.diff ++++++ --- /var/tmp/diff_new_pack.vxHbZI/_old 2009-11-25 15:22:05.000000000 +0100 +++ /var/tmp/diff_new_pack.vxHbZI/_new 2009-11-25 15:22:05.000000000 +0100 @@ -1,20 +1,17 @@ diff -up debhelper/Makefile.orig debhelper/Makefile ---- debhelper/Makefile.orig 2009-07-02 18:46:55.000000000 +0200 -+++ debhelper/Makefile 2009-07-03 10:45:42.000000000 +0200 -@@ -27,29 +27,12 @@ PERLLIBDIR=$(shell perl -MConfig -e 'pri +--- debhelper/Makefile.orig 2009-11-19 17:46:10.000000000 +0100 ++++ debhelper/Makefile 2009-11-25 12:18:37.000000000 +0100 +@@ -34,26 +34,9 @@ PERLLIBDIR=$(shell perl -MConfig -e 'pri - POD2MAN=pod2man -c Debhelper -r "$(VERSION)" + POD2MAN=pod2man --utf8 -c Debhelper -r "$(VERSION)" -# l10n to be built is determined from .po files -LANGS=$(notdir $(basename $(wildcard man/po4a/po/*.po))) - - build: version + build: version debhelper.7 find . -maxdepth 1 -type f -perm +100 -name "dh*" \ -exec $(POD2MAN) {} {}.1 \; - cat debhelper.pod | \ - $(MAKEMANLIST) `find . -maxdepth 1 -type f -perm +100 -name "dh_*" | sort` | \ - $(POD2MAN) --name="debhelper" --section=7 > debhelper.7 -- po4a -L UTF-8 man/po4a/po4a.cfg +- po4a --previous -L UTF-8 man/po4a/po4a.cfg - set -e; \ - for lang in $(LANGS); do \ - dir=man/$$lang; \ @@ -31,11 +28,11 @@ version: printf "package Debian::Debhelper::Dh_Version;\n\$$version='$(VERSION)';\n1" > \ -@@ -57,10 +40,6 @@ version: +@@ -66,10 +49,6 @@ debhelper.7: debhelper.pod clean: rm -f *.1 *.7 Debian/Debhelper/Dh_Version.pm -- po4a --rm-translations --rm-backups man/po4a/po4a.cfg +- po4a --previous --rm-translations --rm-backups man/po4a/po4a.cfg - for lang in $(LANGS); do \ - if [ -e man/$$lang ]; then rmdir man/$$lang; fi; \ - done; ++++++ devscripts_2.10.55.tar.bz2 -> devscripts_2.10.58.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/devscripts-2.10.55/conf.default.in new/devscripts-2.10.58/conf.default.in --- old/devscripts-2.10.55/conf.default.in 2009-08-12 20:41:44.000000000 +0200 +++ new/devscripts-2.10.58/conf.default.in 2009-11-22 15:16:22.000000000 +0100 @@ -42,7 +42,7 @@ # # The default settings are: # DEVSCRIPTS_CHECK_DIRNAME_LEVEL=1 -# DEVSCRIPTS_CHECK_DIRNAME_REGEX='PACKAGE(-.*)?' +# DEVSCRIPTS_CHECK_DIRNAME_REGEX='PACKAGE(-.+)?' ##### annotate-output # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/devscripts-2.10.55/debian/changelog new/devscripts-2.10.58/debian/changelog --- old/devscripts-2.10.55/debian/changelog 2009-09-11 11:03:05.000000000 +0200 +++ new/devscripts-2.10.58/debian/changelog 2009-11-22 15:16:22.000000000 +0100 @@ -1,3 +1,79 @@ +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 <jamessan@debian.org> 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 <jamessan@debian.org> 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) + + -- James Vega <jamessan@debian.org> Fri, 20 Nov 2009 00:28:13 -0500 + devscripts (2.10.55) unstable; urgency=high * Urgency "high" for security fix fix diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/devscripts-2.10.55/debian/control new/devscripts-2.10.58/debian/control --- old/devscripts-2.10.55/debian/control 2009-09-10 20:14:12.000000000 +0200 +++ new/devscripts-2.10.58/debian/control 2009-11-22 15:16:22.000000000 +0100 @@ -24,7 +24,7 @@ sensible-utils 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: @@ -92,7 +92,7 @@ .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] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/devscripts-2.10.55/debian/postinst new/devscripts-2.10.58/debian/postinst --- old/devscripts-2.10.55/debian/postinst 2009-08-12 14:21:29.000000000 +0200 +++ new/devscripts-2.10.58/debian/postinst 2009-11-22 15:16:22.000000000 +0100 @@ -73,7 +73,7 @@ # # The default settings are: # DEVSCRIPTS_CHECK_DIRNAME_LEVEL=1 -# DEVSCRIPTS_CHECK_DIRNAME_REGEX='PACKAGE(-.*)?' +# DEVSCRIPTS_CHECK_DIRNAME_REGEX='PACKAGE(-.+)?' EOF fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/devscripts-2.10.55/po4a/po/devscripts.pot new/devscripts-2.10.58/po4a/po/devscripts.pot --- old/devscripts-2.10.55/po4a/po/devscripts.pot 2009-09-10 20:37:07.000000000 +0200 +++ new/devscripts-2.10.58/po4a/po/devscripts.pot 2009-11-22 15:22:48.000000000 +0100 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2009-09-10 19:33+0200\n" +"POT-Creation-Date: 2009-11-21 22:58+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -165,7 +165,7 @@ msgstr "" #. type: SH -#: ../scripts/annotate-output.1:55 ../scripts/archpath.1:54 ../scripts/build-rdeps.pl:290 ../scripts/checkbashisms.1:62 ../scripts/cowpoke.1:247 ../scripts/cvs-debc.1:64 ../scripts/cvs-debi.1:68 ../scripts/cvs-debrelease.1:69 ../scripts/cvs-debuild.1:59 ../scripts/dcmd.1:101 ../scripts/dcontrol.pl:283 ../scripts/dd-list.1:93 ../scripts/debc.1:120 ../scripts/debchange.1:433 ../scripts/debcheckout.pl:185 ../scripts/debclean.1:111 ../scripts/debcommit.pl:782 ../scripts/debdiff.1:222 ../scripts/debi.1:126 ../scripts/debpkg.1:23 ../scripts/debrelease.1:137 ../scripts/deb-reversion.dbk:292 ../scripts/debrsign.1:71 ../scripts/debsign.1:147 ../scripts/debuild.1:421 ../scripts/desktop2menu.pl:52 ../scripts/dget.pl:628 ../scripts/diff2patches.1:40 ../scripts/dpkg-genbuilddeps.1:36 ../scripts/dscverify.1:76 ../scripts/getbuildlog.1:41 ../scripts/grep-excuses.1:40 ../scripts/licensecheck.pl:121 ../scripts/list-unreleased.1:21 ../scripts/manpage-alert.1:20 ../scripts/mass-bug.pl:521 ../scripts/mergechanges.1:18 ../scripts/mk-build-deps.pl:68 ../scripts/namecheck.pl:30 ../scripts/nmudiff.1:113 ../scripts/plotchangelog.1:126 ../scripts/pts-subscribe.1:56 ../scripts/rc-alert.1:125 ../scripts/rmadison.pl:305 ../scripts/svnpath.pl:97 ../scripts/transition-check.pl:81 ../scripts/uscan.1:540 ../scripts/uupdate.1:169 ../scripts/whodepends.1:19 ../scripts/who-uploads.1:71 ../scripts/wnpp-alert.1:31 ../scripts/wnpp-check.1:33 ../scripts/devscripts.conf.5:58 +#: ../scripts/annotate-output.1:55 ../scripts/archpath.1:54 ../scripts/build-rdeps.pl:290 ../scripts/checkbashisms.1:62 ../scripts/cowpoke.1:247 ../scripts/cvs-debc.1:64 ../scripts/cvs-debi.1:68 ../scripts/cvs-debrelease.1:69 ../scripts/cvs-debuild.1:59 ../scripts/dcmd.1:101 ../scripts/dcontrol.pl:283 ../scripts/dd-list.1:93 ../scripts/debc.1:120 ../scripts/debchange.1:433 ../scripts/debcheckout.pl:185 ../scripts/debclean.1:111 ../scripts/debcommit.pl:805 ../scripts/debdiff.1:222 ../scripts/debi.1:126 ../scripts/debpkg.1:23 ../scripts/debrelease.1:137 ../scripts/deb-reversion.dbk:292 ../scripts/debrsign.1:71 ../scripts/debsign.1:147 ../scripts/debuild.1:421 ../scripts/desktop2menu.pl:52 ../scripts/dget.pl:628 ../scripts/diff2patches.1:40 ../scripts/dpkg-genbuilddeps.1:36 ../scripts/dscverify.1:76 ../scripts/getbuildlog.1:41 ../scripts/grep-excuses.1:40 ../scripts/licensecheck.pl:121 ../scripts/list-unreleased.1:21 ../scripts/manpage-alert.1:20 ../scripts/mass-bug.pl:521 ../scripts/mergechanges.1:18 ../scripts/mk-build-deps.pl:68 ../scripts/namecheck.pl:30 ../scripts/nmudiff.1:113 ../scripts/plotchangelog.1:126 ../scripts/pts-subscribe.1:56 ../scripts/rc-alert.1:125 ../scripts/rmadison.pl:305 ../scripts/svnpath.pl:97 ../scripts/transition-check.pl:81 ../scripts/uscan.1:540 ../scripts/uupdate.1:169 ../scripts/whodepends.1:19 ../scripts/who-uploads.1:71 ../scripts/wnpp-alert.1:31 ../scripts/wnpp-check.1:33 ../scripts/devscripts.conf.5:58 #, no-wrap msgid "AUTHOR" msgstr "" @@ -865,7 +865,7 @@ #: ../scripts/bts.pl:779 msgid "" "Display the page listing the requested bugs in a web browser using " -"L<sensible-browser(1)>." +"sensible-browser(1)." msgstr "" #. type: textblock @@ -2209,7 +2209,7 @@ msgstr "" #. type: SH -#: ../scripts/bts.pl:4018 ../scripts/checkbashisms.1:60 ../scripts/cowpoke.1:241 ../scripts/cvs-debc.1:58 ../scripts/cvs-debi.1:62 ../scripts/cvs-debrelease.1:64 ../scripts/cvs-debuild.1:53 ../scripts/dcmd.1:98 ../scripts/dcontrol.pl:290 ../scripts/debc.1:115 ../scripts/debchange.1:426 ../scripts/debcheckout.pl:180 ../scripts/debclean.1:107 ../scripts/debcommit.pl:786 ../scripts/debdiff.1:215 ../scripts/debi.1:122 ../scripts/debrelease.1:132 ../scripts/deb-reversion.dbk:247 ../scripts/debrsign.1:66 ../scripts/debsign.1:134 ../scripts/debsnap.1:118 ../scripts/debuild.1:408 ../scripts/dget.pl:636 ../scripts/diff2patches.1:37 ../scripts/dpkg-depcheck.1:118 ../scripts/dpkg-genbuilddeps.1:30 ../scripts/dscverify.1:71 ../scripts/grep-excuses.1:38 ../scripts/list-unreleased.1:19 ../scripts/nmudiff.1:108 ../scripts/plotchangelog.1:124 ../scripts/pts-subscribe.1:51 ../scripts/rc-alert.1:121 ../scripts/rmadison.pl:301 ../scripts/tagpending.pl:149 ../scripts/uscan.1:534 ../scripts/uupdate.1:162 ../scripts/wnpp-alert.1:29 ../scripts/wnpp-check.1:23 ../scripts/devscripts.conf.5:54 +#: ../scripts/bts.pl:4018 ../scripts/checkbashisms.1:60 ../scripts/cowpoke.1:241 ../scripts/cvs-debc.1:58 ../scripts/cvs-debi.1:62 ../scripts/cvs-debrelease.1:64 ../scripts/cvs-debuild.1:53 ../scripts/dcmd.1:98 ../scripts/dcontrol.pl:290 ../scripts/debc.1:115 ../scripts/debchange.1:426 ../scripts/debcheckout.pl:180 ../scripts/debclean.1:107 ../scripts/debcommit.pl:809 ../scripts/debdiff.1:215 ../scripts/debi.1:122 ../scripts/debrelease.1:132 ../scripts/deb-reversion.dbk:247 ../scripts/debrsign.1:66 ../scripts/debsign.1:134 ../scripts/debsnap.1:118 ../scripts/debuild.1:408 ../scripts/dget.pl:636 ../scripts/diff2patches.1:37 ../scripts/dpkg-depcheck.1:118 ../scripts/dpkg-genbuilddeps.1:30 ../scripts/dscverify.1:71 ../scripts/grep-excuses.1:38 ../scripts/list-unreleased.1:19 ../scripts/nmudiff.1:108 ../scripts/plotchangelog.1:124 ../scripts/pts-subscribe.1:51 ../scripts/rc-alert.1:121 ../scripts/rmadison.pl:301 ../scripts/tagpending.pl:149 ../scripts/uscan.1:534 ../scripts/uupdate.1:162 ../scripts/wnpp-alert.1:29 ../scripts/wnpp-check.1:23 ../scripts/devscripts.conf.5:54 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -4329,7 +4329,7 @@ "not, then it must match the full directory name. If I<regex> contains the " "string \\'PACKAGE', this will be replaced by the source package name, as " "determined from the changelog. The default value for the regex is: " -"\\'PACKAGE(-.*)?', thus matching directory names such as PACKAGE and " +"\\'PACKAGE(-.+)?', thus matching directory names such as PACKAGE and " "PACKAGE-version." msgstr "" @@ -4725,7 +4725,8 @@ #: ../scripts/debchange.1:209 msgid "" "This specifies the package name to be used in the new changelog; this may " -"only be used in conjunction with the B<--create> and B<--increment> options." +"only be used in conjunction with the B<--create>, B<--increment> and " +"B<--newversion> options." msgstr "" #. type: TP @@ -4937,7 +4938,7 @@ #. type: TP #: ../scripts/debchange.1:282 #, no-wrap -msgid "B<--no-preserve>" +msgid " B<--no-preserve>, B<--nopreserve>" msgstr "" #. type: Plain text @@ -5153,7 +5154,7 @@ #. type: Plain text #: ../scripts/debchange.1:394 msgid "" -"If this is set to I<no>, then it is the same as the B<--no-mainttrailer> " +"If this is set to I<no>, then it is the same as the B<--nomainttrailer> " "command line parameter being used." msgstr "" @@ -5715,8 +5716,8 @@ #. type: textblock #: ../scripts/debcommit.pl:33 msgid "" -"Note that svn/svk tagging conventions vary, so debcommit uses L<svnpath(1)> " -"to determine where the tag should be placed in the repository." +"Note that svn/svk tagging conventions vary, so debcommit uses svnpath(1) to " +"determine where the tag should be placed in the repository." msgstr "" #. type: =item @@ -5973,13 +5974,13 @@ msgstr "" #. type: textblock -#: ../scripts/debcommit.pl:784 ../scripts/mass-bug.pl:523 +#: ../scripts/debcommit.pl:807 ../scripts/mass-bug.pl:523 msgid "Joey Hess <joeyh@debian.org>" msgstr "" #. type: textblock -#: ../scripts/debcommit.pl:788 -msgid "L<svnpath(1)>." +#: ../scripts/debcommit.pl:811 +msgid "svnpath(1)." msgstr "" #. type: TH @@ -7326,7 +7327,7 @@ #: ../scripts/debsign.1:25 msgid "" "If a I<.commands> file is specified it is first validated (see the details " -"at I<ftp://ftp-master.debian.org/pub/UploadQueue/README>), and the name " +"at I<ftp://ftp.upload.debian.org/pub/UploadQueue/README>), and the name " "specified in the Uploader field is used for signing." msgstr "" @@ -10263,7 +10264,7 @@ #. type: textblock #: ../scripts/mk-build-deps.pl:32 -msgid "B<mk-build-deps> [-i|--install] <control file | package name> [...]" +msgid "B<mk-build-deps> [options] <control file | package name> [...]" msgstr "" #. type: textblock diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/devscripts-2.10.55/po4a/po/fr.po new/devscripts-2.10.58/po4a/po/fr.po --- old/devscripts-2.10.55/po4a/po/fr.po 2009-09-10 20:44:25.000000000 +0200 +++ new/devscripts-2.10.58/po4a/po/fr.po 2009-11-22 15:16:22.000000000 +0100 @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: devscripts\n" -"POT-Creation-Date: 2009-09-10 19:33+0200\n" +"POT-Creation-Date: 2009-11-21 22:58+0000\n" "PO-Revision-Date: 2009-09-06 15:06+0200\n" "Last-Translator: Nicolas François <nicolas.francois@centraliens.net>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -311,7 +311,7 @@ #: ../scripts/dcmd.1:101 ../scripts/dcontrol.pl:283 ../scripts/dd-list.1:93 #: ../scripts/debc.1:120 ../scripts/debchange.1:433 #: ../scripts/debcheckout.pl:185 ../scripts/debclean.1:111 -#: ../scripts/debcommit.pl:782 ../scripts/debdiff.1:222 ../scripts/debi.1:126 +#: ../scripts/debcommit.pl:805 ../scripts/debdiff.1:222 ../scripts/debi.1:126 #: ../scripts/debpkg.1:23 ../scripts/debrelease.1:137 #: ../scripts/deb-reversion.dbk:292 ../scripts/debrsign.1:71 #: ../scripts/debsign.1:147 ../scripts/debuild.1:421 @@ -1238,11 +1238,11 @@ #. type: textblock #: ../scripts/bts.pl:779 msgid "" -"Display the page listing the requested bugs in a web browser using " -"L<sensible-browser(1)>." +"Display the page listing the requested bugs in a web browser using sensible-" +"browser(1)." msgstr "" "Afficher la page référençant les bogues demandés dans un navigateur web en " -"utilisant L<sensible-browser>(1)." +"utilisant sensible-browser(1)." #. type: textblock #: ../scripts/bts.pl:782 @@ -2910,7 +2910,7 @@ #: ../scripts/cvs-debrelease.1:64 ../scripts/cvs-debuild.1:53 #: ../scripts/dcmd.1:98 ../scripts/dcontrol.pl:290 ../scripts/debc.1:115 #: ../scripts/debchange.1:426 ../scripts/debcheckout.pl:180 -#: ../scripts/debclean.1:107 ../scripts/debcommit.pl:786 +#: ../scripts/debclean.1:107 ../scripts/debcommit.pl:809 #: ../scripts/debdiff.1:215 ../scripts/debi.1:122 ../scripts/debrelease.1:132 #: ../scripts/deb-reversion.dbk:247 ../scripts/debrsign.1:66 #: ../scripts/debsign.1:134 ../scripts/debsnap.1:118 ../scripts/debuild.1:408 @@ -5618,7 +5618,7 @@ "contains a '/', then it must match the full directory path. If not, then it " "must match the full directory name. If I<regex> contains the string " "\\'PACKAGE', this will be replaced by the source package name, as determined " -"from the changelog. The default value for the regex is: \\'PACKAGE(-.*)?', " +"from the changelog. The default value for the regex is: \\'PACKAGE(-.+)?', " "thus matching directory names such as PACKAGE and PACKAGE-version." msgstr "" "Le nom du répertoire est vérifié en testant si le nom du répertoire courant " @@ -5629,7 +5629,7 @@ "fin. Si elle contient un « / », alors elle doit correspondre au chemin " "complet. Si elle contient la chaîne « PACKAGE », cette chaîne sera remplacée " "par le nom du paquet source déterminé par le fichier changelog. La valeur " -"par défaut de cette expression rationnelle est « PACKAGE(-.*)? », ce qui " +"par défaut de cette expression rationnelle est « PACKAGE(-.+)? », ce qui " "correspond aux répertoires nommés PACKAGE ou PACKAGE-version." #. type: TP @@ -6217,11 +6217,12 @@ #: ../scripts/debchange.1:209 msgid "" "This specifies the package name to be used in the new changelog; this may " -"only be used in conjunction with the B<--create> and B<--increment> options." +"only be used in conjunction with the B<--create>, B<--increment> and B<--" +"newversion> options." msgstr "" "Spécifie le nom du paquet qui devra être utilisé dans le nouveau journal des " "modifications ; doit être utilisé seulement en conjonction avec les options " -"B<--create> et B<--increment>." +"B<--create>, B<--increment>, et B<--newversion>." #. type: TP #: ../scripts/debchange.1:209 @@ -6482,8 +6483,8 @@ #. type: TP #: ../scripts/debchange.1:282 #, no-wrap -msgid "B<--no-preserve>" -msgstr "B<--no-preserve>" +msgid " B<--no-preserve>, B<--nopreserve>" +msgstr "B<--no-preserve>, B<--nopreserve>" #. type: Plain text #: ../scripts/debchange.1:285 @@ -6759,11 +6760,11 @@ #. type: Plain text #: ../scripts/debchange.1:394 msgid "" -"If this is set to I<no>, then it is the same as the B<--no-mainttrailer> " +"If this is set to I<no>, then it is the same as the B<--nomainttrailer> " "command line parameter being used." msgstr "" -"Si elle est positionnée à I<no>, alors c'est comme si l'option B<--no-" -"mainttrailer> était utilisée." +"Si elle est positionnée à I<no>, alors c'est comme si l'option B<--" +"nomainttrailer> était utilisée." #. type: TP #: ../scripts/debchange.1:394 @@ -7488,11 +7489,11 @@ #. type: textblock #: ../scripts/debcommit.pl:33 msgid "" -"Note that svn/svk tagging conventions vary, so debcommit uses L<svnpath(1)> " -"to determine where the tag should be placed in the repository." +"Note that svn/svk tagging conventions vary, so debcommit uses svnpath(1) to " +"determine where the tag should be placed in the repository." msgstr "" "Veuillez noter que les conventions de nommage des tags varient pour svn et " -"svk, donc debcommit utilise L<svnpath(1)> pour déterminer où le tag doit " +"svk, donc debcommit utilise svnpath(1) pour déterminer où le tag doit " "être placé dans le dépôt." #. type: =item @@ -7808,14 +7809,14 @@ "pour associer la résision aux bogues." #. type: textblock -#: ../scripts/debcommit.pl:784 ../scripts/mass-bug.pl:523 +#: ../scripts/debcommit.pl:807 ../scripts/mass-bug.pl:523 msgid "Joey Hess <joeyh@debian.org>" msgstr "Joey Hess <joeyh@debian.org>" #. type: textblock -#: ../scripts/debcommit.pl:788 -msgid "L<svnpath(1)>." -msgstr "L<svnpath(1)>." +#: ../scripts/debcommit.pl:811 +msgid "svnpath(1)." +msgstr "svnpath(1)." #. type: TH #: ../scripts/debdiff.1:1 @@ -9536,11 +9537,11 @@ #: ../scripts/debsign.1:25 msgid "" "If a I<.commands> file is specified it is first validated (see the details " -"at I<ftp://ftp-master.debian.org/pub/UploadQueue/README>), and the name " +"at I<ftp://ftp.upload.debian.org/pub/UploadQueue/README>), and the name " "specified in the Uploader field is used for signing." msgstr "" "Si un fichier I<.commands> est indiqué, il est validé en premier (voir les " -"détails I<ftp://ftp-master.debian.org/pub/UploadQueue/README>) ; et le nom " +"détails I<ftp://ftp.upload.debian.org/pub/UploadQueue/README>) ; et le nom " "indiqué dans le champ Uploader est utilisé pour la signature." # NOTE: presque identique à une autre chaîne @@ -13222,8 +13223,8 @@ #. type: textblock #: ../scripts/mk-build-deps.pl:32 -msgid "B<mk-build-deps> [-i|--install] <control file | package name> [...]" -msgstr "B<mk-build-deps> [-i|--install] <fichier control | nom paquet> [...]" +msgid "B<mk-build-deps> [options] <control file | package name> [...]" +msgstr "B<mk-build-deps> [options] <fichier control | nom paquet> [...]" #. type: textblock #: ../scripts/mk-build-deps.pl:36 @@ -17590,6 +17591,16 @@ "Cette page de manuel a été écrite pour le paquet B<devscripts> par le " "responsable du paquet, Julian Gilbey E<lt>jdg@debian.orgE<gt>." +#~ msgid "B<--no-preserve>, B<--nopreserve>" +#~ msgstr "B<--no-preserve>, B<--nopreserve>" + +#~ msgid "B<--no-preserve>" +#~ msgstr "B<--no-preserve>" + +#~ msgid "B<mk-build-deps> [-i|--install] <control file | package name> [...]" +#~ msgstr "" +#~ "B<mk-build-deps> [-i|--install] <fichier control | nom paquet> [...]" + #~ msgid "" #~ "When B<cowpoke> is run the following configuration options are read from " #~ "global, per-user, and per-project configuration files if present:" @@ -18003,9 +18014,6 @@ #~ "ignore=regex>] [B<-c|--check=regex>] [B<-r|--recursive>] I<liste de " #~ "fichiers ou répertoires à vérifier>" -#~ msgid "B<mk-build-deps> <control file | package name> [...]" -#~ msgstr "B<mk-build-deps> <fichier control | nom paquet> [...]" - #~ msgid "" #~ "If using the sendmail (B<--no-mutt>) option, then the email to the BTS " #~ "will be sent using the name and address in the environment variable " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/devscripts-2.10.55/README new/devscripts-2.10.58/README --- old/devscripts-2.10.55/README 2009-08-30 09:43:11.000000000 +0200 +++ new/devscripts-2.10.58/README 2009-11-22 15:16:22.000000000 +0100 @@ -160,7 +160,7 @@ - getbuildlog: Download package build logs from Debian auto-builders. [wget] - grep-excuses: grep the update_excuses.html file to find out what is - happening to your packages. [libterm-size-perl, wget] + happening to your packages. [libterm-size-perl, wget, w3m] - licensecheck: given a list of source files, attempt to determine which license (or combination of licenses) each file is placed under. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/devscripts-2.10.55/README.newscripts new/devscripts-2.10.58/README.newscripts --- old/devscripts-2.10.55/README.newscripts 2009-01-21 22:27:18.000000000 +0100 +++ new/devscripts-2.10.58/README.newscripts 2009-11-22 15:16:22.000000000 +0100 @@ -17,4 +17,4 @@ permissions are correct in a copy of the repository 9. Add a changelog entry -last modified: $Id: README.newscripts 1805 2009-01-21 21:27:18Z adsb $ +last modified: $Id$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/devscripts-2.10.55/scripts/bts.pl new/devscripts-2.10.58/scripts/bts.pl --- old/devscripts-2.10.55/scripts/bts.pl 2009-09-10 19:44:11.000000000 +0200 +++ new/devscripts-2.10.58/scripts/bts.pl 2009-11-22 15:16:22.000000000 +0100 @@ -777,7 +777,7 @@ =item bugs [release-critical | release-critical/... | RC] Display the page listing the requested bugs in a web browser using -L<sensible-browser(1)>. +sensible-browser(1). Options may be specified after the "bugs" command in addition to or instead of options at the start of the command line: recognised diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/devscripts-2.10.55/scripts/debc.1 new/devscripts-2.10.58/scripts/debc.1 --- old/devscripts-2.10.55/scripts/debc.1 2008-03-15 20:43:38.000000000 +0100 +++ new/devscripts-2.10.58/scripts/debc.1 2009-11-22 15:16:22.000000000 +0100 @@ -59,7 +59,7 @@ match the full directory name. If \fIregex\fR contains the string \'PACKAGE', this will be replaced by the source package name, as determined from the changelog. The default value for the regex is: -\'PACKAGE(-.*)?', thus matching directory names such as PACKAGE and +\'PACKAGE(-.+)?', thus matching directory names such as PACKAGE and PACKAGE-version. .SH OPTIONS .TP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/devscripts-2.10.55/scripts/debchange.1 new/devscripts-2.10.58/scripts/debchange.1 --- old/devscripts-2.10.55/scripts/debchange.1 2009-08-30 06:36:28.000000000 +0200 +++ new/devscripts-2.10.58/scripts/debchange.1 2009-11-22 15:16:22.000000000 +0100 @@ -137,7 +137,7 @@ match the full directory name. If \fIregex\fR contains the string \'PACKAGE', this will be replaced by the source package name, as determined from the changelog. The default value for the regex is: -\'PACKAGE(-.*)?', thus matching directory names such as PACKAGE and +\'PACKAGE(-.+)?', thus matching directory names such as PACKAGE and PACKAGE-version. .PP The default changelog to be edited is \fIdebian/changelog\fR; however, @@ -204,8 +204,8 @@ .TP \fB\-\-package\fR \fIpackage\fR This specifies the package name to be used in the new changelog; this -may only be used in conjunction with the \fB\-\-create\fR and -\fB\-\-increment\fR options. +may only be used in conjunction with the \fB\-\-create\fR, \fB\-\-increment\fR and +\fB\-\-newversion\fR options. .TP .BR \-\-nmu ", " \-n Increment the Debian release number for a non-maintainer upload by @@ -280,7 +280,7 @@ (or the version number of a Debian native package) changes. See also the configuration variables section below. .TP -.B \-\-no\-preserve +\fB \-\-no\-preserve\fR, \fB\-\-nopreserve\fR Do not preserve the source tree directory name (default). .TP \fB\-\-distribution \fIdist\fR, \fB\-D \fIdist\fR @@ -390,7 +390,7 @@ .TP .BR DEBCHANGE_MAINTTRAILER If this is set to \fIno\fR, then it is the same as the -\fB\-\-no\-mainttrailer\fR command line parameter being used. +\fB\-\-nomainttrailer\fR command line parameter being used. .TP .BR DEBCHANGE_TZ Use this timezone for changelog entries. Default is the user/system diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/devscripts-2.10.55/scripts/debchange.pl new/devscripts-2.10.58/scripts/debchange.pl --- old/devscripts-2.10.55/scripts/debchange.pl 2009-09-05 06:20:28.000000000 +0200 +++ new/devscripts-2.10.58/scripts/debchange.pl 2009-11-22 15:16:22.000000000 +0100 @@ -170,7 +170,7 @@ What constitutes a matching directory name; REGEX is a Perl regular expression; the string \`PACKAGE\' will be replaced by the package name; see manpage for details - (default: 'PACKAGE(-.*)?') + (default: 'PACKAGE(-.+)?') --no-conf, --noconf Don\'t read devscripts config files; must be the first option given --release-heuristic log|changelog @@ -203,7 +203,7 @@ # Start by setting default values my $check_dirname_level = 1; -my $check_dirname_regex = 'PACKAGE(-.*)?'; +my $check_dirname_regex = 'PACKAGE(-.+)?'; my $opt_p = 0; my $opt_query = 1; my $opt_release_heuristic = 'log'; @@ -227,7 +227,7 @@ 'DEBCHANGE_PRESERVE' => 'no', 'DEBCHANGE_QUERY_BTS' => 'yes', 'DEVSCRIPTS_CHECK_DIRNAME_LEVEL' => 1, - 'DEVSCRIPTS_CHECK_DIRNAME_REGEX' => 'PACKAGE(-.*)?', + 'DEVSCRIPTS_CHECK_DIRNAME_REGEX' => 'PACKAGE(-.+)?', 'DEBCHANGE_RELEASE_HEURISTIC' => 'log', 'DEBCHANGE_MULTIMAINT' => 'yes', 'DEBCHANGE_TZ' => $ENV{TZ}, # undef if TZ unset @@ -406,8 +406,8 @@ $warnings++ if not $opt_force_dist; } } elsif ($distributor eq 'Ubuntu') { - unless ($opt_D =~ /^((dapper|gutsy|hardy|intrepid|jaunty|karmic)(-updates|-security|-proposed|-backports)?|UNRELEASED)$/) { - warn "$progname warning: Recognised distributions are:\n{dapper,gutsy,hardy,intrepid,jaunty,karmic}{,-updates,-security,-proposed,-backports} and UNRELEASED.\nUsing your request anyway.\n"; + unless ($opt_D =~ /^((dapper|hardy|intrepid|jaunty|karmic|lucid)(-updates|-security|-proposed|-backports)?|UNRELEASED)$/) { + warn "$progname warning: Recognised distributions are:\n{dapper,hardy,intrepid,jaunty,karmic,lucid}{,-updates,-security,-proposed,-backports} and UNRELEASED.\nUsing your request anyway.\n"; $warnings++ if not $opt_force_dist; } } else { @@ -419,8 +419,8 @@ if $opt_news && @closes; # hm, this can probably be used with more than just -i. -fatal "--package can only be used with --create and --increment" - if $opt_package && ! ($opt_create || $opt_i); +fatal "--package can only be used with --create, --increment and --newversion" + if $opt_package && ! ($opt_create || $opt_i || $opt_v); my $changelog_path = $opt_c || $ENV{'CHANGELOG'} || 'debian/changelog'; my $real_changelog_path = $changelog_path; @@ -1173,7 +1173,7 @@ } } elsif (/ \* Upload to ([^ ]+).*$/) { - ($dist_indicator = $1) =~ s/[,;]$//; + ($dist_indicator = $1) =~ s/[!:.,;]$//; chomp $dist_indicator; } elsif (/^ --\s+([^<]+)\s+/) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/devscripts-2.10.55/scripts/debcheckout.pl new/devscripts-2.10.58/scripts/debcheckout.pl --- old/devscripts-2.10.55/scripts/debcheckout.pl 2009-08-30 06:39:55.000000000 +0200 +++ new/devscripts-2.10.58/scripts/debcheckout.pl 2009-11-22 15:16:22.000000000 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/perl -w # # debcheckout: checkout the development repository of a Debian package -# Copyright (C) 2007-2008 Stefano Zacchiroli <zack@debian.org> +# Copyright (C) 2007-2009 Stefano Zacchiroli <zack@debian.org> # # 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 @@ # # Created: Tue, 14 Aug 2007 10:20:55 +0200 -# Last-Modified: $Date: 2009-08-30 05:39:55 +0100 (Sun, 30 Aug 2009) $ +# Last-Modified: $Date$ =head1 NAME @@ -914,6 +914,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 '*') { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/devscripts-2.10.55/scripts/debclean.1 new/devscripts-2.10.58/scripts/debclean.1 --- old/devscripts-2.10.55/scripts/debclean.1 2007-04-01 20:26:18.000000000 +0200 +++ new/devscripts-2.10.58/scripts/debclean.1 2009-11-22 15:16:22.000000000 +0100 @@ -55,7 +55,7 @@ match the full directory name. If \fIregex\fR contains the string \'PACKAGE', this will be replaced by the source package name, as determined from the changelog. The default value for the regex is: -\'PACKAGE(-.*)?', thus matching directory names such as PACKAGE and +\'PACKAGE(-.+)?', thus matching directory names such as PACKAGE and PACKAGE-version. .SH OPTIONS .TP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/devscripts-2.10.55/scripts/debclean.sh new/devscripts-2.10.58/scripts/debclean.sh --- old/devscripts-2.10.55/scripts/debclean.sh 2007-04-01 20:26:18.000000000 +0200 +++ new/devscripts-2.10.58/scripts/debclean.sh 2009-11-22 15:16:22.000000000 +0100 @@ -24,7 +24,7 @@ What constitutes a matching directory name; REGEX is a Perl regular expression; the string \`PACKAGE' will be replaced by the package name; see manpage for details - (default: 'PACKAGE(-.*)?') + (default: 'PACKAGE(-.+)?') --no-conf, --noconf Do not read devscripts config files; @@ -52,7 +52,7 @@ # Boilerplate: set config variables DEFAULT_DEBCLEAN_CLEANDEBS=no DEFAULT_DEVSCRIPTS_CHECK_DIRNAME_LEVEL=1 -DEFAULT_DEVSCRIPTS_CHECK_DIRNAME_REGEX='PACKAGE(-.*)?' +DEFAULT_DEVSCRIPTS_CHECK_DIRNAME_REGEX='PACKAGE(-.+)?' VARS="DEBCLEAN_CLEANDEBS DEVSCRIPTS_CHECK_DIRNAME_LEVEL DEVSCRIPTS_CHECK_DIRNAME_REGEX" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/devscripts-2.10.55/scripts/debcommit.pl new/devscripts-2.10.58/scripts/debcommit.pl --- old/devscripts-2.10.55/scripts/debcommit.pl 2009-07-16 22:42:43.000000000 +0200 +++ new/devscripts-2.10.58/scripts/debcommit.pl 2009-11-22 15:16:22.000000000 +0100 @@ -31,7 +31,7 @@ debian/changelog, and is used to tag the package in the repository. Note that svn/svk tagging conventions vary, so debcommit uses -L<svnpath(1)> to determine where the tag should be placed in the +svnpath(1) to determine where the tag should be placed in the repository. =item B<-R> B<--release-use-changelog> @@ -334,15 +334,28 @@ $message=getmessage() if ! defined $message and (not $release or $release_use_changelog); if ($release) { - open (C, "<$changelog" ) || die "debcommit: cannot read $changelog: $!"; - my $top=<C>; - if ($top=~/UNRELEASED/) { - die "debcommit: $changelog says it's UNRELEASED\nTry running dch --release first\n"; + eval { + require Dpkg::Changelog::Parse; + }; + if (not $@) { + # dpkg >= 1.15.5.2 + my $log = Dpkg::Changelog::Parse::changelog_parse(file => $changelog); + if ($log->{Distribution} =~ /UNRELEASED/) { + die "debcommit: $changelog says it's UNRELEASED\nTry running dch --release first\n"; + } + $version = $log->{Version}; + } + else { + open (C, "<$changelog" ) || die "debcommit: cannot read $changelog: $!"; + my $top=<C>; + if ($top=~/UNRELEASED/) { + die "debcommit: $changelog says it's UNRELEASED\nTry running dch --release first\n"; + } + close C; + + $version=`dpkg-parsechangelog | grep '^Version:' | cut -f 2 -d ' '`; + chomp $version; } - close C; - - $version=`dpkg-parsechangelog | grep '^Version:' | cut -f 2 -d ' '`; - chomp $version; $message="releasing version $version" if ! defined $message; } @@ -437,7 +450,17 @@ sub bzr_find_fixes { my $message=shift; - my $debian_closes = Dpkg::Changelog::find_closes($message); + my $debian_closes = []; + eval { + require Dpkg::Changelog::Entry::Debian; + }; + if (not $@) { + # dpkg >= 1.15.5.2 + push(@$debian_closes, + Dpkg::Changelog::Entry::Debian::find_closes($message)); + } else { + $debian_closes = Dpkg::Changelog::find_closes($message); + } my $launchpad_closes = []; eval { require Dpkg::Vendor::Ubuntu; @@ -785,6 +808,6 @@ =head1 SEE ALSO -L<svnpath(1)>. +svnpath(1). =cut diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/devscripts-2.10.55/scripts/debi.1 new/devscripts-2.10.58/scripts/debi.1 --- old/devscripts-2.10.55/scripts/debi.1 2008-11-24 20:51:47.000000000 +0100 +++ new/devscripts-2.10.58/scripts/debi.1 2009-11-22 15:16:22.000000000 +0100 @@ -60,7 +60,7 @@ match the full directory name. If \fIregex\fR contains the string \'PACKAGE', this will be replaced by the source package name, as determined from the changelog. The default value for the regex is: -\'PACKAGE(-.*)?', thus matching directory names such as PACKAGE and +\'PACKAGE(-.+)?', thus matching directory names such as PACKAGE and PACKAGE-version. .SH OPTIONS .TP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/devscripts-2.10.55/scripts/debi.pl new/devscripts-2.10.58/scripts/debi.pl --- old/devscripts-2.10.55/scripts/debi.pl 2009-07-21 11:36:47.000000000 +0200 +++ new/devscripts-2.10.58/scripts/debi.pl 2009-11-22 15:16:22.000000000 +0100 @@ -61,7 +61,7 @@ What constitutes a matching directory name; REGEX is a Perl regular expression; the string \`PACKAGE\' will be replaced by the package name; see manpage for details - (default: 'PACKAGE(-.*)?') + (default: 'PACKAGE(-.+)?') --with-depends Install packages with their depends. --tool TOOL Use the specified tool for installing the dependencies of the package(s) to be installed. @@ -97,7 +97,7 @@ What constitutes a matching directory name; REGEX is a Perl regular expression; the string \`PACKAGE\' will be replaced by the package name; see manpage for details - (default: 'PACKAGE(-.*)?') + (default: 'PACKAGE(-.+)?') --help Show this message --version Show version and copyright information @@ -124,7 +124,7 @@ my $debsdir = '..'; my $debsdir_warning; my $check_dirname_level = 1; -my $check_dirname_regex = 'PACKAGE(-.*)?'; +my $check_dirname_regex = 'PACKAGE(-.+)?'; my $install_tool = 'apt-get'; # Next, read configuration files and then command line @@ -138,7 +138,7 @@ my %config_vars = ( 'DEBRELEASE_DEBS_DIR' => '..', 'DEVSCRIPTS_CHECK_DIRNAME_LEVEL' => 1, - 'DEVSCRIPTS_CHECK_DIRNAME_REGEX' => 'PACKAGE(-.*)?', + 'DEVSCRIPTS_CHECK_DIRNAME_REGEX' => 'PACKAGE(-.+)?', ); my %config_default = %config_vars; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/devscripts-2.10.55/scripts/debrelease.1 new/devscripts-2.10.58/scripts/debrelease.1 --- old/devscripts-2.10.55/scripts/debrelease.1 2007-02-23 11:31:10.000000000 +0100 +++ new/devscripts-2.10.58/scripts/debrelease.1 2009-11-22 15:16:22.000000000 +0100 @@ -51,7 +51,7 @@ match the full directory name. If \fIregex\fR contains the string \'PACKAGE', this will be replaced by the source package name, as determined from the changelog. The default value for the regex is: -\'PACKAGE(-.*)?', thus matching directory names such as PACKAGE and +\'PACKAGE(-.+)?', thus matching directory names such as PACKAGE and PACKAGE-version. .SH OPTIONS .TP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/devscripts-2.10.55/scripts/debrelease.sh new/devscripts-2.10.58/scripts/debrelease.sh --- old/devscripts-2.10.55/scripts/debrelease.sh 2007-02-23 11:31:10.000000000 +0100 +++ new/devscripts-2.10.58/scripts/debrelease.sh 2009-11-22 15:16:22.000000000 +0100 @@ -49,7 +49,7 @@ What constitutes a matching directory name; REGEX is a Perl regular expression; the string \`PACKAGE' will be replaced by the package name; see manpage for details - (default: 'PACKAGE(-.*)?') + (default: 'PACKAGE(-.+)?') --no-conf, --noconf Don't read devscripts config files; must be the first option given @@ -84,7 +84,7 @@ DEFAULT_DEBRELEASE_UPLOADER=dupload DEFAULT_DEBRELEASE_DEBS_DIR=.. DEFAULT_DEVSCRIPTS_CHECK_DIRNAME_LEVEL=1 -DEFAULT_DEVSCRIPTS_CHECK_DIRNAME_REGEX='PACKAGE(-.*)?' +DEFAULT_DEVSCRIPTS_CHECK_DIRNAME_REGEX='PACKAGE(-.+)?' VARS="DEBRELEASE_UPLOADER DEBRELEASE_DEBS_DIR DEVSCRIPTS_CHECK_DIRNAME_LEVEL DEVSCRIPTS_CHECK_DIRNAME_REGEX" if [ "$1" = "--no-conf" -o "$1" = "--noconf" ]; then @@ -167,20 +167,14 @@ --multi) multiarch=yes ;; --dupload) DEBRELEASE_UPLOADER=dupload ;; --dput) DEBRELEASE_UPLOADER=dput ;; + # Delay checking of debsdir until we need it. We need to make sure we're + # in the package root directory first. --debs-dir=*) - debsdir="`echo \"$1\" | sed -e 's/^--debs-dir=//; s%/\+%/%g; s%\(.\)/$%\1%;'`" - if ! [ -d "$debsdir" ]; then - echo "$PROGNAME: directory $debsdir does not exist!" >&2 - exit 1 - fi + opt_debsdir="`echo \"$1\" | sed -e 's/^--debs-dir=//; s%/\+%/%g; s%\(.\)/$%\1%;'`" ;; --debs-dir) shift - debsdir="`echo \"$1\" | sed -e 's%/\+%/%g; s%\(.\)/$%\1%;'`" - if ! [ -d "$debsdir" ]; then - echo "$PROGNAME: directory $debsdir does not exist!" >&2 - exit 1 - fi + opt_debsdir="`echo \"$1\" | sed -e 's%/\+%/%g; s%\(.\)/$%\1%;'`" ;; --check-dirname-level=*) level="`echo \"$1\" | sed -e 's/^--check-dirname-level=//'`" @@ -231,17 +225,6 @@ shift done -# check sanity of debdir -if ! [ -d "$debsdir" ]; then - if [ -n "$debsdir_warning" ]; then - echo "$PROGNAME: $debsdir_warning" >&2 - exit 1 - else - echo "$PROGNAME: could not find directory $debsdir!" >&2 - exit 1 - fi -fi - # Look for .changes file via debian/changelog CHDIR= until [ -f debian/changelog ]; do @@ -254,6 +237,26 @@ fi done +# Use svn-buildpackage's directory if there is one and debsdir wasn't already +# specified on the command-line. This can override DEBRELEASE_DEBS_DIR. +if [ -e ".svn/deb-layout" ]; then + buildArea="$(sed -ne '/^buildArea=/{s/^buildArea=//; s%/\+%/%g; s%\(.\)/$%\1%; p; q}' .svn/deb-layout)" + if [ -n "$buildArea" -a -d "$buildArea" -a -z "$opt_debsdir" ]; then + debsdir="$buildArea" + fi +fi + +# check sanity of debdir +if ! [ -d "$debsdir" ]; then + if [ -n "$debsdir_warning" ]; then + echo "$PROGNAME: $debsdir_warning" >&2 + exit 1 + else + echo "$PROGNAME: could not find directory $debsdir!" >&2 + exit 1 + fi +fi + mustsetvar package "`dpkg-parsechangelog | sed -n 's/^Source: //p'`" \ "source package" mustsetvar version "`dpkg-parsechangelog | sed -n 's/^Version: //p'`" \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/devscripts-2.10.55/scripts/debsign.1 new/devscripts-2.10.58/scripts/debsign.1 --- old/devscripts-2.10.55/scripts/debsign.1 2008-11-18 21:42:19.000000000 +0100 +++ new/devscripts-2.10.58/scripts/debsign.1 2009-11-22 15:16:22.000000000 +0100 @@ -20,7 +20,7 @@ directory. .PP If a \fI.commands\fR file is specified it is first validated (see the -details at \fIftp://ftp-master.debian.org/pub/UploadQueue/README\fR), +details at \fIftp://ftp.upload.debian.org/pub/UploadQueue/README\fR), and the name specified in the Uploader field is used for signing. .PP This utility is useful if a developer must build a package on one diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/devscripts-2.10.55/scripts/debsign.sh new/devscripts-2.10.58/scripts/debsign.sh --- old/devscripts-2.10.55/scripts/debsign.sh 2009-04-30 23:51:14.000000000 +0200 +++ new/devscripts-2.10.58/scripts/debsign.sh 2009-11-22 15:16:22.000000000 +0100 @@ -570,7 +570,7 @@ } # simple validator for .commands files, see - # ftp://ftp-master.debian.org/pub/UploadQueue/README + # ftp://ftp.upload.debian.org/pub/UploadQueue/README perl -ne 'BEGIN { $uploader = 0; $incommands = 0; } END { exit $? if $?; if ($uploader && $incommands) { exit 0; } @@ -598,7 +598,7 @@ if (/./) { die ".commands file: extra stuff after Commands field!\n"; } }' $commands || { echo "$PROGNAME: .commands file appears to be invalid. see: -ftp://ftp-master.debian.org/pub/UploadQueue/README +ftp://ftp.upload.debian.org/pub/UploadQueue/README for valid format" >&2; exit 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/devscripts-2.10.55/scripts/debuild.1 new/devscripts-2.10.58/scripts/debuild.1 --- old/devscripts-2.10.55/scripts/debuild.1 2008-04-16 09:39:33.000000000 +0200 +++ new/devscripts-2.10.58/scripts/debuild.1 2009-11-22 15:16:22.000000000 +0100 @@ -81,7 +81,7 @@ match the full directory name. If \fIregex\fR contains the string \'PACKAGE', this will be replaced by the source package name, as determined from the changelog. The default value for the regex is: -\'PACKAGE(-.*)?', thus matching directory names such as PACKAGE and +\'PACKAGE(-.+)?', thus matching directory names such as PACKAGE and PACKAGE-version. .SH ENVIRONMENT VARIABLES As environment variables can affect the building of a package, often diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/devscripts-2.10.55/scripts/debuild.pl new/devscripts-2.10.58/scripts/debuild.pl --- old/devscripts-2.10.55/scripts/debuild.pl 2009-05-05 20:04:25.000000000 +0200 +++ new/devscripts-2.10.58/scripts/debuild.pl 2009-11-22 15:16:22.000000000 +0100 @@ -102,7 +102,7 @@ What constitutes a matching directory name; REGEX is a Perl regular expression; the string \`PACKAGE\' will be replaced by the package name; see manpage for details - (default: 'PACKAGE(-.*)?') + (default: 'PACKAGE(-.+)?') --help, -h display this message @@ -179,7 +179,7 @@ my @lintian_opts=(); my $checkbuilddep=1; my $check_dirname_level = 1; -my $check_dirname_regex = 'PACKAGE(-.*)?'; +my $check_dirname_regex = 'PACKAGE(-.+)?'; my $logging=0; my $tgz_check=1; my $prepend_path=''; @@ -254,7 +254,7 @@ 'DEBUILD_POST_DPKG_BUILDPACKAGE_HOOK' => '', 'DEBUILD_SIGNING_USERNAME' => '', 'DEVSCRIPTS_CHECK_DIRNAME_LEVEL' => 1, - 'DEVSCRIPTS_CHECK_DIRNAME_REGEX' => 'PACKAGE(-.*)?', + 'DEVSCRIPTS_CHECK_DIRNAME_REGEX' => 'PACKAGE(-.+)?', ); my %config_default = %config_vars; my $dpkg_opts_var = 'DEBUILD_DPKG_BUILDPACKAGE_OPTS'; @@ -786,6 +786,8 @@ my $targetarch=''; my $targetgnusystem=''; my $changedby=''; + my $compression=''; + my $comp_level=''; # and one for us my @debsign_opts = (); @@ -811,6 +813,8 @@ /^-s[iad]$/ and $sourcestyle=$_, push(@dpkg_opts, $_), next; /^-i/ and $diffignore=$_, push(@dpkg_opts, $_), next; /^-I/ and push(@tarignore, $_), push(@dpkg_opts, $_), next; + /^-Z/ and $compression=$_, push(@dpkg_opts, $_), next; + /^-z/ and $comp_level=$_, push(@dpkg_opts, $_), next; $_ eq '-tc' and $cleansource=1, push(@dpkg_opts, $_), next; /^-t(.*)/ and $targetgnusystem=$1, push(@dpkg_opts, $_), next; # Ditto $_ eq '-nc' and $noclean=1, $binaryonly ||= '-b', push(@dpkg_opts, $_), @@ -859,6 +863,8 @@ /^-s[iad]$/ and $sourcestyle=$_, push(@dpkg_opts, $_), next; /^-i/ and $diffignore=$_, push(@dpkg_opts, $_), next; /^-I/ and push(@tarignore, $_), push(@dpkg_opts, $_), next; + /^-Z/ and $compression=$_, push(@dpkg_opts, $_), next; + /^-z/ and $comp_level=$_, push(@dpkg_opts, $_), next; $_ eq '-tc' and $cleansource=1, push(@dpkg_opts, $_), next; /^-t(.*)/ and $targetgnusystem=$1, $checkbuilddep=0, next; $_ eq '-nc' and $noclean=1, $binaryonly ||= '-b', push(@dpkg_opts, $_), @@ -1077,15 +1083,13 @@ system('dpkg-checkbuilddeps'); } if ($?>>8) { - # Horrible non-Perlish formatting here, but emacs formatting - # dies miserably if this paragraph is done as a here-document. - # And even the documented hack doesn't work here :( - fatal "You do not appear to have all build dependencies properly met, aborting.\n" . - "(Use -d flag to override.)\n" . - "If you have the pbuilder package installed you can run\n" . - "/usr/lib/pbuilder/pbuilder-satisfydepends as root to install the\n" . - "required packages, or you can do it manually using dpkg or apt using\n" . - "the error messages just above this message.\n"; + fatal <<"EOT"; +You do not appear to have all build dependencies properly met, aborting. +(Use -d flag to override.) +You can use mk-build-deps to generate a dummy package which Depends on all the +required packages, or you can install them manually using dpkg or apt using +the error messages just above this message. +EOT } } @@ -1108,10 +1112,12 @@ my @cmd = (qw(dpkg-source)); push @cmd, @passopts; push @cmd, $diffignore if $diffignore; + push @cmd, $compression if $compression; + push @cmd, $comp_level if $comp_level; push @cmd, @tarignore; push @cmd, "-b", $dirn; chdir '..' or fatal "can't chdir ..: $!"; - system_withecho(@cmd); + system_withecho(@cmd); chdir $dirn or fatal "can't chdir $dirn: $!"; } @@ -1215,7 +1221,7 @@ } # end of debuild dpkg-buildpackage emulation run_hook('lintian', $run_lintian && $lintian_exists); - + if ($run_lintian && $lintian_exists) { $<=$>=$uid; # Give up on root privileges if we can $(=$)=$gid; @@ -1288,10 +1294,10 @@ if ($?>>8) { fatal <<"EOT"; You do not appear to have all build dependencies properly met. -If you have the pbuilder package installed, you can run -/usr/lib/pbuilder/pbuilder-satisfydepends as root to install the -required packages, or you can do it manually using dpkg or apt using -the error messages just above this message. +You can use mk-build-deps to generate a dummy package which +Depends on all the required packages, or you can install them +manually using dpkg or apt using the error messages just above +this message. EOT } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/devscripts-2.10.55/scripts/grep-excuses.pl new/devscripts-2.10.58/scripts/grep-excuses.pl --- old/devscripts-2.10.55/scripts/grep-excuses.pl 2009-08-03 22:06:12.000000000 +0200 +++ new/devscripts-2.10.58/scripts/grep-excuses.pl 2009-11-22 15:16:22.000000000 +0100 @@ -88,6 +88,10 @@ my $columns = Term::Size::chars(); +if (system("command -v w3m >/dev/null 2>&1") != 0) { + die "$progname: wipnity mode requires the w3m package to be installed\n"; +} + while( my $package=shift ) { my $dump = `w3m -dump -cols $columns "http://release.debian.org/migration/testing.pl?package=$package"`; $dump =~ s/^.*?(?=Checking)//s; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/devscripts-2.10.55/scripts/mergechanges.sh new/devscripts-2.10.58/scripts/mergechanges.sh --- old/devscripts-2.10.55/scripts/mergechanges.sh 2009-01-18 17:16:02.000000000 +0100 +++ new/devscripts-2.10.58/scripts/mergechanges.sh 2009-11-22 15:16:22.000000000 +0100 @@ -86,7 +86,11 @@ # Extract the Architecture: field from all .changes files, # and merge them, sorting out duplicates -ARCHS=$(grep -h "^Architecture: " "$@" | sed -e "s,^Architecture: ,," | tr ' ' '\n' | sort -u | tr '\n' ' ') +ARCHS=$(grep -h "^Architecture: " "$@" | sed -e "s,^Architecture: ,," | tr ' ' '\n' | sort -u | tr '\n' ' ' | sed 's/ $//') + +checksum_uniq() { + awk '{if(arr[$NF] != 1){arr[$NF] = 1; print;}}' +} # Extract & merge the Version: field from all files.. # Don't catch Version: GnuPG lines, though! @@ -95,11 +99,11 @@ # Extract & merge the sources from all files SOURCE=$(grep -h "^Source: " "$@" | sed -e "s,^Source: ,," | sort -u) # Extract & merge the files from all files -FILES=$(egrep -h "^ [0-9a-f]{32} [0-9]+" "$@" | sort -u) +FILES=$(egrep -h "^ [0-9a-f]{32} [0-9]+" "$@" | checksum_uniq) # Extract & merge the sha1 checksums from all files -SHA1S=$(egrep -h "^ [0-9a-f]{40} [0-9]+" "$@" | sort -u) +SHA1S=$(egrep -h "^ [0-9a-f]{40} [0-9]+" "$@" | checksum_uniq) # Extract & merge the sha256 checksums from all files -SHA256S=$(egrep -h "^ [0-9a-f]{64} [0-9]+" "$@" | sort -u) +SHA256S=$(egrep -h "^ [0-9a-f]{64} [0-9]+" "$@" | checksum_uniq) # Extract & merge the description from all files DESCRIPTIONS=$(sed '/^Description:/,/^[^ ]/{/^ /p;d};d' "$@" | sort -u) # Extract & merge the Formats from all files @@ -174,7 +178,7 @@ trap "rm -f '${OUTPUT}' '${DESCFILE}'" 0 1 2 3 7 10 13 15 if test $(echo "${DESCRIPTIONS}" | wc -l) -ne 0; then - echo "Description:" > "${DESCFILE}" + echo "Description: " > "${DESCFILE}" echo "${DESCRIPTIONS}" >> "${DESCFILE}" fi @@ -190,7 +194,7 @@ eval "sed -e 's,^Architecture: .*,Architecture: ${ARCHS},' \ -e '/^Files: /,$ d; /^Checksums-.*: /,$ d' \ -e '/^Description:/,/^[^ ]/{/^Description:/d;/^[ ]/d}' \ - -e '/^Changes:/{r '${DESCFILE} -e ';aChanges:' -e ';d}' \ + -e '/^Changes:/{r '${DESCFILE} -e ';aChanges: ' -e ';d}' \ -e 's,^Format: .*,Format: ${FORMATS},' \ ${OUTPUT} ${REDIR1}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/devscripts-2.10.55/scripts/mk-build-deps.pl new/devscripts-2.10.58/scripts/mk-build-deps.pl --- old/devscripts-2.10.55/scripts/mk-build-deps.pl 2008-09-23 19:08:11.000000000 +0200 +++ new/devscripts-2.10.58/scripts/mk-build-deps.pl 2009-11-22 15:16:22.000000000 +0100 @@ -29,7 +29,7 @@ B<mk-build-deps> --help|--version -B<mk-build-deps> [-i|--install] <control file | package name> [...] +B<mk-build-deps> [options] <control file | package name> [...] =head1 DESCRIPTION @@ -80,6 +80,7 @@ use warnings; use Getopt::Long; use File::Basename; +use Pod::Usage; my $progname = basename($0); my $opt_install; @@ -128,9 +129,9 @@ "remove|r" => \$opt_remove, "tool|t=s" => \$install_tool, ) - or die "Usage: $progname <control file | package name> [...]\nRun $progname --help for more details\n"; + or pod2usage({ -exitval => 1, -verbose => 0 }); -if ($opt_help) { help(); exit 0; } +pod2usage({ -exitval => 0, -verbose => 1 }) if ($opt_help); if ($opt_version) { version(); exit 0; } if (!@ARGV) { @@ -139,7 +140,7 @@ } } -die "Usage: $progname <control file | package name> [...]\nRun $progname --help for more details\n" unless @ARGV; +pod2usage({ -exitval => 1, -verbose => 0 }) unless @ARGV; system("command -v equivs-build >/dev/null 2>&1"); if ($?) { @@ -160,6 +161,7 @@ } while (<CONTROL>) { + next if /^#|^\s*$/; if (/^(?:Package|Source):\s*(\S+)/ && !$name) { $name = $1; } @@ -202,6 +204,8 @@ } +use Text::ParseWords; + if ($opt_install) { for my $package (@packages) { my $file = glob "${package}-build-deps_*.deb"; @@ -209,7 +213,7 @@ } system 'dpkg', '--unpack', @deb_files; - system $install_tool, '-f', 'install'; + system shellwords($install_tool), '-f', 'install'; if ($opt_remove) { foreach my $file (@deb_files) { @@ -218,15 +222,6 @@ } } -sub help { - print <<"EOF"; -Usage: $progname <control file> | <package name> [...] -Valid options are: - --help, -h Display this message - --version, -v Display version and copyright info -EOF -} - sub version { print <<"EOF"; This is $progname, from the Debian devscripts package, version ###VERSION### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/devscripts-2.10.55/scripts/nmudiff.sh new/devscripts-2.10.58/scripts/nmudiff.sh --- old/devscripts-2.10.55/scripts/nmudiff.sh 2009-07-21 15:03:17.000000000 +0200 +++ new/devscripts-2.10.58/scripts/nmudiff.sh 2009-11-22 15:16:22.000000000 +0100 @@ -66,7 +66,7 @@ VARS="NMUDIFF_DELAY NMUDIFF_MUTT NMUDIFF_NEWREPORT BTS_SENDMAIL_COMMAND" # Don't think it's worth including this stuff # DEFAULT_DEVSCRIPTS_CHECK_DIRNAME_LEVEL=1 -# DEFAULT_DEVSCRIPTS_CHECK_DIRNAME_REGEX='PACKAGE(-.*)?' +# DEFAULT_DEVSCRIPTS_CHECK_DIRNAME_REGEX='PACKAGE(-.+)?' # VARS="BTS_SENDMAIL_COMMAND DEVSCRIPTS_CHECK_DIRNAME_LEVEL DEVSCRIPTS_CHECK_DIRNAME_REGEX" if [ "$1" = "--no-conf" -o "$1" = "--noconf" ]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/devscripts-2.10.55/scripts/uscan.1 new/devscripts-2.10.58/scripts/uscan.1 --- old/devscripts-2.10.55/scripts/uscan.1 2009-09-02 21:20:35.000000000 +0200 +++ new/devscripts-2.10.58/scripts/uscan.1 2009-11-22 15:16:22.000000000 +0100 @@ -313,7 +313,7 @@ match the full directory name. If \fIregex\fR contains the string \'PACKAGE', this will be replaced by the source package name, as determined from the changelog. The default value for the regex is: -\'PACKAGE(-.*)?', thus matching directory names such as PACKAGE and +\'PACKAGE(-.+)?', thus matching directory names such as PACKAGE and PACKAGE-version. .SH EXAMPLE This script will perform a fully automatic upstream update. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/devscripts-2.10.55/scripts/uscan.pl new/devscripts-2.10.58/scripts/uscan.pl --- old/devscripts-2.10.55/scripts/uscan.pl 2009-09-10 21:26:37.000000000 +0200 +++ new/devscripts-2.10.58/scripts/uscan.pl 2009-11-22 15:16:22.000000000 +0100 @@ -108,7 +108,7 @@ What constitutes a matching directory name; REGEX is a Perl regular expression; the string \`PACKAGE\' will be replaced by the package name; see manpage for details - (default: 'PACKAGE(-.*)?') + (default: 'PACKAGE(-.+)?') --watchfile FILE Specify the watchfile rather than using debian/watch; no directory traversing will be done in this case @@ -168,7 +168,7 @@ my $symlink = 'symlink'; my $verbose = 0; my $check_dirname_level = 1; -my $check_dirname_regex = 'PACKAGE(-.*)?'; +my $check_dirname_regex = 'PACKAGE(-.+)?'; my $dehs = 0; my %dehs_tags; my $dehs_end_output = 0; @@ -193,7 +193,7 @@ 'USCAN_USER_AGENT' => '', 'USCAN_REPACK' => 'no', 'DEVSCRIPTS_CHECK_DIRNAME_LEVEL' => 1, - 'DEVSCRIPTS_CHECK_DIRNAME_REGEX' => 'PACKAGE(-.*)?', + 'DEVSCRIPTS_CHECK_DIRNAME_REGEX' => 'PACKAGE(-.+)?', ); my %config_default = %config_vars; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/devscripts-2.10.55/scripts/who-uploads.sh new/devscripts-2.10.58/scripts/who-uploads.sh --- old/devscripts-2.10.55/scripts/who-uploads.sh 2008-07-26 22:19:06.000000000 +0200 +++ new/devscripts-2.10.58/scripts/who-uploads.sh 2009-11-22 15:16:22.000000000 +0100 @@ -201,10 +201,11 @@ # only grab the actual "Accepted" news announcements; hopefully this # won't pick up many false positives + WGETOPTS="-q -O - --timeout=30 " count=0 - for news in $(wget -q -O - $pkgurl | + for news in $(wget $WGETOPTS $pkgurl | sed -ne 's%^.*<a href="\('$package'/news/[0-9A-Z]*\.html\)">Accepted .*%\1%p'); do - HTML_TEXT=$(wget -q -O - "$baseurl$news") + HTML_TEXT=$(wget $WGETOPTS "$baseurl$news") GPG_TEXT=$(echo "$HTML_TEXT" | sed -ne 's/^<pre>//; /-----BEGIN PGP SIGNED MESSAGE-----/,/-----END PGP SIGNATURE-----/p') ++++++ dpkg_1.15.0.tar.bz2 -> dpkg_1.15.5.2.tar.bz2 ++++++ ++++ 704784 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root＠Hilbert.suse.de