Ubuntu
etckeeper package

Merge lp:~xnox/ubuntu/oneiric/etckeeper/dhpy2 into lp:ubuntu/oneiric/etckeeper

  1. Oneiric (11.10)
  2. dhpy2
  3. Merge into oneiric
Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: 32
Proposed branch: lp:~xnox/ubuntu/oneiric/etckeeper/dhpy2
Merge into: lp:ubuntu/oneiric/etckeeper
Diff against target: 50 lines (+8/-4)
3 files modified
debian/changelog (+6/-0)
debian/control (+1/-3)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~xnox/ubuntu/oneiric/etckeeper/dhpy2
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
Ubuntu branches Pending
Review via email: mp+65741@code.launchpad.net

Description of the change

* Convert from python-central to dh_python2

python-bzrlib is already converted.

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Looks good an works well. Thanks or your work there :)

review: Approve
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Can you ensure that you send your change to debian please?

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

On 7 July 2011 15:17, Didier Roche <email address hidden> wrote:
> Can you ensure that you send your change to debian please?

Sure I will send $ git am against upstream/debian repo (upstream is a DD ;-) )

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-06-21 17:14:20 +0000
3+++ debian/changelog 2011-06-23 22:21:36 +0000
4@@ -1,3 +1,9 @@
5+etckeeper (0.55ubuntu2) oneiric; urgency=low
6+
7+ * Convert from python-central to dh_python2
8+
9+ -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> Thu, 23 Jun 2011 21:58:49 +0000
10+
11 etckeeper (0.55ubuntu1) oneiric; urgency=low
12
13 * Merge from debian unstable. (LP: #800034) Remaining changes:
14
15=== modified file 'debian/control'
16--- debian/control 2011-05-31 08:11:31 +0000
17+++ debian/control 2011-06-23 22:21:36 +0000
18@@ -1,11 +1,10 @@
19 Source: etckeeper
20 Section: admin
21 Priority: optional
22-Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.9.0), bzr (>= 1.5~), python-central
23+Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.9.0), bzr (>= 1.5~), python (>= 2.6.6-3~)
24 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
25 XSBC-Original-Maintainer: Joey Hess <joeyh@debian.org>
26 Standards-Version: 3.9.2
27-XS-Python-Version: all
28 Vcs-Git: git://git.kitenet.net/etckeeper
29 Homepage: http://kitenet.net/~joey/code/etckeeper/
30
31@@ -16,7 +15,6 @@
32 Recommends: cron
33 Suggests: sudo (>= 1.7.4p4)
34 Conflicts: bzr (<< 1.5~)
35-XB-Python-Version: ${python:Versions}
36 Description: store /etc in git, mercurial, bzr or darcs
37 The etckeeper program is a tool to let /etc be stored in a git, mercurial,
38 bzr or darcs repository. It hooks into APT to automatically commit changes
39
40=== modified file 'debian/rules'
41--- debian/rules 2008-12-23 18:51:14 +0000
42+++ debian/rules 2011-06-23 22:21:36 +0000
43@@ -1,6 +1,6 @@
44 #!/usr/bin/make -f
45 %:
46- dh --with python-central $@
47+ dh --with python2 $@
48
49 # Not intended for use by anyone except the author.
50 announcedir:

Subscribers

People subscribed via source and target branches