Merge lp://qastaging/~noskcaj/ubuntu/trusty/pyrocket/new-release into lp://qastaging/ubuntu/trusty/pyrocket

Proposed by Jackson Doak
Status: Needs review
Proposed branch: lp://qastaging/~noskcaj/ubuntu/trusty/pyrocket/new-release
Merge into: lp://qastaging/ubuntu/trusty/pyrocket
Diff against target: 1133 lines (+414/-378)
15 files modified
40-rocketlauncher.rules (+3/-4)
debian/changelog (+10/-0)
debian/compat (+1/-1)
debian/control (+4/-5)
debian/pycompat (+0/-1)
debian/pyrocket.install (+1/-1)
debian/pyrocket.manpages (+1/-0)
debian/pyrocket.xpm (+299/-0)
debian/rules (+6/-9)
pyrocket.xpm (+0/-299)
rocket_backend.py (+36/-3)
rocket_frontend.py (+25/-19)
rocket_joystick.py (+5/-13)
rocket_webcam.py (+21/-21)
setup.py (+2/-2)
To merge this branch: bzr merge lp://qastaging/~noskcaj/ubuntu/trusty/pyrocket/new-release
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Needs Information
Dmitry Shachnev Abstain
Review via email: mp+195921@code.qastaging.launchpad.net

Description of the change

Import upstream fix.

To post a comment you must log in.
Revision history for this message
Dmitry Shachnev (mitya57) wrote :

Thanks for your work here.

- When does the source tarball come from? debian/watch is broken, and when I download v0.8.tar.gz from GitHub, it has differences with your branch (i.e. 40-rocketlauncher.rules is missing);
- "LP:#1055778" won't close the bug, you need a space after the colon;
- dh-python is not used unless you build-depend on it (and falls back to "old" dh_python2 provided by python-defaults). See the relevant logic in /usr/bin/dh_python2.

By the way, here is a debian/watch line that works with GitHub:

opts=filenamemangle=s/.*v(.*).tar.gz/pyrocket_$1.orig.tar.gz/ \
http://github.com/stadler/pyrocket/tags .*/archive/v(.*).tar.gz

review: Needs Fixing
Revision history for this message
Jackson Doak (noskcaj) wrote :

I got the tarball from the PPA, then removed the debian/ folder
Everything should say dh-python2

On Wed, Nov 20, 2013 at 9:17 PM, Dmitry Shachnev <email address hidden> wrote:

> The proposal to merge lp:~noskcaj/ubuntu/trusty/pyrocket/new-release into
> lp:ubuntu/pyrocket has been updated.
>
> Status: Needs review => Work in progress
>
> For more details, see:
>
> https://code.launchpad.net/~noskcaj/ubuntu/trusty/pyrocket/new-release/+merge/195921
> --
>
> https://code.launchpad.net/~noskcaj/ubuntu/trusty/pyrocket/new-release/+merge/195921
> You are the owner of lp:~noskcaj/ubuntu/trusty/pyrocket/new-release.
>

Revision history for this message
Dmitry Shachnev (mitya57) wrote :

Looks better now, though I cannot sponsor it right now…

review: Abstain
Revision history for this message
Jackson Doak (noskcaj) wrote :

The tarball is at https://launchpad.net/~zarquon42/+archive/ppa/+files/pyrocket_0.8-0ubuntu1.tar.gz , it just needs the debian directory renamed or removed from it.

Revision history for this message
Daniel Holbach (dholbach) wrote :

The patch looks good, can it be forward to the upstream developers please?

Revision history for this message
Daniel Holbach (dholbach) wrote :

Sorry, commented on the wrong MP.

Revision history for this message
Daniel Holbach (dholbach) wrote :
Download full text (5.8 KiB)

Using https://github.com/stadler/pyrocket/archive/v0.8.tar.gz I get the following:

daniel@daydream:~/pyrocket$ LC_ALL=C bzr bd -- -S -sa
Building using working tree
Building package in normal mode
Purging the build dir: /home/daniel/build-area/pyrocket-0.8
Looking for a way to retrieve the upstream tarball
Upstream tarball already exists in build directory, using that
Building the package in /home/daniel/build-area/pyrocket-0.8, using debuild -S -sa
 dpkg-buildpackage -rfakeroot -d -us -uc -S -sa
dpkg-buildpackage: source package pyrocket
dpkg-buildpackage: source version 0.8-0ubuntu1
dpkg-buildpackage: source distribution trusty
dpkg-buildpackage: source changed by Jackson Doak <email address hidden>
 dpkg-source --before-build pyrocket-0.8
 fakeroot debian/rules clean
dh clean --with python2
   dh_testdir
   dh_auto_clean
