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

Proposed by Jackson Doak on 2014-12-20
Status: Merged
Merge reported by: Iain Lane
Merged at revision: not available
Proposed branch: lp:~noskcaj/cheese/3.14
Merge into: lp:~ubuntu-desktop/cheese/ubuntu
Diff against target: 305 lines (+155/-39)
8 files modified
debian/changelog (+50/-1)
debian/cheese.install (+3/-1)
debian/control (+8/-9)
debian/control.in (+5/-5)
debian/libcheese7.symbols (+0/-1)
debian/patches/series (+1/-0)
debian/patches/substitute-bindir-and-libexecdir.patch (+75/-0)
debian/patches/use-plugins-good (+13/-22)
To merge this branch: bzr merge lp:~noskcaj/cheese/3.14
Reviewer Review Type Date Requested Status
Ubuntu Desktop 2014-12-20 Pending
Review via email: mp+245277@code.launchpad.net

Description of the change

Merge from debian

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-09-29 10:40:15 +0000
3+++ debian/changelog 2014-12-20 21:01:27 +0000
4@@ -1,8 +1,57 @@
5+cheese (3.14.1-2ubuntu1) vivid; urgency=low
6+
7+ * Merge from debian. Remaining changes:
8+ - Add apport hook
9+ - debian/control.in:
10+ + Build-depend on good gstreamer plugins instead of bad
11+ + Update Vcs-*
12+ - debian/patches/use-plugins-good:
13+ + The camerabin plugin is part of the good gstreamer plugins in Ubuntu
14+
15+ -- Jackson Doak <noskcaj@ubuntu.com> Fri, 07 Nov 2014 16:10:56 +0000
16+
17+cheese (3.14.1-2) unstable; urgency=medium
18+
19+ * debian/patches/substitute-bindir-and-libexecdir.patch:
20+ + Substitute @bindir@ and @libexecdir@ in service files. Fixes
21+ launching cheese from the shell. Closes: #765513.
22+
23+ -- Emilio Pozuelo Monfort <pochu@debian.org> Fri, 07 Nov 2014 12:37:43 +0100
24+
25+cheese (3.14.1-1) unstable; urgency=medium
26+
27+ * New upstream release.
28+ - Drop debian/patches/using-fmod-link-libm.patch: Applied upstream
29+ * Drop debian/patches/revert-appstream-usage.patch and build-depend against
30+ appstream-util
31+ * debian/control.in: Bump Standards-Version to 3.9.6 (no further changes)
32+
33+ -- Laurent Bigonville <bigon@debian.org> Sun, 19 Oct 2014 20:42:33 +0200
34+
35+cheese (3.14.0-1) unstable; urgency=medium
36+
37+ * New upstream release.
38+ * Add debian/patches/revert-appstream-usage.patch
39+ - we don't have appstream-glib in Debian yet...
40+ * Add debian/patches/using-fmod-link-libm.patch
41+ - libcheese-gtk now uses fmod and needs to link with libm
42+ * debian/cheese.install: Ship gnome-camera-service and dbus services files
43+ * Upload to unstable.
44+
45+ -- Andreas Henriksson <andreas@fatal.se> Wed, 24 Sep 2014 16:50:11 +0200
46+
47+cheese (3.13.90.1-1) experimental; urgency=medium
48+
49+ * New upstream release
50+ * debian/control.in: b-d on vala (>= 0.25.4)
51+
52+ -- Sjoerd Simons <sjoerd@debian.org> Thu, 11 Sep 2014 21:45:32 +0200
53+
54 cheese (3.12.2-1ubuntu2) utopic; urgency=medium
55
56 * No change rebuild for gnome-desktop 3.12
57
58- -- Tim Lunn <tim@feathertop.org> Mon, 29 Sep 2014 20:40:15 +1000
59+ -- Tim Lunn <tim@feathertop.org> Wed, 24 Sep 2014 09:47:53 +1000
60
61 cheese (3.12.2-1ubuntu1) utopic; urgency=medium
62
63
64=== modified file 'debian/cheese.install'
65--- debian/cheese.install 2014-05-23 10:34:42 +0000
66+++ debian/cheese.install 2014-12-20 21:01:27 +0000
67@@ -1,4 +1,6 @@
68 usr/bin
69 usr/share/applications
70 usr/share/man
71-usr/share/appdata/cheese.appdata.xml
72+usr/share/appdata/*.appdata.xml
73+usr/share/dbus-1/services/*.service
74+usr/lib/cheese/gnome-camera-service
75
76=== modified file 'debian/control'
77--- debian/control 2014-07-24 07:31:08 +0000
78+++ debian/control 2014-12-20 21:01:27 +0000
79@@ -2,17 +2,16 @@
80 #
81 # Modifications should be made to debian/control.in instead.
82 # This file is regenerated automatically in the clean target.
83-
84 Source: cheese
85 Section: gnome
86 Priority: optional
87 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
88 XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
89-Uploaders: Andreas Henriksson <andreas@fatal.se>, Josselin Mouette <joss@debian.org>, Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org>, Sjoerd Simons <sjoerd@debian.org>
90-Standards-Version: 3.9.5
91+Uploaders: Andreas Henriksson <andreas@fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Laurent Bigonville <bigon@debian.org>, Sjoerd Simons <sjoerd@debian.org>
92+Standards-Version: 3.9.6
93 Homepage: https://wiki.gnome.org/Apps/Cheese
94-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/cheese/
95-Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/cheese/
96+Vcs-Browser: https://code.launchpad.net/~ubuntu-desktop/cheese/ubuntu
97+Vcs-Bzr: lp:~ubuntu-desktop/cheese/ubuntu
98 Build-Depends: cdbs (>= 0.4.93~),
99 debhelper (>= 9),
100 dh-autoreconf,
101@@ -22,11 +21,11 @@
102 gtk-doc-tools (>= 1.14),
103 intltool (>= 0.50.0),
104 rarian-compat,
105- valac (>= 0.23.3),
106+ valac (>= 0.25.3),
107 libglib2.0-dev (>= 2.39.90),
108 libgdk-pixbuf2.0-dev,
109- libgtk-3-dev (>= 3.10.0),
110- libgnome-desktop-3-dev (>= 2.91.6),
111+ libgtk-3-dev (>= 3.13.4),
112+ libgnome-desktop-3-dev (>= 3.12),
113 libgstreamer1.0-dev (>= 0.11.0),
114 libgstreamer-plugins-base1.0-dev (>= 0.11.0),
115 libgstreamer-plugins-good1.0-dev (>= 0.11.0),
116@@ -44,7 +43,7 @@
117 libxtst-dev,
118 libgudev-1.0-dev [linux-any],
119 pkg-config (>= 0.24),
120- appdata-tools,
121+ appstream-util,
122 yelp-tools
123
124 Package: cheese
125
126=== modified file 'debian/control.in'
127--- debian/control.in 2014-07-24 07:31:08 +0000
128+++ debian/control.in 2014-12-20 21:01:27 +0000
129@@ -4,7 +4,7 @@
130 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
131 XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
132 Uploaders: @GNOME_TEAM@
133-Standards-Version: 3.9.5
134+Standards-Version: 3.9.6
135 Homepage: https://wiki.gnome.org/Apps/Cheese
136 Vcs-Browser: https://code.launchpad.net/~ubuntu-desktop/cheese/ubuntu
137 Vcs-Bzr: lp:~ubuntu-desktop/cheese/ubuntu
138@@ -17,11 +17,11 @@
139 gtk-doc-tools (>= 1.14),
140 intltool (>= 0.50.0),
141 rarian-compat,
142- valac (>= 0.23.3),
143+ valac (>= 0.25.3),
144 libglib2.0-dev (>= 2.39.90),
145 libgdk-pixbuf2.0-dev,
146- libgtk-3-dev (>= 3.10.0),
147- libgnome-desktop-3-dev (>= 2.91.6),
148+ libgtk-3-dev (>= 3.13.4),
149+ libgnome-desktop-3-dev (>= 3.12),
150 libgstreamer1.0-dev (>= 0.11.0),
151 libgstreamer-plugins-base1.0-dev (>= 0.11.0),
152 libgstreamer-plugins-good1.0-dev (>= 0.11.0),
153@@ -39,7 +39,7 @@
154 libxtst-dev,
155 libgudev-1.0-dev [linux-any],
156 pkg-config (>= 0.24),
157- appdata-tools,
158+ appstream-util,
159 yelp-tools
160
161 Package: cheese
162
163=== modified file 'debian/libcheese7.symbols'
164--- debian/libcheese7.symbols 2014-05-23 10:34:42 +0000
165+++ debian/libcheese7.symbols 2014-12-20 21:01:27 +0000
166@@ -15,7 +15,6 @@
167 cheese_camera_device_monitor_error_quark@Base 3.0.1
168 cheese_camera_device_monitor_get_type@Base 3.0.1
169 cheese_camera_device_monitor_new@Base 3.0.1
170-#MISSING: 3.11.90-1# (arch=linux-any)cheese_camera_device_monitor_set_up_device@Base 3.4.0
171 cheese_camera_device_new@Base 3.0.1
172 cheese_camera_error_quark@Base 3.0.1
173 cheese_camera_get_balance_property_range@Base 3.0.1
174
175=== modified file 'debian/patches/series'
176--- debian/patches/series 2014-07-24 07:31:08 +0000
177+++ debian/patches/series 2014-12-20 21:01:27 +0000
178@@ -1,1 +1,2 @@
179+substitute-bindir-and-libexecdir.patch
180 use-plugins-good
181
182=== added file 'debian/patches/substitute-bindir-and-libexecdir.patch'
183--- debian/patches/substitute-bindir-and-libexecdir.patch 1970-01-01 00:00:00 +0000
184+++ debian/patches/substitute-bindir-and-libexecdir.patch 2014-12-20 21:01:27 +0000
185@@ -0,0 +1,75 @@
186+From e19f4b1a5ccd682b2d67171f29a037e0b754085b Mon Sep 17 00:00:00 2001
187+From: David King <amigadave@amigadave.com>
188+Date: Sat, 25 Oct 2014 12:20:36 +0100
189+Subject: Substitute bindir and libexecdir in Makefile.am
190+
191+Rather than substituting the values of libexecdir and bindir during
192+configure, which might include some unexpanded shell variables, expand
193+and substitute them as targets in Makefile.am instead.
194+
195+https://bugzilla.gnome.org/show_bug.cgi?id=726095
196+
197+diff --git a/Makefile.am b/Makefile.am
198+index 469e3a4..771cb74 100644
199+--- a/Makefile.am
200++++ b/Makefile.am
201+@@ -367,10 +367,17 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
202+ appstream_in_files = data/org.gnome.Cheese.appdata.xml.in
203+ appstream_XML = $(appstream_in_files:.appdata.xml.in=.appdata.xml)
204+
205++data/org.gnome.Cheese.service: data/org.gnome.Cheese.service.in
206++ $(AM_V_GEN)$(SED) -e "s|[@]bindir[@]|$(bindir)|" $< > $@
207++
208++data/org.gnome.Camera.service: data/org.gnome.Camera.service.in
209++ $(AM_V_GEN)$(SED) -e "s|[@]libexecdir[@]|$(libexecdir)|" $< > $@
210++
211+ servicedir = $(datadir)/dbus-1/services
212+-service_DATA = \
213+- data/org.gnome.Camera.service \
214+- data/org.gnome.Cheese.service
215++service_in_files = \
216++ data/org.gnome.Camera.service.in \
217++ data/org.gnome.Cheese.service.in
218++service_DATA = $(service_in_files:.service.in=.service)
219+
220+ @GSETTINGS_RULES@
221+ gsettings_SCHEMAS = data/org.gnome.Cheese.gschema.xml
222+@@ -534,11 +541,12 @@ dist-hook: git-changelog-hook
223+ dist_noinst_DATA = \
224+ ChangeLog.pre-git \
225+ COPYING.GPL3 \
226++ $(appstream_in_files) \
227+ $(desktop_in_files) \
228+ $(gsettings_SCHEMAS) \
229+ $(noinst_gnome_camera_service_headers) \
230+ $(noinst_resource_files) \
231+- $(appstream_in_files) \
232++ $(service_in_files) \
233+ data/org.gnome.Cheese.gresource.xml \
234+ data/org.gnome.Camera.xml \
235+ build-aux/test-driver \
236+@@ -566,6 +574,7 @@ CLEANFILES = \
237+ $(pkgconfig_DATA) \
238+ $(enum_data) \
239+ $(gir_DATA) \
240++ $(service_DATA) \
241+ $(typelib_DATA) \
242+ $(nodist_gnome_camera_service_headers) \
243+ $(nodist_gnome_camera_service_SOURCES) \
244+diff --git a/configure.ac b/configure.ac
245+index b32be22..13843f7 100644
246+--- a/configure.ac
247++++ b/configure.ac
248+@@ -215,9 +215,7 @@ docs/reference/Makefile
249+ docs/reference/version.xml
250+ data/cheese.pc
251+ data/cheese-gtk.pc
252+-data/org.gnome.Camera.service
253+ data/org.gnome.Cheese.desktop.in
254+-data/org.gnome.Cheese.service
255+ help/Makefile
256+ po/Makefile.in
257+ ])
258+--
259+cgit v0.10.1
260+
261
262=== modified file 'debian/patches/use-plugins-good'
263--- debian/patches/use-plugins-good 2014-05-23 10:34:42 +0000
264+++ debian/patches/use-plugins-good 2014-12-20 21:01:27 +0000
265@@ -3,27 +3,18 @@
266 Forwarded: not-needed
267 Last-Update: 2013-12-15
268
269-Index: b/configure.ac
270-===================================================================
271+---
272+ configure.ac | 2 +-
273+ 1 file changed, 1 insertion(+), 1 deletion(-)
274+
275 --- a/configure.ac
276 +++ b/configure.ac
277-@@ -62,8 +62,8 @@
278- LIBGNOMEDESKTOP_REQUIRED="gnome-desktop-3.0 >= 2.91.6"
279- GSTREAMER_VERSION=0.11.0
280- GSTREAMER_REQUIRED="gstreamer-plugins-base-1.0 >= $GSTREAMER_VERSION gstreamer-1.0 >= $GSTREAMER_VERSION gstreamer-pbutils-1.0 >= $GSTREAMER_VERSION"
281--GSTREAMER_PLUGINS_BAD_VERSION=0.11.0
282--GSTREAMER_PLUGINS_BAD_REQUIRED="gstreamer-plugins-bad-1.0 >= $GSTREAMER_PLUGINS_BAD_VERSION"
283-+GSTREAMER_PLUGINS_GOOD_VERSION=0.11.0
284-+GSTREAMER_PLUGINS_GOOD_REQUIRED="gstreamer-plugins-good-1.0 >= $GSTREAMER_PLUGINS_GOOD_VERSION"
285- CAIRO_REQUIRED="cairo >= 1.10.0"
286- PANGOCAIRO_REQUIRED="pangocairo >= 1.28.0"
287- LIBRSVG_REQUIRED="librsvg-2.0 >= 2.32.0"
288-@@ -103,7 +103,7 @@
289- $X11_REQUIRED
290- $GDK_PIXBUF_REQUIRED
291- $GSTREAMER_REQUIRED
292-- $GSTREAMER_PLUGINS_BAD_REQUIRED
293-+ $GSTREAMER_PLUGINS_GOOD_REQUIRED
294- $LIBGNOMEDESKTOP_REQUIRED
295- $CAIRO_REQUIRED
296- $PANGOCAIRO_REQUIRED
297+@@ -62,7 +62,7 @@ IT_PROG_INTLTOOL([0.50.0])
298+ GLIB_REQUIRED="glib-2.0 >= 2.39.90"
299+ GTK_REQUIRED="gtk+-3.0 >= 3.13.4"
300+ GDK_PIXBUF_REQUIRED="gdk-pixbuf-2.0"
301+-GSTREAMER_REQUIRED="gstreamer-pbutils-1.0 gstreamer-plugins-bad-1.0"
302++GSTREAMER_REQUIRED="gstreamer-pbutils-1.0 gstreamer-plugins-good-1.0"
303+ LIBGNOMEDESKTOP_REQUIRED="gnome-desktop-3.0"
304+ CLUTTER_REQUIRED="clutter-1.0 >= 1.13.2"
305+ CLUTTERGTK_REQUIRED="clutter-gtk-1.0"

Subscribers

People subscribed via source and target branches

to all changes: