rev 11196 - in branches/kde4/packages/kdeedu/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2008-06-29 14:09:45 +0000 (Sun, 29 Jun 2008)
New Revision: 11196

Modified:
   branches/kde4/packages/kdeedu/debian/changelog
   branches/kde4/packages/kdeedu/debian/kstars.install
   branches/kde4/packages/kdeedu/debian/libmarble-dev.install
   branches/kde4/packages/kdeedu/debian/patches/97_fix_target_link_libraries.diff
   branches/kde4/packages/kdeedu/debian/patches/series
Log:
re-enable indi, refresh patches

Modified: branches/kde4/packages/kdeedu/debian/changelog
===================================================================
--- branches/kde4/packages/kdeedu/debian/changelog	2008-06-29 13:33:20 UTC (rev 11195)
+++ branches/kde4/packages/kdeedu/debian/changelog	2008-06-29 14:09:45 UTC (rev 11196)
@@ -1,3 +1,10 @@
+kdeedu (4:4.0.84-1) experimental; urgency=low
+
+  * New upstream snapshot
+  * Enable indi again - put stuff in kstars.
+
+ -- Sune Vuorela <debian at pusling.com>  Sun, 29 Jun 2008 16:07:39 +0200
+
 kdeedu (4:4.0.82+svn819867-1) experimental; urgency=low
 
   * New upstream snapshot.

Modified: branches/kde4/packages/kdeedu/debian/kstars.install
===================================================================
--- branches/kde4/packages/kdeedu/debian/kstars.install	2008-06-29 13:33:20 UTC (rev 11195)
+++ branches/kde4/packages/kdeedu/debian/kstars.install	2008-06-29 14:09:45 UTC (rev 11196)
@@ -1,3 +1,25 @@
 usr/bin/kstars
 usr/lib/libSatLib.so.4
 usr/lib/libSatLib.so.4.1.0
+usr/bin/indi_apogee_alta
+usr/bin/indi_celestron_gps
+usr/bin/indi_fli_ccd
+usr/bin/indi_fli_pdf
+usr/bin/indi_fli_wheel
+usr/bin/indi_intelliscope
+usr/bin/indi_lx200basic
+usr/bin/indi_lx200generic
+usr/bin/indi_meade_lpi
+usr/bin/indi_orion_atlas
+usr/bin/indi_robofocus
+usr/bin/indi_sbig_ccd
+usr/bin/indi_sbig_stv
+usr/bin/indi_skycommander
+usr/bin/indi_temma
+usr/bin/indi_trutech_wheel
+usr/bin/indi_v4l_generic
+usr/bin/indi_v4l_philips
+usr/bin/indiserver
+usr/lib/libsbigudrv.so.1
+usr/lib/libsbigudrv.so.1.0.0
+

Modified: branches/kde4/packages/kdeedu/debian/libmarble-dev.install
===================================================================
--- branches/kde4/packages/kdeedu/debian/libmarble-dev.install	2008-06-29 13:33:20 UTC (rev 11195)
+++ branches/kde4/packages/kdeedu/debian/libmarble-dev.install	2008-06-29 14:09:45 UTC (rev 11196)
@@ -1,3 +1,4 @@
 usr/include/marble/
 usr/lib/libmarblewidget.so
 usr/share/kde4/apps/cmake/modules/FindMarbleWidget.cmake
+usr/share/kde4/apps/cmake/modules/FindMarble.cmake

Modified: branches/kde4/packages/kdeedu/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- branches/kde4/packages/kdeedu/debian/patches/97_fix_target_link_libraries.diff	2008-06-29 13:33:20 UTC (rev 11195)
+++ branches/kde4/packages/kdeedu/debian/patches/97_fix_target_link_libraries.diff	2008-06-29 14:09:45 UTC (rev 11196)
@@ -1,3 +1,5 @@
+Index: b/kig/CMakeLists.txt
+===================================================================
 --- a/kig/CMakeLists.txt
 +++ b/kig/CMakeLists.txt
 @@ -144,7 +144,7 @@
@@ -9,6 +11,8 @@
  if(BOOST_PYTHON_FOUND)
    target_link_libraries(kigpart ${BOOST_PYTHON_LIBS} ${KDE4_KTEXTEDITOR_LIBS})
  endif(BOOST_PYTHON_FOUND)
+Index: b/kmplot/kmplot/CMakeLists.txt
+===================================================================
 --- a/kmplot/kmplot/CMakeLists.txt
 +++ b/kmplot/kmplot/CMakeLists.txt
 @@ -57,7 +57,7 @@
@@ -20,10 +24,20 @@
  
  install(TARGETS kmplotpart  DESTINATION ${PLUGIN_INSTALL_DIR} )
  
+Index: b/kstars/kstars/indi/CMakeLists.txt
+===================================================================
 --- a/kstars/kstars/indi/CMakeLists.txt
 +++ b/kstars/kstars/indi/CMakeLists.txt
-@@ -409,7 +409,7 @@
+@@ -1,5 +1,7 @@
+ KDE4_NO_ENABLE_FINAL(indi)
  
++find_package(ZLIB REQUIRED)
++
+ include_directories( ${CMAKE_CURRENT_BINARY_DIR}/../.. )
+ include_directories( ${CMAKE_SOURCE_DIR}/kstars/kstars/indi/libs)
+ include_directories( ${CMAKE_SOURCE_DIR}/kstars/kstars/indi/libs/apogee)
+@@ -409,7 +411,7 @@
+ 
  kde4_add_executable(indi_fli_ccd ${fliccd_SRCS} ${libfli_SRCS} ${liblilxml_SRCS} ${libindicom_SRCS})
  
 -target_link_libraries(indi_fli_ccd ${KDE4_KDECORE_LIBS} ${CFITSIO_LIBRARIES} m)
@@ -31,16 +45,16 @@
  
  if (NOVA_FOUND)
    target_link_libraries(indi_fli_ccd ${NOVA_LIBRARIES})
-@@ -431,7 +431,7 @@
+@@ -431,7 +433,7 @@
  
  kde4_add_executable(indi_apogee_alta ${apogee_alta_SRCS} ${libfli_SRCS} ${liblilxml_SRCS} ${libindicom_SRCS})
  
 -target_link_libraries(indi_apogee_alta ${KDE4_KDECORE_LIBS} ${LIBUSB_LIBRARIES} ${CFITSIO_LIBRARIES})
-+target_link_libraries(indi_apogee_alta ${KDE4_KDECORE_LIBS} ${LIBUSB_LIBRARIES} ${CFITSIO_LIBRARIES} ${ZLIB_LIBRARY} ${ZLIB_LIBRARY})
++target_link_libraries(indi_apogee_alta ${KDE4_KDECORE_LIBS} ${LIBUSB_LIBRARIES} ${CFITSIO_LIBRARIES} ${ZLIB_LIBRARY} )
  
  if (NOVA_FOUND)
    target_link_libraries(indi_apogee_alta ${NOVA_LIBRARIES})
-@@ -453,7 +453,7 @@
+@@ -453,7 +455,7 @@
  
  kde4_add_executable(indi_sbig_ccd ${sbigccd_SRCS} ${liblilxml_SRCS} ${libindicom_SRCS})
  
@@ -49,16 +63,16 @@
  
  if (NOVA_FOUND)
    target_link_libraries(indi_sbig_ccd ${NOVA_LIBRARIES})
-@@ -480,7 +480,7 @@
+@@ -480,7 +482,7 @@
  
  kde4_add_executable(indi_sbig_stv NOGUI ${stv_SRCS} ${liblilxml_SRCS} ${libindicom_SRCS})
  
 -target_link_libraries(indi_sbig_stv ${KDE4_KDECORE_LIBS} ${CFITSIO_LIBRARIES} ${NOVA_LIBRARIES})
 +target_link_libraries(indi_sbig_stv ${KDE4_KDECORE_LIBS} ${CFITSIO_LIBRARIES} ${NOVA_LIBRARIES} ${ZLIB_LIBRARY})
  
- install(TARGETS indi_sbig_stv DESTINATION ${BIN_INSTALL_DIR} )
+ install(TARGETS indi_sbig_stv ${INSTALL_TARGETS_DEFAULT_ARGS} )
  
-@@ -502,7 +502,7 @@
+@@ -502,7 +504,7 @@
  
  kde4_add_executable(indi_meade_lpi ${meade_lpi_SRCS} ${libwebcam_SRCS} ${liblilxml_SRCS} ${libindicom_SRCS})
  

Modified: branches/kde4/packages/kdeedu/debian/patches/series
===================================================================
--- branches/kde4/packages/kdeedu/debian/patches/series	2008-06-29 13:33:20 UTC (rev 11195)
+++ branches/kde4/packages/kdeedu/debian/patches/series	2008-06-29 14:09:45 UTC (rev 11196)
@@ -1,2 +1,2 @@
-disable_indi
+#disable_indi
 97_fix_target_link_libraries.diff