rev 10793 - in branches/kde4/packages/koffice/debian: . patches

[Ana Beatriz Guerrero López]

Author: ana
Date: 2008-05-29 19:00:24 +0000 (Thu, 29 May 2008)
New Revision: 10793

Modified:
   branches/kde4/packages/koffice/debian/changelog
   branches/kde4/packages/koffice/debian/control
   branches/kde4/packages/koffice/debian/patches/97_fix_target_link_libraries.diff
Log:
  * Add new build depends on libqt4-opengl-dev and python-dev.
  * Update 97_fix_target_link_libraries.diff and remove some parts merged by
    upstream.
  * Bump build depends to beta 1: >= 4.0.80.



Modified: branches/kde4/packages/koffice/debian/changelog
===================================================================
--- branches/kde4/packages/koffice/debian/changelog	2008-05-29 18:35:40 UTC (rev 10792)
+++ branches/kde4/packages/koffice/debian/changelog	2008-05-29 19:00:24 UTC (rev 10793)
@@ -1,6 +1,10 @@
 koffice (1:1.9.96.0~that.is.really.1.9.95.8-1) experimental; urgency=low
 
   * New upstrem release 1.9.95.8.
+  * Add new build depends on libqt4-opengl-dev and python-dev.
+  * Update 97_fix_target_link_libraries.diff and remove some parts merged by 
+    upstream.
+  * Bump build depends to beta 1: >= 4.0.80.
 
  -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Wed, 28 May 2008 16:16:13 +0200
 

Modified: branches/kde4/packages/koffice/debian/control
===================================================================
--- branches/kde4/packages/koffice/debian/control	2008-05-29 18:35:40 UTC (rev 10792)
+++ branches/kde4/packages/koffice/debian/control	2008-05-29 19:00:24 UTC (rev 10793)
@@ -4,14 +4,14 @@
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Raúl Sánchez Siles <rasasi78 at gmail.com>
 Build-Depends: cdbs, debhelper (>= 5), quilt, cmake (>= 2.4.5), 
- kdepimlibs5-dev (>= 4:4.0.72), libphonon-dev (>= 4:4.0.72),
+ kdepimlibs5-dev (>= 4:4.0.80), libphonon-dev (>= 4:4.0.80),
  libboost-dev, libopenexr-dev,
  libeigen-dev, libqimageblitz-dev, libqca2-dev, libglew1.5-dev,
  freeglut3-dev, libglpk-dev, libexiv2-dev, 
  libgraphicsmagick1-dev, libgraphicsmagick++1-dev,
  libwv2-dev, libmysqlclient15-dev, libpqxx-dev, libpoppler-qt4-dev, 
  libgsl0-dev, freetds-dev, libwpd8-dev, libwpg-dev,
- libxslt1-dev
+ libxslt1-dev, libqt4-opengl-dev, python-dev
 Standards-Version: 3.7.3
 Homepage: http://www.koffice.org/
 

Modified: branches/kde4/packages/koffice/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- branches/kde4/packages/koffice/debian/patches/97_fix_target_link_libraries.diff	2008-05-29 18:35:40 UTC (rev 10792)
+++ branches/kde4/packages/koffice/debian/patches/97_fix_target_link_libraries.diff	2008-05-29 19:00:24 UTC (rev 10793)
@@ -1,14 +1,3 @@
---- koffice-1.9.96.0~that.is.really.1.9.95.4.orig/libs/main/CMakeLists.txt
-+++ koffice-1.9.96.0~that.is.really.1.9.95.4/libs/main/CMakeLists.txt
-@@ -86,7 +86,7 @@
- 
- kde4_add_library(komain SHARED ${komain_LIB_SRCS})
- 
--target_link_libraries(komain koodf kstore ${KDE4_KPARTS_LIBS} ${KDE4_KABC_LIBS} ${KDE4_THREADWEAVER_LIBRARIES} ${KDE4_KDE3SUPPORT_LIBS})
-+target_link_libraries(komain koodf kstore ${KDE4_KFILE_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KABC_LIBS} ${KDE4_THREADWEAVER_LIBRARIES} ${KDE4_KDE3SUPPORT_LIBS})
- 
- set_target_properties(komain PROPERTIES VERSION ${GENERIC_KOFFICE_LIB_VERSION} SOVERSION ${GENERIC_KOFFICE_LIB_SOVERSION} )
- install(TARGETS komain DESTINATION ${LIB_INSTALL_DIR} )
 --- koffice-1.9.96.0~that.is.really.1.9.95.4.orig/libs/pigment/CMakeLists.txt
 +++ koffice-1.9.96.0~that.is.really.1.9.95.4/libs/pigment/CMakeLists.txt
 @@ -73,6 +73,11 @@