On Monday 02 of December 2013 21:53:33 Timothy Pearson wrote:
> > On Sunday 10 of November 2013 06:51:43 Timothy Pearson wrote:
> >> > On Thursday 07 of November 2013 00:01:55 Timothy Pearson wrote:
> >> >> > On Sunday 13 of October 2013 22:04:32 Timothy Pearson wrote:
> >> >> >> > Hello all, Tim,
> >> >> >> >
> >> >> >> > in a recent test of upgrade from TDE 3.5.13.2 to R14 smooth
> >>
> >> update
> >>
> >> >> was
> >> >>
> >> >> >> > thwarted by conflicts in packages qt3 × tqt3. How should they be
> >> >> >>
> >> >> >> treated?
> >> >> >>
> >> >> >> > Rename files to prevent conflicts? Or mark packages as
> >>
> >> conflicting
> >>
> >> >> /
> >> >>
> >> >> >> > replacement to allow smooth upgrade?
> >> >> >>
> >> >> >> We may need to rename the files, though this would push release
> >>
> >> back
> >>
> >> >> yet
> >> >>
> >> >> >> again.  My primary concern is the complaints we would get if we
> >> >>
> >> >> blocked
> >> >>
> >> >> >> installation of Qt3 on TDE systems via the Conflicts package
> >>
> >> field.
> >>
> >> >> >> At first glance the files listed are not used by the majority of
> >>
> >> TDE
> >>
> >> >> >> applications, so renaming them might not be as bad as it first
> >>
> >> looks.
> >>
> >> >> >> Let
> >> >> >> me see what I can do with it.
> >> >> >>
> >> >> >> Tim
> >> >> >
> >> >> > I believe that it would be good to resolve this conflicts before
> >> >>
> >> >> release
> >> >>
> >> >> > RC1.
> >> >> > Should I help?
> >> >> >
> >> >> > Slavek
> >> >>
> >> >> I just pushed through a commit that should resolve the majority of
> >>
> >> these
> >>
> >> >> issues.  I don't know if the TDE sources will need to be updated
> >> >> anywhere
> >> >> to handle these changes; can you take a look?
> >> >>
> >> >> Thanks!
> >> >>
> >> >> Tim
> >> >
> >> > I was looking for using renamed tools in the entire GIT tree, and I
> >>
> >> did
> >>
> >> > not
> >> > find anything where were actively used. So it looks good.
> >> >
> >> > Slavek
> >>
> >> So the Qt3/TQt3 conflicts are now sufficiently resolved for R14?
> >>
> >> Tim
> >
> > Most of the conflicts were resolved, but still remain conflicts
> > qt3-apps-dev × tqt3-apps-dev:
> >
> > qt3-apps-dev: /usr/lib/libeditor.a
> > qt3-apps-dev: /usr/lib/libdesignercore.a
> > qt3-apps-dev: /usr/lib/libqassistantclient.a
> > qt3-apps-dev: /usr/lib/libqassistantclient.prl
> > qt3-apps-dev: /usr/lib/libdesignercore.prl
> > qt3-apps-dev: /usr/lib/libeditor.prl
>
> This should (finally!) be fixed in GIT.
>
> Tim
>

Great, it looks good.

By the way, just coincidentally I'm also test and solve problems with upgrade 
3.5.13.x => R14 and also solve conflict of diverts kio-umountwrapper × 
tdeio-umountwrapper. Hovewer, because it seems to me wrong to deal with 
diverts from foreign package, I have prepared a patch for the package 
rename-meta => fix for metapackage kio-umountwrapper.

Slavek
--