[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.5.1-174-gc6b2a17



The following commit has been merged in the master branch:
commit c6b2a1789a59950f5ce3d6602feb54d9e8cd323b
Author: Niels Thykier <niels@thykier.net>
Date:   Wed Aug 3 22:49:16 2011 +0200

    Added test for installing stuff in usr/X11R6

diff --git a/t/COVERAGE b/t/COVERAGE
index d924f95..b77b9d4 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,5 +1,5 @@
 Last generated 2011-08-03
-Coverage: 676/914 (73.96%), w. legacy tests: 806/914 (88.18%)
+Coverage: 678/914 (74.18%), w. legacy tests: 806/914 (88.18%)
 
 The following tags are not tested by the test suite:
 
@@ -182,8 +182,6 @@ files package-contains-readme-for-other-platform-or-distro
 files package-contains-upstream-install-documentation
 files package-contains-vcs-control-dir
 files package-contains-vcs-control-file
-files package-installs-file-to-usr-x11r6
-files package-installs-file-to-usr-x11r6-bin
 files package-installs-into-etc-gconf-schemas
 files package-installs-nonbinary-perl-in-usr-lib-perl5
 files package-installs-packlist
@@ -368,8 +366,6 @@ filenames
   package-contains-readme-for-other-platform-or-distro
   package-contains-vcs-control-dir
   package-contains-vcs-control-file
-  package-installs-file-to-usr-x11r6
-  package-installs-file-to-usr-x11r6-bin
   package-installs-into-etc-gconf-schemas
   package-installs-nonbinary-perl-in-usr-lib-perl5
   package-installs-packlist
diff --git a/t/tests/files-foo-in-bar/debian/bar.pod b/t/tests/files-foo-in-bar/debian/bar.pod
new file mode 100644
index 0000000..4144a36
--- /dev/null
+++ b/t/tests/files-foo-in-bar/debian/bar.pod
@@ -0,0 +1,18 @@
+
+=head1 NAME
+
+bar - does stuff
+
+=head1 SYNOPSIS
+
+bar
+
+=head1 DESCRIPTION
+
+Does nothing.
+
+=head1 AUTHOR
+
+Niels Thykier <niels@thykier.net>
+
+=cut
diff --git a/t/tests/files-foo-in-bar/debian/debian/clean b/t/tests/files-foo-in-bar/debian/debian/clean
new file mode 100644
index 0000000..a504f50
--- /dev/null
+++ b/t/tests/files-foo-in-bar/debian/debian/clean
@@ -0,0 +1 @@
+bar.1
diff --git a/t/tests/files-foo-in-bar/debian/debian/install b/t/tests/files-foo-in-bar/debian/debian/install
index 14646e2..a9f1beb 100644
--- a/t/tests/files-foo-in-bar/debian/debian/install
+++ b/t/tests/files-foo-in-bar/debian/debian/install
@@ -13,6 +13,7 @@ bar usr/local/foo
 bar usr/share
 bar usr/share/doc
 bar usr/share/doc/files-foo-in-bar/examples/examples
+bar usr/X11R6/bin
 bar var/foo
 bar var/lock/foo
 bar var/run/foo
diff --git a/reporting/lintian-dummy.cfg b/t/tests/files-foo-in-bar/debian/debian/manpages
similarity index 100%
copy from reporting/lintian-dummy.cfg
copy to t/tests/files-foo-in-bar/debian/debian/manpages
diff --git a/t/tests/files-foo-in-bar/debian/debian/rules b/t/tests/files-foo-in-bar/debian/debian/rules
index 6f49a5e..0a16a75 100755
--- a/t/tests/files-foo-in-bar/debian/debian/rules
+++ b/t/tests/files-foo-in-bar/debian/debian/rules
@@ -1,6 +1,13 @@
 #!/usr/bin/make -f
 %:
 	dh $@
-binary:
-	dh --before dh_usrlocal binary
-	dh --after dh_usrlocal binary
+
+override_dh_auto_build:
+	pod2man --section 1 bar.pod > bar.1
+	gzip --best bar.1
+
+override_dh_auto_install:
+	dh_install bar.1.gz usr/X11R6/man/man1/
+
+override_dh_usrlocal:
+	# skip
diff --git a/t/tests/files-foo-in-bar/desc b/t/tests/files-foo-in-bar/desc
index 5c235b6..3f16939 100644
--- a/t/tests/files-foo-in-bar/desc
+++ b/t/tests/files-foo-in-bar/desc
@@ -16,8 +16,12 @@ Test-For:
  file-in-usr-lib-sgml
  file-in-usr-lib-site-python
  file-in-usr-local
+ package-installs-file-to-usr-x11r6
+ package-installs-file-to-usr-x11r6-bin
  nested-examples-directory
  non-standard-dir-in-usr
  non-standard-dir-in-var
  subdir-in-bin
  udev-rule-in-etc
+
+
diff --git a/t/tests/files-foo-in-bar/tags b/t/tests/files-foo-in-bar/tags
index 38c342b..ba80548 100644
--- a/t/tests/files-foo-in-bar/tags
+++ b/t/tests/files-foo-in-bar/tags
@@ -20,6 +20,12 @@ E: files-foo-in-bar: file-in-usr-lib-site-python usr/lib/site-python/foo/bar
 E: files-foo-in-bar: file-in-usr-local usr/local/foo/bar
 E: files-foo-in-bar: nested-examples-directory usr/share/doc/files-foo-in-bar/examples/examples/
 E: files-foo-in-bar: non-standard-dir-in-var var/foo/
+E: files-foo-in-bar: package-installs-file-to-usr-x11r6 usr/X11R6/
+E: files-foo-in-bar: package-installs-file-to-usr-x11r6 usr/X11R6/man/
+E: files-foo-in-bar: package-installs-file-to-usr-x11r6 usr/X11R6/man/man1/
+E: files-foo-in-bar: package-installs-file-to-usr-x11r6 usr/X11R6/man/man1/bar.1.gz
+E: files-foo-in-bar: package-installs-file-to-usr-x11r6-bin usr/X11R6/bin/
+E: files-foo-in-bar: package-installs-file-to-usr-x11r6-bin usr/X11R6/bin/bar
 E: files-foo-in-bar: subdir-in-bin bin/foo/
 E: files-foo-in-bar: subdir-in-usr-bin usr/bin/foo/
 E: files-foo-in-bar: udev-rule-in-etc etc/udev/rules.d/bar

-- 
Debian package checker


Reply to: