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

[Jackson Doak]

Merge 3.16 from debian

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-12-19 21:41:40 +0000
+++ debian/changelog	2015-06-05 20:02:56 +0000
@@ -1,3 +1,30 @@
+gnome-themes-standard (3.16.2-1ubuntu1) wily; urgency=medium
+
+  * Merge from debian. Remaining changes:
+    - debian/control.in:
+      + Have gnome-themes-standard recommend
+        adwaita-icon-theme-full | gnome-icon-theme-full
+      + Depend on adwaita-icon-theme | gnome-icon-theme over adwaita-icon-theme
+      + Use Ubuntu Vcs link
+    - debian/patches/ubuntu_a11y_fallback.patch:
+      + Also have HighContrast inheirit from the Humanity icon theme
+
+ -- Jackson Doak <[e-mail]>  Fri, 05 Jun 2015 19:29:58 +1000
+
+gnome-themes-standard (3.16.2-1) experimental; urgency=medium
+
+  * New upstream release.
+    - Drops the Metacity themes (new versions of both Mutter and Metacity
+      can use the Gtk+ theme for window decorations, in addition the
+      Adwaita and HighContrast themes will be shipped in metacity-common
+      package).
+    - Drops the HighContrast Gtk+ 3 theme (moved into gtk+3.0 itself).
+  * Make gnome-themes-standard-data break pre-3.16 versions of Mutter and
+    Metacity.
+  * Bump Standards-Version to 3.9.6, no changes needed.
+
+ -- Dmitry Shachnev <[e-mail]>  Mon, 01 Jun 2015 17:32:27 +0300
+
 gnome-themes-standard (3.14.2.3-0ubuntu1) vivid; urgency=medium
 
   * New upstream release. LP: #1399047

=== modified file 'debian/control'
--- debian/control	2014-12-19 21:41:40 +0000
+++ debian/control	2015-06-05 20:02:56 +0000
@@ -7,8 +7,8 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
-Uploaders: Andreas Henriksson <[e-mail]>, Debian GNOME Maintainers <[e-mail]>, Emilio Pozuelo Monfort <[e-mail]>, Josselin Mouette <[e-mail]>
-Standards-Version: 3.9.5
+Uploaders: Andreas Henriksson <[e-mail]>, Debian GNOME Maintainers <[e-mail]>, Dmitry Shachnev <[e-mail]>, Emilio Pozuelo Monfort <[e-mail]>, Josselin Mouette <[e-mail]>
+Standards-Version: 3.9.6
 Build-Depends: debhelper (>= 8.1.3),
                gnome-pkg-tools (>= 0.10),
                cdbs (>= 0.4.93~),
@@ -32,7 +32,7 @@
          ${shlibs:Depends}
 Recommends: gtk2-engines-pixbuf,
             gnome-accessibility-themes,
-            gnome-icon-theme-full | adwaita-icon-theme
+            adwaita-icon-theme-full | gnome-icon-theme-full
 Breaks: libmutter0 (<< 3.2),
         libgtk2.0-0 (<< 2.24.13)
 Description: Standard GNOME themes
@@ -41,9 +41,12 @@
 Package: gnome-themes-standard-data
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}, gnome-icon-theme | adwaita-icon-theme
+Depends: ${misc:Depends}, adwaita-icon-theme | gnome-icon-theme
 Replaces: gnome-themes-standard (<< 3.6.2-1)
-Breaks: gnome-themes-standard (<< 3.6.2-1), libgtk-3-0 (<< 3.13)
+Breaks: gnome-themes-standard (<< 3.6.2-1),
+        libgtk-3-0 (<< 3.13),
+        metacity (<< 3.16),
+        mutter (<< 3.15.4)
 Description: Data files for GNOME standard themes
  This package contains data files for standard themes for the GNOME
  desktop environment.

=== modified file 'debian/control.in'
--- debian/control.in	2014-12-19 21:41:40 +0000
+++ debian/control.in	2015-06-05 20:02:56 +0000
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: @GNOME_TEAM@
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Build-Depends: debhelper (>= 8.1.3),
                gnome-pkg-tools (>= 0.10),
                cdbs (>= 0.4.93~),
@@ -28,7 +28,7 @@
          ${shlibs:Depends}
 Recommends: gtk2-engines-pixbuf,
             gnome-accessibility-themes,
-            gnome-icon-theme-full | adwaita-icon-theme
+            adwaita-icon-theme-full | gnome-icon-theme-full
 Breaks: libmutter0 (<< 3.2),
         libgtk2.0-0 (<< 2.24.13)
 Description: Standard GNOME themes
@@ -37,9 +37,12 @@
 Package: gnome-themes-standard-data
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}, gnome-icon-theme | adwaita-icon-theme
+Depends: ${misc:Depends}, adwaita-icon-theme | gnome-icon-theme
 Replaces: gnome-themes-standard (<< 3.6.2-1)
-Breaks: gnome-themes-standard (<< 3.6.2-1), libgtk-3-0 (<< 3.13)
+Breaks: gnome-themes-standard (<< 3.6.2-1),
+        libgtk-3-0 (<< 3.13),
+        metacity (<< 3.16),
+        mutter (<< 3.15.4)
 Description: Data files for GNOME standard themes
  This package contains data files for standard themes for the GNOME
  desktop environment.