Merge lp:~noskcaj/ubuntu/trusty/gnome-themes-standard/merge into lp:ubuntu/trusty/gnome-themes-standard

[Jackson Doak]

Merge from debian

[Daniel Holbach (dholbach)]

This merge does not make too much change - it doesn't amount to much more than a rebuild (only changes in d/changelog). Still sponsoring it as it's in the sponsoring queue.

review: Approve

[Jackson Doak (noskcaj)]

I'm just trying to have all the gnome packages merged for ease of work in
the future.

On Sat, Dec 21, 2013 at 3:36 AM, Daniel Holbach
<email address hidden>wrote:

> Review: Approve
>
> This merge does not make too much change - it doesn't amount to much more
> than a rebuild (only changes in d/changelog). Still sponsoring it as it's
> in the sponsoring queue.
> --
>
> https://code.launchpad.net/~noskcaj/ubuntu/trusty/gnome-themes-standard/merge/+merge/199558
> You are the owner of lp:~noskcaj/ubuntu/trusty/gnome-themes-standard/merge.
>

=== removed directory '.pc/01_gtk-update-icon-cache_name.patch'
=== removed file '.pc/01_gtk-update-icon-cache_name.patch/configure.ac'
--- .pc/01_gtk-update-icon-cache_name.patch/configure.ac	2013-09-07 16:25:06 +0000
+++ .pc/01_gtk-update-icon-cache_name.patch/configure.ac	1970-01-01 00:00:00 +0000
@@ -1,92 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.53)
-
-AC_INIT([gnome-themes-standard], [3.8.4],
-        [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-themes-standard])
-
-AM_INIT_AUTOMAKE([1.9 tar-ustar foreign dist-xz no-dist-gzip])
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-
-PKG_PROG_PKG_CONFIG([0.19])
-
-AC_PROG_SED
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_PROG_MAKE_SET
-AM_PATH_GLIB_2_0
-
-dnl Initialize libtool
-AM_DISABLE_STATIC
-AC_LIBTOOL_WIN32_DLL
-AM_PROG_LIBTOOL
-
-dnl Initialize intltool
-IT_PROG_INTLTOOL([0.40.0])
-
-GETTEXT_PACKAGE="${PACKAGE}"
-AC_SUBST(GETTEXT_PACKAGE)
-
-AC_ARG_ENABLE([gtk3-engine],
-              AC_HELP_STRING([--disable-gtk3-engine],
-                             [Disable Gtk+ 3.x engine [default=no]]),
-              enable_gtk3_engine=$enableval,
-              enable_gtk3_engine=yes)
-AC_MSG_CHECKING([building gtk3 engine])
-AM_CONDITIONAL(GTK3_ENGINE, test "x$enable_gtk3_engine" = "xyes")
-AC_MSG_RESULT([$enable_gtk3_engine])
-
-GTK_VERSION_REQUIRED=3.6.2
-if test "x$enable_gtk3_engine" = "xyes"; then
-  PKG_CHECK_MODULES([GTK3_ENGINE], [gtk+-3.0 >= $GTK_VERSION_REQUIRED librsvg-2.0])
-  PKG_CHECK_MODULES([HIGHCONTRAST], [cairo gio-2.0 gdk-pixbuf-2.0 gdk-3.0])
-fi
-
-GTK3_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`
-AC_SUBST(GTK3_VERSION)
-
-AC_ARG_ENABLE([gtk2-engine],
-              AC_HELP_STRING([--disable-gtk2-engine],
-                             [Disable Gtk+-2 engine [default=no]]),
-              enable_gtk2_engine=$enableval,
-              enable_gtk2_engine=yes)
-AC_MSG_CHECKING([building gtk2 engine])
-AM_CONDITIONAL(GTK2_ENGINE, test "x$enable_gtk2_engine" = "xyes")
-AC_MSG_RESULT([$enable_gtk2_engine])
-
-GTK2_VERSION_REQUIRED=2.24.15
-if test "x$enable_gtk2_engine" = "xyes"; then
-  PKG_CHECK_MODULES([GTK2_ENGINE], [gtk+-2.0 >= $GTK2_VERSION_REQUIRED gdk-2.0 >= $GTK2_VERSION_REQUIRED])
-fi
-
-GTK2_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
-AC_SUBST(GTK2_VERSION)
-
-GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
-AC_SUBST(GLIB_COMPILE_RESOURCES)
-
-AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache)
-if test -z "$GTK_UPDATE_ICON_CACHE"; then
-    AC_MSG_ERROR([Could not find gtk-update-icon-cache])
-fi
-
-# Workaround to make aclocal get the right flags
-AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}")
-
-AC_CONFIG_FILES([
-Makefile
-themes/Makefile
-themes/Adwaita/Makefile
-themes/Adwaita/backgrounds/Makefile
-themes/Adwaita/cursors/Makefile
-themes/Adwaita/gtk-2.0/Makefile
-themes/Adwaita/gtk-3.0/Makefile
-themes/Adwaita/metacity-1/Makefile
-themes/HighContrast/Makefile
-themes/HighContrast/gtk-2.0/Makefile
-themes/HighContrast/gtk-3.0/Makefile
-themes/HighContrast/icons/Makefile
-themes/HighContrast/metacity-1/Makefile
-po/Makefile.in
-])
-
-AC_OUTPUT

=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2013-05-27 12:41:28 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-01_gtk-update-icon-cache_name.patch
-ubuntu_a11y_fallback.patch

=== removed directory '.pc/ubuntu_a11y_fallback.patch'
=== removed directory '.pc/ubuntu_a11y_fallback.patch/themes'
=== removed directory '.pc/ubuntu_a11y_fallback.patch/themes/HighContrast'
=== removed directory '.pc/ubuntu_a11y_fallback.patch/themes/HighContrast/icons'
=== removed file '.pc/ubuntu_a11y_fallback.patch/themes/HighContrast/icons/index.theme.in'
--- .pc/ubuntu_a11y_fallback.patch/themes/HighContrast/icons/index.theme.in	2013-05-27 12:41:28 +0000
+++ .pc/ubuntu_a11y_fallback.patch/themes/HighContrast/icons/index.theme.in	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-[Icon Theme]
-Name=HighContrast
-Comment=High contrast scalable icons with black borders
-Inherits=gnome
-Example=folder
-
-Directories=@THEME_DIRS@

=== modified file 'configure.ac'
--- configure.ac	2013-09-07 16:25:06 +0000
+++ configure.ac	2013-12-18 20:56:06 +0000
@@ -64,9 +64,9 @@
 GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
 AC_SUBST(GLIB_COMPILE_RESOURCES)
 
-AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache-3.0)
+AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache)
 if test -z "$GTK_UPDATE_ICON_CACHE"; then
-    AC_MSG_ERROR([Could not find gtk-update-icon-cache-3.0])
+    AC_MSG_ERROR([Could not find gtk-update-icon-cache])
 fi
 
 # Workaround to make aclocal get the right flags

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-07 16:25:06 +0000
+++ debian/changelog	2013-12-18 20:56:06 +0000
@@ -1,3 +1,20 @@
+gnome-themes-standard (3.8.4-1ubuntu1) trusty; urgency=medium
+
+  * Merge from debian. Remaining changes:
+    - debian/control.in:
+      + Have gnome-themes-standard recommend gnome-icon-theme-full
+    - debian/patches/ubuntu_a11y_fallback.patch:
+      + Also have HighContrast inheirit from the Humanity icon theme
+    - Backport new blinds background from 3.10
+
+ -- Jackson Doak <[e-mail]>  Thu, 19 Dec 2013 07:39:40 +1100
+
+gnome-themes-standard (3.8.4-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Michael Biebl <[e-mail]>  Tue, 17 Sep 2013 02:15:38 +0200
+
 gnome-themes-standard (3.8.4-0ubuntu1) saucy; urgency=low
 
   * New upstream release.
@@ -6,6 +23,12 @@
 
  -- Jeremy Bicha <[e-mail]>  Sat, 07 Sep 2013 16:25:06 -0400
 
+gnome-themes-standard (3.8.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Michael Biebl <[e-mail]>  Thu, 01 Aug 2013 02:54:20 +0200
+
 gnome-themes-standard (3.8.3-0ubuntu1) saucy; urgency=low
 
   [ Jeremy Bicha ]

=== modified file 'themes/HighContrast/icons/index.theme.in'
--- themes/HighContrast/icons/index.theme.in	2013-05-27 12:41:28 +0000
+++ themes/HighContrast/icons/index.theme.in	2013-12-18 20:56:06 +0000
@@ -1,7 +1,7 @@
 [Icon Theme]
 Name=HighContrast
 Comment=High contrast scalable icons with black borders
-Inherits=gnome,Humanity
+Inherits=gnome
 Example=folder
 
 Directories=@THEME_DIRS@