rev 13645 - in kde-extras/rsibreak/trunk/debian: . patches

Xavier Vello wdgt-guest at alioth.debian.org
Thu Jan 29 00:18:27 UTC 2009


Author: wdgt-guest
Date: 2009-01-29 00:18:26 +0000 (Thu, 29 Jan 2009)
New Revision: 13645

Added:
   kde-extras/rsibreak/trunk/debian/patches/
   kde-extras/rsibreak/trunk/debian/patches/01_build_with_4.2.0
   kde-extras/rsibreak/trunk/debian/patches/series
Modified:
   kde-extras/rsibreak/trunk/debian/
   kde-extras/rsibreak/trunk/debian/changelog
   kde-extras/rsibreak/trunk/debian/control
   kde-extras/rsibreak/trunk/debian/rules
Log:
prepare 0.9.0-2 to upload :
  - patch to build on 4.2.0
  - migrate to pkg-kde-tools




Property changes on: kde-extras/rsibreak/trunk/debian
___________________________________________________________________
Name: svn:externals
   - cdbs svn://svn.debian.org/pkg-kde/branches/kde4/cdbs/

   + 


Modified: kde-extras/rsibreak/trunk/debian/changelog
===================================================================
--- kde-extras/rsibreak/trunk/debian/changelog	2009-01-29 00:07:48 UTC (rev 13644)
+++ kde-extras/rsibreak/trunk/debian/changelog	2009-01-29 00:18:26 UTC (rev 13645)
@@ -1,4 +1,4 @@
-rsibreak (1:0.9.0-2) UNRELEASED; urgency=low
+rsibreak (1:0.9.0-2) experimental; urgency=low
 
   +++ Changes by Scott Kitterman:
 
@@ -9,8 +9,13 @@
   * Add ${misc:Depends}
   * Update debian/watch
 
- -- Mark Purcell <msp at debian.org>  Sun, 04 Jan 2009 12:32:52 +1100
+  +++ Changes by Xavier Vello:
 
+  * Migrate to pkg-kde-tools
+  * Added 01_build_with_4.2.0
+
+ -- Xavier Vello <xavier.vello at gmail.com>  Thu, 29 Jan 2009 01:03:17 +0100
+
 rsibreak (1:0.9.0-1) experimental; urgency=low
 
   * New upstream release. (Closes: #507957)

Modified: kde-extras/rsibreak/trunk/debian/control
===================================================================
--- kde-extras/rsibreak/trunk/debian/control	2009-01-29 00:07:48 UTC (rev 13644)
+++ kde-extras/rsibreak/trunk/debian/control	2009-01-29 00:18:26 UTC (rev 13645)
@@ -6,8 +6,8 @@
  Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>,
  Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>,
  Daniel Queirolo <danf.1979 at gmail.com>, Xavier Vello <xavier.vello at gmail.com>
-Build-Depends: debhelper (>= 6), cmake, quilt (>= 0.40), cdbs, libxss-dev,
- libxrandr-dev, libplasma-dev
+Build-Depends: debhelper (>= 6), cmake, quilt (>= 0.40), cdbs, pkg-kde-tools
+ libxss-dev, libxrandr-dev, kdelibs5-dev
 Standards-Version: 3.8.0
 Homepage: http://www.rsibreak.org
 

Added: kde-extras/rsibreak/trunk/debian/patches/01_build_with_4.2.0
===================================================================
--- kde-extras/rsibreak/trunk/debian/patches/01_build_with_4.2.0	                        (rev 0)
+++ kde-extras/rsibreak/trunk/debian/patches/01_build_with_4.2.0	2009-01-29 00:18:26 UTC (rev 13645)
@@ -0,0 +1,43 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3,19 +3,12 @@
+ 
+ find_package (KDE4 REQUIRED)
+ include(KDE4Defaults)
+-macro_optional_find_package(Plasma)
+-
+-macro_log_feature(PLASMA_FOUND "Plasma" "Plasma libraries and header files" "http://plasma.kde.org/" FALSE "" "Plasma is needed for Plasma applet of rsibreak. Install kdebase-workspace.")
+-
+-
+ 
+ add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+ include_directories ( ${KDE4_INCLUDES} ${BLITZ_INCLUDES} )
+ ADD_SUBDIRECTORY( icons ) 
+ ADD_SUBDIRECTORY( src ) 
+-if (PLASMA_FOUND)
+-  ADD_SUBDIRECTORY( plasma ) 
+-endif (PLASMA_FOUND)
++ADD_SUBDIRECTORY( plasma ) 
+ find_package(Msgfmt REQUIRED)
+ find_package(Gettext REQUIRED)
+ add_subdirectory( po )
+--- a/plasma/CMakeLists.txt
++++ b/plasma/CMakeLists.txt
+@@ -8,7 +8,7 @@
+     rsibreak_interface)
+ 
+ kde4_add_plugin(plasma_engine_rsibreak ${rsibreak_engine_SRCS})
+-target_link_libraries(plasma_engine_rsibreak ${PLASMA_LIBS} ${KDE4_KIO_LIBS})
++target_link_libraries(plasma_engine_rsibreak ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS})
+ 
+ install(TARGETS plasma_engine_rsibreak DESTINATION ${PLUGIN_INSTALL_DIR})
+ install(FILES plasma-engine-rsibreak.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+@@ -17,7 +17,7 @@
+     rsibreak.cpp)
+ 
+ kde4_add_plugin(plasma_applet_rsibreak ${rsibreak_applet_SRCS})
+-target_link_libraries(plasma_applet_rsibreak ${PLASMA_LIBS} ${KDE4_KIO_LIBS})
++target_link_libraries(plasma_applet_rsibreak ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS})
+ 
+ install(TARGETS plasma_applet_rsibreak DESTINATION ${PLUGIN_INSTALL_DIR})
+ install(FILES plasma-applet-rsibreak.desktop DESTINATION ${SERVICES_INSTALL_DIR})

Added: kde-extras/rsibreak/trunk/debian/patches/series
===================================================================
--- kde-extras/rsibreak/trunk/debian/patches/series	                        (rev 0)
+++ kde-extras/rsibreak/trunk/debian/patches/series	2009-01-29 00:18:26 UTC (rev 13645)
@@ -0,0 +1 @@
+01_build_with_4.2.0

Modified: kde-extras/rsibreak/trunk/debian/rules
===================================================================
--- kde-extras/rsibreak/trunk/debian/rules	2009-01-29 00:07:48 UTC (rev 13644)
+++ kde-extras/rsibreak/trunk/debian/rules	2009-01-29 00:18:26 UTC (rev 13645)
@@ -2,17 +2,11 @@
 
 DEB_INSTALL_MANPAGES_rsibreak	= debian/rsibreak.manpage
 
-include debian/cdbs/kde.mk
+include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
 
 binary-install/rsibreak::
 	install -D -p -m0644 debian/rsibreak.xpm \
 		debian/rsibreak/usr/share/pixmaps/rsibreak.xpm
 	install -D -p -m0644 debian/rsibreak-16.xpm \
 		debian/rsibreak/usr/share/pixmaps/rsibreak-16.xpm
-
-#install/rsibreak::
-#	rm -fR debian/rsibreak/usr/share/doc/kde/
-
-#buildprep: clean apply-patches
-#	make -f admin/Makefile.common dist
-#	debian/rules clean




More information about the pkg-kde-commits mailing list