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

Proposed by Robert Ancell
Status: Merged
Approved by: Iain Lane
Approved revision: 12877
Merged at revision: 12879
Proposed branch: lp:~robert-ancell/unity-control-center/appdata
Merge into: lp:unity-control-center
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
Reviewer Review Type Date Requested Status
Iain Lane Approve
Review via email: mp+310155@code.launchpad.net

Commit message

Add AppData

To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) wrote :
Revision history for this message
Iain Lane (laney) wrote :

Ok, looks good enough to merge, thanks!

Couple of comments

  - Are translations going to work?
  - Would be nice to have a screenshot

Can address those later.

review: Approve
Revision history for this message
Robert Ancell (robert-ancell) wrote :

I think translations should work. Yeah, a screenshot would be useful.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'configure.ac'
--- configure.ac 2016-02-16 15:26:59 +0000
+++ configure.ac 2016-11-07 01:15:03 +0000
@@ -493,6 +493,7 @@
493panels/wacom/calibrator/Makefile493panels/wacom/calibrator/Makefile
494panels/wacom/unity-wacom-panel.desktop.in494panels/wacom/unity-wacom-panel.desktop.in
495po/Makefile.in495po/Makefile.in
496shell/appdata/Makefile
496shell/Makefile497shell/Makefile
497shell/unity-control-center.desktop.in498shell/unity-control-center.desktop.in
498man/Makefile499man/Makefile
499500
=== modified file 'debian/unity-control-center.install'
--- debian/unity-control-center.install 2015-08-11 09:45:47 +0000
+++ debian/unity-control-center.install 2016-11-07 01:15:03 +0000
@@ -2,6 +2,7 @@
2usr/bin2usr/bin
3usr/lib/*/unity-control-center-1/panels/*.so3usr/lib/*/unity-control-center-1/panels/*.so
4usr/lib/*/libgnome-bluetooth.so.*4usr/lib/*/libgnome-bluetooth.so.*
5usr/share/appdata
5usr/share/applications6usr/share/applications
6usr/share/bash-completion7usr/share/bash-completion
7usr/share/man8usr/share/man
89
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in 2015-08-11 10:59:19 +0000
+++ po/POTFILES.in 2016-11-07 01:15:03 +0000
@@ -133,6 +133,7 @@
133[type: gettext/glade]panels/wacom/gnome-wacom-properties.ui133[type: gettext/glade]panels/wacom/gnome-wacom-properties.ui
134panels/wacom/gsd-wacom-device.c134panels/wacom/gsd-wacom-device.c
135[type: gettext/glade]panels/wacom/wacom-stylus-page.ui135[type: gettext/glade]panels/wacom/wacom-stylus-page.ui
136shell/appdata/unity-control-center.appdata.xml.in
136shell/cc-shell-nav-bar.c137shell/cc-shell-nav-bar.c
137shell/control-center.c138shell/control-center.c
138shell/unity-control-center.desktop.in.in139shell/unity-control-center.desktop.in.in
139140
=== modified file 'shell/Makefile.am'
--- shell/Makefile.am 2014-02-24 17:28:38 +0000
+++ shell/Makefile.am 2016-11-07 01:15:03 +0000
@@ -1,3 +1,5 @@
1SUBDIRS = appdata
2
1INCLUDES = \3INCLUDES = \
2 -I$(top_srcdir) \4 -I$(top_srcdir) \
3 $(SHELL_CFLAGS) \5 $(SHELL_CFLAGS) \
46
=== added directory 'shell/appdata'
=== added file 'shell/appdata/Makefile.am'
--- shell/appdata/Makefile.am 1970-01-01 00:00:00 +0000
+++ shell/appdata/Makefile.am 2016-11-07 01:15:03 +0000
@@ -0,0 +1,13 @@
1@INTLTOOL_XML_RULE@
2appdatadir = $(datadir)/appdata
3appdata_DATA = $(appdata_in_files:.xml.in=.xml)
4appdata_in_files = \
5 unity-control-center.appdata.xml.in
6
7test:
8EXTRA_DIST = $(appdata_in_files)
9
10CLEANFILES = \
11 unity-control-center.appdata.xml
12
13-include $(top_srcdir)/git.mk
014
=== added file 'shell/appdata/unity-control-center.appdata.xml.in'
--- shell/appdata/unity-control-center.appdata.xml.in 1970-01-01 00:00:00 +0000
+++ shell/appdata/unity-control-center.appdata.xml.in 2016-11-07 01:15:03 +0000
@@ -0,0 +1,23 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<component type="desktop">
3 <id>unity-control-center.desktop</id>
4 <metadata_license>CC0-1.0</metadata_license>
5 <project_license>GPL-2.0+</project_license>
6 <_name>Unity Control Center</_name>
7 <_summary>Utilities to configure the Unity desktop</_summary>
8 <description>
9 <_p>
10 The control center is Unity’s main interface for configuration of various
11 aspects of your desktop.
12 </_p>
13 </description>
14 <url type="bugtracker">https://launchpad.net/ubuntu/+source/unity-control-center</url>
15 <compulsory_for_desktop>Unity</compulsory_for_desktop>
16 <kudos>
17 <kudo>AppMenu</kudo>
18 <kudo>HiDpiIcon</kudo>
19 <kudo>ModernToolkit</kudo>
20 <kudo>SearchProvider</kudo>
21 </kudos>
22 <translation type="gettext">unity-control-center</translation>
23</component>

Subscribers

People subscribed via source and target branches