[SCM] guitarix/master: Revert "Add patch to remove non DSFG file"

[viccuad-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a44d236139f5cea3e655895c49c428d2cf4520f7
Author: Víctor Cuadrado Juan <me at viccuad.me>
Date:   Mon Apr 25 11:27:51 2016 +0200

    Revert "Add patch to remove non DSFG file"
    
    This reverts commit f104a53e6514338c6240c0aa6432488faa203da2.
    
    The non DFSG file is not present anymore.

diff --git a/debian/patches/07-remove-DFSG-file.patch b/debian/patches/07-remove-DFSG-file.patch
deleted file mode 100644
index 8ab8d45..0000000
--- a/debian/patches/07-remove-DFSG-file.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Substitute usage of rcstyles/gx-dezert_18.png for gx18.png
- gx-dezert_18.png is under CC-BY-2.0, not DFSG accepted
-Author: Víctor Cuadrado Juan <me at viccuad.me>
-Applied-Upstream: no
----
---- a/rcstyles/gx_head_gx3-dezert.rc
-+++ b/rcstyles/gx_head_gx3-dezert.rc
-@@ -80,8 +80,8 @@ GxPaintBox::skin-gradient = {
- 
-   GxPaintBox::width =600
-   GxPaintBox::height =180
--  stock["main_image"] = {{"gx-dezert_18.png"}}
--  stock["gxhead"] = {{"gx-dezert_18.png"}}
-+  stock["main_image"] = {{"gx18.png"}}
-+  stock["gxhead"] = {{"gx18.png"}}
-   GxPaintBox::icon-set =3
- }
- class "*GxPaintBox" style "gx_dezert-paintbox"
-@@ -141,7 +141,7 @@ class "*GtkExpander" style:highest "gx_d
- style "gx_dezert-event"
- {
- # main window background pixmap
--bg_pixmap[NORMAL] = "gx-dezert_18.png"
-+bg_pixmap[NORMAL] = "gx18.png"
- }
- widget "*.osc_box" style:highest "gx_dezert-event"
- widget "*.main_window" style:highest "gx_dezert-event"
diff --git a/debian/patches/series b/debian/patches/series
index 253efbd..3337d7d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-07-remove-DFSG-file.patch
 06-log-stdout.patch
 05-fix-spelling.patch
 04-fix-desktop.patch

-- 
guitarix packaging