empcommand

Merge lp:~logan/empcommand/packaging into lp:~libavg-team/empcommand/packaging

  1. packaging
  2. Merge into packaging
Proposed by Logan Rosen
Status: Merged
Merged at revision: 50
Proposed branch: lp:~logan/empcommand/packaging
Merge into: lp:~libavg-team/empcommand/packaging
Diff against target: 58 lines (+13/-6)
5 files modified
debian/changelog (+8/-0)
debian/control (+3/-3)
debian/copyright (+1/-1)
debian/pyversions (+0/-1)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~logan/empcommand/packaging
Reviewer Review Type Date Requested Status
OXullo Intersecans Approve
Review via email: mp+195906@code.launchpad.net
To post a comment you must log in.
Revision history for this message
OXullo Intersecans (oxullo) wrote :

Thanks!

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-12-07 22:25:24 +0000
3+++ debian/changelog 2013-11-20 05:34:39 +0000
4@@ -1,3 +1,11 @@
5+empcommand (0.3+svn6617-0ubuntu2) UNRELEASED; urgency=low
6+
7+ * Convert to dh_python2.
8+ * Update copyright fields.
9+ * Bump Standards-Version to 3.9.4.
10+
11+ -- Logan Rosen <logan@ubuntu.com> Wed, 20 Nov 2013 00:24:20 -0500
12+
13 empcommand (0.3+svn6617-0ubuntu1) precise; urgency=low
14
15 * Fix compatibility with libavg 1.7.0 (LP: #901464).
16
17=== modified file 'debian/control'
18--- debian/control 2011-12-03 00:49:58 +0000
19+++ debian/control 2013-11-20 05:34:39 +0000
20@@ -6,9 +6,9 @@
21 Homepage: http://www.brainrapers.org/empcommand/
22 Vcs-Bzr: bzr+ssh://bazaar.launchpad.net/~libavg-team/empcommand/packaging
23 Vcs-Browser: http://bazaar.launchpad.net/~libavg-team/empcommand/packaging/files
24-Build-Depends: debhelper (>= 7.0.50~), python-support, python (>=2.6)
25-Standards-Version: 3.9.2
26-XS-Python-Version: >= 2.6
27+Build-Depends: debhelper (>= 7.0.50~), python (>= 2.6.6-3~)
28+Standards-Version: 3.9.4
29+X-Python-Version: >= 2.6
30
31 Package: empcommand
32 Architecture: all
33
34=== modified file 'debian/copyright'
35--- debian/copyright 2011-03-25 23:16:10 +0000
36+++ debian/copyright 2013-11-20 05:34:39 +0000
37@@ -1,4 +1,4 @@
38-Format: http://dep.debian.net/deps/dep5
39+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
40 Upstream-Name: empcommand
41 Upstream-Contact: OXullo Intersecans <x@brainrapers.org>
42 Source: https://www.libavg.de/svn/trunk/avg_media/mtc/emp_command
43
44=== removed file 'debian/pyversions'
45--- debian/pyversions 2011-03-10 18:42:20 +0000
46+++ debian/pyversions 1970-01-01 00:00:00 +0000
47@@ -1,1 +0,0 @@
48-2.6-
49
50=== modified file 'debian/rules'
51--- debian/rules 2011-03-11 15:44:10 +0000
52+++ debian/rules 2013-11-20 05:34:39 +0000
53@@ -18,4 +18,4 @@
54 rm -r empcommand-$(VER).orig
55
56 %:
57- dh $@
58+ dh $@ --with python2

Subscribers

People subscribed via source and target branches