Ubuntu Software Center

Merge lp:~pitti/software-center/scour into lp:software-center

  1. scour
  2. Merge into trunk
Proposed by Martin Pitt
Status: Merged
Merged at revision: 1275
Proposed branch: lp:~pitti/software-center/scour
Merge into: lp:software-center
Diff against target: 43 lines (+9/-2)
3 files modified
debian/changelog (+6/-0)
debian/control (+2/-1)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~pitti/software-center/scour
Reviewer Review Type Date Requested Status
Gary Lasker (community) Approve
Review via email: mp+40878@code.launchpad.net

Description of the change

Build with scour for SVG optimization, and fix dh invocation

To post a comment you must log in.
Revision history for this message
Gary Lasker (gary-lasker) wrote :

Merged. Thank you, Martin!

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 2010-11-12 23:23:48 +0000
3+++ debian/changelog 2010-11-15 15:15:45 +0000
4@@ -29,6 +29,12 @@
5 - show generic error on purchase failure and log the error
6 (LP: #632361)
7
8+ [ Martin Pitt ]
9+ * debian/rules: Supply dh --with option after $@, for compatibility with
10+ current debhelper.
11+ * debian/rules: Build with scour for SVG optimization. Add python-scour
12+ build dependency.
13+
14 -- Gary Lasker <gary.lasker@canonical.com> Fri, 12 Nov 2010 18:21:29 -0500
15
16 software-center (3.1.0) natty; urgency=low
17
18=== modified file 'debian/control'
19--- debian/control 2010-10-15 23:06:02 +0000
20+++ debian/control 2010-11-15 15:15:45 +0000
21@@ -11,7 +11,8 @@
22 python,
23 python-central,
24 python-distutils-extra,
25- python-setuptools
26+ python-setuptools,
27+ python-scour
28 Standards-Version: 3.8.4
29 XS-Python-Version: current
30 Vcs-Bzr: https://code.launchpad.net/~software-center-developers/software-center/trunk
31
32=== modified file 'debian/rules'
33--- debian/rules 2010-09-06 10:43:04 +0000
34+++ debian/rules 2010-11-15 15:15:45 +0000
35@@ -2,7 +2,7 @@
36 share:=usr/share/software-center
37
38 %:
39- dh --with=python-central $@
40+ dh $@ --with=python-central,scour
41
42 # Install the modules in a private directory, as our applications are the
43 # only ones using them.