DEB kkbswitch: Switch to cmake.

Keyboard layout for xkb is split into a separate package.

Signed-off-by: Slávek Banko <[email protected]>

14 files changed, 41 insertions, 157 deletions

diff --git a/ubuntu/maverick/applications/kkbswitch/debian/cdbs/buildvars.mk b/ubuntu/maverick/applications/kkbswitch/debian/cdbs/buildvars.mk
deleted file mode 100644
index 23d4709dc..000000000
--- a/ubuntu/maverick/applications/kkbswitch/debian/cdbs/buildvars.mk
+++ /dev/null
@@ -1,86 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2002,2003 Colin Walters <[email protected]>
-# 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
diff --git a/ubuntu/maverick/applications/kkbswitch/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kkbswitch/debian/cdbs/debian-qt-kde.mk
index b4b889c6d..32ba4acfb 100644
--- a/ubuntu/maverick/applications/kkbswitch/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kkbswitch/debian/cdbs/debian-qt-kde.mk
@@ -10,6 +10,7 @@ _cdbs_class_debian-qt-kde := 1
 # 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,6 +19,7 @@ ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
 	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)
@@ -103,6 +105,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	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 @@ clean::
 			configure configure.files configure.in stamp-h.in \
 			subdirs; \
 	fi
+endif
 	rm -f debian/stamp-cvs-make
 
 endif
diff --git a/ubuntu/maverick/applications/kkbswitch/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kkbswitch/debian/cdbs/kde.mk
index 765560c89..023886fc8 100644
--- a/ubuntu/maverick/applications/kkbswitch/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kkbswitch/debian/cdbs/kde.mk
@@ -35,7 +35,9 @@ else
 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 @@ endif
 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/%:
diff --git a/ubuntu/maverick/applications/kkbswitch/debian/cdbs/uploaders.mk b/ubuntu/maverick/applications/kkbswitch/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/ubuntu/maverick/applications/kkbswitch/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <[email protected]>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "[email protected]" | 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
diff --git a/ubuntu/maverick/applications/kkbswitch/debian/control b/ubuntu/maverick/applications/kkbswitch/debian/control
index 191d4b445..3327f4eb7 100644
--- a/ubuntu/maverick/applications/kkbswitch/debian/control
+++ b/ubuntu/maverick/applications/kkbswitch/debian/control
@@ -4,14 +4,14 @@ Priority: optional
 Maintainer: Timothy Pearson <[email protected]>
 XSBC-Original-Maintainer: Debian Hebrew Packaging Team <[email protected]>
 Uploaders: Baruch Even <[email protected]>, Lior Kaplan <[email protected]>, Shachar Shemesh <[email protected]>
-Build-Depends: debhelper (>= 7.0.50~), cdbs, automake, libtool, tdelibs14-trinity-dev
+Build-Depends: debhelper (>= 7.0.50~), cdbs, cmake, tdelibs14-trinity-dev, libxkbfile-dev
 Standards-Version: 3.7.3
 Homepage: http://kkbswitch.sourceforge.net/
 
 Package: kkbswitch-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: tdebase-data-trinity
+Suggests: tdebase-data-trinity, xkb-data-extra-trinity
 Description: keyboard layout indicator for TDE
  KKBSwitch displays an icon in the system tray that indicates which layout is 
  currently active and enables you to switch layouts by clicking the icon or by 
@@ -23,3 +23,10 @@ Description: keyboard layout indicator for TDE
      layouts.
    - Choose to use a global layout or per-application or per-window layouts.
    - Configurable keyboard shortcuts.
+
+Package: xkb-data-extra-trinity
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Enhances: xkb-data
+Description: Additional data for xkb
+ This package contains additional keyboard layout definitions for xkb.
diff --git a/ubuntu/maverick/applications/kkbswitch/debian/docs b/ubuntu/maverick/applications/kkbswitch/debian/docs
deleted file mode 100644
index 724e08449..000000000
--- a/ubuntu/maverick/applications/kkbswitch/debian/docs
+++ /dev/null
@@ -1,2 +0,0 @@
-README
-TODO
diff --git a/ubuntu/maverick/applications/kkbswitch/debian/dirs b/ubuntu/maverick/applications/kkbswitch/debian/kkbswitch-trinity.dirs
index 8a625f92e..8a625f92e 100644
--- a/ubuntu/maverick/applications/kkbswitch/debian/dirs
+++ b/ubuntu/maverick/applications/kkbswitch/debian/kkbswitch-trinity.dirs
diff --git a/ubuntu/maverick/applications/kkbswitch/debian/kkbswitch-trinity.docs b/ubuntu/maverick/applications/kkbswitch/debian/kkbswitch-trinity.docs
new file mode 100644
index 000000000..c17f03764
--- /dev/null
+++ b/ubuntu/maverick/applications/kkbswitch/debian/kkbswitch-trinity.docs
@@ -0,0 +1,4 @@
+AUTHORS
+NEWS
+README
+TODO
diff --git a/ubuntu/maverick/applications/kkbswitch/debian/kkbswitch-trinity.install b/ubuntu/maverick/applications/kkbswitch/debian/kkbswitch-trinity.install
index 22b6da0d0..b9b4bccd3 100644
--- a/ubuntu/maverick/applications/kkbswitch/debian/kkbswitch-trinity.install
+++ b/ubuntu/maverick/applications/kkbswitch/debian/kkbswitch-trinity.install
@@ -1,2 +1,3 @@
+debian/tmp/opt/trinity
+debian/tmp/opt/trinity/share/applnk/Utilities/kkbswitch.desktop opt/trinity/share/applications
 kkbswitch.xpm opt/trinity/share/pixmaps
