data: Bump MediaServer version to 3

Also use version and website from build in the device template.

Fixes:
    https://bugzilla.gnome.org/show_bug.cgi?id=679023

diff --git a/configure.ac b/configure.ac
index 30a8bc8..183756a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -286,6 +286,8 @@ src/media-engines/simple/Makefile
 src/plugins/Makefile
 data/Makefile
 data/xml/Makefile
+data/xml/MediaServer3.xml.in
+data/xml/MediaRenderer2.xml.in
 data/icons/Makefile
 data/icons/32x32/Makefile
 data/icons/48x48/Makefile

diff --git a/data/xml/Makefile.am b/data/xml/Makefile.am
index db06461..d35f3e4 100644 (file)
--- a/data/xml/Makefile.am
+++ b/data/xml/Makefile.am
@@ -1,4 +1,4 @@
-xml_in_files = MediaServer2.xml.in \
+xml_in_files = MediaServer3.xml.in \
                MediaRenderer2.xml.in \
                ContentDirectory.xml.in \
                ConnectionManager.xml.in \
@@ -14,7 +14,7 @@ xml_DATA = $(xml_in_files:.xml.in=.xml)
 
 xmldir = $(datadir)/rygel/xml
 
-EXTRA_DIST = $(xml_in_files)
+EXTRA_DIST = $(xml_in_files) MediaServer3.xml.in.in MediaRenderer2.xml.in.in
 CLEANFILES = $(xml_DATA)
 
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = Makefile.in MediaServer3.xml.in MediaRenderer2.xml.in

diff --git a/data/xml/MediaRenderer2.xml.in b/data/xml/MediaRenderer2.xml.in.in
similarity index 74%
rename from data/xml/MediaRenderer2.xml.in
rename to data/xml/MediaRenderer2.xml.in.in
index 5223285..02904df 100644 (file)
--- a/data/xml/MediaRenderer2.xml.in
+++ b/data/xml/MediaRenderer2.xml.in.in
@@ -8,10 +8,10 @@
     <deviceType>urn:schemas-upnp-org:device:MediaRenderer:2</deviceType>
     <friendlyName></friendlyName>
     <manufacturer>Rygel Developers</manufacturer>
-    <manufacturerURL>http://live.gnome.org/Rygel</manufacturerURL>
+    <manufacturerURL>@PACKAGE_URL@</manufacturerURL>
     <modelName>Rygel</modelName>
-    <modelNumber>0.1</modelNumber>
-    <modelURL>http://live.gnome.org/Rygel</modelURL>
+    <modelNumber>@VERSION@</modelNumber>
+    <modelURL>@PACKAGE_URL@</modelURL>
     <UDN></UDN>
     <serviceList>
     </serviceList>

diff --git a/data/xml/MediaServer2.xml.in b/data/xml/MediaServer2.xml.in
deleted file mode 100644 (file)
index b341e13..0000000
--- a/data/xml/MediaServer2.xml.in
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<root xmlns="urn:schemas-upnp-org:device-1-0" xmlns:dlna="urn:schemas-dlna-org:device-1-0">
-<specVersion>
-<major>1</major>
-<minor>0</minor>
-</specVersion>
-<device>
-<deviceType>urn:schemas-upnp-org:device:MediaServer:2</deviceType>
-<UDN></UDN>
-<friendlyName></friendlyName>
-<manufacturer>Rygel Developers.</manufacturer>
-<manufacturerURL>http://live.gnome.org/Rygel</manufacturerURL>
-<modelName>Rygel</modelName>
-<modelNumber>0.1</modelNumber>
-<serialNumber>0000001</serialNumber>
-<serviceList>
-</serviceList>
-<dlna:X_DLNADOC>DMS-1.50</dlna:X_DLNADOC>
-<dlna:X_DLNADOC>M-DMS-1.50</dlna:X_DLNADOC>
-<dlna:X_DLNACAP>av-upload,image-upload,audio-upload,create-item-with-OCM-destroy-item</dlna:X_DLNACAP>
-</device>
-</root>

diff --git a/data/xml/MediaServer3.xml.in.in b/data/xml/MediaServer3.xml.in.in
new file mode 100644 (file)
index 0000000..8f02727
--- /dev/null
+++ b/data/xml/MediaServer3.xml.in.in
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<root xmlns="urn:schemas-upnp-org:device-1-0" xmlns:dlna="urn:schemas-dlna-org:device-1-0">
+  <specVersion>
+    <major>1</major>
+    <minor>0</minor>
+  </specVersion>
+  <device>
+    <deviceType>urn:schemas-upnp-org:device:MediaServer:3</deviceType>
+    <UDN></UDN>
+    <friendlyName></friendlyName>
+    <manufacturer>Rygel Developers.</manufacturer>
+    <manufacturerURL>@PACKAGE_URL@</manufacturerURL>
+    <modelName>Rygel</modelName>
+    <modelNumber>@VERSION@</modelNumber>
+    <serialNumber>0000001</serialNumber>
+    <serviceList>
+    </serviceList>
+    <dlna:X_DLNADOC>DMS-1.50</dlna:X_DLNADOC>
+    <dlna:X_DLNADOC>M-DMS-1.50</dlna:X_DLNADOC>
+    <dlna:X_DLNACAP>av-upload,image-upload,audio-upload,create-item-with-OCM-destroy-item</dlna:X_DLNACAP>
+  </device>
+</root>

diff --git a/po/POTFILES.in b/po/POTFILES.in
index f299add..75a1964 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,8 +8,8 @@ data/rygel.desktop.in.in
 data/xml/AVTransport2.xml.in
 data/xml/ConnectionManager.xml.in
 data/xml/ContentDirectory.xml.in
-data/xml/MediaRenderer2.xml.in
-data/xml/MediaServer2.xml.in
+data/xml/MediaRenderer2.xml.in.in
+data/xml/MediaServer3.xml.in.in
 data/xml/RenderingControl2.xml.in
 src/plugins/external/rygel-external-container.vala
 src/plugins/external/rygel-external-icon-factory.vala