Merge lp:~panfaust/kubuntu-packaging-next/kapidox-work into lp:~kubuntu-packagers/kubuntu-packaging-next/kapidox

Proposed by Jose Manuel Santamaria Lema
Status: Merged
Merge reported by: Jonathan Riddell
Merged at revision: not available
Proposed branch: lp:~panfaust/kubuntu-packaging-next/kapidox-work
Merge into: lp:~kubuntu-packagers/kubuntu-packaging-next/kapidox
Diff against target: 33 lines (+8/-3)
2 files modified
debian/changelog (+3/-0)
debian/rules (+5/-3)
To merge this branch: bzr merge lp:~panfaust/kubuntu-packaging-next/kapidox-work
Reviewer Review Type Date Requested Status
Kubuntu Packagers Pending
Review via email: mp+222328@code.launchpad.net

Description of the change

Fix debian/rules so the package is buildable again.

To post a comment you must log in.

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 2014-06-06 12:14:10 +0000
3+++ debian/changelog 2014-06-06 14:15:33 +0000
4@@ -10,6 +10,9 @@
5 * Remove useless Pre-Depends fields used for multiarch compat in
6 releases older than trusty
7
8+ [ José Manuel Santamaría Lema ]
9+ * Fix debian/rules so the package is buildable again.
10+
11 -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 02 Jun 2014 13:33:23 +0100
12
13 kapidox (4.99.0-0ubuntu1) trusty; urgency=medium
14
15=== modified file 'debian/rules'
16--- debian/rules 2014-02-25 22:06:04 +0000
17+++ debian/rules 2014-06-06 14:15:33 +0000
18@@ -5,9 +5,11 @@
19
20 export PYBUILD_NAME=kapidox
21
22-dh $@ --with python2,python3 --buildsystem=pybuild
23+%:
24+ dh $@ --with python2,python3 --buildsystem=pybuild
25
26 override_dh_auto_install:
27 python setup.py install --root=debian/kapidox --install-layout=deb --install-data=/usr/share/kapidox --install-lib=/usr/share/kapidox --install-scripts=/usr/share/kapidox
28- dh_python2
29-override_dh_auto_build:
30\ No newline at end of file
31+ dh_python2
32+
33+override_dh_auto_build:

Subscribers

People subscribed via source and target branches