rev 10426 - in kde-extras: . gtk-qt-engine-kde4 gtk-qt-engine-kde4/trunk gtk-qt-engine-kde4/trunk/debian gtk-qt-engine-kde4/trunk/debian/cdbs gtk-qt-engine-kde4/trunk/debian/patches

Fathi Boudra fabo at alioth.debian.org
Thu May 1 13:23:01 UTC 2008


Author: fabo
Date: 2008-05-01 13:23:00 +0000 (Thu, 01 May 2008)
New Revision: 10426

Added:
   kde-extras/gtk-qt-engine-kde4/
   kde-extras/gtk-qt-engine-kde4/branches/
   kde-extras/gtk-qt-engine-kde4/tags/
   kde-extras/gtk-qt-engine-kde4/trunk/
   kde-extras/gtk-qt-engine-kde4/trunk/debian/
   kde-extras/gtk-qt-engine-kde4/trunk/debian/cdbs/
   kde-extras/gtk-qt-engine-kde4/trunk/debian/cdbs/control.mk
   kde-extras/gtk-qt-engine-kde4/trunk/debian/cdbs/kde.mk
   kde-extras/gtk-qt-engine-kde4/trunk/debian/cdbs/versions.mk
   kde-extras/gtk-qt-engine-kde4/trunk/debian/changelog
   kde-extras/gtk-qt-engine-kde4/trunk/debian/compat
   kde-extras/gtk-qt-engine-kde4/trunk/debian/control
   kde-extras/gtk-qt-engine-kde4/trunk/debian/copyright
   kde-extras/gtk-qt-engine-kde4/trunk/debian/patches/
   kde-extras/gtk-qt-engine-kde4/trunk/debian/patches/01_fix_out_of_source_build.diff
   kde-extras/gtk-qt-engine-kde4/trunk/debian/patches/02_change_desktop_file_installation.diff
   kde-extras/gtk-qt-engine-kde4/trunk/debian/patches/03_disable_engine_with_nspluginviewer.diff
   kde-extras/gtk-qt-engine-kde4/trunk/debian/patches/series
   kde-extras/gtk-qt-engine-kde4/trunk/debian/rules
Log:
* Add qtk-qt-engine-kde4 to kde-extras repo. feel free to join uploaders.


Added: kde-extras/gtk-qt-engine-kde4/trunk/debian/cdbs/control.mk
===================================================================
--- kde-extras/gtk-qt-engine-kde4/trunk/debian/cdbs/control.mk	                        (rev 0)
+++ kde-extras/gtk-qt-engine-kde4/trunk/debian/cdbs/control.mk	2008-05-01 13:23:00 UTC (rev 10426)
@@ -0,0 +1,19 @@
+include debian/cdbs/versions.mk
+debian/control: debian/control.tmp
+	mv debian/control.tmp debian/control
+
+debian/control.tmp: update-versions
+
+update-versions: debian/control.in
+	sed "s/CDBS_MIN_VER/$(CDBS_MIN_VER)/;\
+	     s/QUILT_MIN_VER/$(QUILT_MIN_VER)/;\
+	     s/CMAKE_MIN_VER/$(CMAKE_MIN_VER)/;\
+	     s/KDELIBS_VERSION/$(KDELIBS_VERSION)/;\
+	     s/KDELIBS_UPSTREAM_VERSION/$(KDELIBS_UPSTREAM_VERSION)/;\
+	     s/KDELIBS_SOURCE_VERSION/$(KDELIBS_SOURCE_VERSION)/;\
+	     s/KDEPIMLIBS_VERSION/$(KDEPIMLIBS_VERSION)/;\
+	     s/KDEPIMLIBS_SOURCE_VERSION/$(KDEPIMLIBS_SOURCE_VERSION)/;\
+	     s/KDEPIMLIBS_UPSTREAM_VERSION/$(KDEPIMLIBS_UPSTREAM_VERSION)/;\
+	     " debian/control.in > debian/control.tmp
+
+.PHONY: update-versions

Added: kde-extras/gtk-qt-engine-kde4/trunk/debian/cdbs/kde.mk
===================================================================
--- kde-extras/gtk-qt-engine-kde4/trunk/debian/cdbs/kde.mk	                        (rev 0)
+++ kde-extras/gtk-qt-engine-kde4/trunk/debian/cdbs/kde.mk	2008-05-01 13:23:00 UTC (rev 10426)
@@ -0,0 +1,102 @@
+include /usr/share/cdbs/1/class/cmake.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/utils.mk
+
+DEB_CONFIG_INSTALL_DIR ?= /etc/kde4
+
+DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_CMAKE_EXTRA_FLAGS += \
+			-DCMAKE_BUILD_TYPE=Debian \
+			$(KDE4-ENABLE-FINAL) \
+			-DKDE4_BUILD_TESTS=false \
+			-DKDE_DISTRIBUTION_TEXT="Debian packages" \
+			-DCMAKE_SKIP_RPATH=true \
+			-DKDE4_USE_ALWAYS_FULL_RPATH=false \
+			-DCONFIG_INSTALL_DIR=$(DEB_CONFIG_INSTALL_DIR) \
+			-DDATA_INSTALL_DIR=/usr/share/kde4/apps \
+			-DHTML_INSTALL_DIR=/usr/share/doc/kde4/HTML \
+			-DKCFG_INSTALL_DIR=/usr/share/kde4/config.kcfg \
+			-DLIB_INSTALL_DIR=/usr/lib \
+			-DSYSCONF_INSTALL_DIR=/etc
+
+# Set the one below to something else than 'yes' to disable linking 
+# with --as-needed (on by default)
+DEB_KDE_LINK_WITH_AS_NEEDED ?= yes
+ifneq (,$(findstring yes, $(DEB_KDE_LINK_WITH_AS_NEEDED)))
+	ifeq (,$(findstring no-as-needed, $(DEB_BUILD_OPTIONS)))
+		DEB_KDE_LINK_WITH_AS_NEEDED := yes
+		DEB_CMAKE_EXTRA_FLAGS += \
+					-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
+					-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
+					-DCMAKE_EXE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed"
+	else
+		DEB_KDE_LINK_WITH_AS_NEEDED := no
+	endif
+else
+	DEB_KDE_LINK_WITH_AS_NEEDED := no
+endif
+
+#DEB_CMAKE_PREFIX = /usr/lib/kde4
+DEB_DH_INSTALL_SOURCEDIR = debian/tmp
+#DEB_DH_SHLIBDEPS_ARGS = -l/usr/lib/kde4/lib/
+DEB_KDE_ENABLE_FINAL ?=
+#DEB_MAKE_ENVVARS += XDG_CONFIG_DIRS=/etc/xdg XDG_DATA_DIRS=/usr/share
+#DEB_STRIP_EXCLUDE = so
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
+    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
+        KDE4-ENABLE-FINAL = $(if $(DEB_KDE_ENABLE_FINAL),-DKDE4_ENABLE_FINAL=true,)
+    else
+        KDE4-ENABLE-FINAL =
+    endif
+endif
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+	for f in $$(find debian/man -name '*.sgml'); do \
+		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+	done
+	for f in $$(find debian/man -name '*.man'); do \
+		soelim -I debian/man $$f \
+		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+	done
+	touch debian/stamp-man-pages
+
+clean::
+ifndef THIS_SHOULD_GO_TO_UNSTABLE
+	#guard against experimental uploads to unstable
+	dpkg-parsechangelog | grep ^Distribution | grep -q 'experimental\|UNRELEASED'
+endif
+	rm -rf debian/man/out
+	-rmdir debian/man
+	rm -f debian/stamp-man-pages
+	rm -f CMakeCache.txt
+
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+	if test -e debian/$(cdbs_curpkg).lintian; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
+			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+	fi
+	if test -e debian/$(cdbs_curpkg).presubj; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
+			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+	fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+	set -e; \
+	for doc in `cd $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+		echo Building $$pkg HTML docs...; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
+		meinproc4 $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+	done
+	for pkg in $(DOC_HTML_PRUNE) ; do \
+		rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
+	done
+

Added: kde-extras/gtk-qt-engine-kde4/trunk/debian/cdbs/versions.mk
===================================================================
--- kde-extras/gtk-qt-engine-kde4/trunk/debian/cdbs/versions.mk	                        (rev 0)
+++ kde-extras/gtk-qt-engine-kde4/trunk/debian/cdbs/versions.mk	2008-05-01 13:23:00 UTC (rev 10426)
@@ -0,0 +1,14 @@
+
+CDBS_MIN_VER:=0.4.52
+QUILT_MIN_VER:=0.40
+CMAKE_MIN_VER:=2.4.8
+
+
+KDELIBS_VERSION:=$(shell dpkg -l kdelibs5 | grep kdelibs5 | awk '{print $$3}')
+KDELIBS_SOURCE_VERSION:=$(shell echo $(KDELIBS_VERSION) | sed 's/+b.*//')
+KDELIBS_UPSTREAM_VERSION:=$(shell echo $(KDELIBS_VERSION) | sed 's/-.*//')
+
+KDEPIMLIBS_VERSION:=$(shell dpkg -l kdepimlibs5 | grep kdepimlibs5 | awk '{print $$3}')
+KDEPIMLIBS_SOURCE_VERSION:=$(shell echo $(KDEPIMLIBS_VERSION) | sed 's/+b.*//')
+KDEPIMLIBS_UPSTREAM_VERSION:=$(shell echo $(KDEPIMLIBS_VERSION) | sed 's/-.*//')
+

Added: kde-extras/gtk-qt-engine-kde4/trunk/debian/changelog
===================================================================
--- kde-extras/gtk-qt-engine-kde4/trunk/debian/changelog	                        (rev 0)
+++ kde-extras/gtk-qt-engine-kde4/trunk/debian/changelog	2008-05-01 13:23:00 UTC (rev 10426)
@@ -0,0 +1,11 @@
+gtk-qt-engine-kde4 (1.1-1) experimental; urgency=low
+
+  * Initial release (Closes: #478846)
+  * Add patch to disable engine with nspluginviewer.
+  * Merge Kubuntu patches:
+    * Out of source build isn't working due to problems in 2 CMakeLists.txt.
+    * Installs the kcm desktop file in KDE 4's services directory, as it
+      shouldn't show up in menus.
+
+ -- Fathi Boudra <fabo at debian.org>  Thu, 01 May 2008 12:47:20 +0200
+

Added: kde-extras/gtk-qt-engine-kde4/trunk/debian/compat
===================================================================
--- kde-extras/gtk-qt-engine-kde4/trunk/debian/compat	                        (rev 0)
+++ kde-extras/gtk-qt-engine-kde4/trunk/debian/compat	2008-05-01 13:23:00 UTC (rev 10426)
@@ -0,0 +1 @@
+5

Added: kde-extras/gtk-qt-engine-kde4/trunk/debian/control
===================================================================
--- kde-extras/gtk-qt-engine-kde4/trunk/debian/control	                        (rev 0)
+++ kde-extras/gtk-qt-engine-kde4/trunk/debian/control	2008-05-01 13:23:00 UTC (rev 10426)
@@ -0,0 +1,22 @@
+Source: gtk-qt-engine-kde4
+Section: kde
+Priority: optional
+Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
+Uploaders: Fathi Boudra <fabo at debian.org>
+Build-Depends: cdbs, debhelper (>= 6), cmake, quilt, kdelibs5-dev, libgtk2.0-dev,
+ libbonoboui2-dev
+Standards-Version: 3.7.3
+Homepage: http://gtk-qt.ecs.soton.ac.uk/
+
+Package: gtk-qt-engine-kde4
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: theme engine using Qt 4 for GTK+ 2.x
+ The GTK-Qt Theme Engine (also known as gtk-qt-engine) is a GTK+ 2 theme engine
+ that calls Qt 4 to do the actual drawing. This makes your GTK+ 2 applications
+ look almost like real Qt 4 applications and gives you a more unified desktop
+ experience.
+ .
+ Please note that this package is targeted at KDE 4 users and therefore provides
+ a way to configure it from within Systemsettings.
+

Added: kde-extras/gtk-qt-engine-kde4/trunk/debian/copyright
===================================================================
--- kde-extras/gtk-qt-engine-kde4/trunk/debian/copyright	                        (rev 0)
+++ kde-extras/gtk-qt-engine-kde4/trunk/debian/copyright	2008-05-01 13:23:00 UTC (rev 10426)
@@ -0,0 +1,31 @@
+This package was debianized by Fathi Boudra <fabo at debian.org> on
+Thu, 01 May 2008 12:47:20 +0200.
+
+It was downloaded from http://gtk-qt.ecs.soton.ac.uk/
+
+Upstream Author: David Sansome <me at davidsansome.com>
+
+Copyright: © 2008 David Sansome <me at davidsansome.com>
+
+License:
+
+    This package 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 of the License, or
+    (at your option) any later version.
+
+    This package 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 package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is (C) 2008, Fathi Boudra <fabo at debian.org> and
+is licensed under the GPL, see above.
+

Added: kde-extras/gtk-qt-engine-kde4/trunk/debian/patches/01_fix_out_of_source_build.diff
===================================================================
--- kde-extras/gtk-qt-engine-kde4/trunk/debian/patches/01_fix_out_of_source_build.diff	                        (rev 0)
+++ kde-extras/gtk-qt-engine-kde4/trunk/debian/patches/01_fix_out_of_source_build.diff	2008-05-01 13:23:00 UTC (rev 10426)
@@ -0,0 +1,81 @@
+--- a/kcm_gtk/CMakeLists.txt
++++ b/kcm_gtk/CMakeLists.txt
+@@ -16,7 +16,7 @@
+ 
+ KDE4_ADD_PLUGIN(kcm_gtk4 ${kcm_gtk4_SOURCES})
+ 
+-INCLUDE_DIRECTORIES(${KDE4_INCLUDE_DIR})
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR})
+ LINK_DIRECTORIES(${KDE4_LIB_DIR})
+ 
+ TARGET_LINK_LIBRARIES(kcm_gtk4 ${KDE4_KDECORE_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
+--- a/po/CMakeLists.txt
++++ b/po/CMakeLists.txt
+@@ -1,46 +1,23 @@
+-# .po to .gmo stuff
++FIND_PROGRAM(GETTEXT_MSGFMT_EXECUTABLE msgfmt)
++
+ FILE(GLOB _pofiles *.po)
+ 
+-FOREACH(_file ${_pofiles})
+-	GET_FILENAME_COMPONENT(_file_we ${_file} NAME_WE)
+-	SET(_out "${_file_we}.gmo")
+-	SET(_in "${_file_we}.po")
+-	
+-	ADD_CUSTOM_COMMAND(
+-		OUTPUT ${_out}
+-		COMMAND ${MSGFMT_EXECUTABLE} -o ${_out} ${_in}
+-		DEPENDS ${_in}
+-	)
+-	
+-	INSTALL(
+-		FILES ${_out}
+-		DESTINATION share/locale/${_file_we}/LC_MESSAGES/
+-		RENAME gtkqtengine.mo
+-	)
+-	
+-	SET(_outputs ${_outputs} ${_out})
+-ENDFOREACH(_file)
+-
+-ADD_CUSTOM_TARGET(
+-	pofiles ALL
+-	DEPENDS ${_outputs}
+-)
+-
+-
+-# Stuff to generate the .pot
+-FILE(GLOB POT_UIFILES ../kcm_gtk/*.ui)
+-SET(POT_SOURCES ../kcm_gtk/kcmgtk.cpp)
+-SET(POT_OUTPUT gtkqtengine.pot)
+-
+-ADD_CUSTOM_COMMAND(
+-	OUTPUT _${POT_OUTPUT}
+-	COMMAND ${EXTRACTRC_PATH} ${POT_UIFILES} > rc.cpp
+-	COMMAND ${XGETTEXT_PATH} --foreign-user -C -ci18n -ki18n -ktr2i18n
+-		-kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -o ${POT_OUTPUT} rc.cpp ${POT_SOURCES}
+-	COMMAND rm rc.cpp
+-)
+-
+-ADD_CUSTOM_TARGET(
+-	extract_messages
+-	DEPENDS _${POT_OUTPUT}
+-)
++FOREACH(_current_PO_FILE ${_pofiles})
++   SET(_addToAll ALL)
++   SET(_installDest ${LOCALE_INSTALL_DIR})
++
++   GET_FILENAME_COMPONENT(_basename ${_current_PO_FILE} NAME_WE)
++      SET(_gmoFile ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.gmo)
++   message(STATUS gmo file: ${_gmoFile})
++      add_custom_command(OUTPUT ${_gmoFile}
++            COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_current_PO_FILE}
++            WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
++            DEPENDS ${_current_PO_FILE}
++         )
++
++   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.gmo DESTINATION ${_installDest}/${_basename}/LC_MESSAGES/ RENAME gtkqtengine.mo)
++
++   LIST(APPEND _gmoFiles ${_gmoFile})
++ENDFOREACH(_current_PO_FILE)
++
++ADD_CUSTOM_TARGET(pofiles ${_addToAll} DEPENDS ${_gmoFiles})

Added: kde-extras/gtk-qt-engine-kde4/trunk/debian/patches/02_change_desktop_file_installation.diff
===================================================================
--- kde-extras/gtk-qt-engine-kde4/trunk/debian/patches/02_change_desktop_file_installation.diff	                        (rev 0)
+++ kde-extras/gtk-qt-engine-kde4/trunk/debian/patches/02_change_desktop_file_installation.diff	2008-05-01 13:23:00 UTC (rev 10426)
@@ -0,0 +1,11 @@
+--- a/kcm_gtk/CMakeLists.txt
++++ b/kcm_gtk/CMakeLists.txt
+@@ -28,7 +28,7 @@
+ 
+ INSTALL(
+ 	FILES kcmgtk4.desktop
+-	DESTINATION ${XDG_APPS_INSTALL_DIR}
++	DESTINATION ${SERVICES_INSTALL_DIR}
+ )
+ 
+ INSTALL(

Added: kde-extras/gtk-qt-engine-kde4/trunk/debian/patches/03_disable_engine_with_nspluginviewer.diff
===================================================================
--- kde-extras/gtk-qt-engine-kde4/trunk/debian/patches/03_disable_engine_with_nspluginviewer.diff	                        (rev 0)
+++ kde-extras/gtk-qt-engine-kde4/trunk/debian/patches/03_disable_engine_with_nspluginviewer.diff	2008-05-01 13:23:00 UTC (rev 10426)
@@ -0,0 +1,12 @@
+--- a/src/engine.cpp
++++ b/src/engine.cpp
+@@ -110,7 +110,8 @@
+ 	    commandLine.contains("metacity") ||
+ 	    commandLine.contains("xfwm4") ||
+ 	    commandLine.contains("gnome-settings-daemon") ||
+-	    commandLine.contains("gnome-panel"))
++	    commandLine.contains("gnome-panel") ||
++	    commandLine.contains("nspluginviewer"))
+ 	{
+ 		m_enabled = false;
+ 		qDebug() << "Disabling the GTK-Qt Theme Engine for" << commandLine;

Added: kde-extras/gtk-qt-engine-kde4/trunk/debian/patches/series
===================================================================
--- kde-extras/gtk-qt-engine-kde4/trunk/debian/patches/series	                        (rev 0)
+++ kde-extras/gtk-qt-engine-kde4/trunk/debian/patches/series	2008-05-01 13:23:00 UTC (rev 10426)
@@ -0,0 +1,4 @@
+01_fix_out_of_source_build.diff
+02_change_desktop_file_installation.diff
+03_disable_engine_with_nspluginviewer.diff
+

Added: kde-extras/gtk-qt-engine-kde4/trunk/debian/rules
===================================================================
--- kde-extras/gtk-qt-engine-kde4/trunk/debian/rules	                        (rev 0)
+++ kde-extras/gtk-qt-engine-kde4/trunk/debian/rules	2008-05-01 13:23:00 UTC (rev 10426)
@@ -0,0 +1,4 @@
+#!/usr/bin/make -f
+
+include debian/cdbs/kde.mk
+


Property changes on: kde-extras/gtk-qt-engine-kde4/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
   + *




More information about the pkg-kde-commits mailing list