Merge lp:~josernestodavila/ubuntu/natty/gnumeric/gnumeric-fix-725292 into lp:ubuntu/natty/gnumeric

Proposed by José Ernesto Dávila Pantoja on 2011-03-11
Status: Merged
Merge reported by: Didier Roche
Merged at revision: not available
Proposed branch: lp:~josernestodavila/ubuntu/natty/gnumeric/gnumeric-fix-725292
Merge into: lp:ubuntu/natty/gnumeric
Diff against target: 28 lines (+8/-2)
2 files modified
debian/changelog (+6/-0)
debian/control (+2/-2)
To merge this branch: bzr merge lp:~josernestodavila/ubuntu/natty/gnumeric/gnumeric-fix-725292
Reviewer Review Type Date Requested Status
Didier Roche Approve on 2011-03-11
Ubuntu branches 2011-03-11 Pending
Review via email: mp+52968@code.launchpad.net

Description of the change

debian/control: added gnumeric-doc Depends: yelp

To post a comment you must log in.
Didier Roche (didrocks) wrote :

Thanks a lot for you patch. All looks good! Sponsoring :)

btw: no need for (Closes: only LP: #bugnumber is needed ;)

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 2009-06-22 13:37:20 +0000
3+++ debian/changelog 2011-03-11 04:43:01 +0000
4@@ -1,3 +1,9 @@
5+gnumeric (1.9.9-1ubuntu2) natty; urgency=low
6+
7+ * debian/control: added gnumeric-doc Depends: yelp. (Closes: LP: #725292)
8+
9+ -- Jose Ernesto Davila Pantoja <josernestodavila@ubuntu.com> Thu, 10 Mar 2011 21:37:20 -0600
10+
11 gnumeric (1.9.9-1ubuntu1) karmic; urgency=low
12
13 * Merge from debian unstable, remaining changes:
14
15=== modified file 'debian/control'
16--- debian/control 2009-06-22 13:37:20 +0000
17+++ debian/control 2011-03-11 04:43:01 +0000
18@@ -74,8 +74,8 @@
19 Package: gnumeric-doc
20 Architecture: all
21 Section: doc
22-Depends: ${misc:Depends}
23-Recommends: yelp (>= 2.6.0), gnome-desktop-data
24+Depends: ${misc:Depends}, yelp (>= 2.6.0)
25+Recommends: gnome-desktop-data
26 Suggests: gnumeric (>= ${Upstream-Version}), docbook-xsl
27 Conflicts: gnumeric1.0-doc
28 Replaces: gnumeric (<< 1.1.17-2), gnumeric1.0-doc, docbook-xsl

Subscribers

People subscribed via source and target branches