Merge lp:~kiwinote/app-install-data-ubuntu/update-menu-data-additional into lp:app-install-data-ubuntu

[Kiwinote]

This branch updates menu-data-additional/* for current oneiric.

[Michael Vogt (mvo)]

Thanks, looks great!

That should go into oneiric-proposed, its probably worth collecting a few more fixes along the way
as the package is a big upload/download for the users.

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-08 08:18:59 +0000
+++ debian/changelog	2011-09-28 15:57:28 +0000
@@ -1,4 +1,18 @@
-app-install-data-ubuntu (0.11.10.5) UNRELEASED; urgency=low
+app-install-data-ubuntu (0.11.10.6) UNRELEASED; urgency=low
+
+  [ Kiwinote ]
+  * update menu-data-additional:
+    - remove gnome-office as it seems not to be in oneiric anymore
+    - update gnome-utils section to universe
+    - update nvidia-glx-* to point to nvidia-*
+    - remove the openoffice meta package as we're libreoffice these days
+    - update openclipart-openoffice.org to openclipart-libreoffice
+    - remove totem-xine as it's gone in oneiric
+    - remove excessive wine as it's available in menu-data itself
+
+ -- Colin Watson <[e-mail]>  Thu, 08 Sep 2011 09:17:51 +0100
+
+app-install-data-ubuntu (0.11.10.5) oneiric; urgency=low
 
   [ Jacob Johan Edwards ]
   * Updated the custom ubufox icon to match 10.04+ branding (LP: #725487).

=== removed file 'menu-data-additional/gnome-office.desktop'
--- menu-data-additional/gnome-office.desktop	2010-01-11 10:13:43 +0000
+++ menu-data-additional/gnome-office.desktop	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Comment=This is a set of applications labeled the "GNOME Office suite".
-Name=Gnome Office 
-Encoding=UTF-8
-Terminal=false
-Type=Application
-Categories=GNOME;Application;Office
-Icon=applications-office
-X-AppInstall-Package=gnome-office
-X-AppInstall-Popcon=0
-X-AppInstall-Section=universe

=== modified file 'menu-data-additional/gnome-utils.desktop'
--- menu-data-additional/gnome-utils.desktop	2011-08-02 07:34:30 +0000
+++ menu-data-additional/gnome-utils.desktop	2011-09-28 15:57:28 +0000
@@ -1,7 +1,7 @@
 [Desktop Entry]
 X-AppInstall-Package=gnome-utils
 X-AppInstall-Popcon=56918
-X-AppInstall-Section=main
+X-AppInstall-Section=universe
 
 Name=GNOME Desktop Utilities
 Comment=Dictionary, Disk Usage Analyzer, Log File Viewer, Search Tool

=== removed file 'menu-data-additional/icons/wine.svg'
--- menu-data-additional/icons/wine.svg	2009-10-05 19:59:41 +0000
+++ menu-data-additional/icons/wine.svg	1970-01-01 00:00:00 +0000
@@ -1,371 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="48"
-   height="48"
-   id="svg2">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient4402">
-      <stop
-         id="stop4404"
-         style="stop-color:#e80000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4406"
-         style="stop-color:#490000;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="27.216721"
-       y1="15.98358"
-       x2="22.035772"
-       y2="7.1351838"
-       id="linearGradient4400"
-       xlink:href="#linearGradient4402"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3452">
-      <stop
-         id="stop3454"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3456"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3442">
-      <stop
-         id="stop3444"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3446"
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3373">
-      <stop
-         id="stop3375"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3377"
-         style="stop-color:#373737;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3346">
-      <stop
-         id="stop3348"
-         style="stop-color:#737373;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3350"
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3228">
-      <stop
-         id="stop3230"
-         style="stop-color:#373737;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3232"
-         style="stop-color:#373737;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3220">
-      <stop
-         id="stop3222"
-         style="stop-color:#373737;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3224"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3198">
-      <stop
-         id="stop3200"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3202"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3189">
-      <stop
-         id="stop3191"
-         style="stop-color:#e40000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3193"
-         style="stop-color:#490000;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3171">
-      <stop
-         id="stop3173"
-         style="stop-color:#fd0000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3175"
-         style="stop-color:#6a0000;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="26.625"
-       cy="26.577381"
-       r="12.5"
-       fx="26.625"
-       fy="26.577381"
-       id="radialGradient3187"
-       xlink:href="#linearGradient3189"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4717199,-0.4836227,0.1784028,0.5276254,-15.853782,25.128759)" />
-    <linearGradient
-       x1="30.376078"
-       y1="25.270369"
-       x2="22"
-       y2="19"
-       id="linearGradient3206"
-       xlink:href="#linearGradient3198"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5439563,0,0,1.5428223,-13.002754,-11.785278)" />
-    <linearGradient
-       x1="29"
-       y1="33"
-       x2="19"
-       y2="27"
-       id="linearGradient3226"
-       xlink:href="#linearGradient3220"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.551329,0,0,1.529349,-13.231894,-11.862931)" />
-    <linearGradient
-       x1="29.454559"
-       y1="19.121878"
-       x2="21.439751"
-       y2="9.2769918"
-       id="linearGradient3234"
-       xlink:href="#linearGradient3228"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="25.26918"
-       y1="12.037592"
-       x2="17.79917"
-       y2="5.0354052"
-       id="linearGradient3244"
-       xlink:href="#linearGradient3198"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="17.604616"
-       y1="18.3125"
-       x2="23"
-       y2="18.3125"
-       id="linearGradient3274"
-       xlink:href="#linearGradient3198"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.551329,0,0,1.5293489,-11.904902,-12.881536)" />
-    <radialGradient
-       cx="27.5"
-       cy="22.61413"
-       r="6.5"
-       fx="27.5"
-       fy="22.61413"
-       id="radialGradient3361"
-       xlink:href="#linearGradient3346"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.3866597,-0.117642,0.1489799,2.9373862,-39.572536,-38.349836)" />
-    <filter
-       height="1.336"
-       y="-0.168"
-       width="1.1344"
-       x="-0.067199998"
-       id="filter3391">
-      <feGaussianBlur
-         id="feGaussianBlur3393"
-         stdDeviation="0.14"
-         inkscape:collect="always" />
-    </filter>
-    <filter
-       height="1.2801698"
-       y="-0.14008497"
-       width="1.1580106"
-       x="-0.079005308"
-       id="filter3436">
-      <feGaussianBlur
-         id="feGaussianBlur3438"
-         stdDeviation="0.3190069"
-         inkscape:collect="always" />
-    </filter>
-    <linearGradient
-       x1="16"
-       y1="27.5"
-       x2="20.5"
-       y2="25.5"
-       id="linearGradient3440"
-       xlink:href="#linearGradient3373"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-8.0000004,15.967633)" />
-    <linearGradient
-       x1="16"
-       y1="27"
-       x2="21.5"
-       y2="27"
-       id="linearGradient3448"
-       xlink:href="#linearGradient3442"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-8.0000004,15.967633)" />
-    <radialGradient
-       cx="18"
-       cy="14.18971"
-       r="5.5054908"
-       fx="18"
-       fy="14.18971"
-       id="radialGradient3458"
-       xlink:href="#linearGradient3452"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.551329,0,0,0.2811779,-0.8402834,14.539516)" />
-    <radialGradient
-       cx="25.01705"
-       cy="13.191627"
-       r="9.7513494"
-       fx="25.01705"
-       fy="13.191627"
-       id="radialGradient5790"
-       xlink:href="#linearGradient3171"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.4950025,0,5.5549725)" />
-    <linearGradient
-       id="linearGradient4333">
-      <stop
-         id="stop4335"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4337"
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="37.375"
-       cy="33.1875"
-       r="14.625"
-       fx="37.375"
-       fy="33.1875"
-       id="radialGradient7042"
-       xlink:href="#linearGradient4333"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.226496,0,25.67067)" />
-  </defs>
-  <g
-     id="layer8">
-    <path
-       d="M 52,33.1875 A 14.625,3.3125 0 1 1 22.75,33.1875 A 14.625,3.3125 0 1 1 52,33.1875 z"
-       transform="matrix(0.6310473,0,0,0.6898995,-0.6006231,-1.7902006)"
-       id="path4331"
-       style="opacity:0.07000002;fill:url(#radialGradient7042);fill-opacity:1;stroke:none;stroke-width:1.00199997;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1" />
-    <g
-       transform="matrix(0.7031669,0,0,0.7031669,41.202675,31.783137)"
-       id="g2637"
-       style="display:inline" />
-  </g>
-  <g
-     id="layer4"
-     style="display:inline">
-    <path
-       d="M 27.43751,11 A 4.4375095,2.1843002 0 1 1 18.56249,11 A 4.4375095,2.1843002 0 1 1 27.43751,11 z"
-       transform="matrix(1.9227697,0,0,1.4097191,-20.223704,28.471946)"
-       id="path3420"
-       style="opacity:0.2;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.61406273;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;display:inline;filter:url(#filter3436)" />
-  </g>
-  <g
-     id="layer1"
-     style="display:inline">
-    <path
-       d="M 31.756645,4.1952333 C 30.98098,2.6658844 17.01902,2.6658844 16.243355,4.1952333 C 16.243355,6.4892566 13.916362,13.371327 13.916362,19.488722 C 13.916362,25.606118 21.673007,29.42949 24,29.42949 C 26.326993,29.42949 34.083638,25.606118 34.083638,19.488722 C 34.083638,13.371327 31.756645,6.4892566 31.756645,4.1952333 z"
-       id="path3159"
-       style="fill:url(#radialGradient3361);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="M 27.0341,11 A 4.0340996,1.0994399 0 1 1 18.9659,11 A 4.0340996,1.0994399 0 1 1 27.0341,11 z"
-       transform="matrix(1.9227697,0,0,1.4097191,-20.223704,-11.291125)"
-       id="path2385"
-       style="opacity:1;fill:none;fill-opacity:1;stroke:#919191;stroke-width:0.61406273;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 27.43751,11 A 4.4375095,2.1843002 0 1 1 18.56249,11 A 4.4375095,2.1843002 0 1 1 27.43751,11 z"
-       transform="matrix(1.9227697,0,0,1.4097191,-20.223704,26.922047)"
-       id="path3157"
-       style="opacity:1;fill:url(#linearGradient3234);fill-opacity:1;stroke:#888a85;stroke-width:0.61406273;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 26.900623,11 A 3.9006226,1.353747 0 1 1 19.099377,11 A 3.9006226,1.353747 0 1 1 26.900623,11 z"
-       transform="matrix(1.9227697,0,0,1.4097191,-20.223704,26.901493)"
-       id="path3236"
-       style="opacity:1;fill:none;fill-opacity:1;stroke:url(#linearGradient3244);stroke-width:0.61406273;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 20.121678,27.900142 C 21.673007,29.429491 23.224337,31.723514 23.224337,40.134934 C 23.224337,41.664283 23.434152,42.428957 24,42.428957 C 24.565849,42.428957 24.775665,41.664283 24.775665,40.134934 C 24.775665,31.723514 26.326993,29.429491 27.878323,27.900142"
-       id="path3163"
-       style="fill:url(#linearGradient3226);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="M 14,17 C 14,26 21.673007,29.42949 24,29.42949 C 26.326993,29.42949 34,26 34,17"
-       id="path3179"
-       style="fill:url(#radialGradient3187);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="M 27.940789,11 A 4.9407887,1.6272911 0 1 1 18.059211,11 A 4.9407887,1.6272911 0 1 1 27.940789,11 z"
-       transform="matrix(1.9227697,0,0,1.4097191,-20.223704,1.6877877)"
-       id="path5788"
-       style="opacity:1;fill:url(#radialGradient5790);fill-opacity:1;stroke:url(#linearGradient4400);stroke-width:0.61406273;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-    <path
-       d="M 15,17.5 C 13.5,24 21.5,28.5 24,28.5 C 26.5,28.5 35,24 33,16.5 C 32.5,12.5 32,10.5 31,7"
-       id="path3196"
-       style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient3206);stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="M 18.346014,7 L 23,7 C 23,7 20.673007,16.176093 20.673007,19.999466 C 20.673007,22.293489 22.224336,23.822838 21.448671,24.587512 C 20.673007,25.352187 16.794684,22.369207 16.794684,18.470117 C 16.794684,16.940768 17.570349,12.352721 18.346014,7 z"
-       id="path3266"
-       style="fill:url(#linearGradient3274);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="M 31.5,5.5 C 31,6 28.038313,6.5499019 23.756645,6.5499019 C 19.474978,6.5499019 17,6 16.5,5.5"
-       id="path3358"
-       style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.01098013;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1" />
-    <path
-       d="M 33,16.5 C 33,17.355546 29.5,18.5 23.98098,18.549902 C 18.46196,18.599804 15,17.355546 15,16.5"
-       id="path3450"
-       style="fill:none;fill-opacity:1;stroke:url(#radialGradient3458);stroke-width:1.01098013;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1" />
-  </g>
-  <g
-     id="layer3"
-     style="display:inline">
-    <path
-       d="M 22,30 C 22,30 22.5,31 24,30.95884 C 25.5,30.91768 26,30 26,30"
-       id="path3395"
-       style="opacity:0.35;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;display:inline" />
-    <path
-       d="M 7.9999996,43.467633 L 10.499999,42.467633 L 12.968749,42.592633 L 7.9999996,43.467633 z"
-       transform="matrix(1.551329,0,0,1.5293489,11.589369,-24.477177)"
-       id="path3363"
-       style="fill:url(#linearGradient3440);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3448);stroke-width:0.64922434px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;display:inline;filter:url(#filter3391)" />
-  </g>
-  <g
-     id="layer2"
-     style="display:inline">
-    <path
-       d="M 31.756645,4.1952335 C 30.98098,1.90121 17.01902,1.90121 16.243355,4.1952335 C 16.243355,6.4892569 13.916362,13.371327 13.916362,19.488723 C 13.916362,25.606119 21.673007,29.429491 24,29.429491 C 26.326993,29.429491 34.083638,25.606119 34.083638,19.488723 C 34.083638,13.371327 31.756645,6.4892569 31.756645,4.1952335 z"
-       id="path3354"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#919191;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
-  </g>
-</svg>

=== modified file 'menu-data-additional/nvidia-driver-173.desktop'
--- menu-data-additional/nvidia-driver-173.desktop	2011-08-02 07:34:30 +0000
+++ menu-data-additional/nvidia-driver-173.desktop	2011-09-28 15:57:28 +0000
@@ -4,6 +4,6 @@
 Comment=Optimized hardware acceleration of OpenGL with nvidia graphic cards
 Type=Application
 Categories=Application;System;
-X-AppInstall-Package=nvidia-glx-173
+X-AppInstall-Package=nvidia-173
 X-AppInstall-Popcon=274
 X-AppInstall-Section=restricted

=== modified file 'menu-data-additional/nvidia-driver-185.desktop'
--- menu-data-additional/nvidia-driver-185.desktop	2011-08-02 07:34:30 +0000
+++ menu-data-additional/nvidia-driver-185.desktop	2011-09-28 15:57:28 +0000
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=NVidia binary X.Org driver ('version 185' driver)
+Name=NVidia binary X.Org driver ('current' driver)
 Comment=Optimized hardware acceleration of OpenGL with nvidia graphic cards
 Type=Application
 Categories=Application;System;
-X-AppInstall-Package=nvidia-glx-185
+X-AppInstall-Package=nvidia-current
 X-AppInstall-Popcon=1105
 X-AppInstall-Section=restricted

=== modified file 'menu-data-additional/nvidia-driver-96.desktop'
--- menu-data-additional/nvidia-driver-96.desktop	2011-08-02 07:34:30 +0000
+++ menu-data-additional/nvidia-driver-96.desktop	2011-09-28 15:57:28 +0000
@@ -4,6 +4,6 @@
 Comment=Optimized hardware acceleration of OpenGL with older nvidia graphic cards
 Type=Application
 Categories=Application;System;
-X-AppInstall-Package=nvidia-glx-96
+X-AppInstall-Package=nvidia-96
 X-AppInstall-Popcon=220
 X-AppInstall-Section=restricted

=== removed file 'menu-data-additional/ooo-meta.desktop'
--- menu-data-additional/ooo-meta.desktop	2011-08-02 07:34:30 +0000
+++ menu-data-additional/ooo-meta.desktop	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-[Desktop Entry]
-X-AppInstall-Package=openoffice.org
-X-AppInstall-Popcon=385
-X-AppInstall-Section=universe
-
-Version=1.0
-Encoding=UTF-8
-Terminal=0
-Icon=ooo-writer
-Type=Application
-Categories=Application;Office;
-Name=OpenOffice.org Office Suite
-Comment=Full-featured office productivity suite 

=== modified file 'menu-data-additional/openclipart.desktop'
--- menu-data-additional/openclipart.desktop	2011-08-02 07:34:30 +0000
+++ menu-data-additional/openclipart.desktop	2011-09-28 15:57:28 +0000
@@ -6,6 +6,6 @@
 Type=Application
 Categories=Application;Office
 Icon=applications-office
-X-AppInstall-Package=openclipart-openoffice.org
+X-AppInstall-Package=openclipart-libreoffice
 X-AppInstall-Popcon=533
 X-AppInstall-Section=universe

=== removed file 'menu-data-additional/totem-xine.desktop'
--- menu-data-additional/totem-xine.desktop	2011-08-02 07:34:30 +0000
+++ menu-data-additional/totem-xine.desktop	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Movie Player Totem (xine backend)
-Comment=Play DVD, movies and songs via xine backend
-Exec=totem %U
-Icon=totem
-Terminal=false
-Type=Application
-Categories=GNOME;GTK;Application;AudioVideo;Player;X-Ximian-Main;X-Red-Hat-Base;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=totem
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=2.17.3
-StartupNotify=true
-X-Ubuntu-Gettext-Domain=totem
-MimeType=application/x-extension-mp4;application/x-extension-m4a;application/x-shorten;application/x-smil;application/smil;application/xspf+xml;application/x-quicktime-media-link;video/mp4;video/x-m4v;video/dv;video/mpeg;video/x-mpeg;video/msvideo;video/quicktime;video/x-anim;video/x-avi;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/x-flc;video/x-fli;video/vnd.divx;video/3gpp;audio/3gpp;application/ogg;application/x-ogg;application/x-matroska;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-wav;audio/x-mpegurl;audio/mpegurl;audio/x-scpls;audio/x-m4a;audio/mp4;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;application/vnd.rn-realmedia;audio/x-real-audio;audio/x-pn-realaudio;application/x-flac;audio/x-flac;application/x-shockwave-flash;misc/ultravox;audio/vnd.rn-realaudio;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-wav;audio/x-pn-windows-acm;image/vnd.rn-realpix;video/vnd.rn-realvideo;audio/x-pn-realaudio-plugin;application/x-flash-video;video/x-ogm+ogg;audio/x-it;audio/x-mod;audio/x-ape;audio/ac3;audio/AMR;audio/AMR-WB;audio/x-musepack;audio/x-realaudio;application/x-quicktimeplayer;image/x-pict;audio/x-wav;audio/basic;
-X-AppInstall-Package=totem-xine
-X-AppInstall-Popcon=150
-X-AppInstall-Section=universe
-X-AppInstall-Replaces=totem-gstreamer

=== removed file 'menu-data-additional/wine.desktop.THIS'
--- menu-data-additional/wine.desktop.THIS	2011-04-01 20:31:57 +0000
+++ menu-data-additional/wine.desktop.THIS	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=Wine Microsoft Windows Compatibility Layer 
-Categories=Application;Office;Game;System;
-MimeType=application/x-ms-dos-executable;application/x-msi;application/x-win-lnk
-Icon=wine.svg
-X-AppInstall-Package=wine
-X-AppInstall-Popcon=9344
-X-AppInstall-Section=universe
-X-AppInstall-Architectures=i386,amd64

=== removed file 'menu-data-additional/wine1.2.desktop'
--- menu-data-additional/wine1.2.desktop	2011-08-02 07:34:30 +0000
+++ menu-data-additional/wine1.2.desktop	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=Wine Microsoft Windows Compatibility Layer 
-Categories=Application;System;
-MimeType=application/x-ms-dos-executable;application/x-msi;application/x-win-lnk
-Icon=wine.svg
-X-AppInstall-Package=wine1.2
-X-AppInstall-Popcon=42005
-X-AppInstall-Section=universe
-X-AppInstall-Architectures=i386,amd64

=== removed file 'menu-data-additional/wine1.3.desktop'
--- menu-data-additional/wine1.3.desktop	2011-08-02 07:34:30 +0000
+++ menu-data-additional/wine1.3.desktop	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=Wine Microsoft Windows Compatibility Layer (Beta Release)
-Categories=Application;System;
-MimeType=application/x-ms-dos-executable;application/x-msi;application/x-win-lnk
-Icon=wine.svg
-X-AppInstall-Package=wine1.3
-X-AppInstall-Popcon=8701
-X-AppInstall-Section=universe
-X-AppInstall-Architectures=i386,amd64