[SCM] QImageBlitz packaging branch, master, updated. debian/0.0.6-3

[Modestas Vainius]

The following commit has been merged in the master branch:
commit c2b4f4ef4342b3eeab59b0c2c4983a2701a60baf
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Mar 13 22:51:19 2011 +0200

    Switch debian/rules engine to qt-kde-team/2/*.
---
 debian/changelog       |    1 +
 debian/control         |    2 +-
 debian/cpu-optimize.mk |   48 ------------------------------------------------
 debian/rules           |   19 +++++++++++++++----
 4 files changed, 17 insertions(+), 53 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3ae943c..390c210 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 qimageblitz (1:0.0.6-3) UNRELEASED; urgency=low
 
+  * Switch debian/rules engine to qt-kde-team/2/*.
 
  -- Modestas Vainius <modax at debian.org>  Sun, 13 Mar 2011 22:36:22 +0200
 
diff --git a/debian/control b/debian/control
index 8ebfc95..b6a812f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: optional
 Section: libs
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Sune Vuorela <sune at debian.org>, Modestas Vainius <modax at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, cmake, pkg-kde-tools (>= 0.9), libqt4-dev (>= 4.4.0~)
+Build-Depends: debhelper (>= 7), cmake, pkg-kde-tools (>= 0.11), libqt4-dev (>= 4.4.0~)
 Standards-Version: 3.9.1
 Homepage: http://www.kde.org/
 Vcs-Git: git://git.debian.org/pkg-kde/kde-req/qimageblitz.git
diff --git a/debian/cpu-optimize.mk b/debian/cpu-optimize.mk
deleted file mode 100644
index 1a2a99c..0000000
--- a/debian/cpu-optimize.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2008 Matthew Rosewarne <mrosewarne at inoutbox.com>
-# Description: Determines possible CPU optimisations.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_rules_cpu_optimize
-_cdbs_rules_cpu_optimize := 1
-endif
-
-include $(_cdbs_rules_path)/buildvars.mk$(_cdbs_makefile_suffix)
-
-
-_cdbs_cpu_opt_i386 := 3dnow mmx sse sse2 sse3
-_cdbs_cpu_opt_amd64 := 3dnow mmx sse sse2 sse3
-_cdbs_cpu_opt_powerpc := altivec
-
-
-ifdef _cdbs_cpu_opt_$(DEB_BUILD_ARCH_CPU)
-	DEB_BUILD_ARCH_CPU_OPT = $(_cdbs_cpu_opt_$(DEB_BUILD_ARCH_CPU))
-else
-	DEB_BUILD_ARCH_CPU_OPT =
-endif
-
-ifdef _cdbs_cpu_opt_$(DEB_HOST_ARCH_CPU)
-	DEB_HOST_ARCH_CPU_OPT = $(_cdbs_cpu_opt_$(DEB_HOST_ARCH_CPU))
-else
-	DEB_HOST_ARCH_CPU_OPT =
-endif
diff --git a/debian/rules b/debian/rules
index daa1bd3..8ce1d8b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,19 @@
 #!/usr/bin/make -f
 
+dh = --dbg-package=libqimageblitz-dbg
 
-include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
-include debian/cpu-optimize.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+
+cpu_opt_i386 = 3dnow mmx sse sse2 sse3
+cpu_opt_amd64 = 3dnow mmx sse sse2 sse3
+cpu_opt_powerpc = altivec
+
+build_arch_opts = $(cpu_opt_$(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU))
+
+ifneq (,$(build_arch_opts))
+
+override_dh_auto_configure:
+	$(overriden_command) -- $(shell echo $(foreach opt,$(build_arch_opts),-DHAVE_$(opt)=ON) | tr '[:lower:]' '[:upper:]')
+
+endif
 
-DEB_CMAKE_EXTRA_FLAGS += \
-			$(shell echo $(foreach cpuopt,$(DEB_BUILD_ARCH_CPU_OPT),-DHAVE_$(cpuopt):BOOL=ON) | tr '[:lower:]' '[:upper:]')

-- 
QImageBlitz packaging