Hello all!
Blame is all on me for this and here's an attempt to redeem myself a bit
(spoiler: will fail).
On Mon, May 19, 2014 at 01:19:20PM +0200, Emilio Pozuelo Monfort wrote:
[...]
>
> Since 0.9 is only in experimental and unstable still has 0.4.x, we could keep
> linking against that, but we need to make sure we have something sane by the
> freeze.
I've attached a patch that make the totem-pl-parser package
build against the old version of libquvi we have in testing/unstable
(but otherwise basically untested).
Beware, This will make totem blow up when used!
Problem being that both gnutls26 (via glib/gio) and gnutls28 (via libquvi7)
gets pulled in and apparently the symbol versioning is broken.
The Debian gnutls maintainer has been alerted.
Please also note that libquvi in testing/unstable is RC-buggy (FTBFS),
see: #747798
Regards,
Andreas Henriksson
Index: debian/changelog
===================================================================
--- debian/changelog (revision 41753)
+++ debian/changelog (working copy)
@@ -1,3 +1,16 @@
+totem-pl-parser (3.10.2-2) UNRELEASED; urgency=medium
+
+ * Add debian/patches/totem-pl-parser-use-old-quvi.patch
+ - reverts upstream commit 24970018abfcedcaa496
+ "plparse: Port to libquvi 0.9"
+ because we don't have this version in unstable yet.
+ * debian/rules: use autoreconf because of above patch
+ * Re-add libquvi build-dependency
+ * Add build-dependencies on dh-autoreconf and libgcrypt20-dev
+ * Run wrap-and-sort
+
+ -- Andreas Henriksson <andr...@fatal.se> Mon, 19 May 2014 18:08:56 +0200
+
totem-pl-parser (3.10.2-1) unstable; urgency=medium
* New upstream release.
Index: debian/control
===================================================================
--- debian/control (revision 41753)
+++ debian/control (working copy)
@@ -8,21 +8,24 @@
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintain...@lists.alioth.debian.org>
Uploaders: Andreas Henriksson <andr...@fatal.se>, Emilio Pozuelo Monfort <po...@debian.org>, Michael Biebl <bi...@debian.org>, Sjoerd Simons <sjo...@debian.org>
-Build-Depends: debhelper (>= 8),
- autotools-dev,
+Build-Depends: autotools-dev,
cdbs (>= 0.4.90),
+ debhelper (>= 8),
+ dh-autoreconf,
gnome-pkg-tools,
+ gobject-introspection (>= 0.9.12-4~),
+ gtk-doc-tools (>= 1.11),
intltool (>= 0.35),
- libxml-parser-perl,
+ libarchive-dev (>= 3.0),
+ libgcrypt20-dev,
+ libgirepository1.0-dev (>= 0.10.7-1~),
libglib2.0-dev (>= 2.31.0),
- libxml2-dev,
+ libglib2.0-doc,
libgmime-2.6-dev,
+ libquvi-dev,
libsoup-gnome2.4-dev (>= 2.43.0),
- libarchive-dev (>= 3.0),
- gtk-doc-tools (>= 1.11),
- libglib2.0-doc,
- libgirepository1.0-dev (>= 0.10.7-1~),
- gobject-introspection (>= 0.9.12-4~)
+ libxml-parser-perl,
+ libxml2-dev
Standards-Version: 3.9.4
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/totem-pl-parser
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/totem-pl-parser
@@ -30,13 +33,13 @@
Package: libtotem-plparser-dev
Section: libdevel
Architecture: any
-Depends: ${misc:Depends},
+Depends: gir1.2-totem-plparser-1.0 (= ${binary:Version}),
+ libarchive-dev,
+ libglib2.0-dev,
+ libgmime-2.6-dev,
libtotem-plparser18 (= ${binary:Version}),
- gir1.2-totem-plparser-1.0 (= ${binary:Version}),
- libglib2.0-dev,
libxml2-dev,
- libgmime-2.6-dev,
- libarchive-dev
+ ${misc:Depends}
Replaces: libtotem-plparser10
Description: Totem Playlist Parser library - development files
totem-pl-parser is a simple GObject-based library to parse a host of
@@ -46,8 +49,7 @@
Package: libtotem-plparser18
Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Replaces: libtotem-plparser10, libtotem-plparser12, libtotem-plparser17
Description: Totem Playlist Parser library - runtime files
totem-pl-parser is a simple GObject-based library to parse a host of
@@ -71,9 +73,7 @@
Package: gir1.2-totem-plparser-1.0
Section: introspection
Architecture: any
-Depends: ${gir:Depends},
- ${shlibs:Depends},
- ${misc:Depends}
+Depends: ${gir:Depends}, ${misc:Depends}, ${shlibs:Depends}
Conflicts: gir1.0-totem-plparser-1.0
Replaces: gir1.0-totem-plparser-1.0
Description: GObject introspection data for the Totem Playlist Parser library
Index: debian/control.in
===================================================================
--- debian/control.in (revision 41753)
+++ debian/control.in (working copy)
@@ -3,21 +3,24 @@
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintain...@lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 8),
- autotools-dev,
+Build-Depends: autotools-dev,
cdbs (>= 0.4.90),
+ debhelper (>= 8),
+ dh-autoreconf,
gnome-pkg-tools,
+ gobject-introspection (>= 0.9.12-4~),
+ gtk-doc-tools (>= 1.11),
intltool (>= 0.35),
- libxml-parser-perl,
+ libarchive-dev (>= 3.0),
+ libgcrypt20-dev,
+ libgirepository1.0-dev (>= 0.10.7-1~),
libglib2.0-dev (>= 2.31.0),
- libxml2-dev,
+ libglib2.0-doc,
libgmime-2.6-dev,
+ libquvi-dev,
libsoup-gnome2.4-dev (>= 2.43.0),
- libarchive-dev (>= 3.0),
- gtk-doc-tools (>= 1.11),
- libglib2.0-doc,
- libgirepository1.0-dev (>= 0.10.7-1~),
- gobject-introspection (>= 0.9.12-4~)
+ libxml-parser-perl,
+ libxml2-dev
Standards-Version: 3.9.4
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/totem-pl-parser
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/totem-pl-parser
@@ -25,13 +28,13 @@
Package: libtotem-plparser-dev
Section: libdevel
Architecture: any
-Depends: ${misc:Depends},
+Depends: gir1.2-totem-plparser-1.0 (= ${binary:Version}),
+ libarchive-dev,
+ libglib2.0-dev,
+ libgmime-2.6-dev,
libtotem-plparser18 (= ${binary:Version}),
- gir1.2-totem-plparser-1.0 (= ${binary:Version}),
- libglib2.0-dev,
libxml2-dev,
- libgmime-2.6-dev,
- libarchive-dev
+ ${misc:Depends}
Replaces: libtotem-plparser10
Description: Totem Playlist Parser library - development files
totem-pl-parser is a simple GObject-based library to parse a host of
@@ -41,8 +44,7 @@
Package: libtotem-plparser18
Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Replaces: libtotem-plparser10, libtotem-plparser12, libtotem-plparser17
Description: Totem Playlist Parser library - runtime files
totem-pl-parser is a simple GObject-based library to parse a host of
@@ -66,9 +68,7 @@
Package: gir1.2-totem-plparser-1.0
Section: introspection
Architecture: any
-Depends: ${gir:Depends},
- ${shlibs:Depends},
- ${misc:Depends}
+Depends: ${gir:Depends}, ${misc:Depends}, ${shlibs:Depends}
Conflicts: gir1.0-totem-plparser-1.0
Replaces: gir1.0-totem-plparser-1.0
Description: GObject introspection data for the Totem Playlist Parser library
Index: debian/libtotem-plparser-dev.install
===================================================================
--- debian/libtotem-plparser-dev.install (revision 41753)
+++ debian/libtotem-plparser-dev.install (working copy)
@@ -2,5 +2,5 @@
usr/lib/lib*.a
usr/lib/lib*.so
usr/lib/pkgconfig/*
+usr/share/gir-*
usr/share/gtk-doc
-usr/share/gir-*
Index: debian/patches/series
===================================================================
--- debian/patches/series (revision 41753)
+++ debian/patches/series (working copy)
@@ -0,0 +1 @@
+totem-pl-parser-use-old-quvi.patch
Index: debian/patches/totem-pl-parser-use-old-quvi.patch
===================================================================
--- debian/patches/totem-pl-parser-use-old-quvi.patch (revision 0)
+++ debian/patches/totem-pl-parser-use-old-quvi.patch (working copy)
@@ -0,0 +1,48 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -45,7 +45,7 @@
+ # Requirements
+ GLIB_REQS=2.31.0
+ GIO_REQS=2.24.0
+-QUVI_REQS=0.9.1
++QUVI_REQS=0.2.15
+ LIBARCHIVE_REQS=3.0
+ LIBSOUP_REQS=2.43.0
+
+@@ -114,13 +114,13 @@
+ [enable_quvi=auto])
+ if test "x$enable_quvi" != "xno" ; then
+ PKG_CHECK_MODULES(QUVI,
+- libquvi-0.9 >= $QUVI_REQS glib-2.0,
++ libquvi >= $QUVI_REQS glib-2.0,
+ [have_quvi=yes], [have_quvi=no])
+ if test "x$enable_quvi" = "xyes" -a "x$have_quvi" = "xno" ; then
+ AC_MSG_ERROR([Quvi support requested but not available.])
+ fi
+ if test "x$have_quvi" = "xyes" ; then
+- QUVI="libquvi-0.9"
++ QUVI="libquvi"
+ AC_DEFINE(HAVE_QUVI, 1, [libquvi available in the system])
+ fi
+ fi
+--- a/plparse/Makefile.am
++++ b/plparse/Makefile.am
+@@ -182,12 +182,12 @@
+ plparser.symbols \
+ plparser-mini.symbols
+
+-if HAVE_QUVI
+-libexec_PROGRAMS = totem-pl-parser-videosite
+-totem_pl_parser_videosite_SOURCES = videosite-parser.c
+-totem_pl_parser_videosite_CFLAGS = $(QUVI_CFLAGS) -DLIBEXECDIR=\""$(libexecdir)"\"
+-totem_pl_parser_videosite_LDADD = $(QUVI_LIBS)
+-endif
++#if HAVE_QUVI
++#libexec_PROGRAMS = totem-pl-parser-videosite
++#totem_pl_parser_videosite_SOURCES = videosite-parser.c
++#totem_pl_parser_videosite_CFLAGS = $(QUVI_CFLAGS) -DLIBEXECDIR=\""$(libexecdir)"\"
++#totem_pl_parser_videosite_LDADD = $(QUVI_LIBS)
++#endif
+
+ # Introspection
+ -include $(INTROSPECTION_MAKEFILE)
Index: debian/rules
===================================================================
--- debian/rules (revision 41753)
+++ debian/rules (working copy)
@@ -3,6 +3,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
libtotem-plparserN := $(shell sed -rn 's/^Package:[[:space:]]*(libtotem-plparser[0-9]+)[[:space:]]*$$/\1/p' debian/control)
@@ -10,3 +11,5 @@
DEB_DH_MAKESHLIBS_ARGS_$(libtotem-plparserN) += -V -- -c4
DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc
+
+DEB_DH_AUTORECONF_ARGS += ./autogen.sh
