[SCM] KDevelop PG-Qt packaging branch, master, updated. debian/2.0-2

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/kdevelop-pg-qt.git;a=commitdiff;h=0550c90

The following commit has been merged in the master branch:
commit 0550c9023e8be6a61c5ee36421a73012eee81e86
Author: Pino Toscano <pino at debian.org>
Date:   Thu Aug 25 19:00:11 2016 +0200

    update the patches
    
    - upstream_fix-some-warnings: drop, backported from upstream
    - fix_cmake_installation.diff: drop, fixed upstream
---
 debian/changelog                           |  4 +++
 debian/patches/fix_cmake_installation.diff | 15 ----------
 debian/patches/series                      |  2 --
 debian/patches/upstream_fix-some-warnings  | 45 ------------------------------
 debian/watch                               |  4 +--
 5 files changed, 6 insertions(+), 64 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e5d1297..be2b602 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ kdevelop-pg-qt (2.0-0r1) UNRELEASED; urgency=medium
 
   [ Pino Toscano ]
   * New upstream release.
+  * Update watch file.
+  * Update the patches:
+    - upstream_fix-some-warnings: drop, backported from upstream
+    - fix_cmake_installation.diff: drop, fixed upstream
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 25 Aug 2016 18:54:02 +0200
 
diff --git a/debian/patches/fix_cmake_installation.diff b/debian/patches/fix_cmake_installation.diff
deleted file mode 100644
index 7eabf21..0000000
--- a/debian/patches/fix_cmake_installation.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Pino Toscano <pino at debian.org>
-Description: Set LIB_INSTALL_DIR even with no KDE4 stuff.
-Forwarded: no
-Last-Update: 2012-03-25
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -15,6 +15,7 @@ if(NOT KDE4_FOUND)
-     cmake_policy(SET CMP0002 OLD)
-     find_package(Qt4)
-     set(DATA_INSTALL_DIR share)
-+    set(LIB_INSTALL_DIR lib)
- endif(NOT KDE4_FOUND)
- 
- # Use colored output (since cmake 2.4.0)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index cd31ded..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-upstream_fix-some-warnings
-fix_cmake_installation.diff
diff --git a/debian/patches/upstream_fix-some-warnings b/debian/patches/upstream_fix-some-warnings
deleted file mode 100644
index 3651ec4..0000000
--- a/debian/patches/upstream_fix-some-warnings
+++ /dev/null
@@ -1,45 +0,0 @@
-commit ac587957cd0cabbc668604507e2cfebb6810ed09
-Author: Milian Wolff <mail at milianw.de>
-Date:   Thu Nov 29 15:56:40 2012 +0100
-
-    fix some warnings
-
-diff --git a/kdev-pg/kdev-pg-code-gen.cpp b/kdev-pg/kdev-pg-code-gen.cpp
-index e06c6be..badb461 100644
---- a/kdev-pg/kdev-pg-code-gen.cpp
-+++ b/kdev-pg/kdev-pg-code-gen.cpp
-@@ -51,7 +51,7 @@ namespace KDevPG
- 
-   void generateCondition(const World::NodeSet& s, QTextStream& out)
-   {
--    if(s.size() == 0 || s.size() == 1 && nodeCast<Model::ZeroItem*>(*s.begin()) != 0)
-+    if(s.size() == 0 || (s.size() == 1 && nodeCast<Model::ZeroItem*>(*s.begin()) != 0))
-     {
-       out << "true /*epsilon*/";
-       return;
-diff --git a/kdev-pg/kdev-pg-lexer.ll b/kdev-pg/kdev-pg-lexer.ll
-index a0864af..9261d71 100644
---- a/kdev-pg/kdev-pg-lexer.ll
-+++ b/kdev-pg/kdev-pg-lexer.ll
-@@ -425,7 +425,7 @@ void appendLineBuffer()
-   strcpy(yyTextLine+currentOffset, yytext + (yymoreFlag ? lastTextLeng : 0)); /* append current */
-   /* strcpy is faster than strcat */
-   
--  Q_ASSERT(strlen(yyTextLine) < yyTextLineLeng);
-+  Q_ASSERT(strlen(yyTextLine) < size_t(yyTextLineLeng));
-   
-   lastTextLeng = strlen(yytext);
-   yymoreFlag = false;
-diff --git a/kdev-pg/kdev-pg-parser.yy b/kdev-pg/kdev-pg-parser.yy
-index d5a25f5..8f8d604 100644
---- a/kdev-pg/kdev-pg-parser.yy
-+++ b/kdev-pg/kdev-pg-parser.yy
-@@ -309,7 +309,7 @@ opt_lexer_action
-     | T_CONTINUE {
-         r = "
lxCONTINUE;
";
-       }
--    | /* empty */ { r = "
lxSKIP
" }
-+    | /* empty */ { r = "
lxSKIP
"; }
-     ;
- 
- regexp
diff --git a/debian/watch b/debian/watch
index d19bcc0..2d7be65 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
-version=3
+version=4
 
-ftp://ftp.kde.org/pub/kde/stable/kdevelop-pg-qt/([\d.]+)/src/kdevelop-pg-qt-([\d.]+).tar.bz2
+http://download.kde.org/stable/kdevelop-pg-qt/([\d.]+)/src/kdevelop-pg-qt-([\d.]+).tar.xz

-- 
KDevelop PG-Qt packaging