[SCM] kbruch packaging branch, master, updated. debian/15.08.0-2-4-g36721bb

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kbruch.git;a=commitdiff;h=d0559f6

The following commit has been merged in the master branch:
commit d0559f67205b66b84d15e2623ef5ccb96214d423
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Oct 14 13:38:05 2015 +0200

    Remove upstream applied patch: learning_config_toolbar.patch
---
 debian/changelog                             |  1 +
 debian/patches/learning_config_toolbar.patch | 22 ----------------------
 debian/patches/series                        |  1 -
 3 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9f3a6c3..48aaf45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ kbruch (4:15.08.2-1~) UNRELEASED; urgency=medium
 
   * New upstream release (15.08.2).
   * Remove upstream applied patch: statusbar_menu.patch
+  * Remove upstream applied patch: learning_config_toolbar.patch
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 12 Oct 2015 15:33:32 +0200
 
diff --git a/debian/patches/learning_config_toolbar.patch b/debian/patches/learning_config_toolbar.patch
deleted file mode 100644
index 8e18848..0000000
--- a/debian/patches/learning_config_toolbar.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: 
-  * Set the toolbar editable. Resolves the following bug: Learning -> Settings -> Configure Toolbars... displays an empty 'Configure Toolbars' dialog.
-Author: Prathibha B <prathibhab at cdac.in>
-
----
-Bug-Debian: https://bugs.debian.org/796200
-Forwarded: no
-Last-Update: 2015-09-14
-
-Index: kbruch/src/FractionRingWidgetui.rc
-===================================================================
---- kbruch.orig/src/FractionRingWidgetui.rc	2015-09-14 11:53:11.815970558 +0200
-+++ kbruch/src/FractionRingWidgetui.rc	2015-09-14 11:53:11.815970558 +0200
-@@ -10,7 +10,7 @@
-     <Action name="file_quit"/>
-   </Menu>
- </MenuBar>
--<ToolBar name="exerciseToolBar" noEdit="true" fullWidth="true">
-+<ToolBar name="exerciseToolBar" noEdit="false" fullWidth="true">
-   <Action name="NewTask"/>
-   <Action name="Back"/>  
-   <Separator/>
diff --git a/debian/patches/series b/debian/patches/series
index 1fb2b55..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-learning_config_toolbar.patch

-- 
kbruch packaging