debian/lenny/applications/tdmtheme/debian/cdbs/buildvars.mk

diff --git a/debian/lenny/applications/tdmtheme/debian/cdbs/buildvars.mk b/debian/lenny/applications/tdmtheme/debian/cdbs/buildvars.mk

deleted file mode 100644

index 23d4709..0000000

--- a/debian/lenny/applications/tdmtheme/debian/cdbs/buildvars.mk

+++ /dev/null

@@ -1,86 +0,0 @@

-# -*- mode: makefile; coding: utf-8 -*-

-# Copyright �� 2002,2003 Colin Walters <walters@...>

-# Description: Defines some useful variables, but no rules

-#

-# 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.

-

-_cdbs_scripts_path ?= /usr/lib/cdbs

-_cdbs_rules_path ?= /usr/share/cdbs/1/rules

-_cdbs_class_path ?= /usr/share/cdbs/1/class

-

-ifndef _cdbs_rules_buildvars

-_cdbs_rules_buildvars = 1

-

-CDBS_VERSION = something

-

-# Common useful variables

-DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))

-DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')

-DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)

-DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')

-DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;')

-

-# Split into arch/indep packages

-ifneq ($(DEB_INDEP_PACKAGES),cdbs)

-DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep)))

-DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same))))

-endif

-# Split into normal and udeb packages

-ifeq ($(DEB_UDEB_PACKAGES),)

-DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))

-DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))

-else

-DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))

-endif

-# Too much bother for now.  If someone complains we'll fix it.

-#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES))

-#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES))

-# A handy list of every package, udeb or not

-DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES))

-DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES)))

-DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES)))

-

-DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))

-

-# Some support for srcdir != builddir builds.

-# These are relative to the root of the package

-DEB_SRCDIR ?= .

-DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR))

-

-# Miscellaneous bits

-DEB_ARCH = $(shell dpkg --print-architecture)

-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)

-DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)

-DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)

-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)

-DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)

-DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)

-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)

-DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)

-DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)

-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)

-DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)

-DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)

-

-ifeq ($(words $(DEB_ALL_PACKAGES)),1)

-	DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/

-else

-	DEB_DESTDIR = $(CURDIR)/debian/tmp/

-endif

-

-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1)

-

-endif

debian/lenny/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk

diff --git a/debian/lenny/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk

index 9920696..32ba4ac 100644

--- a/debian/lenny/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk

+++ b/debian/lenny/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk

@@ -10,6 +10,7 @@

 # Note: This _must_ be included before autotools.mk, or it won't work.

 common-configure-arch common-configure-indep:: debian/stamp-cvs-make

 debian/stamp-cvs-make:

+ifndef _cdbs_class_cmake

 	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in

 ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""

 	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh

@@ -18,10 +19,11 @@

 	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh

 endif

 	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;

+endif

 	touch debian/stamp-cvs-make

 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)

-include debian/cdbs/uploaders.mk

+#include debian/cdbs/uploaders.mk

 ifndef _cdbs_rules_patchsys_quilt

 DEB_PATCHDIRS := debian/patches/common debian/patches

@@ -103,6 +105,7 @@

 	done

 clean::

+ifndef _cdbs_class_cmake

 	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \

 		cd $(DEB_SRCDIR); \

 		find . -name Makefile.in -print | \

@@ -111,6 +114,7 @@

 			configure configure.files configure.in stamp-h.in \

 			subdirs; \

 	fi

+endif

 	rm -f debian/stamp-cvs-make

 endif

debian/lenny/applications/tdmtheme/debian/cdbs/kde.mk

diff --git a/debian/lenny/applications/tdmtheme/debian/cdbs/kde.mk b/debian/lenny/applications/tdmtheme/debian/cdbs/kde.mk

index 765560c..ed93c47 100644

--- a/debian/lenny/applications/tdmtheme/debian/cdbs/kde.mk

+++ b/debian/lenny/applications/tdmtheme/debian/cdbs/kde.mk

@@ -35,7 +35,9 @@

 DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)

 endif

+ifndef _cdbs_class_cmake

 include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)

+endif

 export kde_cgidir  = \$${libdir}/cgi-bin

 export kde_confdir = \$${sysconfdir}/trinity

@@ -59,7 +61,7 @@

 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)

 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin

-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"

+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"

 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el

 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

