rev 9763 - in kde-extras/basket/trunk/debian: . patches

Sune Vuorela pusling-guest at alioth.debian.org
Sat Mar 15 13:32:29 UTC 2008 

Author: pusling-guest
Date: 2008-03-15 13:32:29 +0000 (Sat, 15 Mar 2008)
New Revision: 9763

Added:
   kde-extras/basket/trunk/debian/patches/16_basket_kontact_compat.diff
Removed:
   kde-extras/basket/trunk/debian/patches/02_libtool_update.diff
   kde-extras/basket/trunk/debian/patches/98_buildprep.diff
   kde-extras/basket/trunk/debian/watch
Modified:
   kde-extras/basket/trunk/debian/changelog
   kde-extras/basket/trunk/debian/control
   kde-extras/basket/trunk/debian/patches/03_lib_link.diff
   kde-extras/basket/trunk/debian/patches/series
   kde-extras/basket/trunk/debian/rules
Log:
update kontact integration, remove watch file, relibtoolize on build

Modified: kde-extras/basket/trunk/debian/changelog
===================================================================
--- kde-extras/basket/trunk/debian/changelog	2008-03-15 12:54:26 UTC (rev 9762)
+++ kde-extras/basket/trunk/debian/changelog	2008-03-15 13:32:29 UTC (rev 9763)
@@ -1,3 +1,13 @@
+basket (1.0.2-3) unstable; urgency=low
+
+  +++ Changes by Sune Vuorela:
+
+  * Relibtoolize on build. much easier. This also fixes double build(Closes: #442503)
+  * Fix kontact integration (Closes: #469596)
+  * Remove watch file (Closes: #449699)
+
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Tue, 11 Mar 2008 23:39:35 +0100
+
 basket (1.0.2-2) unstable; urgency=low
 
   [ Ana Beatriz Guerrero Lopez ]

Modified: kde-extras/basket/trunk/debian/control
===================================================================
--- kde-extras/basket/trunk/debian/control	2008-03-15 12:54:26 UTC (rev 9762)
+++ kde-extras/basket/trunk/debian/control	2008-03-15 13:32:29 UTC (rev 9763)
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>
-Build-Depends: debhelper (>= 5), autotools-dev, kdelibs4-dev (>= 4:3.5.6), kdepim-dev (>= 4:3.5.6), libgpgme11-dev, quilt (>= 0.40)
+Build-Depends: debhelper (>= 5), autotools-dev, kdelibs4-dev (>= 4:3.5.6), kdepim-dev (>= 4:3.5.6), libgpgme11-dev, quilt (>= 0.40), autoconf, libtool, automake1.9
 Standards-Version: 3.7.2
 
 Package: basket
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${kontact:Depends}
 Description: a multi-purpose note-taking application for KDE
  This application provides as many baskets (drawers) as you wish; Several
  kinds of objects (texts, URLs, images,...) can be drag-n-drop'd into it. 

Deleted: kde-extras/basket/trunk/debian/patches/02_libtool_update.diff

Modified: kde-extras/basket/trunk/debian/patches/03_lib_link.diff
===================================================================
--- kde-extras/basket/trunk/debian/patches/03_lib_link.diff	2008-03-15 12:54:26 UTC (rev 9762)
+++ kde-extras/basket/trunk/debian/patches/03_lib_link.diff	2008-03-15 13:32:29 UTC (rev 9763)
@@ -1,11 +1,40 @@
---- basket-1.0~beta3/file-integration/Makefile.am	2007-02-02 13:13:55.000000000 +0100
-+++ basket-1.0~beta3/file-integration/Makefile.am	2007-02-02 13:17:49.000000000 +0100
-@@ -11,7 +11,7 @@ INCLUDES = $(all_includes)
+Index: b/file-integration/Makefile.am
+===================================================================
+--- a/file-integration/Makefile.am
++++ b/file-integration/Makefile.am
+@@ -10,8 +10,8 @@
+ INCLUDES = $(all_includes)
  kde_module_LTLIBRARIES = basketthumbcreator.la
  basketthumbcreator_la_SOURCES = basketthumbcreator.cpp
- basketthumbcreator_la_LIBADD = $(LIB_KIO)
+-basketthumbcreator_la_LIBADD = $(LIB_KIO)
 -basketthumbcreator_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-+basketthumbcreator_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE)
++basketthumbcreator_la_LIBADD =
++basketthumbcreator_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lqt-mt $(LIB_KDECORE)
  kde_services_DATA = basketthumbcreator.desktop
  
  # Icons:
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -32,7 +32,7 @@
+ libbasketcommon_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries)
+ 
+ libbasketcommon_la_LIBADD = $(LIB_ARTSKDE) -lkio $(LIB_KDEUI) $(LIB_KDECORE) \
+-	$(LIB_QT) $(LIBSOCKET) $(GPGME_LIBS) $(LIB_KPARTS) -lDCOP -lkdefx -lkdeui
++	-lqt-mt -lX11 $(LIBSOCKET) -lgpgme $(LIB_KPARTS) -lkdefx -lkdeui -lDCOP
+ 
+ libbasketcommon_la_SOURCES = \
+ 	archive.cpp bnpview.cpp settings.cpp basket.cpp basketproperties.cpp \
+@@ -82,11 +82,11 @@
+ 
+ libbasketpart_la_SOURCES = basket_part.cpp
+ libbasketpart_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
+-libbasketpart_la_LIBADD  = libbasketcommon.la -lkparts -lkdeui $(LIB_KDECORE) $(LIB_QT) -lDCOP
++libbasketpart_la_LIBADD  = libbasketcommon.la -lkparts -lkdeui $(LIB_KDECORE) -lqt-mt
+ 
+ kcm_basket_la_SOURCES = kcm_basket.cpp
+ kcm_basket_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-kcm_basket_la_LIBADD = libbasketcommon.la $(LIB_KDECORE) $(LIB_QT) -lkdeui
++kcm_basket_la_LIBADD = libbasketcommon.la -lqt-mt -lkdeui
+ 
+ # this is where the desktop file will go
+ partdesktopdir   = $(kde_servicesdir)

Added: kde-extras/basket/trunk/debian/patches/16_basket_kontact_compat.diff
===================================================================
--- kde-extras/basket/trunk/debian/patches/16_basket_kontact_compat.diff	                        (rev 0)
+++ kde-extras/basket/trunk/debian/patches/16_basket_kontact_compat.diff	2008-03-15 13:32:29 UTC (rev 9763)
@@ -0,0 +1,13 @@
+Index: b/kontact_plugin/basket.desktop
+===================================================================
+--- a/kontact_plugin/basket.desktop
++++ b/kontact_plugin/basket.desktop
+@@ -5,7 +5,7 @@
+ ServiceTypes=Kontact/Plugin,KPluginInfo
+ 
+ X-KDE-Library=libkontact_basket
+-X-KDE-KontactPluginVersion=5
++X-KDE-KontactPluginVersion=6
+ X-KDE-KontactPartLibraryName=libbasketpart
+ X-KDE-KontactPartExecutableName=basket
+ X-KDE-KontactPartLoadOnStart=true

Deleted: kde-extras/basket/trunk/debian/patches/98_buildprep.diff

Modified: kde-extras/basket/trunk/debian/patches/series
===================================================================
--- kde-extras/basket/trunk/debian/patches/series	2008-03-15 12:54:26 UTC (rev 9762)
+++ kde-extras/basket/trunk/debian/patches/series	2008-03-15 13:32:29 UTC (rev 9763)
@@ -1,8 +1,7 @@
-02_libtool_update.diff
 03_lib_link.diff
 04_am_maintainer_mode.diff
 12_desktop.diff
 13_add_da.po.diff
 14_update_es_po.diff
 15_fix_gcc4.3.diff
-98_buildprep.diff
+16_basket_kontact_compat.diff

Modified: kde-extras/basket/trunk/debian/rules
===================================================================
--- kde-extras/basket/trunk/debian/rules	2008-03-15 12:54:26 UTC (rev 9762)
+++ kde-extras/basket/trunk/debian/rules	2008-03-15 13:32:29 UTC (rev 9763)
@@ -18,8 +18,15 @@
 
 include /usr/share/quilt/quilt.make
 
+configure: $(QUILT_STAMPFN)
+	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
+	cp -f /usr/share/libtool/libtool.m4 admin/libtool.m4.in
 
-config.status: $(QUILT_STAMPFN)
+	make -f admin/Makefile.common
+
+
+
+config.status: configure
 	dh_testdir
 	test -e config.sub -a -L config.sub || \
 		ln -sf /usr/share/misc/config.sub config.sub
@@ -49,13 +56,24 @@
 	dh_testdir
 	dh_testroot
 
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 
 	$(RM) config.cache config.sub config.guess config.log
 
 	dh_clean
 	rm -f build-stamp
+	#cleaning up after relibtoolizing
+	find . -name Makefile.in | xargs rm -f
+	rm -f po/*.gmo
+	rm -f config.sub config.guess
+	rm -f aclocal.m4
+	rm -f acinclude.m4
+	rm -f configure configure.in
+	rm -f config.h.in
+	rm -f admin/ltmain.sh
+	rm -f admin/libtool.m4.in
 
+
 install: build
 	dh_testdir
 	dh_testroot
@@ -64,12 +82,15 @@
 
 	# Install into package-build-dir
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/basket
+	#incompatible compatible file
+	rm $(CURDIR)/debian/basket/usr/share/services/kontact/basket_v4.desktop
 
 	mkdir -p $(CURDIR)/debian/basket/usr/share/applications/kde/
 	mv $(CURDIR)/debian/basket/usr/share/applnk/Utilities/basket.desktop $(CURDIR)/debian/basket/usr/share/applications/kde/
 
 binary-indep: build install
 
+KONTACT_PLUGIN_ABI=$(shell echo $(shell grep X-KDE-KontactPluginVersion kontact_plugin/basket.desktop|sed 's/X-KDE-KontactPluginVersion//;s/=//'))
 binary-arch: build install
 	dh_testdir
 	dh_testroot
@@ -87,6 +108,7 @@
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
+	echo kontact:Depends=kontact-plugin-abi-$(KONTACT_PLUGIN_ABI) >> debian/basket.substvars
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Deleted: kde-extras/basket/trunk/debian/watch

More information about the pkg-kde-commits mailing list