Jonathan Kolberg has proposed merging lp:~bulldog98/kubuntu-packaging/smokekde 
into lp:~kubuntu-packagers/kubuntu-packaging/smokekde.

Requested reviews:
  Kubuntu Packagers (kubuntu-packagers)

For more details, see:
https://code.launchpad.net/~bulldog98/kubuntu-packaging/smokekde/+merge/73990
-- 
https://code.launchpad.net/~bulldog98/kubuntu-packaging/smokekde/+merge/73990
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~bulldog98/kubuntu-packaging/smokekde into 
lp:~kubuntu-packagers/kubuntu-packaging/smokekde.
=== modified file 'debian/changelog'
--- debian/changelog	2011-07-27 22:39:15 +0000
+++ debian/changelog	2011-09-04 10:10:25 +0000
@@ -1,3 +1,10 @@
+smokekde (4:4.7.1-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Drop fix_smoke_config_install_path (now included in sources)
+
+ -- Jonathan Kolberg <[email protected]>  Sun, 04 Sep 2011 11:01:23 +0200
+
 smokekde (4:4.7.0-0ubuntu1) oneiric; urgency=low
 
   * New upstream release

=== modified file 'debian/control'
--- debian/control	2011-07-23 02:02:49 +0000
+++ debian/control	2011-09-04 10:10:25 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Kubuntu Developers <[email protected]>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <[email protected]>
-Build-Depends: debhelper (>= 7.4.10), kde-sc-dev-latest (>= 4:4.7.0),
+Build-Depends: debhelper (>= 7.4.10), kde-sc-dev-latest (>= 4:4.7.1),
  pkg-kde-tools (>= 0.6.8), cmake,
  smoke-dev-tools, libsmokeqt4-dev, kdelibs5-dev, kdepimlibs5-dev,
  libqt4-opengl-dev, libsoprano-dev, okular-dev, libakonadi-dev, libattica-dev,

=== removed file 'debian/patches/fix_smoke_config_install_path.diff'
--- debian/patches/fix_smoke_config_install_path.diff	2011-07-18 16:43:18 +0000
+++ debian/patches/fix_smoke_config_install_path.diff	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-Author: David Palacio <[email protected]>
-Description: Fix installation of kde-config.xml
-Last-Update: 2011-06-24
-Forwarded: no
-
---- a/kdecore/CMakeLists.txt
-+++ b/kdecore/CMakeLists.txt
-@@ -80,4 +80,4 @@ target_link_libraries(smokekdecore
- set_target_properties(smokekdecore PROPERTIES VERSION 3.0.0 SOVERSION 3 )
- install(TARGETS smokekdecore DESTINATION ${LIB_INSTALL_DIR} )
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../kdecore_smoke.h DESTINATION include/smoke)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kde-config.xml DESTINATION share/${SMOKE_GEN_BIN})
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kde-config.xml DESTINATION share/smokegen)

=== removed file 'debian/patches/series'
--- debian/patches/series	2011-07-18 16:43:18 +0000
+++ debian/patches/series	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-fix_smoke_config_install_path.diff

-- 
kubuntu-devel mailing list
[email protected]
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel

Reply via email to