[debhelper-devel] [debhelper] 01/01: Support building on case-insensitive filesystems
Niels Thykier
nthykier at moszumanska.debian.org
Thu Aug 24 05:26:59 UTC 2017
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository debhelper.
commit 3e2178efae2a2ce3ec9b8c56c7709370887a3652
Author: Geoffrey Thomas <geofft at ldpreload.com>
Date: Wed Aug 23 20:18:01 2017 -0400
Support building on case-insensitive filesystems
Move Debian/ to lib subdirectory to support building on
non-case-sensitive filesystems.
---
Makefile | 10 +++++-----
debian/changelog | 5 +++++
debian/copyright | 4 ++--
lib | 1 -
{Debian => lib/Debian}/Debhelper/Buildsystem.pm | 0
{Debian => lib/Debian}/Debhelper/Buildsystem/ant.pm | 0
{Debian => lib/Debian}/Debhelper/Buildsystem/autoconf.pm | 0
{Debian => lib/Debian}/Debhelper/Buildsystem/cmake.pm | 0
{Debian => lib/Debian}/Debhelper/Buildsystem/makefile.pm | 0
{Debian => lib/Debian}/Debhelper/Buildsystem/meson.pm | 0
{Debian => lib/Debian}/Debhelper/Buildsystem/ninja.pm | 0
{Debian => lib/Debian}/Debhelper/Buildsystem/perl_build.pm | 0
{Debian => lib/Debian}/Debhelper/Buildsystem/perl_makemaker.pm | 0
.../Debian}/Debhelper/Buildsystem/python_distutils.pm | 0
{Debian => lib/Debian}/Debhelper/Buildsystem/qmake.pm | 0
{Debian => lib/Debian}/Debhelper/Buildsystem/qmake_qt4.pm | 0
{Debian => lib/Debian}/Debhelper/Dh_Buildsystems.pm | 0
{Debian => lib/Debian}/Debhelper/Dh_Getopt.pm | 0
{Debian => lib/Debian}/Debhelper/Dh_Lib.pm | 0
{Debian => lib/Debian}/Debhelper/Sequence/build_stamp.pm | 0
{Debian => lib/Debian}/Debhelper/Sequence/python_support.pm | 0
{Debian => lib/Debian}/Debhelper/Sequence/systemd.pm | 0
run | 2 +-
t/buildsystems/03-bs-auto-buildable.t | 2 +-
t/override_target.t | 2 +-
t/syntax/syntax-progs.t | 2 +-
26 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
index 9cd42c8..b5a0a13 100644
--- a/Makefile
+++ b/Makefile
@@ -92,7 +92,7 @@ translated-%-stamp: po4a-stamp
version:
printf "package Debian::Debhelper::Dh_Version;\n\$$version='$(VERSION)';\n1" > \
- Debian/Debhelper/Dh_Version.pm
+ lib/Debian/Debhelper/Dh_Version.pm
dh_%.1: dh_%
$(POD2MAN) $(POD2MAN_FLAGS) $^ $@
@@ -109,7 +109,7 @@ debhelper-obsolete-compat.7: debhelper-obsolete-compat.pod
$(POD2MAN) $(POD2MAN_FLAGS) --name="debhelper" --section=7 $^ > $@
clean:
- rm -f *-stamp *.1 *.7 Debian/Debhelper/Dh_Version.pm
+ rm -f *-stamp *.1 *.7 lib/Debian/Debhelper/Dh_Version.pm
ifneq ($(USE_NLS),no)
$(PO4A) --previous --rm-translations --rm-backups man/po4a/po4a.cfg
endif
@@ -124,11 +124,11 @@ install:
$(DESTDIR)$(PERLLIBDIR)/Buildsystem
install dh $(COMMANDS) $(DESTDIR)$(PREFIX)/bin
install -m 0644 autoscripts/* $(DESTDIR)$(PREFIX)/share/debhelper/autoscripts
- install -m 0644 Debian/Debhelper/*.pm $(DESTDIR)$(PERLLIBDIR)
+ install -m 0644 lib/Debian/Debhelper/*.pm $(DESTDIR)$(PERLLIBDIR)
[ "$(PREFIX)" = /usr ] || \
sed -i '/$$prefix=/s@/usr@$(PREFIX)@g' $(DESTDIR)$(PERLLIBDIR)/Dh_Lib.pm
- install -m 0644 Debian/Debhelper/Sequence/*.pm $(DESTDIR)$(PERLLIBDIR)/Sequence
- install -m 0644 Debian/Debhelper/Buildsystem/*.pm $(DESTDIR)$(PERLLIBDIR)/Buildsystem
+ install -m 0644 lib/Debian/Debhelper/Sequence/*.pm $(DESTDIR)$(PERLLIBDIR)/Sequence
+ install -m 0644 lib/Debian/Debhelper/Buildsystem/*.pm $(DESTDIR)$(PERLLIBDIR)/Buildsystem
test: version
MAKEFLAGS= HARNESS_OPTIONS=j$(TEST_JOBS) ./run perl -MTest::Harness -e 'runtests grep { ! /CVS/ && ! /\.svn/ && -f && -x && m/\.t$$/ } @ARGV' t/* t/*/*
diff --git a/debian/changelog b/debian/changelog
index a6bf745..8a38f40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,11 @@ debhelper (10.7.3) UNRELEASED; urgency=medium
requirements are satisfied in oldoldstable.
* dh_installdocs: Merge two chmod calls to save a fork+exec.
+ [ Geoffrey Thomas ]
+ * Support building debhelper on case-insensitive filesystems by
+ moving the Debian (perl package) to the lib subdirectory.
+ (Closes: #873043)
+
-- Niels Thykier <niels at thykier.net> Thu, 03 Aug 2017 19:30:01 +0000
debhelper (10.7.2) unstable; urgency=medium
diff --git a/debian/copyright b/debian/copyright
index bb8de76..337c3e0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -66,11 +66,11 @@ Files: dh_systemd_enable dh_systemd_start
Copyright: 2013 Michael Stapelberg
License: BSD-3-clause
-Files: Debian/Debhelper/Buildsystem* Debian/Debhelper/Dh_Buildsystems.pm
+Files: lib/Debian/Debhelper/Buildsystem* lib/Debian/Debhelper/Dh_Buildsystems.pm
Copyright: 2008-2009 Modestas Vainius
License: GPL-2+
-Files: Debian/Debhelper/Buildsystem/qmake.pm
+Files: lib/Debian/Debhelper/Buildsystem/qmake.pm
Copyright: 2010 Kel Modderman
License: GPL-2+
diff --git a/lib b/lib
deleted file mode 120000
index 945c9b4..0000000
--- a/lib
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
diff --git a/Debian/Debhelper/Buildsystem.pm b/lib/Debian/Debhelper/Buildsystem.pm
similarity index 100%
rename from Debian/Debhelper/Buildsystem.pm
rename to lib/Debian/Debhelper/Buildsystem.pm
diff --git a/Debian/Debhelper/Buildsystem/ant.pm b/lib/Debian/Debhelper/Buildsystem/ant.pm
similarity index 100%
rename from Debian/Debhelper/Buildsystem/ant.pm
rename to lib/Debian/Debhelper/Buildsystem/ant.pm
diff --git a/Debian/Debhelper/Buildsystem/autoconf.pm b/lib/Debian/Debhelper/Buildsystem/autoconf.pm
similarity index 100%
rename from Debian/Debhelper/Buildsystem/autoconf.pm
rename to lib/Debian/Debhelper/Buildsystem/autoconf.pm
diff --git a/Debian/Debhelper/Buildsystem/cmake.pm b/lib/Debian/Debhelper/Buildsystem/cmake.pm
similarity index 100%
rename from Debian/Debhelper/Buildsystem/cmake.pm
rename to lib/Debian/Debhelper/Buildsystem/cmake.pm
diff --git a/Debian/Debhelper/Buildsystem/makefile.pm b/lib/Debian/Debhelper/Buildsystem/makefile.pm
similarity index 100%
rename from Debian/Debhelper/Buildsystem/makefile.pm
rename to lib/Debian/Debhelper/Buildsystem/makefile.pm
diff --git a/Debian/Debhelper/Buildsystem/meson.pm b/lib/Debian/Debhelper/Buildsystem/meson.pm
similarity index 100%
rename from Debian/Debhelper/Buildsystem/meson.pm
rename to lib/Debian/Debhelper/Buildsystem/meson.pm
diff --git a/Debian/Debhelper/Buildsystem/ninja.pm b/lib/Debian/Debhelper/Buildsystem/ninja.pm
similarity index 100%
rename from Debian/Debhelper/Buildsystem/ninja.pm
rename to lib/Debian/Debhelper/Buildsystem/ninja.pm
diff --git a/Debian/Debhelper/Buildsystem/perl_build.pm b/lib/Debian/Debhelper/Buildsystem/perl_build.pm
similarity index 100%
rename from Debian/Debhelper/Buildsystem/perl_build.pm
rename to lib/Debian/Debhelper/Buildsystem/perl_build.pm
diff --git a/Debian/Debhelper/Buildsystem/perl_makemaker.pm b/lib/Debian/Debhelper/Buildsystem/perl_makemaker.pm
similarity index 100%
rename from Debian/Debhelper/Buildsystem/perl_makemaker.pm
rename to lib/Debian/Debhelper/Buildsystem/perl_makemaker.pm
diff --git a/Debian/Debhelper/Buildsystem/python_distutils.pm b/lib/Debian/Debhelper/Buildsystem/python_distutils.pm
similarity index 100%
rename from Debian/Debhelper/Buildsystem/python_distutils.pm
rename to lib/Debian/Debhelper/Buildsystem/python_distutils.pm
diff --git a/Debian/Debhelper/Buildsystem/qmake.pm b/lib/Debian/Debhelper/Buildsystem/qmake.pm
similarity index 100%
rename from Debian/Debhelper/Buildsystem/qmake.pm
rename to lib/Debian/Debhelper/Buildsystem/qmake.pm
diff --git a/Debian/Debhelper/Buildsystem/qmake_qt4.pm b/lib/Debian/Debhelper/Buildsystem/qmake_qt4.pm
similarity index 100%
rename from Debian/Debhelper/Buildsystem/qmake_qt4.pm
rename to lib/Debian/Debhelper/Buildsystem/qmake_qt4.pm
diff --git a/Debian/Debhelper/Dh_Buildsystems.pm b/lib/Debian/Debhelper/Dh_Buildsystems.pm
similarity index 100%
rename from Debian/Debhelper/Dh_Buildsystems.pm
rename to lib/Debian/Debhelper/Dh_Buildsystems.pm
diff --git a/Debian/Debhelper/Dh_Getopt.pm b/lib/Debian/Debhelper/Dh_Getopt.pm
similarity index 100%
rename from Debian/Debhelper/Dh_Getopt.pm
rename to lib/Debian/Debhelper/Dh_Getopt.pm
diff --git a/Debian/Debhelper/Dh_Lib.pm b/lib/Debian/Debhelper/Dh_Lib.pm
similarity index 100%
rename from Debian/Debhelper/Dh_Lib.pm
rename to lib/Debian/Debhelper/Dh_Lib.pm
diff --git a/Debian/Debhelper/Sequence/build_stamp.pm b/lib/Debian/Debhelper/Sequence/build_stamp.pm
similarity index 100%
rename from Debian/Debhelper/Sequence/build_stamp.pm
rename to lib/Debian/Debhelper/Sequence/build_stamp.pm
diff --git a/Debian/Debhelper/Sequence/python_support.pm b/lib/Debian/Debhelper/Sequence/python_support.pm
similarity index 100%
rename from Debian/Debhelper/Sequence/python_support.pm
rename to lib/Debian/Debhelper/Sequence/python_support.pm
diff --git a/Debian/Debhelper/Sequence/systemd.pm b/lib/Debian/Debhelper/Sequence/systemd.pm
similarity index 100%
rename from Debian/Debhelper/Sequence/systemd.pm
rename to lib/Debian/Debhelper/Sequence/systemd.pm
diff --git a/run b/run
index 2c74976..304deaf 100755
--- a/run
+++ b/run
@@ -7,7 +7,7 @@ export PATH
# Ensure that builds are self-hosting, which means I have to use the .pm
# files in this package, not any that may be on the system.
-export PERL5LIB=$(pwd)
+export PERL5LIB=$(pwd)/lib
# If any automatic script generation is done in building this package,
# be sure to use the new templates from this package.
diff --git a/t/buildsystems/03-bs-auto-buildable.t b/t/buildsystems/03-bs-auto-buildable.t
index b2c82e2..c1229dc 100755
--- a/t/buildsystems/03-bs-auto-buildable.t
+++ b/t/buildsystems/03-bs-auto-buildable.t
@@ -60,7 +60,7 @@ my %options = (
);
make_path($sourcedir, $builddir);
use Config;
-my $libpath = $ENV{AUTOPKGTEST_TMP} ? $Config{vendorlib} : $Test::DH::ROOT_DIR;
+my $libpath = $ENV{AUTOPKGTEST_TMP} ? $Config{vendorlib} : "$Test::DH::ROOT_DIR/lib";
my @bs = load_all_buildsystems([ $libpath ], %options);
my %bs;
my @names = map { $_->NAME() } @bs;
diff --git a/t/override_target.t b/t/override_target.t
index 2ef0baa..bf7323b 100755
--- a/t/override_target.t
+++ b/t/override_target.t
@@ -12,7 +12,7 @@ my $binpath = $ENV{AUTOPKGTEST_TMP} ? '/usr/bin' : '../..';
print OUT <<EOF;
#!/usr/bin/make -f
%:
- PATH=../..:\$\$PATH PERL5LIB=../.. $binpath/dh \$@ --without autoreconf
+ PATH=../..:\$\$PATH PERL5LIB=../../lib $binpath/dh \$@ --without autoreconf
override_dh_update_autotools_config override_dh_strip_nondeterminism:
diff --git a/t/syntax/syntax-progs.t b/t/syntax/syntax-progs.t
index 0317c6e..93d00bb 100755
--- a/t/syntax/syntax-progs.t
+++ b/t/syntax/syntax-progs.t
@@ -10,7 +10,7 @@ use Test::DH;
use Config;
my $binpath = $ENV{AUTOPKGTEST_TMP} ? '/usr/bin' : '.';
-my $libpath = $ENV{AUTOPKGTEST_TMP} ? $Config{vendorlib} : '.';
+my $libpath = $ENV{AUTOPKGTEST_TMP} ? $Config{vendorlib} : 'lib';
my @targets;
if ($0 =~ m{syntax-progs\.t$}) {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git
More information about the debhelper-devel
mailing list