[SCM] Calligra suite packaging branch, master, updated. debian/2.8.5+dfsg-1-2-g6e0b308

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=6e0b308

The following commit has been merged in the master branch:
commit 6e0b3081724df6ac788d40ea6326e52f018e4a98
Author: Pino Toscano <pino at debian.org>
Date:   Sun Sep 14 19:06:32 2014 +0200

    watch: ignore +dfsg suffix in Debian version number
---
 debian/changelog | 2 ++
 debian/watch     | 1 +
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c839afc..4b67315 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 calligra (1:2.8.5+dfsg-2) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * watch file: ignore +dfsg suffix in Debian version number.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 14 Sep 2014 19:03:51 +0200
 
diff --git a/debian/watch b/debian/watch
index dce6b4c..1e5a573 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
 version=3
 
+opts=dversionmangle=s/\+dfsg\d*$// \
 ftp://ftp.kde.org/pub/kde/stable/calligra-([\d\.]+)/calligra-([\d\.]+)\.tar\.(?:bz2|xz)

-- 
Calligra suite packaging