diff options
| author | Pawel "l0ner" Soltys <pwslts@gmail.com> | 2012-02-15 02:03:20 +0100 |
|---|---|---|
| committer | Pawel "l0ner" Soltys <pwslts@gmail.com> | 2012-02-15 02:03:20 +0100 |
| commit | 11bfc1adba5c32d7299cca4d4f9141e889033cd6 (patch) | |
| tree | b1b0a42e8ae5b51dfe93352f9247b4056be0c027 /debian/squeeze | |
| parent | 9eaa7eb86bd627d3636f0d1988c7e867e2f7eebf (diff) | |
| parent | 14dfc7ec02c0f331342d8becac217b781b5feadf (diff) | |
| download | tde-packaging-11bfc1adba5c32d7299cca4d4f9141e889033cd6.tar.gz tde-packaging-11bfc1adba5c32d7299cca4d4f9141e889033cd6.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'debian/squeeze')
3 files changed, 12 insertions, 12 deletions
diff --git a/debian/squeeze/applications/k3b/debian/rules b/debian/squeeze/applications/k3b/debian/rules index 664df39cf..3a19a0ec8 100755 --- a/debian/squeeze/applications/k3b/debian/rules +++ b/debian/squeeze/applications/k3b/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde5 +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde5 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/debian/squeeze/tdebase/debian/patches/disable_starttde_wallpaper.diff b/debian/squeeze/tdebase/debian/patches/disable_starttde_wallpaper.diff index 21011fbd5..00cc8ca37 100644 --- a/debian/squeeze/tdebase/debian/patches/disable_starttde_wallpaper.diff +++ b/debian/squeeze/tdebase/debian/patches/disable_starttde_wallpaper.diff @@ -1,12 +1,12 @@ --- starttde +++ starttde -@@ -184,17 +184,17 @@ +@@ -228,17 +228,17 @@ . $tdehome/share/config/startupconfig fi -# Make sure a default wallpaper is set. -if [ ! -e $tdehome/share/config/kdesktoprc ]; then -- # With Trinity KDE this file should exist, but test first. +- # With Trinity this file should exist, but test first. - if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then -cat >$tdehome/share/config/kdesktoprc <<EOF -[Desktop0] @@ -17,7 +17,7 @@ -fi +## Make sure a default wallpaper is set. +#if [ ! -e $tdehome/share/config/kdesktoprc ]; then -+# # With Trinity KDE this file should exist, but test first. ++# # With Trinity this file should exist, but test first. +# if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then +#cat >$tdehome/share/config/kdesktoprc <<EOF +#[Desktop0] diff --git a/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install b/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install index 637e5ff60..3d2e8e43b 100644 --- a/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install +++ b/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install @@ -197,12 +197,12 @@ debian/tmp/opt/trinity/include/kdatewidget.h debian/tmp/opt/trinity/include/kdcopactionproxy.h debian/tmp/opt/trinity/include/kdcoppropertyproxy.h debian/tmp/opt/trinity/include/kdcopservicestarter.h -debian/tmp/opt/trinity/include/tdebugclasses.h -debian/tmp/opt/trinity/include/tdebug.h -debian/tmp/opt/trinity/include/tdedmodule.h -debian/tmp/opt/trinity/include/tde_file.h +debian/tmp/opt/trinity/include/kdebugclasses.h +debian/tmp/opt/trinity/include/kdebug.h +debian/tmp/opt/trinity/include/kdedmodule.h +debian/tmp/opt/trinity/include/kde_file.h debian/tmp/opt/trinity/include/tdelibs_export.h -debian/tmp/opt/trinity/include/tdemacros.h +debian/tmp/opt/trinity/include/kdemacros.h debian/tmp/opt/trinity/include/kde.pot debian/tmp/opt/trinity/include/tdeprint/driver.h debian/tmp/opt/trinity/include/tdeprint/kiconselectaction.h @@ -221,7 +221,7 @@ debian/tmp/opt/trinity/include/tdeprint/kprintdialogpage.h debian/tmp/opt/trinity/include/tdeprint/lpr/lprhandler.h debian/tmp/opt/trinity/include/tdeprint/lpr/lprsettings.h debian/tmp/opt/trinity/include/tdeprint/lpr/printcapentry.h -debian/tmp/opt/trinity/include/tdesktopfile.h +debian/tmp/opt/trinity/include/kdesktopfile.h debian/tmp/opt/trinity/include/tdesu/client.h debian/tmp/opt/trinity/include/tdesu/defaults.h debian/tmp/opt/trinity/include/tdesu/kcookie.h @@ -231,7 +231,7 @@ debian/tmp/opt/trinity/include/tdesu/pty.h debian/tmp/opt/trinity/include/tdesu/ssh.h debian/tmp/opt/trinity/include/tdesu/stub.h debian/tmp/opt/trinity/include/tdesu/su.h -debian/tmp/opt/trinity/include/tde_terminal_interface.h +debian/tmp/opt/trinity/include/kde_terminal_interface.h debian/tmp/opt/trinity/include/tdeversion.h debian/tmp/opt/trinity/include/kdialogbase.h debian/tmp/opt/trinity/include/kdialog.h @@ -717,7 +717,7 @@ debian/tmp/opt/trinity/include/networkstatusindicator.h debian/tmp/opt/trinity/include/connectionmanager.h debian/tmp/opt/trinity/include/serviceiface.h debian/tmp/opt/trinity/include/provideriface.h -#debian/tmp/opt/trinity/include/tdemm +#debian/tmp/opt/trinity/include/kdemm debian/tmp/opt/trinity/lib/libnetworkstatus.la debian/tmp/opt/trinity/lib/libnetworkstatus.so |