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

[Jackson Doak]

Merge from debian

[Robert Ancell (robert-ancell)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-26 18:05:42 +0000
+++ debian/changelog	2015-06-01 21:32:26 +0000
@@ -1,3 +1,34 @@
+cheese (3.16.1-1ubuntu1) wily; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Add apport hook
+    - debian/control.in:
+      + Build-depend on good gstreamer plugins instead of bad
+    - debian/patches/use-plugins-good:
+      + The camerabin plugin is part of the good gstreamer plugins in Ubuntu
+    - Use support in gnome-pkg-tools to install a compatibility version of
+      cheese.desktop, which was renamed upstream.
+    - Switch gnome-icon-theme to adwaita-icon-theme, which is its successor.
+
+ -- Jackson Doak <[e-mail]>  Tue, 02 Jun 2015 07:12:47 +1000
+
+cheese (3.16.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Drop debian/patches/substitute-bindir-and-libexecdir.patch, merged
+    upstream.
+  * Drop obsolete Breaks/Replaces from pre-wheezy.
+  * Install typelib files into multiarch paths.
+  * Mark gir and dev packages as Multi-Arch: same.
+
+ -- Michael Biebl <[e-mail]>  Wed, 27 May 2015 02:23:00 +0200
+
+cheese (3.14.1-2ubuntu4) vivid; urgency=medium
+
+  * Drop appdata-tools patch, switch b-dep to appstream-util. It's in main now
+
+ -- Jackson Doak <[e-mail]>  Sat, 14 Feb 2015 07:54:28 +1100
+
 cheese (3.14.1-2ubuntu3) vivid; urgency=medium
 
   * Switch gnome-icon-theme to adwaita-icon-theme, which is its

=== modified file 'debian/control'
--- debian/control	2015-01-26 18:05:42 +0000
+++ debian/control	2015-06-01 21:32:26 +0000
@@ -7,7 +7,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
-Uploaders: Andreas Henriksson <[e-mail]>, Debian GNOME Maintainers <[e-mail]>, Emilio Pozuelo Monfort <[e-mail]>, Laurent Bigonville <[e-mail]>, Sjoerd Simons <[e-mail]>
+Uploaders: Andreas Henriksson <[e-mail]>, Debian GNOME Maintainers <[e-mail]>, Emilio Pozuelo Monfort <[e-mail]>, Laurent Bigonville <[e-mail]>, Michael Biebl <[e-mail]>, Sjoerd Simons <[e-mail]>
 Standards-Version: 3.9.6
 Homepage: https://wiki.gnome.org/Apps/Cheese
 Vcs-Browser: https://code.launchpad.net/~ubuntu-desktop/cheese/ubuntu
@@ -43,7 +43,7 @@
                libxtst-dev,
                libgudev-1.0-dev [linux-any],
                pkg-config (>= 0.24),
-               appdata-tools,
+               appstream-util,
                yelp-tools
 
 Package: cheese
@@ -68,8 +68,6 @@
 Package: cheese-common
 Architecture: all
 Depends: ${misc:Depends}
-Replaces: cheese (<< 2.30.1-1)
-Breaks: cheese (<< 2.30.1-1)
 Multi-Arch: foreign
 Description: Common files for the Cheese tool to take pictures and videos
  A webcam application that supports image and video capture. Makes
@@ -82,13 +80,13 @@
 
 Package: libcheese-gtk23
 Architecture: any
+Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          gstreamer1.0-clutter,
          cheese-common (= ${source:Version})
 Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
 Description: tool to take pictures and videos from your webcam - widgets
  A webcam application that supports image and video capture. Makes
  it easy to take photos and videos of you, your friends, pets or whatever
@@ -100,6 +98,7 @@
 
 Package: libcheese-gtk-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: libcheese-gtk23 (= ${binary:Version}),
          libcheese-dev (= ${binary:Version}),
@@ -122,6 +121,7 @@
 
 Package: libcheese7
 Architecture: any
+Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends},
@@ -130,7 +130,6 @@
          gstreamer1.0-plugins-good (>= 0.11.0),
          gstreamer1.0-x
 Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
 Description: tool to take pictures and videos from your webcam - base library
  A webcam application that supports image and video capture. Makes
  it easy to take photos and videos of you, your friends, pets or whatever
@@ -142,6 +141,7 @@
 
 Package: libcheese-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: libcheese7 (= ${binary:Version}),
          gir1.2-cheese-3.0 (= ${binary:Version}),
@@ -153,8 +153,6 @@
          libgdk-pixbuf2.0-dev,
          ${misc:Depends}
 Suggests: libcheese-doc
-Replaces: libcheese-gtk-dev (<< 3.0.1-1)
-Breaks: libcheese-gtk-dev (<< 3.0.1-1)
 Description: tool to take pictures and videos from your webcam - base dev
  A webcam application that supports image and video capture. Makes
  it easy to take photos and videos of you, your friends, pets or whatever
@@ -169,8 +167,6 @@
 Section: doc
 Depends: ${misc:Depends}
 Suggests: devhelp
-Replaces: libcheese-gtk-dev (<< 3.2.2-2)
-Breaks: libcheese-gtk-dev (<< 3.2.2-2)
 Description: tool to take pictures and videos from your webcam - documentation
  A webcam application that supports image and video capture. Makes
  it easy to take photos and videos of you, your friends, pets or whatever
@@ -182,6 +178,7 @@
 
 Package: gir1.2-cheese-3.0
 Architecture: any
+Multi-Arch: same
 Section: introspection
 Depends: ${misc:Depends},
          ${gir:Depends}

=== modified file 'debian/control.in'
--- debian/control.in	2015-01-26 18:05:42 +0000
+++ debian/control.in	2015-06-01 21:32:26 +0000
@@ -39,7 +39,7 @@
                libxtst-dev,
                libgudev-1.0-dev [linux-any],
                pkg-config (>= 0.24),
-               appdata-tools,
+               appstream-util,
                yelp-tools
 
 Package: cheese
@@ -64,8 +64,6 @@
 Package: cheese-common
 Architecture: all
 Depends: ${misc:Depends}
-Replaces: cheese (<< 2.30.1-1)
-Breaks: cheese (<< 2.30.1-1)
 Multi-Arch: foreign
 Description: Common files for the Cheese tool to take pictures and videos
  A webcam application that supports image and video capture. Makes
@@ -78,13 +76,13 @@
 
 Package: libcheese-gtk23
 Architecture: any
+Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          gstreamer1.0-clutter,
          cheese-common (= ${source:Version})
 Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
 Description: tool to take pictures and videos from your webcam - widgets
  A webcam application that supports image and video capture. Makes
  it easy to take photos and videos of you, your friends, pets or whatever
@@ -96,6 +94,7 @@
 
 Package: libcheese-gtk-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: libcheese-gtk23 (= ${binary:Version}),
          libcheese-dev (= ${binary:Version}),
@@ -118,6 +117,7 @@
 
 Package: libcheese7
 Architecture: any
+Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends},
@@ -126,7 +126,6 @@
          gstreamer1.0-plugins-good (>= 0.11.0),
          gstreamer1.0-x
 Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
 Description: tool to take pictures and videos from your webcam - base library
  A webcam application that supports image and video capture. Makes
  it easy to take photos and videos of you, your friends, pets or whatever
@@ -138,6 +137,7 @@
 
 Package: libcheese-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: libcheese7 (= ${binary:Version}),
          gir1.2-cheese-3.0 (= ${binary:Version}),
@@ -149,8 +149,6 @@
          libgdk-pixbuf2.0-dev,
          ${misc:Depends}
 Suggests: libcheese-doc
-Replaces: libcheese-gtk-dev (<< 3.0.1-1)
-Breaks: libcheese-gtk-dev (<< 3.0.1-1)
 Description: tool to take pictures and videos from your webcam - base dev
  A webcam application that supports image and video capture. Makes
  it easy to take photos and videos of you, your friends, pets or whatever
@@ -165,8 +163,6 @@
 Section: doc
 Depends: ${misc:Depends}
 Suggests: devhelp
-Replaces: libcheese-gtk-dev (<< 3.2.2-2)
-Breaks: libcheese-gtk-dev (<< 3.2.2-2)
 Description: tool to take pictures and videos from your webcam - documentation
  A webcam application that supports image and video capture. Makes
  it easy to take photos and videos of you, your friends, pets or whatever
@@ -178,6 +174,7 @@
 
 Package: gir1.2-cheese-3.0
 Architecture: any
+Multi-Arch: same
 Section: introspection
 Depends: ${misc:Depends},
          ${gir:Depends}

=== modified file 'debian/gir1.2-cheese-3.0.install'
--- debian/gir1.2-cheese-3.0.install	2011-12-27 20:09:40 +0000
+++ debian/gir1.2-cheese-3.0.install	2015-06-01 21:32:26 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/girepository-1.0 usr/lib/
+usr/lib/*/girepository-1.0

=== removed file 'debian/patches/appdata-tools'
--- debian/patches/appdata-tools	2015-01-26 18:05:42 +0000
+++ debian/patches/appdata-tools	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-Description: We can't use APPSTREAM_XML until we get appstream-util in main
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=768269
-Forwarded: not-needed
-Author: Iain Lane <[e-mail]>
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -203,7 +203,7 @@
- YELP_HELP_INIT
- 
- # AppData
--APPSTREAM_XML
-+APPDATA_XML
- 
- GLIB_GSETTINGS
- #*******************************************************************************
-Index: b/Makefile.am
-===================================================================
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -362,10 +362,10 @@
- desktop_in_files = data/org.gnome.Cheese.desktop.in
- desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- 
--@APPSTREAM_XML_RULES@
-+@APPDATA_XML_RULES@
- @INTLTOOL_XML_RULE@
--appstream_in_files = data/org.gnome.Cheese.appdata.xml.in
--appstream_XML = $(appstream_in_files:.appdata.xml.in=.appdata.xml)
-+appdata_in_files = data/org.gnome.Cheese.appdata.xml.in
-+appdata_XML = $(appdata_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)|" $< > $@
-@@ -541,7 +541,7 @@
- dist_noinst_DATA = \
- 	ChangeLog.pre-git \
- 	COPYING.GPL3 \
--	$(appstream_in_files) \
-+	$(appdata_in_files) \
- 	$(desktop_in_files) \
- 	$(gsettings_SCHEMAS) \
- 	$(noinst_gnome_camera_service_headers) \

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-01-26 18:05:42 +0000
+++ debian/patches/series	2015-06-01 21:32:26 +0000
@@ -1,3 +1,1 @@
-substitute-bindir-and-libexecdir.patch
 use-plugins-good
-appdata-tools

=== removed file 'debian/patches/substitute-bindir-and-libexecdir.patch'
--- debian/patches/substitute-bindir-and-libexecdir.patch	2015-01-05 12:28:54 +0000
+++ debian/patches/substitute-bindir-and-libexecdir.patch	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-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	2015-01-05 12:28:54 +0000
+++ debian/patches/use-plugins-good	2015-06-01 21:32:26 +0000
@@ -3,11 +3,13 @@
 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,7 +62,7 @@
+@@ -63,7 +63,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"