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

Proposed by Nekhelesh Ramananthan on 2012-04-08
Status: Rejected
Rejected by: St├ęphane Graber on 2012-07-13
Proposed branch: lp:~nik90/ubuntu/precise/totem/add_keywords_new
Merge into: lp:ubuntu/precise/totem
Diff against target: 96 lines (+42/-0)
8 files modified
.pc/.quilt_patches (+1/-0)
.pc/.quilt_series (+1/-0)
.pc/add_keywords.patch/data/totem.desktop.in.in.in (+16/-0)
.pc/applied-patches (+1/-0)
data/totem.desktop.in.in.in (+1/-0)
debian/changelog (+6/-0)
debian/patches/add_keywords.patch (+15/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~nik90/ubuntu/precise/totem/add_keywords_new
Reviewer Review Type Date Requested Status
Ubuntu branches 2012-04-08 Pending
Review via email: mp+101209@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Nekhelesh Ramananthan (nik90) wrote :

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

Sebastien Bacher (seb128) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file '.pc/.quilt_patches'
2--- .pc/.quilt_patches 1970-01-01 00:00:00 +0000
3+++ .pc/.quilt_patches 2012-04-08 15:38:18 +0000
4@@ -0,0 +1,1 @@
5+debian/patches
6
7=== added file '.pc/.quilt_series'
8--- .pc/.quilt_series 1970-01-01 00:00:00 +0000
9+++ .pc/.quilt_series 2012-04-08 15:38:18 +0000
10@@ -0,0 +1,1 @@
11+series
12
13=== added directory '.pc/add_keywords.patch'
14=== added file '.pc/add_keywords.patch/.timestamp'
15=== added directory '.pc/add_keywords.patch/data'
16=== added file '.pc/add_keywords.patch/data/totem.desktop.in.in.in'
17--- .pc/add_keywords.patch/data/totem.desktop.in.in.in 1970-01-01 00:00:00 +0000
18+++ .pc/add_keywords.patch/data/totem.desktop.in.in.in 2012-04-08 15:38:18 +0000
19@@ -0,0 +1,16 @@
20+[Desktop Entry]
21+_Name=Movie Player
22+_Comment=Play movies and songs
23+Exec=totem %U
24+Icon=totem
25+Terminal=false
26+Type=Application
27+Categories=GTK;GNOME;AudioVideo;Player;Video;
28+X-GNOME-DocPath=totem/totem.xml
29+X-GNOME-Bugzilla-Bugzilla=GNOME
30+X-GNOME-Bugzilla-Product=totem
31+X-GNOME-Bugzilla-Component=general
32+X-GNOME-Bugzilla-Version=@VERSION@
33+X-GNOME-Bugzilla-OtherBinaries=totem-video-indexer;totem-video-thumbnailer;totem-audio-preview;
34+X-GNOME-Bugzilla-ExtraInfoScript=@FULL_LIBEXECDIR@/totem/totem-bugreport.py
35+StartupNotify=true
36
37=== modified file '.pc/applied-patches'
38--- .pc/applied-patches 2012-01-09 16:19:39 +0000
39+++ .pc/applied-patches 2012-04-08 15:38:18 +0000
40@@ -1,3 +1,4 @@
41 00_create_m4_folder.patch
42 02_lpi.patch
43 03_default_options.patch
44+add_keywords.patch
45
46=== modified file 'data/totem.desktop.in.in.in'
47--- data/totem.desktop.in.in.in 2009-05-21 20:20:37 +0000
48+++ data/totem.desktop.in.in.in 2012-04-08 15:38:18 +0000
49@@ -14,3 +14,4 @@
50 X-GNOME-Bugzilla-OtherBinaries=totem-video-indexer;totem-video-thumbnailer;totem-audio-preview;
51 X-GNOME-Bugzilla-ExtraInfoScript=@FULL_LIBEXECDIR@/totem/totem-bugreport.py
52 StartupNotify=true
53+_Keywords=Audio;Video;
54
55=== modified file 'debian/changelog'
56--- debian/changelog 2012-01-09 16:19:39 +0000
57+++ debian/changelog 2012-04-08 15:38:18 +0000
58@@ -1,3 +1,9 @@
59+totem (3.3.4-0ubuntu1~precise1ubuntu1) precise; urgency=low
60+
61+Added keywords to the .desktop file (LP: #976624) *
62+
63+ -- Nekhelesh Ramananthan <krnekhelesh@gmail.com> Sun, 08 Apr 2012 17:32:56 +0200
64+
65 totem (3.3.4-0ubuntu1~precise1) precise; urgency=low
66
67 [ Rico Tzschichholz ]
68
69=== added file 'debian/patches/add_keywords.patch'
70--- debian/patches/add_keywords.patch 1970-01-01 00:00:00 +0000
71+++ debian/patches/add_keywords.patch 2012-04-08 15:38:18 +0000
72@@ -0,0 +1,15 @@
73+Description: added keywords
74+Origin: commit, revision id: krnekhelesh@gmail.com-20120408153046-ql9ruml80j2ru0sh
75+Author: Nekhelesh Ramananthan krnekhelesh@gmail.com
76+Last-Update: 2012-04-08
77+X-Bzr-Revision-Id: krnekhelesh@gmail.com-20120408153046-ql9ruml80j2ru0sh
78+
79+=== modified file 'data/totem.desktop.in.in.in'
80+--- old/data/totem.desktop.in.in.in 2009-05-21 20:20:37 +0000
81++++ new/data/totem.desktop.in.in.in 2012-04-08 15:30:46 +0000
82+@@ -14,3 +14,4 @@
83+ X-GNOME-Bugzilla-OtherBinaries=totem-video-indexer;totem-video-thumbnailer;totem-audio-preview;
84+ X-GNOME-Bugzilla-ExtraInfoScript=@FULL_LIBEXECDIR@/totem/totem-bugreport.py
85+ StartupNotify=true
86++_Keywords=Audio;Video;
87+
88
89=== modified file 'debian/patches/series'
90--- debian/patches/series 2012-01-09 16:19:39 +0000
91+++ debian/patches/series 2012-04-08 15:38:18 +0000
92@@ -1,3 +1,4 @@
93 00_create_m4_folder.patch
94 02_lpi.patch
95 03_default_options.patch
96+add_keywords.patch

Subscribers

People subscribed via source and target branches