[SCM] smokegen packaging branch, master, updated. 206491d618541e3f390b4e41de42ab14d816603d

[Pino Toscano]

The following commit has been merged in the master branch:
commit e979d5cf2f8a42f7420adfd15d4d3d5550d86a05
Author: Pino Toscano <pino at kde.org>
Date:   Wed Jun 29 14:04:21 2011 +0200

    Revert "disable smokegen_load_system_defines.diff"
    
    This reverts commit cb65e4656308970f82056494c45096f282210fee.
    
    smokegen_load_system_defines.diff will be fixed to compile with kdelibs >= 4.6
---
 debian/changelog      |    1 -
 debian/patches/series |    1 +
 2 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 960be73..85d5c2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,5 @@ smokegen (4:4.6.80-1) UNRELEASED; urgency=low
 
   [ David Palacio ]
   * Source package `kdebindings` split.
-  * Disable patch smokegen_load_system_defines.diff
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 17 Jun 2011 22:01:09 -0500
diff --git a/debian/patches/series b/debian/patches/series
index c702345..ca7c26c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix_segfault_in_generator_on_armel.diff
+smokegen_load_system_defines.diff
 version_cppparser_library.diff

-- 
smokegen packaging