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

[Jackson Doak]

Import upstream fix.

[Dmitry Shachnev (mitya57)]

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

[Jackson Doak (noskcaj)]

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.
>

[Dmitry Shachnev (mitya57)]

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

review: Abstain

[Jackson Doak (noskcaj)]

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.

[Daniel Holbach (dholbach)]

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

[Daniel Holbach (dholbach)]

Sorry, commented on the wrong MP.

[Daniel Holbach (dholbach)]

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....

review: Needs Fixing

[Dmitry Shachnev (mitya57)]

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

[Daniel Holbach (dholbach)]

Was there a good reason for it?

[Jackson Doak (noskcaj)]

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.
>

[Daniel Holbach (dholbach)]

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?

[Jackson Doak (noskcaj)]

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.
>

[Daniel Holbach (dholbach)]

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

review: Needs Information

Unmerged revisions

10. By Jackson Doak on 2013-11-20

changelog fixes

9. By Jackson Doak on 2013-11-20

Bump standards-version to 3.9.5

8. By Jackson Doak on 2013-11-20

revert to .xpm pixmap

7. By Jackson Doak on 2013-11-20

Fix dh_clean override

6. By Jackson Doak on 2013-11-20

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

5. By Jackson Doak on 2013-11-20

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

=== modified file '40-rocketlauncher.rules'
--- 40-rocketlauncher.rules	2008-12-30 19:29:33 +0000
+++ 40-rocketlauncher.rules	2013-11-20 21:01:57 +0000
@@ -1,4 +1,3 @@
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ACTION=="add", SYSFS{idVendor}=="1941", SYSFS{idProduct}=="8021", GROUP="plugdev", MODE="0660"
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ACTION=="add", SYSFS{idVendor}=="0a81", SYSFS{idProduct}=="0701", GROUP="plugdev", MODE="0660"
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ACTION=="add", SYSFS{idVendor}=="1130", SYSFS{idProduct}=="0202", GROUP="plugdev", MODE="0660"
-
+SUBSYSTEM=="usb", ATTRS{idVendor}=="1941", ATTRS{idProduct}=="8021", GROUP="plugdev", MODE="0660"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="0a81", ATTRS{idProduct}=="0701", GROUP="plugdev", MODE="0660"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="1130", ATTRS{idProduct}=="0202", GROUP="plugdev", MODE="0660"
 \ No newline at end of file
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-05-23 19:56:33 +0000
+++ debian/changelog	2013-11-20 21:01:57 +0000
@@ -1,3 +1,13 @@
+pyrocket (0.8-0ubuntu1) trusty; urgency=low
+
+  * New upstream release from https://github.com/stadler/pyrocket
+    LP: #1055778
+  * Convert to dh, dh-python2, and debhelper 9
+  * Create pyrocket.manpages
+  * Bump standards-version to 3.9.5
+
+ -- Jackson Doak <[e-mail]>  Wed, 20 Nov 2013 19:10:21 +1100
+
 pyrocket (0.6-0ubuntu3) maverick; urgency=low
 
   * debain/watch: Update for code.google.com (LP: #583719)
 
=== modified file 'debian/compat'
--- debian/compat	2008-12-30 19:29:33 +0000
+++ debian/compat	2013-11-20 21:01:57 +0000
@@ -1,1 +1,1 @@
-5
+9
 \ No newline at end of file
 
=== modified file 'debian/control'
--- debian/control	2010-05-23 19:56:33 +0000
+++ debian/control	2013-11-20 21:01:57 +0000
@@ -1,12 +1,11 @@
 Source: pyrocket
 Section: electronics
 Priority: optional
-Maintainer: Ubuntu MOTU Developers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Karl Ostmo <[e-mail]>
-Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 5), python, cdbs (>= 0.4.49)
-Build-Depends-Indep: perl, python-support (>= 0.5.3)
-XB-Python-Version: ${python:Versions}
+Standards-Version: 3.9.5
+Build-Depends: debhelper (>= 9), python
+Build-Depends-Indep: perl
 Homepage: http://pyrocket.googlecode.com/
 
 Package: pyrocket
 
=== removed file 'debian/pycompat'
--- debian/pycompat	2008-12-30 19:29:33 +0000
+++ debian/pycompat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2
 
=== modified file 'debian/pyrocket.install'
--- debian/pyrocket.install	2009-01-16 15:01:27 +0000
+++ debian/pyrocket.install	2013-11-20 21:01:57 +0000
@@ -1,3 +1,3 @@
 40-rocketlauncher.rules		/lib/udev/rules.d
-pyrocket.xpm			/usr/share/pixmaps
+debian/pyrocket.xpm			/usr/share/pixmaps
 debian/pyrocket.desktop		/usr/share/applications
 
=== added file 'debian/pyrocket.manpages'
--- debian/pyrocket.manpages	1970-01-01 00:00:00 +0000
+++ debian/pyrocket.manpages	2013-11-20 21:01:57 +0000
@@ -0,0 +1,1 @@
+pyrocket.6
 \ No newline at end of file
 
=== added file 'debian/pyrocket.xpm'
--- debian/pyrocket.xpm	1970-01-01 00:00:00 +0000
+++ debian/pyrocket.xpm	2013-11-20 21:01:57 +0000
@@ -0,0 +1,299 @@
+/* XPM */
+static char * pyrocket_icon_xpm[] = {
+"31 32 264 2",
+"  	c None",
+". 	c #39291F",
+"+ 	c #94837F",
+"@ 	c #060504",
+"# 	c #0E0E0B",
+"$ 	c #414339",
+"% 	c #FF3B1E",
+"& 	c #FE6A31",
+"* 	c #FFCE61",
+"= 	c #FFFF8F",
+"- 	c #FFFF9E",
+"; 	c #FFFFB9",
+"> 	c #91854C",
+", 	c #2F201A",
+"' 	c #786866",
+") 	c #372F24",
+"! 	c #18150F",
+"~ 	c #1A1A11",
+"{ 	c #253024",
+"] 	c #332521",
+"^ 	c #30251E",
+"/ 	c #1C120E",
+"( 	c #120B08",
+"_ 	c #1F0E0D",
+": 	c #CA933E",
+"< 	c #FEB84F",
+"[ 	c #FFCA5D",
+"} 	c #FFF786",
+"| 	c #FFFFA8",
+"1 	c #FFFF95",
+"2 	c #FFFF99",
+"3 	c #C4B969",
+"4 	c #5A463F",
+"5 	c #957F7B",
+"6 	c #221D16",
+"7 	c #171410",
+"8 	c #040302",
+"9 	c #010000",
+"0 	c #000000",
+"a 	c #0A100A",
+"b 	c #050302",
+"c 	c #100808",
+"d 	c #020000",
+"e 	c #040303",
+"f 	c #3C2323",
+"g 	c #F14B2E",
+"h 	c #FF7F45",
+"i 	c #FFAD4E",
+"j 	c #FDC142",
+"k 	c #FFFC7C",
+"l 	c #FFFFAC",
+"m 	c #FFFF9C",
+"n 	c #6B5839",
+"o 	c #4D3C3A",
+"p 	c #8E7B7B",
+"q 	c #14110D",
+"r 	c #17140F",
+"s 	c #030202",
+"t 	c #050403",
+"u 	c #0B0705",
+"v 	c #010101",
+"w 	c #010300",
+"x 	c #020701",
+"y 	c #030B02",
+"z 	c #0D130A",
+"A 	c #0D0707",
+"B 	c #160D0D",
+"C 	c #020101",
+"D 	c #040101",
+"E 	c #130807",
+"F 	c #40250D",
+"G 	c #FEB150",
+"H 	c #FFD262",
+"I 	c #FFF876",
+"J 	c #FFFFA7",
+"K 	c #FFFFAE",
+"L 	c #FFFE86",
+"M 	c #8E7B2D",
+"N 	c #483825",
+"O 	c #52423E",
+"P 	c #050303",
+"Q 	c #040604",
+"R 	c #010501",
+"S 	c #000300",
+"T 	c #000200",
+"U 	c #0D100C",
+"V 	c #181112",
+"W 	c #0A0707",
+"X 	c #3F3537",
+"Y 	c #765737",
+"Z 	c #FFB14F",
+"` 	c #FF9349",
+" .	c #FDB25E",
+"..	c #FBE24B",
+"+.	c #FDDF49",
+"@.	c #FEF651",
+"#.	c #FFF855",
+"$.	c #000100",
+"%.	c #1A1718",
+"&.	c #050405",
+"*.	c #0E120F",
+"=.	c #241D1F",
+"-.	c #141011",
+";.	c #050304",
+">.	c #370D0A",
+",.	c #902A23",
+"'.	c #A74C29",
+").	c #F84D1A",
+"!.	c #FC4628",
+"~.	c #14100D",
+"{.	c #0E1914",
+"].	c #0B0F0C",
+"^.	c #0E0809",
+"/.	c #0C0607",
+"(.	c #0B0706",
+"_.	c #140E0C",
+":.	c #150E0B",
+"<.	c #050A08",
+"[.	c #09100D",
+"}.	c #0E0E0D",
+"|.	c #392B2A",
+"1.	c #54423E",
+"2.	c #020303",
+"3.	c #030201",
+"4.	c #24261E",
+"5.	c #4A4940",
+"6.	c #030203",
+"7.	c #060706",
+"8.	c #080A09",
+"9.	c #1D1A14",
+"0.	c #0D0B09",
+"a.	c #040404",
+"b.	c #2A2424",
+"c.	c #342522",
+"d.	c #2F201E",
+"e.	c #3F302C",
+"f.	c #030302",
+"g.	c #1F191A",
+"h.	c #393233",
+"i.	c #3C2C2B",
+"j.	c #392927",
+"k.	c #342422",
+"l.	c #010301",
+"m.	c #08120C",
+"n.	c #18201B",
+"o.	c #2D2826",
+"p.	c #030101",
+"q.	c #312829",
+"r.	c #3D3532",
+"s.	c #3A423A",
+"t.	c #3C4039",
+"u.	c #090704",
+"v.	c #2D282A",
+"w.	c #020D06",
+"x.	c #1B3B2A",
+"y.	c #718377",
+"z.	c #504B49",
+"A.	c #1B0E0E",
+"B.	c #27181C",
+"C.	c #545253",
+"D.	c #85A596",
+"E.	c #5F8D77",
+"F.	c #57514A",
+"G.	c #5B4641",
+"H.	c #969788",
+"I.	c #000701",
+"J.	c #042713",
+"K.	c #0D3A24",
+"L.	c #262B28",
+"M.	c #0E0607",
+"N.	c #3E3239",
+"O.	c #8B8291",
+"P.	c #ECF2F3",
+"Q.	c #65907F",
+"R.	c #6A6561",
+"S.	c #3A2728",
+"T.	c #6E7367",
+"U.	c #020203",
+"V.	c #0C0C0D",
+"W.	c #022511",
+"X.	c #0A3722",
+"Y.	c #18211D",
+"Z.	c #060102",
+"`.	c #2B1E22",
+" +	c #746D79",
+".+	c #DFE7E9",
+"++	c #5D8978",
+"@+	c #5B5A57",
+"#+	c #412F30",
+"$+	c #726F64",
+"%+	c #1D170E",
+"&+	c #020202",
+"*+	c #060505",
+"=+	c #010903",
+"-+	c #04180A",
+";+	c #0B2918",
+">+	c #212D25",
+",+	c #1A1415",
+"'+	c #090405",
+")+	c #191214",
+"!+	c #415C51",
+"~+	c #557A6C",
+"{+	c #446E5A",
+"]+	c #46433E",
+"^+	c #54413E",
+"/+	c #7D7369",
+"(+	c #010100",
+"_+	c #010702",
+":+	c #011708",
+"<+	c #062A17",
+"[+	c #20201F",
+"}+	c #0C090A",
+"|+	c #170F10",
+"1+	c #516A63",
+"2+	c #A1B3B2",
+"3+	c #6C9082",
+"4+	c #303532",
+"5+	c #28191C",
+"6+	c #423335",
+"7+	c #747B6A",
+"8+	c #000F03",
+"9+	c #02230F",
+"0+	c #0C0D0D",
+"a+	c #191012",
+"b+	c #456057",
+"c+	c #86A19E",
+"d+	c #5A8476",
+"e+	c #252E2A",
+"f+	c #1C0D0F",
+"g+	c #312224",
+"h+	c #6D7966",
+"i+	c #211910",
+"j+	c #000E03",
+"k+	c #02210E",
+"l+	c #0E0F0E",
+"m+	c #170E0E",
+"n+	c #385046",
+"o+	c #718785",
+"p+	c #48695D",
+"q+	c #202421",
+"r+	c #241515",
+"s+	c #3D2D2E",
+"t+	c #686758",
+"u+	c #0C0907",
+"v+	c #040201",
+"w+	c #1A1414",
+"x+	c #080505",
+"y+	c #110A0B",
+"z+	c #352D34",
+"A+	c #93838D",
+"B+	c #5F545E",
+"C+	c #2A1F23",
+"D+	c #211313",
+"E+	c #251818",
+"F+	c #261411",
+"G+	c #502F28",
+"H+	c #000001",
+"I+	c #090406",
+"J+	c #292229",
+"K+	c #5C515E",
+"L+	c #403844",
+"M+	c #181016",
+"N+	c #110808",
+"O+	c #13090B",
+"                                                              ",
+"                                                              ",
+"                                                              ",
+"                                                              ",
+"                                                          . + ",
+"                            @ # $           % & * = - ; > , ' ",
+"                        ) ! ~ { ] ^ / ( _ : < [ } | 1 2 3 4 5 ",
+"                  6 7 8 9 0 a b c d 9 e f g h i j k l m n o p ",
+"          q r s t u v w x y z A B C D E F G H I J | K L M N O ",
+"          0 0 0 0 P Q R S T U V W 9 C X Y Z `  ...+.@.#.      ",
+"          $.0 0 0 %.&.0 0 $.*.=.-.0 0 ;.>.,.'.).!.            ",
+"        ~.0 0 0 0 0 v 0 0 0 {.].^./.(._.:.                    ",
+"          0 0 0 0 0 0 0 0 0 <.[.}.|.1.                        ",
+"          e 0 0 0 v 0 2.0 0 0 3.4.5.                          ",
+"            t 0 6.0 0 7.8.9.                                  ",
+"            0.0 s a.0 b.c.d.e.                                ",
+"            f.0 0 g.0 h.i.j.k.                                ",
+"            l.m.n.o.p.q.r.s.t.                                ",
+"      u.v.0 w.x.y.z.A.B.C.D.E.F.G.H.                          ",
+"      v %.0 I.J.K.L.M.N.O.P.Q.R.S.T.                          ",
+"      U.V.0 I.W.X.Y.Z.`. +.+++@+#+$+                          ",
+"    %+&+*+=+-+;+>+,+'+)+!+~+{+]+^+/+                          ",
+"    (+0 0 _+:+<+[+}+p.|+1+2+3+4+5+6+7+                        ",
+"    0 0 0 $.8+9+0+0 0 a+b+c+d+e+f+g+h+                        ",
+"  i+0 0 0 T j+k+l+e p.m+n+o+p+q+r+s+t+                        ",
+"u+v+0 0 0 0 0 8 w+x+p.y+z+A+B+C+D+E+F+G+                      ",
+"  0 0 0 0 0 0 0 0 H+0 I+J+K+L+M+N+O+                          ",
+"                                                              ",
+"                                                              ",
+"                                                              ",
+"                                                              ",
+"                                                              "};
 
=== modified file 'debian/rules'
--- debian/rules	2008-12-30 19:29:33 +0000
+++ debian/rules	2013-11-20 21:01:57 +0000
@@ -1,15 +1,12 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM=pysupport
-
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-
-build/pyrocket::
+override_dh_auto_build:
 	pod2man --section=6 --release=$(VERSION) --center "" debian/pyrocket.pod > pyrocket.6
+	dh_auto_build
 
-cleanbuilddir/pyrocket::
+override_dh_clean:
+	dh_clean
 	rm -f pyrocket.6
 
-DEB_INSTALL_MANPAGES_pyrocket = pyrocket.6
+%:
+	dh $@ --with python2
 
=== added directory 'icons'
=== added file 'icons/128.png'
 Binary files icons/128.png	1970-01-01 00:00:00 +0000 and icons/128.png	2013-11-20 21:01:57 +0000 differ
=== added file 'icons/32.png'
 Binary files icons/32.png	1970-01-01 00:00:00 +0000 and icons/32.png	2013-11-20 21:01:57 +0000 differ
=== added file 'icons/48.png'
 Binary files icons/48.png	1970-01-01 00:00:00 +0000 and icons/48.png	2013-11-20 21:01:57 +0000 differ
=== added file 'icons/72.png'
 Binary files icons/72.png	1970-01-01 00:00:00 +0000 and icons/72.png	2013-11-20 21:01:57 +0000 differ
=== removed file 'pyrocket.xpm'
--- pyrocket.xpm	2008-12-30 19:29:33 +0000
+++ pyrocket.xpm	1970-01-01 00:00:00 +0000
@@ -1,299 +0,0 @@
-/* XPM */
-static char * pyrocket_icon_xpm[] = {
-"31 32 264 2",
-"  	c None",
-". 	c #39291F",
-"+ 	c #94837F",
-"@ 	c #060504",
-"# 	c #0E0E0B",
-"$ 	c #414339",
-"% 	c #FF3B1E",
-"& 	c #FE6A31",
-"* 	c #FFCE61",
-"= 	c #FFFF8F",
-"- 	c #FFFF9E",
-"; 	c #FFFFB9",
-"> 	c #91854C",
-", 	c #2F201A",
-"' 	c #786866",
-") 	c #372F24",
-"! 	c #18150F",
-"~ 	c #1A1A11",
-"{ 	c #253024",
-"] 	c #332521",
-"^ 	c #30251E",
-"/ 	c #1C120E",
-"( 	c #120B08",
-"_ 	c #1F0E0D",
-": 	c #CA933E",
-"< 	c #FEB84F",
-"[ 	c #FFCA5D",
-"} 	c #FFF786",
-"| 	c #FFFFA8",
-"1 	c #FFFF95",
-"2 	c #FFFF99",
-"3 	c #C4B969",
-"4 	c #5A463F",
-"5 	c #957F7B",
-"6 	c #221D16",
-"7 	c #171410",
-"8 	c #040302",
-"9 	c #010000",
-"0 	c #000000",
-"a 	c #0A100A",
-"b 	c #050302",
-"c 	c #100808",
-"d 	c #020000",
-"e 	c #040303",
-"f 	c #3C2323",
-"g 	c #F14B2E",
-"h 	c #FF7F45",
-"i 	c #FFAD4E",
-"j 	c #FDC142",
-"k 	c #FFFC7C",
-"l 	c #FFFFAC",
-"m 	c #FFFF9C",
-"n 	c #6B5839",
-"o 	c #4D3C3A",
-"p 	c #8E7B7B",
-"q 	c #14110D",
-"r 	c #17140F",
-"s 	c #030202",
-"t 	c #050403",
-"u 	c #0B0705",
-"v 	c #010101",
-"w 	c #010300",
-"x 	c #020701",
-"y 	c #030B02",
-"z 	c #0D130A",
-"A 	c #0D0707",
-"B 	c #160D0D",
-"C 	c #020101",
-"D 	c #040101",
-"E 	c #130807",
-"F 	c #40250D",
-"G 	c #FEB150",
-"H 	c #FFD262",
-"I 	c #FFF876",
-"J 	c #FFFFA7",
-"K 	c #FFFFAE",
-"L 	c #FFFE86",
-"M 	c #8E7B2D",
-"N 	c #483825",
-"O 	c #52423E",
-"P 	c #050303",
-"Q 	c #040604",
-"R 	c #010501",
-"S 	c #000300",
-"T 	c #000200",
-"U 	c #0D100C",
-"V 	c #181112",
-"W 	c #0A0707",
-"X 	c #3F3537",
-"Y 	c #765737",
-"Z 	c #FFB14F",
-"` 	c #FF9349",
-" .	c #FDB25E",
-"..	c #FBE24B",
-"+.	c #FDDF49",
-"@.	c #FEF651",
-"#.	c #FFF855",
-"$.	c #000100",
-"%.	c #1A1718",
-"&.	c #050405",
-"*.	c #0E120F",
-"=.	c #241D1F",
-"-.	c #141011",
-";.	c #050304",
-">.	c #370D0A",
-",.	c #902A23",
-"'.	c #A74C29",
-").	c #F84D1A",
-"!.	c #FC4628",
-"~.	c #14100D",
-"{.	c #0E1914",
-"].	c #0B0F0C",
-"^.	c #0E0809",
-"/.	c #0C0607",
-"(.	c #0B0706",
-"_.	c #140E0C",
-":.	c #150E0B",
-"<.	c #050A08",
-"[.	c #09100D",
-"}.	c #0E0E0D",
-"|.	c #392B2A",
-"1.	c #54423E",
-"2.	c #020303",
-"3.	c #030201",
-"4.	c #24261E",
-"5.	c #4A4940",
-"6.	c #030203",
-"7.	c #060706",
-"8.	c #080A09",
-"9.	c #1D1A14",
-"0.	c #0D0B09",
-"a.	c #040404",
-"b.	c #2A2424",
-"c.	c #342522",
-"d.	c #2F201E",
-"e.	c #3F302C",
-"f.	c #030302",
-"g.	c #1F191A",
-"h.	c #393233",
-"i.	c #3C2C2B",
-"j.	c #392927",
-"k.	c #342422",
-"l.	c #010301",
-"m.	c #08120C",
-"n.	c #18201B",
-"o.	c #2D2826",
-"p.	c #030101",
-"q.	c #312829",
-"r.	c #3D3532",
-"s.	c #3A423A",
-"t.	c #3C4039",
-"u.	c #090704",
-"v.	c #2D282A",
-"w.	c #020D06",
-"x.	c #1B3B2A",
-"y.	c #718377",
-"z.	c #504B49",
-"A.	c #1B0E0E",
-"B.	c #27181C",
-"C.	c #545253",
-"D.	c #85A596",
-"E.	c #5F8D77",
-"F.	c #57514A",
-"G.	c #5B4641",
-"H.	c #969788",
-"I.	c #000701",
-"J.	c #042713",
-"K.	c #0D3A24",
-"L.	c #262B28",
-"M.	c #0E0607",
-"N.	c #3E3239",
-"O.	c #8B8291",
-"P.	c #ECF2F3",
-"Q.	c #65907F",
-"R.	c #6A6561",
-"S.	c #3A2728",
-"T.	c #6E7367",
-"U.	c #020203",
-"V.	c #0C0C0D",
-"W.	c #022511",
-"X.	c #0A3722",
-"Y.	c #18211D",
-"Z.	c #060102",
-"`.	c #2B1E22",
-" +	c #746D79",
-".+	c #DFE7E9",
-"++	c #5D8978",
-"@+	c #5B5A57",
-"#+	c #412F30",
-"$+	c #726F64",
-"%+	c #1D170E",
-"&+	c #020202",
-"*+	c #060505",
-"=+	c #010903",
-"-+	c #04180A",
-";+	c #0B2918",
-">+	c #212D25",
-",+	c #1A1415",
-"'+	c #090405",
-")+	c #191214",
-"!+	c #415C51",
-"~+	c #557A6C",
-"{+	c #446E5A",
-"]+	c #46433E",
-"^+	c #54413E",
-"/+	c #7D7369",
-"(+	c #010100",
-"_+	c #010702",
-":+	c #011708",
-"<+	c #062A17",
-"[+	c #20201F",
-"}+	c #0C090A",
-"|+	c #170F10",
-"1+	c #516A63",
-"2+	c #A1B3B2",
-"3+	c #6C9082",
-"4+	c #303532",
-"5+	c #28191C",
-"6+	c #423335",
-"7+	c #747B6A",
-"8+	c #000F03",
-"9+	c #02230F",
-"0+	c #0C0D0D",
-"a+	c #191012",
-"b+	c #456057",
-"c+	c #86A19E",
-"d+	c #5A8476",
-"e+	c #252E2A",
-"f+	c #1C0D0F",
-"g+	c #312224",
-"h+	c #6D7966",
-"i+	c #211910",
-"j+	c #000E03",
-"k+	c #02210E",
-"l+	c #0E0F0E",
-"m+	c #170E0E",
-"n+	c #385046",
-"o+	c #718785",
-"p+	c #48695D",
-"q+	c #202421",
-"r+	c #241515",
-"s+	c #3D2D2E",
-"t+	c #686758",
-"u+	c #0C0907",
-"v+	c #040201",
-"w+	c #1A1414",
-"x+	c #080505",
-"y+	c #110A0B",
-"z+	c #352D34",
-"A+	c #93838D",
-"B+	c #5F545E",
-"C+	c #2A1F23",
-"D+	c #211313",
-"E+	c #251818",
-"F+	c #261411",
-"G+	c #502F28",
-"H+	c #000001",
-"I+	c #090406",
-"J+	c #292229",
-"K+	c #5C515E",
-"L+	c #403844",
-"M+	c #181016",
-"N+	c #110808",
-"O+	c #13090B",
-"                                                              ",
-"                                                              ",
-"                                                              ",
-"                                                              ",
-"                                                          . + ",
-"                            @ # $           % & * = - ; > , ' ",
-"                        ) ! ~ { ] ^ / ( _ : < [ } | 1 2 3 4 5 ",
-"                  6 7 8 9 0 a b c d 9 e f g h i j k l m n o p ",
-"          q r s t u v w x y z A B C D E F G H I J | K L M N O ",
-"          0 0 0 0 P Q R S T U V W 9 C X Y Z `  ...+.@.#.      ",
-"          $.0 0 0 %.&.0 0 $.*.=.-.0 0 ;.>.,.'.).!.            ",
-"        ~.0 0 0 0 0 v 0 0 0 {.].^./.(._.:.                    ",
-"          0 0 0 0 0 0 0 0 0 <.[.}.|.1.                        ",
-"          e 0 0 0 v 0 2.0 0 0 3.4.5.                          ",
-"            t 0 6.0 0 7.8.9.                                  ",
-"            0.0 s a.0 b.c.d.e.                                ",
-"            f.0 0 g.0 h.i.j.k.                                ",
-"            l.m.n.o.p.q.r.s.t.                                ",
-"      u.v.0 w.x.y.z.A.B.C.D.E.F.G.H.                          ",
-"      v %.0 I.J.K.L.M.N.O.P.Q.R.S.T.                          ",
-"      U.V.0 I.W.X.Y.Z.`. +.+++@+#+$+                          ",
-"    %+&+*+=+-+;+>+,+'+)+!+~+{+]+^+/+                          ",
-"    (+0 0 _+:+<+[+}+p.|+1+2+3+4+5+6+7+                        ",
-"    0 0 0 $.8+9+0+0 0 a+b+c+d+e+f+g+h+                        ",
-"  i+0 0 0 T j+k+l+e p.m+n+o+p+q+r+s+t+                        ",
-"u+v+0 0 0 0 0 8 w+x+p.y+z+A+B+C+D+E+F+G+                      ",
-"  0 0 0 0 0 0 0 0 H+0 I+J+K+L+M+N+O+                          ",
-"                                                              ",
-"                                                              ",
-"                                                              ",
-"                                                              ",
-"                                                              "};
 
=== modified file 'rocket_backend.py'
--- rocket_backend.py	2008-12-30 19:29:33 +0000
+++ rocket_backend.py	2013-11-20 21:01:57 +0000
@@ -5,9 +5,9 @@
 
 class RocketManager:
 
-	vendor_product_ids = [(0x1941, 0x8021), (0x0a81, 0x0701), (0x0a81, 0xff01), (0x1130, 0x0202)]
-	launcher_types = ["Original", "Webcam", "Wireless", "Striker II"]
-	housing_colors = ["green", "blue", "silver", "black"]
+	vendor_product_ids = [(0x1941, 0x8021), (0x0a81, 0x0701), (0x0a81, 0xff01), (0x1130, 0x0202), (0x2123,0x1010)]
+	launcher_types = ["Original", "Webcam", "Wireless", "Striker II", "OIC Webcam"]
+	housing_colors = ["green", "blue", "silver", "black", "gray"]
 
 	def __init__(self):
 		self.launchers = []
@@ -18,6 +18,8 @@
 
 		device_found = False
 
+
+
 		for bus in usb.busses():
 			for dev in bus.devices:
 				for i, (cheeky_vendor_id, cheeky_product_id) in enumerate(self.vendor_product_ids):
@@ -35,6 +37,8 @@
 							return '''The '''+self.launcher_types[i]+''' ('''+self.housing_colors[i]+''') Rocket Launcher is not yet supported.  Try the '''+self.launcher_types[0]+''' or '''+self.launcher_types[1]+''' one.'''
 						elif i == 3:
 							launcher = BlackRocketLauncher()
+						elif i == 4:
+							launcher = GrayRocketLauncher()
 
 						return_code = launcher.acquire( dev )
 						if not return_code:
@@ -56,9 +60,11 @@
 the new permissions from the .rules file.'''
 
 
+
 		if not device_found:
 			return 'No USB Rocket Launcher appears\nto be connected.'
 
+
 # ============================================
 # ============================================
 
@@ -237,3 +243,30 @@
 
 		return self.previous_limit_switch_states
 
+
+
+# ============================================
+# ============================================
+
+class GrayRocketLauncher(BlueRocketLauncher):
+
+	striker_commands = [0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40]
+	has_laser = False
+
+	# -----------------------------
+	def issue_command(self, command_index):
+
+		signal = self.striker_commands[command_index]
+
+		try:
+			self.handle.controlMsg(0x21,0x09, [0x02, signal, 0x00,0x00,0x00,0x00,0x00,0x00])
+
+		except usb.USBError:
+			pass
+
+	# -----------------------------
+	def check_limits(self):
+
+		return self.previous_limit_switch_states
+
+
 
=== modified file 'rocket_frontend.py'
--- rocket_frontend.py	2008-12-30 19:29:33 +0000
+++ rocket_frontend.py	2013-11-20 21:01:57 +0000
@@ -11,10 +11,10 @@
 from rocket_webcam import VideoWindow
 from rocket_joystick import StatefulJoystick
 
-class RocketWindow(StatefulJoystick):
+class RocketWindow:
 
 	appname = "pyrocket"
-	version = "0.6"
+	version = "0.7"
 	local_share_dir = "/usr/share/"
 
 	keymap = [65364, 65362, 65361, 65363]
@@ -30,6 +30,9 @@
 
 	def __init__(self, run_installed=True):
 
+		self.joystick_state = StatefulJoystick()
+#		self.joystick_state = None
+
 		self.run_installed = run_installed
 
 		self.img_path = ""
@@ -107,14 +110,6 @@
 
 		top_menu.append( help_menu )
 
-
-
-
-
-
-
-
-
 		# ----------------------------
 
 		self.video = VideoWindow()
@@ -123,8 +118,6 @@
 
 		# ----------------------------
 
-
-
 		self.joystick_hbox = gtk.HBox(False, 5)
 		vbox.pack_start(self.joystick_hbox, False, False)
 
@@ -139,6 +132,18 @@
 
 		self.joystick_hbox.set_no_show_all(True)
 
+
+		if self.joystick_state:
+			if not self.joystick_state.joystick_init():
+				self.status_message_list.append("Try connecting a Joystick!")
+			else:
+				self.joystick_hbox.set_no_show_all(False)	# huh?
+				self.joystick_hbox.show_all()
+				self.joystick_name_label.set_text( self.joystick_state.joystick_object.get_name() )
+				print 'Joystick has %d axes and %d buttons' %(self.joystick_state.num_axes, self.joystick_state.num_buttons)
+
+
+
 		# ----------------------------        
 		control_hbox = gtk.HBox(False, 5)
 		vbox.pack_start(control_hbox, False, False)
@@ -206,13 +211,13 @@
 		self.connect_everything()
 		self.cb_select_new_launcher(self.laucher_id)
 
-		StatefulJoystick.__init__(self)
-
 
 		self.status_message_index = 1
 		self.last_message_id = None
 		self.cycle_status_message()
 
+		gobject.idle_add( self.limit_checker_loop )
+
 	# ===============================
 
 	def cb_toggle_show_camera(self, widget):
@@ -233,6 +238,7 @@
 	def cb_about_dialog(self, widget):
 
 		about_dialog = gtk.AboutDialog()
+		about_dialog.set_transient_for(self.window)
 		about_dialog.set_version( self.version )
 		about_dialog.set_logo( gtk.gdk.pixbuf_new_from_file(self.img_path + "msnmissile.png") )
 		about_dialog.set_copyright(u"\u00A92008 Karl Ostmo")
@@ -297,7 +303,7 @@
 		self.last_message_id = self.status_bar.push(0, new_msg_text)
 
 		if not saved_id is None:
-			self.status_bar.remove(saved_id, (self.status_message_index-1) % len(self.status_message_list) + 1)
+			self.status_bar.remove_message(saved_id, (self.status_message_index-1) % len(self.status_message_list) + 1)
 		self.status_message_index += 1
 		gobject.timeout_add( self.status_message_timeout, self.cycle_status_message)
 
@@ -465,10 +471,10 @@
 
 		# Terminate cylinder charging based on radio state
 		grp = self.stop_charge.get_group()
-		if grp[0].get_active():
+		if len(grp) > 0 and grp[0].get_active():
 			if prev_fire_state and not next_fire_state:
 				launcher.stop_movement()
-		elif grp[1].get_active():
+		elif len(grp) > 1 and grp[1].get_active():
 			if not prev_fire_state and next_fire_state:
 				launcher.stop_movement()
 
@@ -496,8 +502,8 @@
 		if self.video:
 			self.video.stop_capture()
 
-		if self.joystick_object:
-			self.joystick_object.quit()
+		if self.joystick_state and self.joystick_state.joystick_object:
+			self.joystick_state.joystick_object.quit()
 
 
 		for launcher in self.rocket_controller.launchers:
 
=== modified file 'rocket_joystick.py'
--- rocket_joystick.py	2008-12-30 19:29:33 +0000
+++ rocket_joystick.py	2013-11-20 21:01:57 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from opencv import cv, highgui
+import cv
 
 from pygtk import require
 require('2.0')
@@ -7,9 +7,7 @@
 
 
 import pygame
-import pygame.display
-import pygame.joystick
-from pygame.locals import *
+#from pygame.locals import *
 
 # ==================================
 
@@ -28,9 +26,6 @@
 		self.joystick_debug = False
 		self.joystick_object = None
 
-		self.joystick_init()
-		gobject.idle_add( self.limit_checker_loop )
-
     # ===============================
 
 	def joystick_init(self):
@@ -43,8 +38,7 @@
 		joystick_count = pygame.joystick.get_count()	# get number of joysticks
 		print('%d joystick(s) connected' %joystick_count)
 		if not joystick_count:
-			self.status_message_list.append("Try connecting a Joystick!")
-			return
+			return False
 
 		self.joystick_object = pygame.joystick.Joystick(0)
 		self.joystick_object.init()
@@ -53,10 +47,6 @@
 		self.num_buttons = self.joystick_object.get_numbuttons()
 
 
-		self.joystick_hbox.set_no_show_all(False)
-		self.joystick_hbox.show_all()
-		self.joystick_name_label.set_text( self.joystick_object.get_name() )
-		print 'Joystick has %d axes and %d buttons' %(self.num_axes, self.num_buttons)
 
 		self.prev_button_array = [0]*self.num_buttons
 		self.prev_movement_state = [0, 0]
@@ -64,6 +54,8 @@
 
 		gobject.idle_add( self.joystick_event_loop )
 
+		return True
+
 	# ===============================
 
 	def joystick_event_loop(self):
 
=== modified file 'rocket_webcam.py'
--- rocket_webcam.py	2008-12-30 19:29:33 +0000
+++ rocket_webcam.py	2013-11-20 21:01:57 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from opencv import cv, highgui
+import cv
 
 from pygtk import require
 require('2.0')
@@ -68,16 +68,16 @@
 
                 if not self.capture:
 
-			self.capture = highgui.cvCreateCameraCapture (device)
+			self.capture = cv.CreateCameraCapture (device)
 			
-			highgui.cvSetCaptureProperty(self.capture, highgui.CV_CAP_PROP_FRAME_WIDTH, video_dimensions[0])
-			highgui.cvSetCaptureProperty(self.capture, highgui.CV_CAP_PROP_FRAME_HEIGHT, video_dimensions[1])
+			cv.SetCaptureProperty(self.capture, cv.CV_CAP_PROP_FRAME_WIDTH, video_dimensions[0])
+			cv.SetCaptureProperty(self.capture, cv.CV_CAP_PROP_FRAME_HEIGHT, video_dimensions[1])
 
 	# -----------------------------------
 
 	def stop_capture(self):
                 if self.capture:
-                        cv.cvReleaseCapture( self.capture )
+                	del(self.capture)
 
 		self.capture = None
 
@@ -85,24 +85,24 @@
 
 	def initialize_video(self):
 
-		webcam_frame = highgui.cvQueryFrame( self.capture )
+		webcam_frame = cv.QueryFrame( self.capture )
 
 		if not webcam_frame:
 			print "Frame acquisition failed."
 			return False
 
 		self.webcam_pixbuf = gtk.gdk.pixbuf_new_from_data(
-			webcam_frame.imageData,
+			webcam_frame.tostring(),
 			gtk.gdk.COLORSPACE_RGB,
 			False,
 			8,
 			webcam_frame.width,
 			webcam_frame.height,
-			webcam_frame.widthStep)
+			webcam_frame.width * 3)
 		self.video_image.set_from_pixbuf(self.webcam_pixbuf)
 
 
-                self.display_frame = cv.cvCreateImage( cv.cvSize(webcam_frame.width, webcam_frame.height), cv.IPL_DEPTH_8U, 3)
+                self.display_frame = cv.CreateImage( (webcam_frame.width, webcam_frame.height), cv.IPL_DEPTH_8U, 3)
 
 		return True
 
@@ -118,26 +118,26 @@
 	def run(self):
 
 		if self.capture:
-			webcam_frame = highgui.cvQueryFrame( self.capture )
+			webcam_frame = cv.QueryFrame( self.capture )
 		else:
 			print "Capture failed!"
 			return
 
 		if self.inverted_video.get_active():
-			highgui.cvConvertImage(webcam_frame, webcam_frame, highgui.CV_CVTIMG_FLIP)
-		highgui.cvConvertImage(webcam_frame, self.display_frame, highgui.CV_CVTIMG_SWAP_RB)
+			cv.ConvertImage(webcam_frame, webcam_frame, cv.CV_CVTIMG_FLIP)
+		cv.ConvertImage(webcam_frame, self.display_frame, cv.CV_CVTIMG_SWAP_RB)
 
 
 
 
 		if False:
 			# PROCESS WEBCAM FRAME HERE...
-			inputImage = cv.cvCreateImage(cv.cvGetSize(webcam_frame), cv.IPL_DEPTH_8U, 1)
-			cv.cvCvtColor(webcam_frame, inputImage, cv.CV_RGB2GRAY);
-
-			cv.cvThreshold(inputImage, inputImage, 128, 255, cv.CV_THRESH_BINARY)
-
-			mysize = cv.cvGetSize(webcam_frame)
+			inputImage = cv.CreateImage((webcam_frame), cv.IPL_DEPTH_8U, 1)
+			cv.CvtColor(webcam_frame, inputImage, cv.CV_RGB2GRAY);
+
+			cv.Threshold(inputImage, inputImage, 128, 255, cv.CV_THRESH_BINARY)
+
+			mysize = cv.GetSize(webcam_frame)
 			height = mysize.height
 			width = mysize.width
 
@@ -150,19 +150,19 @@
 
 				print "Sum:", mysum
 
-			cv.cvMerge( inputImage, inputImage, inputImage, None, self.display_frame )
+			cv.Merge( inputImage, inputImage, inputImage, None, self.display_frame )
 
 
 
 
 		incoming_pixbuf = gtk.gdk.pixbuf_new_from_data(
-				self.display_frame.imageData,
+				self.display_frame.tostring(),
 				gtk.gdk.COLORSPACE_RGB,
 				False,
 				8,
 				self.display_frame.width,
 				self.display_frame.height,
-				self.display_frame.widthStep)
+				self.display_frame.width * 3)
 		incoming_pixbuf.copy_area(0, 0, self.display_frame.width, self.display_frame.height, self.webcam_pixbuf, 0, 0)
 
 		self.video_image.queue_draw()
 
=== modified file 'setup.py'
--- setup.py	2008-12-30 19:29:33 +0000
+++ setup.py	2013-11-20 21:01:57 +0000
@@ -10,7 +10,7 @@
 		long_description="""pyrocket is used to operate USB foam dart launchers. It supports many models,
 and for some, has considerably more functionality than the drivers provided by
 the manufacturer. One may find it useful as a starting point for controlling
-other USB devices, or just for waging cubicle warfare.
+other USB devices, or simply for waging cubicle warfare.
 
 pyrocket automatically detects the launcher(s) and a joystick, and a video
 window is provided for webcam-enabled devices. pyrocket currently supports the
@@ -21,7 +21,7 @@
 		author_email="[e-mail]",
 		url="http://pyrocket.googlecode.com/",
 #		version=RocketWindow.version
-		version="0.6",
+		version="0.7",
 		py_modules=["rocket_backend", "rocket_frontend", "rocket_webcam", "rocket_joystick"],
 		scripts=["pyrocket"],
 #		data_files=[(RocketWindow.img_path, ["joystick.svg", "pyrocket.png"])]