rev 14992 - in kde-extras/gtk-qt-engine/tags: . 1:1.1+svn5-1/debian 1:1.1+svn5-1/debian/patches
Fathi Boudra
fabo at alioth.debian.org
Thu Jun 25 08:07:56 UTC 2009
Author: fabo
Date: 2009-06-25 08:07:55 +0000 (Thu, 25 Jun 2009)
New Revision: 14992
Added:
kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/
kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/changelog
kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/control
kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/copyright
kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/patches/01_fix_out_of_source_build.diff
kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/patches/02_change_desktop_file_installation.diff
kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/patches/03_disable_engine_with_nspluginviewer.diff
kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/patches/04_no_kde4_in_configfile.diff
kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/rules
Removed:
kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/changelog
kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/control
kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/copyright
kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/patches/01_fix_out_of_source_build.diff
kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/patches/02_change_desktop_file_installation.diff
kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/patches/03_disable_engine_with_nspluginviewer.diff
kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/patches/04_no_kde4_in_configfile.diff
kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/rules
Log:
Tagging gtk-qt-engine 1:1.1+svn5-1
Copied: kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/changelog (from rev 14991, kde-extras/gtk-qt-engine/trunk/debian/changelog)
===================================================================
--- kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/changelog (rev 0)
+++ kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/changelog 2009-06-25 08:07:55 UTC (rev 14992)
@@ -0,0 +1,57 @@
+gtk-qt-engine (1:1.1+svn5-1) unstable; urgency=low
+
+ * New svn repository (http://code.google.com/p/gtk-qt-engine)
+ - Update upstream package to revision 5
+ "Updated Norwegian Nynorsk translation by Karl Ove Hufthammer"
+
+ [ Didier Raboud ]
+
+ * Change source and binary name to gtk-qt-engine.
+ - Bump epoch to 1 due to previous gtk-qt-engine being 1:0.8.
+ (Closes: 480696)
+ - Use the actual repository revision.
+ * Update debian/control:
+ - Add myself to Uploaders field.
+ - Add Vcs-{Svn,Browser} fields.
+ * Refactorize debian/rules:
+ - Remove the custom debian/cdbs directory.
+ - Add get-orig-source target.
+ * Add 04_no_kde4_in_configfile.diff patch (Closes: 527340).
+
+ [ Fathi Boudra ]
+
+ * Bump Standard-Version to 3.8.2 (no changes needed).
+ * Update debian/control: drop cdbs build dependency.
+ * Update debian/copyright: update upstream url.
+
+ -- Fathi Boudra <fabo at debian.org> Thu, 25 Jun 2009 09:35:02 +0200
+
+gtk-qt-engine-kde4 (1.1+svn145-2) unstable; urgency=low
+
+ * Upload to Sid.
+ * Bump compat/debhelper to 7.
+ * Bump Standard-Version to 3.8.1.
+ * Update upstream homepage.
+
+ -- Fathi Boudra <fabo at debian.org> Fri, 17 Apr 2009 20:27:27 +0200
+
+gtk-qt-engine-kde4 (1.1+svn145-1) experimental; urgency=low
+
+ [ Xavier Vello ]
+
+ * New snapshot from svn rev 145. (Closes: #482457, #496860)
+ * Add myself in Uploaders field.
+
+ -- Fathi Boudra <fabo at debian.org> Sun, 09 Nov 2008 10:52:51 +0100
+
+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
+
Copied: kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/control (from rev 14991, kde-extras/gtk-qt-engine/trunk/debian/control)
===================================================================
--- kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/control (rev 0)
+++ kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/control 2009-06-25 08:07:55 UTC (rev 14992)
@@ -0,0 +1,26 @@
+Source: gtk-qt-engine
+Section: kde
+Priority: optional
+Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
+Uploaders: Fathi Boudra <fabo at debian.org>, Xavier Vello <xavier.vello at gmail.com>, Didier Raboud <didier at raboud.com>
+Build-Depends: debhelper (>= 7), cmake, quilt,
+ kdelibs5-dev, libgtk2.0-dev, libbonoboui2-dev
+Standards-Version: 3.8.2
+Homepage: http://code.google.com/p/gtk-qt-engine/
+Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/gtk-qt-engine/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/gtk-qt-engine/?op=log
+
+Package: gtk-qt-engine
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: gtk-qt-engine-kde4
+Replaces: gtk-qt-engine-kde4
+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.
+
Copied: kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/copyright (from rev 14991, kde-extras/gtk-qt-engine/trunk/debian/copyright)
===================================================================
--- kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/copyright (rev 0)
+++ kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/copyright 2009-06-25 08:07:55 UTC (rev 14992)
@@ -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://code.google.com/p/gtk-qt-engine/
+
+Upstream Author: David Sansome <me at davidsansome.com>
+
+Copyright: © 2008-2009 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.
+
Copied: kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/patches/01_fix_out_of_source_build.diff (from rev 14991, kde-extras/gtk-qt-engine/trunk/debian/patches/01_fix_out_of_source_build.diff)
===================================================================
--- kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/patches/01_fix_out_of_source_build.diff (rev 0)
+++ kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/patches/01_fix_out_of_source_build.diff 2009-06-25 08:07:55 UTC (rev 14992)
@@ -0,0 +1,81 @@
+--- a/kcm_gtk/CMakeLists.txt
++++ b/kcm_gtk/CMakeLists.txt
+@@ -16,7 +16,7 @@ KDE4_ADD_UI_FILES(kcm_gtk4_SOURCES ${kcm
+
+ 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 ../kcm_gtk/firefoxfix.cpp ../kcm_gtk/gtkrcfile.cpp ../kcm_gtk/searchpaths.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})
Copied: kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/patches/02_change_desktop_file_installation.diff (from rev 14991, kde-extras/gtk-qt-engine/trunk/debian/patches/02_change_desktop_file_installation.diff)
===================================================================
--- kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/patches/02_change_desktop_file_installation.diff (rev 0)
+++ kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/patches/02_change_desktop_file_installation.diff 2009-06-25 08:07:55 UTC (rev 14992)
@@ -0,0 +1,11 @@
+--- a/kcm_gtk/CMakeLists.txt
++++ b/kcm_gtk/CMakeLists.txt
+@@ -28,7 +28,7 @@ INSTALL(
+
+ INSTALL(
+ FILES kcmgtk4.desktop
+- DESTINATION ${XDG_APPS_INSTALL_DIR}
++ DESTINATION ${SERVICES_INSTALL_DIR}
+ )
+
+ INSTALL(
Copied: kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/patches/03_disable_engine_with_nspluginviewer.diff (from rev 14991, kde-extras/gtk-qt-engine/trunk/debian/patches/03_disable_engine_with_nspluginviewer.diff)
===================================================================
--- kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/patches/03_disable_engine_with_nspluginviewer.diff (rev 0)
+++ kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/patches/03_disable_engine_with_nspluginviewer.diff 2009-06-25 08:07:55 UTC (rev 14992)
@@ -0,0 +1,12 @@
+--- a/src/engine.cpp
++++ b/src/engine.cpp
+@@ -110,7 +110,8 @@ Engine::Engine()
+ 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;
Copied: kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/patches/04_no_kde4_in_configfile.diff (from rev 14991, kde-extras/gtk-qt-engine/trunk/debian/patches/04_no_kde4_in_configfile.diff)
===================================================================
--- kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/patches/04_no_kde4_in_configfile.diff (rev 0)
+++ kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/patches/04_no_kde4_in_configfile.diff 2009-06-25 08:07:55 UTC (rev 14992)
@@ -0,0 +1,20 @@
+--- a/kcm_gtk/kcmgtk.cpp
++++ b/kcm_gtk/kcmgtk.cpp
+@@ -37,7 +37,7 @@
+ #include <sys/stat.h>
+
+
+-const QString KcmGtk::k_gtkRcFileName(QDir::homePath() + "/.gtkrc-2.0-kde4");
++const QString KcmGtk::k_gtkRcFileName(QDir::homePath() + "/.gtkrc-2.0-kde");
+ const QString KcmGtk::k_envFileName(KGlobal::dirs()->localkdedir() + "/env/gtk-qt-engine.rc.sh");
+ const QString KcmGtk::k_qtThemeName("Qt4");
+
+@@ -112,7 +112,7 @@ void KcmGtk::updateFontPreview()
+
+ void KcmGtk::save()
+ {
+- // Write ~/.gtkrc-2.0-kde4
++ // Write ~/.gtkrc-2.0-kde
+ m_gtkRc->save();
+
+ // Write ~/.kde/env/gtk-qt-engine.rc.sh
Copied: kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/rules (from rev 14991, kde-extras/gtk-qt-engine/trunk/debian/rules)
===================================================================
--- kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/rules (rev 0)
+++ kde-extras/gtk-qt-engine/tags/1:1.1+svn5-1/debian/rules 2009-06-25 08:07:55 UTC (rev 14992)
@@ -0,0 +1,44 @@
+#!/usr/bin/make -f
+
+DEB_KDE_LINK_WITH_AS_NEEDED := yes
+
+include /usr/share/pkg-kde-tools/makefiles/1/variables.mk
+
+PACKAGE = gtk-qt-engine
+SVN_REPOS = http://gtk-qt-engine.googlecode.com/svn/trunk/gtk-qt-engine/
+SRC_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(\([0-9]\+\):\)\?\(.*\)-.*/\3/p')
+SVN_REVISION := $(shell echo $(SRC_VERSION) | sed -ne 's/^.*svn\([0-9]\+\)/\1/p' )
+TARBALL = ../tarballs/$(PACKAGE)_$(SRC_VERSION).orig.tar.gz
+
+TMPDIR = ../build-area/${PACKAGE}
+
+%:
+ dh --with quilt $@
+
+override_dh_auto_configure:
+ mkdir builddir
+ cd builddir && cmake .. \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_C_FLAGS="$(CFLAGS)" \
+ -DCMAKE_LD_FLAGS="-Wl,-z,defs" \
+ -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ $(DEB_CMAKE_KDE4_FLAGS)
+
+override_dh_auto_build:
+ $(MAKE) -C builddir
+
+override_dh_auto_clean:
+ rm -rf builddir
+
+override_dh_auto_install:
+ $(MAKE) -C builddir DESTDIR=$(CURDIR)/debian/gtk-qt-engine install
+
+get-orig-source:
+ rm -rf ${TMPDIR} $(TARBALL)
+ mkdir ${TMPDIR}
+ svn export -r $(SVN_REVISION) ${SVN_REPOS} \
+ ${TMPDIR}/$(PACKAGE)-$(SRC_VERSION).orig
+ GZIP=--best tar czf $(TARBALL) -C ${TMPDIR} $(PACKAGE)-$(SRC_VERSION).orig
+ rm -rf ${TMPDIR}
More information about the pkg-kde-commits
mailing list