AppStream: Mark .appdata.xml for translation
authorDominique Leuenberger <dimstar@opensuse.org>
Sun, 4 Sep 2016 14:05:47 +0000 (16:05 +0200)
committerJean-Baptiste Kempf <jb@videolan.org>
Wed, 7 Sep 2016 13:20:00 +0000 (15:20 +0200)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
configure.ac
po/POTFILES.in
share/.gitignore
share/Makefile.am
share/vlc.appdata.xml.in [deleted file]
share/vlc.appdata.xml.in.in [new file with mode: 0644]

index 5d93964..91b9315 100644 (file)
@@ -493,7 +493,7 @@ AS_IF([test "${enable_shared}" = "no" -a "${enable_vlc}" != "no"], [
 dnl
 dnl Gettext stuff
 dnl
-AM_GNU_GETTEXT_VERSION([0.19.6])
+AM_GNU_GETTEXT_VERSION([0.19.7])
 AM_GNU_GETTEXT([external], [need-formatstring-macros])
 
 dnl
@@ -4255,6 +4255,7 @@ AC_CONFIG_FILES([
   modules/gui/qt/Makefile
   modules/gui/skins2/Makefile
   modules/hw/mmal/Makefile
+  share/vlc.appdata.xml.in
 ])
 
 AM_COND_IF([HAVE_WIN32], [
index 352ab03..757094b 100644 (file)
@@ -1192,6 +1192,7 @@ modules/visualization/visual/fft.h
 modules/visualization/visual/visual.c
 modules/visualization/visual/visual.h
 modules/visualization/vsxu.cpp
+share/vlc.appdata.xml
 share/lua/http/dialogs/batch_window.html
 share/lua/http/dialogs/browse_window.html
 share/lua/http/dialogs/create_stream.html
index c3deb60..53ba52c 100644 (file)
@@ -1 +1,3 @@
 vlc.desktop
+vlc.appdata.xml
+vlc.appdata.xml.in
index b30d69c..a595ef3 100644 (file)
@@ -8,8 +8,12 @@ if !HAVE_DARWIN
 desktop_DATA = vlc.desktop
 endif
 endif
+appdatadir = $(datarootdir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+appdata_in_files = vlc.appdata.xml.in
+
 EXTRA_DIST += vlc.desktop.in vlc.desktop.mimetypes
-CLEANFILES += $(desktop_DATA)
+CLEANFILES += $(desktop_DATA) $(appdata_DATA)
 
 vlc.desktop: vlc.desktop.in $(top_builddir)/config.status
        $(AM_V_GEN)sed -e 's,\@bindir\@,$(bindir),g' < "$<" > tmp-$@
@@ -17,8 +21,8 @@ vlc.desktop: vlc.desktop.in $(top_builddir)/config.status
        $(AM_V_at)$(DESKTOP_FILE_VALIDATE) tmp-$@
        $(AM_V_at)mv -f tmp-$@ $@
 
-vlc.appdata.xml: vlc.appdata.xml.in $(top_builddir)/config.status
-       cd $(top_builddir) && $(SHELL) ./config.status --file=$(subdir)/$@
+vlc.appdata.xml: vlc.appdata.xml.in
+       $(AM_V_GEN)$(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
 iconsdatadir = $(datadir)/icons/hicolor
 icons16dir = $(iconsdatadir)/16x16/apps
diff --git a/share/vlc.appdata.xml.in b/share/vlc.appdata.xml.in
deleted file mode 100644 (file)
index 1212595..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2016 Jean-Baptiste Kempf -->
-
-<component type="desktop">
-    <id>vlc.desktop</id>
-    <metadata_license>CC0-1.0</metadata_license>
-    <name>VLC</name>
-    <summary>VLC media player, the open-source multimedia player</summary>
-    <description>
-        <p>
-            VLC is a free and open source cross-platform multimedia player and
-            framework that plays most multimedia files as well as DVDs, Audio CDs,
-            VCDs, and various streaming protocols.
-        </p>
-    </description>
-    <url type="homepage">https://www.videolan.org/vlc/</url>
-    <url type="bugtracker">https://trac.videolan.org/vlc/</url>
-    <url type="donation">https://www.videolan.org/contribute.html</url>
-    <releases>
-        <release version="@VERSION@" />
-    </releases>
-    <provides>
-        <library>libvlc.so.5</library>
-    </provides>
-    <project_group>VideoLAN</project_group>
-    <project_license>GPL-2.0+</project_license>
-    <developer_name>VideoLAN et al.</developer_name>
-    <update_contact>vlc-devel -- videolan.org</update_contact>
-    <screenshots>
-        <screenshot type="default">http://images.videolan.org/vlc/screenshots/2.0.0/vlc-2.0-poney.jpg</screenshot>
-        <screenshot type="default">http://images.videolan.org/vlc/screenshots/2.0.0/vlc-2.0-gnome3-open.jpg</screenshot>
-        <screenshot type="default">http://images.videolan.org/vlc/screenshots/2.0.0/vlc-2.0-gnome3-debian.jpg</screenshot>
-    </screenshots>
-</component>
diff --git a/share/vlc.appdata.xml.in.in b/share/vlc.appdata.xml.in.in
new file mode 100644 (file)
index 0000000..1212595
--- /dev/null
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2016 Jean-Baptiste Kempf -->
+
+<component type="desktop">
+    <id>vlc.desktop</id>
+    <metadata_license>CC0-1.0</metadata_license>
+    <name>VLC</name>
+    <summary>VLC media player, the open-source multimedia player</summary>
+    <description>
+        <p>
+            VLC is a free and open source cross-platform multimedia player and
+            framework that plays most multimedia files as well as DVDs, Audio CDs,
+            VCDs, and various streaming protocols.
+        </p>
+    </description>
+    <url type="homepage">https://www.videolan.org/vlc/</url>
+    <url type="bugtracker">https://trac.videolan.org/vlc/</url>
+    <url type="donation">https://www.videolan.org/contribute.html</url>
+    <releases>
+        <release version="@VERSION@" />
+    </releases>
+    <provides>
+        <library>libvlc.so.5</library>
+    </provides>
+    <project_group>VideoLAN</project_group>
+    <project_license>GPL-2.0+</project_license>
+    <developer_name>VideoLAN et al.</developer_name>
+    <update_contact>vlc-devel -- videolan.org</update_contact>
+    <screenshots>
+        <screenshot type="default">http://images.videolan.org/vlc/screenshots/2.0.0/vlc-2.0-poney.jpg</screenshot>
+        <screenshot type="default">http://images.videolan.org/vlc/screenshots/2.0.0/vlc-2.0-gnome3-open.jpg</screenshot>
+        <screenshot type="default">http://images.videolan.org/vlc/screenshots/2.0.0/vlc-2.0-gnome3-debian.jpg</screenshot>
+    </screenshots>
+</component>