diff -Nru totem-3.22.0/debian/changelog totem-3.22.0/debian/changelog --- totem-3.22.0/debian/changelog 2016-09-27 06:49:54.000000000 +0000 +++ totem-3.22.0/debian/changelog 2016-10-25 00:28:08.000000000 +0000 @@ -1,59 +1,24 @@ -totem (3.22.0-0ubuntu1) yakkety; urgency=medium - - * New upstream stable release - * Adapt extension install for nautilus multi-archification - - -- Jeremy Bicha Tue, 27 Sep 2016 02:49:54 -0400 - -totem (3.21.91-0ubuntu2) yakkety; urgency=medium - - * Add ubuntu-make-zeitgeist-plugin-builtin.patch: - - Make sure that zeitgeist plugin is enabled by default (LP: #1621162) - - -- Jeremy Bicha Wed, 07 Sep 2016 12:21:05 -0400 - -totem (3.21.91-0ubuntu1) yakkety; urgency=medium - - [ Jeremy Bicha ] - * New upstream beta release (LP: #1620160) - * Add debian/patches/lower-clutter-gtk.patch: - - The new clutter-gtk isn't needed because it fixes a GTK 3.22 specific - issue and is apparently not intended for GTK 3.20 - * Refresh debian/patches/0001-Add-a-traditional-menubar.patch - - [ Andreas Henriksson ] - * debian/totem-plugins.install: ship new variable-rate plugin. - * Drop debian/patches/backend-Fix-the-build-with-Werror-format.patch - - now included in upstream release. - - -- Jeremy Bicha Tue, 06 Sep 2016 12:17:37 -0400 - -totem (3.20.1-3ubuntu2) yakkety; urgency=medium +totem (3.22.0-2ubuntu1) zesty; urgency=medium * Merge with Debian (LP: #1609215). Remaining changes: - debian/control.in: + Drop libxtst-dev build-depends so that the (redundant) fake key presses for inhibiting the screensaver are disabled (LP: #1007438) - + Build-depend on libzeitgeist-dev, libicu-dev + Depend on grilo base plugins not the full set + Suggest rather than recommend gstreamer components in universe + Add totem-plugins-extra + Don't recommend gnome-settings-daemon from the plugins any more; it's not right to pull in desktop integration bits by default. + Use ubuntu-desktop vcs + + Add Multi-Arch tags - debian/rules: - + Build with --fail-missing, to ensure we install everything. - + Ignore libtotem.{,l}a since we delibrately don't install these. - + Binary install override for totem-plugins-extra + Generate compatibility .desktop file - + Enable buildflags script - + Enable GTK+ Doc - debian/totem-common.install, debian/source_totem.py: + Install Ubuntu apport debugging hook - debian/totem-plugins-extra.install: + Universe plugins split out of totem-plugins (currently only gromit) - debian/totem-plugins.install: - + Skip the plugins split to -extra and add the zeitgeist plugin + + Skip the plugins split to -extra - debian/patches/0001-Add-a-traditional-menubar.patch: + Add a traditional menubar - debian/patches/correct_desktop_mimetypes.patch: @@ -70,10 +35,53 @@ + Respect gtk-dialogs-use-header setting - debian/patches/0003-totem-movie-properties-Respect-gtk-dialogs-use-heade.patch: + Respect gtk-dialogs-use-header setting - - Multiarchify the library packages. - * Updated 0001-Add-a-traditional-menubar.patch for new version - -- Jeremy Bicha Wed, 03 Aug 2016 00:47:03 -0400 + -- Jeremy Bicha Mon, 24 Oct 2016 20:28:08 -0400 + +totem (3.22.0-2) unstable; urgency=medium + + * Bump Build-Depends on libnautilus-extension-dev to (>= 3.21.92-3~) to + ensure we have a version with multiarch support. + + -- Michael Biebl Wed, 21 Sep 2016 22:09:28 +0200 + +totem (3.22.0-1) unstable; urgency=medium + + [ Andreas Henriksson ] + * Convert from cdbs to dh + * Add debian/patches/disable-gtkdoc-check.patch to avoid failing make check + * Add gnome-common build-dependency explicitly (Closes: #837835) + * debian/totem.install: fix nautilus extension path which is now multi-arch. + * Use --fail-missing + + [ Jeremy Bicha ] + * Bump dh compat to 10 + + [ Michael Biebl ] + * New upstream release. + * Bump Build-Depends on libclutter-gtk-1.0-dev to (>= 1.8.1) as per + configure.ac. + * Drop debian/patches/lower-clutter-gtk.patch, no longer needed. + * Drop debian/test.html, the gecko plugin is long gone. + + -- Michael Biebl Wed, 21 Sep 2016 21:14:18 +0200 + +totem (3.21.91-1) unstable; urgency=medium + + * New upstream release. + * Update build-dependencies according to configure.ac changes: + - bump clutter-gtk to >= 1.8.1 + * debian/totem-plugins.install: ship new variable-rate plugin. + * Bump Standards-Version to 3.9.8 + * Drop debian/patches/backend-Fix-the-build-with-Werror-format.patch + - now included in upstream release. + * Add debian/patches/lower-clutter-gtk.patch + - temporary patch to allow building with the current latest released + version of clutter-gtk. + * Lower clutter-gtk build-dependency to the version shipping the patch + that totem wants to avoid flickering, 1.8.0-2~. + + -- Andreas Henriksson Sun, 04 Sep 2016 16:38:44 +0200 totem (3.20.1-3) unstable; urgency=medium diff -Nru totem-3.22.0/debian/compat totem-3.22.0/debian/compat --- totem-3.22.0/debian/compat 2016-09-27 06:49:54.000000000 +0000 +++ totem-3.22.0/debian/compat 2016-10-25 00:28:08.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru totem-3.22.0/debian/control totem-3.22.0/debian/control --- totem-3.22.0/debian/control 2016-09-27 06:49:54.000000000 +0000 +++ totem-3.22.0/debian/control 2016-10-25 00:28:08.000000000 +0000 @@ -7,13 +7,11 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers -Uploaders: Andreas Henriksson , Debian GNOME Maintainers , Jeremy Bicha , Laurent Bigonville , Michael Biebl -Build-Depends: debhelper (>= 9.20160114), - cdbs (>= 0.4.90), +Uploaders: Andreas Henriksson , Jeremy Bicha , Laurent Bigonville , Michael Biebl +Build-Depends: appstream-util, + debhelper (>= 10), dpkg-dev (>= 1.16.1), - autotools-dev, - dh-autoreconf, - appstream-util, + gnome-common, gnome-pkg-tools (>= 0.10), gobject-introspection (>= 0.9.12-4~), gsettings-desktop-schemas-dev, @@ -26,7 +24,7 @@ libbluetooth-dev [linux-any], libcairo2-dev (>= 1.14.0), libclutter-gst-3.0-dev, - libclutter-gtk-1.0-dev (>= 1.7.1~), + libclutter-gtk-1.0-dev (>= 1.8.1), libclutter-1.0-dev (>= 1.17.3), libgdata-dev (>= 0.8.0), libgdk-pixbuf2.0-dev (>= 2.23.0), @@ -37,9 +35,8 @@ libgstreamer-plugins-base1.0-dev, libgstreamer1.0-dev (>= 1.6.0), libgtk-3-dev (>= 3.19.4), - libicu-dev, liblircclient-dev (>= 0.6.6), - libnautilus-extension-dev (>= 2.91.4), + libnautilus-extension-dev (>= 3.21.92-3~), libpeas-dev (>= 1.1.0), librsvg2-dev (>= 2.16.0-2), libsoup2.4-dev, @@ -87,8 +84,8 @@ totem-plugins Suggests: gnome-codec-install, gstreamer1.0-libav, - gstreamer1.0-plugins-ugly, gstreamer1.0-plugins-bad, + gstreamer1.0-plugins-ugly, Description: Simple media player for the GNOME desktop based on GStreamer Totem is a simple yet featureful media player for GNOME which can read a large number of file formats. It features : @@ -114,6 +111,7 @@ Package: totem-common Architecture: all +Multi-Arch: foreign Depends: ${misc:Depends} Description: Data files for the Totem media player Totem is a simple yet featureful media player for GNOME which can read @@ -136,14 +134,12 @@ python3-gi (>= 2.90.3), python3-xdg Recommends: zeitgeist-core -Suggests: gromit Description: Plugins for the Totem media player Totem is a simple yet featureful media player for GNOME which can read a large number of file formats. . This package contains a set of recommended plugins for Totem: . - * Annotate the screen with the Gromit tool * Control Totem with an Infrared remote control * Control Totem with the keyboard's media player keys * Keep the Totem window on top of the screen diff -Nru totem-3.22.0/debian/control.in totem-3.22.0/debian/control.in --- totem-3.22.0/debian/control.in 2016-09-27 06:49:54.000000000 +0000 +++ totem-3.22.0/debian/control.in 2016-10-25 00:28:08.000000000 +0000 @@ -4,12 +4,10 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ -Build-Depends: debhelper (>= 9.20160114), - cdbs (>= 0.4.90), +Build-Depends: appstream-util, + debhelper (>= 10), dpkg-dev (>= 1.16.1), - autotools-dev, - dh-autoreconf, - appstream-util, + gnome-common, gnome-pkg-tools (>= 0.10), gobject-introspection (>= 0.9.12-4~), gsettings-desktop-schemas-dev, @@ -22,7 +20,7 @@ libbluetooth-dev [linux-any], libcairo2-dev (>= 1.14.0), libclutter-gst-3.0-dev, - libclutter-gtk-1.0-dev (>= 1.7.1~), + libclutter-gtk-1.0-dev (>= 1.8.1), libclutter-1.0-dev (>= 1.17.3), libgdata-dev (>= 0.8.0), libgdk-pixbuf2.0-dev (>= 2.23.0), @@ -33,9 +31,8 @@ libgstreamer-plugins-base1.0-dev, libgstreamer1.0-dev (>= 1.6.0), libgtk-3-dev (>= 3.19.4), - libicu-dev, liblircclient-dev (>= 0.6.6), - libnautilus-extension-dev (>= 2.91.4), + libnautilus-extension-dev (>= 3.21.92-3~), libpeas-dev (>= 1.1.0), librsvg2-dev (>= 2.16.0-2), libsoup2.4-dev, @@ -83,8 +80,8 @@ totem-plugins Suggests: gnome-codec-install, gstreamer1.0-libav, - gstreamer1.0-plugins-ugly, gstreamer1.0-plugins-bad, + gstreamer1.0-plugins-ugly, Description: Simple media player for the GNOME desktop based on GStreamer Totem is a simple yet featureful media player for GNOME which can read a large number of file formats. It features : @@ -110,6 +107,7 @@ Package: totem-common Architecture: all +Multi-Arch: foreign Depends: ${misc:Depends} Description: Data files for the Totem media player Totem is a simple yet featureful media player for GNOME which can read @@ -132,14 +130,12 @@ python3-gi (>= 2.90.3), python3-xdg Recommends: zeitgeist-core -Suggests: gromit Description: Plugins for the Totem media player Totem is a simple yet featureful media player for GNOME which can read a large number of file formats. . This package contains a set of recommended plugins for Totem: . - * Annotate the screen with the Gromit tool * Control Totem with an Infrared remote control * Control Totem with the keyboard's media player keys * Keep the Totem window on top of the screen diff -Nru totem-3.22.0/debian/patches/disable-gtkdoc-check.patch totem-3.22.0/debian/patches/disable-gtkdoc-check.patch --- totem-3.22.0/debian/patches/disable-gtkdoc-check.patch 1970-01-01 00:00:00.000000000 +0000 +++ totem-3.22.0/debian/patches/disable-gtkdoc-check.patch 2016-10-25 00:28:08.000000000 +0000 @@ -0,0 +1,21 @@ +From: Andreas Henriksson +Subject: disable gtkdoc-check + +This avoids failing make check + +--- a/docs/reference/Makefile.am ++++ b/docs/reference/Makefile.am +@@ -141,9 +141,9 @@ + # e.g. EXTRA_DIST += version.xml.in + EXTRA_DIST += version.xml.in + +-if ENABLE_GTK_DOC +-TESTS_ENVIRONMENT = cd $(builddir) && +-TESTS = $(GTKDOC_CHECK) +-endif ++#if ENABLE_GTK_DOC ++#TESTS_ENVIRONMENT = cd $(builddir) && ++#TESTS = $(GTKDOC_CHECK) ++#endif + + -include $(top_srcdir)/git.mk diff -Nru totem-3.22.0/debian/patches/lower-clutter-gtk.patch totem-3.22.0/debian/patches/lower-clutter-gtk.patch --- totem-3.22.0/debian/patches/lower-clutter-gtk.patch 2016-09-27 06:49:54.000000000 +0000 +++ totem-3.22.0/debian/patches/lower-clutter-gtk.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -93,7 +93,7 @@ - GSTPLUG_REQS=0.11.93 - CLUTTER_REQS=1.17.3 - CLUTTER_GST_REQS=2.99.2 --CLUTTER_GTK_REQS=1.8.1 -+CLUTTER_GTK_REQS=1.8.0 - - dnl Check for the required GStreamer versions for missing plugins - dnl installation, unless this has been disabled. diff -Nru totem-3.22.0/debian/patches/series totem-3.22.0/debian/patches/series --- totem-3.22.0/debian/patches/series 2016-09-27 06:49:54.000000000 +0000 +++ totem-3.22.0/debian/patches/series 2016-10-25 00:28:08.000000000 +0000 @@ -1,4 +1,4 @@ -lower-clutter-gtk.patch +disable-gtkdoc-check.patch 0001-Add-a-traditional-menubar.patch correct_desktop_mimetypes.patch 91_quicklist_entries.patch @@ -7,5 +7,4 @@ 0001-totem-open-location-Respect-gtk-dialogs-use-header-s.patch 0002-preferences-Respect-gtk-dialogs-use-header-setting.patch 0003-totem-movie-properties-Respect-gtk-dialogs-use-heade.patch - ubuntu-make-zeitgeist-plugin-builtin.patch diff -Nru totem-3.22.0/debian/rules totem-3.22.0/debian/rules --- totem-3.22.0/debian/rules 2016-09-27 06:49:54.000000000 +0000 +++ totem-3.22.0/debian/rules 2016-10-25 00:28:08.000000000 +0000 @@ -1,52 +1,44 @@ #!/usr/bin/make -f #-*- makefile -*- -export DEB_LDFLAGS_MAINT_APPEND=-Wl,-O1 -Wl,--as-needed +export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,--as-needed export DEB_BUILD_MAINT_OPTIONS = hardening=+all -DPKG_EXPORT_BUILDFLAGS = 1 -include /usr/share/dpkg/buildflags.mk - -include /usr/share/cdbs/1/rules/autoreconf.mk -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/gnome.mk -include /usr/share/cdbs/1/rules/utils.mk -include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk -include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk +include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk -include /usr/share/gnome-pkg-tools/1/rules/make-compat-desktop-file.mk - -DEB_MK_COMPAT_DESKTOP_totem := $(CURDIR)/debian/totem/usr/share/applications/org.gnome.Totem.desktop \ - $(CURDIR)/debian/totem/usr/share/applications/totem.desktop +%: + dh $@ --with gnome,gir -DEB_DH_AUTORECONF_ARGS = --as-needed +override_dh_autoreconf: + dh_autoreconf --as-needed -DEB_CONFIGURE_EXTRA_FLAGS += \ - --enable-vala=yes \ - --disable-run-in-source-tree \ - --enable-gtk-doc \ - PYTHON=/usr/bin/python3 - -DEB_DH_STRIP_ARGS := --dbgsym-migration='totem-dbg (<< 3.20.1-1~)' -DEB_DH_MAKESHLIBS_ARGS += -Xplugins/ -DEB_DH_GIREPOSITORY_ARGS += -lsrc -DEB_DH_MAKESHLIBS_ARGS_totem += -X/usr/lib/$(DEB_HOST_MULTIARCH)/nautilus/ -DEB_DH_MAKESHLIBS_ARGS_libtotem0 += -V'libtotem0 (>= $(DEB_VERSION)), libtotem0 (<< $(DEB_GNOME_NEXTVERSION))' - -DEB_DH_INSTALL_ARGS += --fail-missing -Xlibtotem.a -Xlibtotem.la - -# don't configure with --libdir, but move the files manually, because -# other locations in /usr/lib/ must not change. -common-install-impl:: - mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) - mv debian/tmp/usr/lib/*.a debian/tmp/usr/lib/*.so* \ - debian/tmp/usr/lib/girepository-1.0 debian/tmp/usr/lib/pkgconfig \ - debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) - -binary-install/totem-plugins:: - dh_python3 --no-ext-rename -ptotem-plugins /usr/lib/totem/plugins - -common-binary-predeb-arch:: - find debian -name '*.a' -delete - find debian -name '*.la' -delete +override_dh_auto_configure: + dh_auto_configure -- \ + --enable-gtk-doc \ + --enable-vala=yes \ + --disable-run-in-source-tree \ + PYTHON=/usr/bin/python3 + +override_dh_strip: + dh_strip --dbgsym-migration='totem-dbg (<< 3.20.1-1~)' + +override_dh_makeshlibs: + dh_makeshlibs -p totem -X/usr/lib/$(DEB_HOST_MULTIARCH)/nautilus/ + dh_makeshlibs -p libtotem0 -V'libtotem0 (>= $(DEB_VERSION)), libtotem0 (<< $(DEB_GNOME_NEXTVERSION))' + dh_makeshlibs --remaining-packages -Xplugins/ + +override_dh_girepository: + dh_girepository -lsrc + +override_dh_python3: + dh_python3 --no-ext-rename -ptotem-plugins /usr/lib/*/totem/plugins + dh_python3 --remaining-packages + +override_dh_install: + find debian \( -name '*.a' -o -name '*.la' \) -delete + rm -rf debian/tmp/usr/lib/*/totem/plugins/*/__pycache__ + dh_install --fail-missing + /usr/bin/pkg-gnome-compat-desktop-file \ + debian/totem/usr/share/applications/org.gnome.Totem.desktop \ + debian/totem/usr/share/applications/totem.desktop diff -Nru totem-3.22.0/debian/test.html totem-3.22.0/debian/test.html --- totem-3.22.0/debian/test.html 2016-09-27 06:49:54.000000000 +0000 +++ totem-3.22.0/debian/test.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ - - -Test - - -
-

PIMP

-

PIMP Internet Media Player

- - - - - - - - - -
- -
- - - - - -
- -
- - diff -Nru totem-3.22.0/debian/totem.docs totem-3.22.0/debian/totem.docs --- totem-3.22.0/debian/totem.docs 1970-01-01 00:00:00.000000000 +0000 +++ totem-3.22.0/debian/totem.docs 2016-10-25 00:28:08.000000000 +0000 @@ -0,0 +1,3 @@ +AUTHORS +NEWS +README diff -Nru totem-3.22.0/debian/totem-plugins-extra.install totem-3.22.0/debian/totem-plugins-extra.install --- totem-3.22.0/debian/totem-plugins-extra.install 2016-09-27 06:49:54.000000000 +0000 +++ totem-3.22.0/debian/totem-plugins-extra.install 2016-10-25 00:28:08.000000000 +0000 @@ -1 +1 @@ -usr/lib/totem/plugins/gromit +usr/lib/*/totem/plugins/gromit diff -Nru totem-3.22.0/debian/totem-plugins.install totem-3.22.0/debian/totem-plugins.install --- totem-3.22.0/debian/totem-plugins.install 2016-09-27 06:49:54.000000000 +0000 +++ totem-3.22.0/debian/totem-plugins.install 2016-10-25 00:28:08.000000000 +0000 @@ -1,22 +1,23 @@ # Needs porting -# usr/lib/totem/plugins/bbc -usr/lib/totem/plugins/apple-trailers -usr/lib/totem/plugins/autoload-subtitles -usr/lib/totem/plugins/brasero-disc-recorder -usr/lib/totem/plugins/dbus -usr/lib/totem/plugins/im-status -usr/lib/totem/plugins/lirc -usr/lib/totem/plugins/media-player-keys -usr/lib/totem/plugins/ontop -usr/lib/totem/plugins/opensubtitles -usr/lib/totem/plugins/properties -usr/lib/totem/plugins/pythonconsole -usr/lib/totem/plugins/recent -usr/lib/totem/plugins/rotation -usr/lib/totem/plugins/save-file -usr/lib/totem/plugins/screensaver -usr/lib/totem/plugins/screenshot -usr/lib/totem/plugins/skipto -usr/lib/totem/plugins/variable-rate -usr/lib/totem/plugins/vimeo -usr/lib/totem/plugins/zeitgeist-dp +# usr/lib/*/totem/plugins/bbc +usr/lib/*/totem/plugins/apple-trailers +usr/lib/*/totem/plugins/autoload-subtitles +usr/lib/*/totem/plugins/brasero-disc-recorder +#usr/lib/*/totem/plugins/chapters +usr/lib/*/totem/plugins/dbus +usr/lib/*/totem/plugins/im-status +usr/lib/*/totem/plugins/lirc +usr/lib/*/totem/plugins/media-player-keys +usr/lib/*/totem/plugins/ontop +usr/lib/*/totem/plugins/opensubtitles +usr/lib/*/totem/plugins/properties +usr/lib/*/totem/plugins/pythonconsole +usr/lib/*/totem/plugins/recent +usr/lib/*/totem/plugins/rotation +usr/lib/*/totem/plugins/save-file +usr/lib/*/totem/plugins/screensaver +usr/lib/*/totem/plugins/screenshot +usr/lib/*/totem/plugins/skipto +usr/lib/*/totem/plugins/variable-rate +usr/lib/*/totem/plugins/vimeo +usr/lib/*/totem/plugins/zeitgeist-dp