SVN devscripts commit: r546 - in trunk: debian scripts

[Adam D. Barratt]

Author: adam-guest
Date: 2007-03-07 20:58:02 +0000 (Wed, 07 Mar 2007)
New Revision: 546

Modified:
   trunk/debian/changelog
   trunk/scripts/debc.1
   trunk/scripts/debi.pl
Log:
debc: Add support for udebs, based on a patch from Frans Pop (closes 
#404952)



Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-03-07 10:40:27 UTC (rev 545)
+++ trunk/debian/changelog	2007-03-07 20:58:02 UTC (rev 546)
@@ -57,8 +57,10 @@
   * tagpending: support marking wnpp bugs as pending (Closes: #398178)
   * debc.1: Fix reference to debi (thanks, Frans Pop)
   * {cvs-,}debc.1: Fix reference to installing packages (thanks, Frans Pop)
+  * debc: Add support for udebs, based on a patch from Frans Pop
+    (Closes: #404952)
 
- -- Adam D. Barratt <debian-bts at adam-barratt.org.uk>  Wed,  7 Mar 2007 10:36:06 +0000
+ -- Adam D. Barratt <debian-bts at adam-barratt.org.uk>  Wed,  7 Mar 2007 20:55:34 +0000
 
 devscripts (2.9.27) unstable; urgency=low
 

Modified: trunk/scripts/debc.1
===================================================================
--- trunk/scripts/debc.1	2007-03-07 10:40:27 UTC (rev 545)
+++ trunk/scripts/debc.1	2007-03-07 20:58:02 UTC (rev 546)
@@ -5,25 +5,26 @@
 \fBdebc\fP [\fIoptions\fR] [\fIchanges file\fR] [\fIpackage\fR ...]
 .SH DESCRIPTION
 \fBdebc\fR figures out the current version of a package and displays
-information about the .deb files which have been generated in the
-current build process.  If a \fI.changes\fR file is specified on the
-command line, the filename must end with \fI.changes\fR, as this is
-how the program distinguishes it from package names.  If not, then
-\fBdebc\fR has to be called from within the source code directory
+information about the .deb and .udeb files which have been generated
+in the current build process.  If a \fI.changes\fR file is specified
+on the command line, the filename must end with \fI.changes\fR, as
+this is how the program distinguishes it from package names.  If not,
+then \fBdebc\fR has to be called from within the source code directory
 tree.  In this case, it will look for the \fI.changes\fR file
 corresponding to the current package version (by determining the name
 and version number from the changelog, and the architecture in the
 same way as \fBdpkg-buildpackage\fR(1) does).  It then runs
-\fBdpkg-deb \-I\fR and \fBdpkg-deb \-c\fR on every \fI.deb\fR archive
-listed in the \fI.changes\fR file to display information about the
-contents of the \fI.deb\fR files.  It precedes every \fI.deb\fR file
-with the name of the file.  It assumes that all of the \fI.deb\fR
-archives live in the same directory as the \fI.changes\fR file.  It is
+\fBdpkg-deb \-I\fR and \fBdpkg-deb \-c\fR on every \fI.deb\fR and
+\fI.udeb\fR archive listed in the \fI.changes\fR file to display 
+information about the contents of the \fI.deb\fR / \fI.udeb\fR files.  
+It precedes every \fI.deb\fR or \fI.udeb\fR file with the name of the 
+file.  It assumes that all of the \fI.deb\fR / \fI.udeb\fR archives
+live  in the same directory as the \fI.changes\fR file.  It is
 useful for ensuring that the expected files have ended up in the
 Debian package.
 .PP
 If a list of packages is given on the command line, then only those
-debs with names in this list of packages will be processed.
+debs or udebs with names in this list of packages will be processed.
 .SH "Directory name checking"
 In common with several other scripts in the \fBdevscripts\fR package,
 \fBdebc\fR will climb the directory tree until it finds a
@@ -69,10 +70,10 @@
 name of the \fI.changes\fR file.
 .TP
 \fB\-\-debs\-dir\fR \fIDIR\fR
-Look for the \fI.changes\fR and \fI.deb\fR files in directory
-\fIDIR\fR instead of the parent of the source directory.  This should
-either be an absolute path or relative to the top of the source
-directory.
+Look for the \fI.changes\fR, \fI.deb\fR and \fI.udeb\fR files in 
+directory \fIDIR\fR instead of the parent of the source directory.
+This should either be an absolute path or relative to the top of the 
+source directory.
 .TP
 \fB\-\-check-dirname-level\fR \fIN\fR
 See the above section "Directory name checking" for an explanation of
@@ -96,9 +97,9 @@
 purpose.  The currently recognised variables are:
 .TP
 .B DEBRELEASE_DEBS_DIR
-This specifies the directory in which to look for the \fI.changes\fR
-and \fI.deb\fR files, and is either an absolute path or relative to
-the top of the source tree.  This corresponds to the
+This specifies the directory in which to look for the \fI.changes\fR,
+\fI.deb\fR and \fI.udeb\fR files, and is either an absolute path or 
+relative to the top of the source tree.  This corresponds to the
 \fB\-\-debs\-dir\fR command line option.  This directive could be
 used, for example, if you always use \fBpbuilder\fR or
 \fBsvn-buildpackage\fR to build your packages.  Note that it also

Modified: trunk/scripts/debi.pl
===================================================================
--- trunk/scripts/debi.pl	2007-03-07 10:40:27 UTC (rev 545)
+++ trunk/scripts/debi.pl	2007-03-07 20:58:02 UTC (rev 546)
@@ -69,7 +69,7 @@
 sub usage_c {
     print <<"EOF";
 Usage: $progname [options] [.changes file] [package ...]
-  Display the contents of the .deb file(s) just created, as listed
+  Display the contents of the .deb or .udeb file(s) just created, as listed
   in the generated .changes file or the .changes file specified.
   If packages are listed, only display those specified packages
   from the .changes file.  Options:
@@ -333,7 +333,10 @@
     last if $infiles and /^[^ ]/;
     /^Files:/ and $infiles=1, next;
     next unless $infiles;
-    if (/ (\S*\.deb)$/) {
+
+    # udebs are only supported for debc
+    if ((($progname eq 'debi') && (/ (\S*\.deb)$/)) ||
+        (($progname eq 'debc') && (/ (\S*\.u?deb)$/))) {
         my $deb = $1;
         $deb =~ /^([a-z0-9+\.-]+)_/ or warn "unrecognised .deb name: $deb\n";
 	# don't want other archs' .debs: