diff options
author | Pawel "l0ner" Soltys <pwslts@gmail.com> | 2012-02-05 14:42:45 +0100 |
---|---|---|
committer | Pawel "l0ner" Soltys <pwslts@gmail.com> | 2012-02-05 14:42:45 +0100 |
commit | 1acb88f0ca7a408d0edaf2120473d45be3e73baf (patch) | |
tree | 0ce8f665b38716387ed8f054deec65676d1c7960 /ubuntu | |
parent | 67c29959bba58dab9643c351f319526883881b59 (diff) | |
parent | 422429b5737a4f3fe95f2d350192a580a8b37d3f (diff) | |
download | tde-packaging-1acb88f0ca7a408d0edaf2120473d45be3e73baf.tar.gz tde-packaging-1acb88f0ca7a408d0edaf2120473d45be3e73baf.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu')
4 files changed, 7 insertions, 6 deletions
diff --git a/ubuntu/lucid_automake/kdelibs/debian/man/lnusertemp-kde3.sgml b/ubuntu/lucid_automake/kdelibs/debian/man/lnusertemp-kde3.sgml index a75709316..2d0bf81a5 100644 --- a/ubuntu/lucid_automake/kdelibs/debian/man/lnusertemp-kde3.sgml +++ b/ubuntu/lucid_automake/kdelibs/debian/man/lnusertemp-kde3.sgml @@ -93,8 +93,8 @@ manpage.1: manpage.sgml <para><command>&dhpackage;</command> will create the first two resources in directories under <filename>/tmp</filename> (or - <envar>KDETMP</envar> if defined in the environment) and will use - <filename>/var/tmp</filename> (or <envar>KDEVARTMP</envar> if + <envar>TDETMP</envar> if defined in the environment) and will use + <filename>/var/tmp</filename> (or <envar>TDEVARTMP</envar> if defined in the environment) for the <emphasis>cache</emphasis> resource (in order to survive system reboots). The temporary directories created for resources are usually of the form diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install index 8549b03b9..b90f777a8 100644 --- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install +++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install @@ -1,4 +1,5 @@ debian/tmp/opt/trinity/bin/krootbacking +debian/tmp/opt/trinity/bin/tdeinit_phase1 debian/tmp/opt/trinity/bin/tdmtsak debian/tmp/opt/trinity/bin/tsak debian/tmp/opt/trinity/bin/kdebugdialog diff --git a/ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml b/ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml index 1ab3ff715..2332768a6 100644 --- a/ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml +++ b/ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml @@ -93,8 +93,8 @@ manpage.1: manpage.sgml <para><command>&dhpackage;</command> will create the first two resources in directories under <filename>/tmp</filename> (or - <envar>KDETMP</envar> if defined in the environment) and will use - <filename>/var/tmp</filename> (or <envar>KDEVARTMP</envar> if + <envar>TDETMP</envar> if defined in the environment) and will use + <filename>/var/tmp</filename> (or <envar>TDEVARTMP</envar> if defined in the environment) for the <emphasis>cache</emphasis> resource (in order to survive system reboots). The temporary directories created for resources are usually of the form diff --git a/ubuntu/maverick_automake/kdelibs/debian/man/lnusertemp-kde3.sgml b/ubuntu/maverick_automake/kdelibs/debian/man/lnusertemp-kde3.sgml index a75709316..2d0bf81a5 100644 --- a/ubuntu/maverick_automake/kdelibs/debian/man/lnusertemp-kde3.sgml +++ b/ubuntu/maverick_automake/kdelibs/debian/man/lnusertemp-kde3.sgml @@ -93,8 +93,8 @@ manpage.1: manpage.sgml <para><command>&dhpackage;</command> will create the first two resources in directories under <filename>/tmp</filename> (or - <envar>KDETMP</envar> if defined in the environment) and will use - <filename>/var/tmp</filename> (or <envar>KDEVARTMP</envar> if + <envar>TDETMP</envar> if defined in the environment) and will use + <filename>/var/tmp</filename> (or <envar>TDEVARTMP</envar> if defined in the environment) for the <emphasis>cache</emphasis> resource (in order to survive system reboots). The temporary directories created for resources are usually of the form |