The following commit has been merged in the master branch:
commit 949dad8ad559942b37a951e7bd790cec35c77241
Author: Benjamin Drung <[email protected]>
Date: Tue Apr 19 23:40:27 2011 +0200
Wrap and sort lists in debian/control.
Run wrap-and-sort.
Closes: #577999
diff --git a/debian/changelog b/debian/changelog
index d704694..055d1e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
devscripts (2.10.73) UNRELEASED; urgency=low
+ [ James Vega ]
* uscan:
+ Use the correct path when repacking zip files. (Closes: #622889)
+ Make file show all matched file types instead of just the first.
@@ -7,7 +8,10 @@ devscripts (2.10.73) UNRELEASED; urgency=low
* uupdate: Handle hidden files when the upstream archive doesn't contain its
files under one top-level directory. (Closes: #601945)
- -- James Vega <[email protected]> Tue, 19 Apr 2011 21:57:10 -0400
+ [ Benjamin Drung ]
+ * Wrap and sort lists in debian/control. (Closes: #577999)
+
+ -- Benjamin Drung <[email protected]> Wed, 20 Apr 2011 11:12:51 +0200
devscripts (2.10.72) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 18afab6..57407d8 100644
--- a/debian/control
+++ b/debian/control
@@ -2,26 +2,75 @@ Source: devscripts
Section: devel
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]>
+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.9.1.0
-Build-Depends: perl, debhelper (>= 6.0.0), docbook-xsl, libtimedate-perl,
- libfile-desktopentry-perl, libterm-size-perl, liburi-perl, libwww-perl,
- po4a (>= 0.40), xsltproc, libjson-perl
+Build-Depends: debhelper (>= 6.0.0),
+ docbook-xsl,
+ libfile-desktopentry-perl,
+ libjson-perl,
+ libterm-size-perl,
+ libtimedate-perl,
+ liburi-perl,
+ libwww-perl,
+ perl,
+ po4a (>= 0.40),
+ xsltproc
Vcs-Browser: http://git.debian.org/?p=devscripts/devscripts.git
Vcs-Git: git://git.debian.org/devscripts/devscripts.git
Package: devscripts
Architecture: any
-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, libcrypt-ssleay-perl,
- libparse-debcontrol-perl, libsoap-lite-perl, liburi-perl, libwww-perl,
- lintian, lsb-release, man-db, patch, patchutils, strace, unzip,
- wdiff, xz-utils, sensible-utils, libjson-perl
-Suggests: bsd-mailx | mailx, build-essential, cvs-buildpackage, devscripts-el,
- gnuplot, libauthen-sasl-perl, libtimedate-perl, libfile-desktopentry-perl,
- libnet-smtp-ssl-perl, libterm-size-perl, libyaml-syck-perl, mutt, ssh-client,
- svn-buildpackage, w3m
+Depends: dpkg-dev (>= 1.15.4.1), perl, ${misc:Depends}, ${shlibs:Depends}
+Recommends: at,
+ curl | wget,
+ dctrl-tools,
+ debian-keyring,
+ debian-maintainers,
+ dput | dupload,
+ equivs,
+ fakeroot,
+ gnupg,
+ libcrypt-ssleay-perl,
+ libjson-perl,
+ libparse-debcontrol-perl,
+ libsoap-lite-perl,
+ liburi-perl,
+ libwww-perl,
+ lintian,
+ lsb-release,
+ man-db,
+ patch,
+ patchutils,
+ sensible-utils,
+ strace,
+ unzip,
+ wdiff,
+ xz-utils
+Suggests: bsd-mailx | mailx,
+ build-essential,
+ cvs-buildpackage,
+ devscripts-el,
+ gnuplot,
+ libauthen-sasl-perl,
+ libfile-desktopentry-perl,
+ libnet-smtp-ssl-perl,
+ libterm-size-perl,
+ libtimedate-perl,
+ libyaml-syck-perl,
+ mutt,
+ ssh-client,
+ 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:
@@ -49,7 +98,7 @@ Description: scripts to make the life of a Debian Package
maintainer easier
- cvs-debuild: A wrapper for cvs-buildpackage to use debuild as its package
building program. [cvs-buildpackage, fakeroot, lintian, gnupg]
- dcmd: run a given command replacing the name of a .changes or .dsc file
- with each of the files referenced therein
+ with each of the files referenced therein
- dcontrol: remotely query package and source control files for all Debian
distributions. [liburl-perl, libwww-perl]
- dd-list: given a list of packages, pretty-print it ordered by maintainer
@@ -111,7 +160,7 @@ Description: scripts to make the life of a Debian Package
maintainer easier
- rmadison: remotely query the Debian archive database about packages
[wget | curl, liburi-perl]
- svnpath: print svn repository paths [subversion]
- - tagpending: runs from a Debian source tree and tags bugs that are to
+ - tagpending: runs from a Debian source tree and tags bugs that are to
be closed in the latest changelog as pending. [libsoap-lite-perl]
- transition-check: Check a list of source packages for involvement in
transitions for which uploads to unstable are currently blocked
diff --git a/debian/copyright b/debian/copyright
index 822b50b..341486e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -18,7 +18,7 @@ dpkg-perl package, copyright (C) 1997 Klee Dienes
<[email protected]>
With the exceptions listed below, the whole package is copyright under
the GPL, version 2 or later.
-- annotate-output, debdiff and nmudiff are released under version 2
+- annotate-output, debdiff and nmudiff are released under version 2
(only) of the GPL.
- debsnap and diff2patches are released under version 3 or later of the GPL
diff --git a/debian/install b/debian/install
index 17f2e34..fef263d 100644
--- a/debian/install
+++ b/debian/install
@@ -1,2 +1,2 @@
-debian/bug/* /usr/share/bug/devscripts
cowpoke.conf /etc
+debian/bug/* /usr/share/bug/devscripts
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
