what-patch: apply patch by Daniel Hahler (LP: #163454). pbuilder-dist: assume action 'build' when .dsc is passed, and update it's manpage.

debian/changelog

@@ -12,14 +12,23 @@ ubuntu-dev-tools (0.23) UNRELEASED; urgency=low
 
   [ Siegfried-Angel Gevatter Pujals (RainCT) ]
   * pbuilder-dist:
-     - move warning about changing $COMPONENTS's value to
+     - Move warning about changing $COMPONENTS's value to
        the right place (it should be displayed if the installed version
        of pbuilder is too old, not otherwise).
+     - Asume action is "build" if no recognized action is passed but
+       the next argument ends with .dsc.
   * dgetlp:
-     - add "-h", "--help" and "--debug" (-d was already there)
+     - Add "-h", "--help" and "--debug" (-d was already there)
   * 404main:
-     - rewrite most of it; cleanup and improvements
+     - Rewrite most of it; cleanup and improvements
-     - change license to GPLv2+
+     - Identify Pete Savage as it's original author
+     - Change the license to GPLv2+
+  * AUTHORS, debian/copyright:
+     - Add Pete Savage, as he wrote 404main
+  * what-patch:
+     - Ignore commented lines; patch by Daniel Hahler (LP: #163454)
+  * doc/pbuilder-dist.1:
+     - Update manpage to match recent changes (including those from 0.21).
 
  -- Siegfried-Angel Gevatter Pujals (RainCT) <sgevatter@ubuntu.cat>  Fri, 23 Nov 2007 22:07:58 +0100
 

doc/pbuilder-dist.1

@@ -20,9 +20,8 @@ It is common to symlink this script in order to give it many names in the form o
 systems), like for example \fBpbuilder\-feisty\fP, \fBpbuilder\-sid\fP, \fBpbuilder\-gutsy\-i386\fP, etc.
 .\"
 .SH USAGE
-There are many arguments listed on the synopsis.
+There are many arguments listed on the synopsis; each of them, if used, has to be used exactly in
-Each of them, if used, has to be used exactly in the same order as it
+the same order as it appears there.
-appears there.
 In case you renamed the script to \fBpbuilder\-\fIdistribution\fP\fR, do not
 use the \fBdistribution\fP parameter; same with \fBi386\fP / \fBamd64\fP if
 the name also contains \-\fIarchitecture\fR.
@@ -51,7 +50,8 @@ If this file already exists, it will be overwritten.
 .TP
 \fBoperation\fP
 Replace this with the action you want \fBpbuilder\fP to do (create, update, build, clean, login
-or execute).
+or execute). If you don't specify any action, but the next argument is a .dsc file, it will
+assume that it should build.
 Check its manpage for more details.
 .TP
 \fB[...]\fP
@@ -61,7 +61,9 @@ For example, if \fBbuild\fP is the option, you will need to also specify
 a .dsc file.
 .PP
 The default value of all optional parameters (except the architecture) can be changed by
-editing the first lines of the script.
+editing the first lines of the script. You can also change the base directory using the
+global variable $PBUILDFOLDER.
+.PP
 .\"
 .SH EXAMPLES
 .TP
@@ -83,7 +85,7 @@ Updates an existing i386-architecture Debian Etch environment on an amd64 system
 .SH FILES
 By default, \fBpbuilder\-dist\fP will store all the files it generates in \fB~/pbuilder/\fP.
 This can be changed by modifying the BASE_DIR value on the top of the script
-to any other directory you want.
+to any other directory you want, or by using the $PBUILDFOLDER global variable.
 If it doesn't exist, it will be created on the run.
 .\"
 .SH BUGS

pbuilder-dist

@@ -146,14 +146,19 @@ case $OPERATION in
         ;;
     
     *)
-        echo "Unrecognized argument. Please use one of those:"
+    	if [ ${1##*.} =  'dsc' ]
-        echo "    create"
+    	then
-        echo "    update"
+    		OPERATION=build
-        echo "    build"
+    	else
-        echo "    clean"
+        	echo "Unrecognized argument. Please use one of those:"
-        echo "    login"
+        	echo "    create"
-        echo "    execute"
+        	echo "    update"
-        exit 1
+        	echo "    build"
+        	echo "    clean"
+        	echo "    login"
+        	echo "    execute"
+        	exit 1
+        fi
         ;;
 esac
 

requestsync

@@ -1,11 +1,11 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
-# (C) 2007 Canonical Ltd, Steve Kowalik
+# (C) 2007 Canonical Ltd., Steve Kowalik
 # Authors:
 # Martin Pitt <martin.pitt@ubuntu.com>
 # Steve Kowalik <stevenk@ubuntu.com>
-# GPLv2, see /usr/share/common-licenses/GPL
+# License: GPLv2, see /usr/share/common-licenses/GPL
 
 import os, os.path, sys, urllib, subprocess, smtplib, getopt
 

what-patch

@@ -1,25 +1,26 @@
 #!/bin/bash
 # Copyright 2006-2007 (C) Kees Cook <kees@ubuntu.com>
 # Modified by Siegfried-A. Gevatter <siggi.gevatter@gmail.com>
+# Modified by Daniel Hahler <ubuntu@thequod.de>
 # License: GPLv2
 
 if [[ -d debian ]]; then
-    cd . # pass
+	cd . # pass
 elif [[ -d ../debian ]]; then
-    cd ..
+	cd ..
 elif [[ -d ../patches ]]; then
-    cd ../.. 
+	cd ../.. 
 else
-    echo "Can't find debian/rules."; exit
+	echo "Can't find debian/rules."; exit
 fi
 
 for filename in $(echo "debian/rules"; grep ^include debian/rules | fgrep -v '$(' | awk '{print $2}')
 do
-    fgrep -q patchsys.mk "$filename" && { echo "cdbs"; exit; }
+	fgrep patchsys.mk "$filename" | grep -q -v "^#" && { echo "cdbs"; exit; }
-    fgrep -q quilt "$filename" && { echo "quilt"; exit; }
+	fgrep quilt "$filename" | grep -q -v "^#" && { echo "quilt"; exit; }
-    fgrep -q dbs-build.mk "$filename" && { echo "dbs"; exit; }
+	fgrep dbs-build.mk "$filename" | grep -q -v "^#" && { echo "dbs"; exit; }
-    fgrep -q dpatch "$filename" && { echo "dpatch"; exit; }
+	fgrep dpatch "$filename" | grep -q -v "^#" && { echo "dpatch"; exit; }
-    fgrep -q '*.diff' "$filename" && { echo "diff splash"; exit; }
+	fgrep '*.diff' "$filename" | grep -q -v "^#" && { echo "diff splash"; exit; }
 done
 [ -d debian/patches ] || { echo "patchless?"; exit; }
 echo "unknown patch system"