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

lintian: r366 - in trunk: checks debian testset testset/debconf testset/debconf/debian testset/debconf/debian/po



Author: djpig
Date: 2004-11-13 23:33:08 +0100 (Sat, 13 Nov 2004)
New Revision: 366

Added:
   trunk/testset/debconf/
   trunk/testset/debconf/debian/
   trunk/testset/debconf/debian/changelog
   trunk/testset/debconf/debian/compat
   trunk/testset/debconf/debian/control
   trunk/testset/debconf/debian/copyright
   trunk/testset/debconf/debian/debconf-test.config
   trunk/testset/debconf/debian/debconf-test.postinst
   trunk/testset/debconf/debian/debconf-test.templates
   trunk/testset/debconf/debian/debconf-udeb.postinst
   trunk/testset/debconf/debian/debconf-udeb.templates
   trunk/testset/debconf/debian/po/
   trunk/testset/debconf/debian/po/POTFILES.in
   trunk/testset/debconf/debian/po/output
   trunk/testset/debconf/debian/po/templates.pot
   trunk/testset/debconf/debian/rules
   trunk/testset/tags.debconf
Modified:
   trunk/checks/debconf
   trunk/checks/debconf.desc
   trunk/debian/changelog
   trunk/testset/runtests
Log:
* checks/debconf{,.desc}:
  + The SETTITLE command was introduced in debconf version
    1.3.22. Check the depends for that (Closes: #261890)
* testset/debconf/*,testset/tags.debconf:
  + New test package for debconf and udeb tests
* testset/runtests:
  + Make checks of udeb packages possible


Modified: trunk/checks/debconf
===================================================================
--- trunk/checks/debconf	2004-11-13 21:25:00 UTC (rev 365)
+++ trunk/checks/debconf	2004-11-13 22:33:08 UTC (rev 366)
@@ -236,6 +236,7 @@
 	my $db_input='';
 	my $isdefault='';
 	my $usesseen='';
+	my $usessettitle='';
 
 	my $fl = <IN>;
 	next unless $fl && ( $fl =~ /^#!/ ); # skip, if not a script
@@ -267,12 +268,20 @@
 	    }
 	    if (not $usesseen and m/db_f[sg]et\s+\S+\s+seen\s+/) {
 	       unless (Dep::implies($alldependencies,
-	                 Dep::parse('debconf (>= 0.5)'))) {
+				    Dep::parse('debconf (>= 0.5)'))) {
 	           tag "seen-flag-requires-versioned-depends", "$file" 
 		       unless $type eq 'udeb';
 	       }
 	        $usesseen = 1;
 	    }
+	    if (not $usessettitle and m/db_settitle\s+/) {
+		unless (Dep::implies($alldependencies,
+				     Dep::parse('debconf (>= 1.3.22)'))) {
+	           tag "settitle-requires-versioned-depends", "$file" 
+		       unless $type eq 'udeb';
+	       }
+	        $usessettitle = 1;
+	    }
 	}
 
 	unless ($usesconfmodule) {

Modified: trunk/checks/debconf.desc
===================================================================
--- trunk/checks/debconf.desc	2004-11-13 21:25:00 UTC (rev 365)
+++ trunk/checks/debconf.desc	2004-11-13 22:33:08 UTC (rev 366)
@@ -184,3 +184,9 @@
 Info: Debconf only supports the 'seen' flag as of version 0.5.00.  To ensure
  upgrades work correctly, packages that use this new flag should declare a
  dependency on that version of debconf.
+
+Tag: settitle-requires-versioned-depends
+Type: error
+Info: Debconf only supports the SETTITLE command as of version 1.3.22. To
+ ensure upgrades work correctly, packages that use this new command should
+ declare a dependency on that version of debconf.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2004-11-13 21:25:00 UTC (rev 365)
+++ trunk/debian/changelog	2004-11-13 22:33:08 UTC (rev 366)
@@ -1,5 +1,8 @@
 lintian (1.23.4) unstable; urgency=low
 
+  * checks/debconf{,.desc}:
+    + [FL] The SETTITLE command was introduced in debconf version
+      1.3.22. Check the depends for that (Closes: #261890)
   * checks/debhelper:
     + [FL] Update list of debhelper scripts that modify maintainer
       scripts
@@ -12,6 +15,11 @@
     + [FL] Add missing "use Util;", noted by Robert Luberda
       (Closes: #278513)
   
+  * testset/debconf/*,testset/tags.debconf:
+    + [FL] New test package for debconf and udeb tests
+  * testset/runtests:
+    + [FL] Make checks of udeb packages possible
+  
  -- Frank Lichtenheld <frank@lichtenheld.de>  Sun, 17 Oct 2004 20:04:06 +0200
 
 lintian (1.23.3) unstable; urgency=low

Added: trunk/testset/debconf/debian/changelog
===================================================================
--- trunk/testset/debconf/debian/changelog	2004-11-13 21:25:00 UTC (rev 365)
+++ trunk/testset/debconf/debian/changelog	2004-11-13 22:33:08 UTC (rev 366)
@@ -0,0 +1,5 @@
+debconf (1) unstable; urgency=low
+
+  * Initial Release
+
+ -- Lintian Maintainers <lintian@packages.debian.org>  Sat, 13 Nov 2004 22:45:05 +0100

Added: trunk/testset/debconf/debian/compat
===================================================================
--- trunk/testset/debconf/debian/compat	2004-11-13 21:25:00 UTC (rev 365)
+++ trunk/testset/debconf/debian/compat	2004-11-13 22:33:08 UTC (rev 366)
@@ -0,0 +1 @@
+4

Added: trunk/testset/debconf/debian/control
===================================================================
--- trunk/testset/debconf/debian/control	2004-11-13 21:25:00 UTC (rev 365)
+++ trunk/testset/debconf/debian/control	2004-11-13 22:33:08 UTC (rev 366)
@@ -0,0 +1,19 @@
+Source: debconf
+Section: utils
+Priority: optional
+Build-Depends: debhelper (>= 4)
+Maintainer: Lintian Maintainers <lintian@packages.debian.org>
+Standards-Version: 3.6.1
+
+Package: debconf-test
+Architecture: any
+Depends: ${shlibs:Depends}, debconf
+Description: Test package for the debconf checks of lintian
+
+Package: debconf-udeb
+Section: debian-installer
+XC-Package-Type: udeb
+XB-Installer-Menu-Item: 100
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Test udeb package for the debconf checks of lintian

Added: trunk/testset/debconf/debian/copyright
===================================================================
--- trunk/testset/debconf/debian/copyright	2004-11-13 21:25:00 UTC (rev 365)
+++ trunk/testset/debconf/debian/copyright	2004-11-13 22:33:08 UTC (rev 366)
@@ -0,0 +1,2 @@
+Copyright (C) 2004 Frank Lichtenheld <djpig@debian.org>
+

Added: trunk/testset/debconf/debian/debconf-test.config
===================================================================
--- trunk/testset/debconf/debian/debconf-test.config	2004-11-13 21:25:00 UTC (rev 365)
+++ trunk/testset/debconf/debian/debconf-test.config	2004-11-13 22:33:08 UTC (rev 366)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+db_settitle "Funky lintian test"

Added: trunk/testset/debconf/debian/debconf-test.postinst
===================================================================
--- trunk/testset/debconf/debian/debconf-test.postinst	2004-11-13 21:25:00 UTC (rev 365)
+++ trunk/testset/debconf/debian/debconf-test.postinst	2004-11-13 22:33:08 UTC (rev 366)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+true

Added: trunk/testset/debconf/debian/debconf-test.templates
===================================================================
--- trunk/testset/debconf/debian/debconf-test.templates	2004-11-13 21:25:00 UTC (rev 365)
+++ trunk/testset/debconf/debian/debconf-test.templates	2004-11-13 22:33:08 UTC (rev 366)
@@ -0,0 +1,3 @@
+Template: debconf/test
+Type: text
+_description: Foo bar

Added: trunk/testset/debconf/debian/debconf-udeb.postinst
===================================================================
--- trunk/testset/debconf/debian/debconf-udeb.postinst	2004-11-13 21:25:00 UTC (rev 365)
+++ trunk/testset/debconf/debian/debconf-udeb.postinst	2004-11-13 22:33:08 UTC (rev 366)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+true

Added: trunk/testset/debconf/debian/debconf-udeb.templates
===================================================================
--- trunk/testset/debconf/debian/debconf-udeb.templates	2004-11-13 21:25:00 UTC (rev 365)
+++ trunk/testset/debconf/debian/debconf-udeb.templates	2004-11-13 22:33:08 UTC (rev 366)
@@ -0,0 +1,3 @@
+Template: debian-installer/debconf-udeb/title
+Type: text
+_description: This is just a test

Added: trunk/testset/debconf/debian/po/POTFILES.in
===================================================================
--- trunk/testset/debconf/debian/po/POTFILES.in	2004-11-13 21:25:00 UTC (rev 365)
+++ trunk/testset/debconf/debian/po/POTFILES.in	2004-11-13 22:33:08 UTC (rev 366)
@@ -0,0 +1,2 @@
+[type: gettext/rfc822deb] debconf-test.templates
+[type: gettext/rfc822deb] debconf-udeb.templates

Added: trunk/testset/debconf/debian/po/output
===================================================================
--- trunk/testset/debconf/debian/po/output	2004-11-13 21:25:00 UTC (rev 365)
+++ trunk/testset/debconf/debian/po/output	2004-11-13 22:33:08 UTC (rev 366)
@@ -0,0 +1 @@
+2 utf8

Added: trunk/testset/debconf/debian/po/templates.pot
===================================================================
--- trunk/testset/debconf/debian/po/templates.pot	2004-11-13 21:25:00 UTC (rev 365)
+++ trunk/testset/debconf/debian/po/templates.pot	2004-11-13 22:33:08 UTC (rev 366)
@@ -0,0 +1,37 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-11-13 23:00+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: text
+#. description
+#: ../debconf-test.templates:3
+msgid "Foo bar"
+msgstr ""
+
+#. Type: text
+#. description
+#: ../debconf-udeb.templates:3
+msgid "This is just a test"
+msgstr ""

Added: trunk/testset/debconf/debian/rules
===================================================================
--- trunk/testset/debconf/debian/rules	2004-11-13 21:25:00 UTC (rev 365)
+++ trunk/testset/debconf/debian/rules	2004-11-13 22:33:08 UTC (rev 366)
@@ -0,0 +1,46 @@
+#!/usr/bin/make -f
+
+deb_dir		=	debian/debconf
+udeb_dir	=	debian/debconf-udeb
+build_dirs	=	$(deb_dir) $(udeb_dir)
+
+build:
+	dh_testdir
+	touch build
+
+clean:
+	dh_testdir
+	dh_testroot
+	-rm -f build
+
+	dh_clean
+
+binary-indep:	build
+# There are no architecture-independent files to be uploaded
+# generated by this package.  If there were any they would be
+# made here.
+
+binary-arch:	build
+	dh_testdir
+	dh_testroot
+	dh_clean -k -a
+	dh_installdirs -a
+
+	dh_installchangelogs -a
+	dh_installdocs -a
+	dh_installdebconf -a
+
+	dh_compress -a
+	dh_fixperms -a
+
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums
+	dh_builddeb -a
+
+# Below here is fairly generic really
+
+binary:		binary-indep binary-arch
+
+.PHONY: binary binary-arch binary-indep clean checkroot


Property changes on: trunk/testset/debconf/debian/rules
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/testset/runtests
===================================================================
--- trunk/testset/runtests	2004-11-13 21:25:00 UTC (rev 365)
+++ trunk/testset/runtests	2004-11-13 22:33:08 UTC (rev 366)
@@ -235,7 +235,7 @@
 
     open TAGS, "$rundir/tags.$pkg" or fail("Cannot open $rundir/tags.$pkg");
     while (<TAGS>) {
-	if (not /^(.): (\S+)(?: source)?: (\S+)/) {
+	if (not /^(.): (\S+)(?: (?:source|udeb))?: (\S+)/) {
 	    print "E: Invalid line:\n$_";
 	    next;
 	}

Added: trunk/testset/tags.debconf
===================================================================
--- trunk/testset/tags.debconf	2004-11-13 21:25:00 UTC (rev 365)
+++ trunk/testset/tags.debconf	2004-11-13 22:33:08 UTC (rev 366)
@@ -0,0 +1,4 @@
+E: debconf-test: extended-description-is-empty
+E: debconf-test: settitle-requires-versioned-depends config
+W: debconf source: maintainer-script-lacks-debhelper-token debian/debconf-test.postinst
+W: debconf-udeb udeb: missing-debconf-dependency



Reply to: