Merge lp:~noskcaj/gnome-themes-extra/316 into lp:~ubuntu-desktop/gnome-themes-extra/ubuntu

Proposed by Jackson Doak on 2015-06-05
Status: Merged
Merged at revision: 63
Proposed branch: lp:~noskcaj/gnome-themes-extra/316
Merge into: lp:~ubuntu-desktop/gnome-themes-extra/ubuntu
Diff against target: 110 lines (+42/-9)
3 files modified
debian/changelog (+27/-0)
debian/control (+8/-5)
debian/control.in (+7/-4)
To merge this branch: bzr merge lp:~noskcaj/gnome-themes-extra/316
Reviewer Review Type Date Requested Status
Daniel Holbach 2015-06-05 Approve on 2015-06-07
Review via email: mp+261281@code.launchpad.net

Description of the change

Merge 3.16 from debian

To post a comment you must log in.
Daniel Holbach (dholbach) wrote :

Thanks. Uploaded.

review: Approve

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 2014-12-19 21:41:40 +0000
3+++ debian/changelog 2015-06-05 20:02:56 +0000
4@@ -1,3 +1,30 @@
5+gnome-themes-standard (3.16.2-1ubuntu1) wily; urgency=medium
6+
7+ * Merge from debian. Remaining changes:
8+ - debian/control.in:
9+ + Have gnome-themes-standard recommend
10+ adwaita-icon-theme-full | gnome-icon-theme-full
11+ + Depend on adwaita-icon-theme | gnome-icon-theme over adwaita-icon-theme
12+ + Use Ubuntu Vcs link
13+ - debian/patches/ubuntu_a11y_fallback.patch:
14+ + Also have HighContrast inheirit from the Humanity icon theme
15+
16+ -- Jackson Doak <noskcaj@ubuntu.com> Fri, 05 Jun 2015 19:29:58 +1000
17+
18+gnome-themes-standard (3.16.2-1) experimental; urgency=medium
19+
20+ * New upstream release.
21+ - Drops the Metacity themes (new versions of both Mutter and Metacity
22+ can use the Gtk+ theme for window decorations, in addition the
23+ Adwaita and HighContrast themes will be shipped in metacity-common
24+ package).
25+ - Drops the HighContrast Gtk+ 3 theme (moved into gtk+3.0 itself).
26+ * Make gnome-themes-standard-data break pre-3.16 versions of Mutter and
27+ Metacity.
28+ * Bump Standards-Version to 3.9.6, no changes needed.
29+
30+ -- Dmitry Shachnev <mitya57@debian.org> Mon, 01 Jun 2015 17:32:27 +0300
31+
32 gnome-themes-standard (3.14.2.3-0ubuntu1) vivid; urgency=medium
33
34 * New upstream release. LP: #1399047
35
36=== modified file 'debian/control'
37--- debian/control 2014-12-19 21:41:40 +0000
38+++ debian/control 2015-06-05 20:02:56 +0000
39@@ -7,8 +7,8 @@
40 Priority: optional
41 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
42 XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
43-Uploaders: Andreas Henriksson <andreas@fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Josselin Mouette <joss@debian.org>
44-Standards-Version: 3.9.5
45+Uploaders: Andreas Henriksson <andreas@fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Dmitry Shachnev <mitya57@debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Josselin Mouette <joss@debian.org>
46+Standards-Version: 3.9.6
47 Build-Depends: debhelper (>= 8.1.3),
48 gnome-pkg-tools (>= 0.10),
49 cdbs (>= 0.4.93~),
50@@ -32,7 +32,7 @@
51 ${shlibs:Depends}
52 Recommends: gtk2-engines-pixbuf,
53 gnome-accessibility-themes,
54- gnome-icon-theme-full | adwaita-icon-theme
55+ adwaita-icon-theme-full | gnome-icon-theme-full
56 Breaks: libmutter0 (<< 3.2),
57 libgtk2.0-0 (<< 2.24.13)
58 Description: Standard GNOME themes
59@@ -41,9 +41,12 @@
60 Package: gnome-themes-standard-data
61 Architecture: all
62 Multi-Arch: foreign
63-Depends: ${misc:Depends}, gnome-icon-theme | adwaita-icon-theme
64+Depends: ${misc:Depends}, adwaita-icon-theme | gnome-icon-theme
65 Replaces: gnome-themes-standard (<< 3.6.2-1)
66-Breaks: gnome-themes-standard (<< 3.6.2-1), libgtk-3-0 (<< 3.13)
67+Breaks: gnome-themes-standard (<< 3.6.2-1),
68+ libgtk-3-0 (<< 3.13),
69+ metacity (<< 3.16),
70+ mutter (<< 3.15.4)
71 Description: Data files for GNOME standard themes
72 This package contains data files for standard themes for the GNOME
73 desktop environment.
74
75=== modified file 'debian/control.in'
76--- debian/control.in 2014-12-19 21:41:40 +0000
77+++ debian/control.in 2015-06-05 20:02:56 +0000
78@@ -4,7 +4,7 @@
79 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
80 XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
81 Uploaders: @GNOME_TEAM@
82-Standards-Version: 3.9.5
83+Standards-Version: 3.9.6
84 Build-Depends: debhelper (>= 8.1.3),
85 gnome-pkg-tools (>= 0.10),
86 cdbs (>= 0.4.93~),
87@@ -28,7 +28,7 @@
88 ${shlibs:Depends}
89 Recommends: gtk2-engines-pixbuf,
90 gnome-accessibility-themes,
91- gnome-icon-theme-full | adwaita-icon-theme
92+ adwaita-icon-theme-full | gnome-icon-theme-full
93 Breaks: libmutter0 (<< 3.2),
94 libgtk2.0-0 (<< 2.24.13)
95 Description: Standard GNOME themes
96@@ -37,9 +37,12 @@
97 Package: gnome-themes-standard-data
98 Architecture: all
99 Multi-Arch: foreign
100-Depends: ${misc:Depends}, gnome-icon-theme | adwaita-icon-theme
101+Depends: ${misc:Depends}, adwaita-icon-theme | gnome-icon-theme
102 Replaces: gnome-themes-standard (<< 3.6.2-1)
103-Breaks: gnome-themes-standard (<< 3.6.2-1), libgtk-3-0 (<< 3.13)
104+Breaks: gnome-themes-standard (<< 3.6.2-1),
105+ libgtk-3-0 (<< 3.13),
106+ metacity (<< 3.16),
107+ mutter (<< 3.15.4)
108 Description: Data files for GNOME standard themes
109 This package contains data files for standard themes for the GNOME
110 desktop environment.

Subscribers

People subscribed via source and target branches

to all changes: