diff options
Diffstat (limited to 'ubuntu/_base')
| -rw-r--r-- | ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install | 35 | ||||
| -rwxr-xr-x | ubuntu/_base/core/tdelibs/debian/rules | 7 |
2 files changed, 5 insertions, 37 deletions
diff --git a/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install b/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install index 2ac5be87f..8131ae5b5 100644 --- a/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install +++ b/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install @@ -83,40 +83,7 @@ debian/tmp/opt/trinity/share/apps/tdedisplay/app-defaults/XOsview.ad debian/tmp/opt/trinity/share/apps/tdedisplay/app-defaults/Xpdf.ad debian/tmp/opt/trinity/share/apps/tdedisplay/app-defaults/XTerm.ad debian/tmp/opt/trinity/share/apps/tdedisplay/app-defaults/XV.ad -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/AtlasGreen.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/BeOS.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/BlackOnWhite.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/BlueSlate.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/CDE.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/DarkBlue.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/DesertRed.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/DigitalCDE.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/EveX.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Human.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/KDEOne.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/KDETwo.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/KeramikEmerald.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Keramik.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/KeramikWhite.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Last.fm.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Lizard.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/MediaPeach.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Next.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/PaleGray.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Plastik.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Platinum.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/PointReyesGreen.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Pumpkin.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Sienna.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/SolarisCDE.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Storm.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/System.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/WedgieWeb.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/WhiteOnBlack.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Windows2000.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Windows95.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/WindowsXP.kcsrc -debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/YellowOnBlue.kcsrc +debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/*.kcsrc debian/tmp/opt/trinity/share/apps/tdefontview/tdefontviewpart.rc debian/tmp/opt/trinity/share/apps/tdefontview/tdefontviewui.rc debian/tmp/opt/trinity/share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.preview.png diff --git a/ubuntu/_base/core/tdelibs/debian/rules b/ubuntu/_base/core/tdelibs/debian/rules index bcbeda4fc..b1e609845 100755 --- a/ubuntu/_base/core/tdelibs/debian/rules +++ b/ubuntu/_base/core/tdelibs/debian/rules @@ -110,10 +110,10 @@ ifeq (linux,$(DEB_HOST_ARCH_OS)) echo "libasound2-trinity-dev=libasound2-trinity-dev" >> debian/tdelibs14-trinity-dev.substvars endif -binary-install/tdelibs14-trinity:: +binary-install/tdelibs14$(DEB_TIME64_SUFFIX)-trinity:: mv debian/tmp/opt/trinity/bin/tdecmshell debian/tmp/opt/trinity/bin/tdecmshell.real - install -p -D -m755 debian/tmp/opt/trinity/bin/tdecmshell.real debian/tdelibs14-trinity/opt/trinity/bin/tdecmshell.real - install -p -D -m755 debian/tdecmshell debian/tdelibs14-trinity/opt/trinity/bin/tdecmshell + install -p -D -m755 debian/tmp/opt/trinity/bin/tdecmshell.real debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/opt/trinity/bin/tdecmshell.real + install -p -D -m755 debian/tdecmshell debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/opt/trinity/bin/tdecmshell post-patches:: dh_testdir @@ -126,6 +126,7 @@ ifeq ($(DEB_TIME64_API),true) [ -d $$a ] || [ -f $$a.t64 ] || \ (cp -a $$a debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity.$${a##*.} && mv $$a $$a.t64); \ done + sed -i -e "s/^tdelibs14-trinity /tdelibs14$(DEB_TIME64_SUFFIX)-trinity /" debian/tdelibs14t64-trinity.lintian [ -f debian/control.t64 ] || \ sed -i.t64 \ -e "s/^\\(Package: tdelibs14\\)-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \ |