[Pkg-net-snmp-commits] r190 - branches/net-snmp54/debian branches/net-snmp54-dev/debian trunk/debian

[jochen at alioth.debian.org]

Author: jochen
Date: 2007-07-06 15:58:04 +0000 (Fri, 06 Jul 2007)
New Revision: 190

Added:
   branches/net-snmp54-dev/debian/snmp.dirs
   branches/net-snmp54/debian/snmp.dirs
   trunk/debian/snmp.dirs
Modified:
   branches/net-snmp54-dev/debian/rules
   branches/net-snmp54-dev/debian/snmp.install
   branches/net-snmp54-dev/debian/snmp.lintian-overrides
   branches/net-snmp54-dev/debian/snmpd.install
   branches/net-snmp54/debian/rules
   branches/net-snmp54/debian/snmp.install
   branches/net-snmp54/debian/snmp.lintian-overrides
   branches/net-snmp54/debian/snmpd.install
   trunk/debian/rules
   trunk/debian/snmp.install
   trunk/debian/snmp.lintian-overrides
   trunk/debian/snmpd.install
Log:
Merge R186 (Handle overrides correctly)


Modified: branches/net-snmp54/debian/rules
===================================================================
--- branches/net-snmp54/debian/rules	2007-07-06 15:53:52 UTC (rev 189)
+++ branches/net-snmp54/debian/rules	2007-07-06 15:58:04 UTC (rev 190)
@@ -95,6 +95,7 @@
 	# make lintian happy
 	mkdir -p debian/tmp/usr/share/lintian/overrides
 	cp debian/snmpd.lintian-overrides debian/tmp/usr/share/lintian/overrides/snmpd
+	cp debian/snmp.lintian-overrides debian/tmp/usr/share/lintian/overrides/snmp
 
 debian/python-install-stamp-%:
 	# Build python modules manually as the net-snmp Makefile is too limited.

Copied: branches/net-snmp54/debian/snmp.dirs (from rev 186, branches/net-snmp53/debian/snmp.dirs)
===================================================================
--- branches/net-snmp54/debian/snmp.dirs	                        (rev 0)
+++ branches/net-snmp54/debian/snmp.dirs	2007-07-06 15:58:04 UTC (rev 190)
@@ -0,0 +1 @@
+usr/share/lintian/overrides

Modified: branches/net-snmp54/debian/snmp.install
===================================================================
--- branches/net-snmp54/debian/snmp.install	2007-07-06 15:53:52 UTC (rev 189)
+++ branches/net-snmp54/debian/snmp.install	2007-07-06 15:58:04 UTC (rev 190)
@@ -9,3 +9,4 @@
 debian/tmp/usr/share/man/man1/traptoemail.1
 debian/tmp/usr/share/man/man1/mib2c-update.1
 debian/tmp/usr/share/snmp/snmpconf-data/snmp-data
+debian/tmp/usr/share/lintian/overrides/snmp

Modified: branches/net-snmp54/debian/snmp.lintian-overrides
===================================================================
--- branches/net-snmp54/debian/snmp.lintian-overrides	2007-07-06 15:53:52 UTC (rev 189)
+++ branches/net-snmp54/debian/snmp.lintian-overrides	2007-07-06 15:58:04 UTC (rev 190)
@@ -1 +1 @@
-E: snmp: description-starts-with-package-name
+snmp: description-starts-with-package-name

Modified: branches/net-snmp54/debian/snmpd.install
===================================================================
--- branches/net-snmp54/debian/snmpd.install	2007-07-06 15:53:52 UTC (rev 189)
+++ branches/net-snmp54/debian/snmpd.install	2007-07-06 15:58:04 UTC (rev 190)
@@ -10,4 +10,4 @@
 debian/tmp/etc/default/snmpd
 debian/tmp/etc/snmp/snmpd.conf
 debian/tmp/etc/snmp/snmptrapd.conf
-debian/tmp/usr/share/lintian/overrides/
+debian/tmp/usr/share/lintian/overrides/snmpd

Modified: branches/net-snmp54-dev/debian/rules
===================================================================
--- branches/net-snmp54-dev/debian/rules	2007-07-06 15:53:52 UTC (rev 189)
+++ branches/net-snmp54-dev/debian/rules	2007-07-06 15:58:04 UTC (rev 190)
@@ -95,6 +95,7 @@
 	# make lintian happy
 	mkdir -p debian/tmp/usr/share/lintian/overrides
 	cp debian/snmpd.lintian-overrides debian/tmp/usr/share/lintian/overrides/snmpd
+	cp debian/snmp.lintian-overrides debian/tmp/usr/share/lintian/overrides/snmp
 
 debian/python-install-stamp-%:
 	# Build python modules manually as the net-snmp Makefile is too limited.

