summaryrefslogtreecommitdiff
path: root/Debian
diff options
context:
space:
mode:
authorjoey <joey>2001-01-28 09:52:41 +0000
committerjoey <joey>2001-01-28 09:52:41 +0000
commitc89efb0352c6c4af78bc8d5ebbe7cb3846ff89f3 (patch)
tree314535c835fa7d8bb8e13967e9ec801fe5fbb3b2 /Debian
parent454aea6d19ef8a973b6467c594691be4ba937b1c (diff)
r412: * Bah, reverted that last change. It isn't useful because
dpkg-buildpackage reads the real control file and gets confused.
Diffstat (limited to 'Debian')
-rw-r--r--Debian/Debhelper/Dh_Getopt.pm6
-rw-r--r--Debian/Debhelper/Dh_Lib.pm8
2 files changed, 5 insertions, 9 deletions
diff --git a/Debian/Debhelper/Dh_Getopt.pm b/Debian/Debhelper/Dh_Getopt.pm
index 18157bf..6d545e3 100644
--- a/Debian/Debhelper/Dh_Getopt.pm
+++ b/Debian/Debhelper/Dh_Getopt.pm
@@ -148,9 +148,9 @@ sub parseopts {
# packages out, below.
if (! defined $options{DOPACKAGES} || ! @{$options{DOPACKAGES}}) {
if ($options{DOINDEP} || $options{DOARCH} || $options{DOSAME}) {
- # User specified that all arch (in)dep package be
- # built, and there are none of that type.
- error("I have no package to build");
+ # User specified that all arch (in)dep package be
+ # built, and there are none of that type.
+ error("I have no package to build");
}
push @{$options{DOPACKAGES}},GetPackages();
}
diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index 4140642..ef924b6 100644
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -383,10 +383,6 @@ sub filearray {
}
}
-sub getcontrol {
- return $ENV{DH_CONTROL} || 'debian/control';
-}
-
# Returns a list of packages in the control file.
# Must pass "arch" or "indep" or "same" to specify arch-dependant or
# -independant or same arch packages. If nothing is specified, returns all
@@ -405,8 +401,8 @@ sub GetPackages {
my $package="";
my $arch="";
my @list=();
- open (CONTROL, getcontrol()) ||
- error("cannot read ".getcontrol().": $!\n");
+ open (CONTROL, 'debian/control') ||
+ error("cannot read debian/control: $!\n");
while (<CONTROL>) {
chomp;
s/\s+$//;