Merge lp:~dobey/ubuntu/oneiric/desktopcouch/include-apport into lp:ubuntu/oneiric/desktopcouch

Proposed by dobey
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~dobey/ubuntu/oneiric/desktopcouch/include-apport
Merge into: lp:ubuntu/oneiric/desktopcouch
Diff against target: 24 lines (+9/-0)
2 files modified
debian/changelog (+7/-0)
debian/desktopcouch.install (+2/-0)
To merge this branch: bzr merge lp:~dobey/ubuntu/oneiric/desktopcouch/include-apport
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Review via email: mp+82197@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Stéphane Graber (stgraber) wrote :

Looks good, just a small detail, as it's an SRU, version number should be -0ubuntu1.1

I'm only doing a queue cleanup today, but would have done the change myself and uploaded otherwise, assuming the change is already in Precise.

Thanks for the fix!

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

I merged it into precise, and backported/uploaded to oneiric-proposed.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-09-13 15:08:44 +0000
3+++ debian/changelog 2011-11-14 17:27:36 +0000
4@@ -1,3 +1,10 @@
5+desktopcouch (1.0.8-0ubuntu2) oneiric-proposed; urgency=low
6+
7+ * desktopcouch.install:
8+ - Include the apport package hook (LP: #791927)
9+
10+ -- Rodney Dawes <rodney.dawes@ubuntu.com> Mon, 14 Nov 2011 12:01:03 -0500
11+
12 desktopcouch (1.0.8-0ubuntu1) oneiric; urgency=low
13
14 * New upstream release.
15
16=== modified file 'debian/desktopcouch.install'
17--- debian/desktopcouch.install 2011-01-12 15:08:25 +0000
18+++ debian/desktopcouch.install 2011-11-14 17:27:36 +0000
19@@ -2,3 +2,5 @@
20 debian/tmp/usr/share/desktopcouch
21 debian/tmp/usr/lib/desktopcouch
22 debian/tmp/usr/share/dbus-1/services/org.desktopcouch.CouchDB.service
23+debian/tmp/usr/share/apport/package-hooks/source_desktopcouch.py
24+

Subscribers

People subscribed via source and target branches

to all changes: