CoverGloobus

Merge lp:~cahr-gr/covergloobus/python2 into lp:covergloobus

  1. python2
  2. Merge into trunk
Proposed by Alexandr Grigorcea
Status: Merged
Merged at revision: 272
Proposed branch: lp:~cahr-gr/covergloobus/python2
Merge into: lp:covergloobus
Diff against target: 103 lines (+12/-12)
7 files modified
configure.ac (+5/-5)
src/covergloobus-config.py (+2/-2)
src/covergloobus.py (+1/-1)
src/scripts/covergloobus (+1/-1)
src/scripts/covergloobus-config (+1/-1)
src/scripts/covergloobus-config.in (+1/-1)
src/scripts/covergloobus.in (+1/-1)
To merge this branch: bzr merge lp:~cahr-gr/covergloobus/python2
Reviewer Review Type Date Requested Status
BadChoice Pending
Review via email: mp+37588@code.launchpad.net

Description of the change

some distros (like ArchLinux) move to python3, so I changed python to python2, it does not make problems for other distros, tested on Ubuntu 10.04 and works fine

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 'configure.ac'
2--- configure.ac 2010-05-25 21:15:35 +0000
3+++ configure.ac 2010-10-05 11:27:42 +0000
4@@ -1,6 +1,6 @@
5 AC_INIT(src/covergloobus-config.py)
6
7-AM_INIT_AUTOMAKE(covergloobus, 1.6, http://launchpad.net/covergloobus)
8+AM_INIT_AUTOMAKE(covergloobus, 1.7, http://launchpad.net/covergloobus)
9
10 AM_SILENT_RULES([yes])
11
12@@ -37,8 +37,8 @@
13 data/Makefile
14 data/themes/Makefile
15 data/themes/45Controls/Makefile
16- data/themes/BadChoice/Makefile
17- data/themes/BadChoice2/Makefile
18+ data/themes/BadChoice/Makefile
19+ data/themes/BadChoice2/Makefile
20 data/themes/BoxOfTricks/Makefile
21 data/themes/BoxOfTricksMod/Makefile
22 data/themes/corner/Makefile
23@@ -49,7 +49,7 @@
24 data/themes/Polaroid/Makefile
25 data/themes/Postcard/Makefile
26 data/themes/Postcard2/Makefile
27- data/themes/simple/Makefile
28+ data/themes/simple/Makefile
29 data/themes/Vinyl/Makefile
30 data/themes/Ibex/Makefile
31 data/themes/ToolTip/Makefile
32@@ -71,5 +71,5 @@
33 echo
34 echo "Run \"make\" to create the needed files"
35 echo "then run \"make install\" as root to install the $PACKAGE $VERSION"
36-echo
37+echo
38 echo
39
40=== modified file 'src/covergloobus-config.py'
41--- src/covergloobus-config.py 2010-02-06 21:45:21 +0000
42+++ src/covergloobus-config.py 2010-10-05 11:27:42 +0000
43@@ -1,4 +1,4 @@
44-#!/usr/bin/env python
45+#!/usr/bin/env python2
46
47 # CoverGloobus by BadChoice <guitarboy000@gmail.com>
48 # - Reused a lot of code from NowPlaying Screenlet done by Magicrobomonkey and modified by Vrunner
49@@ -8,7 +8,7 @@
50 # - Webpage: http://launchpad.net/covergloobus
51 # - Blog: http://gloobus.wordpress.com
52 # - Donate: guitarboy000@gmail.com via PayPal
53-#
54+#
55 # TODO:
56 #This program is free software; you can redistribute it and/or
57 #modify it under the terms of the GNU General Public License
58
59=== modified file 'src/covergloobus.py'
60--- src/covergloobus.py 2010-07-10 11:14:46 +0000
61+++ src/covergloobus.py 2010-10-05 11:27:42 +0000
62@@ -1,4 +1,4 @@
63-#!/usr/bin/env python
64+#!/usr/bin/env python2
65
66 # CoverGloobus by BadChoice <guitarboy000@gmail.com>
67 # - Reused a lot of code from NowPlaying Screenlet done by Magicrobomonkey and modified by Vrunner
68
69=== modified file 'src/scripts/covergloobus'
70--- src/scripts/covergloobus 2010-03-19 22:22:45 +0000
71+++ src/scripts/covergloobus 2010-10-05 11:27:42 +0000
72@@ -1,3 +1,3 @@
73 #!/bin/bash
74
75-python /usr/share/covergloobus/covergloobus.py $1
76+python2 /usr/share/covergloobus/covergloobus.py $1
77
78=== modified file 'src/scripts/covergloobus-config'
79--- src/scripts/covergloobus-config 2010-03-19 22:22:45 +0000
80+++ src/scripts/covergloobus-config 2010-10-05 11:27:42 +0000
81@@ -1,3 +1,3 @@
82 #!/bin/bash
83
84-python /usr/share/covergloobus/covergloobus-config.py $1
85+python2 /usr/share/covergloobus/covergloobus-config.py $1
86
87=== modified file 'src/scripts/covergloobus-config.in'
88--- src/scripts/covergloobus-config.in 2009-11-28 17:10:56 +0000
89+++ src/scripts/covergloobus-config.in 2010-10-05 11:27:42 +0000
90@@ -1,3 +1,3 @@
91 #!/bin/bash
92
93-python @prefix@/share/covergloobus/covergloobus-config.py $1
94+python2 @prefix@/share/covergloobus/covergloobus-config.py $1
95
96=== modified file 'src/scripts/covergloobus.in'
97--- src/scripts/covergloobus.in 2009-11-28 13:07:48 +0000
98+++ src/scripts/covergloobus.in 2010-10-05 11:27:42 +0000
99@@ -1,3 +1,3 @@
100 #!/bin/bash
101
102-python @prefix@/share/covergloobus/covergloobus.py $1
103+python2 @prefix@/share/covergloobus/covergloobus.py $1

Subscribers

People subscribed via source and target branches