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

[SCM] Debian package checker branch, master, updated. 2.1.3-45-g2209841



The following commit has been merged in the master branch:
commit 2209841350f0d28067023dc863dfcc7d877bfb0c
Author: Russ Allbery <rra@debian.org>
Date:   Tue Dec 30 18:14:21 2008 -0800

    Remove old empty test case
    
    Add a new test case for packages in the wrong section and remove the old
    empty test case, since everything it was testing is now covered.

diff --git a/t/tests/6000_files-wrong-section.desc b/t/tests/6000_files-wrong-section.desc
new file mode 100644
index 0000000..dbd0175
--- /dev/null
+++ b/t/tests/6000_files-wrong-section.desc
@@ -0,0 +1,8 @@
+Testname: files-wrong-section
+Version: 1.0
+Description: Packages placed in the wrong sections
+Test-For:
+ doc-package-should-be-section-doc
+ dev-package-should-be-section-libdevel
+ perl-package-should-be-section-perl
+ python-package-should-be-section-python
diff --git a/t/tests/scripts-control-interpreters/debian/debian/control.in b/t/tests/files-wrong-section/debian/debian/control.in
similarity index 66%
copy from t/tests/scripts-control-interpreters/debian/debian/control.in
copy to t/tests/files-wrong-section/debian/debian/control.in
index cb5466a..9ecaf8b 100644
--- a/t/tests/scripts-control-interpreters/debian/debian/control.in
+++ b/t/tests/files-wrong-section/debian/debian/control.in
@@ -5,43 +5,34 @@ Maintainer: {$author}
 Standards-Version: 3.8.0
 Build-Depends: debhelper (>= 7)
 
-Package: {$srcpkg}-paths
+Package: {$srcpkg}-doc
 Architecture: {$architecture}
 Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
-Description: {$description} (paths)
+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.
 
-Package: {$srcpkg}-forbidden
+Package: lib{$srcpkg}-dev
 Architecture: {$architecture}
 Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
-Description: {$description} (forbidden)
+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.
 
-Package: {$srcpkg}-unknown
+Package: lib{$srcpkg}-perl
 Architecture: {$architecture}
 Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
-Description: {$description} (forbidden)
+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.
 
-Package: {$srcpkg}-python
+Package: python-{$srcpkg}
 Architecture: {$architecture}
-Depends: python, $\{shlibs:Depends\}, $\{misc:Depends\}
-Description: {$description} (python)
- 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.
-
-Package: {$srcpkg}-prepython
-Architecture: {$architecture}
-Pre-Depends: python
 Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
-Description: {$description} (python)
+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/files-wrong-section/tags b/t/tests/files-wrong-section/tags
new file mode 100644
index 0000000..d1c7e37
--- /dev/null
+++ b/t/tests/files-wrong-section/tags
@@ -0,0 +1,4 @@
+W: files-wrong-section-doc: doc-package-should-be-section-doc files-wrong-section-doc
+W: libfiles-wrong-section-dev: dev-package-should-be-section-libdevel libfiles-wrong-section-dev
+W: libfiles-wrong-section-perl: perl-package-should-be-section-perl libfiles-wrong-section-perl
+W: python-files-wrong-section: python-package-should-be-section-python python-files-wrong-section
diff --git a/testset/empty/debian/changelog b/testset/empty/debian/changelog
deleted file mode 100644
index 1e8cca3..0000000
--- a/testset/empty/debian/changelog
+++ /dev/null
@@ -1,11 +0,0 @@
-empty (2) unstable; urgency=low
-
-  * Add pyempty, empty-docs and empty-perl (to check for section errors)
-
- -- Marc 'HE' Brockschmidt <he@debian.org>  Thu, 29 Nov 2007 12:48:13 +0100
-
-empty (1) unstable; urgency=low
-
-  * Initial version
-
- -- Richard Braakman <dark@xs4all.nl>  Wed, 10 Jun 1998 19:45:40 +0200
diff --git a/testset/empty/debian/control b/testset/empty/debian/control
deleted file mode 100644
index 5825d59..0000000
--- a/testset/empty/debian/control
+++ /dev/null
@@ -1,17 +0,0 @@
-Source: empty
-Maintainer: empty
-
-Package: empty
-Architecture: all
-
-Package: empty-docs
-Architecture: all
-Section: perl
-
-Package: libempty-perl
-Architecture: all
-Section: doc
-
-Package: python-empty
-Architecture: all
-Section: doc
diff --git a/testset/empty/debian/rules b/testset/empty/debian/rules
deleted file mode 100755
index b3d4e70..0000000
--- a/testset/empty/debian/rules
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/make -f
-
-# Copyright (C) 1998 Richard Braakman
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, you can find it on the World Wide
-# Web at http://www.gnu.org/copyleft/gpl.html, or write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-
-build:
-
-binary-indep:
-	install -d debian/empty debian/empty/DEBIAN
-	dpkg-gencontrol -pempty -Pdebian/empty
-	dpkg --build debian/empty ..
-	install -d debian/empty-docs debian/empty-docs/DEBIAN
-	dpkg-gencontrol -pempty-docs -Pdebian/empty-docs
-	dpkg --build debian/empty-docs ..
-	install -d debian/libempty-perl debian/libempty-perl/DEBIAN
-	dpkg-gencontrol -plibempty-perl -Pdebian/libempty-perl
-	dpkg --build debian/libempty-perl ..
-	install -d debian/python-empty debian/python-empty/DEBIAN
-	dpkg-gencontrol -ppython-empty -Pdebian/python-empty
-	dpkg --build debian/python-empty ..
-
-binary: binary-indep
-
-clean:
-	rm -rf $(CURDIR)/debian/empty $(CURDIR)/debian/empty-docs \
-		$(CURDIR)/debian/libempty-perl $(CURDIR)/debian/python-empty \
-		debian/files
-
-.PHONY: build binary-indep binary clean
diff --git a/testset/tags.empty b/testset/tags.empty
deleted file mode 100644
index d931b74..0000000
--- a/testset/tags.empty
+++ /dev/null
@@ -1,31 +0,0 @@
-E: empty source: debian-rules-missing-required-target binary-arch
-E: empty source: maintainer-address-missing empty
-E: empty source: no-standards-version-field
-E: empty-docs: maintainer-address-missing empty
-E: empty-docs: no-copyright-file
-E: empty-docs: package-has-no-description
-E: empty: maintainer-address-missing empty
-E: empty: no-copyright-file
-E: empty: package-has-no-description
-E: libempty-perl: maintainer-address-missing empty
-E: libempty-perl: no-copyright-file
-E: libempty-perl: package-has-no-description
-E: python-empty: maintainer-address-missing empty
-E: python-empty: no-copyright-file
-E: python-empty: package-has-no-description
-W: empty source: changelog-should-mention-nmu
-W: empty source: maintainer-not-full-name empty
-W: empty source: no-section-field-for-source
-W: empty source: source-nmu-has-incorrect-version-number 2
-W: empty-docs: doc-package-should-be-section-doc empty-docs
-W: empty-docs: maintainer-not-full-name empty
-W: empty-docs: no-priority-field
-W: empty: maintainer-not-full-name empty
-W: empty: no-priority-field
-W: empty: no-section-field
-W: libempty-perl: maintainer-not-full-name empty
-W: libempty-perl: no-priority-field
-W: libempty-perl: perl-package-should-be-section-perl libempty-perl
-W: python-empty: maintainer-not-full-name empty
-W: python-empty: no-priority-field
-W: python-empty: python-package-should-be-section-python python-empty

-- 
Debian package checker


Reply to: