Hi,
This is the list of conflictive files and possible solutions.
The next upload is planned to fix the new strigi incompatibility
and this.
suggestions?
** conflicts:
kdelibs-bin_3.92.0.dfsg.1-1_i386.deb
/usr/bin/kunittestmodrunner
/usr/bin/makekdewidgets
/usr/bin/preparetips
/usr/bin/kconfig_compiler
/usr/bin/ksvgtopng
Fix: rename from name -> name4
kdelibs5_3.92.0.dfsg.1-1_i386.deb
/usr/lib/libkdeprint_management.so.4
Fix: ???
kdelibs5-data_3.92.0.dfsg.1-1_all.deb
/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
Fix: create symlink to the kdelibs-data or not ship :?
Ana
On Saturday 11 August 2007, Ana Guerrero wrote:> ** conflicts: > > kdelibs-bin_3.92.0.dfsg.1-1_i386.deb > /usr/bin/kunittestmodrunner > /usr/bin/makekdewidgets > /usr/bin/preparetips > /usr/bin/kconfig_compiler > /usr/bin/ksvgtopng > > Fix: rename from name -> name4Or move to -dev. it looks like development programs. And add appropriate conflicts with kdelibs4.> kdelibs5_3.92.0.dfsg.1-1_i386.deb > /usr/lib/libkdeprint_management.so.4 > Fix: ???Let us slap upstream.> kdelibs5-data_3.92.0.dfsg.1-1_all.deb > /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 > > Fix: create symlink to the kdelibs-data or not ship :?Let us try to not ship. I hate emoticons ;) /Sune -- Man, do you know how might I install a processor? First of all you should insert on the provider, in such way from the control folder within Mandrake Linux you must remove a virus to digit from the IRC Internet site. -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: This is a digitally signed message part. Url : http://lists.alioth.debian.org/pipermail/pkg-kde-talk/attachments/20070811/baadb222/attachment.pgp
Ana Guerrero wrote:> kdelibs5_3.92.0.dfsg.1-1_i386.deb > /usr/lib/libkdeprint_management.so.4Something is wrong here; time is running backwards. kdelibs4c2a has libkdeprint_management.so.4.2.0, kdelibs5 has libkdeprint_management.so.4.0.0. Perhaps this should be verified with upstream.> kdelibs5-data_3.92.0.dfsg.1-1_all.deb > /usr/share/locale/all_languages > /usr/share/emoticons/Default/shade.png > /usr/share/emoticons/Default/love.png[etc] These are the same images as KDE 3 has, so it should be safe to add Replaces: kdelibs-data.
On Sat, Aug 11, 2007 at 04:40:09PM +0200, Peter Eisentraut wrote:> Ana Guerrero wrote: > > kdelibs5_3.92.0.dfsg.1-1_i386.deb > > /usr/lib/libkdeprint_management.so.4 > > Something is wrong here; time is running backwards. kdelibs4c2a has > libkdeprint_management.so.4.2.0, kdelibs5 has > libkdeprint_management.so.4.0.0. Perhaps this should be verified with > upstream.It''s this commit from Dirk I think. KDE/kdelibs/kdeprint/management>svn diff -r 695655:695656 Index: CMakeLists.txt ==================================================================--- CMakeLists.txt (revision 695655) +++ CMakeLists.txt (revision 695656) @@ -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} ) Dirk, should this be reverted? Jonathan
On Saturday, 11. August 2007, Jonathan Riddell wrote:> Dirk, should this be reverted?no, you should add this patch to your package. Dirk
Hi again, thanks for the replies. I''m doing an upload to fix these conflicts, doing the following: On Sat, Aug 11, 2007 at 01:20:23AM +0200, Ana Guerrero wrote:> ** conflicts: > > kdelibs-bin_3.92.0.dfsg.1-1_i386.deb > /usr/bin/kunittestmodrunner > /usr/bin/makekdewidgets > /usr/bin/preparetips > /usr/bin/kconfig_compiler > /usr/bin/ksvgtopng > > Fix: rename from name -> name4 >I''m going to apply this fix. On Sat, Aug 11, 2007 at 08:59:01AM +0200, Sune Vuorela wrote:> Or move to -dev. it looks like development programs. And add appropriate > conflicts with kdelibs4.Then you can not have installed at the same time developers libraries for kde4 and kde3, i do not think this is a good idea. Plus, there is a extra problem here, current kdelibs4c2a, has the following: Conflicts: kdelibs4, kdelibs4c2, kdelibs-bin so we should remove the kdelibs-bin conflicts (is it useful anymore?) or add a version dependency.> kdelibs5_3.92.0.dfsg.1-1_i386.deb > /usr/lib/libkdeprint_management.so.4 > Fix: ???I''ll try the patch Riddell pointed.> > kdelibs5-data_3.92.0.dfsg.1-1_all.deb > /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 > > Fix: create symlink to the kdelibs-data or not ship :? >Those files won''t be shipped. Ana
On Saturday 11 August 2007, Ana Guerrero wrote:> Hi again, > > thanks for the replies. I''m doing an upload to fix these conflicts, > doing the following: > > On Sat, Aug 11, 2007 at 01:20:23AM +0200, Ana Guerrero wrote: > > ** conflicts: > > > > kdelibs-bin_3.92.0.dfsg.1-1_i386.deb > > /usr/bin/kunittestmodrunner > > /usr/bin/makekdewidgets > > /usr/bin/preparetips > > /usr/bin/kconfig_compiler > > /usr/bin/ksvgtopng > > > > Fix: rename from name -> name4 > > I''m going to apply this fix. > > On Sat, Aug 11, 2007 at 08:59:01AM +0200, Sune Vuorela wrote: > > Or move to -dev. it looks like development programs. And add appropriate > > conflicts with kdelibs4. > > Then you can not have installed at the same time developers libraries for > kde4 and kde3, i do not think this is a good idea.You already can''t have development stuff for both coinstalled. They both contain .so symlinks - and several of the headers is also the same names, so no luck here no matter what we try. /Sune -- Genius, I cannot close the wordprocessor of a sendmail from the file inside Windows, how does it work? First of all you neither should ever save the graphics board on a SCSI clock, nor should insert the forward. -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: This is a digitally signed message part. Url : http://lists.alioth.debian.org/pipermail/pkg-kde-talk/attachments/20070812/c68d491b/attachment.pgp