[numix-gtk-theme] 02/02: Apply 1002-Set-Adwaita-as-default-icon-theme.patch on Ubuntu only

[Jeremy Bicha]

This is an automated email from the git hooks/post-receive script.

jbicha pushed a commit to branch master
in repository numix-gtk-theme.

commit 8411a588466593973a3d2c33db30be19723e0730
Author: Jeremy Bicha <jbicha at debian.org>
Date:   Sat Nov 25 13:06:46 2017 -0500

    Apply 1002-Set-Adwaita-as-default-icon-theme.patch on Ubuntu only
---
 debian/patches/1002-Set-Adwaita-as-default-icon-theme.patch | 11 ++++++-----
 debian/patches/README                                       |  3 +++
 debian/patches/{series => ubuntu.series}                    |  0
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian/patches/1002-Set-Adwaita-as-default-icon-theme.patch b/debian/patches/1002-Set-Adwaita-as-default-icon-theme.patch
index e88ebec..901147c 100644
--- a/debian/patches/1002-Set-Adwaita-as-default-icon-theme.patch
+++ b/debian/patches/1002-Set-Adwaita-as-default-icon-theme.patch
@@ -1,5 +1,5 @@
 From 693123ad0a27631a4907a8e54c90cb0716377ff9 Mon Sep 17 00:00:00 2001
-From: Jeremy Bicha <jbicha at linux.com>
+From: Jeremy Bicha <jbicha at ubuntu.com>
 Date: Thu, 16 Jun 2016 19:46:25 -0400
 Subject: [PATCH] Set Adwaita as default icon theme for MATE's theme picker
  (#488)
@@ -7,6 +7,9 @@ Subject: [PATCH] Set Adwaita as default icon theme for MATE's theme picker
 Choosing a default icon theme is required for Numix to show up in
 MATE's theme picker (mate-appearance-properties)
 
+But Ubuntu Developers don't want to install numix-icon-theme by default.
+For instance, Xubuntu wants to include numix-gtk-theme by default, but
+not be forced to install the theme.
 ---
  src/index.theme | 1 +
  1 file changed, 1 insertion(+)
@@ -15,13 +18,11 @@ diff --git a/index.theme b/index.theme
 index c757888..04e3c00 100755
 --- a/src/index.theme
 +++ b/src/index.theme
-@@ -6,5 +6,6 @@ Encoding=UTF-8
+@@ -6,6 +6,6 @@ Encoding=UTF-8
  
  [X-GNOME-Metatheme]
  GtkTheme=Numix
+-IconTheme=Numix
 +IconTheme=Adwaita
  MetacityTheme=Numix
  ButtonLayout=:minimize,maximize,close
--- 
-2.8.1
-
diff --git a/debian/patches/README b/debian/patches/README
index 80c1584..25ea2bf 100644
--- a/debian/patches/README
+++ b/debian/patches/README
@@ -1,3 +1,6 @@
 0xxx: Grabbed from upstream development.
 1xxx: Possibly relevant for upstream adoption.
 2xxx: Only relevant for official Debian release.
+
+Add patches to both debian/patches/series and debian/patches/ubuntu.series
+if they should apply on Debian and on Ubuntu
diff --git a/debian/patches/series b/debian/patches/ubuntu.series
similarity index 100%
rename from debian/patches/series
rename to debian/patches/ubuntu.series

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/numix-gtk-theme.git