Merge lp:~noskcaj/cheese/3.14 into lp:~ubuntu-desktop/cheese/ubuntu

[Jackson Doak]

Merge from debian

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-29 10:40:15 +0000
+++ debian/changelog	2014-12-20 21:01:27 +0000
@@ -1,8 +1,57 @@
+cheese (3.14.1-2ubuntu1) vivid; urgency=low
+
+  * Merge from debian. Remaining changes:
+    - Add apport hook
+    - debian/control.in:
+      + Build-depend on good gstreamer plugins instead of bad
+      + Update Vcs-*
+    - debian/patches/use-plugins-good:
+      + The camerabin plugin is part of the good gstreamer plugins in Ubuntu
+
+ -- Jackson Doak <[e-mail]>  Fri, 07 Nov 2014 16:10:56 +0000
+
+cheese (3.14.1-2) unstable; urgency=medium
+
+  * debian/patches/substitute-bindir-and-libexecdir.patch:
+    + Substitute @bindir@ and @libexecdir@ in service files. Fixes
+      launching cheese from the shell. Closes: #765513.
+
+ -- Emilio Pozuelo Monfort <[e-mail]>  Fri, 07 Nov 2014 12:37:43 +0100
+
+cheese (3.14.1-1) unstable; urgency=medium
+
+  * New upstream release.
+    - Drop debian/patches/using-fmod-link-libm.patch: Applied upstream
+  * Drop debian/patches/revert-appstream-usage.patch and build-depend against
+    appstream-util
+  * debian/control.in: Bump Standards-Version to 3.9.6 (no further changes)
+
+ -- Laurent Bigonville <[e-mail]>  Sun, 19 Oct 2014 20:42:33 +0200
+
+cheese (3.14.0-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Add debian/patches/revert-appstream-usage.patch
+    - we don't have appstream-glib in Debian yet...
+  * Add debian/patches/using-fmod-link-libm.patch
+    - libcheese-gtk now uses fmod and needs to link with libm
+  * debian/cheese.install: Ship gnome-camera-service and dbus services files
+  * Upload to unstable.
+
+ -- Andreas Henriksson <[e-mail]>  Wed, 24 Sep 2014 16:50:11 +0200
+
+cheese (3.13.90.1-1) experimental; urgency=medium
+
+  * New upstream release
+  * debian/control.in: b-d on vala (>= 0.25.4)
+
+ -- Sjoerd Simons <[e-mail]>  Thu, 11 Sep 2014 21:45:32 +0200
+
 cheese (3.12.2-1ubuntu2) utopic; urgency=medium
 
   * No change rebuild for gnome-desktop 3.12
 
- -- Tim Lunn <[e-mail]>  Mon, 29 Sep 2014 20:40:15 +1000
+ -- Tim Lunn <[e-mail]>  Wed, 24 Sep 2014 09:47:53 +1000
 
 cheese (3.12.2-1ubuntu1) utopic; urgency=medium
 
 
=== modified file 'debian/cheese.install'
--- debian/cheese.install	2014-05-23 10:34:42 +0000
+++ debian/cheese.install	2014-12-20 21:01:27 +0000
@@ -1,4 +1,6 @@
 usr/bin
 usr/share/applications
 usr/share/man
-usr/share/appdata/cheese.appdata.xml
+usr/share/appdata/*.appdata.xml
+usr/share/dbus-1/services/*.service
+usr/lib/cheese/gnome-camera-service
 
=== modified file 'debian/control'
--- debian/control	2014-07-24 07:31:08 +0000
+++ debian/control	2014-12-20 21:01:27 +0000
@@ -2,17 +2,16 @@
 # 
 # Modifications should be made to debian/control.in instead.
 # This file is regenerated automatically in the clean target.
-
 Source: cheese
 Section: gnome
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
-Uploaders: Andreas Henriksson <[e-mail]>, Josselin Mouette <[e-mail]>, Laurent Bigonville <[e-mail]>, Michael Biebl <[e-mail]>, Sjoerd Simons <[e-mail]>
-Standards-Version: 3.9.5
+Uploaders: Andreas Henriksson <[e-mail]>, Debian GNOME Maintainers <[e-mail]>, Emilio Pozuelo Monfort <[e-mail]>, Laurent Bigonville <[e-mail]>, Sjoerd Simons <[e-mail]>
+Standards-Version: 3.9.6
 Homepage: https://wiki.gnome.org/Apps/Cheese
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/cheese/
-Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/cheese/
+Vcs-Browser: https://code.launchpad.net/~ubuntu-desktop/cheese/ubuntu
+Vcs-Bzr: lp:~ubuntu-desktop/cheese/ubuntu
 Build-Depends: cdbs (>= 0.4.93~),
                debhelper (>= 9),
                dh-autoreconf,
@@ -22,11 +21,11 @@
                gtk-doc-tools (>= 1.14),
                intltool (>= 0.50.0),
                rarian-compat,
-               valac (>= 0.23.3),
+               valac (>= 0.25.3),
                libglib2.0-dev (>= 2.39.90),
                libgdk-pixbuf2.0-dev,
-               libgtk-3-dev (>= 3.10.0),
-               libgnome-desktop-3-dev (>= 2.91.6),
+               libgtk-3-dev (>= 3.13.4),
+               libgnome-desktop-3-dev (>= 3.12),
                libgstreamer1.0-dev (>= 0.11.0),
                libgstreamer-plugins-base1.0-dev (>= 0.11.0),
                libgstreamer-plugins-good1.0-dev (>= 0.11.0),
@@ -44,7 +43,7 @@
                libxtst-dev,
                libgudev-1.0-dev [linux-any],
                pkg-config (>= 0.24),
-               appdata-tools,
+               appstream-util,
                yelp-tools
 
 Package: cheese
 
=== modified file 'debian/control.in'
--- debian/control.in	2014-07-24 07:31:08 +0000
+++ debian/control.in	2014-12-20 21:01:27 +0000
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: @GNOME_TEAM@
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: https://wiki.gnome.org/Apps/Cheese
 Vcs-Browser: https://code.launchpad.net/~ubuntu-desktop/cheese/ubuntu
 Vcs-Bzr: lp:~ubuntu-desktop/cheese/ubuntu
@@ -17,11 +17,11 @@
                gtk-doc-tools (>= 1.14),
                intltool (>= 0.50.0),
                rarian-compat,
-               valac (>= 0.23.3),
+               valac (>= 0.25.3),
                libglib2.0-dev (>= 2.39.90),
                libgdk-pixbuf2.0-dev,
-               libgtk-3-dev (>= 3.10.0),
-               libgnome-desktop-3-dev (>= 2.91.6),
+               libgtk-3-dev (>= 3.13.4),
+               libgnome-desktop-3-dev (>= 3.12),
                libgstreamer1.0-dev (>= 0.11.0),
                libgstreamer-plugins-base1.0-dev (>= 0.11.0),
                libgstreamer-plugins-good1.0-dev (>= 0.11.0),
@@ -39,7 +39,7 @@
                libxtst-dev,
                libgudev-1.0-dev [linux-any],
                pkg-config (>= 0.24),
-               appdata-tools,
+               appstream-util,
                yelp-tools
 
 Package: cheese
 
=== modified file 'debian/libcheese7.symbols'
--- debian/libcheese7.symbols	2014-05-23 10:34:42 +0000
+++ debian/libcheese7.symbols	2014-12-20 21:01:27 +0000
@@ -15,7 +15,6 @@
  cheese_camera_device_monitor_error_quark@Base 3.0.1
  cheese_camera_device_monitor_get_type@Base 3.0.1
  cheese_camera_device_monitor_new@Base 3.0.1
-#MISSING: 3.11.90-1# (arch=linux-any)cheese_camera_device_monitor_set_up_device@Base 3.4.0
  cheese_camera_device_new@Base 3.0.1
  cheese_camera_error_quark@Base 3.0.1
  cheese_camera_get_balance_property_range@Base 3.0.1
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2014-07-24 07:31:08 +0000
+++ debian/patches/series	2014-12-20 21:01:27 +0000
@@ -1,1 +1,2 @@
+substitute-bindir-and-libexecdir.patch
 use-plugins-good
 
=== added file 'debian/patches/substitute-bindir-and-libexecdir.patch'
--- debian/patches/substitute-bindir-and-libexecdir.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/substitute-bindir-and-libexecdir.patch	2014-12-20 21:01:27 +0000
@@ -0,0 +1,75 @@
+From e19f4b1a5ccd682b2d67171f29a037e0b754085b Mon Sep 17 00:00:00 2001
+From: David King <[e-mail]>
+Date: Sat, 25 Oct 2014 12:20:36 +0100
+Subject: Substitute bindir and libexecdir in Makefile.am
+
+Rather than substituting the values of libexecdir and bindir during
+configure, which might include some unexpanded shell variables, expand
+and substitute them as targets in Makefile.am instead.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=726095
+
+diff --git a/Makefile.am b/Makefile.am
+index 469e3a4..771cb74 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -367,10 +367,17 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ appstream_in_files = data/org.gnome.Cheese.appdata.xml.in
+ appstream_XML = $(appstream_in_files:.appdata.xml.in=.appdata.xml)
+ 
++data/org.gnome.Cheese.service: data/org.gnome.Cheese.service.in
++	$(AM_V_GEN)$(SED) -e "s|[@]bindir[@]|$(bindir)|" $< > $@
++
++data/org.gnome.Camera.service: data/org.gnome.Camera.service.in
++	$(AM_V_GEN)$(SED) -e "s|[@]libexecdir[@]|$(libexecdir)|" $< > $@
++
+ servicedir = $(datadir)/dbus-1/services
+-service_DATA = \
+-	data/org.gnome.Camera.service \
+-	data/org.gnome.Cheese.service
++service_in_files = \
++	data/org.gnome.Camera.service.in \
++	data/org.gnome.Cheese.service.in
++service_DATA = $(service_in_files:.service.in=.service)
+ 
+ @GSETTINGS_RULES@
+ gsettings_SCHEMAS = data/org.gnome.Cheese.gschema.xml
+@@ -534,11 +541,12 @@ dist-hook: git-changelog-hook
+ dist_noinst_DATA = \
+ 	ChangeLog.pre-git \
+ 	COPYING.GPL3 \
++	$(appstream_in_files) \
+ 	$(desktop_in_files) \
+ 	$(gsettings_SCHEMAS) \
+ 	$(noinst_gnome_camera_service_headers) \
+ 	$(noinst_resource_files) \
+-	$(appstream_in_files) \
++	$(service_in_files) \
+ 	data/org.gnome.Cheese.gresource.xml \
+ 	data/org.gnome.Camera.xml \
+ 	build-aux/test-driver \
+@@ -566,6 +574,7 @@ CLEANFILES = \
+ 	$(pkgconfig_DATA) \
+ 	$(enum_data) \
+ 	$(gir_DATA) \
++	$(service_DATA) \
+ 	$(typelib_DATA) \
+ 	$(nodist_gnome_camera_service_headers) \
+ 	$(nodist_gnome_camera_service_SOURCES) \
+diff --git a/configure.ac b/configure.ac
+index b32be22..13843f7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -215,9 +215,7 @@ docs/reference/Makefile
+ docs/reference/version.xml
+ data/cheese.pc
+ data/cheese-gtk.pc
+-data/org.gnome.Camera.service
+ data/org.gnome.Cheese.desktop.in
+-data/org.gnome.Cheese.service
+ help/Makefile
+ po/Makefile.in
+ ])
+-- 
+cgit v0.10.1
+
 
=== modified file 'debian/patches/use-plugins-good'
--- debian/patches/use-plugins-good	2014-05-23 10:34:42 +0000
+++ debian/patches/use-plugins-good	2014-12-20 21:01:27 +0000
@@ -3,27 +3,18 @@
 Forwarded: not-needed
 Last-Update: 2013-12-15
 
-Index: b/configure.ac
-===================================================================
+---
+ configure.ac |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/configure.ac
 +++ b/configure.ac
-@@ -62,8 +62,8 @@
- LIBGNOMEDESKTOP_REQUIRED="gnome-desktop-3.0 >= 2.91.6"
- GSTREAMER_VERSION=0.11.0
- GSTREAMER_REQUIRED="gstreamer-plugins-base-1.0 >= $GSTREAMER_VERSION gstreamer-1.0 >= $GSTREAMER_VERSION gstreamer-pbutils-1.0 >= $GSTREAMER_VERSION"
--GSTREAMER_PLUGINS_BAD_VERSION=0.11.0
--GSTREAMER_PLUGINS_BAD_REQUIRED="gstreamer-plugins-bad-1.0 >= $GSTREAMER_PLUGINS_BAD_VERSION"
-+GSTREAMER_PLUGINS_GOOD_VERSION=0.11.0
-+GSTREAMER_PLUGINS_GOOD_REQUIRED="gstreamer-plugins-good-1.0 >= $GSTREAMER_PLUGINS_GOOD_VERSION"
- CAIRO_REQUIRED="cairo >= 1.10.0"
- PANGOCAIRO_REQUIRED="pangocairo >= 1.28.0"
- LIBRSVG_REQUIRED="librsvg-2.0 >= 2.32.0"
-@@ -103,7 +103,7 @@
-   $X11_REQUIRED
-   $GDK_PIXBUF_REQUIRED
-   $GSTREAMER_REQUIRED
--  $GSTREAMER_PLUGINS_BAD_REQUIRED
-+  $GSTREAMER_PLUGINS_GOOD_REQUIRED
-   $LIBGNOMEDESKTOP_REQUIRED
-   $CAIRO_REQUIRED
-   $PANGOCAIRO_REQUIRED
+@@ -62,7 +62,7 @@ IT_PROG_INTLTOOL([0.50.0])
+ GLIB_REQUIRED="glib-2.0 >= 2.39.90"
+ GTK_REQUIRED="gtk+-3.0 >= 3.13.4"
+ GDK_PIXBUF_REQUIRED="gdk-pixbuf-2.0"
+-GSTREAMER_REQUIRED="gstreamer-pbutils-1.0 gstreamer-plugins-bad-1.0"
++GSTREAMER_REQUIRED="gstreamer-pbutils-1.0 gstreamer-plugins-good-1.0"
+ LIBGNOMEDESKTOP_REQUIRED="gnome-desktop-3.0"
+ CLUTTER_REQUIRED="clutter-1.0 >= 1.13.2"
+ CLUTTERGTK_REQUIRED="clutter-gtk-1.0"