pyversions: missing X(S)-Python-Version in control file, fall back to debian/pyversions
pyversions: missing debian/pyversions file, fall back to supported versions
running clean
'build/lib.linux-x86_64-2.7' does not exist -- can't clean it
'build/bdist.linux-x86_64' does not exist -- can't clean it
'build/scripts-2.7' does not exist -- can't clean it
   debian/rules override_dh_clean
make[1]: Entering directory `/home/daniel/build-area/pyrocket-0.8'
dh_clean
rm -f pyrocket.6
make[1]: Leaving directory `/home/daniel/build-area/pyrocket-0.8'
 dpkg-source -b pyrocket-0.8
dpkg-source: info: using source format `3.0 (quilt)'
dpkg-source: info: building pyrocket using existing ./pyrocket_0.8.orig.tar.gz
dpkg-source: warning: ignoring deletion of file find_occurences_of_version_number.sh
dpkg-source: warning: ignoring deletion of file make_source_package.sh
dpkg-source: warning: ignoring deletion of file make_package.sh
dpkg-source: warning: ignoring deletion of file cheeky.xcf
dpkg-source: warning: ignoring deletion of file README.md
dpkg-source: warning: ignoring deletion of file cheeky.png
dpkg-source: warning: ignoring deletion of file clean_source_package.sh
dpkg-source: warning: ignoring deletion of file TODO.txt
dpkg-source: warning: ignoring deletion of directory src
dpkg-source: warning: ignoring deletion of file src/msnmissile.png
dpkg-source: warning: ignoring deletion of file src/40-rocketlauncher.rules
dpkg-source: warning: ignoring deletion of file src/LICENSE
dpkg-source: warning: ignoring deletion of file src/setup.py
dpkg-source: warning: ignoring deletion of file src/rocket_frontend.py
dpkg-source: warning: ignoring deletion of file src/pyrocket
dpkg-source: warning: ignoring deletion of file src/rocket_joystick.py
dpkg-source: warning: ignoring deletion of file src/pyrocket.png
dpkg-source: warning: ignoring deletion of file src/rocket_webcam.py
dpkg-source: warning: ignoring deletion of file src/joystick.svg
dpkg-source: warning: ignoring deletion of file src/rocket_backend.py
dpkg-source: warning: ignoring deletion of directory src/debian
dpkg-source: warning: ignoring deletion of file src/debian/pyrocket.desktop
dpkg-source: warning: ignoring deletion of file src/debian/control
dpkg-source: warning: ignoring deletion of file src/debian/watch
dpkg-source: warning: ignoring deletion of file src/debian/pyrocket....

Read more...

review: Needs Fixing
Revision history for this message
Dmitry Shachnev (mitya57) wrote :

Daniel: Jackson used a repacked tarball from someone's PPA, not the GitHub one.

Revision history for this message
Daniel Holbach (dholbach) wrote :

Was there a good reason for it?

Revision history for this message
Jackson Doak (noskcaj) wrote :

I used the tarball from upstream's PPA, then removed the debian/ folder
from it. Should i change the bzr branch to use the github tarball?

On Thu, Dec 19, 2013 at 2:25 AM, Daniel Holbach
<email address hidden>wrote:

> Was there a good reason for it?
> --
>
> https://code.launchpad.net/~noskcaj/ubuntu/trusty/pyrocket/new-release/+merge/195921
> You are the owner of lp:~noskcaj/ubuntu/trusty/pyrocket/new-release.
>

Revision history for this message
Daniel Holbach (dholbach) wrote :

We always try to use what is the most official tarball, so there are less chances of Debian and Ubuntu getting out of sync, etc. What are the differences of the two?

Revision history for this message
Jackson Doak (noskcaj) wrote :

Debian doesn't have this anyway, but it appears the difference in tarballs
is some extra config files, plus a huge .xcf file. Should we just leave
this as the smaller version, or do we need the extra files?

On Fri, Dec 20, 2013 at 12:05 AM, Daniel Holbach
<email address hidden>wrote:

> We always try to use what is the most official tarball, so there are less
> chances of Debian and Ubuntu getting out of sync, etc. What are the
> differences of the two?
> --
>
> https://code.launchpad.net/~noskcaj/ubuntu/trusty/pyrocket/new-release/+merge/195921
> You are the owner of lp:~noskcaj/ubuntu/trusty/pyrocket/new-release.
>

Revision history for this message
Daniel Holbach (dholbach) wrote :

I have no idea. Somebody who packaged it or upstream would know.

review: Needs Information

Unmerged revisions

10. By Jackson Doak

changelog fixes

9. By Jackson Doak

Bump standards-version to 3.9.5

8. By Jackson Doak

revert to .xpm pixmap

7. By Jackson Doak

Fix dh_clean override

6. By Jackson Doak

* Convert to dh, dh-python, and debhelper 9
* Create pyrocket.manpages

5. By Jackson Doak

New upstream release from https://github.com/stadler/pyrocket
LP:#1055778

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: