[SCM] smokegen packaging branch, master, updated. debian/4.7.1-1-3-g06103fb

[David Palacio]

The following commit has been merged in the master branch:
commit 06103fbbc98b00e1f6932dfc66f86541182d52a4
Author: David Palacio <dpalacio at orbitalibre.org>
Date:   Thu Feb 9 21:40:55 2012 -0500

    Refresh patches
---
 debian/changelog                                   |    5 +++
 .../fix_segfault_in_generator_on_armel.diff        |   28 --------------------
 debian/patches/series                              |    1 -
 debian/patches/version_cppparser_library.diff      |    4 +-
 4 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7415798..da53469 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,11 @@ smokegen (4:4.8.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
+  [ David Palacio ]
+  * Update patches:
+    - Refresh version_cppparser_library.diff.
+    - Remove patch fix_segfault_in_generator_on_armel.diff. Applied upstream.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 09 Feb 2012 19:30:14 -0500
 
 smokegen (4:4.7.1-1) unstable; urgency=low
diff --git a/debian/patches/fix_segfault_in_generator_on_armel.diff b/debian/patches/fix_segfault_in_generator_on_armel.diff
deleted file mode 100644
index 0521ef4..0000000
--- a/debian/patches/fix_segfault_in_generator_on_armel.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-Author: Sune Vuorela <sune at debian.org>
-Description: Fix segfault when trying to parse/write the akonadi smoke part
- Fixes segfault seen on arm, but theoretically could happen more places.
- token_text can return a null pointer.
- Patch acknowledged by upstream.
-Last-Update: 2010-05-11
-
---- a/type_compiler.cpp
-+++ b/type_compiler.cpp
-@@ -191,11 +191,13 @@ void TypeCompiler::visitParameterDeclara
- 
- void TypeCompiler::visitPtrOperator(PtrOperatorAST* node)
- {
--    if (token_text(m_session->token_stream->kind(node->op))[0] == '*') {
--        QPair<bool, bool> cv = m_visitor->parseCv(node->cv);
--        pointerDepth.append(cv.first);
--    } else if (token_text(m_session->token_stream->kind(node->op))[0] == '&') {
--        isRef = true;
-+    if(token_text(m_session->token_stream->kind(node->op))) {
-+        if (token_text(m_session->token_stream->kind(node->op))[0] == '*') {
-+            QPair<bool, bool> cv = m_visitor->parseCv(node->cv);
-+            pointerDepth.append(cv.first);
-+        } else if (token_text(m_session->token_stream->kind(node->op))[0] == '&') {
-+            isRef = true;
-+        }
-     }
- }
- 
diff --git a/debian/patches/series b/debian/patches/series
index ca7c26c..7b74722 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-fix_segfault_in_generator_on_armel.diff
 smokegen_load_system_defines.diff
 version_cppparser_library.diff
diff --git a/debian/patches/version_cppparser_library.diff b/debian/patches/version_cppparser_library.diff
index 599d5f3..c520ddf 100644
--- a/debian/patches/version_cppparser_library.diff
+++ b/debian/patches/version_cppparser_library.diff
@@ -4,11 +4,11 @@ Last-Update: 2010-03-01
 
 --- a/parser/CMakeLists.txt
 +++ b/parser/CMakeLists.txt
-@@ -36,6 +36,7 @@ set(cppparser_LIB_SRCS
+@@ -36,6 +36,7 @@
  
  add_definitions(-D__CPPPARSER_BUILDING)
  add_library(cppparser SHARED ${cppparser_LIB_SRCS})
 +set_target_properties(cppparser PROPERTIES VERSION 0a.0.0 SOVERSION 0a)
  target_link_libraries(cppparser ${QT_QTCORE_LIBRARY})
  
- install(TARGETS cppparser LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+ install(TARGETS cppparser LIBRARY DESTINATION ${LIB_INSTALL_DIR}

-- 
smokegen packaging