[Python-apps-commits] r12766 - in packages/mypaint/trunk/debian (11 files)

vcheng at users.alioth.debian.org vcheng at users.alioth.debian.org
Tue Feb 2 03:52:09 UTC 2016 

    Date: Tuesday, February 2, 2016 @ 03:52:08
  Author: vcheng
Revision: 12766

import changes from https://github.com/mypaint/debian

Added:
  packages/mypaint/trunk/debian/docs
  packages/mypaint/trunk/debian/upstream/
  packages/mypaint/trunk/debian/upstream/signing-key.asc
Modified:
  packages/mypaint/trunk/debian/changelog
  packages/mypaint/trunk/debian/control
  packages/mypaint/trunk/debian/copyright
  packages/mypaint/trunk/debian/mypaint-data.install
  packages/mypaint/trunk/debian/mypaint.install
  packages/mypaint/trunk/debian/rules
  packages/mypaint/trunk/debian/watch
Deleted:
  packages/mypaint/trunk/debian/patches/

Modified: packages/mypaint/trunk/debian/changelog
===================================================================
--- packages/mypaint/trunk/debian/changelog	2016-02-02 03:02:04 UTC (rev 12765)
+++ packages/mypaint/trunk/debian/changelog	2016-02-02 03:52:08 UTC (rev 12766)
@@ -2,11 +2,23 @@
 
   * 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)
 
  -- Vincent Cheng <vcheng at debian.org>  Mon, 01 Feb 2016 19:00:26 -0800
 

Modified: packages/mypaint/trunk/debian/control
===================================================================
--- packages/mypaint/trunk/debian/control	2016-02-02 03:02:04 UTC (rev 12765)
+++ packages/mypaint/trunk/debian/control	2016-02-02 03:52:08 UTC (rev 12766)
@@ -3,11 +3,13 @@
 Priority: optional
 Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Uploaders: Andrew Chadwick <a.t.chadwick at gmail.com>
-Build-Depends: debhelper (>= 8), scons, python-gtk2-dev, python-numpy, swig,
- python (>= 2.6), liblcms2-dev, libjson0-dev, dpkg-dev (>= 1.16.1~),
- python-matplotlib, python-tk
-Standards-Version: 3.9.4
-X-Python-Version: >= 2.6
+Build-Depends: debhelper (>= 8), scons, swig, python-dev,
+ python (>= 2.7), liblcms2-dev, libjson-c-dev, dpkg-dev (>= 1.16.1~),
+ python-matplotlib, python-tk, libgtk-3-dev (>= 3.10), python-gi-dev, gettext,
+ libpng12-dev, dh-python
+Standards-Version: 3.9.6
+X-Python-Version: >= 2.7
+X-Python3-Version: << 3.0
 Homepage: http://mypaint.info/
 Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/mypaint/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/mypaint/
@@ -15,7 +17,8 @@
 Package: mypaint
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
- mypaint-data (>= ${source:Version}), python-numpy, python-gtk2
+ mypaint-data (>= ${source:Version}), python-numpy, gir1.2-gtk-3.0 (>= 3.10),
+ python-gi-cairo
 Suggests: mypaint-data-extras
 Recommends: shared-mime-info
 Description: paint program for use with graphics tablets

Modified: packages/mypaint/trunk/debian/copyright
===================================================================
--- packages/mypaint/trunk/debian/copyright	2016-02-02 03:02:04 UTC (rev 12765)
+++ packages/mypaint/trunk/debian/copyright	2016-02-02 03:52:08 UTC (rev 12766)
@@ -1,52 +1,32 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: MyPaint
-Upstream-Contact: Martin Renold <martinxyz at gmx.ch>
-Source: http://mypaint.info/
+Upstream-Contact: Andrew Chadwick <a.t.chadwick at gmail.com>
+Source: http://mypaint.org/
 Comment: This package was debianized by Gürkan Sengün <gurkan at phys.ethz.ch>
   on Thu, 07 May 2009 21:50:39 +0200.
 
 Files: *
-Copyright: Copyright 2005-2012 Martin Renold and the MyPaint Development Team
-  Copyright 2005-2012 Martin Renold <martinxyz at gmx.ch>
-  Copyright 2005, 2007-2008 Artis Rozentāls <artis at aaa.apollo.lv>
-  Copyright 2007 Yves Combe <yves at ycombe.net>
-  Copyright 2007 Sebastian Kraft (desktop icon)
-  Copyright 2007, 2009-2012 Popolon <popolon at popolon.org>
-  Copyright 2008 Clement Skau <clementskau at gmail.com>
-  Copyright 2009 Marcelo "Tanda" Cervino <info at lodetanda.com.ar>
-  Copyright 2009-2012 Jon Nordby <jononor at gmail.com>
-  Copyright 2009 Álinson Santos <isoron at gmail.com>
-  Copyright 2009-2011 Tumagonx <mr_tiar at gmail.com>
-  Copyright 2009-2010, 2012 Ilya Portnov <portnov at iportnov.ru>
-  Copyright 2009 Jonas Wagner <veers at gmx.ch>
-  Copyright 2009-2010 Luka ÄŒehovin <luka at tnode.com>
-  Copyright 2009-2012 Andrew Chadwick <a.t.chadwick at gmail.com>
-  Copyright 2010-2012 Till Hartmann <ich at till-hartmann.de>
-  Copyright 2010-2012 David Gowers <00ai99 at gmail.com>
-  Copyright 2010 David Grundberg <individ at acc.umu.se>
-  Copyright 2011 Ben O'Steen <bosteen at gmail.com>
-  Copyright 2011 Ferry Jérémie <ferryjeremie at mothsart.com>
-  Copyright 2011-2012 しげっち 'sigetch' <sigetch at users.sourceforge.jp>
-  Copyright 2011-2012 Richard Jones <optigon17 at gmail.com>
+Copyright: Copyright 2005-2016 Martin Renold and the MyPaint Development Team
 License: GPL-2+
 
-Files: lib/gdkpixbuf2numpy.hpp
+Files: lib/gdkpixbuf2numpy.*
 Copyright: Copyright 1998-2003 James Henstridge
-  Copyright 2008-2012 Martin Renold
+  Copyright 2008-2016 Martin Renold and the MyPaint Development Team
 License: GPL-2+
 
 Files: gui/gtkexcepthook.py
 Comment: http://www.daa.com.au/pipermail/pygtk/2003-August/005775.html
 Copyright: Copyright 2003 Gustavo J A M Carneiro <gjc at inescporto.pt>
   Copyright 2004-2005 Filip Van Raemdonck
