Ubuntu
evince package

Merge lp:~jbicha/ubuntu/oneiric/evince/evince-3.1.2 into lp:~ubuntu-desktop/evince/ubuntu

  1. Oneiric (11.10)
  2. evince-3.1.2
  3. Merge into ubuntu
Proposed by Jeremy Bícha
Status: Merged
Merged at revision: 125
Proposed branch: lp:~jbicha/ubuntu/oneiric/evince/evince-3.1.2
Merge into: lp:~ubuntu-desktop/evince/ubuntu
Diff against target: 55 lines (+28/-1)
4 files modified
debian/changelog (+11/-0)
debian/patches/10_remove_nodisplay.patch (+15/-0)
debian/patches/series (+1/-0)
debian/watch (+1/-1)
To merge this branch: bzr merge lp:~jbicha/ubuntu/oneiric/evince/evince-3.1.2
Reviewer Review Type Date Requested Status
Ubuntu Desktop Pending
Review via email: mp+66132@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-06-22 21:49:46 +0000
3+++ debian/changelog 2011-06-28 13:04:13 +0000
4@@ -1,3 +1,14 @@
5+evince (3.1.2-0ubuntu1) oneiric; urgency=low
6+
7+ * New upstream version
8+ * debian/patches/10_remove_nodisplay.patch:
9+ - Follow Fedora's example and show "Document Viewer" in Unity or
10+ Gnome Shell search
11+ * debian/watch:
12+ - Point to unstable .bz2
13+
14+ -- Jeremy Bicha <jbicha@ubuntu.com> Tue, 28 Jun 2011 08:24:25 -0400
15+
16 evince (3.0.2-0ubuntu4) oneiric; urgency=low
17
18 * debian/apparmor-profile: also allow the thumbnailer to access to
19
20=== added file 'debian/patches/10_remove_nodisplay.patch'
21--- debian/patches/10_remove_nodisplay.patch 1970-01-01 00:00:00 +0000
22+++ debian/patches/10_remove_nodisplay.patch 2011-06-28 13:04:13 +0000
23@@ -0,0 +1,15 @@
24+Description: Follow Fedora's example and show "Document Viewer" in
25+ Unity & Gnome Shell search
26+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=634245
27+Index: evince-3.1.2/data/evince.desktop.in.in
28+===================================================================
29+--- evince-3.1.2.orig/data/evince.desktop.in.in 2011-06-28 08:26:37.684037838 -0400
30++++ evince-3.1.2/data/evince.desktop.in.in 2011-06-28 08:26:42.114165725 -0400
31+@@ -7,7 +7,6 @@
32+ Terminal=false
33+ Type=Application
34+ Icon=evince
35+-NoDisplay=true
36+ X-GNOME-DocPath=
37+ X-GNOME-Bugzilla-Bugzilla=GNOME
38+ X-GNOME-Bugzilla-Product=evince
39
40=== modified file 'debian/patches/series'
41--- debian/patches/series 2011-05-19 12:23:46 +0000
42+++ debian/patches/series 2011-06-28 13:04:13 +0000
43@@ -2,3 +2,4 @@
44 01_lpi.patch
45 04_gold.patch
46 05_library-path.patch
47+10_remove_nodisplay.patch
48
49=== modified file 'debian/watch'
50--- debian/watch 2009-02-03 20:32:56 +0000
51+++ debian/watch 2011-06-28 13:04:13 +0000
52@@ -1,2 +1,2 @@
53 version=2
54-http://ftp.gnome.org/pub/gnome/sources/evince/([\d\.]+)/evince-([\d\.]+)\.tar\.gz
55+http://ftp.gnome.org/pub/gnome/sources/evince/([\d\.]+)/evince-([\d\.]+)\.tar\.bz2

Subscribers

People subscribed via source and target branches

to all changes: