Light-Weight Text Editor for Gnome

Merge lp:~barry/gedit/bug-788514 into lp:~ubuntu-desktop/gedit/ubuntu

Proposed by Barry Warsaw on 2011-07-06
Status: Merged
Merged at revision: 70
Proposed branch: lp:~barry/gedit/bug-788514
Merge into: lp:~ubuntu-desktop/gedit/ubuntu
Diff against target: 131 lines (+26/-12) 4 files modified
To merge this branch: bzr merge lp:~barry/gedit/bug-788514
Reviewer Review Type Date Requested Status
Ubuntu Desktop 2011-07-06 Pending
Review via email: mp+67069@code.launchpad.net
To post a comment you must log in.
Barry Warsaw (barry) wrote :

Matches uploaded version to switch to dh_python2. LP: #788514

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2011-06-27 13:11:09 +0000
3+++ debian/changelog 2011-07-06 18:11:20 +0000
4@@ -1,3 +1,18 @@
5+gedit (3.1.1-0ubuntu4) oneiric; urgency=low
6+
7+ * debian/rules
8+ - Call dh_python2 twice to build for both public and private
9+ modules.
10+
11+ -- Barry Warsaw <barry@ubuntu.com> Tue, 28 Jun 2011 04:36:52 +0100
12+
13+gedit (3.1.1-0ubuntu3) oneiric; urgency=low
14+
15+ * debian/control.in, debian/rules
16+ - Convert to dh_python2. (LP: #788514)
17+
18+ -- Barry Warsaw <barry@ubuntu.com> Mon, 27 Jun 2011 16:30:43 +0100
19+
20 gedit (3.1.1-0ubuntu2) oneiric; urgency=low
21
22 * debian/patches/07_unity_quicklist.patch: Add Unity static quicklist
23
24=== modified file 'debian/control'
25--- debian/control 2011-06-27 09:32:21 +0000
26+++ debian/control 2011-07-06 18:11:20 +0000
27@@ -8,13 +8,12 @@
28 Priority: optional
29 Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
30 XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
31-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>
32-Build-Depends: cdbs (>= 0.4.41),
33+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
34+Build-Depends: cdbs (>= 0.4.90~),
35 debhelper (>= 5.0.37.2),
36 gnome-pkg-tools (>= 0.10),
37 dh-autoreconf,
38 gnome-common,
39- python-support (>= 0.3),
40 intltool (>= 0.40.0),
41 gnome-doc-utils (>= 0.9.0),
42 gsettings-desktop-schemas-dev,
43@@ -28,7 +27,7 @@
44 libgtksourceview-3.0-dev (>= 3.0.0),
45 libpeas-dev (>= 0.7.3),
46 libx11-dev,
47- python-dev (>= 2.5),
48+ python-dev (>= 2.6.6-3~),
49 python-gobject-dev (>= 2.28),
50 gobject-introspection,
51 libgirepository1.0-dev (>= 0.9.3),
52@@ -38,7 +37,7 @@
53 libgtk-3-doc,
54 libgtksourceview-3.0-doc
55 Standards-Version: 3.9.0
56-XS-Python-Version: >= 2.5
57+X-Python-Version: >= 2.5
58 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gedit/ubuntu
59 Homepage: http://www.gnome.org/projects/gedit/
60
61@@ -60,7 +59,6 @@
62 Recommends: gir1.2-gtksource-3.0,
63 zenity,
64 yelp
65-XB-Python-Version: ${python:Versions}
66 Description: official text editor of the GNOME desktop environment
67 gedit is a text editor which supports most standard editor features,
68 extending this basic functionality with other features not usually
69
70=== modified file 'debian/control.in'
71--- debian/control.in 2011-06-27 09:32:21 +0000
72+++ debian/control.in 2011-07-06 18:11:20 +0000
73@@ -4,12 +4,11 @@
74 Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
75 XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
76 Uploaders: @GNOME_TEAM@
77-Build-Depends: cdbs (>= 0.4.41),
78+Build-Depends: cdbs (>= 0.4.90~),
79 debhelper (>= 5.0.37.2),
80 gnome-pkg-tools (>= 0.10),
81 dh-autoreconf,
82 gnome-common,
83- python-support (>= 0.3),
84 intltool (>= 0.40.0),
85 gnome-doc-utils (>= 0.9.0),
86 gsettings-desktop-schemas-dev,
87@@ -23,7 +22,7 @@
88 libgtksourceview-3.0-dev (>= 3.0.0),
89 libpeas-dev (>= 0.7.3),
90 libx11-dev,
91- python-dev (>= 2.5),
92+ python-dev (>= 2.6.6-3~),
93 python-gobject-dev (>= 2.28),
94 gobject-introspection,
95 libgirepository1.0-dev (>= 0.9.3),
96@@ -33,7 +32,7 @@
97 libgtk-3-doc,
98 libgtksourceview-3.0-doc
99 Standards-Version: 3.9.0
100-XS-Python-Version: >= 2.5
101+X-Python-Version: >= 2.5
102 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gedit/ubuntu
103 Homepage: http://www.gnome.org/projects/gedit/
104
105@@ -55,7 +54,6 @@
106 Recommends: gir1.2-gtksource-3.0,
107 zenity,
108 yelp
109-XB-Python-Version: ${python:Versions}
110 Description: official text editor of the GNOME desktop environment
111 gedit is a text editor which supports most standard editor features,
112 extending this basic functionality with other features not usually
113
114=== modified file 'debian/rules'
115--- debian/rules 2011-05-04 10:36:14 +0000
116+++ debian/rules 2011-07-06 18:11:20 +0000
117@@ -8,10 +8,13 @@
118 include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
119 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
120
121+DEB_PYTHON2_MODULE_PACKAGES = gedit
122+
123 binary-install/gedit::
124 cd debian/gedit/usr/share/gedit && mv gedit-bugreport.sh gedit-bugreport
125 chmod 755 debian/gedit/usr/share/bug/gedit/script
126- dh_pysupport -pgedit /usr/lib/gedit/plugins
127+ dh_python2
128+ dh_python2 -pgedit /usr/lib/gedit/plugins
129
130 binary-predeb/gedit::
131 dh_girepository -ldebian/tmp/usr/share/gedit/gir-1.0 /usr/lib/gedit/girepository-1.0

Subscribers

People subscribed via source and target branches

to all changes: