1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147 | diff -Nru swell-foop-3.14.0/debian/changelog swell-foop-3.14.0/debian/changelog
--- swell-foop-3.14.0/debian/changelog 2014-09-26 03:30:26.000000000 +1000
+++ swell-foop-3.14.0/debian/changelog 2015-02-25 19:45:41.000000000 +1100
@@ -1,3 +1,10 @@
+swell-foop (1:3.14.0-1ubuntu1) vivid; urgency=medium
+
+ * Add upstream patch to use appstream-util over appdata-tools
+ * Switch build-dep to appstream-util
+
+ -- Jackson Doak <noskcaj@ubuntu.com> Wed, 25 Feb 2015 19:42:30 +1100
+
swell-foop (1:3.14.0-1) unstable; urgency=medium
* New upstream release.
diff -Nru swell-foop-3.14.0/debian/control swell-foop-3.14.0/debian/control
--- swell-foop-3.14.0/debian/control 2014-09-26 03:31:11.000000000 +1000
+++ swell-foop-3.14.0/debian/control 2015-02-25 19:47:24.000000000 +1100
@@ -5,15 +5,16 @@
Source: swell-foop
Section: games
Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas@fatal.se>, Emilio Pozuelo Monfort <pochu@debian.org>, Jordi Mallach <jordi@debian.org>, Michael Biebl <biebl@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Uploaders: Andreas Henriksson <andreas@fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Jordi Mallach <jordi@debian.org>, Michael Biebl <biebl@debian.org>
Homepage: https://wiki.gnome.org/Swell%20Foop
Build-Depends: cdbs (>= 0.4.90~),
debhelper (>= 8),
dh-autoreconf,
gnome-common,
gnome-pkg-tools (>= 0.6),
- appdata-tools,
+ appstream-util,
libclutter-1.0-dev (>= 1.14.0),
libclutter-gtk-1.0-dev (>= 1.5.0),
libglib2.0-dev (>= 2.36.0),
diff -Nru swell-foop-3.14.0/debian/control.in swell-foop-3.14.0/debian/control.in
--- swell-foop-3.14.0/debian/control.in 2014-09-26 03:28:50.000000000 +1000
+++ swell-foop-3.14.0/debian/control.in 2015-02-25 19:47:22.000000000 +1100
@@ -1,7 +1,8 @@
Source: swell-foop
Section: games
Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
Homepage: https://wiki.gnome.org/Swell%20Foop
Build-Depends: cdbs (>= 0.4.90~),
@@ -9,7 +10,7 @@
dh-autoreconf,
gnome-common,
gnome-pkg-tools (>= 0.6),
- appdata-tools,
+ appstream-util,
libclutter-1.0-dev (>= 1.14.0),
libclutter-gtk-1.0-dev (>= 1.5.0),
libglib2.0-dev (>= 2.36.0),
diff -Nru swell-foop-3.14.0/debian/patches/git_appstream-util.patch swell-foop-3.14.0/debian/patches/git_appstream-util.patch
--- swell-foop-3.14.0/debian/patches/git_appstream-util.patch 1970-01-01 10:00:00.000000000 +1000
+++ swell-foop-3.14.0/debian/patches/git_appstream-util.patch 2015-02-25 19:38:03.000000000 +1100
@@ -0,0 +1,78 @@
+From af779bb8c68ad520d87602a8fecc98a91ed3a549 Mon Sep 17 00:00:00 2001
+From: Robert Roth <robert.roth.off@gmail.com>
+Date: Mon, 15 Dec 2014 21:12:01 +0200
+Subject: Switch to appstream util validate from appdata validation
+
+
+diff --git a/configure.ac b/configure.ac
+index d742935..a570121 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -11,6 +11,8 @@ AM_PROG_CC_C_O
+
+ GLIB_GSETTINGS
+
++APPSTREAM_XML
++
+ dnl ###########################################################################
+ dnl Dependencies
+ dnl ###########################################################################
+@@ -30,7 +32,6 @@ PKG_CHECK_MODULES(SWELL_FOOP, [
+
+ AC_CHECK_LIB([m],[floor])
+
+-AC_PATH_PROG([APPDATA_VALIDATE], [appdata-validate], [/bin/true])
+ AC_PATH_PROG([DESKTOP_FILE_VALIDATE], [desktop-file-validate], [/bin/true])
+
+ dnl ###########################################################################
+diff --git a/data/Makefile.am b/data/Makefile.am
+index b547fe8..d744154 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -13,23 +13,24 @@ desktopdir = $(datadir)/applications
+ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ @INTLTOOL_DESKTOP_RULE@
+
+-appdatadir = $(datadir)/appdata
+-appdata_in_files = swell-foop.appdata.xml.in
+-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
++appstream_in_files = swell-foop.appdata.xml.in
++appstream_XML = $(appstream_in_files:.xml.in=.xml)
++@APPSTREAM_XML_RULES@
+ @INTLTOOL_XML_RULE@
+
+ EXTRA_DIST = \
+- $(appdata_in_files) \
++ $(appstream_in_files) \
+ $(swell_DATA) \
+ $(gsettings_SCHEMAS) \
+ $(desktop_in_files)
+
+ CLEANFILES = \
+- $(appdata_DATA) \
++ $(appstream_XML) \
+ $(desktop_DATA)
+
+-check-local: $(appdata_DATA) $(desktop_DATA)
+- $(APPDATA_VALIDATE) $(appdata_DATA)
++check-local: $(desktop_DATA)
+ $(DESKTOP_FILE_VALIDATE) $(desktop_DATA)
+
++DISTCHECK_CONFIGURE_FLAGS = --enable-appdata-check
++
+ -include $(top_srcdir)/git.mk
+diff --git a/data/swell-foop.appdata.xml.in b/data/swell-foop.appdata.xml.in
+index 4970586..654d032 100644
+--- a/data/swell-foop.appdata.xml.in
++++ b/data/swell-foop.appdata.xml.in
+@@ -4,6 +4,8 @@
+ <id type="desktop">swell-foop.desktop</id>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>GPL-2.0+ and GFDL-1.1</project_license>
++ <_name>Swell Foop</_name>
++ <_summary>Clear the screen by removing groups of colored and shaped tiles</_summary>
+ <description>
+ <_p>
+ Remove as many squares as possible from the board. Click on a group of
+--
+cgit v0.10.2
\ No newline at end of file
diff -Nru swell-foop-3.14.0/debian/patches/series swell-foop-3.14.0/debian/patches/series
--- swell-foop-3.14.0/debian/patches/series 1970-01-01 10:00:00.000000000 +1000
+++ swell-foop-3.14.0/debian/patches/series 2015-02-25 19:37:14.000000000 +1100
@@ -0,0 +1 @@
+git_appstream-util.patch
|