← Back to branch summary

~ubuntu-branches/ubuntu/wily/swell-foop/wily

« back to all changes in this revision

Viewing changes to debian/patches/git_appstream-util.patch

  • Committer: Package Import Robot
  • Author(s): Andreas Henriksson
  • Date: 2015-05-19 14:54:40 UTC
  • mfrom: (4.1.1 sid)
  • Revision ID: package-import@ubuntu.com-20150519145440-5gvlqn2aijuq2xzw
Tags: 1:3.16.1-1
* New upstream release.
* Switch build-dependency from appdata-tools to appstream-util

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/git_appstream-util.patch
1
 
From af779bb8c68ad520d87602a8fecc98a91ed3a549 Mon Sep 17 00:00:00 2001
2
 
From: Robert Roth <robert.roth.off@gmail.com>
3
 
Date: Mon, 15 Dec 2014 21:12:01 +0200
4
 
Subject: Switch to appstream util validate from appdata validation
5
 
 
6
 
 
7
 
Index: swell-foop-3.14.0/configure.ac
8
 
===================================================================
9
 
--- swell-foop-3.14.0.orig/configure.ac
10
 
+++ swell-foop-3.14.0/configure.ac
11
 
@@ -11,6 +11,8 @@ AM_PROG_CC_C_O
12
 
 
13
 
 GLIB_GSETTINGS
14
 
 
15
 
+APPSTREAM_XML
16
 
+
17
 
 dnl ###########################################################################
18
 
 dnl Dependencies
19
 
 dnl ###########################################################################
20
 
@@ -30,7 +32,6 @@ PKG_CHECK_MODULES(SWELL_FOOP, [
21
 
 
22
 
 AC_CHECK_LIB([m],[floor])
23
 
 
24
 
-AC_PATH_PROG([APPDATA_VALIDATE], [appdata-validate], [/bin/true])
25
 
 AC_PATH_PROG([DESKTOP_FILE_VALIDATE], [desktop-file-validate], [/bin/true])
26
 
 
27
 
 dnl ###########################################################################
28
 
Index: swell-foop-3.14.0/data/Makefile.am
29
 
===================================================================
30
 
--- swell-foop-3.14.0.orig/data/Makefile.am
31
 
+++ swell-foop-3.14.0/data/Makefile.am
32
 
@@ -12,23 +12,24 @@ desktopdir = $(datadir)/applications
33
 
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
34
 
 @INTLTOOL_DESKTOP_RULE@
35
 
 
36
 
-appdatadir = $(datadir)/appdata
37
 
-appdata_in_files = swell-foop.appdata.xml.in
38
 
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
39
 
+appstream_in_files = swell-foop.appdata.xml.in
40
 
+appstream_XML = $(appstream_in_files:.xml.in=.xml)
41
 
+@APPSTREAM_XML_RULES@
42
 
 @INTLTOOL_XML_RULE@
43
 
 
44
 
 EXTRA_DIST = \
45
 
-    $(appdata_in_files) \
46
 
+    $(appstream_in_files) \
47
 
     $(swell_DATA) \
48
 
     $(gsettings_SCHEMAS) \
49
 
     $(desktop_in_files)
50
 
 
51
 
 CLEANFILES = \
52
 
-       $(appdata_DATA) \
53
 
+       $(appstream_XML) \
54
 
        $(desktop_DATA)
55
 
 
56
 
-check-local: $(appdata_DATA) $(desktop_DATA)
57
 
-       $(APPDATA_VALIDATE) $(appdata_DATA)
58
 
+check-local: $(desktop_DATA)
59
 
        $(DESKTOP_FILE_VALIDATE) $(desktop_DATA)
60
 
 
61
 
+DISTCHECK_CONFIGURE_FLAGS = --enable-appdata-check
62
 
+
63
 
 -include $(top_srcdir)/git.mk
64
 
Index: swell-foop-3.14.0/data/swell-foop.appdata.xml.in
65
 
===================================================================
66
 
--- swell-foop-3.14.0.orig/data/swell-foop.appdata.xml.in
67
 
+++ swell-foop-3.14.0/data/swell-foop.appdata.xml.in
68
 
@@ -4,6 +4,8 @@
69
 
  <id type="desktop">swell-foop.desktop</id>
70
 
  <metadata_license>CC0-1.0</metadata_license>
71
 
  <project_license>GPL-2.0+ and GFDL-1.1</project_license>
72
 
+ <_name>Swell Foop</_name>
73
 
+ <_summary>Clear the screen by removing groups of colored and shaped tiles</_summary>
74
 
  <description>
75
 
   <_p>
76
 
    Remove as many squares as possible from the board. Click on a group of