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

onlyjob at users.alioth.debian.org onlyjob at users.alioth.debian.org
Thu Apr 30 03:32:33 UTC 2015


The following commit has been merged in the master branch:
commit 6a2084b1dc79a81581f9b464f0ff2bc21c0137c2
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Thu Apr 30 11:45:05 2015 +1000

    New upstream release [1.0] + changelog summary

diff --git a/debian/changelog b/debian/changelog
index 24fa5a5..6c797db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+synfig (1.0-1) UNRELEASED; urgency=low
+
+  * New upstream release [April 2015].
+  * Build-Depends:
+    - etl-dev (>= 0.04.17)
+    + etl-dev (>= 0.04.18)
+    + libmlt-dev
+    + libmlt++-dev
+  * Dropped obsolete "hurd-path_max.patch".
+
+ -- Dmitry Smirnov <onlyjob at debian.org>  Thu, 30 Apr 2015 10:12:10 +1000
+
 synfig (0.64.2-2) unstable; urgency=medium
 
   * New "hurd-path_max.patch" to fix FTBFS on GNU Hurd.
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..8368d9f
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+src/modules/mod_ffmpeg/Makefile
+config.log
diff --git a/debian/control b/debian/control
index a589c3e..a482639 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alio
 Uploaders: Dmitry Smirnov <onlyjob at debian.org>
 Build-Depends: debhelper (>= 9), dh-autoreconf, autopoint
  ,binutils
- ,etl-dev (>= 0.04.17)
+ ,etl-dev (>= 0.04.18)
 # ,libavcodec-dev
 # ,libavformat-dev
  ,libboost-all-dev
@@ -16,6 +16,8 @@ Build-Depends: debhelper (>= 9), dh-autoreconf, autopoint
  ,libltdl-dev
  ,libmng-dev
  ,libmagick++-dev
+ ,libmlt-dev
+ ,libmlt++-dev
  ,libopenexr-dev
  ,libpango1.0-dev
  ,libpng-dev
diff --git a/debian/copyright b/debian/copyright
index 705d6d7..3ca781d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,35 +4,39 @@ Source: http://sourceforge.net/projects/synfig/
 Comment:
  This package was debianized by Paul Wise <pabs at debian.org> on 2005-11-05
 
-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>
-           2009      Scott Kitterman <scott at kitterman.com>
-           2010      Stefano Zacchiroli <zack at debian.org>
-License: GPL-2+
-
 Files: *
 Copyright: 2002-2005      Adrian Bentley
            2010           Brendon Higgins
-           2008-2013      Carlos López
+           2008-2014      Carlos López
            2009           Carlos A. Sosa Navarro
            2007-2008      Chris Moore
-           2009-2012      Diego Barrios Romero
+           2009-2015      Diego Barrios Romero
            2008           Gerco Ballintijn
            2009,2012-2013 Konstantin Dmitriev
            2009-2010,2012 Nikita Kitaev
            2006-2008      Paul Wise
            2009           Ray Frederikson
            2002-2005      Robert B. Quattlebaum Jr.
+           2015           Jérôme Blanchi
+           2013           Moritz Grosch (LittleFox) <littlefox at fsfe.org>
+           2015           Denis Zdorovtsov (mrtrizer) <mrtrizer at gmail.com>
+           2013-2014      Ivan Mahonin
 License: GPL-2+
 
 Files: libltdl/*
 Copyright: 1996-2001,2003-2010 Free Software Foundation, Inc.
 License: LGPL-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>
+           2009      Scott Kitterman <scott at kitterman.com>
+           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
diff --git a/debian/libsynfig-dev.install b/debian/libsynfig-dev.install
index 9549064..56abc84 100644
--- a/debian/libsynfig-dev.install
+++ b/debian/libsynfig-dev.install
@@ -1,4 +1,4 @@
 usr/bin/synfig-config
 usr/lib/*/pkgconfig/synfig.pc
 usr/lib/*/libsynfig.so
-usr/include/synfig-0.0/synfig/
+usr/include/synfig-*/synfig/
diff --git a/debian/patches/hurd-path_max.patch b/debian/patches/hurd-path_max.patch
deleted file mode 100644
index 2f51d50..0000000
--- a/debian/patches/hurd-path_max.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Last-Update: 2014-11-18
-Forwarded: https://github.com/synfig/synfig/pull/144
-Author: Dmitry Smirnov <onlyjob at member.fsf.org>
-Description: define PATH_MAX if needed; necessary to fix FTBFS on GNU Hurd
-
---- a/src/synfig/main.cpp
-+++ b/src/synfig/main.cpp
-@@ -75,8 +75,12 @@
- #endif
- 
- #endif
- 
-+#ifndef PATH_MAX
-+#define PATH_MAX 4096
-+#endif
-+
- using namespace std;
- using namespace etl;
- using namespace synfig;
- 
diff --git a/debian/patches/series b/debian/patches/series
index 87ee4f2..30ed419 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-hurd-path_max.patch
 no-mod_ffmpeg.patch
diff --git a/debian/rules b/debian/rules
index 5b1d79b..877f3ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,8 @@ override_dh_auto_configure:
 override_dh_auto_install:
 	chmod a-x examples/*.sifz
 	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 -V

-- 
synfig-synfig packaging



More information about the pkg-multimedia-commits mailing list