Merge lp:~lfaraone/ubuntu/lucid/mirage/lp538906 into lp:ubuntu/lucid/mirage

Proposed by Luke Faraone on 2010-03-16
Status: Merged
Merged at revision: not available
Proposed branch: lp:~lfaraone/ubuntu/lucid/mirage/lp538906
Merge into: lp:ubuntu/lucid/mirage
Diff against target: 285 lines (+144/-18)
11 files modified
debian/changelog (+23/-0)
debian/control (+5/-4)
debian/menu (+6/-0)
debian/patches/.dpkg-source-applied (+3/-0)
debian/patches/halfSelected.patch (+12/-0)
debian/patches/remove_gimp_remote.patch (+16/-0)
debian/patches/series (+3/-0)
debian/patches/xdg_specification.patch (+60/-0)
debian/rules (+3/-2)
debian/source/format (+1/-0)
mirage.py (+12/-12)
To merge this branch: bzr merge lp:~lfaraone/ubuntu/lucid/mirage/lp538906
Reviewer Review Type Date Requested Status
Daniel Holbach Approve on 2010-03-16
Ubuntu branches 2010-03-16 Pending
Review via email: mp+21426@code.launchpad.net
To post a comment you must log in.
Daniel Holbach (dholbach) wrote :

Generally OK, I changed a few things though:

 - added (LP: #538906)
 - ran 'update-maintainer' (from ubuntu-dev-tools)
 - spelled 'verison' as 'version'
 - mentioned that debian/control was changed for the python version change too

Good work!

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 2009-06-12 14:30:25 +0000
3+++ debian/changelog 2010-03-16 03:29:21 +0000
4@@ -1,3 +1,26 @@
5+mirage (0.9.3-5ubuntu1) lucid; urgency=low
6+
7+ * Bump Python verison in debian/rules to 2.6.
8+
9+ -- Luke Faraone <luke@faraone.cc> Mon, 15 Mar 2010 21:59:00 -0400
10+
11+mirage (0.9.3-5) unstable; urgency=low
12+
13+ * Fix dh_pysupport call, so only python-support controlled files are
14+ installed (Closes: #566038)
15+ * Fix half-selected images (Closes: #536285). Thanks to Evgeni Golov patch
16+ * Provide a mirage menu item (Closes: #550023)
17+ * Add XDG base directory specification support (Closes: #535816).
18+ Thanks to Jakub Wilk <ubanus@users.sf.net> patch
19+ * Add suggest gimp, imagemagick, menu (Closes: #535822)
20+ * By default, Ctrl+E is bound to the gimp-remote-2.4 command, which is no
21+ longer available in sid (Closes: #535817)
22+ Thanks to Jakub Wilk <ubanus@users.sf.net> patch
23+ * Switch to dpkg-source 3.0 (quilt) format
24+ * Bump Standards-Version to 3.8.4
25+
26+ -- Xavier Oswald <xoswald@debian.org> Wed, 10 Feb 2010 00:29:30 +0100
27+
28 mirage (0.9.3-4) unstable; urgency=low
29
30 * Remove forgotten DM flag
31
32=== modified file 'debian/control'
33--- debian/control 2009-06-12 14:30:25 +0000
34+++ debian/control 2010-03-16 03:29:21 +0000
35@@ -2,14 +2,15 @@
36 Section: graphics
37 Priority: extra
38 Maintainer: Xavier Oswald <xoswald@debian.org>
39-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), python-support (>= 0.7.6), python-dev (>= 2.5), python-gtk2-dev
40-Standards-Version: 3.8.1
41+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), python-support (>= 0.7.6), python-dev (>= 2.6), python-gtk2-dev, quilt
42+Standards-Version: 3.8.4
43 Homepage: http://mirageiv.berlios.de/
44-XS-Python-Version: current
45+XS-Python-Version: 2.6
46
47 Package: mirage
48 Architecture: any
49-Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}, python-gtk2
50+Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, python-gtk2
51+Suggests: gimp, imagemagick, menu
52 Description: fast and simple GTK+ image viewer
53 Mirage is ideal for users who wish to keep their computers
54 lean while still having a clean image viewer.
55
56=== added file 'debian/menu'
57--- debian/menu 1970-01-01 00:00:00 +0000
58+++ debian/menu 2010-03-16 03:29:21 +0000
59@@ -0,0 +1,6 @@
60+?package(mirage):\
61+ needs="X11"\
62+ section="Applications/Viewers"\
63+ title="Mirage"\
64+ longtitle="Mirage image viewer"\
65+ command="mirage"
66
67=== added directory 'debian/patches'
68=== added file 'debian/patches/.dpkg-source-applied'
69--- debian/patches/.dpkg-source-applied 1970-01-01 00:00:00 +0000
70+++ debian/patches/.dpkg-source-applied 2010-03-16 03:29:21 +0000
71@@ -0,0 +1,3 @@
72+xdg_specification.patch
73+halfSelected.patch
74+remove_gimp_remote.patch
75
76=== added file 'debian/patches/halfSelected.patch'
77--- debian/patches/halfSelected.patch 1970-01-01 00:00:00 +0000
78+++ debian/patches/halfSelected.patch 2010-03-16 03:29:21 +0000
79@@ -0,0 +1,12 @@
80+# mirage loads a cached image and does not update self.currimg_name.
81+# Author: Evgeni Golov <evgeni@debian.org>
82+--- a/mirage.py
83++++ b/mirage.py
84+@@ -3892,6 +3892,7 @@
85+ self.last_image_action_was_smart_fit = False
86+ elif self.open_mode == self.open_mode_1to1 or (self.open_mode == self.open_mode_last and self.last_mode == self.open_mode_1to1):
87+ self.last_image_action_was_fit = False
88++ self.currimg_name = str(self.image_list[self.curr_img_in_list])
89+ else:
90+ # Need to load the current image
91+ self.currimg_pixbuf = None
92
93=== added file 'debian/patches/remove_gimp_remote.patch'
94--- debian/patches/remove_gimp_remote.patch 1970-01-01 00:00:00 +0000
95+++ debian/patches/remove_gimp_remote.patch 2010-03-16 03:29:21 +0000
96@@ -0,0 +1,16 @@
97+# By default, Ctrl+E is bound to the gimp-remote-2.4 command, which is no
98+# longer available in sid.
99+# Author: Jakub Wilk <ubanus@users.sf.net>.
100+Index: mirage-0.9.3/mirage.py
101+===================================================================
102+--- mirage-0.9.3.orig/mirage.py 2010-02-09 23:20:50.000000000 +0100
103++++ mirage-0.9.3/mirage.py 2010-02-09 23:21:53.000000000 +0100
104+@@ -150,7 +150,7 @@
105+ self.preloading_images = True
106+ self.action_names = ["Open in GIMP", "Create Thumbnail", "Create Thumbnails", "Move to Favorites"]
107+ self.action_shortcuts = ["<Control>e", "<Alt>t", "<Control><Alt>t", "<Control><Alt>f"]
108+- self.action_commands = ["gimp-remote-2.4 %F", "convert %F -thumbnail 150x150 %Pt_%N.jpg", "convert %F -thumbnail 150x150 %Pt_%N.jpg", "mkdir -p ~/mirage-favs; mv %F ~/mirage-favs; [NEXT]"]
109++ self.action_commands = ["gimp %F &", "convert %F -thumbnail 150x150 %Pt_%N.jpg", "convert %F -thumbnail 150x150 %Pt_%N.jpg", "mkdir -p ~/mirage-favs; mv %F ~/mirage-favs; [NEXT]"]
110+ self.action_batch = [False, False, True, False]
111+ self.onload_cmd = None
112+ self.searching_for_images = False
113
114=== added file 'debian/patches/series'
115--- debian/patches/series 1970-01-01 00:00:00 +0000
116+++ debian/patches/series 2010-03-16 03:29:21 +0000
117@@ -0,0 +1,3 @@
118+xdg_specification.patch
119+halfSelected.patch
120+remove_gimp_remote.patch
121
122=== added file 'debian/patches/xdg_specification.patch'
123--- debian/patches/xdg_specification.patch 1970-01-01 00:00:00 +0000
124+++ debian/patches/xdg_specification.patch 2010-03-16 03:29:21 +0000
125@@ -0,0 +1,60 @@
126+# Mirage is currently using ~/.config/mirage/ directory to store its
127+# configuration files, which is in the spirit of XDG Base Directory
128+# Specification. The attached patches makes mirage to actually follow
129+# the specification, i.e. to respect the $XDG_CONFIG_HOME variable.
130+# Author Jakub Wilk <ubanus@users.sf.net>
131+Index: mirage-0.9.3/mirage.py
132+===================================================================
133+--- mirage-0.9.3.orig/mirage.py 2010-02-09 23:25:29.000000000 +0100
134++++ mirage-0.9.3/mirage.py 2010-02-09 23:28:47.000000000 +0100
135+@@ -53,6 +53,8 @@
136+ if gtk.pygtk_version < (2, 6, 0):
137+ sys.stderr.write("Mirage requires PyGTK 2.6.0 or newer.\n")
138+ sys.exit(1)
139++
140++config_dir = (os.getenv('XDG_CONFIG_HOME') or os.path.expanduser('~/.config')) + '/mirage'
141+
142+ def valid_int(inputstring):
143+ try:
144+@@ -204,8 +206,8 @@
145+
146+ # Load config from disk:
147+ conf = ConfigParser.ConfigParser()
148+- if os.path.isfile(os.path.expanduser('~/.config/mirage/miragerc')):
149+- conf.read(os.path.expanduser('~/.config/mirage/miragerc'))
150++ if os.path.isfile(config_dir + '/miragerc'):
151++ conf.read(config_dir + '/miragerc')
152+ elif os.path.isfile(os.path.expanduser('~/.miragerc')):
153+ conf.read(os.path.expanduser('~/.miragerc'))
154+ os.remove(os.path.expanduser('~/.miragerc'))
155+@@ -297,8 +299,8 @@
156+ self.curr_slideshow_random = self.slideshow_random
157+
158+ # Read accel_map file, if it exists
159+- if os.path.isfile(os.path.expanduser('~/.config/mirage/accel_map')):
160+- gtk.accel_map_load(os.path.expanduser('~/.config/mirage/accel_map'))
161++ if os.path.isfile(config_dir + '/accel_map'):
162++ gtk.accel_map_load(config_dir + '/accel_map')
163+
164+ self.blank_image = gtk.gdk.pixbuf_new_from_file(self.find_path("mirage_blank.png"))
165+
166+@@ -1465,15 +1467,12 @@
167+ for i in range(len(self.recentfiles)):
168+ conf.set('recent', 'num[' + str(i) + ']', len(self.recentfiles[i]))
169+ conf.set('recent', 'urls[' + str(i) + ',0]', self.recentfiles[i])
170+- if not os.path.exists(os.path.expanduser('~/.config/')):
171+- os.mkdir(os.path.expanduser('~/.config/'))
172+- if not os.path.exists(os.path.expanduser('~/.config/mirage/')):
173+- os.mkdir(os.path.expanduser('~/.config/mirage/'))
174+- conf.write(file(os.path.expanduser('~/.config/mirage/miragerc'), 'w'))
175++ if not os.path.exists(config_dir):
176++ os.makedirs(config_dir)
177++ conf.write(file(config_dir + '/miragerc', 'w'))
178+
179+ # Also, save accel_map:
180+- gtk.accel_map_save(os.path.expanduser('~/.config/mirage/accel_map'))
181+-
182++ gtk.accel_map_save(config_dir + '/accel_map')
183+ return
184+
185+ def delete_event(self, widget, event, data=None):
186
187=== modified file 'debian/rules'
188--- debian/rules 2009-06-12 14:30:25 +0000
189+++ debian/rules 2010-03-16 03:29:21 +0000
190@@ -5,13 +5,14 @@
191
192 include /usr/share/cdbs/1/rules/debhelper.mk
193 include /usr/share/cdbs/1/class/python-distutils.mk
194+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
195
196-PYTHONVER = 2.5
197+PYTHONVER = 2.6
198 DEB_CONFIGURE_EXTRA_FLAGS := --no-compile --prefix $(DEB_DESTDIR)/usr --install-layout=deb
199
200 binary-install/mirage::
201+ /usr/bin/python setup.py install $(DEB_CONFIGURE_EXTRA_FLAGS)
202 dh_pysupport -pmirage
203- /usr/bin/python setup.py install $(DEB_CONFIGURE_EXTRA_FLAGS)
204 dh_installman debian/mirage.1
205 rm -f $(DEB_DESTDIR)/usr/share/mirage/COPYING
206 rm -f $(DEB_DESTDIR)/usr/share/mirage/README
207
208=== added directory 'debian/source'
209=== added file 'debian/source/format'
210--- debian/source/format 1970-01-01 00:00:00 +0000
211+++ debian/source/format 2010-03-16 03:29:21 +0000
212@@ -0,0 +1,1 @@
213+3.0 (quilt)
214
215=== modified file 'mirage.py'
216--- mirage.py 2008-06-05 12:48:37 +0000
217+++ mirage.py 2010-03-16 03:29:21 +0000
218@@ -53,6 +53,8 @@
219 if gtk.pygtk_version < (2, 6, 0):
220 sys.stderr.write("Mirage requires PyGTK 2.6.0 or newer.\n")
221 sys.exit(1)
222+
223+config_dir = (os.getenv('XDG_CONFIG_HOME') or os.path.expanduser('~/.config')) + '/mirage'
224
225 def valid_int(inputstring):
226 try:
227@@ -150,7 +152,7 @@
228 self.preloading_images = True
229 self.action_names = ["Open in GIMP", "Create Thumbnail", "Create Thumbnails", "Move to Favorites"]
230 self.action_shortcuts = ["<Control>e", "<Alt>t", "<Control><Alt>t", "<Control><Alt>f"]
231- self.action_commands = ["gimp-remote-2.4 %F", "convert %F -thumbnail 150x150 %Pt_%N.jpg", "convert %F -thumbnail 150x150 %Pt_%N.jpg", "mkdir -p ~/mirage-favs; mv %F ~/mirage-favs; [NEXT]"]
232+ self.action_commands = ["gimp %F &", "convert %F -thumbnail 150x150 %Pt_%N.jpg", "convert %F -thumbnail 150x150 %Pt_%N.jpg", "mkdir -p ~/mirage-favs; mv %F ~/mirage-favs; [NEXT]"]
233 self.action_batch = [False, False, True, False]
234 self.onload_cmd = None
235 self.searching_for_images = False
236@@ -204,8 +206,8 @@
237
238 # Load config from disk:
239 conf = ConfigParser.ConfigParser()
240- if os.path.isfile(os.path.expanduser('~/.config/mirage/miragerc')):
241- conf.read(os.path.expanduser('~/.config/mirage/miragerc'))
242+ if os.path.isfile(config_dir + '/miragerc'):
243+ conf.read(config_dir + '/miragerc')
244 elif os.path.isfile(os.path.expanduser('~/.miragerc')):
245 conf.read(os.path.expanduser('~/.miragerc'))
246 os.remove(os.path.expanduser('~/.miragerc'))
247@@ -297,8 +299,8 @@
248 self.curr_slideshow_random = self.slideshow_random
249
250 # Read accel_map file, if it exists
251- if os.path.isfile(os.path.expanduser('~/.config/mirage/accel_map')):
252- gtk.accel_map_load(os.path.expanduser('~/.config/mirage/accel_map'))
253+ if os.path.isfile(config_dir + '/accel_map'):
254+ gtk.accel_map_load(config_dir + '/accel_map')
255
256 self.blank_image = gtk.gdk.pixbuf_new_from_file(self.find_path("mirage_blank.png"))
257
258@@ -1465,15 +1467,12 @@
259 for i in range(len(self.recentfiles)):
260 conf.set('recent', 'num[' + str(i) + ']', len(self.recentfiles[i]))
261 conf.set('recent', 'urls[' + str(i) + ',0]', self.recentfiles[i])
262- if not os.path.exists(os.path.expanduser('~/.config/')):
263- os.mkdir(os.path.expanduser('~/.config/'))
264- if not os.path.exists(os.path.expanduser('~/.config/mirage/')):
265- os.mkdir(os.path.expanduser('~/.config/mirage/'))
266- conf.write(file(os.path.expanduser('~/.config/mirage/miragerc'), 'w'))
267+ if not os.path.exists(config_dir):
268+ os.makedirs(config_dir)
269+ conf.write(file(config_dir + '/miragerc', 'w'))
270
271 # Also, save accel_map:
272- gtk.accel_map_save(os.path.expanduser('~/.config/mirage/accel_map'))
273-
274+ gtk.accel_map_save(config_dir + '/accel_map')
275 return
276
277 def delete_event(self, widget, event, data=None):
278@@ -3892,6 +3891,7 @@
279 self.last_image_action_was_smart_fit = False
280 elif self.open_mode == self.open_mode_1to1 or (self.open_mode == self.open_mode_last and self.last_mode == self.open_mode_1to1):
281 self.last_image_action_was_fit = False
282+ self.currimg_name = str(self.image_list[self.curr_img_in_list])
283 else:
284 # Need to load the current image
285 self.currimg_pixbuf = None

Subscribers

People subscribed via source and target branches

to all changes: