diff options
| author | joey <joey> | 2000-03-03 03:44:42 +0000 |
|---|---|---|
| committer | joey <joey> | 2000-03-03 03:44:42 +0000 |
| commit | 57cd028e69472a1d2ade68a474a45641c65ff7bb (patch) | |
| tree | 77e316ab5d0d69f75e6ec8aab7a39aab133a13d5 | |
| parent | f60fc64ac3128ed3a352fc3fae521cbf8c932a42 (diff) | |
| download | debhelper-57cd028e69472a1d2ade68a474a45641c65ff7bb.tar.gz | |
r340: * Patch from Jorgen `forcer' Schaefer <forcer at mindless.com> (much
modified)to make dh_installwm use new window manager registration method,
update-alternatives. Closes: #52156, #34684 (latter bug is obsolete)
* Fixed $dh{flavor} to be upper-case.
* Deprecated dh_installemavcsen --number; use --priority instead. Also,
the option parser requires the parameter be a number now. And,
dh_installwm now accepts --priority, and window manager packages should
start using it.
* dh_installwm now behaves like a proper debhelper command, and reads
debian/<package>.wm too. This is a small behavior change; filenames
specified on the command line no longer apply to all packages it acts
on. I can't belive this program existed for 2 years with such a glaring
problem; I guess most people don't need ot register 5 wm's in 3
sub-packages. Anyway, it can handle such things now. :-)
* Moved Dh_*.pm to /usr/lib/perl5/Debian/Debhelper. *big* change.
| -rw-r--r-- | Debian/Debhelper/Dh_Getopt.pm (renamed from Dh_Getopt.pm) | 9 | ||||
| -rw-r--r-- | Debian/Debhelper/Dh_Lib.pm (renamed from Dh_Lib.pm) | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/Dh_Getopt.pm b/Debian/Debhelper/Dh_Getopt.pm index 5084d6f0..1e52109e 100644 --- a/Dh_Getopt.pm +++ b/Debian/Debhelper/Dh_Getopt.pm @@ -4,10 +4,10 @@ # # Joey Hess GPL copyright 1998. -package Dh_Getopt; +package Debian::Debhelper::Dh_Getopt; use strict; -use Dh_Lib; +use Debian::Debhelper::Dh_Lib; use Getopt::Long; use Exporter; #use vars qw{@ISA @EXPORT}; @@ -124,9 +124,10 @@ sub parseopts { "destdir=s" => \$options{DESTDIR}, - "number=s" => \$options{number}, + "number=i" => \$options{PRIORITY}, # deprecated + "priority=i" => \$options{PRIORITY}, - "flavor=s" => \$options{flavor}, + "flavor=s" => \$options{FLAVOR}, "<>" => \&NonOption, ); diff --git a/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm index 4c3841cc..915d37af 100644 --- a/Dh_Lib.pm +++ b/Debian/Debhelper/Dh_Lib.pm @@ -4,7 +4,7 @@ # # Joey Hess, GPL copyright 1997, 1998. -package Dh_Lib; +package Debian::Debhelper::Dh_Lib; use strict; use Exporter; @@ -35,9 +35,9 @@ sub init { } } if ($parseopt) { - eval "use Dh_Getopt"; + eval "use Debian::Debhelper::Dh_Getopt"; error($!) if $@; - %dh=Dh_Getopt::parseopts(); + %dh=Debian::Debhelper::Dh_Getopt::parseopts(); } # Check to see if DH_VERBOSE environment variable was set, if so, |