diff options
| author | Niels Thykier <niels@thykier.net> | 2016-06-19 07:06:03 +0000 |
|---|---|---|
| committer | Niels Thykier <niels@thykier.net> | 2016-06-19 07:06:03 +0000 |
| commit | 49656f59e5446c9707833bf81de351975cdedc3d (patch) | |
| tree | 0a0ca1e465ddc309de0157508cf45d6865764e37 | |
| parent | c1f102537e9e204deed0eab17c10680f3372a2ba (diff) | |
| download | debhelper-49656f59e5446c9707833bf81de351975cdedc3d.tar.gz | |
Dh_Getopt: Deprecate -s and remove it in compat 11
Signed-off-by: Niels Thykier <niels@thykier.net>
| -rw-r--r-- | Debian/Debhelper/Dh_Getopt.pm | 7 | ||||
| -rw-r--r-- | debhelper.pod | 5 | ||||
| -rw-r--r-- | debian/changelog | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/Debian/Debhelper/Dh_Getopt.pm b/Debian/Debhelper/Dh_Getopt.pm index e597ddb6..181a88dd 100644 --- a/Debian/Debhelper/Dh_Getopt.pm +++ b/Debian/Debhelper/Dh_Getopt.pm @@ -33,6 +33,13 @@ sub AddPackage { my($option,$value)=@_; $option eq 's' or $option eq 'same-arch') { push @{$dh{DOPACKAGES}}, getpackages('arch'); $dh{DOARCH}=1; + if ($option eq 's' or $option eq 'same-arch') { + if (compat(10)) { + warning('-s/--same-arch is deprecated; please use -a/--arch instead'); + } else { + error('-s/--same-arch is removed in compat 11; please use -a/--arch instead'); + } + } } elsif ($option eq 'p' or $option eq 'package') { push @{$dh{DOPACKAGES}}, $value; diff --git a/debhelper.pod b/debhelper.pod index f16841d1..9bfea317 100644 --- a/debhelper.pod +++ b/debhelper.pod @@ -4,7 +4,7 @@ debhelper - the debhelper tool suite =head1 SYNOPSIS -B<dh_>I<*> [B<-v>] [B<-a>] [B<-i>] [B<-s>] [B<--no-act>] [B<-p>I<package>] [B<-N>I<package>] [B<-P>I<tmpdir>] +B<dh_>I<*> [B<-v>] [B<-a>] [B<-i>] [B<--no-act>] [B<-p>I<package>] [B<-N>I<package>] [B<-P>I<tmpdir>] =head1 DESCRIPTION @@ -124,8 +124,7 @@ times to make debhelper operate on a given set of packages. =item B<-s>, B<--same-arch> -This used to be a smarter version of the B<-a> flag, but the B<-a> flag is now -equally smart. +Deprecated alias of B<-a>. =item B<-N>I<package>, B<--no-package=>I<package> diff --git a/debian/changelog b/debian/changelog index b287f72f..02d212a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ debhelper (9.20160618.1+unreleased) UNRELEASED; urgency=medium * Start on compat 11. * dh_installmenu: Stop installing menu files in compat 11 (menu-methods are still installed). + * dh_*: Deprecate -s in favor of -a. The -s option is + removed in compat 11. -- Niels Thykier <niels@thykier.net> Sat, 18 Jun 2016 21:10:26 +0000 |