[SCM] projectm packaging branch, master, updated. upstream/2.0.1+dfsg-11-g3fada10

[ximion-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4c4b6ce30e752d6c54c4dc728a9817ddc8db9c57
Author: Matthias Klumpp <matthias at nlinux.org>
Date:   Thu Jun 24 18:59:47 2010 +0200

    Replaced CDBS with Debhelper
    
    * Updated dependencies
    * Removed useless roles

diff --git a/debian/control b/debian/control
index 05745fc..e3ff859 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: sound
 Priority: optional
 Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Matthias Klumpp <matthias at nlinux.org>
-Build-Depends: debhelper (>= 7), cdbs, cmake, libqt4-dev, libqt4-opengl-dev, libjack-dev,
+Build-Depends: debhelper (>= 7.0.50~), cmake, libqt4-dev, libqt4-opengl-dev, libjack-dev,
  libglew-dev, libgl1-mesa-dev, libglu-dev, libx11-dev, libice-dev, libpulse-dev, libfreetype6-dev,
  libvisual-0.4-dev, libsdl1.2-dev, libftgl-dev
 Standards-Version: 3.8.4
@@ -70,7 +70,7 @@ Description: projectM Qt4 bindings
 Package: libprojectm-qt-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libprojectm-qt1 (= ${binary:Version})
+Depends: ${misc:Depends}, libprojectm-qt-1 (= ${binary:Version})
 Description: projectM Qt4 (development files)
  projectM is an iterative music visualization library which uses
  OpenGL for hardware acceleration. It is compatible with Milkdrop
diff --git a/debian/rules b/debian/rules
index 7402b66..a6b8072 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,28 +1,42 @@
 #!/usr/bin/make -f
-# -*- mode: makefile; coding: utf-8 -*-
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
+# Use this variable to allow options passed to cmake to be overridable
+DEB_CMAKE_OPTIONS ?= -DCMAKE_VERBOSE_MAKEFILE=ON \
+		-DCMAKE_INSTALL_PREFIX="/usr" \
+		-DCMAKE_C_FLAGS="$(DEB_CFLAGS)" \
+		-DINCLUDE-PROJECTM-TEST=OFF \
+		-DINCLUDE-PROJECTM-JACK=ON
 
-DEB_SRCDIR := ./src
-DEB_DH_INSTALL_SOURCEDIR := $(CURDIR)/debian/tmp
-DEB_CMAKE_EXTRA_FLAGS := -DINCLUDE-PROJECTM-TEST=OFF -DINCLUDE-PROJECTM-JACK=ON
-DEB_DH_INSTALL_ARGS := --list-missing
+SRC_DIR=$(CURDIR)/src
 
-common-configure-arch common-configure-indep::
-	rm -rf  $(CURDIR)/fonts
+.PHONY: build
+%:
+	dh $@
 
+build:
+	dh $@
 
-clean::
-	#Make clean forgets these files
+override_dh_auto_clean:
+	# "Make clean" forgets these files
 	rm -f $(CURDIR)/src/libprojectM/libprojectM.pc
 	rm -f $(CURDIR)/src/libprojectM/config.inp
 	rm -f $(CURDIR)/src/projectM-qt/libprojectM-qt.pc
 
+override_dh_auto_configure:
+	cd $(SRC_DIR) && \
+		cmake $(DEB_CMAKE_OPTIONS)
+
+override_dh_auto_build:
+	$(MAKE) --directory=$(SRC_DIR)
+
+override_dh_auto_install:
+	$(MAKE) --directory=$(SRC_DIR) install DESTDIR=$(CURDIR)/debian/tmp
+
+
 upstream:
 	rm -rf $(CURDIR)/src/WinLibs
 	rm -rf $(CURDIR)/src/macos
 	rm -rf $(CURDIR)/src/win32
 	rm -f $(CURDIR)/src/projectM-sdlvis/a.out
 	rm -rf $(CURDIR)/presets_test
-	rm -rf `find . -type d -name CVS`
+	find . -type d -name CVS -exec rm {} +

-- 
projectm packaging