[SCM] smokeqt packaging branch, master, updated. debian/4.12.2-2-2-g1509ec7

[Scott Kitterman]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/smokeqt.git;a=commitdiff;h=1509ec7

The following commit has been merged in the master branch:
commit 1509ec70de85fcf89da986aa2a0e11a53da3f189
Author: Scott Kitterman <scott at kitterman.com>
Date:   Thu Sep 10 22:36:36 2015 -0400

    * New upstream release
    * Update watch file
    * Drop libsmokeqtwebkit4-3 and libqtwebkit-dev build-depends as part of
      getting rid of Qt4 WebKit (Closes: #784528)
      - Build-conflicts libqtwebkit-dev just to make sure
---
 debian/changelog | 11 +++++++++++
 debian/control   | 26 +++++++++++++-------------
 debian/watch     |  3 ++-
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 597f456..12ad594 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+smokeqt (4:4.14.3-1) unstable; urgency=medium
+
+  * Team upload
+  * New upstream release
+  * Update watch file
+  * Drop libsmokeqtwebkit4-3 and libqtwebkit-dev build-depends as part of
+    getting rid of Qt4 WebKit (Closes: #784528)
+    - Build-conflicts libqtwebkit-dev just to make sure
+
+ -- Scott Kitterman <scott at kitterman.com>  Thu, 10 Sep 2015 15:41:18 -0400
+
 smokeqt (4:4.12.2-2) unstable; urgency=medium
 
   * Release to unstable
diff --git a/debian/control b/debian/control
index c32c429..2a50753 100644
--- a/debian/control
+++ b/debian/control
@@ -14,10 +14,10 @@ Build-Depends: cmake,
                libqscintilla2-dev,
                libqt4-dev,
                libqt4-opengl-dev,
-               libqtwebkit-dev,
                pkg-config,
                pkg-kde-tools (>= 0.6.8),
                smoke-dev-tools (>= 4:4.11)
+Build-Conflicts: libqtwebkit-dev
 Standards-Version: 3.9.5
 Homepage: http://projects.kde.org/projects/kde/kdebindings/smoke/smokeqt
 Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/smokeqt.git
@@ -191,18 +191,18 @@ Description: Qt Ui Tools SMOKE library
  .
  This is part of the SMOKE Qt module.
 
-Package: libsmokeqtwebkit4-3
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Architecture: any
-Description: Qt WebKit SMOKE library
- SMOKE libraries are part of the bindings used for Qt and KDE. This package
- contains Qt WebKit SMOKE.
- .
- SMOKE provides infrastructure which is used for creating bindings for
- multiple languages such as Ruby, C# and PHP.
- .
- This is part of the SMOKE Qt module.
-
+#Package: libsmokeqtwebkit4-3
+#Depends: ${misc:Depends}, ${shlibs:Depends}
+#Architecture: any
+#Description: Qt WebKit SMOKE library
+# SMOKE libraries are part of the bindings used for Qt and KDE. This package
+# contains Qt WebKit SMOKE.
+# .
+# SMOKE provides infrastructure which is used for creating bindings for
+# multiple languages such as Ruby, C# and PHP.
+# .
+# This is part of the SMOKE Qt module.
+#
 Package: libsmokeqtxml4-3
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Architecture: any
diff --git a/debian/watch b/debian/watch
index 38518a7..c4cd02e 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
-http://download.kde.org/stable/([\d.]+)/src/smokeqt-([\d.]+).tar.xz
+http://download.kde.org/stable/(\d+(?:\.\d+)*)/src/ \
+(?:|.*/)smokeqt(?:[_\-]v?|)(\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)

-- 
smokeqt packaging