Google Documents Lens

Merge lp:~didrocks/unity-scope-gdrive/clean-package into lp:unity-scope-gdrive

  1. clean-package
  2. Merge into trunk
Proposed by Didier Roche on 2012-11-30
Status: Merged
Approved by: Martin Mrazik on 2012-11-30
Approved revision: 33
Merged at revision: 31
Proposed branch: lp:~didrocks/unity-scope-gdrive/clean-package
Merge into: lp:unity-scope-gdrive
Diff against target: 48 lines (+9/-2)
3 files modified
debian/changelog (+6/-0)
debian/rules (+3/-1)
debian/source/include-binaries (+0/-1)
To merge this branch: bzr merge lp:~didrocks/unity-scope-gdrive/clean-package
Reviewer Review Type Date Requested Status
Martin Mrazik (community) Approve on 2012-11-30
PS Jenkins bot continuous-integration Approve on 2012-11-30
Víctor R. Ruiz (community) Needs Fixing on 2012-11-30
Alan Pope 🍺🐧🐱 🦄 2012-11-30 Approve on 2012-11-30
Review via email: mp+137214@code.launchpad.net

Commit Message

Clean properly the packaging to create a source package

Description of the Change

Clean properly the packaging to create a source package

To post a comment you must log in.
Alan Pope 🍺🐧🐱 🦄 (popey) :
review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Víctor R. Ruiz (vrruiz) wrote :

python3 setup.py clean -a
running clean
'build/lib' does not exist -- can't clean it
'build/bdist.linux-x86_64' does not exist -- can't clean it
'build/scripts-3.3' does not exist -- can't clean it
dh_auto_clean
Traceback (most recent call last):
  File "setup.py", line 4, in <module>
    from DistUtilsExtra.command import build_extra
ImportError: No module named DistUtilsExtra.command

review: Needs Fixing
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
lp:~didrocks/unity-scope-gdrive/clean-package updated on 2012-11-30
33. By Didier Roche on 2012-11-30

there is no python3 support in dh_auto_clean, so remove manually the pycache created directory

PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Martin Mrazik (mrazik) wrote :

Jenkins stuff is now fixed -> approving.

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-11-16 16:09:07 +0000
3+++ debian/changelog 2012-11-30 16:04:22 +0000
4@@ -1,5 +1,6 @@
5 unity-scope-gdrive (0.8-0ubuntu1) UNRELEASED; urgency=low
6
7+ [ Michael Terry ]
8 * New upstream release
9 * Rename to unity-scope-gdrive
10 * debian/control:
11@@ -14,6 +15,11 @@
12 * Automatic snapshot from revision 27 (bootstrap)
13 - Rename from gdocs to gdrive (LP: #1059554)
14
15+ [ Didier Roche ]
16+ * remove hackish debian/source/include-binaries
17+ * debian/control:
18+ - clean temporary files created with debuild -S
19+
20 -- Michael Terry <mterry@ubuntu.com> Tue, 06 Nov 2012 14:08:44 -0500
21
22 unity-scope-gdocs (0.7-0ubuntu1) quantal-proposed; urgency=low
23
24=== modified file 'debian/rules'
25--- debian/rules 2012-11-15 20:53:38 +0000
26+++ debian/rules 2012-11-30 16:04:22 +0000
27@@ -1,12 +1,14 @@
28 #!/usr/bin/make -f
29 # -*- makefile -*-
30-
31+export DH_VERBOSE=1
32
33 %:
34 dh $@ --with python3
35
36 override_dh_auto_clean:
37 python3 setup.py clean -a
38+ rm -rf __pycache__/
39+ dh_clean
40
41 override_dh_auto_build:
42 python3 setup.py build
43
44=== removed file 'debian/source/include-binaries'
45--- debian/source/include-binaries 2012-11-06 19:15:25 +0000
46+++ debian/source/include-binaries 1970-01-01 00:00:00 +0000
47@@ -1,1 +0,0 @@
48-__pycache__/build_i18n_ext.cpython-32.pyc

Subscribers

People subscribed via source and target branches