[SCM] KDE Base Runtime module packaging branch, master, updated. debian/4.4.5-1-69-g10dbf24

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 00e6b408c19c3b96c2316a03d0c49a238f663269
Author: Modestas Vainius <modax at debian.org>
Date:   Sun Mar 27 22:28:32 2011 +0300

    Drop ksvgtopng4.diff patch: ksvgtopng4 is ksvgtopong now.
    
    no longer needed as KDE 3 is gone. Add conflicts with kdelibs4-dev and
    kdelibs-dbg, fix install file.
---
 debian/changelog               |    2 ++
 debian/control                 |    2 ++
 debian/kdebase-runtime.install |    2 +-
 debian/patches/ksvgtopng4.diff |   28 ----------------------------
 debian/patches/series          |    1 -
 5 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e8f680c..761b888 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ kdebase-runtime (4:4.6.1-0r1) UNRELEASED; urgency=low
   * Point debian/control Vcs fields to the new Git repository.
   * Switch debian/rules engine to dhmk based qt-kde-team/2/*.
   * Remove sequence number from debian/patches/*.
+  * Drop ksvgtopng4.diff patch: no longer needed as KDE 3 is gone. Add
+    conflicts with kdelibs4-dev and kdelibs-dbg, fix install file.
 
   [ George Kiagiadakis ]
   * Change my email address in uploaders.
diff --git a/debian/control b/debian/control
index 1d939d5..7c91860 100644
--- a/debian/control
+++ b/debian/control
@@ -33,6 +33,7 @@ Breaks: kdebase-bin (<< 4:4.2.90), kdelibs5 (<< 4:4.4.0), kdelibs-bin (<< 4:4.1.
  kdebase-workspace-bin (<< 4:4.2.90), kdebase-bin-kde3, kdebase-runtime-bin-kde4, kcontrol,
  kdebase-runtime-data (<< 4:4.4.0), kdelibs5-plugins (<< 4:4.5.0), kdebluetooth (<< 1.0~beta7-1),
  kdebase-kio-plugins, plasma-netbook (<< 4:4.5.95), phonon-backend-xine (<< 4:4.2.80)
+Conflicts: kdelibs4-dev
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends},
  kdebase-runtime-data (>= ${source:Version}), ${sameVersionDep:kdelibs5-plugins:kdebase-runtime},
  oxygen-icon-theme (>= 4:4.4), phonon-backend-xine | phonon-backend,
@@ -113,6 +114,7 @@ Priority: extra
 Depends: ${misc:Depends}, kdebase-runtime (= ${binary:Version}), kdelibs5-dbg
 Replaces: kdelibs5-dbg (<< 4:4.5.0), kdebase-dbg (<< 4:4.2.90), kdebase-workspace-dbg (<< 4:4.2.90)
 Breaks: kdelibs5-dbg (<< 4:4.5.0), kdebase-dbg (<< 4:4.2.90), kdebase-workspace-dbg (<< 4:4.2.90)
+COnflicts: kdelibs-dbg
 Description: debugging symbols for KDE base runtime module
  This package contains the debugging symbols associated with kdebase-runtime.
  They will automatically be used by gdb for debugging kdebase-runtime related
diff --git a/debian/kdebase-runtime.install b/debian/kdebase-runtime.install
index 030f0a3..dcd8897 100644
--- a/debian/kdebase-runtime.install
+++ b/debian/kdebase-runtime.install
@@ -18,7 +18,7 @@ usr/bin/knotify4
 usr/bin/kquitapp
 usr/bin/kreadconfig
 usr/bin/kstart
-usr/bin/ksvgtopng4
+usr/bin/ksvgtopng
 usr/bin/ktraderclient
 usr/bin/ktrash
 usr/bin/kuiserver
diff --git a/debian/patches/ksvgtopng4.diff b/debian/patches/ksvgtopng4.diff
deleted file mode 100644
index 8641959..0000000
--- a/debian/patches/ksvgtopng4.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-ksvgtopng is being renamed ksvgtopng4 to allow kdebase-runtime be 
-co-installable witj KDE 3.
---- a/pics/CMakeLists.txt
-+++ b/pics/CMakeLists.txt
-@@ -4,9 +4,9 @@ add_subdirectory( emoticons )
- #add_subdirectory( oxygen )
- 
- set(ksvgtopng_SRCS ksvgtopng.cpp )
--kde4_add_executable(ksvgtopng NOGUI ${ksvgtopng_SRCS})
--target_link_libraries(ksvgtopng ${KDE4_KDEUI_LIBS})
--install(TARGETS ksvgtopng ${INSTALL_TARGETS_DEFAULT_ARGS} )
-+kde4_add_executable(ksvgtopng4 NOGUI ${ksvgtopng_SRCS})
-+target_link_libraries(ksvgtopng4 ${KDE4_KDEUI_LIBS})
-+install(TARGETS ksvgtopng4 ${INSTALL_TARGETS_DEFAULT_ARGS} )
- 
- # create a symlink for the default icon theme,
- # so that fallbacks work even for themes that don't inherit from oxygen
---- a/pics/ksvgtopng.cpp
-+++ b/pics/ksvgtopng.cpp
-@@ -18,7 +18,7 @@ int main(int argc, char **argv)
- 
- 	if(argc < 5)
- 	{
--		cout << "Usage : ksvgtopng width height svgfilename outputfilename" << endl;
-+		cout << "Usage : ksvgtopng4 width height svgfilename outputfilename" << endl;
- 		cout << "Please use full path name for svgfilename" << endl;
- 		return -1;
- 	}
diff --git a/debian/patches/series b/debian/patches/series
index 6f78653..a282bd7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 kde4_information_menu.diff
-ksvgtopng4.diff
 disable_usr_lib_install_rpath.diff
 khelp_htdig.diff
 dont_show_netattach_outside_kde.diff

-- 
KDE Base Runtime module packaging