[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 890f9db51d6989f5ce8476e016fafa9c0984936f
Author: Russ Allbery <rra@debian.org>
Date:   Tue Dec 30 17:22:33 2008 -0800

    Retire the old dh-test test case
    
    Add new debhelper-no-depends and scripts-maintainer-script-empty tests
    to cover the remaining tags that the old test case had been handling.

diff --git a/t/tests/6000_debhelper-no-depends.desc b/t/tests/6000_debhelper-no-depends.desc
new file mode 100644
index 0000000..ea1b967
--- /dev/null
+++ b/t/tests/6000_debhelper-no-depends.desc
@@ -0,0 +1,8 @@
+Testname: debhelper-no-depends
+Version: 1.0
+Description: Test dependency requirements for debhelper
+Test-For:
+ debhelper-but-no-misc-depends
+ missing-build-dependency-for-dh_-command
+ package-lacks-versioned-build-depends-on-debhelper
+ package-uses-debhelper-but-lacks-build-depends
diff --git a/t/tests/6000_scripts-maintainer-script-empty.desc b/t/tests/6000_scripts-maintainer-script-empty.desc
new file mode 100644
index 0000000..425a622
--- /dev/null
+++ b/t/tests/6000_scripts-maintainer-script-empty.desc
@@ -0,0 +1,4 @@
+Testname: scripts-maintainer-script-empty
+Version: 1.0
+Description: Test for empty maintainer scripts
+Test-For: maintainer-script-empty
diff --git a/t/templates/skel/debian/control.in b/t/tests/debhelper-no-depends/debian/debian/control.in
similarity index 82%
copy from t/templates/skel/debian/control.in
copy to t/tests/debhelper-no-depends/debian/debian/control.in
index f8f5c04..32a68ca 100644
--- a/t/templates/skel/debian/control.in
+++ b/t/tests/debhelper-no-depends/debian/debian/control.in
@@ -3,11 +3,9 @@ Priority: extra
 Section: {$section}
 Maintainer: {$author}
 Standards-Version: 3.8.0
-Build-Depends: debhelper (>= 7)
 
 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
diff --git a/t/tests/debhelper-no-depends/debian/debian/rules b/t/tests/debhelper-no-depends/debian/debian/rules
new file mode 100755
index 0000000..18dc726
--- /dev/null
+++ b/t/tests/debhelper-no-depends/debian/debian/rules
@@ -0,0 +1,12 @@
+#!/usr/bin/make -f
+%:
+	dh $@
+
+binary: binary-arch binary-indep
+binary-arch:
+binary-indep:
+	dh binary-indep --until dh_prep
+	-dh_clideps
+	-dh_gtkmodules
+	dh_lisp || true
+	dh binary-indep --remaining
diff --git a/t/tests/debhelper-no-depends/tags b/t/tests/debhelper-no-depends/tags
new file mode 100644
index 0000000..ad1fc3c
--- /dev/null
+++ b/t/tests/debhelper-no-depends/tags
@@ -0,0 +1,6 @@
+E: debhelper-no-depends source: missing-build-dependency-for-dh_-command dh_clideps=cli-common-dev
+E: debhelper-no-depends source: missing-build-dependency-for-dh_-command dh_gtkmodules=libgtk2.0-dev
+E: debhelper-no-depends source: missing-build-dependency-for-dh_-command dh_lisp=dh-lisp
+E: debhelper-no-depends source: package-uses-debhelper-but-lacks-build-depends
+I: debhelper-no-depends source: package-lacks-versioned-build-depends-on-debhelper 7
+W: debhelper-no-depends source: debhelper-but-no-misc-depends debhelper-no-depends
diff --git a/t/tests/generic-dh-make-2008/debian/debian/postinst.ex b/t/tests/scripts-maintainer-script-empty/debian/debian/postinst
similarity index 100%
copy from t/tests/generic-dh-make-2008/debian/debian/postinst.ex
copy to t/tests/scripts-maintainer-script-empty/debian/debian/postinst
diff --git a/t/tests/generic-dh-make-2008/debian/debian/postrm.ex b/t/tests/scripts-maintainer-script-empty/debian/debian/postrm
similarity index 100%
copy from t/tests/generic-dh-make-2008/debian/debian/postrm.ex
copy to t/tests/scripts-maintainer-script-empty/debian/debian/postrm
diff --git a/t/tests/generic-dh-make-2008/debian/debian/preinst.ex b/t/tests/scripts-maintainer-script-empty/debian/debian/preinst
similarity index 100%
copy from t/tests/generic-dh-make-2008/debian/debian/preinst.ex
copy to t/tests/scripts-maintainer-script-empty/debian/debian/preinst
diff --git a/t/tests/generic-dh-make-2008/debian/debian/prerm.ex b/t/tests/scripts-maintainer-script-empty/debian/debian/prerm
similarity index 100%
copy from t/tests/generic-dh-make-2008/debian/debian/prerm.ex
copy to t/tests/scripts-maintainer-script-empty/debian/debian/prerm
diff --git a/t/tests/scripts-maintainer-script-empty/tags b/t/tests/scripts-maintainer-script-empty/tags
new file mode 100644
index 0000000..ce95df2
--- /dev/null
+++ b/t/tests/scripts-maintainer-script-empty/tags
@@ -0,0 +1,4 @@
+W: scripts-maintainer-script-empty: maintainer-script-empty postinst
+W: scripts-maintainer-script-empty: maintainer-script-empty postrm
+W: scripts-maintainer-script-empty: maintainer-script-empty preinst
+W: scripts-maintainer-script-empty: maintainer-script-empty prerm
diff --git a/testset/dh-test/debian/README.Debian b/testset/dh-test/debian/README.Debian
deleted file mode 100644
index 5ce4495..0000000
--- a/testset/dh-test/debian/README.Debian
+++ /dev/null
@@ -1,6 +0,0 @@
-dh-test for Debian
-------------------
-
-<possible notes regarding this package - if none, delete this file>
-
- -- Frank Lichtenheld <djpig@debian.org>, Thu,  4 Aug 2005 23:09:00 +0200
diff --git a/testset/dh-test/debian/changelog b/testset/dh-test/debian/changelog
deleted file mode 100644
index 5886b75..0000000
--- a/testset/dh-test/debian/changelog
+++ /dev/null
@@ -1,6 +0,0 @@
-dh-test (1-1) unstable; urgency=low
-
-  * Initial release Closes: #nnnn  (nnnn is the bug number of your ITP)
-
- -- Frank Lichtenheld <djpig@debian.org>  Thu,  4 Aug 2005 23:09:00 +0200
-
diff --git a/testset/dh-test/debian/control b/testset/dh-test/debian/control
deleted file mode 100644
index d0890b2..0000000
--- a/testset/dh-test/debian/control
+++ /dev/null
@@ -1,12 +0,0 @@
-Source: dh-test
-Section: unknown
-Priority: optional
-Maintainer: Frank Lichtenheld <djpig@debian.org>
-Build-Depends: debhelper (>= 4.0.0)
-Standards-Version: 3.6.2
-
-Package: dh-test
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: <insert up to 60 chars description>
- <insert long description, indented with spaces>
diff --git a/testset/dh-test/debian/copyright b/testset/dh-test/debian/copyright
deleted file mode 100644
index 2bcce49..0000000
--- a/testset/dh-test/debian/copyright
+++ /dev/null
@@ -1,10 +0,0 @@
-This package was debianized by Frank Lichtenheld <djpig@debian.org> on
-Thu,  4 Aug 2005 23:09:00 +0200.
-
-It was downloaded from <fill in ftp site>
-
-Copyright Holder: <put author(s) name and email here>
-
-License:
-
-<Put the license of the package here>
diff --git a/testset/dh-test/debian/postinst b/testset/dh-test/debian/postinst
deleted file mode 100644
index 4f37c66..0000000
--- a/testset/dh-test/debian/postinst
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-# postinst script for #PACKAGE#
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    configure)
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/testset/dh-test/debian/rules b/testset/dh-test/debian/rules
deleted file mode 100755
index 613cf7c..0000000
--- a/testset/dh-test/debian/rules
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-DH_COMPAT=3
-export DH_COMPAT
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-
-	touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp 
-	dh_testdir
-
-	# Add here commands to compile the package.
-#	$(MAKE)
-	#docbook-to-man debian/dh-test.sgml > dh-test.1
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
-	-$(MAKE) clean
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# Add here commands to install the package into debian/dh-test.
-#	$(MAKE) install DESTDIR=$(CURDIR)/debian/dh-test
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testversion
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installexamples
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installxfonts
-	dh_installman
-	-dh_gnustep
-#	dh_dhelp
-	dh_suidregister
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-	-dh_lisp
-#	dh_python
-#	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/testset/tags.dh-test b/testset/tags.dh-test
deleted file mode 100644
index 9398521..0000000
--- a/testset/tags.dh-test
+++ /dev/null
@@ -1,19 +0,0 @@
-E: dh-test source: missing-build-dependency-for-dh_-command dh_gnustep=gnustep-make
-E: dh-test source: missing-build-dependency-for-dh_-command dh_lisp=dh-lisp
-E: dh-test: description-is-dh_make-template
-E: dh-test: helper-templates-in-copyright
-E: dh-test: section-is-dh_make-template
-I: dh-test: extended-description-is-probably-too-short
-W: dh-test source: ancient-standards-version 3.6.2 (current is 3.8.0)
-W: dh-test source: debhelper-but-no-misc-depends dh-test
-W: dh-test source: debian-rules-ignores-make-clean-error line 48
-W: dh-test source: debian-rules-sets-DH_COMPAT line 12
-W: dh-test source: dh_suidregister-is-obsolete
-W: dh-test source: dh_testversion-is-deprecated
-W: dh-test source: native-package-with-dash-version
-W: dh-test source: package-uses-deprecated-debhelper-compat-version 3
-W: dh-test: copyright-without-copyright-notice
-W: dh-test: maintainer-script-empty postinst
-W: dh-test: new-package-should-close-itp-bug
-W: dh-test: readme-debian-contains-debmake-template
-W: dh-test: wrong-bug-number-in-closes l3:#nnnn

-- 
Debian package checker


Reply to: