rev 3736 - in kde-extras/libkipi/trunk/debian: . patches

[Achim Bohnet]

Author: ach-guest
Date: 2006-05-14 09:33:48 +0000 (Sun, 14 May 2006)
New Revision: 3736

Added:
   kde-extras/libkipi/trunk/debian/patches/11_kdesvn_r540613_fix_include_path.diff
Modified:
   kde-extras/libkipi/trunk/debian/changelog
   kde-extras/libkipi/trunk/debian/patches/98_buildprep.diff
Log:
libkipi: 
  * Add 11_kdesvn_r540613_fix_include_path.diff.  Closes: #366933: libkipi -
    FTBFS: error: libkipi/interface.h: No such file or directory

  * Relibtoolization: Buildprep needs to be rerun. Because patch 11_...
    modifies a Makefile.am
	o debuild clean
	o mv debian/patches/99_only_-lqt-mt.diff ..
	o (cd ..; create-buildprep libkipi-0.1.3)
	o mv ../99_only_-lqt-mt.diff debian/patches
    99_only_-lqt-mt.diff rewrites configure. So it
    can only be applied after buildprep run.

Modified: kde-extras/libkipi/trunk/debian/changelog
===================================================================
--- kde-extras/libkipi/trunk/debian/changelog	2006-05-14 00:22:16 UTC (rev 3735)
+++ kde-extras/libkipi/trunk/debian/changelog	2006-05-14 09:33:48 UTC (rev 3736)
@@ -1,8 +1,10 @@
-libkipi (0.1.3-2) UNRELEASED; urgency=low
+libkipi (0.1.3-2) unstable; urgency=low
 
-  * NOT RELEASED YET
+  [ Achim Bohnet ]
+  * Add 11_kdesvn_r540613_fix_include_path.diff.  Closes: #366933: libkipi -
+    FTBFS: error: libkipi/interface.h: No such file or directory
 
- -- Mark Purcell <msp at debian.org>  Wed, 10 May 2006 22:42:57 +0100
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 14 May 2006 11:03:25 +0200
 
 libkipi (0.1.3-1) unstable; urgency=low
 

Added: kde-extras/libkipi/trunk/debian/patches/11_kdesvn_r540613_fix_include_path.diff
===================================================================
--- kde-extras/libkipi/trunk/debian/patches/11_kdesvn_r540613_fix_include_path.diff	2006-05-14 00:22:16 UTC (rev 3735)
+++ kde-extras/libkipi/trunk/debian/patches/11_kdesvn_r540613_fix_include_path.diff	2006-05-14 09:33:48 UTC (rev 3736)
@@ -0,0 +1,11 @@
+Index: libkipi/libkipi/Makefile.am
+===================================================================
+--- libkipi/libkipi/Makefile.am	(revision 540612)
++++ libkipi/libkipi/Makefile.am	(revision 540613)
+@@ -1,5 +1,5 @@
+ METASOURCES = AUTO
+-INCLUDES= $(LIBKIPI_CFLAGS) $(all_includes)
++INCLUDES = -I.. -I$(srcdir)/.. $(LIBKIPI_CFLAGS) $(all_includes)
+ 
+ KDE_ICON = kipi
+ 

Modified: kde-extras/libkipi/trunk/debian/patches/98_buildprep.diff
===================================================================
--- kde-extras/libkipi/trunk/debian/patches/98_buildprep.diff	2006-05-14 00:22:16 UTC (rev 3735)
+++ kde-extras/libkipi/trunk/debian/patches/98_buildprep.diff	2006-05-14 09:33:48 UTC (rev 3736)
@@ -105,6 +105,15 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -905,7 +920,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=Mainpage.dox subdirs Makefile.in libkipi.lsm configure.files RELEASE.rev config.h.in configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in 
++KDE_DIST=stamp-h.in Mainpage.dox subdirs Makefile.in libkipi.lsm configure.files RELEASE.rev config.h.in configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in 
+ 
+ #>+ 2
+ docs-am:
 --- acinclude.m4
 +++ acinclude.m4
 @@ -1689,15 +1689,6 @@
@@ -16439,6 +16448,15 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
+@@ -367,7 +368,7 @@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ #>- METASOURCES = AUTO
+-INCLUDES = $(LIBKIPI_CFLAGS) $(all_includes)
++INCLUDES = -I.. -I$(srcdir)/.. $(LIBKIPI_CFLAGS) $(all_includes)
+ KDE_ICON = kipi
+ lib_LTLIBRARIES = libkipi.la
+ libkipi_la_SOURCES = interface.cpp plugin.cpp pluginloader.cpp KDStream.cpp imageinfo.cpp imagecollection.cpp \
 @@ -398,7 +399,7 @@
  
  .SUFFIXES: