Merge lp:~nik90/ubuntu/precise/totem/add_keywords_new into lp:ubuntu/precise/totem

[Nekhelesh Ramananthan]

Added keywords to the .desktop file to make it possible to search totem using search strings Audio and Video as well.

[Nekhelesh Ramananthan (nik90)]

I have already created a bug upstream with the patch attached at https://bugzilla.gnome.org/show_bug.cgi?id=673742

[Sebastien Bacher (seb128)]

There is an updated version with extra keyword commited upstream which will be in the new serie in quantal, I'm about to backport the upstream serie patch to precise as well

Setting that merge request to rejected since it's targetting the wrong VCS and the list of keywords there is outdated

Unmerged revisions

192. By Nekhelesh Ramananthan <email address hidden> on 2012-04-08

Convert source changes into a package patch file

191. By Nekhelesh Ramananthan <email address hidden> on 2012-04-08

added keywords

190. By Jeremy Bicha on 2012-01-09

[ Rico Tzschichholz ]
* New upstream release

[ Jeremy Bicha]
* debian/watch: Watch for .xz tarballs

=== added file '.pc/.quilt_patches'
--- .pc/.quilt_patches	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_patches	2012-04-08 15:38:18 +0000
@@ -0,0 +1,1 @@
+debian/patches

=== added file '.pc/.quilt_series'
--- .pc/.quilt_series	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_series	2012-04-08 15:38:18 +0000
@@ -0,0 +1,1 @@
+series

=== added directory '.pc/add_keywords.patch'
=== added file '.pc/add_keywords.patch/.timestamp'
=== added directory '.pc/add_keywords.patch/data'
=== added file '.pc/add_keywords.patch/data/totem.desktop.in.in.in'
--- .pc/add_keywords.patch/data/totem.desktop.in.in.in	1970-01-01 00:00:00 +0000
+++ .pc/add_keywords.patch/data/totem.desktop.in.in.in	2012-04-08 15:38:18 +0000
@@ -0,0 +1,16 @@
+[Desktop Entry]
+_Name=Movie Player
+_Comment=Play movies and songs
+Exec=totem %U
+Icon=totem
+Terminal=false
+Type=Application
+Categories=GTK;GNOME;AudioVideo;Player;Video;
+X-GNOME-DocPath=totem/totem.xml
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=totem
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version=@VERSION@
+X-GNOME-Bugzilla-OtherBinaries=totem-video-indexer;totem-video-thumbnailer;totem-audio-preview;
+X-GNOME-Bugzilla-ExtraInfoScript=@FULL_LIBEXECDIR@/totem/totem-bugreport.py
+StartupNotify=true

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2012-01-09 16:19:39 +0000
+++ .pc/applied-patches	2012-04-08 15:38:18 +0000
@@ -1,3 +1,4 @@
 00_create_m4_folder.patch
 02_lpi.patch
 03_default_options.patch
+add_keywords.patch

=== modified file 'data/totem.desktop.in.in.in'
--- data/totem.desktop.in.in.in	2009-05-21 20:20:37 +0000
+++ data/totem.desktop.in.in.in	2012-04-08 15:38:18 +0000
@@ -14,3 +14,4 @@
 X-GNOME-Bugzilla-OtherBinaries=totem-video-indexer;totem-video-thumbnailer;totem-audio-preview;
 X-GNOME-Bugzilla-ExtraInfoScript=@FULL_LIBEXECDIR@/totem/totem-bugreport.py
 StartupNotify=true
+_Keywords=Audio;Video;

=== modified file 'debian/changelog'
--- debian/changelog	2012-01-09 16:19:39 +0000
+++ debian/changelog	2012-04-08 15:38:18 +0000
@@ -1,3 +1,9 @@
+totem (3.3.4-0ubuntu1~precise1ubuntu1) precise; urgency=low
+
+Added keywords to the .desktop file (LP: #976624)  * 
+
+ -- Nekhelesh Ramananthan <[e-mail]>  Sun, 08 Apr 2012 17:32:56 +0200
+
 totem (3.3.4-0ubuntu1~precise1) precise; urgency=low
 
   [ Rico Tzschichholz ]

=== added file 'debian/patches/add_keywords.patch'
--- debian/patches/add_keywords.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/add_keywords.patch	2012-04-08 15:38:18 +0000
@@ -0,0 +1,15 @@
+Description: added keywords
+Origin: commit, revision id: [e-mail]-20120408153046-ql9ruml80j2ru0sh
+Author: Nekhelesh Ramananthan [e-mail]
+Last-Update: 2012-04-08
+X-Bzr-Revision-Id: [e-mail]-20120408153046-ql9ruml80j2ru0sh
+
+=== modified file 'data/totem.desktop.in.in.in'
+--- old/data/totem.desktop.in.in.in	2009-05-21 20:20:37 +0000
++++ new/data/totem.desktop.in.in.in	2012-04-08 15:30:46 +0000
+@@ -14,3 +14,4 @@
+ X-GNOME-Bugzilla-OtherBinaries=totem-video-indexer;totem-video-thumbnailer;totem-audio-preview;
+ X-GNOME-Bugzilla-ExtraInfoScript=@FULL_LIBEXECDIR@/totem/totem-bugreport.py
+ StartupNotify=true
++_Keywords=Audio;Video;
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-01-09 16:19:39 +0000
+++ debian/patches/series	2012-04-08 15:38:18 +0000
@@ -1,3 +1,4 @@
 00_create_m4_folder.patch
 02_lpi.patch
 03_default_options.patch
+add_keywords.patch