Merge lp:~andreserl/ubuntu/lucid/bind9/bind9-apport-533601 into lp:ubuntu/lucid/bind9

Proposed by Andres Rodriguez
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~andreserl/ubuntu/lucid/bind9/bind9-apport-533601
Merge into: lp:ubuntu/lucid/bind9
Diff against target: 96 lines (+52/-2)
4 files modified
debian/bind9.apport (+38/-0)
debian/changelog (+9/-0)
debian/control (+3/-2)
debian/rules (+2/-0)
To merge this branch: bzr merge lp:~andreserl/ubuntu/lucid/bind9/bind9-apport-533601
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Team Pending
Review via email: mp+21475@code.launchpad.net

Description of the change

Apport hook for bind9

To post a comment you must log in.
Revision history for this message
James Westby (james-w) wrote :

Hello Andres,

Have you spoken with LaMont about this change?

He likes to keep Ubuntu and Debian in sync, so I would like to
know how he would like to handle this.

Thanks,

James

Revision history for this message
LaMont Jones (lamont) wrote :

> Have you spoken with LaMont about this change?
>
> He likes to keep Ubuntu and Debian in sync, so I would like to
> know how he would like to handle this.

Commenting in the bug

lamont

Revision history for this message
Sebastien Bacher (seb128) wrote :

the request still shows on the sponsoring list, lamont could you merge that in maverick or debian?

Revision history for this message
Martin Pitt (pitti) wrote :

Uploaded to natty. See bug for status update and debdiff.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'debian/bind9.apport'
2--- debian/bind9.apport 1970-01-01 00:00:00 +0000
3+++ debian/bind9.apport 2010-03-16 19:29:16 +0000
4@@ -0,0 +1,38 @@
5+#!/usr/bin/python
6+
7+'''apport hook for bind9
8+
9+(c) 2010 Andres Rodriguez.
10+Author: Andres Rodriguez <andreserl@ubuntu.com>
11+
12+This program is free software; you can redistribute it and/or modify it
13+under the terms of the GNU General Public License as published by the
14+Free Software Foundation; either version 2 of the License, or (at your
15+option) any later version. See http://www.gnu.org/copyleft/gpl.html for
16+the full text of the license.
17+'''
18+
19+from apport.hookutils import *
20+import re
21+
22+def add_info(report, ui):
23+ response = ui.yesno("The contents of your /etc/bind/named.conf file "
24+ "may help developers diagnose your bug more "
25+ "quickly. However, it may contain sensitive "
26+ "information. Do you want to include it in your "
27+ "bug report?")
28+
29+ if response == None: # user cancelled
30+ raise StopIteration
31+
32+ elif response == True:
33+ attach_conffiles(report,'bind9')
34+
35+ # bind9 version
36+ report['BIND9Version'] = root_command_output(['/usr/sbin/named', '-v'])
37+
38+ # getting syslog stuff
39+ report['SyslogBind9'] = recent_syslog(re.compile(r'named\['))
40+
41+ # Attaching related packages info
42+ attach_related_packages(report, ['bind9utils', 'apparmor'])
43
44=== modified file 'debian/changelog'
45--- debian/changelog 2010-03-12 15:16:53 +0000
46+++ debian/changelog 2010-03-16 19:29:16 +0000
47@@ -1,3 +1,12 @@
48+bind9 (1:9.7.0.dfsg.1-1~build1ubuntu1) lucid; urgency=low
49+
50+ * Add apport hook (LP: #533601):
51+ - debian/bind9.apport: Added.
52+ - debian/control: Build-Depends on dh-apport.
53+ - debian/rules: Add dh_apport.
54+
55+ -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 16 Mar 2010 15:22:04 -0400
56+
57 bind9 (1:9.7.0.dfsg.1-1~build1) lucid; urgency=low
58
59 * lucid port
60
61=== modified file 'debian/control'
62--- debian/control 2010-03-04 10:46:42 +0000
63+++ debian/control 2010-03-16 19:29:16 +0000
64@@ -1,9 +1,10 @@
65 Source: bind9
66 Section: net
67 Priority: optional
68-Maintainer: LaMont Jones <lamont@debian.org>
69+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
70+XSBC-Original-Maintainer: LaMont Jones <lamont@debian.org>
71 Uploaders: Bdale Garbee <bdale@gag.com>
72-Build-Depends: libkrb5-dev, debhelper (>= 5), libssl-dev, libtool, bison, libdb-dev (>>4.6), libldap2-dev, libxml2-dev, libcap2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], hardening-wrapper, libgeoip-dev (>= 1.4.6.dfsg-5)
73+Build-Depends: libkrb5-dev, debhelper (>= 5), libssl-dev, libtool, bison, libdb-dev (>>4.6), libldap2-dev, libxml2-dev, libcap2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], hardening-wrapper, libgeoip-dev (>= 1.4.6.dfsg-5), dh-apport
74 Build-Conflicts: libdb4.2-dev
75 Standards-Version: 3.7.3.0
76 XS-Vcs-Browser: http://git.debian.org/?p=users/lamont/bind9.git
77
78=== modified file 'debian/rules'
79--- debian/rules 2010-03-04 10:46:42 +0000
80+++ debian/rules 2010-03-16 19:29:16 +0000
81@@ -124,6 +124,7 @@
82 dh_installinfo -i
83 dh_installchangelogs -i # CHANGES # upstream changelog only in bind9-doc
84 dh_installchangelogs -pbind9-doc CHANGES
85+ dh_apport -i
86 dh_link -i
87 dh_compress -i
88 dh_fixperms -i
89@@ -146,6 +147,7 @@
90 dh_installdebconf -pbind9
91 dh_installinfo -a
92 dh_installchangelogs -a # CHANGES # upstream changelog only in bind9-doc
93+ dh_apport -a
94 dh_install --sourcedir=debian/bind9 -a
95 (cd debian/bind9/ && rm -rf $$(cat ../*.install) )
96 rm -f debian/bind9/usr/share/man/man1/query-loc.1

Subscribers

People subscribed via source and target branches

to all changes: