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
1
evince (3.1.2-0ubuntu1) oneiric; urgency=low
6
2
7
3
  * New upstream version
8
4
  * debian/patches/10_remove_nodisplay.patch:
9
5
    - Follow Fedora's example and show "Document Viewer" in Unity or
10
6
      Gnome Shell search
11
7
  * debian/watch:
12
8
    - Point to unstable .bz2
13
9
14
10
 -- Jeremy Bicha <jbicha@ubuntu.com>  Tue, 28 Jun 2011 08:24:25 -0400
15
11
16
1
evince (3.0.2-0ubuntu4) oneiric; urgency=low
12
evince (3.0.2-0ubuntu4) oneiric; urgency=low
17
2
13
18
3
  * debian/apparmor-profile: also allow the thumbnailer to access to
14
  * debian/apparmor-profile: also allow the thumbnailer to access to
19
4
15
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
1
Description: Follow Fedora's example and show "Document Viewer" in
25
2
 Unity & Gnome Shell search
26
3
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=634245
27
4
Index: evince-3.1.2/data/evince.desktop.in.in
28
5
===================================================================
29
6
--- evince-3.1.2.orig/data/evince.desktop.in.in	2011-06-28 08:26:37.684037838 -0400
30
7
+++ evince-3.1.2/data/evince.desktop.in.in	2011-06-28 08:26:42.114165725 -0400
31
8
@@ -7,7 +7,6 @@
32
9
 Terminal=false
33
10
 Type=Application
34
11
 Icon=evince
35
12
-NoDisplay=true
36
13
 X-GNOME-DocPath=
37
14
 X-GNOME-Bugzilla-Bugzilla=GNOME
38
15
 X-GNOME-Bugzilla-Product=evince
39
0
16
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
2
01_lpi.patch
2
01_lpi.patch
45
3
04_gold.patch
3
04_gold.patch
46
4
05_library-path.patch
4
05_library-path.patch
47
5
10_remove_nodisplay.patch
48
5
6
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
1
version=2
1
version=2
55
2
http://ftp.gnome.org/pub/gnome/sources/evince/([\d\.]+)/evince-([\d\.]+)\.tar\.gz
2
http://ftp.gnome.org/pub/gnome/sources/evince/([\d\.]+)/evince-([\d\.]+)\.tar\.bz2
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
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Ubuntu Desktop		2011-06-28	Pending
Review via email: mp+66132@code.launchpad.net