[SCM] synfig-synfigstudio/master: New upstream release [1.0] + changelog summary

onlyjob at users.alioth.debian.org onlyjob at users.alioth.debian.org
Thu Apr 30 05:35:44 UTC 2015


The following commit has been merged in the master branch:
commit 5dec3c12c4fbd258b2b0a1e1a06e4590061aa9b2
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Thu Apr 30 13:17:04 2015 +1000

    New upstream release [1.0] + changelog summary

diff --git a/debian/changelog b/debian/changelog
index 4067e0e..9e5fa78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+synfigstudio (1.0-1) UNRELEASED; urgency=low
+
+  * New upstream release [April 2015].
+  * Dropped all backported patches.
+  * Build-Depends:
+    - etl-dev (>= 0.04.17)
+    + etl-dev (>= 0.04.18)
+    - libgtkmm-2.4-dev
+    + libgtkmm-3.0-dev
+    + libmlt-dev
+    + libmlt++-dev
+    - synfig (>= 0.64.1)
+    + synfig (>= 1.0)
+
+ -- Dmitry Smirnov <onlyjob at debian.org>  Thu, 30 Apr 2015 10:44:57 +1000
+
 synfigstudio (0.64.2-2) unstable; urgency=medium
 
   * Added two new upstream patches for compatibility with Glib-2.42
diff --git a/debian/clean b/debian/clean
index df92fbc..529d69b 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1 +1,2 @@
 images/*.ttf
+config.log
diff --git a/debian/control b/debian/control
index 9e77251..9b6016a 100644
--- a/debian/control
+++ b/debian/control
@@ -4,14 +4,16 @@ Priority: extra
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Dmitry Smirnov <onlyjob at debian.org>
 Build-Depends: debhelper (>= 9), dh-autoreconf, autopoint, intltool
- ,etl-dev (>= 0.04.17)
+ ,etl-dev (>= 0.04.18)
  ,libglibmm-2.4-dev
  ,libgtk2.0-dev
- ,libgtkmm-2.4-dev
+ ,libgtkmm-3.0-dev
  ,libltdl-dev
+ ,libmlt-dev
+ ,libmlt++-dev
  ,libsigc++-2.0-dev
  ,libsynfig-dev (>= 0.64.2)
- ,synfig (>= 0.64.1)
+ ,synfig (>= 1.0)
  ,ttf-freefont
  ,ttf-dejavu
 Standards-Version: 3.9.6
diff --git a/debian/copyright b/debian/copyright
index c11c69e..6af3241 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,33 +4,56 @@ Source: http://sourceforge.net/projects/synfig/files/synfigstudio/
 Comment:
  This package was debianized by Paul Wise <pabs at debian.org> on 2005-11-07
 
-Files: */debian
-Copyright: 2012-2014 Dmitry Smirnov <onlyjob at debian.org>
-           2007-2009 Cyril Brulebois <kibi at debian.org>
-           2006      Fabian Fagerholm <fabbe at debian.org>
-           2006      Miguel Gea Milvaques <xerakko at debian.org>
-           2005-2009 Paul Wise <pabs at debian.org>
-           2010      Stefano Zacchiroli <zack at debian.org>
-License: GPL-2+
-
 Files: *
-Copyright: 2002-2005      Adrian Bentley
-           2009           Carlos A. Sosa Navarro
-           2008-2013      Carlos López
-           2010-2011      Carlos López González
-           2007-2008      Chris Moore
-           2008           David Roden
-           2008           Gerald Young
-           2008-2009      Gerco Ballintijn
-           2013           Ivan Mahonin
-           2009,2012-2013 Konstantin Dmitriev <ksee.zelgadis at gmail.com>
-           2009-2011      Nikita Kitaev
-           2007-2008      Paul Wise
-           2001-2014      Robert B. Quattlebaum Jr.
-           2006           Yue Shi Lai
+Copyright: 2002-2005 Adrian Bentley
+           2009      Carlos A. Sosa Navarro
+           2008-2013 Carlos López
+           2008-2014 Carlos López González
+           2007-2008 Chris Moore
+           2008      David Roden
+           2015      Denis Zdorovtsov
+           2011-2014 Diego Barrios
+           2015      Evgenij Katunov
+           2008      Gerald Young
+           2008-2009 Gerco Ballintijn
+           2013-2015 Ivan Mahonin
+           2013-2015 Jerome Blanchi
+           2009-2015 Konstantin Dmitriev <ksee.zelgadis at gmail.com>
+           2009-2011 Nikita Kitaev
+           2007-2008 Paul Wise
+           2001-2014 Robert B. Quattlebaum Jr.
+           2006      Yue Shi Lai
+           2011-2014 Yu Chen
 License: GPL-2+
 Comment: see list of all contributors in file README
 
