[SCM] umbrello packaging branch, master, updated. debian/15.08.1-1-3-g92807d9

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit e4346c25c35784bc0d62a3183f1d1bede88a6e84
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Oct 15 00:56:17 2015 +0200

    Remove upstream patch: upstream_add_appstream_metadata.diff
---
 debian/changelog                                   |  1 +
 debian/patches/series                              |  1 -
 .../patches/upstream_add_appstream_metadata.diff   | 51 ----------------------
 3 files changed, 1 insertion(+), 52 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4eb5ff7..a5b6b79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 umbrello (4:15.08.2-1~) UNRELEASED; urgency=medium
 
   * New upstream release (15.08.2).
+  * Remove upstream patch: upstream_add_appstream_metadata.diff
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 12 Oct 2015 15:24:51 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 6b75dfa..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-upstream_add_appstream_metadata.diff
diff --git a/debian/patches/upstream_add_appstream_metadata.diff b/debian/patches/upstream_add_appstream_metadata.diff
deleted file mode 100644
index 8976dc4..0000000
--- a/debian/patches/upstream_add_appstream_metadata.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-commit 70ecfc71c7bf6400560b964d8ed9dfaf2a6abb57
-Author: Matthias Klumpp <matthias at tenstral.net>
-Date:   Thu Aug 6 15:18:02 2015 +0200
-
-    Add AppStream metadata
-    
-    BUG:352607
-    
-    (cherry picked from commit fa2014c9d3edb2cb144bc9f5f0edafa789c2975c)
-    
-    Conflicts:
-    	umbrello/CMakeLists.txt
-
-diff --git a/umbrello/org.kde.umbrello.appdata.xml b/umbrello/org.kde.umbrello.appdata.xml
-new file mode 100644
-index 0000000..bdac08d
---- /dev/null
-+++ b/umbrello/org.kde.umbrello.appdata.xml
-@@ -0,0 +1,32 @@
-+<?xml version="1.0" ?>
-+<component type="desktop">
-+  <id>org.kde.umbrello.desktop</id>
-+  <metadata_license>CC0-1.0</metadata_license>
-+  <project_license>GPL-2.0+</project_license>
-+  <name>Umbrello</name>
-+  <summary>UML Modeller</summary>
-+  <description>
-+    <p>
-+      Umbrello is a Unified Modelling Language (UML) modelling tool and code generator.
-+      It can create diagrams of software and other systems in the industry-standard UML format, and can also generate code from UML diagrams
-+      in a variety of programming languages.
-+    </p>
-+    <p>Features:</p>
-+    <ul>
-+      <li>Supported formats: XMI</li>
-+      <li>Several type of diagrams supported: use case, class, sequence, collaboration, state, activity, component, deployment, entity relationship</li>
-+    </ul>
-+  </description>
-+  <url type="homepage">http://umbrello.kde.org</url>
-+  <url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&product=umbrello</url>
-+  <url type="help">http://docs.kde.org/stable/en/kdesdk/umbrello/index.html</url>
-+  <screenshots>
-+    <screenshot type="default">
-+      <image>http://kde.org/images/screenshots/umbrello.png</image>
-+    </screenshot>
-+  </screenshots>
-+  <project_group>KDE</project_group>
-+  <provides>
-+    <binary>umbrello</binary>
-+  </provides>
-+</component>

-- 
umbrello packaging