rev 7072 - in branches/kde4/packages/kdelibs/debian: . patches
Fathi Boudra
fboudra-guest at alioth.debian.org
Sun Aug 12 15:48:20 UTC 2007
Author: fboudra-guest
Date: 2007-08-12 15:48:19 +0000 (Sun, 12 Aug 2007)
New Revision: 7072
Added:
branches/kde4/packages/kdelibs/debian/patches/01_libkdeprint_management_soname.diff
branches/kde4/packages/kdelibs/debian/patches/02_strigi-0.5.5_support.diff
branches/kde4/packages/kdelibs/debian/patches/10_kdehome_kde4.diff
branches/kde4/packages/kdelibs/debian/patches/11_applications_menu_kde4.diff
branches/kde4/packages/kdelibs/debian/patches/12_no_emoticons.diff
branches/kde4/packages/kdelibs/debian/patches/13_qt4_designer_plugins_path.diff
Removed:
branches/kde4/packages/kdelibs/debian/patches/01_kdehome_kde4.diff
branches/kde4/packages/kdelibs/debian/patches/02_applications_menu_kde4.diff
branches/kde4/packages/kdelibs/debian/patches/03_strigi-0.5.5_support.diff
branches/kde4/packages/kdelibs/debian/patches/04_libkdeprint_management_soname.diff
branches/kde4/packages/kdelibs/debian/qt4-designer-kde4-plugins.install
Modified:
branches/kde4/packages/kdelibs/debian/changelog
branches/kde4/packages/kdelibs/debian/control
branches/kde4/packages/kdelibs/debian/kdelibs5-data.install
branches/kde4/packages/kdelibs/debian/kdelibs5-dev.install
branches/kde4/packages/kdelibs/debian/no-install.list
branches/kde4/packages/kdelibs/debian/patches/series
Log:
* Remove qt4-designer-kde4-plugins package. No need to have an extra package
as qt4 designer plugins are higky dependent on kdelibs5 and development.
* Add qt4_designer_plugins_path patch to fix plugins installation path.
* Re-order patches.
Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog 2007-08-12 15:38:23 UTC (rev 7071)
+++ branches/kde4/packages/kdelibs/debian/changelog 2007-08-12 15:48:19 UTC (rev 7072)
@@ -7,6 +7,9 @@
* checkXML, kconfig_compiler, ksvgtopng, kunittestmodrunner,
makekdewidgets, preparetips.
* Add kdelibs5-dev conflicts against kdelibs4-dev.
+ * Remove qt4-designer-kde4-plugins package. No need to have an extra package
+ as qt4 designer plugins are higky dependent on kdelibs5 and development.
+ * Add qt4_designer_plugins_path patch to fix plugins installation path.
+++ Changes by Ana Beatriz Guerrero Lopez:
Modified: branches/kde4/packages/kdelibs/debian/control
===================================================================
--- branches/kde4/packages/kdelibs/debian/control 2007-08-12 15:38:23 UTC (rev 7071)
+++ branches/kde4/packages/kdelibs/debian/control 2007-08-12 15:48:19 UTC (rev 7072)
@@ -74,10 +74,3 @@
.
This package is part of KDE, and a component of the KDE libraries module.
See the 'kde' and 'kdelibs' packages for more information.
-
-Package: qt4-designer-kde4-plugins
-Architecture: any
-Depends: qt4-designer, ${shlibs:Depends}
-Description: kde4 widgets for qt4 designer
- This package contains the needed widgets to qt4 designer to make you able
- to design kde4 applications.
Modified: branches/kde4/packages/kdelibs/debian/kdelibs5-data.install
===================================================================
--- branches/kde4/packages/kdelibs/debian/kdelibs5-data.install 2007-08-12 15:38:23 UTC (rev 7071)
+++ branches/kde4/packages/kdelibs/debian/kdelibs5-data.install 2007-08-12 15:48:19 UTC (rev 7072)
@@ -5859,6 +5859,48 @@
usr/share/kde4/apps/kdeui/pics/ktip-background.png
usr/share/kde4/apps/kdeui/pics/ktip-bulb.png
+usr/share/kde4/apps/kdewidgets/pics/k3iconview.png
+usr/share/kde4/apps/kdewidgets/pics/k3listview.png
+usr/share/kde4/apps/kdewidgets/pics/kactionselector.png
+usr/share/kde4/apps/kdewidgets/pics/kactivelabel.png
+usr/share/kde4/apps/kdewidgets/pics/kcharselect.png
+usr/share/kde4/apps/kdewidgets/pics/kcmodule.png
+usr/share/kde4/apps/kdewidgets/pics/kcolorbutton.png
+usr/share/kde4/apps/kdewidgets/pics/kcolorcombo.png
+usr/share/kde4/apps/kdewidgets/pics/kcombobox.png
+usr/share/kde4/apps/kdewidgets/pics/kdatepicker.png
+usr/share/kde4/apps/kdewidgets/pics/kdatetable.png
+usr/share/kde4/apps/kdewidgets/pics/kdatetimewidget.png
+usr/share/kde4/apps/kdewidgets/pics/kdatewidget.png
+usr/share/kde4/apps/kdewidgets/pics/kdialog.png
+usr/share/kde4/apps/kdewidgets/pics/kdoublenuminput.png
+usr/share/kde4/apps/kdewidgets/pics/kdoublespinbox.png
+usr/share/kde4/apps/kdewidgets/pics/kdualcolorbutton.png
+usr/share/kde4/apps/kdewidgets/pics/keditlistbox.png
+usr/share/kde4/apps/kdewidgets/pics/kfontcombo.png
+usr/share/kde4/apps/kdewidgets/pics/kfontrequester.png
+usr/share/kde4/apps/kdewidgets/pics/kgradientselector.png
+usr/share/kde4/apps/kdewidgets/pics/khistorycombo.png
+usr/share/kde4/apps/kdewidgets/pics/khsselector.png
+usr/share/kde4/apps/kdewidgets/pics/kiconbutton.png
+usr/share/kde4/apps/kdewidgets/pics/kintnuminput.png
+usr/share/kde4/apps/kdewidgets/pics/kintspinbox.png
+usr/share/kde4/apps/kdewidgets/pics/kkeybutton.png
+usr/share/kde4/apps/kdewidgets/pics/kled.png
+usr/share/kde4/apps/kdewidgets/pics/klineedit.png
+usr/share/kde4/apps/kdewidgets/pics/klistbox.png
+usr/share/kde4/apps/kdewidgets/pics/kpalettetable.png
+usr/share/kde4/apps/kdewidgets/pics/kpasswordedit.png
+usr/share/kde4/apps/kdewidgets/pics/kpushbutton.png
+usr/share/kde4/apps/kdewidgets/pics/krestrictedline.png
+usr/share/kde4/apps/kdewidgets/pics/kruler.png
+usr/share/kde4/apps/kdewidgets/pics/ksqueezedtextlabel.png
+usr/share/kde4/apps/kdewidgets/pics/ktextbrowser.png
+usr/share/kde4/apps/kdewidgets/pics/ktextedit.png
+usr/share/kde4/apps/kdewidgets/pics/kurlcomborequester.png
+usr/share/kde4/apps/kdewidgets/pics/kurllabel.png
+usr/share/kde4/apps/kdewidgets/pics/kurlrequester.png
+
usr/share/kde4/apps/khtml/css/html4.css
usr/share/kde4/apps/khtml/css/quirks.css
usr/share/kde4/apps/khtml/domain_info
Modified: branches/kde4/packages/kdelibs/debian/kdelibs5-dev.install
===================================================================
--- branches/kde4/packages/kdelibs/debian/kdelibs5-dev.install 2007-08-12 15:38:23 UTC (rev 7071)
+++ branches/kde4/packages/kdelibs/debian/kdelibs5-dev.install 2007-08-12 15:48:19 UTC (rev 7072)
@@ -7,6 +7,8 @@
usr/include/*
+usr/lib/qt4/plugins/designer/kdewidgets.so
+
usr/lib/libcupsdconf.so
usr/lib/libkaudiodevicelist.so
usr/lib/libkde3support.so
Modified: branches/kde4/packages/kdelibs/debian/no-install.list
===================================================================
--- branches/kde4/packages/kdelibs/debian/no-install.list 2007-08-12 15:38:23 UTC (rev 7071)
+++ branches/kde4/packages/kdelibs/debian/no-install.list 2007-08-12 15:48:19 UTC (rev 7072)
@@ -1,48 +1,10 @@
-Files not installed due to conflicts with current kdelibs-data:
+Files not installed because they conflict with current kdelibs-data:
/usr/share/locale/all_languages
- /usr/share/emoticons/Default/shade.png
- /usr/share/emoticons/Default/love.png
- /usr/share/emoticons/Default/embarassed.png
- /usr/share/emoticons/Default/confused.png
- /usr/share/emoticons/Default/oh.png
- /usr/share/emoticons/Default/innocent.png
- /usr/share/emoticons/Default/cocktail.png
- /usr/share/emoticons/Default/kiss.png
- /usr/share/emoticons/Default/dog.png
- /usr/share/emoticons/Default/note.png
- /usr/share/emoticons/Default/bat.png
- /usr/share/emoticons/Default/sleep.png
- /usr/share/emoticons/Default/smile.png
- /usr/share/emoticons/Default/unhappy.png
- /usr/share/emoticons/Default/thumbs_down.png
- /usr/share/emoticons/Default/angry.png
- /usr/share/emoticons/Default/thumbs_up.png
- /usr/share/emoticons/Default/cup.png
- /usr/share/emoticons/Default/emoticons.xml
- /usr/share/emoticons/Default/teeth.png
- /usr/share/emoticons/Default/camera.png
- /usr/share/emoticons/Default/tongue.png
- /usr/share/emoticons/Default/beer.png
- /usr/share/emoticons/Default/cry.png
- /usr/share/emoticons/Default/present.png
- /usr/share/emoticons/Default/clock.png
- /usr/share/emoticons/Default/wink.png
- /usr/share/emoticons/Default/biggrin.png
- /usr/share/emoticons/Default/film.png
- /usr/share/emoticons/Default/cake.png
- /usr/share/emoticons/Default/cat.png
- /usr/share/emoticons/Default/unlove.png
- /usr/share/emoticons/Default/rose.png
- /usr/share/emoticons/Default/omg.png
- /usr/share/emoticons/Default/email.png
- /usr/share/emoticons/Default/lightbulb.png
- /usr/share/emoticons/Default/phone.png
- /usr/share/emoticons/Default/star.png
- /usr/share/emoticons/Default/undecided.png
- /usr/share/emoticons/Default/wilted_rose.png
- /usr/share/emoticons/Default/foot_in_mouth.png
- /usr/share/emoticons/Default/sad.png
-Files not installed because they are provided by hicolor-icon-theme
- /usr/share/icons/hicolor/index.theme
+ /usr/share/emoticons/Default/*
+
+Files not installed because they are provided by hicolor-icon-theme:
+
+ /usr/share/icons/hicolor/index.theme
+
Deleted: branches/kde4/packages/kdelibs/debian/patches/01_kdehome_kde4.diff
Added: branches/kde4/packages/kdelibs/debian/patches/01_libkdeprint_management_soname.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/01_libkdeprint_management_soname.diff (rev 0)
+++ branches/kde4/packages/kdelibs/debian/patches/01_libkdeprint_management_soname.diff 2007-08-12 15:48:19 UTC (rev 7072)
@@ -0,0 +1,11 @@
+--- kdelibs-3.92.0/kdeprint/management/CMakeLists.txt.orig 2007-08-11 19:39:57.000000000 +0200
++++ kdelibs-3.92.0/kdeprint/management/CMakeLists.txt 2007-08-11 19:40:40.000000000 +0200
+@@ -65,7 +65,7 @@
+
+ target_link_libraries(kdeprint_management ${KDE4_KDECORE_LIBS} kdeprint ${KDE4_KDE3SUPPORT_LIBS} )
+
+-set_target_properties(kdeprint_management PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
++set_target_properties(kdeprint_management PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION} SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION} )
+ install(TARGETS kdeprint_management DESTINATION ${LIB_INSTALL_DIR} )
+
+
Deleted: branches/kde4/packages/kdelibs/debian/patches/02_applications_menu_kde4.diff
Added: branches/kde4/packages/kdelibs/debian/patches/02_strigi-0.5.5_support.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/02_strigi-0.5.5_support.diff (rev 0)
+++ branches/kde4/packages/kdelibs/debian/patches/02_strigi-0.5.5_support.diff 2007-08-12 15:48:19 UTC (rev 7072)
@@ -0,0 +1,26 @@
+--- kdelibs-3.92.0.orig/kio/kio/dummyanalyzers/dummyanalyzers.cpp
++++ kdelibs-3.92.0/kio/kio/dummyanalyzers/dummyanalyzers.cpp
+@@ -80,6 +80,7 @@
+ DummySaxAnalyzer() {}
+ const char* name() const { return "DummySaxAnalyzer"; }
+ void startAnalysis(AnalysisResult*) {}
++ void endAnalysis(bool /*complete*/) {}
+ bool isReadyWithStream() { return true; }
+ };
+ class STRIGI_PLUGIN_API DummySaxAnalyzerFactory : public StreamSaxAnalyzerFactory {
+@@ -96,6 +97,7 @@
+ DummyLineAnalyzer() {}
+ const char* name() const { return "DummyLineAnalyzer"; }
+ void startAnalysis(AnalysisResult*) {}
++ void endAnalysis(bool /*complete*/) {}
+ void handleLine(const char*, uint32_t) {}
+ bool isReadyWithStream() { return true; }
+ };
+@@ -113,6 +115,7 @@
+ DummyEventAnalyzer() {}
+ const char* name() const { return "DummyEventAnalyzer"; }
+ void startAnalysis(AnalysisResult*) {}
++ void endAnalysis(bool /*complete*/) {}
+ void handleData(const char*, uint32_t) {}
+ bool isReadyWithStream() { return true; }
+ };
Deleted: branches/kde4/packages/kdelibs/debian/patches/03_strigi-0.5.5_support.diff
Deleted: branches/kde4/packages/kdelibs/debian/patches/04_libkdeprint_management_soname.diff
Added: branches/kde4/packages/kdelibs/debian/patches/10_kdehome_kde4.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/10_kdehome_kde4.diff (rev 0)
+++ branches/kde4/packages/kdelibs/debian/patches/10_kdehome_kde4.diff 2007-08-12 15:48:19 UTC (rev 7072)
@@ -0,0 +1,11 @@
+--- kdelibs-3.92.0.orig/kdecore/kernel/kstandarddirs.cpp
++++ kdelibs-3.92.0/kdecore/kernel/kstandarddirs.cpp
+@@ -1561,7 +1561,7 @@
+ #ifdef Q_WS_MACX
+ localKdeDir = QDir::homePath() + "/Library/Preferences/KDE/";
+ #else
+- localKdeDir = QDir::homePath() + "/.kde/";
++ localKdeDir = QDir::homePath() + "/.kde4/";
+ #endif
+ }
+
Added: branches/kde4/packages/kdelibs/debian/patches/11_applications_menu_kde4.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/11_applications_menu_kde4.diff (rev 0)
+++ branches/kde4/packages/kdelibs/debian/patches/11_applications_menu_kde4.diff 2007-08-12 15:48:19 UTC (rev 7072)
@@ -0,0 +1,22 @@
+--- kdelibs-3.92.0.orig/kded/CMakeLists.txt
++++ kdelibs-3.92.0/kded/CMakeLists.txt
+@@ -61,7 +61,7 @@
+
+ ########### install files ###############
+
+-install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus )
++install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME applications.menu.kde4)
+ install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
+ install( FILES kded.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
+
+--- kdelibs-3.92.0.orig/kded/kbuildsycoca.cpp
++++ kdelibs-3.92.0/kded/kbuildsycoca.cpp
+@@ -374,7 +374,7 @@
+ connect(g_vfolder, SIGNAL(newService(const QString &, KService::Ptr *)),
+ this, SLOT(slotCreateEntry(const QString &, KService::Ptr *)));
+
+- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
++ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu.kde4", true);
+
+ KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
+ entry->setLayoutInfo(kdeMenu->layoutList);
Added: branches/kde4/packages/kdelibs/debian/patches/12_no_emoticons.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/12_no_emoticons.diff (rev 0)
+++ branches/kde4/packages/kdelibs/debian/patches/12_no_emoticons.diff 2007-08-12 15:48:19 UTC (rev 7072)
@@ -0,0 +1,10 @@
+--- kdelibs-3.92.0.orig/pics/CMakeLists.txt
++++ kdelibs-3.92.0/pics/CMakeLists.txt
+@@ -1,6 +1,6 @@
+
+ add_subdirectory( hicolor )
+-add_subdirectory( emoticons )
++#add_subdirectory( emoticons )
+ add_subdirectory( oxygen )
+
+ include_directories( ${KDE4_KDEUI_INCLUDES} )
Added: branches/kde4/packages/kdelibs/debian/patches/13_qt4_designer_plugins_path.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/13_qt4_designer_plugins_path.diff (rev 0)
+++ branches/kde4/packages/kdelibs/debian/patches/13_qt4_designer_plugins_path.diff 2007-08-12 15:48:19 UTC (rev 7072)
@@ -0,0 +1,11 @@
+--- kdelibs-3.92.0.orig/kdewidgets/CMakeLists.txt
++++ kdelibs-3.92.0/kdewidgets/CMakeLists.txt
+@@ -48,7 +48,7 @@
+ target_link_libraries(kdewidgets ${KDE4_KIO_LIBS} kde3support)
+ set_target_properties(kdewidgets PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE SKIP_BUILD_RPATH TRUE BUILD_WITH_INSTALL_RPATH TRUE INSTALL_RPATH ${LIB_INSTALL_DIR})
+
+-install(TARGETS kdewidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
++install(TARGETS kdewidgets DESTINATION /usr/lib/qt4/plugins/designer )
+
+
+ ########### install files ###############
Modified: branches/kde4/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/series 2007-08-12 15:38:23 UTC (rev 7071)
+++ branches/kde4/packages/kdelibs/debian/patches/series 2007-08-12 15:48:19 UTC (rev 7072)
@@ -1,4 +1,6 @@
-01_kdehome_kde4.diff
-02_applications_menu_kde4.diff
-03_strigi-0.5.5_support.diff
-04_libkdeprint_management_soname.diff
+01_libkdeprint_management_soname.diff
+02_strigi-0.5.5_support.diff
+10_kdehome_kde4.diff
+11_applications_menu_kde4.diff
+12_no_emoticons.diff
+13_qt4_designer_plugins_path.diff
Deleted: branches/kde4/packages/kdelibs/debian/qt4-designer-kde4-plugins.install
More information about the pkg-kde-commits
mailing list