r380: * dh_builddeb: added a --filename option to specify the output filename.

     This is intended to be used when building .udebs for the debian
     installer.

diff --git a/Debian/Debhelper/Dh_Getopt.pm b/Debian/Debhelper/Dh_Getopt.pm
index 1e52109e119b064ab938eeada9747972ab953d63..02045bbe5620f8ef197678e3c8faafd009d88c51 100644 (file)
--- a/Debian/Debhelper/Dh_Getopt.pm
+++ b/Debian/Debhelper/Dh_Getopt.pm
@@ -123,6 +123,8 @@ sub parseopts {
                "sourcedir=s" => \$options{SOURCEDIR},
                
                "destdir=s" => \$options{DESTDIR},
+
+               "filename=s" => \$options{FILENAME},
                
                "number=i" => \$options{PRIORITY},      # deprecated
                "priority=i" => \$options{PRIORITY},

diff --git a/debian/changelog b/debian/changelog
index 546e3fe5f7ca997751c5fd7db1e19c1f3e75b5bc..57c65a44d05d14049486c4a8bdd55e0f1571b507 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (2.1.18) unstable; urgency=low
+
+  * dh_builddeb: added a --filename option to specify the output filename.
+    This is intended to be used when building .udebs for the debian
+    installer.
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 28 Oct 2000 11:41:20 -0700
+
 debhelper (2.1.17) unstable; urgency=low
 
   * dh_movefiles.1: well I thought it was quite obvious why it always used

diff --git a/dh_builddeb b/dh_builddeb
index 1082dd29e9200f33f7ee8a3d226e0820cdc6fccf..15f4e397e0610889acb5d5d48a6e7b8260c63c69 100755 (executable)
--- a/dh_builddeb
+++ b/dh_builddeb
@@ -10,7 +10,11 @@ if (! defined $dh{DESTDIR}) {
        $dh{DESTDIR}='..';
 }
 
+if (! defined $dh{FILENAME}) {
+       $dh{FILENAME}='';
+}
+
 foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
        $TMP=tmpdir($PACKAGE);
-       doit("dpkg","--build",$TMP,$dh{DESTDIR},@{$dh{U_PARAMS}});
+       doit("dpkg","--build",$TMP,"$dh{DESTDIR}/$dh{FILENAME}",@{$dh{U_PARAMS}});
 }

diff --git a/dh_builddeb.1 b/dh_builddeb.1
index 9c5688cd4ef37c0b52293956c67bd345c93f10fa..cefcd64891e504c01cf96030584431a57dad1007 100644 (file)
--- a/dh_builddeb.1
+++ b/dh_builddeb.1
@@ -3,7 +3,7 @@
 dh_builddeb \- build debian packages
 .SH SYNOPSIS
 .B dh_builddeb
-.I "[debhelper options] [--destdir=directory] [-uparams] [-- params]"
+.I "[debhelper options] [--destdir=directory] [--name=filename] [-uparams] [-- params]"
 .SH "DESCRIPTION"
 dh_builddeb simply calls
 .BR dpkg (8)
@@ -19,10 +19,14 @@ for a list of options common to all debhelper commands.
 Use this if you want the generated .deb files to be put in a directory other
 than the default of ".."
 .TP
+.B --name=filename
+Use this if you want to force the generated .deb file to have a particular
+file name. Does not work well if more than one .deb is generated!
+.TP
 .B \-uparams
 .TP
 .B \-\- params
-Pass "params" to 
+Pass "params" to
 .BR dpkg-deb (1)
 when it is used to build the package.
 .SH ENVIRONMENT

diff --git a/doc/PROGRAMMING b/doc/PROGRAMMING
index ca10ca38142bfa0b95ad22dfebcaf6c68bcee195..1f89e10fdf44c86198f20109f27b3c16af59d05a 100644 (file)
--- a/doc/PROGRAMMING
+++ b/doc/PROGRAMMING
@@ -123,6 +123,7 @@ switch              variable        description
                                dh_movefiles will ever use this)
 --destdir      DESTDIR         will be set to a string (probably only
                                dh_builddeb will ever use this)
+--filename     FILENAME        will be set to a string
 --flavor       FLAVOR          will be set to a string (probably only
                                dh_installemacsen will ever use this)
 --number       PRIORITY        will be set to a number (deprecated)