Bug 373930 - umbrello/KF5 installed files conflicts with umbrello/KDE4
Summary: umbrello/KF5 installed files conflicts with umbrello/KDE4
Status: RESOLVED FIXED
Alias: None
Product: umbrello
Classification: Applications
Component: general (show other bugs)
Version: frameworks5
Platform: Other Microsoft Windows
: NOR normal
Target Milestone: ---
Assignee: Umbrello Development Group
URL:
Keywords:
Depends on:
Blocks: 373932
  Show dependency tree / graph
 
Reported: 2016-12-20 00:23 UTC by Ralf Habacker
Modified: 2017-03-16 22:17 UTC (History)
0 users

See Also:
Latest Commit: https://commits.kde.org/umbrello/0d1832c4cf7f070e212d25bccf7162d989dac0a7
Version Fixed In: 2.21.80 (KDE Applications 17.03.80)

Attachments
Add an attachment

Note You need to log in before you can comment on or make changes to this bug.
Description Ralf Habacker 2016-12-20 00:23:58 UTC 
File /usr/i686-w64-mingw32/sys-root/mingw/bin/po2xmi.exe
  from install of
     mingw32-umbrello-2.21.0.ec4653c-28.1.noarch (windows:mingw:win32)
  conflicts with file from package
     mingw32-umbrello5-frameworks-2.21.70.ff40b44-4.1.noarch (@System)

File /usr/i686-w64-mingw32/sys-root/mingw/bin/umbrello.exe
  from install of
     mingw32-umbrello-2.21.0.ec4653c-28.1.noarch (windows:mingw:win32)
  conflicts with file from package
     mingw32-umbrello5-frameworks-2.21.70.ff40b44-4.1.noarch (@System)

File /usr/i686-w64-mingw32/sys-root/mingw/bin/xmi2pot.exe
  from install of
     mingw32-umbrello-2.21.0.ec4653c-28.1.noarch (windows:mingw:win32)
  conflicts with file from package
     mingw32-umbrello5-frameworks-2.21.70.ff40b44-4.1.noarch (@System)

File /usr/i686-w64-mingw32/sys-root/mingw/share/doc/HTML/en/umbrello/index.cache.bz2
  from install of
     mingw32-umbrello-2.21.0.ec4653c-28.1.noarch (windows:mingw:win32)
  conflicts with file from package
     mingw32-umbrello5-frameworks-2.21.70.ff40b44-4.1.noarch (@System)

File /usr/i686-w64-mingw32/sys-root/mingw/share/doc/HTML/en/umbrello/index.docbook
  from install of
     mingw32-umbrello-2.21.0.ec4653c-28.1.noarch (windows:mingw:win32)
  conflicts with file from package
     mingw32-umbrello5-frameworks-2.21.70.ff40b44-4.1.noarch (@System)

File /usr/i686-w64-mingw32/sys-root/mingw/share/doc/HTML/en/umbrello/welcome.docbook
  from install of
     mingw32-umbrello-2.21.0.ec4653c-28.1.noarch (windows:mingw:win32)
  conflicts with file from package
     mingw32-umbrello5-frameworks-2.21.70.ff40b44-4.1.noarch (@System)
Comment 1 Ralf Habacker 2017-03-16 22:17:56 UTC 
Git commit 0d1832c4cf7f070e212d25bccf7162d989dac0a7 by Ralf Habacker.
Committed on 16/03/2017 at 11:57.
Pushed by habacker into branch 'master'.

Fix 'Umbrello/KF5 installed files conflicts with Umbrello/KDE4'.
FIXED-IN: 2.21.80 (KDE Applications 17.03.80)

M  +2    -0    CMakeLists.txt
M  +6    -0    tools/CMakeLists.txt
M  +6    -5    umbrello/CMakeLists.txt
M  +1    -1    umbrello/codegenerators/codegenerationpolicy.cpp
M  +1    -1    umbrello/headings/CMakeLists.txt
M  +1    -1    umbrello/layoutgenerator.cpp

https://commits.kde.org/umbrello/0d1832c4cf7f070e212d25bccf7162d989dac0a7