Copied: branches/net-snmp54-dev/debian/snmp.dirs (from rev 186, branches/net-snmp53/debian/snmp.dirs)
===================================================================
--- branches/net-snmp54-dev/debian/snmp.dirs	                        (rev 0)
+++ branches/net-snmp54-dev/debian/snmp.dirs	2007-07-06 15:58:04 UTC (rev 190)
@@ -0,0 +1 @@
+usr/share/lintian/overrides

Modified: branches/net-snmp54-dev/debian/snmp.install
===================================================================
--- branches/net-snmp54-dev/debian/snmp.install	2007-07-06 15:53:52 UTC (rev 189)
+++ branches/net-snmp54-dev/debian/snmp.install	2007-07-06 15:58:04 UTC (rev 190)
@@ -9,3 +9,4 @@
 debian/tmp/usr/share/man/man1/traptoemail.1
 debian/tmp/usr/share/man/man1/mib2c-update.1
 debian/tmp/usr/share/snmp/snmpconf-data/snmp-data
+debian/tmp/usr/share/lintian/overrides/snmp

Modified: branches/net-snmp54-dev/debian/snmp.lintian-overrides
===================================================================
--- branches/net-snmp54-dev/debian/snmp.lintian-overrides	2007-07-06 15:53:52 UTC (rev 189)
+++ branches/net-snmp54-dev/debian/snmp.lintian-overrides	2007-07-06 15:58:04 UTC (rev 190)
@@ -1 +1 @@
-E: snmp: description-starts-with-package-name
+snmp: description-starts-with-package-name

Modified: branches/net-snmp54-dev/debian/snmpd.install
===================================================================
--- branches/net-snmp54-dev/debian/snmpd.install	2007-07-06 15:53:52 UTC (rev 189)
+++ branches/net-snmp54-dev/debian/snmpd.install	2007-07-06 15:58:04 UTC (rev 190)
@@ -10,4 +10,4 @@
 debian/tmp/etc/default/snmpd
 debian/tmp/etc/snmp/snmpd.conf
 debian/tmp/etc/snmp/snmptrapd.conf
-debian/tmp/usr/share/lintian/overrides/
+debian/tmp/usr/share/lintian/overrides/snmpd

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2007-07-06 15:53:52 UTC (rev 189)
+++ trunk/debian/rules	2007-07-06 15:58:04 UTC (rev 190)
@@ -77,6 +77,7 @@
 	# make lintian happy
 	mkdir -p debian/tmp/usr/share/lintian/overrides
 	cp debian/snmpd.lintian-overrides debian/tmp/usr/share/lintian/overrides/snmpd
+	cp debian/snmp.lintian-overrides debian/tmp/usr/share/lintian/overrides/snmp
 
 binary/libsnmp-perl::
 	dh_installexamples -plibsnmp-perl $(shell ls -d perl/SNMP/examples/* | grep -v SCCS)

Copied: trunk/debian/snmp.dirs (from rev 186, branches/net-snmp53/debian/snmp.dirs)
===================================================================
--- trunk/debian/snmp.dirs	                        (rev 0)
+++ trunk/debian/snmp.dirs	2007-07-06 15:58:04 UTC (rev 190)
@@ -0,0 +1 @@
+usr/share/lintian/overrides

Modified: trunk/debian/snmp.install
===================================================================
--- trunk/debian/snmp.install	2007-07-06 15:53:52 UTC (rev 189)
+++ trunk/debian/snmp.install	2007-07-06 15:58:04 UTC (rev 190)
@@ -5,3 +5,4 @@
 debian/tmp/usr/bin/mib2c-update
 debian/tmp/usr/share/man/man1/snmp*
 debian/tmp/usr/share/snmp/snmpconf-data/snmp-data
+debian/tmp/usr/share/lintian/overrides/snmp

Modified: trunk/debian/snmp.lintian-overrides
===================================================================
--- trunk/debian/snmp.lintian-overrides	2007-07-06 15:53:52 UTC (rev 189)
+++ trunk/debian/snmp.lintian-overrides	2007-07-06 15:58:04 UTC (rev 190)
@@ -1 +1 @@
-E: snmp: description-starts-with-package-name
+snmp: description-starts-with-package-name

Modified: trunk/debian/snmpd.install
===================================================================
--- trunk/debian/snmpd.install	2007-07-06 15:53:52 UTC (rev 189)
+++ trunk/debian/snmpd.install	2007-07-06 15:58:04 UTC (rev 190)
@@ -10,4 +10,4 @@
 debian/tmp/etc/default/snmpd
 debian/tmp/etc/snmp/snmpd.conf
 debian/tmp/etc/snmp/snmptrapd.conf
-debian/tmp/usr/share/lintian/overrides/
+debian/tmp/usr/share/lintian/overrides/snmpd