[SCM] Debian package checker branch, master, updated. 2.3.3-59-gb6b4ca8
The following commit has been merged in the master branch:
commit b6b4ca8641e0e543b7d9ced06a1efec069c8727b
Author: Raphael Geissert <atomo64@gmail.com>
Date: Sun Mar 21 11:14:21 2010 -0600
Add changelog entry and tweak the MakeMaker check
Shorten the tag name and change the wording a bit. Also drop unneeded
files from the test case.
* checks/rules:
+ [RG] Warn about installing files specifying the destination
directory with PREFIX when Perl's MakeMaker build system is used.
Based on a patch by Niko Tyni. (Closes: #568748)
diff --git a/checks/rules b/checks/rules
index 5af27af..c001895 100644
--- a/checks/rules
+++ b/checks/rules
@@ -172,7 +172,7 @@ while (<RULES>) {
tag 'debian-rules-automatically-updates-control', "line $.";
}
if ($uses_makefile_pl && /install.*PREFIX/ && !/DESTDIR/) {
- tag 'debian-rules-perl-makemaker-prefix-is-deprecated', "line $.";
+ tag 'debian-rules-makemaker-prefix-is-deprecated', "line $.";
}
# Keep track of whether this portion of debian/rules may be optional
diff --git a/checks/rules.desc b/checks/rules.desc
index 801f291..a22377c 100644
--- a/checks/rules.desc
+++ b/checks/rules.desc
@@ -159,19 +159,20 @@ Info: The specified package is required to run the clean target of
Build-Depends-Indep, even if no architecture-dependent packages are
built.
-Tag: debian-rules-perl-makemaker-prefix-is-deprecated
+Tag: debian-rules-makemaker-prefix-is-deprecated
Severity: normal
Certainty: possible
-Info: The package appears to use an ExtUtils::MakeMaker (Makefile.PL)
- build system and sets the temporary installation path by overriding
- PREFIX when calling `make install'. This only works because of a Debian
- specific ExtUtils::MakeMaker change that the maintainers of the Debian
- perl package want to remove once the packages needing it are fixed.
+Ref: http://bugs.debian.org/545904
+Info: The package appears to use an <tt>ExtUtils::MakeMaker</tt>
+ (Makefile.PL) build system and sets the temporary installation path by
+ overriding <tt>PREFIX</tt> when calling <tt>make install</tt>. This only
+ works because of a Debian-specific change to <tt>ExtUtils::MakeMaker</tt>
+ that the maintainers of the Debian perl package intend to remove.
.
- The preferred way to set the installation directory is with DESTDIR.
- Setting PREFIX should not be necessary at all. For example, the line
- make install PREFIX=$(TMP)/usr # WRONG
- should be replaced with
- make install DESTDIR=$(TMP) # RIGHT
+ The correct way to set the installation directory is with DESTDIR.
+ Setting PREFIX should not be necessary at all.
.
- See http://bugs.debian.org/545904 for more details.
+ For example, the line
+ make install PREFIX=$(TMP)/usr # WRONG
+ should be replaced with
+ make install DESTDIR=$(TMP) # RIGHT
diff --git a/debian/changelog b/debian/changelog
index e869e52..dde5f57 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ lintian (2.3.4) UNRELEASED; urgency=low
* Summary of tag changes:
+ Added:
- control-file-with-CRLF-EOLs
+ - debian-rules-makemaker-prefix-is-deprecated
- empty-binary-package
- missing-debian-source-format
- possible-new-upstream-release-without-new-version
@@ -66,6 +67,9 @@ lintian (2.3.4) UNRELEASED; urgency=low
Rene Engelhard. (Closes: #572430)
+ [RG] Require a versioned build-dependency on cdbs if scons.mk or
perl-build.mk are used. (Closes: #574744)
+ + [RG] Warn about installing files specifying the destination
+ directory with PREFIX when Perl's MakeMaker build system is used.
+ Based on a patch by Niko Tyni. (Closes: #568748)
* checks/scripts:
+ [ADB] Update the list of octave interpreters, adding octave3.2
(Closes: #574048) and removing octave2.1 (only available in lenny
diff --git a/t/tests/rules-perl-makemaker/debian/debian/compat b/t/tests/rules-perl-makemaker/debian/debian/compat
deleted file mode 100644
index 7ed6ff8..0000000
--- a/t/tests/rules-perl-makemaker/debian/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/t/tests/rules-perl-makemaker/debian/debian/control.in b/t/tests/rules-perl-makemaker/debian/debian/control.in
deleted file mode 100644
index d52ef24..0000000
--- a/t/tests/rules-perl-makemaker/debian/debian/control.in
+++ /dev/null
@@ -1,14 +0,0 @@
-Source: {$srcpkg}
-Priority: extra
-Section: {$section}
-Maintainer: {$author}
-Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 5)
-
-Package: {$srcpkg}
-Architecture: {$architecture}
-Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
-Description: {$description}
- This is a test package designed to exercise some feature or tag of
- Lintian. It is part of the Lintian test suite and may do very odd
- things. It should not be installed like a regular package.
diff --git a/t/tests/rules-perl-makemaker/debian/debian/rules b/t/tests/rules-perl-makemaker/debian/debian/rules
index 4559967..e8ba5e8 100755
--- a/t/tests/rules-perl-makemaker/debian/debian/rules
+++ b/t/tests/rules-perl-makemaker/debian/debian/rules
@@ -35,7 +35,7 @@ clean:
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
$(MAKE) install PREFIX=$(TMP)/usr
diff --git a/t/tests/rules-perl-makemaker/desc b/t/tests/rules-perl-makemaker/desc
index 04e6615..a7604c6 100644
--- a/t/tests/rules-perl-makemaker/desc
+++ b/t/tests/rules-perl-makemaker/desc
@@ -2,5 +2,5 @@ Testname: rules-perl-makemaker
Sequence: 6000
Version: 1.0
Description: Check detection of PREFIX usage in Makefile.PL based packages
-Test-For: debian-rules-perl-makemaker-prefix-is-deprecated
+Test-For: debian-rules-makemaker-prefix-is-deprecated
References: Debian Bug#545904
diff --git a/t/tests/rules-perl-makemaker/tags b/t/tests/rules-perl-makemaker/tags
index 96918df..42a8285 100644
--- a/t/tests/rules-perl-makemaker/tags
+++ b/t/tests/rules-perl-makemaker/tags
@@ -1 +1 @@
-W: rules-perl-makemaker source: debian-rules-perl-makemaker-prefix-is-deprecated line 41
+W: rules-perl-makemaker source: debian-rules-makemaker-prefix-is-deprecated line 41
--
Debian package checker
Reply to: