Merge lp:~noskcaj/vte/ubuntu into lp:~ubuntu-desktop/vte/ubuntu-vte2.91
- ubuntu
- Merge into ubuntu-vte2.91
Proposed by
Jackson Doak
Status: | Merged |
---|---|
Merge reported by: | Tim Lunn |
Merged at revision: | not available |
Proposed branch: | lp:~noskcaj/vte/ubuntu |
Merge into: | lp:~ubuntu-desktop/vte/ubuntu-vte2.91 |
Diff against target: |
234 lines (+79/-16) 9 files modified
debian/changelog (+47/-0) debian/compat (+1/-1) debian/control (+8/-3) debian/control.in (+7/-2) debian/gir1.2-vte-2.91.install (+1/-1) debian/libvte-2.91-0.install (+1/-1) debian/libvte-2.91-0.lintian-overrides (+0/-2) debian/libvte-2.91-dev.install (+3/-3) debian/rules (+11/-3) |
To merge this branch: | bzr merge lp:~noskcaj/vte/ubuntu |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Lunn | Needs Fixing | ||
Review via email: mp+285283@code.launchpad.net |
Commit message
Description of the change
Merge bugfix release from debian
To post a comment you must log in.
lp:~noskcaj/vte/ubuntu
updated
- 121. By Jackson Doak
-
New upstream release.
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 2016-01-04 09:09:44 +0000 | |||
3 | +++ debian/changelog 2016-02-12 07:24:20 +0000 | |||
4 | @@ -1,3 +1,49 @@ | |||
5 | 1 | vte2.91 (0.42.4-1ubuntu1) xenial; urgency=low | ||
6 | 2 | |||
7 | 3 | * Merge from Debian unstable. Remaining changes: | ||
8 | 4 | * debian/control: | ||
9 | 5 | - Depend on libgnutls-dev instead of obsolete libgnutls28-dev | ||
10 | 6 | * debian/patches/0001-Add-the-style-context-provider-with-FALLBACK-priorit.patch: | ||
11 | 7 | - Keep as it is require for the Ubuntu theming | ||
12 | 8 | * debian/patches/91_keep_fds.patch: | ||
13 | 9 | - Keep file descriptors open on vte_fork_pty() | ||
14 | 10 | |||
15 | 11 | -- Jackson Doak <noskcaj@ubuntu.com> Fri, 12 Feb 2016 18:20:17 +1100 | ||
16 | 12 | |||
17 | 13 | vte2.91 (0.42.4-1) unstable; urgency=medium | ||
18 | 14 | |||
19 | 15 | * New upstream release. | ||
20 | 16 | |||
21 | 17 | -- Andreas Henriksson <andreas@fatal.se> Thu, 11 Feb 2016 20:25:23 +0100 | ||
22 | 18 | |||
23 | 19 | vte2.91 (0.42.3-1) unstable; urgency=medium | ||
24 | 20 | |||
25 | 21 | * New upstream release. | ||
26 | 22 | |||
27 | 23 | -- Andreas Henriksson <andreas@fatal.se> Wed, 03 Feb 2016 10:56:48 +0100 | ||
28 | 24 | |||
29 | 25 | vte2.91 (0.42.1-2ubuntu1) xenial; urgency=low | ||
30 | 26 | |||
31 | 27 | * Merge from Debian unstable (LP: #1508636). Remaining changes: | ||
32 | 28 | * debian/control: | ||
33 | 29 | - Depend on libgnutls-dev instead of obsolete libgnutls28-dev | ||
34 | 30 | * debian/patches/0001-Add-the-style-context-provider-with-FALLBACK-priorit.patch: | ||
35 | 31 | - Keep as it is require for the Ubuntu theming | ||
36 | 32 | * debian/patches/91_keep_fds.patch: | ||
37 | 33 | - Keep file descriptors open on vte_fork_pty() | ||
38 | 34 | |||
39 | 35 | -- Jackson Doak <noskcaj@ubuntu.com> Sun, 20 Dec 2015 07:10:18 +1100 | ||
40 | 36 | |||
41 | 37 | vte2.91 (0.42.1-2) unstable; urgency=medium | ||
42 | 38 | |||
43 | 39 | * Bump debhelper version to 9 | ||
44 | 40 | * Add multi-arch support (LP: #1508636) | ||
45 | 41 | * Remove remaining bits related to gnome-pty-helper | ||
46 | 42 | * Pass --as-needed to dh_autoreconf and to the linker to reduce runtime | ||
47 | 43 | dependencies | ||
48 | 44 | |||
49 | 45 | -- Laurent Bigonville <bigon@debian.org> Fri, 13 Nov 2015 15:26:04 +0100 | ||
50 | 46 | |||
51 | 1 | vte2.91 (0.42.1-1ubuntu2) xenial; urgency=medium | 47 | vte2.91 (0.42.1-1ubuntu2) xenial; urgency=medium |
52 | 2 | 48 | ||
53 | 3 | * debian/patches/0001-Add-the-style-context-provider-with-FALLBACK-priorit.patch: | 49 | * debian/patches/0001-Add-the-style-context-provider-with-FALLBACK-priorit.patch: |
54 | @@ -1683,3 +1729,4 @@ | |||
55 | 1683 | * Initial Release (Closes: #153740) | 1729 | * Initial Release (Closes: #153740) |
56 | 1684 | 1730 | ||
57 | 1685 | -- Christian Marillat <marillat@debian.org> Sun, 21 Jul 2002 16:30:57 +0200 | 1731 | -- Christian Marillat <marillat@debian.org> Sun, 21 Jul 2002 16:30:57 +0200 |
58 | 1732 | |||
59 | 1686 | 1733 | ||
60 | === modified file 'debian/compat' | |||
61 | --- debian/compat 2011-05-17 10:19:47 +0000 | |||
62 | +++ debian/compat 2016-02-12 07:24:20 +0000 | |||
63 | @@ -1,1 +1,1 @@ | |||
65 | 1 | 8 | 1 | 9 |
66 | 2 | 2 | ||
67 | === modified file 'debian/control' | |||
68 | --- debian/control 2016-01-04 09:09:44 +0000 | |||
69 | +++ debian/control 2016-02-12 07:24:20 +0000 | |||
70 | @@ -7,10 +7,10 @@ | |||
71 | 7 | Priority: optional | 7 | Priority: optional |
72 | 8 | Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> | 8 | Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
73 | 9 | XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org> | 9 | XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org> |
75 | 10 | Uploaders: Andreas Henriksson <andreas@fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Michael Biebl <biebl@debian.org> | 10 | Uploaders: Andreas Henriksson <andreas@fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org> |
76 | 11 | Standards-Version: 3.9.6 | 11 | Standards-Version: 3.9.6 |
79 | 12 | Build-Depends: cdbs (>= 0.4.90), | 12 | Build-Depends: cdbs (>= 0.4.93~), |
80 | 13 | debhelper (>= 8), | 13 | debhelper (>= 9), |
81 | 14 | gnome-pkg-tools (>= 0.10), | 14 | gnome-pkg-tools (>= 0.10), |
82 | 15 | dh-autoreconf, | 15 | dh-autoreconf, |
83 | 16 | libglib2.0-dev (>= 2.40.0), | 16 | libglib2.0-dev (>= 2.40.0), |
84 | @@ -35,6 +35,8 @@ | |||
85 | 35 | Depends: ${misc:Depends}, | 35 | Depends: ${misc:Depends}, |
86 | 36 | ${shlibs:Depends}, | 36 | ${shlibs:Depends}, |
87 | 37 | libvte-2.91-common (= ${source:Version}) | 37 | libvte-2.91-common (= ${source:Version}) |
88 | 38 | Pre-Depends: ${misc:Pre-Depends} | ||
89 | 39 | Multi-Arch: same | ||
90 | 38 | Description: Terminal emulator widget for GTK+ 3.0 - runtime files | 40 | Description: Terminal emulator widget for GTK+ 3.0 - runtime files |
91 | 39 | The VTE library provides a terminal emulator widget VteTerminal for | 41 | The VTE library provides a terminal emulator widget VteTerminal for |
92 | 40 | applications using the GTK+ toolkit. It also provides the VtePTY object | 42 | applications using the GTK+ toolkit. It also provides the VtePTY object |
93 | @@ -65,6 +67,7 @@ | |||
94 | 65 | Section: introspection | 67 | Section: introspection |
95 | 66 | Depends: ${gir:Depends}, | 68 | Depends: ${gir:Depends}, |
96 | 67 | ${misc:Depends} | 69 | ${misc:Depends} |
97 | 70 | Multi-Arch: same | ||
98 | 68 | Description: GObject introspection data for the VTE library | 71 | Description: GObject introspection data for the VTE library |
99 | 69 | This package contains introspection data for VTE, a terminal emulator | 72 | This package contains introspection data for VTE, a terminal emulator |
100 | 70 | widget for GTK+. | 73 | widget for GTK+. |
101 | @@ -86,6 +89,7 @@ | |||
102 | 86 | libvte-2.91-common | 89 | libvte-2.91-common |
103 | 87 | Recommends: libvte-2.91-doc | 90 | Recommends: libvte-2.91-doc |
104 | 88 | Conflicts: libvte-2.90-dev | 91 | Conflicts: libvte-2.90-dev |
105 | 92 | Multi-Arch: same | ||
106 | 89 | Description: Terminal emulator widget for GTK+ 3.0 - development files | 93 | Description: Terminal emulator widget for GTK+ 3.0 - development files |
107 | 90 | The VTE library provides a terminal emulator widget VteTerminal for | 94 | The VTE library provides a terminal emulator widget VteTerminal for |
108 | 91 | applications using the GTK+ toolkit. It also provides the VtePTY object | 95 | applications using the GTK+ toolkit. It also provides the VtePTY object |
109 | @@ -99,6 +103,7 @@ | |||
110 | 99 | Package: libvte-2.91-common | 103 | Package: libvte-2.91-common |
111 | 100 | Architecture: all | 104 | Architecture: all |
112 | 101 | Depends: ${misc:Depends} | 105 | Depends: ${misc:Depends} |
113 | 106 | Multi-Arch: foreign | ||
114 | 102 | Description: Terminal emulator widget for GTK+ 3.0 - common files | 107 | Description: Terminal emulator widget for GTK+ 3.0 - common files |
115 | 103 | The VTE library provides a terminal emulator widget VteTerminal for | 108 | The VTE library provides a terminal emulator widget VteTerminal for |
116 | 104 | applications using the GTK+ toolkit. It also provides the VtePTY object | 109 | applications using the GTK+ toolkit. It also provides the VtePTY object |
117 | 105 | 110 | ||
118 | === modified file 'debian/control.in' | |||
119 | --- debian/control.in 2016-01-04 09:09:44 +0000 | |||
120 | +++ debian/control.in 2016-02-12 07:24:20 +0000 | |||
121 | @@ -5,8 +5,8 @@ | |||
122 | 5 | XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org> | 5 | XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org> |
123 | 6 | Uploaders: @GNOME_TEAM@ | 6 | Uploaders: @GNOME_TEAM@ |
124 | 7 | Standards-Version: 3.9.6 | 7 | Standards-Version: 3.9.6 |
127 | 8 | Build-Depends: cdbs (>= 0.4.90), | 8 | Build-Depends: cdbs (>= 0.4.93~), |
128 | 9 | debhelper (>= 8), | 9 | debhelper (>= 9), |
129 | 10 | gnome-pkg-tools (>= 0.10), | 10 | gnome-pkg-tools (>= 0.10), |
130 | 11 | dh-autoreconf, | 11 | dh-autoreconf, |
131 | 12 | libglib2.0-dev (>= 2.40.0), | 12 | libglib2.0-dev (>= 2.40.0), |
132 | @@ -31,6 +31,8 @@ | |||
133 | 31 | Depends: ${misc:Depends}, | 31 | Depends: ${misc:Depends}, |
134 | 32 | ${shlibs:Depends}, | 32 | ${shlibs:Depends}, |
135 | 33 | libvte-2.91-common (= ${source:Version}) | 33 | libvte-2.91-common (= ${source:Version}) |
136 | 34 | Pre-Depends: ${misc:Pre-Depends} | ||
137 | 35 | Multi-Arch: same | ||
138 | 34 | Description: Terminal emulator widget for GTK+ 3.0 - runtime files | 36 | Description: Terminal emulator widget for GTK+ 3.0 - runtime files |
139 | 35 | The VTE library provides a terminal emulator widget VteTerminal for | 37 | The VTE library provides a terminal emulator widget VteTerminal for |
140 | 36 | applications using the GTK+ toolkit. It also provides the VtePTY object | 38 | applications using the GTK+ toolkit. It also provides the VtePTY object |
141 | @@ -61,6 +63,7 @@ | |||
142 | 61 | Section: introspection | 63 | Section: introspection |
143 | 62 | Depends: ${gir:Depends}, | 64 | Depends: ${gir:Depends}, |
144 | 63 | ${misc:Depends} | 65 | ${misc:Depends} |
145 | 66 | Multi-Arch: same | ||
146 | 64 | Description: GObject introspection data for the VTE library | 67 | Description: GObject introspection data for the VTE library |
147 | 65 | This package contains introspection data for VTE, a terminal emulator | 68 | This package contains introspection data for VTE, a terminal emulator |
148 | 66 | widget for GTK+. | 69 | widget for GTK+. |
149 | @@ -82,6 +85,7 @@ | |||
150 | 82 | libvte-2.91-common | 85 | libvte-2.91-common |
151 | 83 | Recommends: libvte-2.91-doc | 86 | Recommends: libvte-2.91-doc |
152 | 84 | Conflicts: libvte-2.90-dev | 87 | Conflicts: libvte-2.90-dev |
153 | 88 | Multi-Arch: same | ||
154 | 85 | Description: Terminal emulator widget for GTK+ 3.0 - development files | 89 | Description: Terminal emulator widget for GTK+ 3.0 - development files |
155 | 86 | The VTE library provides a terminal emulator widget VteTerminal for | 90 | The VTE library provides a terminal emulator widget VteTerminal for |
156 | 87 | applications using the GTK+ toolkit. It also provides the VtePTY object | 91 | applications using the GTK+ toolkit. It also provides the VtePTY object |
157 | @@ -95,6 +99,7 @@ | |||
158 | 95 | Package: libvte-2.91-common | 99 | Package: libvte-2.91-common |
159 | 96 | Architecture: all | 100 | Architecture: all |
160 | 97 | Depends: ${misc:Depends} | 101 | Depends: ${misc:Depends} |
161 | 102 | Multi-Arch: foreign | ||
162 | 98 | Description: Terminal emulator widget for GTK+ 3.0 - common files | 103 | Description: Terminal emulator widget for GTK+ 3.0 - common files |
163 | 99 | The VTE library provides a terminal emulator widget VteTerminal for | 104 | The VTE library provides a terminal emulator widget VteTerminal for |
164 | 100 | applications using the GTK+ toolkit. It also provides the VtePTY object | 105 | applications using the GTK+ toolkit. It also provides the VtePTY object |
165 | 101 | 106 | ||
166 | === modified file 'debian/gir1.2-vte-2.91.install' | |||
167 | --- debian/gir1.2-vte-2.91.install 2016-01-04 09:09:44 +0000 | |||
168 | +++ debian/gir1.2-vte-2.91.install 2016-02-12 07:24:20 +0000 | |||
169 | @@ -1,1 +1,1 @@ | |||
171 | 1 | usr/lib/girepository-1.0/Vte-2.91.typelib | 1 | usr/lib/*/girepository-1.0/Vte-2.91.typelib |
172 | 2 | 2 | ||
173 | === modified file 'debian/libvte-2.91-0.install' | |||
174 | --- debian/libvte-2.91-0.install 2016-01-04 09:09:44 +0000 | |||
175 | +++ debian/libvte-2.91-0.install 2016-02-12 07:24:20 +0000 | |||
176 | @@ -1,1 +1,1 @@ | |||
178 | 1 | usr/lib/libvte-2.91.so.* | 1 | usr/lib/*/libvte-2.91.so.* |
179 | 2 | 2 | ||
180 | === removed file 'debian/libvte-2.91-0.lintian-overrides' | |||
181 | --- debian/libvte-2.91-0.lintian-overrides 2016-01-04 09:09:44 +0000 | |||
182 | +++ debian/libvte-2.91-0.lintian-overrides 1970-01-01 00:00:00 +0000 | |||
183 | @@ -1,2 +0,0 @@ | |||
184 | 1 | # Setgid on purpose to write the utmp file | ||
185 | 2 | libvte-2.91-0: setgid-binary usr/lib/libvte-2.91-0/gnome-pty-helper 2755 root/utmp | ||
186 | 3 | 0 | ||
187 | === modified file 'debian/libvte-2.91-dev.install' | |||
188 | --- debian/libvte-2.91-dev.install 2016-01-04 09:09:44 +0000 | |||
189 | +++ debian/libvte-2.91-dev.install 2016-02-12 07:24:20 +0000 | |||
190 | @@ -1,7 +1,7 @@ | |||
191 | 1 | usr/include/vte-2.91 | 1 | usr/include/vte-2.91 |
195 | 2 | usr/lib/pkgconfig/vte-2.91.pc | 2 | usr/lib/*/pkgconfig/vte-2.91.pc |
196 | 3 | usr/lib/libvte-2.91.a | 3 | usr/lib/*/libvte-2.91.a |
197 | 4 | usr/lib/libvte-2.91.so | 4 | usr/lib/*/libvte-2.91.so |
198 | 5 | usr/share/gir-1.0 | 5 | usr/share/gir-1.0 |
199 | 6 | usr/share/glade | 6 | usr/share/glade |
200 | 7 | usr/share/vala/vapi | 7 | usr/share/vala/vapi |
201 | 8 | 8 | ||
202 | === modified file 'debian/rules' | |||
203 | --- debian/rules 2016-01-04 09:09:44 +0000 | |||
204 | +++ debian/rules 2016-02-12 07:24:20 +0000 | |||
205 | @@ -14,19 +14,27 @@ | |||
206 | 14 | include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk | 14 | include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk |
207 | 15 | include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk | 15 | include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk |
208 | 16 | 16 | ||
209 | 17 | DEB_DH_AUTORECONF_ARGS = --as-needed | ||
210 | 18 | |||
211 | 19 | # Ensure at build time that the library has no dependencies on undefined | ||
212 | 20 | # symbols, and speed up loading. | ||
213 | 21 | DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,-O1 -Wl,--as-needed | ||
214 | 22 | include /usr/share/dpkg/default.mk | ||
215 | 23 | |||
216 | 17 | DEB_CONFIGURE_LIBEXECDIR := \$${prefix}/lib/$(libvte2.91N) | 24 | DEB_CONFIGURE_LIBEXECDIR := \$${prefix}/lib/$(libvte2.91N) |
217 | 18 | DEB_FIXPERMS_EXCLUDE += gnome-pty-helper | ||
218 | 19 | DEB_DH_MAKESHLIBS_ARGS_$(libvte2.91N) += --add-udeb=$(udeb) -- -c4 | 25 | DEB_DH_MAKESHLIBS_ARGS_$(libvte2.91N) += --add-udeb=$(udeb) -- -c4 |
219 | 20 | 26 | ||
220 | 21 | DEB_CONFIGURE_FLAGS_main += \ | 27 | DEB_CONFIGURE_FLAGS_main += \ |
222 | 22 | --enable-gnome-pty-helper \ | 28 | --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ |
223 | 23 | --enable-glade-catalogue \ | 29 | --enable-glade-catalogue \ |
224 | 24 | --enable-gtk-doc \ | 30 | --enable-gtk-doc \ |
225 | 25 | --enable-introspection \ | 31 | --enable-introspection \ |
226 | 26 | --with-gnutls | 32 | --with-gnutls |
227 | 27 | 33 | ||
228 | 34 | # FIXME: not honoured | ||
229 | 35 | #DEB_CONFIGURE_EXTRA_FLAGS_main += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) | ||
230 | 36 | |||
231 | 28 | DEB_CONFIGURE_FLAGS_udeb += \ | 37 | DEB_CONFIGURE_FLAGS_udeb += \ |
232 | 29 | --disable-gnome-pty-helper \ | ||
233 | 30 | --disable-gtk-doc \ | 38 | --disable-gtk-doc \ |
234 | 31 | --without-gnutls | 39 | --without-gnutls |
235 | 32 | 40 |
latest debian is now 0.42.4-1, can you update merge to that version