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

[SCM] Debian package checker branch, master, updated. 2.4.3-74-ga48fb5a



The following commit has been merged in the master branch:
commit a48fb5a20501a2e468401bfd2ea9e1aec085eb06
Author: Niels Thykier <niels@thykier.net>
Date:   Wed Dec 29 10:28:26 2010 +0100

    Added some /usr/share/doc/<pkg> -> <other> symlink tests.

diff --git a/t/COVERAGE b/t/COVERAGE
index 2291423..0e8b07b 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,4 +1,4 @@
-Last generated 2010-12-28
+Last generated 2010-12-29
 
 The following tags are not tested by the test suite:
 
@@ -26,8 +26,6 @@ control-files unknown-control-file
 
 copyright-file copyright-does-not-refer-to-common-license-file
 copyright-file copyright-should-refer-to-common-license-file-for-lgpl
-copyright-file usr-share-doc-symlink-points-outside-of-usr-share-doc
-copyright-file usr-share-doc-symlink-to-foreign-package
 
 cruft documentation-package-not-architecture-independent
 cruft source-contains-prebuilt-windows-binary
diff --git a/t/tests/files-flash-non-free/debian/debian/control.in b/t/tests/copyright-file-symlink/debian/debian/control.in
similarity index 68%
copy from t/tests/files-flash-non-free/debian/debian/control.in
copy to t/tests/copyright-file-symlink/debian/debian/control.in
index b531357..3997898 100644
--- a/t/tests/files-flash-non-free/debian/debian/control.in
+++ b/t/tests/copyright-file-symlink/debian/debian/control.in
@@ -3,26 +3,26 @@ Priority: extra
 Section: {$section}
 Maintainer: {$author}
 Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
-Homepage: http://lintian.debian.org/
+Build-Depends: debhelper (>= 7.0.50~)
 
-Package: {$srcpkg}
+Package: symlink-to-foreign
 Architecture: {$architecture}
-Depends: $\{misc:Depends\}
-Description: {$description}
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}, foreign-package
+Description: {$description} (foreign)
  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.  It may
  be an empty package.
+ .
+ Foreign
 
-Package: {$srcpkg}-non-free
-Section: non-free/{$section}
+Package: symlink-outside-usd
 Architecture: {$architecture}
-Depends: $\{misc:Depends\}
-Description: {$description} (okay)
- non-free in non-free, nice.
- .
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
+Description: {$description} (usd)
  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.  It may
  be an empty package.
+ .
+ USD
diff --git a/t/tests/copyright-file-symlink/debian/debian/rules b/t/tests/copyright-file-symlink/debian/debian/rules
new file mode 100644
index 0000000..37b7cf6
--- /dev/null
+++ b/t/tests/copyright-file-symlink/debian/debian/rules
@@ -0,0 +1,19 @@
+#!/usr/bin/make -f
+
+USD:=usr/share/doc
+%:
+	dh $@
+
+
+override_dh_md5sums:
+	rm -fr debian/symlink-to-foreign/$(USD)/symlink-to-foreign
+	ln -sf foreign-package \
+		debian/symlink-to-foreign/$(USD)/symlink-to-foreign
+	# Move all of it to usr/lib/<package>/
+	mkdir -p debian/symlink-outside-usd/usr/lib/
+	mv debian/symlink-outside-usd/$(USD)/symlink-outside-usd \
+		debian/symlink-outside-usd/usr/lib/symlink-outside-usd/
+	# with symlink of course :)
+	ln -s ../../lib/symlink-outside-usd/copyright \
+		debian/symlink-outside-usd/$(USD)/symlink-outside-usd
+	dh_md5sums
diff --git a/t/tests/copyright-file-symlink/desc b/t/tests/copyright-file-symlink/desc
new file mode 100644
index 0000000..3fc7062
--- /dev/null
+++ b/t/tests/copyright-file-symlink/desc
@@ -0,0 +1,7 @@
+Testname: copyright-file-symlink
+Sequence: 6000
+Version: 1.0
+Description: Test for symlinked copyright files
+Test-For:
+ usr-share-doc-symlink-points-outside-of-usr-share-doc 
+ usr-share-doc-symlink-to-foreign-package
diff --git a/t/tests/copyright-file-symlink/tags b/t/tests/copyright-file-symlink/tags
new file mode 100644
index 0000000..5c6372a
--- /dev/null
+++ b/t/tests/copyright-file-symlink/tags
@@ -0,0 +1,2 @@
+E: symlink-outside-usd: usr-share-doc-symlink-points-outside-of-usr-share-doc ../../lib/symlink-outside-usd/copyright
+E: symlink-to-foreign: usr-share-doc-symlink-to-foreign-package foreign-package

-- 
Debian package checker


Reply to: