[Dbconfig-common-changes] [dbconfig-common] r272 - trunk/debian

[Sean Finney]

Author: seanius
Date: 2006-07-29 16:29:00 +0000 (Sat, 29 Jul 2006)
New Revision: 272

Added:
   trunk/debian/dbconfig-common.lintian
Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/rules
Log:
more fixes from thijs

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-07-28 02:22:03 UTC (rev 271)
+++ trunk/debian/changelog	2006-07-29 16:29:00 UTC (rev 272)
@@ -6,6 +6,11 @@
   * no longer end php-style generated files with a ?>, as it's 
     superfluous and can reportedly cause problems (closes: #379979).
     thanks to Thijs Kinkhorst for pointing this out.
+  * other changes/fixes from Thijs Kinkhorst:
+    - utf8 fix in changelog
+    - update standards version to 3.7.2
+    - lintian overrides for false-positives due to the example packages
+    closes: #380353
   * updated danish debconf translations from Claus Hindsgaul, thanks.
     closes: #378769
 
@@ -20,7 +25,7 @@
   * now provide a global configuration option which affects the priority of
     questions related to remote database configuration.
   * updated spanish debconf translations, thanks to 
-    Javier Fernández-Sanguino Peña (closes: #372650).
+    Javier Fernández-Sanguino Peña (closes: #372650).
   * provide a fix for over-zealous sanity-checking breakage with packages that
     support multiple database types.  this should remove the need for any
     ugly workarounds.  thanks to David Gil (closes: #372948).

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2006-07-28 02:22:03 UTC (rev 271)
+++ trunk/debian/control	2006-07-29 16:29:00 UTC (rev 272)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: sean finney <seanius at debian.org>
 Build-Depends: debhelper (>= 4.0.0), debiandoc-sgml, tetex-extra, gs
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
 
 Package: dbconfig-common
 Architecture: all

Added: trunk/debian/dbconfig-common.lintian
===================================================================
--- trunk/debian/dbconfig-common.lintian	2006-07-28 02:22:03 UTC (rev 271)
+++ trunk/debian/dbconfig-common.lintian	2006-07-29 16:29:00 UTC (rev 272)
@@ -0,0 +1,33 @@
+##
+## dbconfig-common includes example packages with its documentation.  these
+## packages contain copyright files as well, which is redundant but okay.
+##
+extra-license-file usr/share/doc/dbconfig-common/examples/db-test-multidbtype-2.0/COPYING
+extra-license-file usr/share/doc/dbconfig-common/examples/db-test-mysql-2.0/COPYING
+extra-license-file usr/share/doc/dbconfig-common/examples/db-test-mysql-perl-2.0/COPYING
+extra-license-file usr/share/doc/dbconfig-common/examples/db-test-pgsql-2.0/COPYING
+extra-license-file usr/share/doc/dbconfig-common/examples/db-test-mysql-2.1/COPYING
+##
+## and these are harmless false-positives, also because of the examples.
+##
+debconf-is-not-a-registry ./usr/share/doc/dbconfig-common/examples/db-test-multidbtype-2.0/debian/postinst
+debconf-is-not-a-registry ./usr/share/doc/dbconfig-common/examples/db-test-multidbtype-2.0/debian/postrm
+debconf-is-not-a-registry ./usr/share/doc/dbconfig-common/examples/db-test-multidbtype-2.0/debian/config
+debconf-is-not-a-registry ./usr/share/doc/dbconfig-common/examples/db-test-multidbtype-2.0/debian/prerm
+debconf-is-not-a-registry ./usr/share/doc/dbconfig-common/examples/db-test-mysql-2.0/debian/postinst
+debconf-is-not-a-registry ./usr/share/doc/dbconfig-common/examples/db-test-mysql-2.0/debian/postrm
+debconf-is-not-a-registry ./usr/share/doc/dbconfig-common/examples/db-test-mysql-2.0/debian/config
+debconf-is-not-a-registry ./usr/share/doc/dbconfig-common/examples/db-test-mysql-2.0/debian/prerm
+debconf-is-not-a-registry ./usr/share/doc/dbconfig-common/examples/db-test-mysql-perl-2.0/debian/postinst
+debconf-is-not-a-registry ./usr/share/doc/dbconfig-common/examples/db-test-mysql-perl-2.0/debian/postrm
+debconf-is-not-a-registry ./usr/share/doc/dbconfig-common/examples/db-test-mysql-perl-2.0/debian/config
+debconf-is-not-a-registry ./usr/share/doc/dbconfig-common/examples/db-test-mysql-perl-2.0/debian/prerm
+debconf-is-not-a-registry ./usr/share/doc/dbconfig-common/examples/db-test-pgsql-2.0/debian/postinst
+debconf-is-not-a-registry ./usr/share/doc/dbconfig-common/examples/db-test-pgsql-2.0/debian/postrm
+debconf-is-not-a-registry ./usr/share/doc/dbconfig-common/examples/db-test-pgsql-2.0/debian/config
+debconf-is-not-a-registry ./usr/share/doc/dbconfig-common/examples/db-test-pgsql-2.0/debian/prerm
+debconf-is-not-a-registry ./usr/share/doc/dbconfig-common/examples/db-test-mysql-2.1/debian/postinst
+debconf-is-not-a-registry ./usr/share/doc/dbconfig-common/examples/db-test-mysql-2.1/debian/postrm
+debconf-is-not-a-registry ./usr/share/doc/dbconfig-common/examples/db-test-mysql-2.1/debian/config
+debconf-is-not-a-registry ./usr/share/doc/dbconfig-common/examples/db-test-mysql-2.1/debian/prerm
+

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2006-07-28 02:22:03 UTC (rev 271)
+++ trunk/debian/rules	2006-07-29 16:29:00 UTC (rev 272)
@@ -47,7 +47,11 @@
 	cp -Pr internal debian/dbconfig-common/usr/share/dbconfig-common/
 	cp -P dbconfig-generate-include debian/dbconfig-common/usr/sbin/
 	cp -P dbconfig-load-include debian/dbconfig-common/usr/sbin/
+	mkdir -p debian/dbconfig-common/usr/share/lintian/overrides
+	cp -a debian/dbconfig-common.lintian \
+	      debian/dbconfig-common/usr/share/lintian/overrides/dbconfig-common
 
+
 # Build architecture-independent files here.
 binary-indep: build install