+Files: brushes/CD_concept/*
+Copyright: 2011 Ramon Miranda
+License: CC-BY-3.0
+
+Files: src/brushlib/*
+Copyright: 2007-2011 Martin Renold <martinxyz at gmx.ch>
+License: Expat
+ Permission to use, copy, modify, and/or distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+Comment:
+ http://wiki.mypaint.info/Brushlib
+
+Files: src/gui/main_win32.cpp
+Copyright: 2001 Franz Schmid <Franz.Schmid at altmuehlnet.de>
+           2004 Alessandro Rimoldi (http://ideale.ch/contact)
+           2005 Craig Bradney <cbradney at zip.com.au>
+License: GPL-2+
+
 Files: images/*.sif
 Copyright: not applicable
 License: public-domain
@@ -52,6 +75,15 @@ Files: images/splash_screen-0.62.01.sif
 Copyright: 2010  Madeleine Crubellier
 License: GPL-2
 
+Files: debian/*
+Copyright: 2012-2015 Dmitry Smirnov <onlyjob at debian.org>
+           2007-2009 Cyril Brulebois <kibi at debian.org>
+           2006      Fabian Fagerholm <fabbe at debian.org>
+           2006      Miguel Gea Milvaques <xerakko at debian.org>
+           2005-2009 Paul Wise <pabs at debian.org>
+           2010      Stefano Zacchiroli <zack at debian.org>
+License: GPL-2+
+
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -216,3 +248,318 @@ License: CC0-1.0
        respect to this CC0 or use of the Work.
  .
  https://creativecommons.org/choose/zero/
+
+License: CC-BY-3.0
+ THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
+ COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
+ COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
+ AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+ .
+ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
+ TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
+ BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
+ CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
+ CONDITIONS.
+ .
+ 1. Definitions
+ .
+    a. "Adaptation" means a work based upon the Work, or upon the Work and
+       other pre-existing works, such as a translation, adaptation,
+       derivative work, arrangement of music or other alterations of a
+       literary or artistic work, or phonogram or performance and includes
+       cinematographic adaptations or any other form in which the Work may
+       be recast, transformed, or adapted including in any form
+       recognizably derived from the original, except that a work that
+       constitutes a Collection will not be considered an Adaptation for
+       the purpose of this License. For the avoidance of doubt, where the
+       Work is a musical work, performance or phonogram, the
+       synchronization of the Work in timed-relation with a moving image
+       ("synching") will be considered an Adaptation for the purpose of
+       this License.
+ .
+    b. "Collection" means a collection of literary or artistic works, such
+       as encyclopedias and anthologies, or performances, phonograms or
+       broadcasts, or other works or subject matter other than works listed
+       in Section 1(f) below, which, by reason of the selection and
+       arrangement of their contents, constitute intellectual creations, in
+       which the Work is included in its entirety in unmodified form along
+       with one or more other contributions, each constituting separate and
+       independent works in themselves, which together are assembled into a
+       collective whole. A work that constitutes a Collection will not be
+       considered an Adaptation (as defined above) for the purposes of this
+       License.
+ .
+    c. "Distribute" means to make available to the public the original and
+       copies of the Work or Adaptation, as appropriate, through sale or
+       other transfer of ownership.
+ .
+    d. "Licensor" means the individual, individuals, entity or entities
+       that offer(s) the Work under the terms of this License.
+ .
+    e. "Original Author" means, in the case of a literary or artistic work,
+       the individual, individuals, entity or entities who created the Work
+       or if no individual or entity can be identified, the publisher; and
+       in addition (i) in the case of a performance the actors, singers,
+       musicians, dancers, and other persons who act, sing, deliver,
+       declaim, play in, interpret or otherwise perform literary or
+       artistic works or expressions of folklore; (ii) in the case of a
+       phonogram the producer being the person or legal entity who first
+       fixes the sounds of a performance or other sounds; and, (iii) in the
+       case of broadcasts, the organization that transmits the broadcast.
+ .
+    f. "Work" means the literary and/or artistic work offered under the
+       terms of this License including without limitation any production in
+       the literary, scientific and artistic domain, whatever may be the
+       mode or form of its expression including digital form, such as a
+       book, pamphlet and other writing; a lecture, address, sermon or
+       other work of the same nature; a dramatic or dramatico-musical work;
+       a choreographic work or entertainment in dumb show; a musical
+       composition with or without words; a cinematographic work to which
+       are assimilated works expressed by a process analogous to
+       cinematography; a work of drawing, painting, architecture,
+       sculpture, engraving or lithography; a photographic work to which
+       are assimilated works expressed by a process analogous to
+       photography; a work of applied art; an illustration, map, plan,
+       sketch or three-dimensional work relative to geography, topography,
+       architecture or science; a performance; a broadcast; a phonogram; a
+       compilation of data to the extent it is protected as a copyrightable
+       work; or a work performed by a variety or circus performer to the
+       extent it is not otherwise considered a literary or artistic work.
+ .
+    g. "You" means an individual or entity exercising rights under this
+       License who has not previously violated the terms of this License
+       with respect to the Work, or who has received express permission
+       from the Licensor to exercise rights under this License despite a
+       previous violation.
+ .
+    h. "Publicly Perform" means to perform public recitations of the Work
+       and to communicate to the public those public recitations, by any
+       means or process, including by wire or wireless means or public
+       digital performances; to make available to the public Works in such
+       a way that members of the public may access these Works from a place
+       and at a place individually chosen by them; to perform the Work to
+       the public by any means or process and the communication to the
+       public of the performances of the Work, including by public digital
+       performance; to broadcast and rebroadcast the Work by any means
+       including signs, sounds or images.
+ .
+    i. "Reproduce" means to make copies of the Work by any means including
+       without limitation by sound or visual recordings and the right of
+       fixation and reproducing fixations of the Work, including storage of
+       a protected performance or phonogram in digital form or other
+       electronic medium.
+ .
+ 2. Fair Dealing Rights. Nothing in this License is intended to reduce,
+ limit, or restrict any uses free from copyright or rights arising from
+ limitations or exceptions that are provided for in connection with the
+ copyright protection under copyright law or other applicable laws.
+ .
+ 3. License Grant. Subject to the terms and conditions of this License,
+ Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
+ perpetual (for the duration of the applicable copyright) license to
+ exercise the rights in the Work as stated below:
+ .
+    a. to Reproduce the Work, to incorporate the Work into one or more
+       Collections, and to Reproduce the Work as incorporated in the
+       Collections;
+ .
+    b. to create and Reproduce Adaptations provided that any such
+       Adaptation, including any translation in any medium, takes
+       reasonable steps to clearly label, demarcate or otherwise identify
+       that changes were made to the original Work. For example, a
+       translation could be marked "The original work was translated from
+       English to Spanish," or a modification could indicate "The original
+       work has been modified.";
+ .
+    c. to Distribute and Publicly Perform the Work including as
+       incorporated in Collections; and,
+ .
+    d. to Distribute and Publicly Perform Adaptations.
+ .
+    e. For the avoidance of doubt:
+ .
+       i.   Non-waivable Compulsory License Schemes. In those jurisdictions
+            in which the right to collect royalties through any statutory
+            or compulsory licensing scheme cannot be waived, the Licensor
+            reserves the exclusive right to collect such royalties for any
+            exercise by You of the rights granted under this License;
+ .
+       ii.  Waivable Compulsory License Schemes. In those jurisdictions in
+            which the right to collect royalties through any statutory or
+            compulsory licensing scheme can be waived, the Licensor waives
+            the exclusive right to collect such royalties for any exercise
+            by You of the rights granted under this License; and,
+ .
+       iii. Voluntary License Schemes. The Licensor waives the right to
+            collect royalties, whether individually or, in the event that
+            the Licensor is a member of a collecting society that
+            administers voluntary licensing schemes, via that society, from
+            any exercise by You of the rights granted under this License.
+ .
+ The above rights may be exercised in all media and formats whether now
+ known or hereafter devised. The above rights include the right to make
+ such modifications as are technically necessary to exercise the rights in
+ other media and formats. Subject to Section 8(f), all rights not expressly
+ granted by Licensor are hereby reserved.
+ .
+ 4. Restrictions. The license granted in Section 3 above is expressly made
+ subject to and limited by the following restrictions:
+ .
+    a. You may Distribute or Publicly Perform the Work only under the terms
+       of this License. You must include a copy of, or the Uniform Resource
+       Identifier (URI) for, this License with every copy of the Work You
+       Distribute or Publicly Perform. You may not offer or impose any
+       terms on the Work that restrict the terms of this License or the
+       ability of the recipient of the Work to exercise the rights granted
+       to that recipient under the terms of the License. You may not
+       sublicense the Work. You must keep intact all notices that refer to
+       this License and to the disclaimer of warranties with every copy of
+       the Work You Distribute or Publicly Perform. When You Distribute or
+       Publicly Perform the Work, You may not impose any effective
+       technological measures on the Work that restrict the ability of a
+       recipient of the Work from You to exercise the rights granted to
+       that recipient under the terms of the License. This Section 4(a)
+       applies to the Work as incorporated in a Collection, but this does
+       not require the Collection apart from the Work itself to be made
+       subject to the terms of this License. If You create a Collection,
+       upon notice from any Licensor You must, to the extent practicable,
+       remove from the Collection any credit as required by Section 4(b),
+       as requested. If You create an Adaptation, upon notice from any
+       Licensor You must, to the extent practicable, remove from the
+       Adaptation any credit as required by Section 4(b), as requested.
+ .
+    b. If You Distribute, or Publicly Perform the Work or any Adaptations
+       or Collections, You must, unless a request has been made pursuant to
+       Section 4(a), keep intact all copyright notices for the Work and
+       provide, reasonable to the medium or means You are utilizing: (i)
+       the name of the Original Author (or pseudonym, if applicable) if
+       supplied, and/or if the Original Author and/or Licensor designate
+       another party or parties (e.g., a sponsor institute, publishing
+       entity, journal) for attribution ("Attribution Parties") in
+       Licensor's copyright notice, terms of service or by other reasonable
+       means, the name of such party or parties; (ii) the title of the Work
+       if supplied; (iii) to the extent reasonably practicable, the URI, if
+       any, that Licensor specifies to be associated with the Work, unless
+       such URI does not refer to the copyright notice or licensing
+       information for the Work; and (iv) , consistent with Section 3(b),
+       in the case of an Adaptation, a credit identifying the use of the
+       Work in the Adaptation (e.g., "French translation of the Work by
+       Original Author," or "Screenplay based on original Work by Original
+       Author"). The credit required by this Section 4 (b) may be
+       implemented in any reasonable manner; provided, however, that in the
+       case of a Adaptation or Collection, at a minimum such credit will
+       appear, if a credit for all contributing authors of the Adaptation
+       or Collection appears, then as part of these credits and in a manner
+       at least as prominent as the credits for the other contributing
+       authors. For the avoidance of doubt, You may only use the credit
+       required by this Section for the purpose of attribution in the
+       manner set out above and, by exercising Your rights under this
+       License, You may not implicitly or explicitly assert or imply any
+       connection with, sponsorship or endorsement by the Original Author,
+       Licensor and/or Attribution Parties, as appropriate, of You or Your
+       use of the Work, without the separate, express prior written
+       permission of the Original Author, Licensor and/or Attribution
+       Parties.
+ .
+    c. Except as otherwise agreed in writing by the Licensor or as may be
+       otherwise permitted by applicable law, if You Reproduce, Distribute
+       or Publicly Perform the Work either by itself or as part of any
+       Adaptations or Collections, You must not distort, mutilate, modify
+       or take other derogatory action in relation to the Work which would
+       be prejudicial to the Original Author's honor or reputation.
+       Licensor agrees that in those jurisdictions (e.g. Japan), in which
+       any exercise of the right granted in Section 3(b) of this License
+       (the right to make Adaptations) would be deemed to be a distortion,
+       mutilation, modification or other derogatory action prejudicial to
+       the Original Author's honor and reputation, the Licensor will waive
+       or not assert, as appropriate, this Section, to the fullest extent
+       permitted by the applicable national law, to enable You to
+       reasonably exercise Your right under Section 3(b) of this License
+       (right to make Adaptations) but not otherwise.
+ .
+ 5. Representations, Warranties and Disclaimer
+ .
+ UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
+ OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY
+ KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
+ INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
+ LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS,
+ WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION
+ OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+ .
+ 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
+ LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
+ ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
+ ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS
+ BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ .
+ 7. Termination
+ .
+    a. This License and the rights granted hereunder will terminate
+       automatically upon any breach by You of the terms of this License.
+       Individuals or entities who have received Adaptations or Collections
+       from You under this License, however, will not have their licenses
+       terminated provided such individuals or entities remain in full
+       compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will
+       survive any termination of this License.
+ .
+    b. Subject to the above terms and conditions, the license granted here
+       is perpetual (for the duration of the applicable copyright in the
+       Work). Notwithstanding the above, Licensor reserves the right to
+       release the Work under different license terms or to stop
+       distributing the Work at any time; provided, however that any such
+       election will not serve to withdraw this License (or any other
+       license that has been, or is required to be, granted under the terms
+       of this License), and this License will continue in full force and
+       effect unless terminated as stated above.
+ .
+ 8. Miscellaneous
+ .
+    a. Each time You Distribute or Publicly Perform the Work or a
+       Collection, the Licensor offers to the recipient a license to the
+       Work on the same terms and conditions as the license granted to You
+       under this License.
+ .
+    b. Each time You Distribute or Publicly Perform an Adaptation, Licensor
+       offers to the recipient a license to the original Work on the same
+       terms and conditions as the license granted to You under this
+       License.
+ .
+    c. If any provision of this License is invalid or unenforceable under
+       applicable law, it shall not affect the validity or enforceability
+       of the remainder of the terms of this License, and without further
+       action by the parties to this agreement, such provision shall be
+       reformed to the minimum extent necessary to make such provision
+       valid and enforceable.
+ .
+    d. No term or provision of this License shall be deemed waived and no
+       breach consented to unless such waiver or consent shall be in
+       writing and signed by the party to be charged with such waiver or
+       consent.
+ .
+    e. This License constitutes the entire agreement between the parties
+       with respect to the Work licensed here. There are no understandings,
+       agreements or representations with respect to the Work not specified
+       here. Licensor shall not be bound by any additional provisions that
+       may appear in any communication from You. This License may not be
+       modified without the mutual written agreement of the Licensor and
+       You.
+ .
+    f. The rights granted under, and the subject matter referenced, in this
+       License were drafted utilizing the terminology of the Berne
+       Convention for the Protection of Literary and Artistic Works (as
+       amended on September 28, 1979), the Rome Convention of 1961, the
+       WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms
+       Treaty of 1996 and the Universal Copyright Convention (as revised on
+       July 24, 1971). These rights and subject matter take effect in the
+       relevant jurisdiction in which the License terms are sought to be
+       enforced according to the corresponding provisions of the
+       implementation of those treaty provisions in the applicable national
+       law. If the standard suite of rights granted under applicable
+       copyright law includes additional rights not granted under this
+       License, such additional rights are deemed to be included in the
+       License; this License is not intended to restrict the license of any
+       rights under applicable law.
+Comment:
+ https://creativecommons.org/licenses/by/3.0/legalcode
diff --git a/debian/patches/b699.patch b/debian/patches/b699.patch
deleted file mode 100644
index daa694e..0000000
--- a/debian/patches/b699.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Bug-Upstream: http://www.synfig.org/issues/thebuggenie/synfig/issues/699
-Origin: upstream, https://github.com/synfig/synfig/commit/3a3389cfefc91f95ff165ba3ba5d2e3c976cb278
-From: "[d.j.a.y] Jerome Blanchi" <d.j.a.y at free.fr>
-Date: Mon, 1 Dec 2014 22:52:26 +0100
-Subject: [PATCH] Glib 2.42 fixes : Parameters are not editable
-
---- a/src/gui/cellrenderer/cellrenderer_value.cpp
-+++ b/src/gui/cellrenderer/cellrenderer_value.cpp
-@@ -71,19 +71,30 @@
- #define DIGITS		15
- 
- /* === G L O B A L S ======================================================= */
- 
-+#if GLIB_CHECK_VERSION(2, 42, 0)
-+class studio::ValueBase_Entry : public Gtk::CellEditable, public Gtk::EventBox
-+#else
- class studio::ValueBase_Entry : public Gtk::EventBox, public Gtk::CellEditable
-+#endif
- {
- 	Glib::ustring path;
- 	Widget_ValueBase *valuewidget;
- 	bool edit_done_called;
- 	Gtk::Widget *parent;
- public:
-+#if GLIB_CHECK_VERSION(2, 42, 0)
- 	ValueBase_Entry():
--		Glib::ObjectBase  (typeid(ValueBase_Entry)),
-+		Gtk::CellEditable (),
- 		Gtk::EventBox     (),
--		Gtk::CellEditable ()
-+		Glib::ObjectBase  (typeid(ValueBase_Entry))
-+#else
-+	ValueBase_Entry():
-+		Glib::ObjectBase  (typeid(ValueBase_Entry)),
-+		Gtk::CellEditable (),
-+		Gtk::EventBox     ()
-+#endif
- 	{
- 		parent=0;
- 		edit_done_called=false;
- /*
-@@ -273,16 +284,27 @@
- }
- 
- /* === M E T H O D S ======================================================= */
- 
-+#if GLIB_CHECK_VERSION(2, 42, 0)
-+CellRenderer_ValueBase::CellRenderer_ValueBase():
-+	Gtk::CellRendererText	(),
-+	property_value_	(*this,"value",synfig::ValueBase()),
-+	property_canvas_(*this,"canvas",etl::handle<synfig::Canvas>()),
-+	property_param_desc_(*this,"param_desc",synfig::ParamDesc()),
-+	property_value_desc_(*this,"value_desc",synfigapp::ValueDesc()),
-+	property_child_param_desc_(*this,"child_param_desc", synfig::ParamDesc()),
-+	Glib::ObjectBase	(typeid(CellRenderer_ValueBase))
-+#else
- CellRenderer_ValueBase::CellRenderer_ValueBase():
- 	Glib::ObjectBase	(typeid(CellRenderer_ValueBase)),
- 	Gtk::CellRendererText	(),
- 	property_value_	(*this,"value",synfig::ValueBase()),
- 	property_canvas_(*this,"canvas",etl::handle<synfig::Canvas>()),
- 	property_param_desc_(*this,"param_desc",synfig::ParamDesc()),
- 	property_value_desc_(*this,"value_desc",synfigapp::ValueDesc()),
- 	property_child_param_desc_(*this,"child_param_desc", synfig::ParamDesc())
-+#endif
- {
- 	CellRendererText::signal_edited().connect(sigc::mem_fun(*this,&CellRenderer_ValueBase::string_edited_));
- 	value_entry=new ValueBase_Entry();
- 	value_entry->hide();
diff --git a/debian/patches/b715.patch b/debian/patches/b715.patch
deleted file mode 100644
index 7dde4c5..0000000
--- a/debian/patches/b715.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Bug-Upstream: http://www.synfig.org/issues/thebuggenie/synfig/issues/715
-Origin: upstream, https://github.com/synfig/synfig/commit/082290ea89462e1a3864bb3cf26a4ea66cd58d94
-From: Konstantin Dmitriev <ksee.zelgadis at gmail.com>
-Date: Wed, 3 Dec 2014 22:50:24 +0600
-Subject: [PATCH] Fix #715: Glib 2.42 issue for keyframes list. Thanks to Ron Bentley.
-
---- a/src/gui/trees/keyframetreestore.h
-+++ b/src/gui/trees/keyframetreestore.h
-@@ -46,13 +46,21 @@
- namespace studio {
- 
- class KeyframeTreeStore_Class;
- 
-+#if GLIB_CHECK_VERSION(2, 37, 5)
-+class KeyframeTreeStore :
-+	public Gtk::TreeModel,
-+	public Gtk::TreeDragSource,
-+	public Gtk::TreeDragDest,
-+	public Glib::Object
-+#else
- class KeyframeTreeStore :
- 	public Glib::Object,
- 	public Gtk::TreeModel,
- 	public Gtk::TreeDragSource,
- 	public Gtk::TreeDragDest
-+#endif
- {
- 	/*
-  -- ** -- P U B L I C   T Y P E S ---------------------------------------------
- 	*/
diff --git a/debian/patches/series b/debian/patches/series
index 55b9c14..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-b699.patch
-b715.patch
diff --git a/debian/rules b/debian/rules
index 088a65a..7c71ade 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,6 +29,8 @@ override_dh_auto_build:
 
 override_dh_auto_install:
 	dh_auto_install --destdir=$(CURDIR)/debian/tmp
+	## W:unknown-locale-code zh-Hant
+	$(RM) -rv $(CURDIR)/debian/tmp/usr/share/locale/zh-Hant
 
 override_dh_makeshlibs:
 	dh_makeshlibs --noscripts

-- 
synfig-synfigstudio packaging



More information about the pkg-multimedia-commits mailing list