-  Copyright 2009-2012 Martin Renold and the MyPaint Development Team
+  Copyright 2009-2016 Martin Renold and the MyPaint Development Team
 License: whatever-you-want
 
 Files: brushlib/*
-Copyright: Copyright (C) 2008-2011 Martin Renold and contributors
+Copyright: Copyright (C) 2008-2016 Martin Renold and the MyPaint Development Team
   Copyright 2008-2011 Martin Renold <martinxyz at gmx.ch>
   Copyright 2012 Jon Nordby <jononor at gmail.com>
 License: ISC
+Comment: at present, this is included as a submodule
 
 Files: pixmaps/cursor*arrow*.png pixmaps/cursor*crosshair*.png
   pixmaps/cursor*forbidden*.png pixmaps/cursor*hand*.png
@@ -65,25 +45,35 @@
 License: public-domain
   Copyright released by holders.
 
-Files: desktop/*/mypaint-frame.* svg/mypaint-frame.svgz
-Copyright: 2012 FatCow Web Hosting
-Comment: SVGZ and generated bitmaps were derived through tracing and redrawing,
-  thus forming a derivative work. License is a Creative Commons license;
-  nevertheless, usage is compatible with GPL-2+ because this icon is themeable,
-  and thus may be replaced by the user at runtime.
+Files: glade/icons/*
+Copyright: Copyright 2011-2013 Martin Renold and the MyPaint Development Team
+  Adapted from icons in the Glade gistribution itself.
+License: GPL-2
+
+Files: brushes/*
+Copyright: Copyright 2011-2013 Martin Renold and the MyPaint Development Team
   .
-  Licensed under a Creative Commons Attribution 3.0 (US) License,
-  http://creativecommons.org/licenses/by/3.0/us/ . When attributing,
-  please link to this page on fatcow.com: http://www.fatcow.com/free-icons
-License: CC-BY-3.0-US
+  By policy, MyPaint's brush settings are released into the public domain.
+  See: <https://github.com/mypaint/mypaint/wiki/Licensing-policy>.
+License: CC0-1.0
 
-Files: pixmaps/eye* pixmaps/lock*
-Copyright: Copyright 2009 the Inkscape Developers
-  With contributions by "jEsuSdA 8) www.jesusda.com"
-License: GPL-2
+Files: brushes/ramon
+Copyright: Author: Ramón Miranda <mirandagraphic at gmail.com>
+License: CC0-1.0
 
+Files: brushes/tanda
+Copyright: Author: Marcelo "Tanda" Cerviño <info at lodetanda.com.ar>
+License: CC0-1.0
+
+Files: brushes/deevad/*
+Copyright: Author: David Revoy <info at davidrevoy.com>
+License: CC0-1.0
+
+Files: brushes/kaerhon_v1/*
+Copyright: Author: Guillaume Loussarévian
+License: CC0-1.0
+
 Files: palettes/MyPaint_Default.gpl palettes/Greys16.gpl palettes/Classic_4.gpl
-  brushes/deevad/*
 Copyright: Author: David Revoy <info at davidrevoy.com>
   Author: Andrew Chadwick <a.t.chadwick at gmail.com>
 License: CC0-1.0
@@ -119,7 +109,7 @@
 Copyright: Copyright 2009 the Inkscape Developers
 License: GPL-2
 
-Files: palettes/Tango.gpl
+Files: palettes/Tango_Palette.gpl
 Copyright: Author: The Tango Desktop Project
 License: public-domain
   The Tango palette is released into the public domain
@@ -136,7 +126,7 @@
 License: CC0-1.0
 
 Files: backgrounds/ramon/*
-Copyright: Copyright 2010 Ramon Miranda <mirandagraphic at gmail.com>
+Copyright: Copyright 2010 Ramón Miranda <mirandagraphic at gmail.com>
 License: CC0-1.0
 
 Files: debian/*
@@ -149,6 +139,9 @@
   .
   On Debian systems, the complete text of the GNU General Public License
   version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+  .
+  This license is included with the MyPaint distribution in the file
+  named COPYING.
 
 License: GPL-2+
   http://www.gnu.org/licenses/gpl-2.0.html
@@ -169,6 +162,9 @@
   .
   On Debian systems, the complete text of the GNU General Public License
   version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+  .
+  This license is included with the MyPaint distribution in the file
+  named COPYING.
 
 License: whatever-you-want
   http://www.daa.com.au/pipermail/pygtk/2003-August/005775.html

Added: packages/mypaint/trunk/debian/docs
===================================================================
--- packages/mypaint/trunk/debian/docs	                        (rev 0)
+++ packages/mypaint/trunk/debian/docs	2016-02-02 03:52:08 UTC (rev 12766)
@@ -0,0 +1,7 @@
+README.md
+README_LINUX.md
+Licenses.md
+Licenses.dep5
+CODE_OF_CONDUCT.md
+CONTRIBUTING.md
+DEBUGGING.md

Modified: packages/mypaint/trunk/debian/mypaint-data.install
===================================================================
--- packages/mypaint/trunk/debian/mypaint-data.install	2016-02-02 03:02:04 UTC (rev 12765)
+++ packages/mypaint/trunk/debian/mypaint-data.install	2016-02-02 03:52:08 UTC (rev 12766)
@@ -1,6 +1,6 @@
 usr/share/mypaint/palettes
 usr/share/mypaint/pixmaps
-usr/share/mypaint/backgrounds/README
+usr/share/mypaint/backgrounds/README.md
 usr/share/mypaint/backgrounds/*.png
 usr/share/icons
 usr/share/locale

Modified: packages/mypaint/trunk/debian/mypaint.install
===================================================================
--- packages/mypaint/trunk/debian/mypaint.install	2016-02-02 03:02:04 UTC (rev 12765)
+++ packages/mypaint/trunk/debian/mypaint.install	2016-02-02 03:52:08 UTC (rev 12766)
@@ -1,7 +1,9 @@
-usr/bin/mypaint
+usr/bin
 usr/lib/mypaint
 usr/share/applications
 usr/share/mypaint/gui
 usr/share/mypaint/lib
-usr/share/mypaint/brushlib/brushsettings.*
-usr/share/mypaint/brushlib/__init__.py
+usr/share/libmypaint/brushsettings.*
+usr/share/libmypaint/__init__.py
+usr/share/thumbnailers
+usr/share/appdata

Modified: packages/mypaint/trunk/debian/rules
===================================================================
--- packages/mypaint/trunk/debian/rules	2016-02-02 03:02:04 UTC (rev 12765)
+++ packages/mypaint/trunk/debian/rules	2016-02-02 03:52:08 UTC (rev 12766)
@@ -10,17 +10,7 @@
 # Program build options
 MYPAINT_SCONSOPTS = enable_openmp=true
 
-# Using the default -O0 would break linkage at runtime. The minimum level of
-# optimization supported by MyPaint 1.1.0 is -O1 due to some unhelpful and
-# non-overridable scons defaults.
-#
-# Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=704935 cf.
-# http://www.debian.org/doc/debian-policy/ch-source.html#s-debianrules-options
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O1
-endif
 
-
 build: build-arch build-indep
 
 build-arch: build-stamp
@@ -66,7 +56,7 @@
 	# When the ABI settles a bit more, let's consider dynamic libs.
 	# https://mail.gna.org/public/mypaint-discuss/2013-01/msg00021.html
 	dh_install --fail-missing -X prev-template.xcf.gz -X FX_blender_prev.png -X label-brush-mypaint.sh -X generate.py
-	dh_installchangelogs changelog
+	dh_installchangelogs Changelog.md
 	dh_installdocs
 	dh_installmenu
 	dh_python2

Added: packages/mypaint/trunk/debian/upstream/signing-key.asc
===================================================================
--- packages/mypaint/trunk/debian/upstream/signing-key.asc	                        (rev 0)
+++ packages/mypaint/trunk/debian/upstream/signing-key.asc	2016-02-02 03:52:08 UTC (rev 12766)
@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+oqkTt5dg5HfVew==
+=kMSA
+-----END PGP PUBLIC KEY BLOCK-----

Modified: packages/mypaint/trunk/debian/watch
===================================================================
--- packages/mypaint/trunk/debian/watch	2016-02-02 03:02:04 UTC (rev 12765)
+++ packages/mypaint/trunk/debian/watch	2016-02-02 03:52:08 UTC (rev 12766)
@@ -1,2 +1,4 @@
 version=3
-http://download.gna.org/mypaint/ mypaint-([\d\.]+)\.tar\.bz2
+opts="uversionmangle=s/(\d)-((rc|beta|alpha)[a-z.\d]*)$/$1~$2/, pgpsigurlmangle=s/$/.asc/" \
+  https://github.com/mypaint/mypaint/releases \
+  .*/mypaint-(\d+[.]\d+[.]\d+(?:-[a-z.\d]+)?).tar.xz

More information about the Python-apps-commits mailing list