Control: tags 759065 + patch
Dear maintainer,
The attached patch is likely most of what's needed to update you package
for wxPython 3.0, but I can't easily test it due to the dependency issue
already filed as #753890.
Cheers,
Olly
diff -Nru photofilmstrip-1.9.92+dfsg/debian/changelog photofilmstrip-1.9.92+dfsg/debian/changelog
--- photofilmstrip-1.9.92+dfsg/debian/changelog 2013-07-18 23:31:13.000000000 +1200
+++ photofilmstrip-1.9.92+dfsg/debian/changelog 2014-09-19 00:18:39.000000000 +1200
@@ -1,3 +1,10 @@
+photofilmstrip (1.9.92+dfsg-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update for wxPython 3.0. (Closes: #759065)
+
+ -- Olly Betts <o...@survex.com> Thu, 18 Sep 2014 12:18:39 +0000
+
photofilmstrip (1.9.92+dfsg-1) unstable; urgency=low
* New upstream release (Closes: #695062)
diff -Nru photofilmstrip-1.9.92+dfsg/debian/control photofilmstrip-1.9.92+dfsg/debian/control
--- photofilmstrip-1.9.92+dfsg/debian/control 2013-06-05 21:21:13.000000000 +1200
+++ photofilmstrip-1.9.92+dfsg/debian/control 2014-09-19 00:20:00.000000000 +1200
@@ -10,7 +10,7 @@
Package: photofilmstrip
Architecture: all
-Depends: ${misc:Depends}, mencoder, python-wxgtk2.8, python-imaging, ${python:Depends}
+Depends: ${misc:Depends}, mencoder, python-wxgtk3.0, python-imaging, ${python:Depends}
Description: Slideshow creator with Ken Burns effect
This creates movies out of your pictures in just three steps.
First select your photos, customize the motion path and render the
diff -Nru photofilmstrip-1.9.92+dfsg/debian/patches/series photofilmstrip-1.9.92+dfsg/debian/patches/series
--- photofilmstrip-1.9.92+dfsg/debian/patches/series 2012-04-15 18:23:03.000000000 +1200
+++ photofilmstrip-1.9.92+dfsg/debian/patches/series 2014-09-19 00:18:51.000000000 +1200
@@ -1 +1,2 @@
strip-encoding
+wxpython3.0.patch
diff -Nru photofilmstrip-1.9.92+dfsg/debian/patches/wxpython3.0.patch photofilmstrip-1.9.92+dfsg/debian/patches/wxpython3.0.patch
--- photofilmstrip-1.9.92+dfsg/debian/patches/wxpython3.0.patch 1970-01-01 12:00:00.000000000 +1200
+++ photofilmstrip-1.9.92+dfsg/debian/patches/wxpython3.0.patch 2014-09-19 00:19:22.000000000 +1200
@@ -0,0 +1,126 @@
+Description: Update for wxPython 3.0
+ These changes should remain compatible with wxPython 2.8.
+Author: Olly Betts <o...@survex.com>
+Bug-Debian: https://bugs.debian.org/759065
+Forwarded: no
+Last-Update: 2014-09-19
+
+--- photofilmstrip-1.9.92+dfsg.orig/photofilmstrip/GUI.py
++++ photofilmstrip-1.9.92+dfsg/photofilmstrip/GUI.py
+@@ -29,7 +29,7 @@ class GuiApp(AppMixin):
+ def _OnStart(self):
+ if not getattr(sys, 'frozen', False):
+ import wxversion
+- wxversion.select("2.8")
++ wxversion.select("3.0")
+
+ from photofilmstrip.gui.PhotoFilmStripApp import PhotoFilmStripApp
+ app = PhotoFilmStripApp(0)
+--- photofilmstrip-1.9.92+dfsg.orig/photofilmstrip/gui/DlgProjectProps.py
++++ photofilmstrip-1.9.92+dfsg/photofilmstrip/gui/DlgProjectProps.py
+@@ -334,7 +334,7 @@ class DlgProjectProps(wx.Dialog):
+ dlg = wx.FileDialog(self, _(u"Select music"),
+ Settings().GetAudioPath(), "",
+ _(u"Audio files") + " (*.*)|*.*",
+- wx.OPEN)
++ wx.FD_OPEN)
+ if dlg.ShowModal() == wx.ID_OK:
+ path = dlg.GetPath()
+ Settings().SetAudioPath(os.path.dirname(path))
+--- photofilmstrip-1.9.92+dfsg.orig/photofilmstrip/gui/FrmMain.py
++++ photofilmstrip-1.9.92+dfsg/photofilmstrip/gui/FrmMain.py
+@@ -306,7 +306,7 @@ class FrmMain(wx.Frame, Observer, WxVisu
+ dlg = wx.FileDialog(self, _(u"Select %s-Project") % Constants.APP_NAME,
+ Settings().GetProjectPath(), "",
+ Constants.APP_NAME + u'-' + _(u"Project") + " (*.pfs)|*.pfs",
+- wx.OPEN)
++ wx.FD_OPEN)
+ if dlg.ShowModal() == wx.ID_OK:
+ self.LoadProject(dlg.GetPath())
+
+@@ -326,7 +326,7 @@ class FrmMain(wx.Frame, Observer, WxVisu
+ Settings().GetProjectPath(),
+ curFilePath,
+ Constants.APP_NAME + u'-' + _(u"Project") + " (*.pfs)|*.pfs",
+- wx.SAVE)
++ wx.FD_SAVE)
+ if dlg.ShowModal() == wx.ID_OK:
+ filepath = dlg.GetPath()
+ if os.path.splitext(filepath)[1].lower() != ".pfs":
+@@ -357,7 +357,7 @@ class FrmMain(wx.Frame, Observer, WxVisu
+ Settings().GetProjectPath(),
+ curFilePath,
+ u"%s %s-%s %s" % (_(u"Portable"), Constants.APP_NAME, _(u"Project"), "(*.ppfs)|*.ppfs"),
+- wx.SAVE)
++ wx.FD_SAVE)
+ if dlg.ShowModal() == wx.ID_OK:
+ filepath = dlg.GetPath()
+ if os.path.splitext(filepath)[1].lower() != ".ppfs":
+@@ -368,7 +368,7 @@ class FrmMain(wx.Frame, Observer, WxVisu
+ dlg = wx.FileDialog(self, _(u"Import %s-Project") % Constants.APP_NAME,
+ Settings().GetProjectPath(), "",
+ u"%s %s-%s %s" % (_(u"Portable"), Constants.APP_NAME, _(u"Project"), "(*.ppfs)|*.ppfs"),
+- wx.OPEN)
++ wx.FD_OPEN)
+ if dlg.ShowModal() == wx.ID_OK:
+ self.LoadProject(dlg.GetPath(), True)
+
+--- photofilmstrip-1.9.92+dfsg.orig/photofilmstrip/gui/PhotoFilmStripApp.py
++++ photofilmstrip-1.9.92+dfsg/photofilmstrip/gui/PhotoFilmStripApp.py
+@@ -33,7 +33,6 @@ class PhotoFilmStripApp(wx.App):
+
+ def OnInit(self):
+ self.SetAssertMode(wx.PYAPP_ASSERT_SUPPRESS)
+- wx.InitAllImageHandlers()
+ # loc = wx.Locale(wx.LANGUAGE_GERMAN)
+
+ ArtProvider.Init()
+--- photofilmstrip-1.9.92+dfsg.orig/photofilmstrip/gui/PhotoFilmStripList.py
++++ photofilmstrip-1.9.92+dfsg/photofilmstrip/gui/PhotoFilmStripList.py
+@@ -94,7 +94,7 @@ class PhotoFilmStripList(wx.ScrolledWind
+ font = wx.SystemSettings_GetFont(wx.SYS_ANSI_FIXED_FONT)
+ font.SetPointSize(9)
+ dc.SetFont(font)
+- dc.SetTextForeground(wx.Color(237, 156, 0))
++ dc.SetTextForeground(wx.Colour(237, 156, 0))
+ dc.SetBackground(wx.BLACK_BRUSH)
+
+ dc.Clear()
+@@ -152,13 +152,13 @@ class PhotoFilmStripList(wx.ScrolledWind
+ rect = self.GetThumbRect(selIdx)
+ rect.OffsetXY(-vs, 0)
+ col = wx.SystemSettings_GetColour(wx.SYS_COLOUR_HIGHLIGHT)
+- dc.SetBrush(wx.Brush(wx.Color(col.Red(), col.Green(), col.Blue(), 180)))
++ dc.SetBrush(wx.Brush(wx.Colour(col.Red(), col.Green(), col.Blue(), 180)))
+ dc.DrawRectangleRect(rect)
+ if self.__hvrIdx != -1:
+ rect = self.GetThumbRect(self.__hvrIdx)
+ rect.OffsetXY(-vs, 0)
+ col = wx.SystemSettings_GetColour(wx.SYS_COLOUR_HIGHLIGHT)
+- color = wx.Color(col.Red(), col.Green(), col.Blue(), 80)
++ color = wx.Colour(col.Red(), col.Green(), col.Blue(), 80)
+ dc.SetBrush(wx.Brush(color))
+ dc.DrawRectangleRect(rect)
+
+--- photofilmstrip-1.9.92+dfsg.orig/photofilmstrip/gui/PnlPfsProject.py
++++ photofilmstrip-1.9.92+dfsg/photofilmstrip/gui/PnlPfsProject.py
+@@ -269,7 +269,7 @@ class PnlPfsProject(wx.Panel, Observer):
+ dlg = wx.FileDialog(self, _(u"Import images"),
+ Settings().GetImagePath(), "",
+ _(u"Imagefiles") + " (*.*)|*.*",
+- wx.OPEN | wx.FD_MULTIPLE | wx.FD_PREVIEW)
++ wx.FD_OPEN | wx.FD_MULTIPLE | wx.FD_PREVIEW)
+ if dlg.ShowModal() == wx.ID_OK:
+ pics = []
+ for path in dlg.GetPaths():
+--- photofilmstrip-1.9.92+dfsg.orig/photofilmstrip/gui/PnlWelcome.py
++++ photofilmstrip-1.9.92+dfsg/photofilmstrip/gui/PnlWelcome.py
+@@ -166,7 +166,7 @@ class PnlWelcome(wx.Panel):
+
+ font = wx.Font(14, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD)
+ dc.SetFont(font)
+- dc.SetTextForeground(wx.Color(127, 127, 127))
++ dc.SetTextForeground(wx.Colour(127, 127, 127))
+ dc.DrawLabel(self.title, wx.Rect(0, 10, sz[0], 50), wx.ALIGN_CENTER_HORIZONTAL)
+
+ def OnLinkClicked(self, event):
