← Back to team overview

launchpad-dev team mailing list archive

[Merge] lp:~jelmer/launchpad-buildd/lintian-fixes into lp:launchpad-buildd

 

Jelmer Vernooij has proposed merging lp:~jelmer/launchpad-buildd/lintian-fixes into lp:launchpad-buildd.

Requested reviews:
  Launchpad Development mailing list (launchpad-dev)

For more details, see:
https://code.launchpad.net/~jelmer/launchpad-buildd/lintian-fixes/+merge/81984

Fix some lintian warnings, and add some uninteresting ones to lintian-overrides.
-- 
https://code.launchpad.net/~jelmer/launchpad-buildd/lintian-fixes/+merge/81984
Your team Launchpad Development mailing list is requested to review the proposed merge of lp:~jelmer/launchpad-buildd/lintian-fixes into lp:launchpad-buildd.
=== modified file 'debian/changelog'
--- debian/changelog	2011-11-11 12:19:38 +0000
+++ debian/changelog	2011-11-11 13:53:33 +0000
@@ -1,3 +1,13 @@
+launchpad-buildd (96) UNRELEASED; urgency=low
+
+  * Move python-lpbuildd to section python.
+  * Don't create /var/run/launchpad-buildd during installation, it's
+    already created at init-time.
+  * Remove unnecessary debian/launchpad-buildd.conffiles. debhelper
+    already adds the required conffiles.
+
+ -- Jelmer Vernooij <jelmer@xxxxxxxxxx>  Fri, 11 Nov 2011 14:43:31 +0100
+
 launchpad-buildd (95) hardy; urgency=low
 
   * Add explicit dependency on pristine-tar, recommended by newer

=== modified file 'debian/control'
--- debian/control	2011-11-11 12:19:38 +0000
+++ debian/control	2011-11-11 13:53:33 +0000
@@ -17,7 +17,7 @@
  and independent filecaches etc.
 
 Package: python-lpbuildd
-Section: misc
+Section: python
 Architecture: all
 Depends: python-twisted-core, python-twisted-web, ${misc:Depends}
 Conflicts: launchpad-buildd (<< 88)

=== removed file 'debian/launchpad-buildd.conffiles'
--- debian/launchpad-buildd.conffiles	2011-11-11 05:20:10 +0000
+++ debian/launchpad-buildd.conffiles	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-etc/default/launchpad-buildd
-etc/sbuild.conf

=== modified file 'debian/launchpad-buildd.dirs'
--- debian/launchpad-buildd.dirs	2011-11-11 02:04:22 +0000
+++ debian/launchpad-buildd.dirs	2011-11-11 13:53:33 +0000
@@ -1,8 +1,7 @@
-etc 
-etc/launchpad-buildd 
-usr/bin 
-usr/share/doc/launchpad-buildd 
-usr/share/launchpad-buildd/lpbuildd 
+etc
+etc/launchpad-buildd
+usr/bin
+usr/share/doc/launchpad-buildd
+usr/share/launchpad-buildd/lpbuildd
 usr/share/launchpad-buildd/slavebin
-var/log/launchpad-buildd  
-var/run/launchpad-buildd
+var/log/launchpad-buildd

=== modified file 'debian/launchpad-buildd.init'
--- debian/launchpad-buildd.init	2011-11-11 06:31:46 +0000
+++ debian/launchpad-buildd.init	2011-11-11 13:53:33 +0000
@@ -8,8 +8,8 @@
 
 ### BEGIN INIT INFO
 # Provides:          launchpad_buildd
-# Required-Start:    $local_fs $network $syslog $time
-# Required-Stop:     $local_fs $network $syslog $time
+# Required-Start:    $local_fs $network $syslog $time $remote_fs
+# Required-Stop:     $local_fs $network $syslog $time $remote_fs
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # X-Interactive:     false

=== added file 'debian/launchpad-buildd.lintian-overrides'
--- debian/launchpad-buildd.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/launchpad-buildd.lintian-overrides	2011-11-11 13:53:33 +0000
@@ -0,0 +1,3 @@
+launchpad-buildd binary: binary-without-manpage usr/bin/buildd-genconfig
+launchpad-buildd binary: binary-without-manpage usr/bin/check-implicit-pointer-functions
+launchpad-buildd binary: binary-without-manpage usr/bin/sbuild

=== modified file 'debian/postinst'
--- debian/postinst	2011-11-09 07:50:56 +0000
+++ debian/postinst	2011-11-11 13:53:33 +0000
@@ -71,7 +71,7 @@
 	test -d /home/${USER}/filecache-default || mkdir /home/${USER}/filecache-default
 	chown $USER:buildd /home/${USER}/filecache-default
 
-	chown $USER:buildd /var/log/launchpad-buildd /var/run/launchpad-buildd
+	chown $USER:buildd /var/log/launchpad-buildd
 
 	# Check for the presence of the /etc/source-dependencies file
 	# which sbuild will rant about the absence of...

=== modified file 'debian/rules'
--- debian/rules	2011-11-11 05:28:16 +0000
+++ debian/rules	2011-11-11 13:53:33 +0000
@@ -30,6 +30,7 @@
 	dh_install
 	dh_installdirs 
 	dh_installexamples
+	dh_lintian
 
 	export DH_OPTIONS=-plaunchpad-buildd
 	dh_install $(slavebins) usr/share/launchpad-buildd/slavebin


Follow ups