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

[SCM] Debian package checker branch, master, updated. 2.4.3-83-g3a5cfb1



The following commit has been merged in the master branch:
commit 3a5cfb1a9eb66ccc0fb93200d8f971579807319a
Author: Niels Thykier <niels@thykier.net>
Date:   Thu Dec 30 11:02:28 2010 +0100

    Another symlink doc directory check.

diff --git a/t/COVERAGE b/t/COVERAGE
index d688773..07dddfc 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -205,7 +205,6 @@ control-files control-file-has-bad-permissions
 control-files control-file-is-empty
 
 copyright-file old-fsf-address-in-copyright-file
-copyright-file usr-share-doc-symlink-without-dependency
 
 debconf config-does-not-load-confmodule
 debconf debconf-config-not-executable
@@ -580,7 +579,6 @@ relations
   quilt-build-dep-but-no-series-file
   redundant-bugs-field
   redundant-origin-field
-  usr-share-doc-symlink-without-dependency
   versioned-dependency-satisfied-by-perl
 
 scripts
diff --git a/t/tests/copyright-file-symlink/debian/debian/control.in b/t/tests/copyright-file-symlink/debian/debian/control.in
index 3997898..0949e02 100644
--- a/t/tests/copyright-file-symlink/debian/debian/control.in
+++ b/t/tests/copyright-file-symlink/debian/debian/control.in
@@ -6,23 +6,34 @@ Standards-Version: {$standards_version}
 Build-Depends: debhelper (>= 7.0.50~)
 
 Package: symlink-to-foreign
-Architecture: {$architecture}
-Depends: $\{shlibs:Depends\}, $\{misc:Depends\}, foreign-package
+Architecture: all
+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
+ Foreign.
 
 Package: symlink-outside-usd
-Architecture: {$architecture}
-Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
+Architecture: all
+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
+ USD.
+
+Package: symlink-without-depends
+Architecture: all
+Depends: $\{misc:Depends\}
+Description: {$description} (no-deepnds)
+ 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.
+ .
+ Symlinks without dependency.
diff --git a/t/tests/copyright-file-symlink/debian/debian/rules b/t/tests/copyright-file-symlink/debian/debian/rules
index 37b7cf6..d48f723 100644
--- a/t/tests/copyright-file-symlink/debian/debian/rules
+++ b/t/tests/copyright-file-symlink/debian/debian/rules
@@ -9,6 +9,9 @@ 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
+	rm -fr debian/symlink-without-depends/$(USD)/symlink-without-depends
+	ln -sf foreign-package \
+		debian/symlink-without-depends/$(USD)/symlink-without-depends
 	# 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 \
diff --git a/t/tests/copyright-file-symlink/desc b/t/tests/copyright-file-symlink/desc
index 3fc7062..589b29f 100644
--- a/t/tests/copyright-file-symlink/desc
+++ b/t/tests/copyright-file-symlink/desc
@@ -1,7 +1,8 @@
 Testname: copyright-file-symlink
 Sequence: 6000
 Version: 1.0
-Description: Test for symlinked copyright files
+Description: Test for symlinked doc directories
 Test-For:
  usr-share-doc-symlink-points-outside-of-usr-share-doc 
  usr-share-doc-symlink-to-foreign-package
+ usr-share-doc-symlink-without-dependency
diff --git a/t/tests/copyright-file-symlink/tags b/t/tests/copyright-file-symlink/tags
index 5c6372a..66b0e7d 100644
--- a/t/tests/copyright-file-symlink/tags
+++ b/t/tests/copyright-file-symlink/tags
@@ -1,2 +1,3 @@
 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
+E: symlink-without-depends: usr-share-doc-symlink-without-dependency foreign-package

-- 
Debian package checker


Reply to: