[Pkg-kde-commits] rev 2054 - in branches/kde-3.4.0/packages/kdebindings/debian: . patches

[Adeodato Simó]

Author: adeodato
Date: 2005-10-20 00:41:41 +0000 (Thu, 20 Oct 2005)
New Revision: 2054

Added:
   branches/kde-3.4.0/packages/kdebindings/debian/patches/014_kdejava_link_qtjava.la_not_-lqtjava.diff
Modified:
   branches/kde-3.4.0/packages/kdebindings/debian/changelog
   branches/kde-3.4.0/packages/kdebindings/debian/patches/98_buildprep.diff
Log:
Added 014_kdejava_link_qtjava.la_not_-lqtjava.diff to make libkdejava
link against libqtjava.la instead of -lqtjava.


Modified: branches/kde-3.4.0/packages/kdebindings/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdebindings/debian/changelog	2005-10-19 23:26:47 UTC (rev 2053)
+++ branches/kde-3.4.0/packages/kdebindings/debian/changelog	2005-10-20 00:41:41 UTC (rev 2054)
@@ -18,7 +18,7 @@
     Introduce a wilcard in the .install file, and don't pass a hardcoded path
     to ./configure.
 
-  * Patch reworking:
+  * Work under patches/, each fixing a different FTBFS:
 
     - Further improve 030-koala-makefile-too-much-arguments.diff to do test -n
       "$<" instead of "$?", to avoid new "Argument list too long" errors.
@@ -26,6 +26,9 @@
     - Added 013-kdejava_qtjava_objdir_classpath.diff to look for compiled
       classes in the appropriate dir now that srcdir != builddir.
 
+    - Added 014_kdejava_link_qtjava.la_not_-lqtjava.diff to make libkdejava
+      link against libqtjava.la instead of -lqtjava.
+
   * Install python-dcop examples. (Closes: #303654)
 
   * CDBSized debian/rules, to match the rest of KDE packages.

Added: branches/kde-3.4.0/packages/kdebindings/debian/patches/014_kdejava_link_qtjava.la_not_-lqtjava.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebindings/debian/patches/014_kdejava_link_qtjava.la_not_-lqtjava.diff	2005-10-19 23:26:47 UTC (rev 2053)
+++ branches/kde-3.4.0/packages/kdebindings/debian/patches/014_kdejava_link_qtjava.la_not_-lqtjava.diff	2005-10-20 00:41:41 UTC (rev 2054)
@@ -0,0 +1,11 @@
+--- kdebindings/kdejava/koala/Makefile.am
++++ kdebindings/kdejava/koala/Makefile.am
+@@ -4,7 +4,7 @@
+ ## INCLUDES were found outside kdevelop specific part
+ 
+ koala_SOURCES = main.cpp 
+-koala_LDADD   = ./kdejava/libkdejava.la $(LIB_KSPELL) -lqtjava -lkparts $(LIB_KIO) -lXext -lX11 $(LIBSOCKET)
++koala_LDADD   = ./kdejava/libkdejava.la ../../qtjava/javalib/qtjava/libqtjava.la $(LIB_KSPELL) -lkparts $(LIB_KIO) -lXext -lX11 $(LIBSOCKET)
+ 
+ SUBDIRS = org kdejava 
+ 

Modified: branches/kde-3.4.0/packages/kdebindings/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebindings/debian/patches/98_buildprep.diff	2005-10-19 23:26:47 UTC (rev 2053)
+++ branches/kde-3.4.0/packages/kdebindings/debian/patches/98_buildprep.diff	2005-10-20 00:41:41 UTC (rev 2054)
@@ -64,7 +64,7 @@
  
  #>+ 2
 -KDE_DIST=subdirs Makefile.in configure.in.bot configure.files config.h.in Makefile.am.in.wo kdebindings.lsm configure.in aclocal.m4 configure.in.in acinclude.m4 Makefile.am Makefile.am.in 
-+KDE_DIST=stamp-h.in subdirs Makefile.in configure.in.bot configure.files config.h.in 040-configure-give-kde_java_libgcjdir.diff Makefile.am.in.wo kdebindings.lsm configure.in aclocal.m4 configure.in.in acinclude.m4 configure Makefile.am 030-koala-makefile-too-much-arguments.diff Makefile.am.in 
++KDE_DIST=stamp-h.in subdirs Makefile.in configure.in.bot configure.files config.h.in Makefile.am.in.wo kdebindings.lsm configure.in aclocal.m4 configure.in.in configure Makefile.am acinclude.m4 Makefile.am.in 
  
  #>+ 2
  docs-am:
@@ -10142,7 +10142,7 @@
  subdir = kdejava/koala
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -52,9 +50,7 @@
+@@ -52,15 +50,14 @@
  mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -10153,7 +10153,15 @@
  am_koala_OBJECTS = main.$(OBJEXT)
  #>- koala_OBJECTS = $(am_koala_OBJECTS)
  #>+ 1
-@@ -104,6 +100,7 @@
+ koala_OBJECTS = main.$(OBJEXT)
+ am__DEPENDENCIES_1 =
+-koala_DEPENDENCIES = ./kdejava/libkdejava.la $(am__DEPENDENCIES_1) \
++koala_DEPENDENCIES = ./kdejava/libkdejava.la \
++	../../qtjava/javalib/qtjava/libqtjava.la $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+@@ -104,6 +101,7 @@
      *) f=$$p;; \
    esac;
  am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
@@ -10161,7 +10169,7 @@
  dataDATA_INSTALL = $(INSTALL_DATA)
  DATA = $(data_DATA)
  ETAGS = etags
-@@ -244,6 +241,9 @@
+@@ -244,6 +242,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10171,7 +10179,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -275,6 +275,7 @@
+@@ -275,6 +276,7 @@
  RUBY_ARCHDIR = @RUBY_ARCHDIR@
  RUBY_LIBDIR = @RUBY_LIBDIR@
  RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
@@ -10179,8 +10187,17 @@
  RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
  RUBY_SITEDIR = @RUBY_SITEDIR@
  SET_MAKE = @SET_MAKE@
-@@ -459,7 +460,7 @@
+@@ -425,7 +427,7 @@
+ xparts_SUBDIR_included_FALSE = @xparts_SUBDIR_included_FALSE@
+ xparts_SUBDIR_included_TRUE = @xparts_SUBDIR_included_TRUE@
+ koala_SOURCES = main.cpp 
+-koala_LDADD = ./kdejava/libkdejava.la $(LIB_KSPELL) -lqtjava -lkparts $(LIB_KIO) -lXext -lX11 $(LIBSOCKET)
++koala_LDADD = ./kdejava/libkdejava.la ../../qtjava/javalib/qtjava/libqtjava.la $(LIB_KSPELL) -lkparts $(LIB_KIO) -lXext -lX11 $(LIBSOCKET)
+ SUBDIRS = org kdejava 
+ EXTRA_DIST = main.cpp 
  
+@@ -459,7 +461,7 @@
+ 
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -10188,7 +10205,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -497,34 +498,13 @@
+@@ -497,34 +499,13 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10227,7 +10244,7 @@
  	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
  	  echo " rm -f $$p $$f"; \
  	  rm -f $$p $$f ; \
-@@ -768,7 +748,7 @@
+@@ -768,7 +749,7 @@
  all-am: Makefile $(PROGRAMS) $(DATA)
  installdirs: installdirs-recursive
  installdirs-am:
@@ -10236,7 +10253,7 @@
  	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
  	done
  install: install-recursive
-@@ -800,9 +780,11 @@
+@@ -800,9 +781,11 @@
  #>+ 1
  clean: kde-rpo-clean  clean-recursive
  
@@ -10251,7 +10268,7 @@
  
  distclean: distclean-recursive
  	-rm -rf ./$(DEPDIR)
-@@ -822,7 +804,7 @@
+@@ -822,7 +805,7 @@
  
  install-data-am: install-dataDATA
  
@@ -10260,7 +10277,7 @@
  
  install-info: install-info-recursive
  
-@@ -848,25 +830,24 @@
+@@ -848,25 +831,24 @@
  
  ps-am: