← Back to branch summary

~ubuntu-branches/debian/sid/cheese/sid

« back to all changes in this revision

Viewing changes to debian/patches/revert-appstream-usage.patch

  • Committer: Package Import Robot
  • Author(s): Laurent Bigonville
  • Date: 2014-10-19 20:42:33 UTC
  • mfrom: (1.6.9)
  • Revision ID: package-import@ubuntu.com-20141019204233-crj6dccep3y7mxd8
Tags: 3.14.1-1
* 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)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/revert-appstream-usage.patch
1
 
From: Andreas Henriksson <andreas@fatal.se>
2
 
Subject: Revert back to using appdata
3
 
 
4
 
This reverts upstream commit
5
 
"Use APPSTREAM_XML instead of APPDATA_XML"
6
 
 
7
 
 
8
 
--- a/Makefile.am
9
 
+++ b/Makefile.am
10
 
@@ -361,10 +361,10 @@ desktopdir = $(datadir)/applications
11
 
 desktop_in_files = data/org.gnome.Cheese.desktop.in
12
 
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
13
 
 
14
 
-@APPSTREAM_XML_RULES@
15
 
+@APPDATA_XML_RULES@
16
 
 @INTLTOOL_XML_RULE@
17
 
-appstream_in_files = data/org.gnome.Cheese.appdata.xml.in
18
 
-appstream_XML = $(appstream_in_files:.appdata.xml.in=.appdata.xml)
19
 
+appdata_in_files = data/org.gnome.Cheese.appdata.xml.in
20
 
+appdata_XML = $(appdata_in_files:.appdata.xml.in=.appdata.xml)
21
 
 
22
 
 servicedir = $(datadir)/dbus-1/services
23
 
 service_DATA = \
24
 
@@ -537,7 +537,7 @@ dist_noinst_DATA = \
25
 
        $(gsettings_SCHEMAS) \
26
 
        $(noinst_gnome_camera_service_headers) \
27
 
        $(noinst_resource_files) \
28
 
-       $(appstream_in_files) \
29
 
+       $(appdata_in_files) \
30
 
        data/org.gnome.Cheese.gresource.xml \
31
 
        data/org.gnome.Camera.xml \
32
 
        build-aux/test-driver \
33
 
--- a/configure.ac
34
 
+++ b/configure.ac
35
 
@@ -200,7 +200,7 @@ AM_CONDITIONAL([ENABLE_MAN], [test "x$have_manutils" = "xyes"])
36
 
 YELP_HELP_INIT
37
 
 
38
 
 # AppData
39
 
-APPSTREAM_XML
40
 
+APPDATA_XML
41
 
 
42
 
 GLIB_GSETTINGS
43
 
 #*******************************************************************************