Merge lp:~andrewsomething/sphinx/lp480913 into lp:ubuntu/precise/sphinx

Proposed by Andrew Starr-Bochicchio
Status: Merged
Merged at revision: 30
Proposed branch: lp:~andrewsomething/sphinx/lp480913
Merge into: lp:ubuntu/precise/sphinx
Diff against target: 26 lines (+8/-0)
2 files modified
debian/changelog (+7/-0)
debian/rules (+1/-0)
To merge this branch: bzr merge lp:~andrewsomething/sphinx/lp480913
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Ubuntu branches Pending
Review via email: mp+97757@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Thanks a lot for your work on this!

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 2012-02-21 19:55:03 +0000
3+++ debian/changelog 2012-03-15 21:35:23 +0000
4@@ -1,3 +1,10 @@
5+sphinx (1.1.2+dfsg-4ubuntu3) precise; urgency=low
6+
7+ * debian/rules: export NO_PKG_MANGLE=1 in order to
8+ not have translations stripped (LP: #480913).
9+
10+ -- Andrew Starr-Bochicchio <a.starr.b@gmail.com> Tue, 13 Mar 2012 12:34:01 -0400
11+
12 sphinx (1.1.2+dfsg-4ubuntu2) precise; urgency=low
13
14 * Drop the dependency on python-whoosh. The latter is in universe
15
16=== modified file 'debian/rules'
17--- debian/rules 2012-02-08 19:46:24 +0000
18+++ debian/rules 2012-03-15 21:35:23 +0000
19@@ -3,6 +3,7 @@
20
21 include /usr/share/python/python.mk
22
23+export NO_PKG_MANGLE=1
24 export PYTHONWARNINGS=d
25
26 here = $(dir $(firstword $(MAKEFILE_LIST)))/..

Subscribers

People subscribed via source and target branches