[Python-apps-commits] r13911 - in packages/mypaint/tags (6 files)

achadwick-guest at users.alioth.debian.org achadwick-guest at users.alioth.debian.org
Thu Feb 2 14:44:12 UTC 2017


    Date: Thursday, February 2, 2017 @ 14:44:11
  Author: achadwick-guest
Revision: 13911

[svn-buildpackage] Tagging mypaint 1.2.0-4

Added:
  packages/mypaint/tags/1.2.0-4/
  packages/mypaint/tags/1.2.0-4/debian/changelog
    (from rev 13910, packages/mypaint/trunk/debian/changelog)
  packages/mypaint/tags/1.2.0-4/debian/patches/fix-gtk-3.22.4-canvas-disappearance.patch
    (from rev 13910, packages/mypaint/trunk/debian/patches/fix-gtk-3.22.4-canvas-disappearance.patch)
  packages/mypaint/tags/1.2.0-4/debian/patches/series
    (from rev 13910, packages/mypaint/trunk/debian/patches/series)
Deleted:
  packages/mypaint/tags/1.2.0-4/debian/changelog
  packages/mypaint/tags/1.2.0-4/debian/patches/series

Deleted: packages/mypaint/tags/1.2.0-4/debian/changelog
===================================================================
--- packages/mypaint/trunk/debian/changelog	2017-01-26 16:39:42 UTC (rev 13909)
+++ packages/mypaint/tags/1.2.0-4/debian/changelog	2017-02-02 14:44:11 UTC (rev 13911)
@@ -1,166 +0,0 @@
-mypaint (1.2.0-3) unstable; urgency=medium
-
-  * Update d/rules to use dh sequencer. Fixes arch-indep FTBFS.
-    (Closes: #845111)
-  * Update to dh compat level 9.
-
- -- Vincent Cheng <vcheng at debian.org>  Tue, 22 Nov 2016 00:02:02 -0800
-
-mypaint (1.2.0-2) unstable; urgency=medium
-
-  * Acknowledge NMU. Thanks Tobias!
-  * Add debian/patches/fix-glib-2.48-startup-crash.patch to fix startup crash.
-    (Closes: #822784)
-  * Add myself to Uploaders.
-  * Update Standards version to 3.9.8.
-
- -- Vincent Cheng <vcheng at debian.org>  Mon, 02 May 2016 22:43:44 -0700
-
-mypaint (1.2.0-1.1) unstable; urgency=medium
-
-  * Non-maintainer upload.
-  * libpng transition: Change B-D from libpng12-dev to libpng-dev.
-    (Closes: #819440)
-
- -- Tobias Frost <tobi at debian.org>  Mon, 28 Mar 2016 16:41:19 +0200
-
-mypaint (1.2.0-1) unstable; urgency=low
-
-  * Team upload.
-
-  [ Andrew Chadwick ]
-  * New release. (Closes: #812865)
-  * Update copyright.
-  * Install docs.
-  * Update watchfile, and add my signing signature.
-  * Changelog has changed filename.
-  * Add dh-python to build-deps.
-  * Standards bump 3.9.4 -> 3.9.6.
-  * Patches are in upstream now, drop patches/.
-  * Add Nautilus thumbnailer to install.
-
-  [ Jakub Wilk ]
-  * Use canonical URIs for Vcs-* fields.
-
-  [ Vincent Cheng ]
-  * Import Andrew Chadwick's changes from https://github.com/mypaint/debian
-  * Update build-depends from libjson0-dev to libjson-c-dev. (Closes: #745007)
-  * Remove debian/menu file as per tech-ctte decision in #741573.
-
- -- Vincent Cheng <vcheng at debian.org>  Mon, 01 Feb 2016 19:00:26 -0800
-
-mypaint (1.1.0-3) unstable; urgency=low
-
-  * Remove redundant patch: we don't run the memory-intensive test any more.
-  * (Fixes unpack failure FTBFS with patch 2.7.1 (closes: Bug#706508))
-
- -- Andrew Chadwick <a.t.chadwick at gmail.com>  Wed, 01 May 2013 12:48:43 +0100
-
-mypaint (1.1.0-2) unstable; urgency=low
-
-  * Fix FTBFS with DEB_BUILD_OPTIONS=noopt (closes: Bug#704935)
-  * Fix hardening flags not being honoured (closes: Bug#704927) 
-
- -- Andrew Chadwick <a.t.chadwick at gmail.com>  Sun, 21 Apr 2013 20:37:02 +0100
-
-mypaint (1.1.0-1) unstable; urgency=low
-
-  * New upstream version.
-  * New upstream has an updated ru_RU.UTF-8 translation (closes: Bug#685254).
-  * Standards bump and check 3.9.2 -> 3.9.4.
-  * debian/rules: fix lintian script-not-executable for label-brush-mypaint.sh
-  * debian/{rules,control}: split out hi-res data (closes: Bug#660881).
-  * debian/copyright: update to cover new upstream licenses; machine-readable.
-  * Mark myself as Uploader and PAPT as Maintainer (closes: Bug#691827).
-  * Recommend shared-mime-info (closes: Bug#545396).
-  * Migrated from deprecated dh_pysupport to dh_python2.
-  * debian/control: update homepage link
-  * debian/control: provide Vcs-* info
-  * debian/rules: use dh_install, and use it to check for overlooked files
-  * Move message catalogs to mypaint-data.
-  * Backport license update to the all-colours palette (lintian, spelling(!)).
-  * Backport removal of deprecated Encoding key from upstream (lintian).
-  * Build with hardening flags.
-  * Patch in upstream test suite fixes, and run tests during build.
-  * (Only the one which will run with <= 512M RAM, e.g. some ARM buildbots.)
-  * (19 Jan) Move development to Debian VCS (requirement of python apps team).
-  * Add python-matplotlib and python-tk in build-depends (test suite reqs);
-  * Lowercase first letter of each short package description (best practice).
-  * Newlines for Build-Depends and Depends (sponsor preference).
-
- -- Andrew Chadwick <a.t.chadwick at gmail.com>  Wed, 20 Mar 2013 13:08:23 +0000
-
-mypaint (1.0.0-1) unstable; urgency=low
-
-  * New upstream version.
-  * debian/rules: add lintian recommended targets.
-
- -- Gürkan Sengün <gurkan at phys.ethz.ch>  Fri, 25 Nov 2011 10:38:25 +0100
-
-mypaint (0.9.1-1) unstable; urgency=low
-
-  * New upstream version. (Closes: #618792)
-  * Added versioning for depends of mypaint-data. (Closes: #614091)
-  * Bump debhelper version to 8.
-  * Bump standards version to 3.9.2.
-  * debian/control: Changed Source:Version to source:Version.
-
- -- Gürkan Sengün <gurkan at phys.ethz.ch>  Tue, 03 May 2011 14:19:24 +0100
-
-mypaint (0.9.0-1) unstable; urgency=low
-
-  * New upstream version, dropped protobuf dependency. (Closes: #570685)
-  * Bump standards version to 3.9.1.
-  * Updated the manual page.
-
- -- Gürkan Sengün <gurkan at phys.ethz.ch>  Tue, 02 Nov 2010 22:32:34 +0100
-
-mypaint (0.8.2-1.1) unstable; urgency=low
-
-  * Non-maintainer upload.
-  * Fix "Please do not hardcode python dependencies in debian/control"
-    applied patch by Daniel Hahler, thanks Daniel! (Closes: #575641)
-
- -- Bastian Venthur <venthur at debian.org>  Fri, 13 Aug 2010 22:01:39 +0200
-
-mypaint (0.8.2-1) unstable; urgency=low
-
-  * New upstream version.
-  * Added watch file.
-  * Add missing dependency to python-gtk2. (Closes: #571600)
-  * Switch to dpkg-source 3.0 (quilt) format to avoid repackaging.
-
- -- Gürkan Sengün <gurkan at phys.ethz.ch>  Wed, 24 Feb 2010 11:05:51 +0100
-
-mypaint (0.8.0-2) unstable; urgency=low
-
-  * Bump standards version.
-  * debian/cntrol: add depends for python-protobuf. (Closes: #568958)
-  * Add debian/manpages so the manual page gets installed.
-
- -- Gürkan Sengün <gurkan at phys.ethz.ch>  Tue, 09 Feb 2010 10:35:26 +0100
-
-mypaint (0.8.0-1) unstable; urgency=low
-
-  * New upstream version.
-  * debian/changelog: Updated copyright year.
-  * debian/control: Add build-depends for protobuf-compiler.
-  * debian/control: Add depends for python-numpy. (Closes: #551322)
-
- -- Gürkan Sengün <gurkan at phys.ethz.ch>  Sat, 30 Jan 2010 19:53:23 +0100
-
-mypaint (0.7.1-2) unstable; urgency=low
-
-  * Added missing copyright holders.
-  * Applied patch to fix desktop icons. (Closes: #545387)
-    Thanks to Andrew Chadwick for the patch.
-  * Applied patch to fix multiple builds. (Closes: #545650)
-    Thanks to Andrew Chadwick for the patch.
-
- -- Gürkan Sengün <gurkan at phys.ethz.ch>  Mon, 21 Sep 2009 16:55:18 +0200
-
-mypaint (0.7.1-1) unstable; urgency=low
-
-  * Initial release. (Closes: #527598)
-
- -- Gürkan Sengün <gurkan at phys.ethz.ch>  Wed, 19 Aug 2009 23:31:35 +0200

Copied: packages/mypaint/tags/1.2.0-4/debian/changelog (from rev 13910, packages/mypaint/trunk/debian/changelog)
===================================================================
--- packages/mypaint/tags/1.2.0-4/debian/changelog	                        (rev 0)
+++ packages/mypaint/tags/1.2.0-4/debian/changelog	2017-02-02 14:44:11 UTC (rev 13911)
@@ -0,0 +1,173 @@
+mypaint (1.2.0-4) unstable; urgency=medium
+
+  * Add debian/patches/fix-gtk-3.22.4-canvas-disappearance.patch to fix
+    fullscreen mode. (Closes: #848356)
+
+ -- Andrew Chadwick <a.t.chadwick at gmail.com>  Thu, 02 Feb 2017 14:39:42 +0000
+
+mypaint (1.2.0-3) unstable; urgency=medium
+
+  * Update d/rules to use dh sequencer. Fixes arch-indep FTBFS.
+    (Closes: #845111)
+  * Update to dh compat level 9.
+
+ -- Vincent Cheng <vcheng at debian.org>  Tue, 22 Nov 2016 00:02:02 -0800
+
+mypaint (1.2.0-2) unstable; urgency=medium
+
+  * Acknowledge NMU. Thanks Tobias!
+  * Add debian/patches/fix-glib-2.48-startup-crash.patch to fix startup crash.
+    (Closes: #822784)
+  * Add myself to Uploaders.
+  * Update Standards version to 3.9.8.
+
+ -- Vincent Cheng <vcheng at debian.org>  Mon, 02 May 2016 22:43:44 -0700
+
+mypaint (1.2.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * libpng transition: Change B-D from libpng12-dev to libpng-dev.
+    (Closes: #819440)
+
+ -- Tobias Frost <tobi at debian.org>  Mon, 28 Mar 2016 16:41:19 +0200
+
+mypaint (1.2.0-1) unstable; urgency=low
+
+  * Team upload.
+
+  [ Andrew Chadwick ]
+  * New release. (Closes: #812865)
+  * Update copyright.
+  * Install docs.
+  * Update watchfile, and add my signing signature.
+  * Changelog has changed filename.
+  * Add dh-python to build-deps.
+  * Standards bump 3.9.4 -> 3.9.6.
+  * Patches are in upstream now, drop patches/.
+  * Add Nautilus thumbnailer to install.
+
+  [ Jakub Wilk ]
+  * Use canonical URIs for Vcs-* fields.
+
+  [ Vincent Cheng ]
+  * Import Andrew Chadwick's changes from https://github.com/mypaint/debian
+  * Update build-depends from libjson0-dev to libjson-c-dev. (Closes: #745007)
+  * Remove debian/menu file as per tech-ctte decision in #741573.
+
+ -- Vincent Cheng <vcheng at debian.org>  Mon, 01 Feb 2016 19:00:26 -0800
+
+mypaint (1.1.0-3) unstable; urgency=low
+
+  * Remove redundant patch: we don't run the memory-intensive test any more.
+  * (Fixes unpack failure FTBFS with patch 2.7.1 (closes: Bug#706508))
+
+ -- Andrew Chadwick <a.t.chadwick at gmail.com>  Wed, 01 May 2013 12:48:43 +0100
+
+mypaint (1.1.0-2) unstable; urgency=low
+
+  * Fix FTBFS with DEB_BUILD_OPTIONS=noopt (closes: Bug#704935)
+  * Fix hardening flags not being honoured (closes: Bug#704927) 
+
+ -- Andrew Chadwick <a.t.chadwick at gmail.com>  Sun, 21 Apr 2013 20:37:02 +0100
+
+mypaint (1.1.0-1) unstable; urgency=low
+
+  * New upstream version.
+  * New upstream has an updated ru_RU.UTF-8 translation (closes: Bug#685254).
+  * Standards bump and check 3.9.2 -> 3.9.4.
+  * debian/rules: fix lintian script-not-executable for label-brush-mypaint.sh
+  * debian/{rules,control}: split out hi-res data (closes: Bug#660881).
+  * debian/copyright: update to cover new upstream licenses; machine-readable.
+  * Mark myself as Uploader and PAPT as Maintainer (closes: Bug#691827).
+  * Recommend shared-mime-info (closes: Bug#545396).
+  * Migrated from deprecated dh_pysupport to dh_python2.
+  * debian/control: update homepage link
+  * debian/control: provide Vcs-* info
+  * debian/rules: use dh_install, and use it to check for overlooked files
+  * Move message catalogs to mypaint-data.
+  * Backport license update to the all-colours palette (lintian, spelling(!)).
+  * Backport removal of deprecated Encoding key from upstream (lintian).
+  * Build with hardening flags.
+  * Patch in upstream test suite fixes, and run tests during build.
+  * (Only the one which will run with <= 512M RAM, e.g. some ARM buildbots.)
+  * (19 Jan) Move development to Debian VCS (requirement of python apps team).
+  * Add python-matplotlib and python-tk in build-depends (test suite reqs);
+  * Lowercase first letter of each short package description (best practice).
+  * Newlines for Build-Depends and Depends (sponsor preference).
+
+ -- Andrew Chadwick <a.t.chadwick at gmail.com>  Wed, 20 Mar 2013 13:08:23 +0000
+
+mypaint (1.0.0-1) unstable; urgency=low
+
+  * New upstream version.
+  * debian/rules: add lintian recommended targets.
+
+ -- Gürkan Sengün <gurkan at phys.ethz.ch>  Fri, 25 Nov 2011 10:38:25 +0100
+
+mypaint (0.9.1-1) unstable; urgency=low
+
+  * New upstream version. (Closes: #618792)
+  * Added versioning for depends of mypaint-data. (Closes: #614091)
+  * Bump debhelper version to 8.
+  * Bump standards version to 3.9.2.
+  * debian/control: Changed Source:Version to source:Version.
+
+ -- Gürkan Sengün <gurkan at phys.ethz.ch>  Tue, 03 May 2011 14:19:24 +0100
+
+mypaint (0.9.0-1) unstable; urgency=low
+
+  * New upstream version, dropped protobuf dependency. (Closes: #570685)
+  * Bump standards version to 3.9.1.
+  * Updated the manual page.
+
+ -- Gürkan Sengün <gurkan at phys.ethz.ch>  Tue, 02 Nov 2010 22:32:34 +0100
+
+mypaint (0.8.2-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "Please do not hardcode python dependencies in debian/control"
+    applied patch by Daniel Hahler, thanks Daniel! (Closes: #575641)
+
+ -- Bastian Venthur <venthur at debian.org>  Fri, 13 Aug 2010 22:01:39 +0200
+
+mypaint (0.8.2-1) unstable; urgency=low
+
+  * New upstream version.
+  * Added watch file.
+  * Add missing dependency to python-gtk2. (Closes: #571600)
+  * Switch to dpkg-source 3.0 (quilt) format to avoid repackaging.
+
+ -- Gürkan Sengün <gurkan at phys.ethz.ch>  Wed, 24 Feb 2010 11:05:51 +0100
+
+mypaint (0.8.0-2) unstable; urgency=low
+
+  * Bump standards version.
+  * debian/cntrol: add depends for python-protobuf. (Closes: #568958)
+  * Add debian/manpages so the manual page gets installed.
+
+ -- Gürkan Sengün <gurkan at phys.ethz.ch>  Tue, 09 Feb 2010 10:35:26 +0100
+
+mypaint (0.8.0-1) unstable; urgency=low
+
+  * New upstream version.
+  * debian/changelog: Updated copyright year.
+  * debian/control: Add build-depends for protobuf-compiler.
+  * debian/control: Add depends for python-numpy. (Closes: #551322)
+
+ -- Gürkan Sengün <gurkan at phys.ethz.ch>  Sat, 30 Jan 2010 19:53:23 +0100
+
+mypaint (0.7.1-2) unstable; urgency=low
+
+  * Added missing copyright holders.
+  * Applied patch to fix desktop icons. (Closes: #545387)
+    Thanks to Andrew Chadwick for the patch.
+  * Applied patch to fix multiple builds. (Closes: #545650)
+    Thanks to Andrew Chadwick for the patch.
+
+ -- Gürkan Sengün <gurkan at phys.ethz.ch>  Mon, 21 Sep 2009 16:55:18 +0200
+
+mypaint (0.7.1-1) unstable; urgency=low
+
+  * Initial release. (Closes: #527598)
+
+ -- Gürkan Sengün <gurkan at phys.ethz.ch>  Wed, 19 Aug 2009 23:31:35 +0200

Copied: packages/mypaint/tags/1.2.0-4/debian/patches/fix-gtk-3.22.4-canvas-disappearance.patch (from rev 13910, packages/mypaint/trunk/debian/patches/fix-gtk-3.22.4-canvas-disappearance.patch)
===================================================================
--- packages/mypaint/tags/1.2.0-4/debian/patches/fix-gtk-3.22.4-canvas-disappearance.patch	                        (rev 0)
+++ packages/mypaint/tags/1.2.0-4/debian/patches/fix-gtk-3.22.4-canvas-disappearance.patch	2017-02-02 14:44:11 UTC (rev 13911)
@@ -0,0 +1,63 @@
+diff --git a/gui/workspace.py b/gui/workspace.py
+index 7f4f4abe..2af856a5 100644
+--- a/gui/workspace.py
++++ b/gui/workspace.py
+@@ -223,6 +223,7 @@ class Workspace (Gtk.VBox, Gtk.Buildable):
+         lpaned.pack1(lscrolls, resize=False, shrink=False)
+         lpaned.pack2(rpaned, resize=True, shrink=False)
+         rpaned.pack2(rscrolls, resize=False, shrink=False)
++        rpaned.pack1(cscrolls, resize=True, shrink=False)
+         self.pack_start(lpaned, True, True, 0)
+         # Autohide
+         self._autohide_enabled = True
+@@ -397,43 +398,21 @@ class Workspace (Gtk.VBox, Gtk.Buildable):
+     def set_canvas(self, widget):
+         """Canvas widget (setter)"""
+         assert self.get_canvas() is None
+-        self._rpaned.pack1(widget, resize=True, shrink=False)
+-        self._update_canvas_scrolledwindow()
++        widget = self._canvas_scrolls.add(widget)
+
+     def get_canvas(self):
+         """Canvas widget (getter)"""
+-        widget = self._rpaned.get_child1()
+-        if widget is self._canvas_scrolls:
+-            widget = widget.get_child()
++        widget = self._canvas_scrolls.get_child()
+         return widget
+
+     def _update_canvas_scrolledwindow(self):
+-        """Update whether the canvas has a surrounding ScrolledWindow
+-
+-        In fullscreen mode, the ScrolledWindow is removed from the widget
+-        hierarchy so that the canvas widget can occupy the full size of the
+-        screen. In nonfullscreen mode, the scrollers provide a pretty frame.
+-        """
+-        canvas = self.get_canvas()
+-        parent = canvas.get_parent()
++        """Update the canvas ScrolledWindow's border."""
++        parent = self._canvas_scrolls
+         if not self._is_fullscreen:
+-            if parent is self._canvas_scrolls:
+-                return
+-            logger.debug("Adding GtkScrolledWindow around canvas")
+-            assert parent is self._rpaned
+-            self._rpaned.remove(canvas)
+-            self._rpaned.pack1(self._canvas_scrolls, resize=True, shrink=False)
+-            self._canvas_scrolls.add(canvas)
+-            self._canvas_scrolls.show_all()
++            parent.set_shadow_type(Gtk.ShadowType.NONE)
+         else:
+-            if parent is self._rpaned:
+-                return
+-            logger.debug("Removing GtkScrolledWindow around canvas")
+-            assert parent is self._canvas_scrolls
+-            self._canvas_scrolls.remove(canvas)
+-            self._rpaned.remove(self._canvas_scrolls)
+-            self._rpaned.pack1(canvas, resize=True, shrink=False)
+-            self._canvas_scrolls.hide()
++            parent.set_shadow_type(Gtk.ShadowType.IN)
++        # TODO: this should really be done with CSS now.
+
+     ## Tool widgets
+

Deleted: packages/mypaint/tags/1.2.0-4/debian/patches/series
===================================================================
--- packages/mypaint/trunk/debian/patches/series	2017-01-26 16:39:42 UTC (rev 13909)
+++ packages/mypaint/tags/1.2.0-4/debian/patches/series	2017-02-02 14:44:11 UTC (rev 13911)
@@ -1 +0,0 @@
-fix-glib-2.48-startup-crash.patch

Copied: packages/mypaint/tags/1.2.0-4/debian/patches/series (from rev 13910, packages/mypaint/trunk/debian/patches/series)
===================================================================
--- packages/mypaint/tags/1.2.0-4/debian/patches/series	                        (rev 0)
+++ packages/mypaint/tags/1.2.0-4/debian/patches/series	2017-02-02 14:44:11 UTC (rev 13911)
@@ -0,0 +1,2 @@
+fix-glib-2.48-startup-crash.patch
+fix-gtk-3.22.4-canvas-disappearance.patch




More information about the Python-apps-commits mailing list