[SCM] gtk2-engines-oxygen packaging branch, master, updated. debian/1.2.4-1-5-gc4ac136

[Felix Geyer]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/gtk2-engines-oxygen.git;a=commitdiff;h=83d0e02

The following commit has been merged in the master branch:
commit 83d0e028ac4c8ab104238e363f33a33cba102dd4
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sat May 11 20:20:40 2013 +0200

    Refresh dont-build-demos.patch.
---
 debian/changelog                      |    1 +
 debian/patches/dont-build-demos.patch |    3 ++-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8f8c450..4852731 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ gtk2-engines-oxygen (1.3.3-1) UNRELEASED; urgency=low
 
   * Team upload.
   * New upstream release.
+  * Refresh dont-build-demos.patch.
 
  -- Felix Geyer <fgeyer at debian.org>  Sat, 11 May 2013 20:17:50 +0200
 
diff --git a/debian/patches/dont-build-demos.patch b/debian/patches/dont-build-demos.patch
index 2897acf..3d189ea 100644
--- a/debian/patches/dont-build-demos.patch
+++ b/debian/patches/dont-build-demos.patch
@@ -8,7 +8,7 @@ Forwarded: not-needed
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -211,4 +211,6 @@ configure_file( config.h.cmake ${CMAKE_B
+@@ -198,5 +198,7 @@ configure_file( config.h.cmake ${CMAKE_B
  add_subdirectory( src )
  add_subdirectory( rc )
  add_subdirectory( special-icons )
@@ -16,3 +16,4 @@ Forwarded: not-needed
 +if( NOT DEBIAN_NO_DEMOS )
 +  add_subdirectory( demo )
 +endif( NOT DEBIAN_NO_DEMOS )
+ 

-- 
gtk2-engines-oxygen packaging