[Pkg-privacy-commits] [tails-installer] 01/03: Move the appdata file to data where it belongs

[Intrigeri]

This is an automated email from the git hooks/post-receive script.

intrigeri pushed a commit to tag 3.95.1
in repository tails-installer.

commit e4c905e7308d26f80a7719032c3094a6197bd48d
Author: Martin Briza <mbriza at redhat.com>
Date:   Tue May 10 14:32:55 2016 +0200

    Move the appdata file to data where it belongs
---
 data/liveusb-creator.appdata.xml | 43 +++++++++++++++-------------------------
 liveusb-creator.appdata.xml      | 20 -------------------
 liveusb-creator.spec             |  5 +----
 3 files changed, 17 insertions(+), 51 deletions(-)

diff --git a/data/liveusb-creator.appdata.xml b/data/liveusb-creator.appdata.xml
index 783c873..0633334 100644
--- a/data/liveusb-creator.appdata.xml
+++ b/data/liveusb-creator.appdata.xml
@@ -1,31 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Richard Hughes <richard at hughsie.com> -->
+<!-- Copyright 2016 Jiri Eischmann <eischmann at redhat.com> -->
 
 <application>
-  <id type="desktop">liveusb-creator.desktop</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-2.0</project_license>
-  <name>LiveUSB Creator</name>
-  <summary>Write operating system images to a USB device</summary>
-  <description>
-    <p>
-      The LiveUSB Creator is a tool for easily installing live operating systems
-      on to USB flash drives.
-    </p>
-    <p>
-      Live USB Creator detects all of your removable devices and supports a
-      completely non-destructive install.
-      There is no need to deal with formatting or partitioning your USB key.
-      You can also allocate extra space on your USB stick, allowing you to save
-      files and make modifications to your live operating system that will
-      persist after you reboot.
-      This essentially lets you carry your own personalized Fedora with you at
-      all times.
-    </p>
-  </description>
-  <url type="homepage">https://fedorahosted.org/liveusb-creator/</url>
-  <screenshots>
-    <screenshot type="default">https://lmacken.fedorapeople.org/img/liveusb-creator-3.13.png</screenshot>
-  </screenshots>
-  <updatecontact>lmacken at redhat.com</updatecontact>
+	<id type="desktop">liveusb-creator.desktop</id>
+	<metadata_license>CC0-1.0</metadata_license>
+	<name>Fedora Media Writer</name>
+	<summary>A tool to create a live USB drive with an edition of Fedora</summary>
+	<description>
+		<p>A tool to create a bootable live USB drive with an edition of Fedora. Not only can Fedora Media Writer write an image to your flash drive, it can also download it for you. It offers official editions (Server, Workstation), Fedora spins (KDE Plasma Desktop, Xfce Desktop, Cinnamon Desktop,...), and Fedora Labs (Design Suite, Security Lab,...). It provides basic information about each of them to help you make the right choice.</p>
+		<p>Fedora Media Writer can also write other bootable ISOs loaded from your local disk, but keep in mind that it's only tested with Fedora images.</p>
+	</description>
+	<keywords>iso,fedora,usb,writer,live,spin,creator</keywords>
+	<url type="homepage">https://fedorahosted.org/liveusb-creator</url>
+	<screenshots>
+		<screenshot type="default">https://github.com/lmacken/liveusb-creator/raw/develop/screenshots/screenshot1.png</screenshot>
+		<screenshot>https://github.com/lmacken/liveusb-creator/raw/develop/screenshots/screenshot2.png</screenshot>
+	</screenshots>
+	<updatecontact>mbriza at redhat.com</updatecontact>
 </application>
diff --git a/liveusb-creator.appdata.xml b/liveusb-creator.appdata.xml
deleted file mode 100644
index 0633334..0000000
--- a/liveusb-creator.appdata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2016 Jiri Eischmann <eischmann at redhat.com> -->
-
-<application>
-	<id type="desktop">liveusb-creator.desktop</id>
-	<metadata_license>CC0-1.0</metadata_license>
-	<name>Fedora Media Writer</name>
-	<summary>A tool to create a live USB drive with an edition of Fedora</summary>
-	<description>
-		<p>A tool to create a bootable live USB drive with an edition of Fedora. Not only can Fedora Media Writer write an image to your flash drive, it can also download it for you. It offers official editions (Server, Workstation), Fedora spins (KDE Plasma Desktop, Xfce Desktop, Cinnamon Desktop,...), and Fedora Labs (Design Suite, Security Lab,...). It provides basic information about each of them to help you make the right choice.</p>
-		<p>Fedora Media Writer can also write other bootable ISOs loaded from your local disk, but keep in mind that it's only tested with Fedora images.</p>
-	</description>
-	<keywords>iso,fedora,usb,writer,live,spin,creator</keywords>
-	<url type="homepage">https://fedorahosted.org/liveusb-creator</url>
-	<screenshots>
-		<screenshot type="default">https://github.com/lmacken/liveusb-creator/raw/develop/screenshots/screenshot1.png</screenshot>
-		<screenshot>https://github.com/lmacken/liveusb-creator/raw/develop/screenshots/screenshot2.png</screenshot>
-	</screenshots>
-	<updatecontact>mbriza at redhat.com</updatecontact>
-</application>
diff --git a/liveusb-creator.spec b/liveusb-creator.spec
index d5502e9..a150bc7 100644
--- a/liveusb-creator.spec
+++ b/liveusb-creator.spec
@@ -57,7 +57,7 @@ rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
 #Adding the AppStream metadata file
-install -Dm 0644 -p liveusb-creator.appdata.xml \
+install -Dm 0644 -p data/liveusb-creator.appdata.xml \
 	%{buildroot}%{_datadir}/appdata/liveusb-creator.appdata.xml
 
 # polkit stuff
@@ -99,9 +99,6 @@ rm -rf %{buildroot}
 #%{_datadir}/locale/*/LC_MESSAGES/liveusb-creator.mo
 %{_datadir}/polkit-1/actions/org.fedoraproject.pkexec.run-liveusb-creator.policy
 
-#AppStream metadata
-%{_datadir}/appdata/liveusb-creator.appdata.xml
-
 %changelog
 * Mon Apr 25 2016 Martin Briza <mbriza at redhat.com> - 3.95.0
 - Set the QML imports to require at least Qt 5.3

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git