@@ -75,7 +77,7 @@

 common-install-prehook-impl::

 	mkdir -p po

-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	

+	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages

 	-for file in po/*pot; do \

 		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \

 	done

debian/lenny/applications/tdmtheme/debian/cdbs/team-members

diff --git a/debian/lenny/applications/tdmtheme/debian/cdbs/team-members b/debian/lenny/applications/tdmtheme/debian/cdbs/team-members

deleted file mode 100644

index 05761af..0000000

--- a/debian/lenny/applications/tdmtheme/debian/cdbs/team-members

+++ /dev/null

@@ -1,16 +0,0 @@

-Sune Vuorela <debian@...>

-Ana Beatriz Guerrero Lopez <ana@...>

-Fathi Boudra <fboudra@...>

-Modestas Vainius <geromanas@...>

-Josh Metzler <joshdeb@...>

-Isaac Clerencia <isaac@...>

-Adeodato Sim�� <dato@...>

-Adeodato Simo <dato@...>

-Christopher Martin <chrsmrtn@...>

-Daniel Schepler <schepler@...>

-Sarah Hobbs <hobbsee@...>

-Nacho Barrientos Arias <nacho@...>

-Ricardo Javier Cardenes Medina <rcardenes@...>

-Ricardo Cardenes <rcardenes@...>

-Armin Berres <trigger+debian@...>

-Francesco Pedrini <francesco.pedrini@...>

debian/lenny/applications/tdmtheme/debian/cdbs/uploaders.mk

diff --git a/debian/lenny/applications/tdmtheme/debian/cdbs/uploaders.mk b/debian/lenny/applications/tdmtheme/debian/cdbs/uploaders.mk

deleted file mode 100644

index 31adfe3..0000000

--- a/debian/lenny/applications/tdmtheme/debian/cdbs/uploaders.mk

+++ /dev/null

@@ -1,29 +0,0 @@

-

-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@...>

-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@..." | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')

-

-

-debian/control.tmp:

-	@if [ ! -e debian/control.in ] ; then  \

-		echo "this package is not yet prepared for using automatic update of uploaders"; \

-		echo "Please do so."; \

-		exit 1; \

-	fi

-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp

-

-check-uploaders: debian/control.tmp

-	@if ! diff -q debian/control debian/control.tmp ; then \

-		echo "WARNING:: Control file differs from manually generated one" ; \

-		echo "WARNING:: Please update it manually and check it afterwards" ; \

-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\

-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\

-	fi

-	

-

-clean:: 

-	rm -f debian/control.tmp

-

-update-uploaders: debian/control.tmp

-	@mv -f debian/control.tmp debian/control

-

-makebuilddir:: check-uploaders

debian/lenny/applications/tdmtheme/debian/control

diff --git a/debian/lenny/applications/tdmtheme/debian/control b/debian/lenny/applications/tdmtheme/debian/control

index 7964d03..e827a21 100644

--- a/debian/lenny/applications/tdmtheme/debian/control

+++ b/debian/lenny/applications/tdmtheme/debian/control

@@ -5,7 +5,7 @@

 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@...>

 Uploaders: Kel Modderman <kel@...>, Fathi Boudra <fabo@...>,

  Mark Purcell <msp@...>

-Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev

+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev

 Standards-Version: 3.8.4

 Homepage: http://beta.smileaf.org/projects

debian/lenny/applications/tdmtheme/debian/docs

diff --git a/debian/lenny/applications/tdmtheme/debian/docs b/debian/lenny/applications/tdmtheme/debian/docs

index e845566..6f12db5 100644

--- a/debian/lenny/applications/tdmtheme/debian/docs

+++ b/debian/lenny/applications/tdmtheme/debian/docs

@@ -1 +1,2 @@

+AUTHORS

 README

debian/lenny/applications/tdmtheme/debian/rules

diff --git a/debian/lenny/applications/tdmtheme/debian/rules b/debian/lenny/applications/tdmtheme/debian/rules

index ea483be..d8d7720 100755

--- a/debian/lenny/applications/tdmtheme/debian/rules

+++ b/debian/lenny/applications/tdmtheme/debian/rules

@@ -1,40 +1,20 @@

 #!/usr/bin/make -f

 include /usr/share/cdbs/1/rules/debhelper.mk

** Diff limit reached (max: 250 lines) **