On 23.04.2018 17:09, James Cowgill wrote:
> Hi,
> 
> On 23/04/18 15:55, Debian FTP Masters wrote:
>> binary:libsynfig0 is NEW.
>> binary:libsynfig0 is NEW.
> 
> Unfortunately, since you failed to follow the NMU procedure by not
> uploading the diff anywhere (again), I can't check for myself, but I
> would like to know how you have managed to make this library compatible
> with the pre-gcc5 version shipped with jessie (which is what you are
> doing by renaming it back to libsynfig0).
> 
> If I diff the symbols between 1.0-1 and 1.0-2 there _a lot_ of
> differences relating to std::string, so I would be surprised if you
> fixed this.

I doubt that we are supporting updates directly from jessie to buster. The
update from stretch to buster should be fine.  For other packages it has been
common practice to drop the v5 suffix.

debian diff attached.

diff -urN synfig-1.0.2/debian/changelog synfig-1.2.1/debian/changelog
--- synfig-1.0.2/debian/changelog	2015-11-27 09:57:11.000000000 +0000
+++ synfig-1.2.1/debian/changelog	2018-04-23 12:16:53.925283544 +0000
@@ -1,3 +1,15 @@
+synfig (1.2.1-0.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * New upstream version.
+  * Rename back libsynfig0v5 to libsynfig0. Upstream symbol version changes
+    without bumping the soname.
+  * Update (build) dependency on etl-dev. Closes: #895503.
+  * Stop building the -dbg package.
+  * Build-depend on intltool and libfftw3-dev.
+
+ -- Matthias Klose <[email protected]>  Mon, 16 Apr 2018 02:45:11 +0200
+
 synfig (1.0.2-1) unstable; urgency=medium
 
   * New upstream release.
diff -urN synfig-1.0.2/debian/control synfig-1.2.1/debian/control
--- synfig-1.0.2/debian/control	2015-09-29 11:52:26.000000000 +0000
+++ synfig-1.2.1/debian/control	2018-04-23 12:16:40.045161109 +0000
@@ -3,13 +3,14 @@
 Priority: optional
 Maintainer: Debian Multimedia Maintainers <[email protected]>
 Uploaders: Dmitry Smirnov <[email protected]>
-Build-Depends: debhelper (>= 9), dh-autoreconf, autopoint
+Build-Depends: debhelper (>= 9), dh-autoreconf, autopoint, intltool
  ,binutils
- ,etl-dev (>= 0.04.19)
+ ,etl-dev (>= 1.2.1)
 # ,libavcodec-dev
 # ,libavformat-dev
  ,libboost-all-dev
  ,libcairo-dev
+ ,libfftw3-dev
  ,libfontconfig1-dev
  ,libfreetype6-dev
  ,libjpeg-dev
@@ -43,7 +44,7 @@
  This package contains the command-line renderer, for the GUI animation
  editor, please install synfigstudio.
 
-Package: libsynfig0v5
+Package: libsynfig0
 Section: libs
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
@@ -53,8 +54,8 @@
 # libav-tools,
  imagemagick
 Breaks: synfigstudio (<< 0.64.2)
-Conflicts: libsynfig0
-Replaces: libsynfig0
+Conflicts: libsynfig0v5
+Replaces: libsynfig0v5
 Description: render library and plugins for synfig 2D animation
  synfig is a vector based 2D animation package. It is designed to be
  capable of producing feature-film quality animation.
@@ -64,9 +65,8 @@
 Package: libsynfig-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libsynfig0v5 (= ${binary:Version}),
- etl-dev (>= 0.04.16), libxml++2.6-dev, libsigc++-2.0-dev
-Suggests: synfig-dbg
+Depends: ${misc:Depends}, libsynfig0 (= ${binary:Version}),
+ etl-dev (>= 1.2.1), libxml++2.6-dev, libsigc++-2.0-dev
 Description: synfig library development files
  synfig is a vector based 2D animation package. It is designed to be
  capable of producing feature-film quality animation.
@@ -74,19 +74,6 @@
  This package contains headers and other files needed to develop
  applications using the shared library and plugin modules.
 
-Package: synfig-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: ${misc:Depends},
- libsynfig0v5 (= ${binary:Version}) | synfig (= ${binary:Version})
-Suggests: libsynfig-dev
-Description: synfig debugging symbols
- synfig is a vector based 2D animation package. It is designed to be
- capable of producing feature-film quality animation.
- .
- This package contains debugging symbols for libsynfig0 and synfig.
-
 Package: synfig-examples
 Architecture: all
 Suggests: synfigstudio
diff -urN synfig-1.0.2/debian/libsynfig0.install synfig-1.2.1/debian/libsynfig0.install
--- synfig-1.0.2/debian/libsynfig0.install	1970-01-01 00:00:00.000000000 +0000
+++ synfig-1.2.1/debian/libsynfig0.install	2015-09-29 08:05:44.000000000 +0000
@@ -0,0 +1,4 @@
+etc/synfig/synfig_modules.cfg
+usr/lib/*/libsynfig.so.*
+usr/lib/*/synfig/modules/*.so
+usr/share/locale
diff -urN synfig-1.0.2/debian/libsynfig0v5.install synfig-1.2.1/debian/libsynfig0v5.install
--- synfig-1.0.2/debian/libsynfig0v5.install	2015-09-29 08:05:44.000000000 +0000
+++ synfig-1.2.1/debian/libsynfig0v5.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-etc/synfig/synfig_modules.cfg
-usr/lib/*/libsynfig.so.*
-usr/lib/*/synfig/modules/*.so
-usr/share/locale
diff -urN synfig-1.0.2/debian/patches/c++11.patch synfig-1.2.1/debian/patches/c++11.patch
--- synfig-1.0.2/debian/patches/c++11.patch	2015-11-27 09:38:19.000000000 +0000
+++ synfig-1.2.1/debian/patches/c++11.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-Last-Update: 2015-11-27
-Forwarded: not-needed
-Bug-Upstream: http://www.synfig.org/issues/thebuggenie/synfig/issues/904
-Author: Dmitry Smirnov <[email protected]>
-Description: fix FTBFS with C++11
-
---- a/src/synfig/time.cpp
-+++ b/src/synfig/time.cpp
-@@ -318,6 +318,6 @@
- //! \writeme
- bool
- Time::is_valid()const
- {
--	return !isnan(value_);
-+	return !std::isnan(value_);
- }
diff -urN synfig-1.0.2/debian/patches/series synfig-1.2.1/debian/patches/series
--- synfig-1.0.2/debian/patches/series	2015-11-27 09:31:17.000000000 +0000
+++ synfig-1.2.1/debian/patches/series	2018-04-08 12:01:28.000000000 +0000
@@ -1,2 +1 @@
-c++11.patch
 #no-mod_ffmpeg.patch
diff -urN synfig-1.0.2/debian/rules synfig-1.2.1/debian/rules
--- synfig-1.0.2/debian/rules	2015-11-27 09:55:25.000000000 +0000
+++ synfig-1.2.1/debian/rules	2018-04-23 12:08:16.161050525 +0000
@@ -10,7 +10,9 @@
 	dh $@ --parallel --with autoreconf
 
 override_dh_autoreconf:
-	dh_autoreconf --as-needed
+#	dh_autoreconf --as-needed
+	dh_autoreconf
+	intltoolize --force --copy
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
@@ -34,8 +36,5 @@
 override_dh_compress:
 	dh_compress --exclude=.sifz
 
-override_dh_strip:
-	dh_strip --dbg-package=synfig-dbg
-
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
_______________________________________________
pkg-multimedia-maintainers mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Reply via email to