[SCM] frameworkintegration packaging branch, master, updated. debian/5.37.0-2-105-ge9c37f4

Maximiliano Curia maxy at moszumanska.debian.org
Tue Jan 2 18:25:17 UTC 2018


Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/frameworkintegration.git;a=commitdiff;h=f94a6af

The following commit has been merged in the master branch:
commit f94a6afa44ef2b1b1b0c6ee3b0f7159ab932eef0
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Dec 14 08:33:20 2017 -0300

    Drop unreleased changelog entries and trim trailing spaces
    
    Gbp-Dch: Ignore
---
 debian/changelog | 30 +++---------------------------
 1 file changed, 3 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f3d164c..69f4eef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -261,17 +261,6 @@ frameworkintegration (5.18.0-1) experimental; urgency=medium
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 27 Jan 2016 13:33:16 +0100
 
-frameworkintegration (5.18.0-0ubuntu1) UNRELEASED; urgency=medium
-
-  [ Scarlett Clark ]
-  * Debian merge. No remaining changes. 
-  * New upstream release Xenial
-
-  [ Philip Muškovac ]
-  * New upstream release
-
- -- Philip Muškovac <yofel at kubuntu.org>  Wed, 06 Jan 2016 14:54:38 +0100
-
 frameworkintegration (5.16.0-1) unstable; urgency=medium
 
   * New upstream release (5.16.0).
@@ -285,19 +274,6 @@ frameworkintegration (5.15.0-1) unstable; urgency=medium
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 09 Oct 2015 19:15:47 +0200
 
-frameworkintegration (5.15.0-0ubuntu2) UNRELEASED; urgency=medium
-
-  * Vivid backport. 
-  * Refresh install file.
-  * Frameworkintegration requires kconf_update to build,
-    which resides in libkf5config-bin. Adding to build deps. 
-  * Revert last change, added runtime dep to kconfig instead
-    due to the number of packages it affected. 
-  * 
-  * Fix merge madness. 
-
- -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 08 Oct 2015 20:22:00 -0700
-
 frameworkintegration (5.15.0-0ubuntu2) xenial; urgency=medium
 
   * Fix autopackagetests by adding allow-stderr to the requirements.
@@ -348,9 +324,9 @@ frameworkintegration (5.12.0-0ubuntu1) wily; urgency=medium
 
   * New upstream release
   * Fix merge, remove broken backport.
-  * Vivid backport. 
+  * Vivid backport.
   * Apply 0001-Fix-changelog-format-to-avoid-a-lintian-warning.patch
-    provided by santa. 
+    provided by santa.
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 03 Aug 2015 14:23:00 +0200
 
@@ -449,7 +425,7 @@ frameworkintegration (5.2.0-0ubuntu1) utopic; urgency=medium
 
   [ Scarlett Clark ]
   * Fix copyright file to resolve space-in-std-shortname-in-dep5-copyright
-    lintian error. 
+    lintian error.
   * Add missing file to install.
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 11 Sep 2014 20:17:44 +0000

-- 
frameworkintegration packaging



More information about the pkg-kde-commits mailing list