Merge lp:~robert-ancell/unity-control-center/appdata-16.10 into lp:unity-control-center/16.10

Proposed by Robert Ancell on 2016-11-07
Status: Merged
Approved by: Iain Lane on 2017-02-13
Approved revision: 12877
Merged at revision: 12880
Proposed branch: lp:~robert-ancell/unity-control-center/appdata-16.10
Merge into: lp:unity-control-center/16.10
Diff against target: 92 lines (+41/-0)
6 files modified
configure.ac (+1/-0)
debian/unity-control-center.install (+1/-0)
po/POTFILES.in (+1/-0)
shell/Makefile.am (+2/-0)
shell/appdata/Makefile.am (+13/-0)
shell/appdata/unity-control-center.appdata.xml.in (+23/-0)
To merge this branch: bzr merge lp:~robert-ancell/unity-control-center/appdata-16.10
Reviewer Review Type Date Requested Status
Unity Control Center development team 2016-11-07 Pending
Review via email: mp+310159@code.launchpad.net

Commit message

Add AppData

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 'configure.ac'
2--- configure.ac 2016-02-16 15:26:59 +0000
3+++ configure.ac 2016-11-07 01:47:38 +0000
4@@ -493,6 +493,7 @@
5 panels/wacom/calibrator/Makefile
6 panels/wacom/unity-wacom-panel.desktop.in
7 po/Makefile.in
8+shell/appdata/Makefile
9 shell/Makefile
10 shell/unity-control-center.desktop.in
11 man/Makefile
12
13=== modified file 'debian/unity-control-center.install'
14--- debian/unity-control-center.install 2015-08-11 09:45:47 +0000
15+++ debian/unity-control-center.install 2016-11-07 01:47:38 +0000
16@@ -2,6 +2,7 @@
17 usr/bin
18 usr/lib/*/unity-control-center-1/panels/*.so
19 usr/lib/*/libgnome-bluetooth.so.*
20+usr/share/appdata
21 usr/share/applications
22 usr/share/bash-completion
23 usr/share/man
24
25=== modified file 'po/POTFILES.in'
26--- po/POTFILES.in 2015-08-11 10:59:19 +0000
27+++ po/POTFILES.in 2016-11-07 01:47:38 +0000
28@@ -133,6 +133,7 @@
29 [type: gettext/glade]panels/wacom/gnome-wacom-properties.ui
30 panels/wacom/gsd-wacom-device.c
31 [type: gettext/glade]panels/wacom/wacom-stylus-page.ui
32+shell/appdata/unity-control-center.appdata.xml.in
33 shell/cc-shell-nav-bar.c
34 shell/control-center.c
35 shell/unity-control-center.desktop.in.in
36
37=== modified file 'shell/Makefile.am'
38--- shell/Makefile.am 2014-02-24 17:28:38 +0000
39+++ shell/Makefile.am 2016-11-07 01:47:38 +0000
40@@ -1,3 +1,5 @@
41+SUBDIRS = appdata
42+
43 INCLUDES = \
44 -I$(top_srcdir) \
45 $(SHELL_CFLAGS) \
46
47=== added directory 'shell/appdata'
48=== added file 'shell/appdata/Makefile.am'
49--- shell/appdata/Makefile.am 1970-01-01 00:00:00 +0000
50+++ shell/appdata/Makefile.am 2016-11-07 01:47:38 +0000
51@@ -0,0 +1,13 @@
52+@INTLTOOL_XML_RULE@
53+appdatadir = $(datadir)/appdata
54+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
55+appdata_in_files = \
56+ unity-control-center.appdata.xml.in
57+
58+test:
59+EXTRA_DIST = $(appdata_in_files)
60+
61+CLEANFILES = \
62+ unity-control-center.appdata.xml
63+
64+-include $(top_srcdir)/git.mk
65
66=== added file 'shell/appdata/unity-control-center.appdata.xml.in'
67--- shell/appdata/unity-control-center.appdata.xml.in 1970-01-01 00:00:00 +0000
68+++ shell/appdata/unity-control-center.appdata.xml.in 2016-11-07 01:47:38 +0000
69@@ -0,0 +1,23 @@
70+<?xml version="1.0" encoding="UTF-8"?>
71+<component type="desktop">
72+ <id>unity-control-center.desktop</id>
73+ <metadata_license>CC0-1.0</metadata_license>
74+ <project_license>GPL-2.0+</project_license>
75+ <_name>Unity Control Center</_name>
76+ <_summary>Utilities to configure the Unity desktop</_summary>
77+ <description>
78+ <_p>
79+ The control center is Unity’s main interface for configuration of various
80+ aspects of your desktop.
81+ </_p>
82+ </description>
83+ <url type="bugtracker">https://launchpad.net/ubuntu/+source/unity-control-center</url>
84+ <compulsory_for_desktop>Unity</compulsory_for_desktop>
85+ <kudos>
86+ <kudo>AppMenu</kudo>
87+ <kudo>HiDpiIcon</kudo>
88+ <kudo>ModernToolkit</kudo>
89+ <kudo>SearchProvider</kudo>
90+ </kudos>
91+ <translation type="gettext">unity-control-center</translation>
92+</component>

Subscribers

People subscribed via source and target branches