diff options
author | Jens Georg <jensg@openismus.com> | 2012-10-11 14:39:52 +0200 |
---|---|---|
committer | Jens Georg <jensg@openismus.com> | 2012-10-29 15:12:16 +0100 |
commit | 31286503060ee551fb57944d5cdc0ed3b32c0a80 (patch) | |
tree | e6bf4aa5468fcf0bc489eed35ce692ab0af9dfb3 /data | |
parent | f1efab32566cbeaba3bab20fd0a692dec48fe5db (diff) | |
download | rygel-31286503060ee551fb57944d5cdc0ed3b32c0a80.tar.gz |
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
Diffstat (limited to 'data')
-rw-r--r-- | data/xml/Makefile.am | 6 | ||||
-rw-r--r-- | data/xml/MediaRenderer2.xml.in.in (renamed from data/xml/MediaRenderer2.xml.in) | 6 | ||||
-rw-r--r-- | data/xml/MediaServer2.xml.in | 22 | ||||
-rw-r--r-- | data/xml/MediaServer3.xml.in.in | 22 |
4 files changed, 28 insertions, 28 deletions
diff --git a/data/xml/Makefile.am b/data/xml/Makefile.am index db064617..d35f3e4d 100644 --- 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 index 52232852..02904df9 100644 --- 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 index b341e13c..00000000 --- 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 index 00000000..8f02727c --- /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> |