-kkbswitch/kkbswitch.desktop opt/trinity/share/applications
diff --git a/ubuntu/maverick/applications/kkbswitch/debian/menu b/ubuntu/maverick/applications/kkbswitch/debian/kkbswitch-trinity.menu
index e8422ae40..e8422ae40 100644
--- a/ubuntu/maverick/applications/kkbswitch/debian/menu
+++ b/ubuntu/maverick/applications/kkbswitch/debian/kkbswitch-trinity.menu
diff --git a/ubuntu/maverick/applications/kkbswitch/debian/rules b/ubuntu/maverick/applications/kkbswitch/debian/rules
index bfc6f897f..959036064 100755
--- a/ubuntu/maverick/applications/kkbswitch/debian/rules
+++ b/ubuntu/maverick/applications/kkbswitch/debian/rules
@@ -1,42 +1,29 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include debian/cdbs/kde.mk
-
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+include /usr/share/cdbs/1/class/cmake.mk
+#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include debian/cdbs/debian-qt-kde.mk
 
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-	dh_testdir
-
-	# Regenerate build system
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-
-	autoreconf --install && automake -f && \
-	$(MAKE) -f admin/Makefile.common && \
-	touch debian/stamp-bootstrap
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
 
 binary-install/kkbswitch-trinity::
 	dh_testdir
+	# is installed into /opt/trinity/share/applications directory
 	rm debian/$(cdbs_curpkg)/opt/trinity/share/applnk/Utilities/kkbswitch.desktop
 	rmdir -p --ignore-fail-on-non-empty debian/$(cdbs_curpkg)/opt/trinity/share/applnk/Utilities/
-
-clean::
-	dh_testdir
-	rm -f debian/stamp-bootstrap
+	# is installed in xkb-data-extra-trinity package
+	rm debian/$(cdbs_curpkg)/opt/trinity/share/X11/xkb/symbols/ru_ua
+	rmdir -p --ignore-fail-on-non-empty debian/$(cdbs_curpkg)/opt/trinity/share/X11/xkb/symbols/
diff --git a/ubuntu/maverick/applications/kkbswitch/debian/watch b/ubuntu/maverick/applications/kkbswitch/debian/watch
deleted file mode 100644
index d2c051487..000000000
--- a/ubuntu/maverick/applications/kkbswitch/debian/watch
+++ /dev/null
@@ -1,6 +0,0 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# Site		Directory		Pattern			Version	Script
-version=3
-http://sf.net/kkbswitch/kkbswitch-([.0-9]*)\.tar\.gz
diff --git a/ubuntu/maverick/applications/kkbswitch/debian/xkb-data-extra-trinity.dirs b/ubuntu/maverick/applications/kkbswitch/debian/xkb-data-extra-trinity.dirs
new file mode 100644
index 000000000..590af08e4
--- /dev/null
+++ b/ubuntu/maverick/applications/kkbswitch/debian/xkb-data-extra-trinity.dirs
@@ -0,0 +1 @@
+/usr/share/X11/xkb/symbols
diff --git a/ubuntu/maverick/applications/kkbswitch/debian/xkb-data-extra-trinity.install b/ubuntu/maverick/applications/kkbswitch/debian/xkb-data-extra-trinity.install
new file mode 100644
index 000000000..53bc85b55
--- /dev/null
+++ b/ubuntu/maverick/applications/kkbswitch/debian/xkb-data-extra-trinity.install
@@ -0,0 +1 @@
+debian/tmp/opt/trinity/share/X11/xkb/symbols/ru_ua usr/share/X11/xkb/symbols