rev 5390 - in kde-extras/kbfx/trunk/debian: . patches

Fathi Boudra fboudra-guest at alioth.debian.org
Sat Jan 20 17:53:08 CET 2007


Author: fboudra-guest
Date: 2007-01-20 17:53:07 +0100 (Sat, 20 Jan 2007)
New Revision: 5390

Added:
   kde-extras/kbfx/trunk/debian/cmake.mk
   kde-extras/kbfx/trunk/debian/patches/13_fix_doc_path.diff
   kde-extras/kbfx/trunk/debian/patches/14_fix_docfiles_list.diff
Modified:
   kde-extras/kbfx/trunk/debian/changelog
   kde-extras/kbfx/trunk/debian/control
   kde-extras/kbfx/trunk/debian/docs
   kde-extras/kbfx/trunk/debian/kbfx.lintian-overrides
   kde-extras/kbfx/trunk/debian/patches/10_use_xdg_appsdir.diff
   kde-extras/kbfx/trunk/debian/patches/11_fix_desktop_categories.diff
   kde-extras/kbfx/trunk/debian/rules
Log:
prepare kbfx 0.4.9.3~20070117

Modified: kde-extras/kbfx/trunk/debian/changelog
===================================================================
--- kde-extras/kbfx/trunk/debian/changelog	2007-01-20 16:13:46 UTC (rev 5389)
+++ kde-extras/kbfx/trunk/debian/changelog	2007-01-20 16:53:07 UTC (rev 5390)
@@ -1,3 +1,16 @@
+kbfx (0.4.9.3~20070117-1) experimental; urgency=low
+
+  * New upstream release
+  * convert package to cmake
+  * Update 10_use_xdg_appsdir and 11_fix_desktop_categories patches.
+  * Add 2 patches to fix doc path and files to install.
+  * control: replace automake1.8 by cmake as depends
+  * docs: update to reflect new doc path
+  * Cleanup lintian overrides
+  * rules: for empty LIB_SUFFIX as kbfx doesn't detect it properly.
+
+ -- Fathi Boudra <fboudra at free.fr>  Fri, 19 Jan 2007 01:44:58 +0100
+
 kbfx (0.4.9.2~rc4-1) unstable; urgency=low
 
   * New upstream release (Closes: #385466)

Added: kde-extras/kbfx/trunk/debian/cmake.mk
===================================================================
--- kde-extras/kbfx/trunk/debian/cmake.mk	2007-01-20 16:13:46 UTC (rev 5389)
+++ kde-extras/kbfx/trunk/debian/cmake.mk	2007-01-20 16:53:07 UTC (rev 5390)
@@ -0,0 +1,76 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright (C) 2006 Peter Rockai <me at mornfall.net>
+# Copyright (C) 2006 Fathi Boudra <fboudra at free.fr>
+# Description: A class for cmake packages
+#
+# 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.
+
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_cmake
+_cdbs_class_cmake := 1
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DEB_DESTDIR)
+DEB_CMAKE_PREFIX =/usr
+
+# Overriden from makefile-vars.mk
+# We pass CFLAGS and friends to ./configure, so no need to pass them to make
+DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) $(MAKE) -C $(DEB_BUILDDIR)
+
+include $(_cdbs_class_path)/makefile.mk$(_cdbs_makefile_suffix)
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+# well, -O0
+endif
+
+ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+# semi-debug
+else
+# final
+endif
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+# debug
+endif
+
+#DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+
+common-configure-arch common-configure-indep:: common-configure-impl
+common-configure-impl:: $(DEB_BUILDDIR)/CMakeCache.txt
+$(DEB_BUILDDIR)/CMakeCache.txt:
+	cd $(DEB_BUILDDIR) && cmake $(CURDIR)/$(DEB_SRCDIR) \
+	-DCMAKE_INSTALL_PREFIX="$(DEB_CMAKE_PREFIX)" \
+	$(DEB_CMAKE_EXTRA_FLAGS) -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" \
+	-DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_VERBOSE_MAKEFILE=ON
+	mkdir -p $(DEB_DESTDIR)
+
+cleanbuilddir::
+	-if test "$(DEB_BUILDDIR)" != "$(DEB_SRCDIR)"; then rm -rf $(DEB_BUILDDIR); fi
+
+endif
+

Modified: kde-extras/kbfx/trunk/debian/control
===================================================================
--- kde-extras/kbfx/trunk/debian/control	2007-01-20 16:13:46 UTC (rev 5389)
+++ kde-extras/kbfx/trunk/debian/control	2007-01-20 16:53:07 UTC (rev 5390)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fboudra at free.fr>, Mark Purcell <msp at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), automake1.8, kdelibs4-dev
+Build-Depends: cdbs, debhelper (>= 5), cmake, kdelibs4-dev
 Standards-Version: 3.7.2
 
 Package: kbfx

Modified: kde-extras/kbfx/trunk/debian/docs
===================================================================
--- kde-extras/kbfx/trunk/debian/docs	2007-01-20 16:13:46 UTC (rev 5389)
+++ kde-extras/kbfx/trunk/debian/docs	2007-01-20 16:53:07 UTC (rev 5390)
@@ -1,2 +1,2 @@
-README
-TODO
+doc/README
+doc/TODO

Modified: kde-extras/kbfx/trunk/debian/kbfx.lintian-overrides
===================================================================
--- kde-extras/kbfx/trunk/debian/kbfx.lintian-overrides	2007-01-20 16:13:46 UTC (rev 5389)
+++ kde-extras/kbfx/trunk/debian/kbfx.lintian-overrides	2007-01-20 16:53:07 UTC (rev 5390)
@@ -1,11 +1,5 @@
 # It isn't a library or a development package
-# and no other packages uses libkbfxspinx
-kbfx: no-shlibs-control-file usr/lib/libkbfxspinx.so
-kbfx: package-name-doesnt-match-sonames libkbfxspinx
-# the rpath only shows up on amd64 (at least not on i386)
-# It is not a package bug but a bug somewhere else (gcc, ld ?)
-# It appears to be an $(arch) bug and not a $(pkg) one.
-# --disable-rpath is passed correctly to ./configure e.g.
-kbfx: binary-or-shlib-defines-rpath ./usr/lib/kde3/kcm_kcmkbfx.so /usr/lib
-kbfx: binary-or-shlib-defines-rpath ./usr/lib/libkbfxspinx.so /usr/lib
-kbfx: binary-or-shlib-defines-rpath ./usr/bin/kbfxconfigapp /usr/lib:/lib
+# and no other packages uses libkbfxspinx and libkbfxplasma
+kbfx: no-shlibs-control-file usr/lib/libkbfxspinxtest.so
+kbfx: no-shlibs-control-file usr/lib/libkbfxplasma.so
+kbfx: package-name-doesnt-match-sonames libkbfxspinxtest libkbfxplasma

Modified: kde-extras/kbfx/trunk/debian/patches/10_use_xdg_appsdir.diff
===================================================================
--- kde-extras/kbfx/trunk/debian/patches/10_use_xdg_appsdir.diff	2007-01-20 16:13:46 UTC (rev 5389)
+++ kde-extras/kbfx/trunk/debian/patches/10_use_xdg_appsdir.diff	2007-01-20 16:53:07 UTC (rev 5390)
@@ -1,24 +1,14 @@
-diff -Nur kbfx-0.4.9.2/kbfxconfigapp/Makefile.am kbfx-0.4.9.2.new/kbfxconfigapp/Makefile.am
---- kbfx-0.4.9.2/kbfxconfigapp/Makefile.am	2006-09-19 21:38:17.000000000 +0200
-+++ kbfx-0.4.9.2.new/kbfxconfigapp/Makefile.am	2006-09-25 17:11:48.000000000 +0200
-@@ -46,7 +46,7 @@
- kbfxconfigapp_LDADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_KHTML)
+diff -Nur kbfx-0.4.9.3~20070117/configdialog/CMakeLists.txt kbfx-0.4.9.3~20070117.new/configdialog/CMakeLists.txt
+--- kbfx-0.4.9.3~20070117/configdialog/CMakeLists.txt	2006-11-18 19:02:24.000000000 +0100
++++ kbfx-0.4.9.3~20070117.new/configdialog/CMakeLists.txt	2007-01-19 02:03:48.000000000 +0100
+@@ -33,8 +33,8 @@
+     RUNTIME DESTINATION ${BIN_INSTALL_DIR})
  
- # this is where the desktop file will go 
--shelldesktopdir = $(kde_appsdir)/Utilities
-+shelldesktopdir = $(xdg_appsdir)
- shelldesktop_DATA = kbfxconfigapp.desktop
- 
- # this is where the shell's XML-GUI resource file goes
-diff -Nur kbfx-0.4.9.2/kbfxconfigapp/Makefile.in kbfx-0.4.9.2.new/kbfxconfigapp/Makefile.in
---- kbfx-0.4.9.2/kbfxconfigapp/Makefile.in	2006-09-22 13:19:38.000000000 +0200
-+++ kbfx-0.4.9.2.new/kbfxconfigapp/Makefile.in	2006-09-25 17:12:25.000000000 +0200
-@@ -381,7 +381,7 @@
- kbfxconfigapp_LDADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_KHTML)
- 
- # this is where the desktop file will go 
--shelldesktopdir = $(kde_appsdir)/Utilities
-+shelldesktopdir = $(xdg_appsdir)
- shelldesktop_DATA = kbfxconfigapp.desktop
- 
- # this is where the shell's XML-GUI resource file goes
+ INSTALL(FILES kbfxconfigappui.rc DESTINATION ${DATA_INSTALL_DIR}/kbfxconfigapp)
+-#INSTALL(FILES kbfxconfigapp.desktop DESTINATION ${XDG_APPS_DIR})
+-INSTALL(FILES kbfxconfigapp.desktop DESTINATION ${APPLNK_INSTALL_DIR}/Utilities)
++INSTALL(FILES kbfxconfigapp.desktop DESTINATION ${XDG_APPS_DIR})
++#INSTALL(FILES kbfxconfigapp.desktop DESTINATION ${APPLNK_INSTALL_DIR}/Utilities)
+ INSTALL(FILES kbfx_install_theme.desktop kbfx_prepare_theme.desktop
+     DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus)
+ INSTALL(FILES kbfx_theme.desktop

Modified: kde-extras/kbfx/trunk/debian/patches/11_fix_desktop_categories.diff
===================================================================
--- kde-extras/kbfx/trunk/debian/patches/11_fix_desktop_categories.diff	2007-01-20 16:13:46 UTC (rev 5389)
+++ kde-extras/kbfx/trunk/debian/patches/11_fix_desktop_categories.diff	2007-01-20 16:53:07 UTC (rev 5390)
@@ -1,9 +1,9 @@
-diff -Nur kbfx-0.4.9.2/kbfxconfigapp/kbfxconfigapp.desktop kbfx-0.4.9.2.new/kbfxconfigapp/kbfxconfigapp.desktop
---- kbfx-0.4.9.2/kbfxconfigapp/kbfxconfigapp.desktop	2006-09-19 22:00:33.000000000 +0200
-+++ kbfx-0.4.9.2.new/kbfxconfigapp/kbfxconfigapp.desktop	2006-09-25 16:27:08.000000000 +0200
-@@ -5,4 +5,4 @@
- Icon=kbfxconfigapp
- Type=Application
- Comment=KBFX Configuration Utility
+diff -Nur kbfx-0.4.9.3~20070117/configdialog/kbfxconfigapp.desktop kbfx-0.4.9.3~20070117.new/configdialog/kbfxconfigapp.desktop
+--- kbfx-0.4.9.3~20070117/configdialog/kbfxconfigapp.desktop	2006-12-26 14:47:28.000000000 +0100
++++ kbfx-0.4.9.3~20070117.new/configdialog/kbfxconfigapp.desktop	2007-01-19 02:05:23.000000000 +0100
+@@ -29,4 +29,4 @@
+ Comment[pt]=Utilitário de Configuração do KBFX
+ Comment[pt_BR]=Utilitário para Configuração do KBFX
+ Comment[sv]=KBFX-inställningsverktyg
 -Categories=Qt;KDE;System;Configuration;
 +Categories=Qt;KDE;Settings;

Added: kde-extras/kbfx/trunk/debian/patches/13_fix_doc_path.diff
===================================================================
--- kde-extras/kbfx/trunk/debian/patches/13_fix_doc_path.diff	2007-01-20 16:13:46 UTC (rev 5389)
+++ kde-extras/kbfx/trunk/debian/patches/13_fix_doc_path.diff	2007-01-20 16:53:07 UTC (rev 5390)
@@ -0,0 +1,9 @@
+diff -Nur kbfx-0.4.9.3~20070117/doc/CMakeLists.txt kbfx-0.4.9.3~20070117.new/doc/CMakeLists.txt
+--- kbfx-0.4.9.3~20070117/doc/CMakeLists.txt	2007-01-17 16:31:10.000000000 +0100
++++ kbfx-0.4.9.3~20070117.new/doc/CMakeLists.txt	2007-01-20 17:20:23.000000000 +0100
+@@ -14,4 +14,4 @@
+ 	)
+ 
+ INSTALL(FILES ${DOCFILES}
+-    DESTINATION ${SHARE_INSTALL_PREFIX}/doc/kbfx-${APPLICATION_VERSION})
++    DESTINATION ${SHARE_INSTALL_PREFIX}/doc/kbfx)

Added: kde-extras/kbfx/trunk/debian/patches/14_fix_docfiles_list.diff
===================================================================
--- kde-extras/kbfx/trunk/debian/patches/14_fix_docfiles_list.diff	2007-01-20 16:13:46 UTC (rev 5389)
+++ kde-extras/kbfx/trunk/debian/patches/14_fix_docfiles_list.diff	2007-01-20 16:53:07 UTC (rev 5390)
@@ -0,0 +1,29 @@
+diff -Nur kbfx-0.4.9.3~20070117/doc/CMakeLists.txt kbfx-0.4.9.3~20070117.new/doc/CMakeLists.txt
+--- kbfx-0.4.9.3~20070117/doc/CMakeLists.txt	2007-01-20 17:20:53.000000000 +0100
++++ kbfx-0.4.9.3~20070117.new/doc/CMakeLists.txt	2007-01-20 17:23:54.000000000 +0100
+@@ -1,16 +1,16 @@
+ SET(DOCFILES
+ 	AUTHORS
+-	ChangeLog
+-	COPYING
++#	ChangeLog
++#	COPYING
+ 	CREDITS
+ 	HACKING
+-	HOWTO
+-	INSTALL
+-	KNOWN_BUGS
+-	LICENSE
+-	NEWS
+-	README
+-	TODO
++#	HOWTO
++#	INSTALL
++#	KNOWN_BUGS
++#	LICENSE
++#	NEWS
++#	README
++#	TODO
+ 	)
+ 
+ INSTALL(FILES ${DOCFILES}

Modified: kde-extras/kbfx/trunk/debian/rules
===================================================================
--- kde-extras/kbfx/trunk/debian/rules	2007-01-20 16:13:46 UTC (rev 5389)
+++ kde-extras/kbfx/trunk/debian/rules	2007-01-20 16:53:07 UTC (rev 5390)
@@ -1,10 +1,12 @@
 #!/usr/bin/make -f
 
+include debian/cmake.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
+DEB_CMAKE_EXTRA_FLAGS = -DLIB_SUFFIX=""
+
 install/kbfx::
 	install -D -p -m0644 debian/kbfx.lintian-overrides \
 		debian/kbfx/usr/share/lintian/overrides/kbfx




More information about the pkg-kde-commits mailing list