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

[Jackson Doak]

Merge version 3.14 from debian.

[Tim Lunn (darkxst)]

Thanks Jackson, this looks good to me.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-09 03:59:37 +0000
+++ debian/changelog	2014-12-20 20:09:22 +0000
@@ -1,3 +1,54 @@
+gnome-themes-standard (3.14.2.3-0ubuntu1) vivid; urgency=medium
+
+  * New upstream release. LP: #1399047
+  * Merge from debian. Remaining changes:
+    - debian/control.in:
+      + Have gnome-themes-standard recommend gnome-icon-theme-full
+      + Use Ubuntu Vcs link
+    - debian/patches/ubuntu_a11y_fallback.patch:
+      + Also have HighContrast inheirit from the Humanity icon theme
+  * Depend on gnome-icon-theme | adwaita-icon-theme over adwaita-icon-theme
+
+ -- Jackson Doak <[e-mail]>  Thu, 18 Dec 2014 09:05:38 +1100
+
+gnome-themes-standard (3.14.2.2-1) unstable; urgency=medium
+
+  * New upstream stable release.
+    + Many improvements in the GTK2 theming.
+
+ -- Josselin Mouette <[e-mail]>  Sun, 30 Nov 2014 16:30:13 +0100
+
+gnome-themes-standard (3.14.0-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Andreas Henriksson <[e-mail]>  Tue, 23 Sep 2014 20:40:44 +0200
+
+gnome-themes-standard (3.13.90-2) unstable; urgency=medium
+
+  * Upload to unstable.
+
+ -- Andreas Henriksson <[e-mail]>  Fri, 19 Sep 2014 21:52:05 +0200
+
+gnome-themes-standard (3.13.90-1) experimental; urgency=medium
+
+  [ Andreas Henriksson ]
+  * New upstream development release.
+    - Note: default background moved to gnome-backgrounds.
+    - Note: adwaita-icon-theme split out to separate source.
+  * gnome-themes-standard-data:
+    - stop installing adwaita icon theme, now built from its own source.
+    - depend on adwaita-icon-theme
+    - stop installing gnome-background-properties xml
+  * Stop installing gtk-3.0 theme-engines (themes are now pure css)
+  * Bump Standards-Version 3.9.5
+
+  [ Sjoerd Simons ]
+  * debian/control.in: Let gnome-themes-standard-data break gtk (<< 3.13). New
+    themes can't be rendered by old gtk causing applications to be unusable.
+
+ -- Andreas Henriksson <[e-mail]>  Thu, 04 Sep 2014 20:49:43 +0200
+
 gnome-themes-standard (3.12.0-1ubuntu1) utopic; urgency=medium
 
   * Merge from debian. Remaining changes:

=== modified file 'debian/control'
--- debian/control	2014-06-29 07:50:39 +0000
+++ debian/control	2014-12-20 20:09:22 +0000
@@ -2,14 +2,13 @@
 # 
 # Modifications should be made to debian/control.in instead.
 # This file is regenerated automatically in the clean target.
-
 Source: gnome-themes-standard
 Section: gnome
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
-Uploaders: Emilio Pozuelo Monfort <[e-mail]>, Michael Biebl <[e-mail]>, Sjoerd Simons <[e-mail]>
-Standards-Version: 3.9.4
+Uploaders: Andreas Henriksson <[e-mail]>, Debian GNOME Maintainers <[e-mail]>, Emilio Pozuelo Monfort <[e-mail]>, Josselin Mouette <[e-mail]>
+Standards-Version: 3.9.5
 Build-Depends: debhelper (>= 8.1.3),
                gnome-pkg-tools (>= 0.10),
                cdbs (>= 0.4.93~),
@@ -33,7 +32,7 @@
          ${shlibs:Depends}
 Recommends: gtk2-engines-pixbuf,
             gnome-accessibility-themes,
-            gnome-icon-theme-full
+            gnome-icon-theme-full | adwaita-icon-theme
 Breaks: libmutter0 (<< 3.2),
         libgtk2.0-0 (<< 2.24.13)
 Description: Standard GNOME themes
@@ -42,9 +41,9 @@
 Package: gnome-themes-standard-data
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, gnome-icon-theme | adwaita-icon-theme
 Replaces: gnome-themes-standard (<< 3.6.2-1)
-Breaks: gnome-themes-standard (<< 3.6.2-1)
+Breaks: gnome-themes-standard (<< 3.6.2-1), libgtk-3-0 (<< 3.13)
 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-06-29 07:50:39 +0000
+++ debian/control.in	2014-12-20 20:09:22 +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.4
+Standards-Version: 3.9.5
 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
+            gnome-icon-theme-full | adwaita-icon-theme
 Breaks: libmutter0 (<< 3.2),
         libgtk2.0-0 (<< 2.24.13)
 Description: Standard GNOME themes
@@ -37,9 +37,9 @@
 Package: gnome-themes-standard-data
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, gnome-icon-theme | adwaita-icon-theme
 Replaces: gnome-themes-standard (<< 3.6.2-1)
-Breaks: gnome-themes-standard (<< 3.6.2-1)
+Breaks: gnome-themes-standard (<< 3.6.2-1), libgtk-3-0 (<< 3.13)
 Description: Data files for GNOME standard themes
  This package contains data files for standard themes for the GNOME
  desktop environment.

=== modified file 'debian/gnome-themes-standard-data.install'
--- debian/gnome-themes-standard-data.install	2014-06-09 03:59:37 +0000
+++ debian/gnome-themes-standard-data.install	2014-12-20 20:09:22 +0000
@@ -1,4 +1,2 @@
-usr/share/icons/Adwaita
 usr/share/themes/Adwaita
-usr/share/gnome-background-properties
 debian/cursor.theme usr/share/icons/Adwaita

=== modified file 'debian/gnome-themes-standard.install'
--- debian/gnome-themes-standard.install	2013-01-10 19:12:10 +0000
+++ debian/gnome-themes-standard.install	2014-12-20 20:09:22 +0000
@@ -1,2 +1,1 @@
-usr/lib/*/gtk-3.0/*/theming-engines/*.so
 usr/lib/*/gtk-2.0/*/engines/*.so