rev 15712 - in kde-extras/gtk-qt-engine/trunk/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Fri Aug 21 14:22:40 UTC 2009
Author: fabo
Date: 2009-08-21 14:22:40 +0000 (Fri, 21 Aug 2009)
New Revision: 15712
Modified:
kde-extras/gtk-qt-engine/trunk/debian/changelog
kde-extras/gtk-qt-engine/trunk/debian/control
kde-extras/gtk-qt-engine/trunk/debian/copyright
kde-extras/gtk-qt-engine/trunk/debian/patches/01_fix_out_of_source_build.diff
kde-extras/gtk-qt-engine/trunk/debian/patches/02_change_desktop_file_installation.diff
kde-extras/gtk-qt-engine/trunk/debian/patches/03_disable_engine_with_nspluginviewer.diff
kde-extras/gtk-qt-engine/trunk/debian/patches/05_dont_set_userfont.patch
kde-extras/gtk-qt-engine/trunk/debian/patches/06_no_bonobo.patch
kde-extras/gtk-qt-engine/trunk/debian/rules
Log:
keep changelog current style.
Cleanup debian/rules: dh has cmake support.
other minor cleanup.
Modified: kde-extras/gtk-qt-engine/trunk/debian/changelog
===================================================================
--- kde-extras/gtk-qt-engine/trunk/debian/changelog 2009-08-21 12:40:32 UTC (rev 15711)
+++ kde-extras/gtk-qt-engine/trunk/debian/changelog 2009-08-21 14:22:40 UTC (rev 15712)
@@ -1,22 +1,27 @@
-gtk-qt-engine (1:1.1+svn5-2) UNRELEASED; urgency=low
+gtk-qt-engine (1:1.1+svn5-2) unstable; urgency=low
- * Add patch 05_dont_set_userfont.patch to not set the user font
- (Closes: #512782).
- * Don't compile against bonobo (Closes: #541451)
- - Add patch 06_no_bonobo.patch.
- - Get rid of the Build-Dependency
+ [ Didier Raboud ]
+
+ * Add debian/patches:
+ - 05_dont_set_userfont.patch to not set the user font (Closes: #512782).
+ - 06_no_bonobo.patch to not compile against bonobo and get rid of the
+ build-dependency (Closes: #541451).
+ * Update debian/patches/*: Add DEP-3 headers.
* Split the systemsettings configuration part and the style itself:
- - gtk-qt-engine holds the style, systemsettings-gtk holds the configuration
- module.
- - Thus add .install files and adapt the rules file
- * debian/control : Adjust build-depends on quilt and debhelper.
- * debian/patches/* : Add DEP-3 headers
- * debian/copyright: update to s/(C)/© and to add myself in 2009.
- * Bumped Standards to 3.8.3.0.
- - Add README.source
+ - gtk-qt-engine holds the style, system-config-gtk-kde holds the
+ configuration module.
+ - Add .install file and adapt the debian/rules file.
+ * Update debian/control:
+ - Adjust build-depends on quilt and debhelper.
+ - Bump Standards to 3.8.3 (add debian/README.source).
+ * Update debian/copyright: add myself in 2009.
- -- Didier Raboud <didier at raboud.com> Tue, 04 Aug 2009 17:28:15 +0200
+ [ Fathi Boudra ]
+ * Cleanup debian/rules: dh has cmake support.
+
+ -- Didier Raboud <didier at raboud.com> Fri, 21 Aug 2009 14:43:10 +0200
+
gtk-qt-engine (1:1.1+svn5-1) unstable; urgency=low
* New svn repository (http://code.google.com/p/gtk-qt-engine)
Modified: kde-extras/gtk-qt-engine/trunk/debian/control
===================================================================
--- kde-extras/gtk-qt-engine/trunk/debian/control 2009-08-21 12:40:32 UTC (rev 15711)
+++ kde-extras/gtk-qt-engine/trunk/debian/control 2009-08-21 14:22:40 UTC (rev 15712)
@@ -3,9 +3,9 @@
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.0.50~), cmake, quilt (>= 0.46-7),
+Build-Depends: debhelper (>= 7.3.12), cmake, quilt (>= 0.46-7),
kdelibs5-dev, libgtk2.0-dev
-Standards-Version: 3.8.3.0
+Standards-Version: 3.8.3
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
@@ -28,12 +28,10 @@
Package: system-config-gtk-kde
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: gtk-qt-engine-kde4,
- gtk-qt-engine (< 1:1.1+svn5-2)
-Replaces: gtk-qt-engine-kde4,
- gtk-qt-engine (< 1:1.1+svn5-2)
+Conflicts: gtk-qt-engine-kde4, gtk-qt-engine (<< 1:1.1+svn5-2)
+Replaces: gtk-qt-engine-kde4, gtk-qt-engine (<< 1:1.1+svn5-2)
Description: Systemsettings configuration module for GTK+ 2.x style selection
- This package provides a way to configure GTK+ 2.x styles to be used in KDE4
+ This package provides a way to configure GTK+ 2.x styles to be used in KDE 4
within Systemsettings.
.
- It provides the "kde configuration module" for Gtk: kcm_gtk.
+ It provides the "kde configuration module" for GTK+: kcm_gtk.
Modified: kde-extras/gtk-qt-engine/trunk/debian/copyright
===================================================================
--- kde-extras/gtk-qt-engine/trunk/debian/copyright 2009-08-21 12:40:32 UTC (rev 15711)
+++ kde-extras/gtk-qt-engine/trunk/debian/copyright 2009-08-21 14:22:40 UTC (rev 15712)
@@ -1,12 +1,19 @@
-This package was debianized by Fathi Boudra <fabo at debian.org> on
-Thu, 01 May 2008 12:47:20 +0200.
+This package was debianized by:
-It was downloaded from http://code.google.com/p/gtk-qt-engine/
+ Fathi Boudra <fabo at debian.org> on Thu, 01 May 2008 12:47:20 +0200.
-Upstream Author: David Sansome <me at davidsansome.com>
+It was downloaded from:
-Copyright: © 2008-2009 David Sansome <me at davidsansome.com>
+ http://code.google.com/p/gtk-qt-engine/
+Upstream Author:
+
+ David Sansome <me at davidsansome.com>
+
+Copyright:
+
+ Copyright (C) 2008-2009 David Sansome <me at davidsansome.com>
+
License:
This package is free software; you can redistribute it and/or modify
@@ -26,8 +33,9 @@
On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL-2'.
-The Debian packaging is
- © 2008 Fathi Boudra <fabo at debian.org>
- © 2009 Didier Raboud <didier at raboud.com>
+The Debian packaging is:
+
+ Copyright (C) 2008-2009 Fathi Boudra <fabo at debian.org>
+ Copyright (C) 2009 Didier Raboud <didier at raboud.com>
+
and is licensed under the GPL, see above.
-
Modified: kde-extras/gtk-qt-engine/trunk/debian/patches/01_fix_out_of_source_build.diff
===================================================================
--- kde-extras/gtk-qt-engine/trunk/debian/patches/01_fix_out_of_source_build.diff 2009-08-21 12:40:32 UTC (rev 15711)
+++ kde-extras/gtk-qt-engine/trunk/debian/patches/01_fix_out_of_source_build.diff 2009-08-21 14:22:40 UTC (rev 15712)
@@ -1,17 +1,17 @@
Description: Fix out of source build to cope with Debian methods
-Author: fabo
+Author: Fathi Boudra <fabo at debian.org>
Last-Update: 2008-05-01
--- 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
@@ -20,24 +20,24 @@
+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)
-
Modified: kde-extras/gtk-qt-engine/trunk/debian/patches/02_change_desktop_file_installation.diff
===================================================================
--- kde-extras/gtk-qt-engine/trunk/debian/patches/02_change_desktop_file_installation.diff 2009-08-21 12:40:32 UTC (rev 15711)
+++ kde-extras/gtk-qt-engine/trunk/debian/patches/02_change_desktop_file_installation.diff 2009-08-21 14:22:40 UTC (rev 15712)
@@ -1,15 +1,15 @@
Description: Install kcmgtk4.desktop in SERVICES and not in XDG_APPS
-Author: fabo
+Author: Fathi Boudra <fabo at debian.org>
Last-Update: 2008-05-01
--- 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(
Modified: kde-extras/gtk-qt-engine/trunk/debian/patches/03_disable_engine_with_nspluginviewer.diff
===================================================================
--- kde-extras/gtk-qt-engine/trunk/debian/patches/03_disable_engine_with_nspluginviewer.diff 2009-08-21 12:40:32 UTC (rev 15711)
+++ kde-extras/gtk-qt-engine/trunk/debian/patches/03_disable_engine_with_nspluginviewer.diff 2009-08-21 14:22:40 UTC (rev 15712)
@@ -1,5 +1,5 @@
Description: Don't run the engine for nspluginviewer.
-Author: fabo
+Author: Fathi Boudra <fabo at debian.org>
Last-Update: 2008-05-01
--- a/src/engine.cpp
+++ b/src/engine.cpp
Modified: kde-extras/gtk-qt-engine/trunk/debian/patches/05_dont_set_userfont.patch
===================================================================
--- kde-extras/gtk-qt-engine/trunk/debian/patches/05_dont_set_userfont.patch 2009-08-21 12:40:32 UTC (rev 15711)
+++ kde-extras/gtk-qt-engine/trunk/debian/patches/05_dont_set_userfont.patch 2009-08-21 14:22:40 UTC (rev 15712)
@@ -4,11 +4,9 @@
Bug: http://bugs.debian.org/527340
Last-Update: 2009-05-18
-Index: gtk-qt-engine-1.1+svn5.orig/kcm_gtk/gtkrcfile.cpp
-===================================================================
---- gtk-qt-engine-1.1+svn5.orig.orig/kcm_gtk/gtkrcfile.cpp 2009-08-04 17:26:15.000000000 +0200
-+++ gtk-qt-engine-1.1+svn5.orig/kcm_gtk/gtkrcfile.cpp 2009-08-04 17:26:57.000000000 +0200
-@@ -130,7 +130,6 @@
+--- a/kcm_gtk/gtkrcfile.cpp
++++ b/kcm_gtk/gtkrcfile.cpp
+@@ -130,7 +130,6 @@ void GtkRcFile::save()
stream << "{\n";
stream << "\tfont_name=\"" << m_font.family() << "\"\n";
stream << "}\n";
Modified: kde-extras/gtk-qt-engine/trunk/debian/patches/06_no_bonobo.patch
===================================================================
--- kde-extras/gtk-qt-engine/trunk/debian/patches/06_no_bonobo.patch 2009-08-21 12:40:32 UTC (rev 15711)
+++ kde-extras/gtk-qt-engine/trunk/debian/patches/06_no_bonobo.patch 2009-08-21 14:22:40 UTC (rev 15712)
@@ -1,17 +1,15 @@
Description: Disables the Bonobo features
Origin: vendor
-Bug: http://bugs.debian.org/541451
Author: Didier Raboud <didier at raboud.com>
+Bug: http://bugs.debian.org/541451
Last-Update: 2009-08-21
-Index: gtk-qt-engine-1.1+svn5.orig/CMakeLists.txt
-===================================================================
---- gtk-qt-engine-1.1+svn5.orig.orig/CMakeLists.txt 2009-08-21 11:59:03.000000000 +0200
-+++ gtk-qt-engine-1.1+svn5.orig/CMakeLists.txt 2009-08-21 12:01:13.000000000 +0200
-@@ -13,15 +13,8 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,15 +13,8 @@ ENDIF (NOT GTK_INCLUDE_DIR)
MESSAGE(STATUS "Found GTK include dir: ${GTK_INCLUDE_DIR}")
MESSAGE(STATUS "Found GTK library dir: ${GTK_LIB_DIR}")
-
+
-# Find Bonobo
-PKGCONFIG(libbonoboui-2.0 BONOBO_INCLUDE_DIR BONOBO_LIB_DIR BONOBO_LINK_FLAGS BONOBO_CFLAGS)
-IF (NOT BONOBO_INCLUDE_DIR)
@@ -23,6 +21,6 @@
-ENDIF (NOT BONOBO_INCLUDE_DIR)
+# Don't find Bonobo
+MESSAGE(STATUS "Bonobo has been disabled on purpose for Debian because it is deprecated and pulls too much of Gnome.")
-
+
# Find msgfmt
SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake/Modules)
Modified: kde-extras/gtk-qt-engine/trunk/debian/rules
===================================================================
--- kde-extras/gtk-qt-engine/trunk/debian/rules 2009-08-21 12:40:32 UTC (rev 15711)
+++ kde-extras/gtk-qt-engine/trunk/debian/rules 2009-08-21 14:22:40 UTC (rev 15712)
@@ -2,39 +2,18 @@
DEB_KDE_LINK_WITH_AS_NEEDED := yes
-include /usr/share/pkg-kde-tools/makefiles/1/variables.mk
+include /usr/share/pkg-kde-tools/makefiles/1/debhelper/kde.mk
-PACKAGE = gtk-qt-engine
-SVN_REPOS = http://gtk-qt-engine.googlecode.com/svn/trunk/gtk-qt-engine/
+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
+TARBALL := ../tarballs/$(PACKAGE)_$(SRC_VERSION).orig.tar.gz
+TMPDIR := ../build-area/${PACKAGE}
-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/tmp install
-
get-orig-source:
rm -rf ${TMPDIR} $(TARBALL)
mkdir ${TMPDIR}
More information about the pkg-kde-commits
mailing list