From c14d4f07234a1d66523bbf89b96f1b8388db923d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 18 Jul 2013 02:23:03 +0200 Subject: [PATCH 01/10] Fix unregistration kdm-trinity as the default display manager in rename-meta on Debian and Ubuntu --- .../lenny/metapackages/rename-meta/Makefile | 0 .../metapackages/rename-meta/debian/changelog | 0 .../metapackages/rename-meta/debian/compat | 0 .../metapackages/rename-meta/debian/dirs | 0 ...kdm-kde3.postinst => kdm-trinity.postinst} | 2 +- .../squeeze/metapackages/rename-meta/Makefile | 0 .../metapackages/rename-meta/debian/changelog | 0 .../metapackages/rename-meta/debian/compat | 0 .../metapackages/rename-meta/debian/dirs | 0 ...kdm-kde3.postinst => kdm-trinity.postinst} | 2 +- .../wheezy/metapackages/rename-meta/Makefile | 0 .../metapackages/rename-meta/debian/changelog | 0 .../metapackages/rename-meta/debian/compat | 0 .../metapackages/rename-meta/debian/dirs | 0 ...kdm-kde3.postinst => kdm-trinity.postinst} | 2 +- .../metapackages/rename-meta/Makefile | 0 .../metapackages/rename-meta/debian/changelog | 0 .../metapackages/rename-meta/debian/compat | 0 .../metapackages/rename-meta/debian/dirs | 0 ...kdm-kde3.postinst => kdm-trinity.postinst} | 2 +- .../precise/metapackages/rename-meta/Makefile | 0 .../metapackages/rename-meta/debian/changelog | 0 .../metapackages/rename-meta/debian/compat | 0 .../metapackages/rename-meta/debian/dirs | 0 .../rename-meta/debian/kdm-kde3.postinst | 89 ------------------- .../rename-meta/debian/kdm-trinity.postinst | 89 +++++++++++++++++++ .../raring/metapackages/rename-meta/Makefile | 0 .../metapackages/rename-meta/debian/changelog | 0 .../metapackages/rename-meta/debian/compat | 0 .../metapackages/rename-meta/debian/dirs | 0 .../rename-meta/debian/kdm-kde3.postinst | 89 ------------------- .../rename-meta/debian/kdm-trinity.postinst | 89 +++++++++++++++++++ 32 files changed, 182 insertions(+), 182 deletions(-) mode change 100755 => 100644 debian/lenny/metapackages/rename-meta/Makefile mode change 100755 => 100644 debian/lenny/metapackages/rename-meta/debian/changelog mode change 100755 => 100644 debian/lenny/metapackages/rename-meta/debian/compat mode change 100755 => 100644 debian/lenny/metapackages/rename-meta/debian/dirs rename debian/lenny/metapackages/rename-meta/debian/{kdm-kde3.postinst => kdm-trinity.postinst} (99%) mode change 100755 => 100644 debian/squeeze/metapackages/rename-meta/Makefile mode change 100755 => 100644 debian/squeeze/metapackages/rename-meta/debian/changelog mode change 100755 => 100644 debian/squeeze/metapackages/rename-meta/debian/compat mode change 100755 => 100644 debian/squeeze/metapackages/rename-meta/debian/dirs rename debian/squeeze/metapackages/rename-meta/debian/{kdm-kde3.postinst => kdm-trinity.postinst} (99%) mode change 100755 => 100644 debian/wheezy/metapackages/rename-meta/Makefile mode change 100755 => 100644 debian/wheezy/metapackages/rename-meta/debian/changelog mode change 100755 => 100644 debian/wheezy/metapackages/rename-meta/debian/compat mode change 100755 => 100644 debian/wheezy/metapackages/rename-meta/debian/dirs rename debian/wheezy/metapackages/rename-meta/debian/{kdm-kde3.postinst => kdm-trinity.postinst} (99%) mode change 100755 => 100644 ubuntu/maverick/metapackages/rename-meta/Makefile mode change 100755 => 100644 ubuntu/maverick/metapackages/rename-meta/debian/changelog mode change 100755 => 100644 ubuntu/maverick/metapackages/rename-meta/debian/compat mode change 100755 => 100644 ubuntu/maverick/metapackages/rename-meta/debian/dirs rename ubuntu/maverick/metapackages/rename-meta/debian/{kdm-kde3.postinst => kdm-trinity.postinst} (99%) mode change 100755 => 100644 ubuntu/precise/metapackages/rename-meta/Makefile mode change 100755 => 100644 ubuntu/precise/metapackages/rename-meta/debian/changelog mode change 100755 => 100644 ubuntu/precise/metapackages/rename-meta/debian/compat mode change 100755 => 100644 ubuntu/precise/metapackages/rename-meta/debian/dirs delete mode 100644 ubuntu/precise/metapackages/rename-meta/debian/kdm-kde3.postinst create mode 100644 ubuntu/precise/metapackages/rename-meta/debian/kdm-trinity.postinst mode change 100755 => 100644 ubuntu/raring/metapackages/rename-meta/Makefile mode change 100755 => 100644 ubuntu/raring/metapackages/rename-meta/debian/changelog mode change 100755 => 100644 ubuntu/raring/metapackages/rename-meta/debian/compat mode change 100755 => 100644 ubuntu/raring/metapackages/rename-meta/debian/dirs delete mode 100644 ubuntu/raring/metapackages/rename-meta/debian/kdm-kde3.postinst create mode 100644 ubuntu/raring/metapackages/rename-meta/debian/kdm-trinity.postinst diff --git a/debian/lenny/metapackages/rename-meta/Makefile b/debian/lenny/metapackages/rename-meta/Makefile old mode 100755 new mode 100644 diff --git a/debian/lenny/metapackages/rename-meta/debian/changelog b/debian/lenny/metapackages/rename-meta/debian/changelog old mode 100755 new mode 100644 diff --git a/debian/lenny/metapackages/rename-meta/debian/compat b/debian/lenny/metapackages/rename-meta/debian/compat old mode 100755 new mode 100644 diff --git a/debian/lenny/metapackages/rename-meta/debian/dirs b/debian/lenny/metapackages/rename-meta/debian/dirs old mode 100755 new mode 100644 diff --git a/debian/lenny/metapackages/rename-meta/debian/kdm-kde3.postinst b/debian/lenny/metapackages/rename-meta/debian/kdm-trinity.postinst similarity index 99% rename from debian/lenny/metapackages/rename-meta/debian/kdm-kde3.postinst rename to debian/lenny/metapackages/rename-meta/debian/kdm-trinity.postinst index 8db089c93..e026f2bfe 100644 --- a/debian/lenny/metapackages/rename-meta/debian/kdm-kde3.postinst +++ b/debian/lenny/metapackages/rename-meta/debian/kdm-trinity.postinst @@ -1,5 +1,5 @@ #! /bin/sh -# postinst script for kdm-kde3 +# postinst script for kdm-trinity # # see: dh_installdeb(1) diff --git a/debian/squeeze/metapackages/rename-meta/Makefile b/debian/squeeze/metapackages/rename-meta/Makefile old mode 100755 new mode 100644 diff --git a/debian/squeeze/metapackages/rename-meta/debian/changelog b/debian/squeeze/metapackages/rename-meta/debian/changelog old mode 100755 new mode 100644 diff --git a/debian/squeeze/metapackages/rename-meta/debian/compat b/debian/squeeze/metapackages/rename-meta/debian/compat old mode 100755 new mode 100644 diff --git a/debian/squeeze/metapackages/rename-meta/debian/dirs b/debian/squeeze/metapackages/rename-meta/debian/dirs old mode 100755 new mode 100644 diff --git a/debian/squeeze/metapackages/rename-meta/debian/kdm-kde3.postinst b/debian/squeeze/metapackages/rename-meta/debian/kdm-trinity.postinst similarity index 99% rename from debian/squeeze/metapackages/rename-meta/debian/kdm-kde3.postinst rename to debian/squeeze/metapackages/rename-meta/debian/kdm-trinity.postinst index 8db089c93..e026f2bfe 100644 --- a/debian/squeeze/metapackages/rename-meta/debian/kdm-kde3.postinst +++ b/debian/squeeze/metapackages/rename-meta/debian/kdm-trinity.postinst @@ -1,5 +1,5 @@ #! /bin/sh -# postinst script for kdm-kde3 +# postinst script for kdm-trinity # # see: dh_installdeb(1) diff --git a/debian/wheezy/metapackages/rename-meta/Makefile b/debian/wheezy/metapackages/rename-meta/Makefile old mode 100755 new mode 100644 diff --git a/debian/wheezy/metapackages/rename-meta/debian/changelog b/debian/wheezy/metapackages/rename-meta/debian/changelog old mode 100755 new mode 100644 diff --git a/debian/wheezy/metapackages/rename-meta/debian/compat b/debian/wheezy/metapackages/rename-meta/debian/compat old mode 100755 new mode 100644 diff --git a/debian/wheezy/metapackages/rename-meta/debian/dirs b/debian/wheezy/metapackages/rename-meta/debian/dirs old mode 100755 new mode 100644 diff --git a/debian/wheezy/metapackages/rename-meta/debian/kdm-kde3.postinst b/debian/wheezy/metapackages/rename-meta/debian/kdm-trinity.postinst similarity index 99% rename from debian/wheezy/metapackages/rename-meta/debian/kdm-kde3.postinst rename to debian/wheezy/metapackages/rename-meta/debian/kdm-trinity.postinst index 8db089c93..e026f2bfe 100644 --- a/debian/wheezy/metapackages/rename-meta/debian/kdm-kde3.postinst +++ b/debian/wheezy/metapackages/rename-meta/debian/kdm-trinity.postinst @@ -1,5 +1,5 @@ #! /bin/sh -# postinst script for kdm-kde3 +# postinst script for kdm-trinity # # see: dh_installdeb(1) diff --git a/ubuntu/maverick/metapackages/rename-meta/Makefile b/ubuntu/maverick/metapackages/rename-meta/Makefile old mode 100755 new mode 100644 diff --git a/ubuntu/maverick/metapackages/rename-meta/debian/changelog b/ubuntu/maverick/metapackages/rename-meta/debian/changelog old mode 100755 new mode 100644 diff --git a/ubuntu/maverick/metapackages/rename-meta/debian/compat b/ubuntu/maverick/metapackages/rename-meta/debian/compat old mode 100755 new mode 100644 diff --git a/ubuntu/maverick/metapackages/rename-meta/debian/dirs b/ubuntu/maverick/metapackages/rename-meta/debian/dirs old mode 100755 new mode 100644 diff --git a/ubuntu/maverick/metapackages/rename-meta/debian/kdm-kde3.postinst b/ubuntu/maverick/metapackages/rename-meta/debian/kdm-trinity.postinst similarity index 99% rename from ubuntu/maverick/metapackages/rename-meta/debian/kdm-kde3.postinst rename to ubuntu/maverick/metapackages/rename-meta/debian/kdm-trinity.postinst index 8db089c93..e026f2bfe 100644 --- a/ubuntu/maverick/metapackages/rename-meta/debian/kdm-kde3.postinst +++ b/ubuntu/maverick/metapackages/rename-meta/debian/kdm-trinity.postinst @@ -1,5 +1,5 @@ #! /bin/sh -# postinst script for kdm-kde3 +# postinst script for kdm-trinity # # see: dh_installdeb(1) diff --git a/ubuntu/precise/metapackages/rename-meta/Makefile b/ubuntu/precise/metapackages/rename-meta/Makefile old mode 100755 new mode 100644 diff --git a/ubuntu/precise/metapackages/rename-meta/debian/changelog b/ubuntu/precise/metapackages/rename-meta/debian/changelog old mode 100755 new mode 100644 diff --git a/ubuntu/precise/metapackages/rename-meta/debian/compat b/ubuntu/precise/metapackages/rename-meta/debian/compat old mode 100755 new mode 100644 diff --git a/ubuntu/precise/metapackages/rename-meta/debian/dirs b/ubuntu/precise/metapackages/rename-meta/debian/dirs old mode 100755 new mode 100644 diff --git a/ubuntu/precise/metapackages/rename-meta/debian/kdm-kde3.postinst b/ubuntu/precise/metapackages/rename-meta/debian/kdm-kde3.postinst deleted file mode 100644 index 8db089c93..000000000 --- a/ubuntu/precise/metapackages/rename-meta/debian/kdm-kde3.postinst +++ /dev/null @@ -1,89 +0,0 @@ -#! /bin/sh -# postinst script for kdm-kde3 -# -# see: dh_installdeb(1) - -set -e - -# debconf may not be available if some massive purging is going on -HAVE_DEBCONF= -if [ -e /usr/share/debconf/confmodule ]; then - . /usr/share/debconf/confmodule - HAVE_DEBCONF=yes -fi - -DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager - - if [ -n "$HAVE_DEBCONF" ]; then - # disown this question - db_unregister shared/default-x-display-manager || true - # does the question still exist? - if db_get shared/default-x-display-manager; then - if db_metaget shared/default-x-display-manager owners; then - # FIXME - redo this part uses shell-lib.sh from xfree86 - #observe "X display managers now available are \"$OWNERS\"" - db_subst shared/default-x-display-manager choices "$RET" - fi - DEFAULT_DISPLAY_MANAGER= - if db_get shared/default-x-display-manager; then - DEFAULT_DISPLAY_MANAGER="$RET" - fi - # are we removing the currently selected display manager? - if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then - if [ "kdm-trinity" = "$DEFAULT_DISPLAY_MANAGER" ]; then - if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then - if db_get "$DEFAULT_DISPLAY_MANAGER/daemon_name"; then - # does the display manager file reference the current default? if - # so, remove it because it will now be wrong - if [ -n "$RET" ]; then - if [ "$(cat "$DEFAULT_DISPLAY_MANAGER_FILE")" = "$RET" ]; then - rm "$DEFAULT_DISPLAY_MANAGER_FILE" - fi - fi - fi - fi - # ask the user to choose a new default - db_fset shared/default-x-display-manager seen false - db_input critical shared/default-x-display-manager || true - db_go - # if the default display manager file doesn't exist, write it with - # the path to the new default display manager - if [ ! -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then - DEFAULT_DISPLAY_MANAGER= - if db_get shared/default-x-display-manager; then - DEFAULT_DISPLAY_MANAGER="$RET" - fi - if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then - # FIXME - redo this part uses shell-lib.sh from xfree86 - #warn "new default display manager has been selected; please be" \ - # "sure to run \"dpkg-reconfigure $RET\" to ensure that it" \ - # "is configured" - DAEMON_NAME= - if db_get "$DEFAULT_DISPLAY_MANAGER"/daemon_name; then - DAEMON_NAME="$RET" - fi - if [ ! -n "$DAEMON_NAME" ]; then - # if we were unable to determine the name of the selected daemon (for - # instance, if the selected default display manager doesn't provide a - # daemon_name question), guess - DAEMON_NAME=$(which "$DEFAULT_DISPLAY_MANAGER" 2>/dev/null) - if [ ! -n "$DAEMON_NAME" ]; then - echo . - # FIXME - redo this part uses shell-lib.sh from xfree86 - #warn "unable to determine path to default X display manager" \ - # "$DEFAULT_DISPLAY_MANAGER; not updating" \ - # "$DEFAULT_DISPLAY_MANAGER_FILE" - fi - fi - if [ -n "$DAEMON_NAME" ]; then - echo "$DAEMON_NAME" > "$DEFAULT_DISPLAY_MANAGER_FILE" - fi - fi - fi - fi - fi - fi - fi - -exit 0 - diff --git a/ubuntu/precise/metapackages/rename-meta/debian/kdm-trinity.postinst b/ubuntu/precise/metapackages/rename-meta/debian/kdm-trinity.postinst new file mode 100644 index 000000000..e026f2bfe --- /dev/null +++ b/ubuntu/precise/metapackages/rename-meta/debian/kdm-trinity.postinst @@ -0,0 +1,89 @@ +#! /bin/sh +# postinst script for kdm-trinity +# +# see: dh_installdeb(1) + +set -e + +# debconf may not be available if some massive purging is going on +HAVE_DEBCONF= +if [ -e /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule + HAVE_DEBCONF=yes +fi + +DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager + + if [ -n "$HAVE_DEBCONF" ]; then + # disown this question + db_unregister shared/default-x-display-manager || true + # does the question still exist? + if db_get shared/default-x-display-manager; then + if db_metaget shared/default-x-display-manager owners; then + # FIXME - redo this part uses shell-lib.sh from xfree86 + #observe "X display managers now available are \"$OWNERS\"" + db_subst shared/default-x-display-manager choices "$RET" + fi + DEFAULT_DISPLAY_MANAGER= + if db_get shared/default-x-display-manager; then + DEFAULT_DISPLAY_MANAGER="$RET" + fi + # are we removing the currently selected display manager? + if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then + if [ "kdm-trinity" = "$DEFAULT_DISPLAY_MANAGER" ]; then + if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then + if db_get "$DEFAULT_DISPLAY_MANAGER/daemon_name"; then + # does the display manager file reference the current default? if + # so, remove it because it will now be wrong + if [ -n "$RET" ]; then + if [ "$(cat "$DEFAULT_DISPLAY_MANAGER_FILE")" = "$RET" ]; then + rm "$DEFAULT_DISPLAY_MANAGER_FILE" + fi + fi + fi + fi + # ask the user to choose a new default + db_fset shared/default-x-display-manager seen false + db_input critical shared/default-x-display-manager || true + db_go + # if the default display manager file doesn't exist, write it with + # the path to the new default display manager + if [ ! -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then + DEFAULT_DISPLAY_MANAGER= + if db_get shared/default-x-display-manager; then + DEFAULT_DISPLAY_MANAGER="$RET" + fi + if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then + # FIXME - redo this part uses shell-lib.sh from xfree86 + #warn "new default display manager has been selected; please be" \ + # "sure to run \"dpkg-reconfigure $RET\" to ensure that it" \ + # "is configured" + DAEMON_NAME= + if db_get "$DEFAULT_DISPLAY_MANAGER"/daemon_name; then + DAEMON_NAME="$RET" + fi + if [ ! -n "$DAEMON_NAME" ]; then + # if we were unable to determine the name of the selected daemon (for + # instance, if the selected default display manager doesn't provide a + # daemon_name question), guess + DAEMON_NAME=$(which "$DEFAULT_DISPLAY_MANAGER" 2>/dev/null) + if [ ! -n "$DAEMON_NAME" ]; then + echo . + # FIXME - redo this part uses shell-lib.sh from xfree86 + #warn "unable to determine path to default X display manager" \ + # "$DEFAULT_DISPLAY_MANAGER; not updating" \ + # "$DEFAULT_DISPLAY_MANAGER_FILE" + fi + fi + if [ -n "$DAEMON_NAME" ]; then + echo "$DAEMON_NAME" > "$DEFAULT_DISPLAY_MANAGER_FILE" + fi + fi + fi + fi + fi + fi + fi + +exit 0 + diff --git a/ubuntu/raring/metapackages/rename-meta/Makefile b/ubuntu/raring/metapackages/rename-meta/Makefile old mode 100755 new mode 100644 diff --git a/ubuntu/raring/metapackages/rename-meta/debian/changelog b/ubuntu/raring/metapackages/rename-meta/debian/changelog old mode 100755 new mode 100644 diff --git a/ubuntu/raring/metapackages/rename-meta/debian/compat b/ubuntu/raring/metapackages/rename-meta/debian/compat old mode 100755 new mode 100644 diff --git a/ubuntu/raring/metapackages/rename-meta/debian/dirs b/ubuntu/raring/metapackages/rename-meta/debian/dirs old mode 100755 new mode 100644 diff --git a/ubuntu/raring/metapackages/rename-meta/debian/kdm-kde3.postinst b/ubuntu/raring/metapackages/rename-meta/debian/kdm-kde3.postinst deleted file mode 100644 index 8db089c93..000000000 --- a/ubuntu/raring/metapackages/rename-meta/debian/kdm-kde3.postinst +++ /dev/null @@ -1,89 +0,0 @@ -#! /bin/sh -# postinst script for kdm-kde3 -# -# see: dh_installdeb(1) - -set -e - -# debconf may not be available if some massive purging is going on -HAVE_DEBCONF= -if [ -e /usr/share/debconf/confmodule ]; then - . /usr/share/debconf/confmodule - HAVE_DEBCONF=yes -fi - -DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager - - if [ -n "$HAVE_DEBCONF" ]; then - # disown this question - db_unregister shared/default-x-display-manager || true - # does the question still exist? - if db_get shared/default-x-display-manager; then - if db_metaget shared/default-x-display-manager owners; then - # FIXME - redo this part uses shell-lib.sh from xfree86 - #observe "X display managers now available are \"$OWNERS\"" - db_subst shared/default-x-display-manager choices "$RET" - fi - DEFAULT_DISPLAY_MANAGER= - if db_get shared/default-x-display-manager; then - DEFAULT_DISPLAY_MANAGER="$RET" - fi - # are we removing the currently selected display manager? - if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then - if [ "kdm-trinity" = "$DEFAULT_DISPLAY_MANAGER" ]; then - if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then - if db_get "$DEFAULT_DISPLAY_MANAGER/daemon_name"; then - # does the display manager file reference the current default? if - # so, remove it because it will now be wrong - if [ -n "$RET" ]; then - if [ "$(cat "$DEFAULT_DISPLAY_MANAGER_FILE")" = "$RET" ]; then - rm "$DEFAULT_DISPLAY_MANAGER_FILE" - fi - fi - fi - fi - # ask the user to choose a new default - db_fset shared/default-x-display-manager seen false - db_input critical shared/default-x-display-manager || true - db_go - # if the default display manager file doesn't exist, write it with - # the path to the new default display manager - if [ ! -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then - DEFAULT_DISPLAY_MANAGER= - if db_get shared/default-x-display-manager; then - DEFAULT_DISPLAY_MANAGER="$RET" - fi - if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then - # FIXME - redo this part uses shell-lib.sh from xfree86 - #warn "new default display manager has been selected; please be" \ - # "sure to run \"dpkg-reconfigure $RET\" to ensure that it" \ - # "is configured" - DAEMON_NAME= - if db_get "$DEFAULT_DISPLAY_MANAGER"/daemon_name; then - DAEMON_NAME="$RET" - fi - if [ ! -n "$DAEMON_NAME" ]; then - # if we were unable to determine the name of the selected daemon (for - # instance, if the selected default display manager doesn't provide a - # daemon_name question), guess - DAEMON_NAME=$(which "$DEFAULT_DISPLAY_MANAGER" 2>/dev/null) - if [ ! -n "$DAEMON_NAME" ]; then - echo . - # FIXME - redo this part uses shell-lib.sh from xfree86 - #warn "unable to determine path to default X display manager" \ - # "$DEFAULT_DISPLAY_MANAGER; not updating" \ - # "$DEFAULT_DISPLAY_MANAGER_FILE" - fi - fi - if [ -n "$DAEMON_NAME" ]; then - echo "$DAEMON_NAME" > "$DEFAULT_DISPLAY_MANAGER_FILE" - fi - fi - fi - fi - fi - fi - fi - -exit 0 - diff --git a/ubuntu/raring/metapackages/rename-meta/debian/kdm-trinity.postinst b/ubuntu/raring/metapackages/rename-meta/debian/kdm-trinity.postinst new file mode 100644 index 000000000..e026f2bfe --- /dev/null +++ b/ubuntu/raring/metapackages/rename-meta/debian/kdm-trinity.postinst @@ -0,0 +1,89 @@ +#! /bin/sh +# postinst script for kdm-trinity +# +# see: dh_installdeb(1) + +set -e + +# debconf may not be available if some massive purging is going on +HAVE_DEBCONF= +if [ -e /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule + HAVE_DEBCONF=yes +fi + +DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager + + if [ -n "$HAVE_DEBCONF" ]; then + # disown this question + db_unregister shared/default-x-display-manager || true + # does the question still exist? + if db_get shared/default-x-display-manager; then + if db_metaget shared/default-x-display-manager owners; then + # FIXME - redo this part uses shell-lib.sh from xfree86 + #observe "X display managers now available are \"$OWNERS\"" + db_subst shared/default-x-display-manager choices "$RET" + fi + DEFAULT_DISPLAY_MANAGER= + if db_get shared/default-x-display-manager; then + DEFAULT_DISPLAY_MANAGER="$RET" + fi + # are we removing the currently selected display manager? + if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then + if [ "kdm-trinity" = "$DEFAULT_DISPLAY_MANAGER" ]; then + if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then + if db_get "$DEFAULT_DISPLAY_MANAGER/daemon_name"; then + # does the display manager file reference the current default? if + # so, remove it because it will now be wrong + if [ -n "$RET" ]; then + if [ "$(cat "$DEFAULT_DISPLAY_MANAGER_FILE")" = "$RET" ]; then + rm "$DEFAULT_DISPLAY_MANAGER_FILE" + fi + fi + fi + fi + # ask the user to choose a new default + db_fset shared/default-x-display-manager seen false + db_input critical shared/default-x-display-manager || true + db_go + # if the default display manager file doesn't exist, write it with + # the path to the new default display manager + if [ ! -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then + DEFAULT_DISPLAY_MANAGER= + if db_get shared/default-x-display-manager; then + DEFAULT_DISPLAY_MANAGER="$RET" + fi + if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then + # FIXME - redo this part uses shell-lib.sh from xfree86 + #warn "new default display manager has been selected; please be" \ + # "sure to run \"dpkg-reconfigure $RET\" to ensure that it" \ + # "is configured" + DAEMON_NAME= + if db_get "$DEFAULT_DISPLAY_MANAGER"/daemon_name; then + DAEMON_NAME="$RET" + fi + if [ ! -n "$DAEMON_NAME" ]; then + # if we were unable to determine the name of the selected daemon (for + # instance, if the selected default display manager doesn't provide a + # daemon_name question), guess + DAEMON_NAME=$(which "$DEFAULT_DISPLAY_MANAGER" 2>/dev/null) + if [ ! -n "$DAEMON_NAME" ]; then + echo . + # FIXME - redo this part uses shell-lib.sh from xfree86 + #warn "unable to determine path to default X display manager" \ + # "$DEFAULT_DISPLAY_MANAGER; not updating" \ + # "$DEFAULT_DISPLAY_MANAGER_FILE" + fi + fi + if [ -n "$DAEMON_NAME" ]; then + echo "$DAEMON_NAME" > "$DEFAULT_DISPLAY_MANAGER_FILE" + fi + fi + fi + fi + fi + fi + fi + +exit 0 + From 88e30e4e7aef250bcd37b097ca0b8ea0df057c92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 18 Jul 2013 02:23:40 +0200 Subject: [PATCH 02/10] Fix unintended renames in rename-meta on Debian and Ubuntu --- debian/lenny/metapackages/rename-meta/debian/control | 12 ------------ .../squeeze/metapackages/rename-meta/debian/control | 12 ------------ .../wheezy/metapackages/rename-meta/debian/control | 12 ------------ .../maverick/metapackages/rename-meta/debian/control | 12 ------------ .../precise/metapackages/rename-meta/debian/control | 12 ------------ .../raring/metapackages/rename-meta/debian/control | 12 ------------ 6 files changed, 72 deletions(-) diff --git a/debian/lenny/metapackages/rename-meta/debian/control b/debian/lenny/metapackages/rename-meta/debian/control index 0647d30f3..8a3c151cb 100644 --- a/debian/lenny/metapackages/rename-meta/debian/control +++ b/debian/lenny/metapackages/rename-meta/debian/control @@ -102,12 +102,6 @@ Depends: tdeprint-trinity Conflicts: kdeprint-trinity (< 4:13.9.9) Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed. -Package: kdesktop-trinity -Architecture: all -Depends: tdesktop-trinity -Conflicts: kdesktop-trinity (< 4:13.9.9) -Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed. - Package: kwin-trinity Architecture: all Depends: twin-trinity @@ -516,12 +510,6 @@ Depends: tdeaddons-trinity-doc-html Conflicts: kdeaddons-trinity-doc-html (< 4:13.9.9) Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed. -Package: atlantikdesigner-trinity -Architecture: all -Depends: atlantitdesigner-trinity -Conflicts: atlantikdesigner-trinity (< 4:13.9.9) -Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed. - Package: kdeaddons-kfile-plugins-trinity Architecture: all Depends: tdeaddons-kfile-plugins-trinity diff --git a/debian/squeeze/metapackages/rename-meta/debian/control b/debian/squeeze/metapackages/rename-meta/debian/control index 0647d30f3..8a3c151cb 100644 --- a/debian/squeeze/metapackages/rename-meta/debian/control +++ b/debian/squeeze/metapackages/rename-meta/debian/control @@ -102,12 +102,6 @@ Depends: tdeprint-trinity Conflicts: kdeprint-trinity (< 4:13.9.9) Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed. -Package: kdesktop-trinity -Architecture: all -Depends: tdesktop-trinity -Conflicts: kdesktop-trinity (< 4:13.9.9) -Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed. - Package: kwin-trinity Architecture: all Depends: twin-trinity @@ -516,12 +510,6 @@ Depends: tdeaddons-trinity-doc-html Conflicts: kdeaddons-trinity-doc-html (< 4:13.9.9) Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed. -Package: atlantikdesigner-trinity -Architecture: all -Depends: atlantitdesigner-trinity -Conflicts: atlantikdesigner-trinity (< 4:13.9.9) -Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed. - Package: kdeaddons-kfile-plugins-trinity Architecture: all Depends: tdeaddons-kfile-plugins-trinity diff --git a/debian/wheezy/metapackages/rename-meta/debian/control b/debian/wheezy/metapackages/rename-meta/debian/control index 0647d30f3..8a3c151cb 100644 --- a/debian/wheezy/metapackages/rename-meta/debian/control +++ b/debian/wheezy/metapackages/rename-meta/debian/control @@ -102,12 +102,6 @@ Depends: tdeprint-trinity Conflicts: kdeprint-trinity (< 4:13.9.9) Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed. -Package: kdesktop-trinity -Architecture: all -Depends: tdesktop-trinity -Conflicts: kdesktop-trinity (< 4:13.9.9) -Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed. - Package: kwin-trinity Architecture: all Depends: twin-trinity @@ -516,12 +510,6 @@ Depends: tdeaddons-trinity-doc-html Conflicts: kdeaddons-trinity-doc-html (< 4:13.9.9) Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed. -Package: atlantikdesigner-trinity -Architecture: all -Depends: atlantitdesigner-trinity -Conflicts: atlantikdesigner-trinity (< 4:13.9.9) -Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed. - Package: kdeaddons-kfile-plugins-trinity Architecture: all Depends: tdeaddons-kfile-plugins-trinity diff --git a/ubuntu/maverick/metapackages/rename-meta/debian/control b/ubuntu/maverick/metapackages/rename-meta/debian/control index 0647d30f3..8a3c151cb 100644 --- a/ubuntu/maverick/metapackages/rename-meta/debian/control +++ b/ubuntu/maverick/metapackages/rename-meta/debian/control @@ -102,12 +102,6 @@ Depends: tdeprint-trinity Conflicts: kdeprint-trinity (< 4:13.9.9) Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed. -Package: kdesktop-trinity -Architecture: all -Depends: tdesktop-trinity -Conflicts: kdesktop-trinity (< 4:13.9.9) -Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed. - Package: kwin-trinity Architecture: all Depends: twin-trinity @@ -516,12 +510,6 @@ Depends: tdeaddons-trinity-doc-html Conflicts: kdeaddons-trinity-doc-html (< 4:13.9.9) Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed. -Package: atlantikdesigner-trinity -Architecture: all -Depends: atlantitdesigner-trinity -Conflicts: atlantikdesigner-trinity (< 4:13.9.9) -Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed. - Package: kdeaddons-kfile-plugins-trinity Architecture: all Depends: tdeaddons-kfile-plugins-trinity diff --git a/ubuntu/precise/metapackages/rename-meta/debian/control b/ubuntu/precise/metapackages/rename-meta/debian/control index 0647d30f3..8a3c151cb 100644 --- a/ubuntu/precise/metapackages/rename-meta/debian/control +++ b/ubuntu/precise/metapackages/rename-meta/debian/control @@ -102,12 +102,6 @@ Depends: tdeprint-trinity Conflicts: kdeprint-trinity (< 4:13.9.9) Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed. -Package: kdesktop-trinity -Architecture: all -Depends: tdesktop-trinity -Conflicts: kdesktop-trinity (< 4:13.9.9) -Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed. - Package: kwin-trinity Architecture: all Depends: twin-trinity @@ -516,12 +510,6 @@ Depends: tdeaddons-trinity-doc-html Conflicts: kdeaddons-trinity-doc-html (< 4:13.9.9) Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed. -Package: atlantikdesigner-trinity -Architecture: all -Depends: atlantitdesigner-trinity -Conflicts: atlantikdesigner-trinity (< 4:13.9.9) -Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed. - Package: kdeaddons-kfile-plugins-trinity Architecture: all Depends: tdeaddons-kfile-plugins-trinity diff --git a/ubuntu/raring/metapackages/rename-meta/debian/control b/ubuntu/raring/metapackages/rename-meta/debian/control index 0647d30f3..8a3c151cb 100644 --- a/ubuntu/raring/metapackages/rename-meta/debian/control +++ b/ubuntu/raring/metapackages/rename-meta/debian/control @@ -102,12 +102,6 @@ Depends: tdeprint-trinity Conflicts: kdeprint-trinity (< 4:13.9.9) Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed. -Package: kdesktop-trinity -Architecture: all -Depends: tdesktop-trinity -Conflicts: kdesktop-trinity (< 4:13.9.9) -Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed. - Package: kwin-trinity Architecture: all Depends: twin-trinity @@ -516,12 +510,6 @@ Depends: tdeaddons-trinity-doc-html Conflicts: kdeaddons-trinity-doc-html (< 4:13.9.9) Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed. -Package: atlantikdesigner-trinity -Architecture: all -Depends: atlantitdesigner-trinity -Conflicts: atlantikdesigner-trinity (< 4:13.9.9) -Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed. - Package: kdeaddons-kfile-plugins-trinity Architecture: all Depends: tdeaddons-kfile-plugins-trinity From 576789d6e130be4e3e1d9788ba9bed049ea7ded5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 18 Jul 2013 18:41:37 +0200 Subject: [PATCH 03/10] Rename packages kde-icons-mono, kdelirc and kdewallpapers on Debian and Ubuntu Fix renaming of kdessh package on Debian and Ubuntu --- debian/lenny/tdeaccessibility/debian/control | 4 ++-- ...-trinity.install => tde-icons-mono-trinity.install} | 0 debian/lenny/tdeartwork/debian/control | 4 ++-- ...s-trinity.install => tdewallpapers-trinity.install} | 0 debian/lenny/tdeutils/debian/control | 10 +++++----- debian/lenny/tdeutils/debian/kdelirc-trinity.lintian | 3 --- ...kdelirc-trinity.install => tdelirc-trinity.install} | 0 debian/lenny/tdeutils/debian/tdelirc-trinity.lintian | 3 +++ .../{kdessh-trinity.install => tdessh-trinity.install} | 0 debian/squeeze/tdeaccessibility/debian/control | 4 ++-- ...-trinity.install => tde-icons-mono-trinity.install} | 0 debian/squeeze/tdeartwork/debian/control | 4 ++-- ...s-trinity.install => tdewallpapers-trinity.install} | 0 debian/squeeze/tdeutils/debian/control | 10 +++++----- debian/squeeze/tdeutils/debian/kdelirc-trinity.lintian | 3 --- ...kdelirc-trinity.install => tdelirc-trinity.install} | 0 debian/squeeze/tdeutils/debian/tdelirc-trinity.lintian | 3 +++ .../{kdessh-trinity.install => tdessh-trinity.install} | 0 debian/wheezy/tdeaccessibility/debian/control | 4 ++-- ...-trinity.install => tde-icons-mono-trinity.install} | 0 debian/wheezy/tdeartwork/debian/control | 4 ++-- ...s-trinity.install => tdewallpapers-trinity.install} | 0 debian/wheezy/tdeutils/debian/control | 10 +++++----- debian/wheezy/tdeutils/debian/kdelirc-trinity.lintian | 3 --- ...kdelirc-trinity.install => tdelirc-trinity.install} | 0 debian/wheezy/tdeutils/debian/tdelirc-trinity.lintian | 3 +++ .../{kdessh-trinity.install => tdessh-trinity.install} | 0 .../metapackages/trinity-livecd/debian/control | 2 +- ubuntu/maverick/tdeaccessibility/debian/control | 4 ++-- ...-trinity.install => tde-icons-mono-trinity.install} | 0 ubuntu/maverick/tdeartwork/debian/control | 4 ++-- ...s-trinity.install => tdewallpapers-trinity.install} | 0 ubuntu/maverick/tdeutils/debian/control | 10 +++++----- .../maverick/tdeutils/debian/kdelirc-trinity.lintian | 3 --- ...kdelirc-trinity.install => tdelirc-trinity.install} | 0 .../maverick/tdeutils/debian/tdelirc-trinity.lintian | 3 +++ .../{kdessh-trinity.install => tdessh-trinity.install} | 0 .../precise/metapackages/trinity-livecd/debian/control | 2 +- ubuntu/precise/tdeaccessibility/debian/control | 4 ++-- ...-trinity.install => tde-icons-mono-trinity.install} | 0 ubuntu/precise/tdeartwork/debian/control | 4 ++-- ...s-trinity.install => tdewallpapers-trinity.install} | 0 ubuntu/precise/tdeutils/debian/control | 10 +++++----- ubuntu/precise/tdeutils/debian/kdelirc-trinity.lintian | 3 --- ...kdelirc-trinity.install => tdelirc-trinity.install} | 0 ubuntu/precise/tdeutils/debian/tdelirc-trinity.lintian | 3 +++ .../{kdessh-trinity.install => tdessh-trinity.install} | 0 .../raring/metapackages/trinity-livecd/debian/control | 2 +- ubuntu/raring/tdeaccessibility/debian/control | 4 ++-- ...-trinity.install => tde-icons-mono-trinity.install} | 0 ubuntu/raring/tdeartwork/debian/control | 4 ++-- ...s-trinity.install => tdewallpapers-trinity.install} | 0 ubuntu/raring/tdeutils/debian/control | 10 +++++----- ubuntu/raring/tdeutils/debian/kdelirc-trinity.lintian | 3 --- ...kdelirc-trinity.install => tdelirc-trinity.install} | 0 ubuntu/raring/tdeutils/debian/tdelirc-trinity.lintian | 3 +++ .../{kdessh-trinity.install => tdessh-trinity.install} | 0 57 files changed, 75 insertions(+), 75 deletions(-) rename debian/lenny/tdeaccessibility/debian/{kde-icons-mono-trinity.install => tde-icons-mono-trinity.install} (100%) rename debian/lenny/tdeartwork/debian/{kdewallpapers-trinity.install => tdewallpapers-trinity.install} (100%) delete mode 100644 debian/lenny/tdeutils/debian/kdelirc-trinity.lintian rename debian/lenny/tdeutils/debian/{kdelirc-trinity.install => tdelirc-trinity.install} (100%) create mode 100644 debian/lenny/tdeutils/debian/tdelirc-trinity.lintian rename debian/lenny/tdeutils/debian/{kdessh-trinity.install => tdessh-trinity.install} (100%) rename debian/squeeze/tdeaccessibility/debian/{kde-icons-mono-trinity.install => tde-icons-mono-trinity.install} (100%) rename debian/squeeze/tdeartwork/debian/{kdewallpapers-trinity.install => tdewallpapers-trinity.install} (100%) delete mode 100644 debian/squeeze/tdeutils/debian/kdelirc-trinity.lintian rename debian/squeeze/tdeutils/debian/{kdelirc-trinity.install => tdelirc-trinity.install} (100%) create mode 100644 debian/squeeze/tdeutils/debian/tdelirc-trinity.lintian rename debian/squeeze/tdeutils/debian/{kdessh-trinity.install => tdessh-trinity.install} (100%) rename debian/wheezy/tdeaccessibility/debian/{kde-icons-mono-trinity.install => tde-icons-mono-trinity.install} (100%) rename debian/wheezy/tdeartwork/debian/{kdewallpapers-trinity.install => tdewallpapers-trinity.install} (100%) delete mode 100644 debian/wheezy/tdeutils/debian/kdelirc-trinity.lintian rename debian/wheezy/tdeutils/debian/{kdelirc-trinity.install => tdelirc-trinity.install} (100%) create mode 100644 debian/wheezy/tdeutils/debian/tdelirc-trinity.lintian rename debian/wheezy/tdeutils/debian/{kdessh-trinity.install => tdessh-trinity.install} (100%) rename ubuntu/maverick/tdeaccessibility/debian/{kde-icons-mono-trinity.install => tde-icons-mono-trinity.install} (100%) rename ubuntu/maverick/tdeartwork/debian/{kdewallpapers-trinity.install => tdewallpapers-trinity.install} (100%) delete mode 100644 ubuntu/maverick/tdeutils/debian/kdelirc-trinity.lintian rename ubuntu/maverick/tdeutils/debian/{kdelirc-trinity.install => tdelirc-trinity.install} (100%) create mode 100644 ubuntu/maverick/tdeutils/debian/tdelirc-trinity.lintian rename ubuntu/maverick/tdeutils/debian/{kdessh-trinity.install => tdessh-trinity.install} (100%) rename ubuntu/precise/tdeaccessibility/debian/{kde-icons-mono-trinity.install => tde-icons-mono-trinity.install} (100%) rename ubuntu/precise/tdeartwork/debian/{kdewallpapers-trinity.install => tdewallpapers-trinity.install} (100%) delete mode 100644 ubuntu/precise/tdeutils/debian/kdelirc-trinity.lintian rename ubuntu/precise/tdeutils/debian/{kdelirc-trinity.install => tdelirc-trinity.install} (100%) create mode 100644 ubuntu/precise/tdeutils/debian/tdelirc-trinity.lintian rename ubuntu/precise/tdeutils/debian/{kdessh-trinity.install => tdessh-trinity.install} (100%) rename ubuntu/raring/tdeaccessibility/debian/{kde-icons-mono-trinity.install => tde-icons-mono-trinity.install} (100%) rename ubuntu/raring/tdeartwork/debian/{kdewallpapers-trinity.install => tdewallpapers-trinity.install} (100%) delete mode 100644 ubuntu/raring/tdeutils/debian/kdelirc-trinity.lintian rename ubuntu/raring/tdeutils/debian/{kdelirc-trinity.install => tdelirc-trinity.install} (100%) create mode 100644 ubuntu/raring/tdeutils/debian/tdelirc-trinity.lintian rename ubuntu/raring/tdeutils/debian/{kdessh-trinity.install => tdessh-trinity.install} (100%) diff --git a/debian/lenny/tdeaccessibility/debian/control b/debian/lenny/tdeaccessibility/debian/control index bc2ab50d2..fef62b6bc 100644 --- a/debian/lenny/tdeaccessibility/debian/control +++ b/debian/lenny/tdeaccessibility/debian/control @@ -13,7 +13,7 @@ Architecture: all Replaces: kdeaccessibility-trinity (<< 4:14.0.0) Breaks: kdeaccessibility-trinity (<< 4:14.0.0) Depends: kmag-trinity (>= ${Source-Version}), kmousetool-trinity (>= ${Source-Version}), kmouth-trinity (>= ${Source-Version}), kbstate-trinity (>= ${Source-Version}), ksayit-trinity (>= ${Source-Version}), kttsd-trinity (>= ${Source-Version}) -Recommends: kde-icons-mono-trinity (>= ${Source-Version}) +Recommends: tde-icons-mono-trinity (>= ${Source-Version}) Suggests: kttsd-contrib-plugins-trinity (>= ${Source-Version}), tdeaccessibility-trinity-doc-html (>= ${Source-Version}) Description: accessibility packages from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -46,7 +46,7 @@ Description: KDE accessibility documentation in HTML format This package is part of Trinity, and a component of the KDE accessibility module. See the 'kde-trinity' and 'tdeaccessibility-trinity' packages for more information. -Package: kde-icons-mono-trinity +Package: tde-icons-mono-trinity Section: tde Architecture: all Replaces: kde-icons-mono-trinity (<< 4:14.0.0) diff --git a/debian/lenny/tdeaccessibility/debian/kde-icons-mono-trinity.install b/debian/lenny/tdeaccessibility/debian/tde-icons-mono-trinity.install similarity index 100% rename from debian/lenny/tdeaccessibility/debian/kde-icons-mono-trinity.install rename to debian/lenny/tdeaccessibility/debian/tde-icons-mono-trinity.install diff --git a/debian/lenny/tdeartwork/debian/control b/debian/lenny/tdeartwork/debian/control index 56a6ec0d3..7ac1920c6 100644 --- a/debian/lenny/tdeartwork/debian/control +++ b/debian/lenny/tdeartwork/debian/control @@ -13,7 +13,7 @@ Architecture: all Section: tde Replaces: kdeartwork-trinity (<< 4:14.0.0) Breaks: kdeartwork-trinity (<< 4:14.0.0) -Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), kdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version}) +Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), tdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version}) Recommends: tdescreensaver-xsavers-trinity Description: themes, styles and more from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -98,7 +98,7 @@ Description: window decoration themes released with Trinity This package is part of Trinity, and a component of the KDE artwork module. See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information. -Package: kdewallpapers-trinity +Package: tdewallpapers-trinity Architecture: all Section: tde Replaces: kdewallpapers-trinity (<< 4:14.0.0) diff --git a/debian/lenny/tdeartwork/debian/kdewallpapers-trinity.install b/debian/lenny/tdeartwork/debian/tdewallpapers-trinity.install similarity index 100% rename from debian/lenny/tdeartwork/debian/kdewallpapers-trinity.install rename to debian/lenny/tdeartwork/debian/tdewallpapers-trinity.install diff --git a/debian/lenny/tdeutils/debian/control b/debian/lenny/tdeutils/debian/control index 56d984a2a..43aff85f0 100644 --- a/debian/lenny/tdeutils/debian/control +++ b/debian/lenny/tdeutils/debian/control @@ -13,7 +13,7 @@ Section: tde Architecture: all Replaces: kdeutils-trinity (<< 4:14.0.0) Breaks: kdeutils-trinity (<< 4:14.0.0) -Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), kdelirc-trinity (>= ${Source-Version}), tdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version}) +Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), tdelirc-trinity (>= ${Source-Version}), tdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version}) Suggests: tdeutils-trinity-doc-html (>= ${Source-Version}) Description: general purpose utilities from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -61,7 +61,7 @@ Section: utils Architecture: any Replaces: kdeutils-trinity-dev (<< 4:14.0.0) Breaks: kdeutils-trinity-dev (<< 4:14.0.0) -Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), kdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev +Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), tdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev Description: development files for the Trinity utilities module This package contains development files needed to compile tdeutils applications. @@ -124,7 +124,7 @@ Description: character selector for Trinity This package is part of Trinity, as a component of the KDE utilities module. See the 'kde-trinity' and 'tdeutils-trinity' packages for more information. -Package: kdelirc-trinity +Package: tdelirc-trinity Section: utils Architecture: any Replaces: kdelirc-trinity (<< 4:14.0.0) @@ -140,8 +140,8 @@ Description: infrared control for Trinity Package: tdessh-trinity Section: tde Architecture: any -Replaces: tdessh-trinity (<< 4:14.0.0) -Breaks: tdessh-trinity (<< 4:14.0.0) +Replaces: kdessh-trinity (<< 4:14.0.0) +Breaks: kdessh-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, openssh-client | ssh-client Description: ssh frontend for Trinity This package contains KDE's frontend for ssh. diff --git a/debian/lenny/tdeutils/debian/kdelirc-trinity.lintian b/debian/lenny/tdeutils/debian/kdelirc-trinity.lintian deleted file mode 100644 index 986b7f7d4..000000000 --- a/debian/lenny/tdeutils/debian/kdelirc-trinity.lintian +++ /dev/null @@ -1,3 +0,0 @@ -kdelirc: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so -kdelirc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so -kdelirc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so diff --git a/debian/lenny/tdeutils/debian/kdelirc-trinity.install b/debian/lenny/tdeutils/debian/tdelirc-trinity.install similarity index 100% rename from debian/lenny/tdeutils/debian/kdelirc-trinity.install rename to debian/lenny/tdeutils/debian/tdelirc-trinity.install diff --git a/debian/lenny/tdeutils/debian/tdelirc-trinity.lintian b/debian/lenny/tdeutils/debian/tdelirc-trinity.lintian new file mode 100644 index 000000000..0c89583f3 --- /dev/null +++ b/debian/lenny/tdeutils/debian/tdelirc-trinity.lintian @@ -0,0 +1,3 @@ +tdelirc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so +tdelirc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so +tdelirc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so diff --git a/debian/lenny/tdeutils/debian/kdessh-trinity.install b/debian/lenny/tdeutils/debian/tdessh-trinity.install similarity index 100% rename from debian/lenny/tdeutils/debian/kdessh-trinity.install rename to debian/lenny/tdeutils/debian/tdessh-trinity.install diff --git a/debian/squeeze/tdeaccessibility/debian/control b/debian/squeeze/tdeaccessibility/debian/control index bc2ab50d2..fef62b6bc 100644 --- a/debian/squeeze/tdeaccessibility/debian/control +++ b/debian/squeeze/tdeaccessibility/debian/control @@ -13,7 +13,7 @@ Architecture: all Replaces: kdeaccessibility-trinity (<< 4:14.0.0) Breaks: kdeaccessibility-trinity (<< 4:14.0.0) Depends: kmag-trinity (>= ${Source-Version}), kmousetool-trinity (>= ${Source-Version}), kmouth-trinity (>= ${Source-Version}), kbstate-trinity (>= ${Source-Version}), ksayit-trinity (>= ${Source-Version}), kttsd-trinity (>= ${Source-Version}) -Recommends: kde-icons-mono-trinity (>= ${Source-Version}) +Recommends: tde-icons-mono-trinity (>= ${Source-Version}) Suggests: kttsd-contrib-plugins-trinity (>= ${Source-Version}), tdeaccessibility-trinity-doc-html (>= ${Source-Version}) Description: accessibility packages from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -46,7 +46,7 @@ Description: KDE accessibility documentation in HTML format This package is part of Trinity, and a component of the KDE accessibility module. See the 'kde-trinity' and 'tdeaccessibility-trinity' packages for more information. -Package: kde-icons-mono-trinity +Package: tde-icons-mono-trinity Section: tde Architecture: all Replaces: kde-icons-mono-trinity (<< 4:14.0.0) diff --git a/debian/squeeze/tdeaccessibility/debian/kde-icons-mono-trinity.install b/debian/squeeze/tdeaccessibility/debian/tde-icons-mono-trinity.install similarity index 100% rename from debian/squeeze/tdeaccessibility/debian/kde-icons-mono-trinity.install rename to debian/squeeze/tdeaccessibility/debian/tde-icons-mono-trinity.install diff --git a/debian/squeeze/tdeartwork/debian/control b/debian/squeeze/tdeartwork/debian/control index 56a6ec0d3..7ac1920c6 100644 --- a/debian/squeeze/tdeartwork/debian/control +++ b/debian/squeeze/tdeartwork/debian/control @@ -13,7 +13,7 @@ Architecture: all Section: tde Replaces: kdeartwork-trinity (<< 4:14.0.0) Breaks: kdeartwork-trinity (<< 4:14.0.0) -Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), kdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version}) +Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), tdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version}) Recommends: tdescreensaver-xsavers-trinity Description: themes, styles and more from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -98,7 +98,7 @@ Description: window decoration themes released with Trinity This package is part of Trinity, and a component of the KDE artwork module. See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information. -Package: kdewallpapers-trinity +Package: tdewallpapers-trinity Architecture: all Section: tde Replaces: kdewallpapers-trinity (<< 4:14.0.0) diff --git a/debian/squeeze/tdeartwork/debian/kdewallpapers-trinity.install b/debian/squeeze/tdeartwork/debian/tdewallpapers-trinity.install similarity index 100% rename from debian/squeeze/tdeartwork/debian/kdewallpapers-trinity.install rename to debian/squeeze/tdeartwork/debian/tdewallpapers-trinity.install diff --git a/debian/squeeze/tdeutils/debian/control b/debian/squeeze/tdeutils/debian/control index 56d984a2a..43aff85f0 100644 --- a/debian/squeeze/tdeutils/debian/control +++ b/debian/squeeze/tdeutils/debian/control @@ -13,7 +13,7 @@ Section: tde Architecture: all Replaces: kdeutils-trinity (<< 4:14.0.0) Breaks: kdeutils-trinity (<< 4:14.0.0) -Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), kdelirc-trinity (>= ${Source-Version}), tdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version}) +Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), tdelirc-trinity (>= ${Source-Version}), tdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version}) Suggests: tdeutils-trinity-doc-html (>= ${Source-Version}) Description: general purpose utilities from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -61,7 +61,7 @@ Section: utils Architecture: any Replaces: kdeutils-trinity-dev (<< 4:14.0.0) Breaks: kdeutils-trinity-dev (<< 4:14.0.0) -Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), kdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev +Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), tdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev Description: development files for the Trinity utilities module This package contains development files needed to compile tdeutils applications. @@ -124,7 +124,7 @@ Description: character selector for Trinity This package is part of Trinity, as a component of the KDE utilities module. See the 'kde-trinity' and 'tdeutils-trinity' packages for more information. -Package: kdelirc-trinity +Package: tdelirc-trinity Section: utils Architecture: any Replaces: kdelirc-trinity (<< 4:14.0.0) @@ -140,8 +140,8 @@ Description: infrared control for Trinity Package: tdessh-trinity Section: tde Architecture: any -Replaces: tdessh-trinity (<< 4:14.0.0) -Breaks: tdessh-trinity (<< 4:14.0.0) +Replaces: kdessh-trinity (<< 4:14.0.0) +Breaks: kdessh-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, openssh-client | ssh-client Description: ssh frontend for Trinity This package contains KDE's frontend for ssh. diff --git a/debian/squeeze/tdeutils/debian/kdelirc-trinity.lintian b/debian/squeeze/tdeutils/debian/kdelirc-trinity.lintian deleted file mode 100644 index 986b7f7d4..000000000 --- a/debian/squeeze/tdeutils/debian/kdelirc-trinity.lintian +++ /dev/null @@ -1,3 +0,0 @@ -kdelirc: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so -kdelirc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so -kdelirc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so diff --git a/debian/squeeze/tdeutils/debian/kdelirc-trinity.install b/debian/squeeze/tdeutils/debian/tdelirc-trinity.install similarity index 100% rename from debian/squeeze/tdeutils/debian/kdelirc-trinity.install rename to debian/squeeze/tdeutils/debian/tdelirc-trinity.install diff --git a/debian/squeeze/tdeutils/debian/tdelirc-trinity.lintian b/debian/squeeze/tdeutils/debian/tdelirc-trinity.lintian new file mode 100644 index 000000000..0c89583f3 --- /dev/null +++ b/debian/squeeze/tdeutils/debian/tdelirc-trinity.lintian @@ -0,0 +1,3 @@ +tdelirc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so +tdelirc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so +tdelirc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so diff --git a/debian/squeeze/tdeutils/debian/kdessh-trinity.install b/debian/squeeze/tdeutils/debian/tdessh-trinity.install similarity index 100% rename from debian/squeeze/tdeutils/debian/kdessh-trinity.install rename to debian/squeeze/tdeutils/debian/tdessh-trinity.install diff --git a/debian/wheezy/tdeaccessibility/debian/control b/debian/wheezy/tdeaccessibility/debian/control index bc2ab50d2..fef62b6bc 100644 --- a/debian/wheezy/tdeaccessibility/debian/control +++ b/debian/wheezy/tdeaccessibility/debian/control @@ -13,7 +13,7 @@ Architecture: all Replaces: kdeaccessibility-trinity (<< 4:14.0.0) Breaks: kdeaccessibility-trinity (<< 4:14.0.0) Depends: kmag-trinity (>= ${Source-Version}), kmousetool-trinity (>= ${Source-Version}), kmouth-trinity (>= ${Source-Version}), kbstate-trinity (>= ${Source-Version}), ksayit-trinity (>= ${Source-Version}), kttsd-trinity (>= ${Source-Version}) -Recommends: kde-icons-mono-trinity (>= ${Source-Version}) +Recommends: tde-icons-mono-trinity (>= ${Source-Version}) Suggests: kttsd-contrib-plugins-trinity (>= ${Source-Version}), tdeaccessibility-trinity-doc-html (>= ${Source-Version}) Description: accessibility packages from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -46,7 +46,7 @@ Description: KDE accessibility documentation in HTML format This package is part of Trinity, and a component of the KDE accessibility module. See the 'kde-trinity' and 'tdeaccessibility-trinity' packages for more information. -Package: kde-icons-mono-trinity +Package: tde-icons-mono-trinity Section: tde Architecture: all Replaces: kde-icons-mono-trinity (<< 4:14.0.0) diff --git a/debian/wheezy/tdeaccessibility/debian/kde-icons-mono-trinity.install b/debian/wheezy/tdeaccessibility/debian/tde-icons-mono-trinity.install similarity index 100% rename from debian/wheezy/tdeaccessibility/debian/kde-icons-mono-trinity.install rename to debian/wheezy/tdeaccessibility/debian/tde-icons-mono-trinity.install diff --git a/debian/wheezy/tdeartwork/debian/control b/debian/wheezy/tdeartwork/debian/control index 56a6ec0d3..7ac1920c6 100644 --- a/debian/wheezy/tdeartwork/debian/control +++ b/debian/wheezy/tdeartwork/debian/control @@ -13,7 +13,7 @@ Architecture: all Section: tde Replaces: kdeartwork-trinity (<< 4:14.0.0) Breaks: kdeartwork-trinity (<< 4:14.0.0) -Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), kdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version}) +Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), tdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version}) Recommends: tdescreensaver-xsavers-trinity Description: themes, styles and more from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -98,7 +98,7 @@ Description: window decoration themes released with Trinity This package is part of Trinity, and a component of the KDE artwork module. See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information. -Package: kdewallpapers-trinity +Package: tdewallpapers-trinity Architecture: all Section: tde Replaces: kdewallpapers-trinity (<< 4:14.0.0) diff --git a/debian/wheezy/tdeartwork/debian/kdewallpapers-trinity.install b/debian/wheezy/tdeartwork/debian/tdewallpapers-trinity.install similarity index 100% rename from debian/wheezy/tdeartwork/debian/kdewallpapers-trinity.install rename to debian/wheezy/tdeartwork/debian/tdewallpapers-trinity.install diff --git a/debian/wheezy/tdeutils/debian/control b/debian/wheezy/tdeutils/debian/control index 56d984a2a..43aff85f0 100644 --- a/debian/wheezy/tdeutils/debian/control +++ b/debian/wheezy/tdeutils/debian/control @@ -13,7 +13,7 @@ Section: tde Architecture: all Replaces: kdeutils-trinity (<< 4:14.0.0) Breaks: kdeutils-trinity (<< 4:14.0.0) -Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), kdelirc-trinity (>= ${Source-Version}), tdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version}) +Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), tdelirc-trinity (>= ${Source-Version}), tdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version}) Suggests: tdeutils-trinity-doc-html (>= ${Source-Version}) Description: general purpose utilities from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -61,7 +61,7 @@ Section: utils Architecture: any Replaces: kdeutils-trinity-dev (<< 4:14.0.0) Breaks: kdeutils-trinity-dev (<< 4:14.0.0) -Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), kdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev +Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), tdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev Description: development files for the Trinity utilities module This package contains development files needed to compile tdeutils applications. @@ -124,7 +124,7 @@ Description: character selector for Trinity This package is part of Trinity, as a component of the KDE utilities module. See the 'kde-trinity' and 'tdeutils-trinity' packages for more information. -Package: kdelirc-trinity +Package: tdelirc-trinity Section: utils Architecture: any Replaces: kdelirc-trinity (<< 4:14.0.0) @@ -140,8 +140,8 @@ Description: infrared control for Trinity Package: tdessh-trinity Section: tde Architecture: any -Replaces: tdessh-trinity (<< 4:14.0.0) -Breaks: tdessh-trinity (<< 4:14.0.0) +Replaces: kdessh-trinity (<< 4:14.0.0) +Breaks: kdessh-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, openssh-client | ssh-client Description: ssh frontend for Trinity This package contains KDE's frontend for ssh. diff --git a/debian/wheezy/tdeutils/debian/kdelirc-trinity.lintian b/debian/wheezy/tdeutils/debian/kdelirc-trinity.lintian deleted file mode 100644 index 986b7f7d4..000000000 --- a/debian/wheezy/tdeutils/debian/kdelirc-trinity.lintian +++ /dev/null @@ -1,3 +0,0 @@ -kdelirc: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so -kdelirc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so -kdelirc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so diff --git a/debian/wheezy/tdeutils/debian/kdelirc-trinity.install b/debian/wheezy/tdeutils/debian/tdelirc-trinity.install similarity index 100% rename from debian/wheezy/tdeutils/debian/kdelirc-trinity.install rename to debian/wheezy/tdeutils/debian/tdelirc-trinity.install diff --git a/debian/wheezy/tdeutils/debian/tdelirc-trinity.lintian b/debian/wheezy/tdeutils/debian/tdelirc-trinity.lintian new file mode 100644 index 000000000..0c89583f3 --- /dev/null +++ b/debian/wheezy/tdeutils/debian/tdelirc-trinity.lintian @@ -0,0 +1,3 @@ +tdelirc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so +tdelirc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so +tdelirc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so diff --git a/debian/wheezy/tdeutils/debian/kdessh-trinity.install b/debian/wheezy/tdeutils/debian/tdessh-trinity.install similarity index 100% rename from debian/wheezy/tdeutils/debian/kdessh-trinity.install rename to debian/wheezy/tdeutils/debian/tdessh-trinity.install diff --git a/ubuntu/maverick/metapackages/trinity-livecd/debian/control b/ubuntu/maverick/metapackages/trinity-livecd/debian/control index a6e95b5b5..6adca2f1e 100644 --- a/ubuntu/maverick/metapackages/trinity-livecd/debian/control +++ b/ubuntu/maverick/metapackages/trinity-livecd/debian/control @@ -7,7 +7,7 @@ Build-Depends: cdbs, debhelper (>= 5) Package: trinity-livecd Architecture: all -Depends: akregator-trinity, amarok-trinity, ark-trinity, basket-trinity, eyesapplet-trinity, juk-trinity, k3b-trinity, kaffeine-trinity, karm-trinity, kbstate-trinity, kcalc-trinity, kcharselect-trinity, tdeaddons-tdefile-plugins-trinity, tdeadmin-tdefile-plugins-trinity, tdegames-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdenetwork-tdefile-plugins-trinity, tdepim-tdefile-plugins-trinity, tdesdk-tdefile-plugins-trinity, tdessh-trinity, tdesudo-trinity, kdewallpapers-trinity, kdf-trinity, kedit-trinity, kfloppy-trinity, kget-trinity, kgpg-trinity, kicker-applets-trinity, kleopatra-trinity, kmailcvt-trinity, kmix-trinity, kmoon-trinity, kompare-trinity, kontact-trinity, konversation-trinity, kopete-trinity, korn-trinity, kpdf-trinity, kpowersave-nohal-trinity | kpowersave-trinity, kppp-trinity, krdc-trinity, tdescreensaver-trinity, ksmserver-trinity, ksnapshot-trinity, kteatime-trinity, ktnef-trinity, ktorrent-trinity, kuickshow-trinity, tdewalletmanager-trinity, kweather-trinity, kworldclock-trinity, libarts1-akode-trinity, sudo-trinity, superkaramba-trinity, trinity-keyring +Depends: akregator-trinity, amarok-trinity, ark-trinity, basket-trinity, eyesapplet-trinity, juk-trinity, k3b-trinity, kaffeine-trinity, karm-trinity, kbstate-trinity, kcalc-trinity, kcharselect-trinity, tdeaddons-tdefile-plugins-trinity, tdeadmin-tdefile-plugins-trinity, tdegames-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdenetwork-tdefile-plugins-trinity, tdepim-tdefile-plugins-trinity, tdesdk-tdefile-plugins-trinity, tdessh-trinity, tdesudo-trinity, tdewallpapers-trinity, kdf-trinity, kedit-trinity, kfloppy-trinity, kget-trinity, kgpg-trinity, kicker-applets-trinity, kleopatra-trinity, kmailcvt-trinity, kmix-trinity, kmoon-trinity, kompare-trinity, kontact-trinity, konversation-trinity, kopete-trinity, korn-trinity, kpdf-trinity, kpowersave-nohal-trinity | kpowersave-trinity, kppp-trinity, krdc-trinity, tdescreensaver-trinity, ksmserver-trinity, ksnapshot-trinity, kteatime-trinity, ktnef-trinity, ktorrent-trinity, kuickshow-trinity, tdewalletmanager-trinity, kweather-trinity, kworldclock-trinity, libarts1-akode-trinity, sudo-trinity, superkaramba-trinity, trinity-keyring Recommends: kpresenter-trinity, kspread-trinity, kword-trinity, tde-i18n-cs-trinity, tde-i18n-de-trinity, tde-i18n-es-trinity, tde-i18n-fr-trinity, tde-i18n-it-trinity, tde-i18n-ru-trinity, diff --git a/ubuntu/maverick/tdeaccessibility/debian/control b/ubuntu/maverick/tdeaccessibility/debian/control index 3d7149dd4..efaba8305 100644 --- a/ubuntu/maverick/tdeaccessibility/debian/control +++ b/ubuntu/maverick/tdeaccessibility/debian/control @@ -13,7 +13,7 @@ Architecture: all Replaces: kdeaccessibility-kde3 (<< 4:14.0.0), kdeaccessibility-trinity (<< 4:14.0.0) Breaks: kdeaccessibility-kde3 (<< 4:14.0.0), kdeaccessibility-trinity (<< 4:14.0.0) Depends: kmag-trinity (>= ${Source-Version}), kmousetool-trinity (>= ${Source-Version}), kmouth-trinity (>= ${Source-Version}), kbstate-trinity (>= ${Source-Version}), ksayit-trinity (>= ${Source-Version}), kttsd-trinity (>= ${Source-Version}) -Recommends: kde-icons-mono-trinity (>= ${Source-Version}) +Recommends: tde-icons-mono-trinity (>= ${Source-Version}) Suggests: kttsd-contrib-plugins-trinity (>= ${Source-Version}), tdeaccessibility-trinity-doc-html (>= ${Source-Version}) Description: accessibility packages from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -46,7 +46,7 @@ Description: KDE accessibility documentation in HTML format This package is part of Trinity, and a component of the KDE accessibility module. See the 'kde-trinity' and 'tdeaccessibility-trinity' packages for more information. -Package: kde-icons-mono-trinity +Package: tde-icons-mono-trinity Section: tde Architecture: all Replaces: kde-icons-mono-kde3 (<< 4:14.0.0), kde-icons-mono-trinity (<< 4:14.0.0) diff --git a/ubuntu/maverick/tdeaccessibility/debian/kde-icons-mono-trinity.install b/ubuntu/maverick/tdeaccessibility/debian/tde-icons-mono-trinity.install similarity index 100% rename from ubuntu/maverick/tdeaccessibility/debian/kde-icons-mono-trinity.install rename to ubuntu/maverick/tdeaccessibility/debian/tde-icons-mono-trinity.install diff --git a/ubuntu/maverick/tdeartwork/debian/control b/ubuntu/maverick/tdeartwork/debian/control index 09df752cf..ca1cdd6d6 100644 --- a/ubuntu/maverick/tdeartwork/debian/control +++ b/ubuntu/maverick/tdeartwork/debian/control @@ -13,7 +13,7 @@ Architecture: all Section: tde Replaces: kdeartwork-kde3 (<< 4:14.0.0), kdeartwork-trinity (<< 4:14.0.0) Breaks: kdeartwork-kde3 (<< 4:14.0.0), kdeartwork-trinity (<< 4:14.0.0) -Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), kdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version}) +Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), tdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version}) Recommends: tdescreensaver-xsavers-trinity Description: themes, styles and more from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -98,7 +98,7 @@ Description: window decoration themes released with Trinity This package is part of Trinity, and a component of the KDE artwork module. See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information. -Package: kdewallpapers-trinity +Package: tdewallpapers-trinity Architecture: all Section: tde Replaces: kdewallpapers-kde3 (<< 4:14.0.0), kdewallpapers-trinity (<< 4:14.0.0) diff --git a/ubuntu/maverick/tdeartwork/debian/kdewallpapers-trinity.install b/ubuntu/maverick/tdeartwork/debian/tdewallpapers-trinity.install similarity index 100% rename from ubuntu/maverick/tdeartwork/debian/kdewallpapers-trinity.install rename to ubuntu/maverick/tdeartwork/debian/tdewallpapers-trinity.install diff --git a/ubuntu/maverick/tdeutils/debian/control b/ubuntu/maverick/tdeutils/debian/control index d0556e97b..599a692dd 100644 --- a/ubuntu/maverick/tdeutils/debian/control +++ b/ubuntu/maverick/tdeutils/debian/control @@ -13,7 +13,7 @@ Section: tde Architecture: all Replaces: kdeutils-kde3 (<< 4:14.0.0), kdeutils-trinity (<< 4:14.0.0) Breaks: kdeutils-kde3 (<< 4:14.0.0), kdeutils-trinity (<< 4:14.0.0) -Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), kdelirc-trinity (>= ${Source-Version}), tdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version}) +Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), tdelirc-trinity (>= ${Source-Version}), tdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version}) Suggests: tdeutils-trinity-doc-html (>= ${Source-Version}) Description: general purpose utilities from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -61,7 +61,7 @@ Section: utils Architecture: any Replaces: kdeutils-kde3-dev (<< 4:14.0.0), kdeutils-trinity-dev (<< 4:14.0.0) Breaks: kdeutils-kde3-dev (<< 4:14.0.0), kdeutils-trinity-dev (<< 4:14.0.0) -Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), kdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev +Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), tdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev Description: development files for the Trinity utilities module This package contains development files needed to compile tdeutils applications. @@ -124,7 +124,7 @@ Description: character selector for Trinity This package is part of Trinity, as a component of the KDE utilities module. See the 'kde-trinity' and 'tdeutils-trinity' packages for more information. -Package: kdelirc-trinity +Package: tdelirc-trinity Section: utils Architecture: any Replaces: kdelirc-kde3 (<< 4:14.0.0), kdelirc-trinity (<< 4:14.0.0) @@ -140,8 +140,8 @@ Description: infrared control for Trinity Package: tdessh-trinity Section: tde Architecture: any -Replaces: tdessh-kde3 (<< 4:14.0.0), tdessh-trinity (<< 4:14.0.0) -Breaks: tdessh-kde3 (<< 4:14.0.0), tdessh-trinity (<< 4:14.0.0) +Replaces: kdessh-kde3 (<< 4:14.0.0), kdessh-trinity (<< 4:14.0.0) +Breaks: kdessh-kde3 (<< 4:14.0.0), kdessh-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, openssh-client | ssh-client Description: ssh frontend for Trinity This package contains KDE's frontend for ssh. diff --git a/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.lintian b/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.lintian deleted file mode 100644 index 986b7f7d4..000000000 --- a/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.lintian +++ /dev/null @@ -1,3 +0,0 @@ -kdelirc: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so -kdelirc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so -kdelirc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so diff --git a/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.install b/ubuntu/maverick/tdeutils/debian/tdelirc-trinity.install similarity index 100% rename from ubuntu/maverick/tdeutils/debian/kdelirc-trinity.install rename to ubuntu/maverick/tdeutils/debian/tdelirc-trinity.install diff --git a/ubuntu/maverick/tdeutils/debian/tdelirc-trinity.lintian b/ubuntu/maverick/tdeutils/debian/tdelirc-trinity.lintian new file mode 100644 index 000000000..0c89583f3 --- /dev/null +++ b/ubuntu/maverick/tdeutils/debian/tdelirc-trinity.lintian @@ -0,0 +1,3 @@ +tdelirc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so +tdelirc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so +tdelirc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so diff --git a/ubuntu/maverick/tdeutils/debian/kdessh-trinity.install b/ubuntu/maverick/tdeutils/debian/tdessh-trinity.install similarity index 100% rename from ubuntu/maverick/tdeutils/debian/kdessh-trinity.install rename to ubuntu/maverick/tdeutils/debian/tdessh-trinity.install diff --git a/ubuntu/precise/metapackages/trinity-livecd/debian/control b/ubuntu/precise/metapackages/trinity-livecd/debian/control index a6e95b5b5..6adca2f1e 100644 --- a/ubuntu/precise/metapackages/trinity-livecd/debian/control +++ b/ubuntu/precise/metapackages/trinity-livecd/debian/control @@ -7,7 +7,7 @@ Build-Depends: cdbs, debhelper (>= 5) Package: trinity-livecd Architecture: all -Depends: akregator-trinity, amarok-trinity, ark-trinity, basket-trinity, eyesapplet-trinity, juk-trinity, k3b-trinity, kaffeine-trinity, karm-trinity, kbstate-trinity, kcalc-trinity, kcharselect-trinity, tdeaddons-tdefile-plugins-trinity, tdeadmin-tdefile-plugins-trinity, tdegames-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdenetwork-tdefile-plugins-trinity, tdepim-tdefile-plugins-trinity, tdesdk-tdefile-plugins-trinity, tdessh-trinity, tdesudo-trinity, kdewallpapers-trinity, kdf-trinity, kedit-trinity, kfloppy-trinity, kget-trinity, kgpg-trinity, kicker-applets-trinity, kleopatra-trinity, kmailcvt-trinity, kmix-trinity, kmoon-trinity, kompare-trinity, kontact-trinity, konversation-trinity, kopete-trinity, korn-trinity, kpdf-trinity, kpowersave-nohal-trinity | kpowersave-trinity, kppp-trinity, krdc-trinity, tdescreensaver-trinity, ksmserver-trinity, ksnapshot-trinity, kteatime-trinity, ktnef-trinity, ktorrent-trinity, kuickshow-trinity, tdewalletmanager-trinity, kweather-trinity, kworldclock-trinity, libarts1-akode-trinity, sudo-trinity, superkaramba-trinity, trinity-keyring +Depends: akregator-trinity, amarok-trinity, ark-trinity, basket-trinity, eyesapplet-trinity, juk-trinity, k3b-trinity, kaffeine-trinity, karm-trinity, kbstate-trinity, kcalc-trinity, kcharselect-trinity, tdeaddons-tdefile-plugins-trinity, tdeadmin-tdefile-plugins-trinity, tdegames-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdenetwork-tdefile-plugins-trinity, tdepim-tdefile-plugins-trinity, tdesdk-tdefile-plugins-trinity, tdessh-trinity, tdesudo-trinity, tdewallpapers-trinity, kdf-trinity, kedit-trinity, kfloppy-trinity, kget-trinity, kgpg-trinity, kicker-applets-trinity, kleopatra-trinity, kmailcvt-trinity, kmix-trinity, kmoon-trinity, kompare-trinity, kontact-trinity, konversation-trinity, kopete-trinity, korn-trinity, kpdf-trinity, kpowersave-nohal-trinity | kpowersave-trinity, kppp-trinity, krdc-trinity, tdescreensaver-trinity, ksmserver-trinity, ksnapshot-trinity, kteatime-trinity, ktnef-trinity, ktorrent-trinity, kuickshow-trinity, tdewalletmanager-trinity, kweather-trinity, kworldclock-trinity, libarts1-akode-trinity, sudo-trinity, superkaramba-trinity, trinity-keyring Recommends: kpresenter-trinity, kspread-trinity, kword-trinity, tde-i18n-cs-trinity, tde-i18n-de-trinity, tde-i18n-es-trinity, tde-i18n-fr-trinity, tde-i18n-it-trinity, tde-i18n-ru-trinity, diff --git a/ubuntu/precise/tdeaccessibility/debian/control b/ubuntu/precise/tdeaccessibility/debian/control index 3d7149dd4..efaba8305 100644 --- a/ubuntu/precise/tdeaccessibility/debian/control +++ b/ubuntu/precise/tdeaccessibility/debian/control @@ -13,7 +13,7 @@ Architecture: all Replaces: kdeaccessibility-kde3 (<< 4:14.0.0), kdeaccessibility-trinity (<< 4:14.0.0) Breaks: kdeaccessibility-kde3 (<< 4:14.0.0), kdeaccessibility-trinity (<< 4:14.0.0) Depends: kmag-trinity (>= ${Source-Version}), kmousetool-trinity (>= ${Source-Version}), kmouth-trinity (>= ${Source-Version}), kbstate-trinity (>= ${Source-Version}), ksayit-trinity (>= ${Source-Version}), kttsd-trinity (>= ${Source-Version}) -Recommends: kde-icons-mono-trinity (>= ${Source-Version}) +Recommends: tde-icons-mono-trinity (>= ${Source-Version}) Suggests: kttsd-contrib-plugins-trinity (>= ${Source-Version}), tdeaccessibility-trinity-doc-html (>= ${Source-Version}) Description: accessibility packages from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -46,7 +46,7 @@ Description: KDE accessibility documentation in HTML format This package is part of Trinity, and a component of the KDE accessibility module. See the 'kde-trinity' and 'tdeaccessibility-trinity' packages for more information. -Package: kde-icons-mono-trinity +Package: tde-icons-mono-trinity Section: tde Architecture: all Replaces: kde-icons-mono-kde3 (<< 4:14.0.0), kde-icons-mono-trinity (<< 4:14.0.0) diff --git a/ubuntu/precise/tdeaccessibility/debian/kde-icons-mono-trinity.install b/ubuntu/precise/tdeaccessibility/debian/tde-icons-mono-trinity.install similarity index 100% rename from ubuntu/precise/tdeaccessibility/debian/kde-icons-mono-trinity.install rename to ubuntu/precise/tdeaccessibility/debian/tde-icons-mono-trinity.install diff --git a/ubuntu/precise/tdeartwork/debian/control b/ubuntu/precise/tdeartwork/debian/control index 09df752cf..ca1cdd6d6 100644 --- a/ubuntu/precise/tdeartwork/debian/control +++ b/ubuntu/precise/tdeartwork/debian/control @@ -13,7 +13,7 @@ Architecture: all Section: tde Replaces: kdeartwork-kde3 (<< 4:14.0.0), kdeartwork-trinity (<< 4:14.0.0) Breaks: kdeartwork-kde3 (<< 4:14.0.0), kdeartwork-trinity (<< 4:14.0.0) -Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), kdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version}) +Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), tdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version}) Recommends: tdescreensaver-xsavers-trinity Description: themes, styles and more from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -98,7 +98,7 @@ Description: window decoration themes released with Trinity This package is part of Trinity, and a component of the KDE artwork module. See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information. -Package: kdewallpapers-trinity +Package: tdewallpapers-trinity Architecture: all Section: tde Replaces: kdewallpapers-kde3 (<< 4:14.0.0), kdewallpapers-trinity (<< 4:14.0.0) diff --git a/ubuntu/precise/tdeartwork/debian/kdewallpapers-trinity.install b/ubuntu/precise/tdeartwork/debian/tdewallpapers-trinity.install similarity index 100% rename from ubuntu/precise/tdeartwork/debian/kdewallpapers-trinity.install rename to ubuntu/precise/tdeartwork/debian/tdewallpapers-trinity.install diff --git a/ubuntu/precise/tdeutils/debian/control b/ubuntu/precise/tdeutils/debian/control index d0556e97b..599a692dd 100644 --- a/ubuntu/precise/tdeutils/debian/control +++ b/ubuntu/precise/tdeutils/debian/control @@ -13,7 +13,7 @@ Section: tde Architecture: all Replaces: kdeutils-kde3 (<< 4:14.0.0), kdeutils-trinity (<< 4:14.0.0) Breaks: kdeutils-kde3 (<< 4:14.0.0), kdeutils-trinity (<< 4:14.0.0) -Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), kdelirc-trinity (>= ${Source-Version}), tdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version}) +Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), tdelirc-trinity (>= ${Source-Version}), tdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version}) Suggests: tdeutils-trinity-doc-html (>= ${Source-Version}) Description: general purpose utilities from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -61,7 +61,7 @@ Section: utils Architecture: any Replaces: kdeutils-kde3-dev (<< 4:14.0.0), kdeutils-trinity-dev (<< 4:14.0.0) Breaks: kdeutils-kde3-dev (<< 4:14.0.0), kdeutils-trinity-dev (<< 4:14.0.0) -Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), kdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev +Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), tdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev Description: development files for the Trinity utilities module This package contains development files needed to compile tdeutils applications. @@ -124,7 +124,7 @@ Description: character selector for Trinity This package is part of Trinity, as a component of the KDE utilities module. See the 'kde-trinity' and 'tdeutils-trinity' packages for more information. -Package: kdelirc-trinity +Package: tdelirc-trinity Section: utils Architecture: any Replaces: kdelirc-kde3 (<< 4:14.0.0), kdelirc-trinity (<< 4:14.0.0) @@ -140,8 +140,8 @@ Description: infrared control for Trinity Package: tdessh-trinity Section: tde Architecture: any -Replaces: tdessh-kde3 (<< 4:14.0.0), tdessh-trinity (<< 4:14.0.0) -Breaks: tdessh-kde3 (<< 4:14.0.0), tdessh-trinity (<< 4:14.0.0) +Replaces: kdessh-kde3 (<< 4:14.0.0), kdessh-trinity (<< 4:14.0.0) +Breaks: kdessh-kde3 (<< 4:14.0.0), kdessh-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, openssh-client | ssh-client Description: ssh frontend for Trinity This package contains KDE's frontend for ssh. diff --git a/ubuntu/precise/tdeutils/debian/kdelirc-trinity.lintian b/ubuntu/precise/tdeutils/debian/kdelirc-trinity.lintian deleted file mode 100644 index 986b7f7d4..000000000 --- a/ubuntu/precise/tdeutils/debian/kdelirc-trinity.lintian +++ /dev/null @@ -1,3 +0,0 @@ -kdelirc: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so -kdelirc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so -kdelirc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so diff --git a/ubuntu/precise/tdeutils/debian/kdelirc-trinity.install b/ubuntu/precise/tdeutils/debian/tdelirc-trinity.install similarity index 100% rename from ubuntu/precise/tdeutils/debian/kdelirc-trinity.install rename to ubuntu/precise/tdeutils/debian/tdelirc-trinity.install diff --git a/ubuntu/precise/tdeutils/debian/tdelirc-trinity.lintian b/ubuntu/precise/tdeutils/debian/tdelirc-trinity.lintian new file mode 100644 index 000000000..0c89583f3 --- /dev/null +++ b/ubuntu/precise/tdeutils/debian/tdelirc-trinity.lintian @@ -0,0 +1,3 @@ +tdelirc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so +tdelirc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so +tdelirc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so diff --git a/ubuntu/precise/tdeutils/debian/kdessh-trinity.install b/ubuntu/precise/tdeutils/debian/tdessh-trinity.install similarity index 100% rename from ubuntu/precise/tdeutils/debian/kdessh-trinity.install rename to ubuntu/precise/tdeutils/debian/tdessh-trinity.install diff --git a/ubuntu/raring/metapackages/trinity-livecd/debian/control b/ubuntu/raring/metapackages/trinity-livecd/debian/control index a6e95b5b5..6adca2f1e 100644 --- a/ubuntu/raring/metapackages/trinity-livecd/debian/control +++ b/ubuntu/raring/metapackages/trinity-livecd/debian/control @@ -7,7 +7,7 @@ Build-Depends: cdbs, debhelper (>= 5) Package: trinity-livecd Architecture: all -Depends: akregator-trinity, amarok-trinity, ark-trinity, basket-trinity, eyesapplet-trinity, juk-trinity, k3b-trinity, kaffeine-trinity, karm-trinity, kbstate-trinity, kcalc-trinity, kcharselect-trinity, tdeaddons-tdefile-plugins-trinity, tdeadmin-tdefile-plugins-trinity, tdegames-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdenetwork-tdefile-plugins-trinity, tdepim-tdefile-plugins-trinity, tdesdk-tdefile-plugins-trinity, tdessh-trinity, tdesudo-trinity, kdewallpapers-trinity, kdf-trinity, kedit-trinity, kfloppy-trinity, kget-trinity, kgpg-trinity, kicker-applets-trinity, kleopatra-trinity, kmailcvt-trinity, kmix-trinity, kmoon-trinity, kompare-trinity, kontact-trinity, konversation-trinity, kopete-trinity, korn-trinity, kpdf-trinity, kpowersave-nohal-trinity | kpowersave-trinity, kppp-trinity, krdc-trinity, tdescreensaver-trinity, ksmserver-trinity, ksnapshot-trinity, kteatime-trinity, ktnef-trinity, ktorrent-trinity, kuickshow-trinity, tdewalletmanager-trinity, kweather-trinity, kworldclock-trinity, libarts1-akode-trinity, sudo-trinity, superkaramba-trinity, trinity-keyring +Depends: akregator-trinity, amarok-trinity, ark-trinity, basket-trinity, eyesapplet-trinity, juk-trinity, k3b-trinity, kaffeine-trinity, karm-trinity, kbstate-trinity, kcalc-trinity, kcharselect-trinity, tdeaddons-tdefile-plugins-trinity, tdeadmin-tdefile-plugins-trinity, tdegames-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdenetwork-tdefile-plugins-trinity, tdepim-tdefile-plugins-trinity, tdesdk-tdefile-plugins-trinity, tdessh-trinity, tdesudo-trinity, tdewallpapers-trinity, kdf-trinity, kedit-trinity, kfloppy-trinity, kget-trinity, kgpg-trinity, kicker-applets-trinity, kleopatra-trinity, kmailcvt-trinity, kmix-trinity, kmoon-trinity, kompare-trinity, kontact-trinity, konversation-trinity, kopete-trinity, korn-trinity, kpdf-trinity, kpowersave-nohal-trinity | kpowersave-trinity, kppp-trinity, krdc-trinity, tdescreensaver-trinity, ksmserver-trinity, ksnapshot-trinity, kteatime-trinity, ktnef-trinity, ktorrent-trinity, kuickshow-trinity, tdewalletmanager-trinity, kweather-trinity, kworldclock-trinity, libarts1-akode-trinity, sudo-trinity, superkaramba-trinity, trinity-keyring Recommends: kpresenter-trinity, kspread-trinity, kword-trinity, tde-i18n-cs-trinity, tde-i18n-de-trinity, tde-i18n-es-trinity, tde-i18n-fr-trinity, tde-i18n-it-trinity, tde-i18n-ru-trinity, diff --git a/ubuntu/raring/tdeaccessibility/debian/control b/ubuntu/raring/tdeaccessibility/debian/control index 3d7149dd4..efaba8305 100644 --- a/ubuntu/raring/tdeaccessibility/debian/control +++ b/ubuntu/raring/tdeaccessibility/debian/control @@ -13,7 +13,7 @@ Architecture: all Replaces: kdeaccessibility-kde3 (<< 4:14.0.0), kdeaccessibility-trinity (<< 4:14.0.0) Breaks: kdeaccessibility-kde3 (<< 4:14.0.0), kdeaccessibility-trinity (<< 4:14.0.0) Depends: kmag-trinity (>= ${Source-Version}), kmousetool-trinity (>= ${Source-Version}), kmouth-trinity (>= ${Source-Version}), kbstate-trinity (>= ${Source-Version}), ksayit-trinity (>= ${Source-Version}), kttsd-trinity (>= ${Source-Version}) -Recommends: kde-icons-mono-trinity (>= ${Source-Version}) +Recommends: tde-icons-mono-trinity (>= ${Source-Version}) Suggests: kttsd-contrib-plugins-trinity (>= ${Source-Version}), tdeaccessibility-trinity-doc-html (>= ${Source-Version}) Description: accessibility packages from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -46,7 +46,7 @@ Description: KDE accessibility documentation in HTML format This package is part of Trinity, and a component of the KDE accessibility module. See the 'kde-trinity' and 'tdeaccessibility-trinity' packages for more information. -Package: kde-icons-mono-trinity +Package: tde-icons-mono-trinity Section: tde Architecture: all Replaces: kde-icons-mono-kde3 (<< 4:14.0.0), kde-icons-mono-trinity (<< 4:14.0.0) diff --git a/ubuntu/raring/tdeaccessibility/debian/kde-icons-mono-trinity.install b/ubuntu/raring/tdeaccessibility/debian/tde-icons-mono-trinity.install similarity index 100% rename from ubuntu/raring/tdeaccessibility/debian/kde-icons-mono-trinity.install rename to ubuntu/raring/tdeaccessibility/debian/tde-icons-mono-trinity.install diff --git a/ubuntu/raring/tdeartwork/debian/control b/ubuntu/raring/tdeartwork/debian/control index 09df752cf..ca1cdd6d6 100644 --- a/ubuntu/raring/tdeartwork/debian/control +++ b/ubuntu/raring/tdeartwork/debian/control @@ -13,7 +13,7 @@ Architecture: all Section: tde Replaces: kdeartwork-kde3 (<< 4:14.0.0), kdeartwork-trinity (<< 4:14.0.0) Breaks: kdeartwork-kde3 (<< 4:14.0.0), kdeartwork-trinity (<< 4:14.0.0) -Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), kdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version}) +Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), tdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version}) Recommends: tdescreensaver-xsavers-trinity Description: themes, styles and more from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -98,7 +98,7 @@ Description: window decoration themes released with Trinity This package is part of Trinity, and a component of the KDE artwork module. See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information. -Package: kdewallpapers-trinity +Package: tdewallpapers-trinity Architecture: all Section: tde Replaces: kdewallpapers-kde3 (<< 4:14.0.0), kdewallpapers-trinity (<< 4:14.0.0) diff --git a/ubuntu/raring/tdeartwork/debian/kdewallpapers-trinity.install b/ubuntu/raring/tdeartwork/debian/tdewallpapers-trinity.install similarity index 100% rename from ubuntu/raring/tdeartwork/debian/kdewallpapers-trinity.install rename to ubuntu/raring/tdeartwork/debian/tdewallpapers-trinity.install diff --git a/ubuntu/raring/tdeutils/debian/control b/ubuntu/raring/tdeutils/debian/control index d0556e97b..599a692dd 100644 --- a/ubuntu/raring/tdeutils/debian/control +++ b/ubuntu/raring/tdeutils/debian/control @@ -13,7 +13,7 @@ Section: tde Architecture: all Replaces: kdeutils-kde3 (<< 4:14.0.0), kdeutils-trinity (<< 4:14.0.0) Breaks: kdeutils-kde3 (<< 4:14.0.0), kdeutils-trinity (<< 4:14.0.0) -Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), kdelirc-trinity (>= ${Source-Version}), tdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version}) +Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), tdelirc-trinity (>= ${Source-Version}), tdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version}) Suggests: tdeutils-trinity-doc-html (>= ${Source-Version}) Description: general purpose utilities from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -61,7 +61,7 @@ Section: utils Architecture: any Replaces: kdeutils-kde3-dev (<< 4:14.0.0), kdeutils-trinity-dev (<< 4:14.0.0) Breaks: kdeutils-kde3-dev (<< 4:14.0.0), kdeutils-trinity-dev (<< 4:14.0.0) -Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), kdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev +Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), tdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev Description: development files for the Trinity utilities module This package contains development files needed to compile tdeutils applications. @@ -124,7 +124,7 @@ Description: character selector for Trinity This package is part of Trinity, as a component of the KDE utilities module. See the 'kde-trinity' and 'tdeutils-trinity' packages for more information. -Package: kdelirc-trinity +Package: tdelirc-trinity Section: utils Architecture: any Replaces: kdelirc-kde3 (<< 4:14.0.0), kdelirc-trinity (<< 4:14.0.0) @@ -140,8 +140,8 @@ Description: infrared control for Trinity Package: tdessh-trinity Section: tde Architecture: any -Replaces: tdessh-kde3 (<< 4:14.0.0), tdessh-trinity (<< 4:14.0.0) -Breaks: tdessh-kde3 (<< 4:14.0.0), tdessh-trinity (<< 4:14.0.0) +Replaces: kdessh-kde3 (<< 4:14.0.0), kdessh-trinity (<< 4:14.0.0) +Breaks: kdessh-kde3 (<< 4:14.0.0), kdessh-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, openssh-client | ssh-client Description: ssh frontend for Trinity This package contains KDE's frontend for ssh. diff --git a/ubuntu/raring/tdeutils/debian/kdelirc-trinity.lintian b/ubuntu/raring/tdeutils/debian/kdelirc-trinity.lintian deleted file mode 100644 index 986b7f7d4..000000000 --- a/ubuntu/raring/tdeutils/debian/kdelirc-trinity.lintian +++ /dev/null @@ -1,3 +0,0 @@ -kdelirc: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so -kdelirc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so -kdelirc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so diff --git a/ubuntu/raring/tdeutils/debian/kdelirc-trinity.install b/ubuntu/raring/tdeutils/debian/tdelirc-trinity.install similarity index 100% rename from ubuntu/raring/tdeutils/debian/kdelirc-trinity.install rename to ubuntu/raring/tdeutils/debian/tdelirc-trinity.install diff --git a/ubuntu/raring/tdeutils/debian/tdelirc-trinity.lintian b/ubuntu/raring/tdeutils/debian/tdelirc-trinity.lintian new file mode 100644 index 000000000..0c89583f3 --- /dev/null +++ b/ubuntu/raring/tdeutils/debian/tdelirc-trinity.lintian @@ -0,0 +1,3 @@ +tdelirc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so +tdelirc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so +tdelirc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so diff --git a/ubuntu/raring/tdeutils/debian/kdessh-trinity.install b/ubuntu/raring/tdeutils/debian/tdessh-trinity.install similarity index 100% rename from ubuntu/raring/tdeutils/debian/kdessh-trinity.install rename to ubuntu/raring/tdeutils/debian/tdessh-trinity.install From 21544772c772f6ab17769c37d7dfce48a903688d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 18 Jul 2013 19:49:20 +0200 Subject: [PATCH 04/10] Second part of renaming kpowersave-nohal on Debian and Ubuntu --- .../applications/tdepowersave/debian/control | 4 +- .../applications/tdepowersave/debian/install | 2 +- .../debian/kpowersave-nohal-trinity.lintian | 5 - .../applications/tdepowersave/debian/manpages | 2 +- .../applications/tdepowersave/debian/menu | 8 +- .../applications/tdepowersave/debian/rules | 6 +- ...inity.linda => tdepowersave-trinity.linda} | 0 .../debian/tdepowersave-trinity.lintian | 5 + .../tdepowersave/debian/tdepowersave.1} | 22 +- .../tdepowersave/debian/tdepowersave.xpm} | 2 +- .../applications/tdepowersave/debian/watch | 2 - .../applications/tdepowersave/debian/control | 4 +- .../applications/tdepowersave/debian/install | 2 +- .../debian/kpowersave-nohal-trinity.lintian | 5 - .../applications/tdepowersave/debian/manpages | 2 +- .../applications/tdepowersave/debian/menu | 8 +- .../applications/tdepowersave/debian/rules | 6 +- ...inity.linda => tdepowersave-trinity.linda} | 0 .../debian/tdepowersave-trinity.lintian | 5 + .../tdepowersave/debian/tdepowersave.1} | 22 +- .../tdepowersave/debian/tdepowersave.xpm} | 2 +- .../applications/tdepowersave/debian/watch | 2 - .../applications/tdepowersave/debian/control | 4 +- .../applications/tdepowersave/debian/install | 2 +- .../debian/kpowersave-nohal-trinity.lintian | 5 - .../applications/tdepowersave/debian/manpages | 2 +- .../applications/tdepowersave/debian/menu | 8 +- .../applications/tdepowersave/debian/rules | 6 +- ...inity.linda => tdepowersave-trinity.linda} | 0 .../debian/tdepowersave-trinity.lintian | 5 + .../debian/{kpowersave.1 => tdepowersave.1} | 22 +- .../tdepowersave/debian/tdepowersave.xpm} | 2 +- .../applications/tdepowersave/debian/watch | 2 - .../applications/tdepowersave/debian/control | 4 +- .../applications/tdepowersave/debian/install | 2 +- .../debian/kpowersave-nohal-trinity.lintian | 5 - .../applications/tdepowersave/debian/manpages | 2 +- .../applications/tdepowersave/debian/menu | 8 +- .../applications/tdepowersave/debian/rules | 6 +- ...inity.linda => tdepowersave-trinity.linda} | 0 .../debian/tdepowersave-trinity.lintian | 5 + .../debian/{kpowersave.1 => tdepowersave.1} | 22 +- .../{kpowersave.xpm => tdepowersave.xpm} | 2 +- .../applications/tdepowersave/debian/watch | 2 - .../applications/tdepowersave/debian/control | 4 +- .../applications/tdepowersave/debian/install | 2 +- .../debian/kpowersave-nohal-trinity.lintian | 5 - .../tdepowersave/debian/kpowersave.1 | 148 ----- .../tdepowersave/debian/kpowersave.xpm | 628 ------------------ .../applications/tdepowersave/debian/manpages | 2 +- .../applications/tdepowersave/debian/menu | 8 +- .../applications/tdepowersave/debian/rules | 6 +- ...inity.linda => tdepowersave-trinity.linda} | 0 .../debian/tdepowersave-trinity.lintian | 5 + .../tdepowersave/debian/tdepowersave.1 | 148 +++++ .../tdepowersave/debian/tdepowersave.xpm | 628 ++++++++++++++++++ .../applications/tdepowersave/debian/watch | 2 - .../applications/tdepowersave/debian/control | 4 +- .../applications/tdepowersave/debian/install | 2 +- .../debian/kpowersave-nohal-trinity.lintian | 5 - .../tdepowersave/debian/kpowersave.1 | 148 ----- .../tdepowersave/debian/kpowersave.xpm | 628 ------------------ .../applications/tdepowersave/debian/manpages | 2 +- .../applications/tdepowersave/debian/menu | 8 +- .../applications/tdepowersave/debian/rules | 6 +- ...inity.linda => tdepowersave-trinity.linda} | 0 .../debian/tdepowersave-trinity.lintian | 5 + .../tdepowersave/debian/tdepowersave.1 | 148 +++++ .../tdepowersave/debian/tdepowersave.xpm | 628 ++++++++++++++++++ .../applications/tdepowersave/debian/watch | 2 - 70 files changed, 1696 insertions(+), 1708 deletions(-) delete mode 100644 debian/lenny/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian rename debian/lenny/applications/tdepowersave/debian/{kpowersave-nohal-trinity.linda => tdepowersave-trinity.linda} (100%) create mode 100644 debian/lenny/applications/tdepowersave/debian/tdepowersave-trinity.lintian rename debian/{squeeze/applications/tdepowersave/debian/kpowersave.1 => lenny/applications/tdepowersave/debian/tdepowersave.1} (88%) rename debian/{squeeze/applications/tdepowersave/debian/kpowersave.xpm => lenny/applications/tdepowersave/debian/tdepowersave.xpm} (99%) delete mode 100644 debian/lenny/applications/tdepowersave/debian/watch delete mode 100644 debian/squeeze/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian rename debian/squeeze/applications/tdepowersave/debian/{kpowersave-nohal-trinity.linda => tdepowersave-trinity.linda} (100%) create mode 100644 debian/squeeze/applications/tdepowersave/debian/tdepowersave-trinity.lintian rename debian/{lenny/applications/tdepowersave/debian/kpowersave.1 => squeeze/applications/tdepowersave/debian/tdepowersave.1} (88%) rename debian/{wheezy/applications/tdepowersave/debian/kpowersave.xpm => squeeze/applications/tdepowersave/debian/tdepowersave.xpm} (99%) delete mode 100644 debian/squeeze/applications/tdepowersave/debian/watch delete mode 100644 debian/wheezy/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian rename debian/wheezy/applications/tdepowersave/debian/{kpowersave-nohal-trinity.linda => tdepowersave-trinity.linda} (100%) create mode 100644 debian/wheezy/applications/tdepowersave/debian/tdepowersave-trinity.lintian rename debian/wheezy/applications/tdepowersave/debian/{kpowersave.1 => tdepowersave.1} (88%) rename debian/{lenny/applications/tdepowersave/debian/kpowersave.xpm => wheezy/applications/tdepowersave/debian/tdepowersave.xpm} (99%) delete mode 100644 debian/wheezy/applications/tdepowersave/debian/watch delete mode 100644 ubuntu/maverick/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian rename ubuntu/maverick/applications/tdepowersave/debian/{kpowersave-nohal-trinity.linda => tdepowersave-trinity.linda} (100%) create mode 100644 ubuntu/maverick/applications/tdepowersave/debian/tdepowersave-trinity.lintian rename ubuntu/maverick/applications/tdepowersave/debian/{kpowersave.1 => tdepowersave.1} (88%) rename ubuntu/maverick/applications/tdepowersave/debian/{kpowersave.xpm => tdepowersave.xpm} (99%) delete mode 100644 ubuntu/maverick/applications/tdepowersave/debian/watch delete mode 100644 ubuntu/precise/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian delete mode 100644 ubuntu/precise/applications/tdepowersave/debian/kpowersave.1 delete mode 100644 ubuntu/precise/applications/tdepowersave/debian/kpowersave.xpm rename ubuntu/precise/applications/tdepowersave/debian/{kpowersave-nohal-trinity.linda => tdepowersave-trinity.linda} (100%) create mode 100644 ubuntu/precise/applications/tdepowersave/debian/tdepowersave-trinity.lintian create mode 100644 ubuntu/precise/applications/tdepowersave/debian/tdepowersave.1 create mode 100644 ubuntu/precise/applications/tdepowersave/debian/tdepowersave.xpm delete mode 100644 ubuntu/precise/applications/tdepowersave/debian/watch delete mode 100644 ubuntu/raring/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian delete mode 100644 ubuntu/raring/applications/tdepowersave/debian/kpowersave.1 delete mode 100644 ubuntu/raring/applications/tdepowersave/debian/kpowersave.xpm rename ubuntu/raring/applications/tdepowersave/debian/{kpowersave-nohal-trinity.linda => tdepowersave-trinity.linda} (100%) create mode 100644 ubuntu/raring/applications/tdepowersave/debian/tdepowersave-trinity.lintian create mode 100644 ubuntu/raring/applications/tdepowersave/debian/tdepowersave.1 create mode 100644 ubuntu/raring/applications/tdepowersave/debian/tdepowersave.xpm delete mode 100644 ubuntu/raring/applications/tdepowersave/debian/watch diff --git a/debian/lenny/applications/tdepowersave/debian/control b/debian/lenny/applications/tdepowersave/debian/control index 3c3de5835..dcd5ab3f9 100644 --- a/debian/lenny/applications/tdepowersave/debian/control +++ b/debian/lenny/applications/tdepowersave/debian/control @@ -13,7 +13,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: kpowersave-trinity, kpowersave-nohal-trinity Description: Power management applet for Trinity - KPowersave is a TDE systray applet which allows to control the power + TDEPowersave is a TDE systray applet which allows to control the power management settings and policies of your computer. It relies on the TDE hardware library to do the heavy lifting. . @@ -33,7 +33,7 @@ Description: Power management applet for Trinity * KNotify support * online help * localisations for many languages - KPowersave supports schemes with following configurable specific + TDEPowersave supports schemes with following configurable specific settings for: * screensaver * DPMS diff --git a/debian/lenny/applications/tdepowersave/debian/install b/debian/lenny/applications/tdepowersave/debian/install index 4a1194bd1..8d2341734 100644 --- a/debian/lenny/applications/tdepowersave/debian/install +++ b/debian/lenny/applications/tdepowersave/debian/install @@ -1 +1 @@ -debian/kpowersave.xpm usr/share/pixmaps +debian/tdepowersave.xpm opt/trinity/share/pixmaps diff --git a/debian/lenny/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian b/debian/lenny/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian deleted file mode 100644 index edff50852..000000000 --- a/debian/lenny/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian +++ /dev/null @@ -1,5 +0,0 @@ -kpowersave: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so -kpowersave: package-name-doesnt-match-sonames libtdeinit-kpowersave -kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so -kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so - diff --git a/debian/lenny/applications/tdepowersave/debian/manpages b/debian/lenny/applications/tdepowersave/debian/manpages index c8fa7b85f..aff0f8470 100644 --- a/debian/lenny/applications/tdepowersave/debian/manpages +++ b/debian/lenny/applications/tdepowersave/debian/manpages @@ -1 +1 @@ -debian/kpowersave.1 +debian/tdepowersave.1 diff --git a/debian/lenny/applications/tdepowersave/debian/menu b/debian/lenny/applications/tdepowersave/debian/menu index 6ae0f9833..c2c6cc3d2 100644 --- a/debian/lenny/applications/tdepowersave/debian/menu +++ b/debian/lenny/applications/tdepowersave/debian/menu @@ -1,7 +1,7 @@ -?package(kpowersave):\ +?package(tdepowersave):\ needs="X11"\ section="Applications/System/Monitoring"\ - title="KPowersave"\ + title="TDEPowersave"\ longtitle="Battery monitor and general power management"\ - icon="/usr/share/pixmaps/kpowersave.xpm"\ - command="/opt/trinity/bin/kpowersave" + icon="/opt/trinity/share/pixmaps/tdepowersave.xpm"\ + command="/opt/trinity/bin/tdepowersave" diff --git a/debian/lenny/applications/tdepowersave/debian/rules b/debian/lenny/applications/tdepowersave/debian/rules index 97acebf07..485481ef7 100755 --- a/debian/lenny/applications/tdepowersave/debian/rules +++ b/debian/lenny/applications/tdepowersave/debian/rules @@ -29,9 +29,9 @@ debian/stamp-bootstrap: make -f admin/Makefile.common cvs touch debian/stamp-bootstrap -install/kpowersave:: - install -p -D -m644 debian/tdepowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave - install -p -D -m644 debian/tdepowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave +install/tdepowersave-trinity:: + install -p -D -m644 debian/tdepowersave-trinity.lintian debian/tdepowersave-trinity/usr/share/lintian/overrides/tdepowersave-trinity + install -p -D -m644 debian/tdepowersave-trinity.linda debian/tdepowersave-trinity/usr/share/linda/overrides/tdepowersave-trinity clean:: find . -name Makefile.in | xargs rm -f diff --git a/debian/lenny/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda b/debian/lenny/applications/tdepowersave/debian/tdepowersave-trinity.linda similarity index 100% rename from debian/lenny/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda rename to debian/lenny/applications/tdepowersave/debian/tdepowersave-trinity.linda diff --git a/debian/lenny/applications/tdepowersave/debian/tdepowersave-trinity.lintian b/debian/lenny/applications/tdepowersave/debian/tdepowersave-trinity.lintian new file mode 100644 index 000000000..e27c64261 --- /dev/null +++ b/debian/lenny/applications/tdepowersave/debian/tdepowersave-trinity.lintian @@ -0,0 +1,5 @@ +tdepowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdepowersave.so +tdepowersave-trinity: package-name-doesnt-match-sonames libtdeinit-tdepowersave +tdepowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so +tdepowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so + diff --git a/debian/squeeze/applications/tdepowersave/debian/kpowersave.1 b/debian/lenny/applications/tdepowersave/debian/tdepowersave.1 similarity index 88% rename from debian/squeeze/applications/tdepowersave/debian/kpowersave.1 rename to debian/lenny/applications/tdepowersave/debian/tdepowersave.1 index 0ab1d6f90..d79cfd21d 100644 --- a/debian/squeeze/applications/tdepowersave/debian/kpowersave.1 +++ b/debian/lenny/applications/tdepowersave/debian/tdepowersave.1 @@ -1,12 +1,12 @@ .\" This file was generated by kdemangen.pl -.TH KPOWERSAVE 1 "Sep 2005" "K Desktop Environment" "A KDE KPart Application" +.TH TDEPOWERSAVE 1 "Sep 2005" "Trinity Desktop Environment" "A TDE KPart Application" .SH NAME -kpowersave -\- A KDE KPart Application +tdepowersave +\- A TDE KPart Application .SH SYNOPSIS -kpowersave [Qt\-options] [KDE\-options] +tdepowersave [Qt\-options] [TDE\-options] .SH DESCRIPTION -A KDE KPart Application +A TDE KPart Application .SH OPTIONS .SS Generic options: .TP @@ -16,8 +16,8 @@ Show help about options .B \-\-help\-qt Show Qt specific options .TP -.B \-\-help\-kde -Show KDE specific options +.B \-\-help\-tde +Show TDE specific options .TP .B \-\-help\-all Show all options @@ -34,7 +34,7 @@ Show license information .B \-\- End of options .SS -.SS KDE options: +.SS TDE options: .TP .B \-\-caption Use 'caption' as name in the titlebar @@ -133,10 +133,10 @@ mirrors the whole layout of widgets .SS .SH SEE ALSO -Full user documentation is available through the KDE Help Center. You can also enter the URL -.BR help:/kpowersave/ +Full user documentation is available through the TDE Help Center. You can also enter the URL +.BR help:/tdepowersave/ directly into konqueror or you can run -.BR "`khelpcenter help:/kpowersave/'" +.BR "`khelpcenter help:/tdepowersave/'" from the command-line. .br .SH AUTHORS diff --git a/debian/squeeze/applications/tdepowersave/debian/kpowersave.xpm b/debian/lenny/applications/tdepowersave/debian/tdepowersave.xpm similarity index 99% rename from debian/squeeze/applications/tdepowersave/debian/kpowersave.xpm rename to debian/lenny/applications/tdepowersave/debian/tdepowersave.xpm index 99d178492..a7b0f2e7c 100644 --- a/debian/squeeze/applications/tdepowersave/debian/kpowersave.xpm +++ b/debian/lenny/applications/tdepowersave/debian/tdepowersave.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * kpowersave_xpm[] = { +static char * tdepowersave_xpm[] = { "32 32 593 2", " c None", ". c #6D2121", diff --git a/debian/lenny/applications/tdepowersave/debian/watch b/debian/lenny/applications/tdepowersave/debian/watch deleted file mode 100644 index 832285e63..000000000 --- a/debian/lenny/applications/tdepowersave/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://sf.net/powersave/kpowersave-(.*)\.tar\.bz2 diff --git a/debian/squeeze/applications/tdepowersave/debian/control b/debian/squeeze/applications/tdepowersave/debian/control index 3c3de5835..dcd5ab3f9 100644 --- a/debian/squeeze/applications/tdepowersave/debian/control +++ b/debian/squeeze/applications/tdepowersave/debian/control @@ -13,7 +13,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: kpowersave-trinity, kpowersave-nohal-trinity Description: Power management applet for Trinity - KPowersave is a TDE systray applet which allows to control the power + TDEPowersave is a TDE systray applet which allows to control the power management settings and policies of your computer. It relies on the TDE hardware library to do the heavy lifting. . @@ -33,7 +33,7 @@ Description: Power management applet for Trinity * KNotify support * online help * localisations for many languages - KPowersave supports schemes with following configurable specific + TDEPowersave supports schemes with following configurable specific settings for: * screensaver * DPMS diff --git a/debian/squeeze/applications/tdepowersave/debian/install b/debian/squeeze/applications/tdepowersave/debian/install index 4a1194bd1..8d2341734 100644 --- a/debian/squeeze/applications/tdepowersave/debian/install +++ b/debian/squeeze/applications/tdepowersave/debian/install @@ -1 +1 @@ -debian/kpowersave.xpm usr/share/pixmaps +debian/tdepowersave.xpm opt/trinity/share/pixmaps diff --git a/debian/squeeze/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian b/debian/squeeze/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian deleted file mode 100644 index edff50852..000000000 --- a/debian/squeeze/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian +++ /dev/null @@ -1,5 +0,0 @@ -kpowersave: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so -kpowersave: package-name-doesnt-match-sonames libtdeinit-kpowersave -kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so -kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so - diff --git a/debian/squeeze/applications/tdepowersave/debian/manpages b/debian/squeeze/applications/tdepowersave/debian/manpages index c8fa7b85f..aff0f8470 100644 --- a/debian/squeeze/applications/tdepowersave/debian/manpages +++ b/debian/squeeze/applications/tdepowersave/debian/manpages @@ -1 +1 @@ -debian/kpowersave.1 +debian/tdepowersave.1 diff --git a/debian/squeeze/applications/tdepowersave/debian/menu b/debian/squeeze/applications/tdepowersave/debian/menu index 6ae0f9833..c2c6cc3d2 100644 --- a/debian/squeeze/applications/tdepowersave/debian/menu +++ b/debian/squeeze/applications/tdepowersave/debian/menu @@ -1,7 +1,7 @@ -?package(kpowersave):\ +?package(tdepowersave):\ needs="X11"\ section="Applications/System/Monitoring"\ - title="KPowersave"\ + title="TDEPowersave"\ longtitle="Battery monitor and general power management"\ - icon="/usr/share/pixmaps/kpowersave.xpm"\ - command="/opt/trinity/bin/kpowersave" + icon="/opt/trinity/share/pixmaps/tdepowersave.xpm"\ + command="/opt/trinity/bin/tdepowersave" diff --git a/debian/squeeze/applications/tdepowersave/debian/rules b/debian/squeeze/applications/tdepowersave/debian/rules index 97acebf07..485481ef7 100755 --- a/debian/squeeze/applications/tdepowersave/debian/rules +++ b/debian/squeeze/applications/tdepowersave/debian/rules @@ -29,9 +29,9 @@ debian/stamp-bootstrap: make -f admin/Makefile.common cvs touch debian/stamp-bootstrap -install/kpowersave:: - install -p -D -m644 debian/tdepowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave - install -p -D -m644 debian/tdepowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave +install/tdepowersave-trinity:: + install -p -D -m644 debian/tdepowersave-trinity.lintian debian/tdepowersave-trinity/usr/share/lintian/overrides/tdepowersave-trinity + install -p -D -m644 debian/tdepowersave-trinity.linda debian/tdepowersave-trinity/usr/share/linda/overrides/tdepowersave-trinity clean:: find . -name Makefile.in | xargs rm -f diff --git a/debian/squeeze/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda b/debian/squeeze/applications/tdepowersave/debian/tdepowersave-trinity.linda similarity index 100% rename from debian/squeeze/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda rename to debian/squeeze/applications/tdepowersave/debian/tdepowersave-trinity.linda diff --git a/debian/squeeze/applications/tdepowersave/debian/tdepowersave-trinity.lintian b/debian/squeeze/applications/tdepowersave/debian/tdepowersave-trinity.lintian new file mode 100644 index 000000000..e27c64261 --- /dev/null +++ b/debian/squeeze/applications/tdepowersave/debian/tdepowersave-trinity.lintian @@ -0,0 +1,5 @@ +tdepowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdepowersave.so +tdepowersave-trinity: package-name-doesnt-match-sonames libtdeinit-tdepowersave +tdepowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so +tdepowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so + diff --git a/debian/lenny/applications/tdepowersave/debian/kpowersave.1 b/debian/squeeze/applications/tdepowersave/debian/tdepowersave.1 similarity index 88% rename from debian/lenny/applications/tdepowersave/debian/kpowersave.1 rename to debian/squeeze/applications/tdepowersave/debian/tdepowersave.1 index 0ab1d6f90..d79cfd21d 100644 --- a/debian/lenny/applications/tdepowersave/debian/kpowersave.1 +++ b/debian/squeeze/applications/tdepowersave/debian/tdepowersave.1 @@ -1,12 +1,12 @@ .\" This file was generated by kdemangen.pl -.TH KPOWERSAVE 1 "Sep 2005" "K Desktop Environment" "A KDE KPart Application" +.TH TDEPOWERSAVE 1 "Sep 2005" "Trinity Desktop Environment" "A TDE KPart Application" .SH NAME -kpowersave -\- A KDE KPart Application +tdepowersave +\- A TDE KPart Application .SH SYNOPSIS -kpowersave [Qt\-options] [KDE\-options] +tdepowersave [Qt\-options] [TDE\-options] .SH DESCRIPTION -A KDE KPart Application +A TDE KPart Application .SH OPTIONS .SS Generic options: .TP @@ -16,8 +16,8 @@ Show help about options .B \-\-help\-qt Show Qt specific options .TP -.B \-\-help\-kde -Show KDE specific options +.B \-\-help\-tde +Show TDE specific options .TP .B \-\-help\-all Show all options @@ -34,7 +34,7 @@ Show license information .B \-\- End of options .SS -.SS KDE options: +.SS TDE options: .TP .B \-\-caption Use 'caption' as name in the titlebar @@ -133,10 +133,10 @@ mirrors the whole layout of widgets .SS .SH SEE ALSO -Full user documentation is available through the KDE Help Center. You can also enter the URL -.BR help:/kpowersave/ +Full user documentation is available through the TDE Help Center. You can also enter the URL +.BR help:/tdepowersave/ directly into konqueror or you can run -.BR "`khelpcenter help:/kpowersave/'" +.BR "`khelpcenter help:/tdepowersave/'" from the command-line. .br .SH AUTHORS diff --git a/debian/wheezy/applications/tdepowersave/debian/kpowersave.xpm b/debian/squeeze/applications/tdepowersave/debian/tdepowersave.xpm similarity index 99% rename from debian/wheezy/applications/tdepowersave/debian/kpowersave.xpm rename to debian/squeeze/applications/tdepowersave/debian/tdepowersave.xpm index 99d178492..a7b0f2e7c 100644 --- a/debian/wheezy/applications/tdepowersave/debian/kpowersave.xpm +++ b/debian/squeeze/applications/tdepowersave/debian/tdepowersave.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * kpowersave_xpm[] = { +static char * tdepowersave_xpm[] = { "32 32 593 2", " c None", ". c #6D2121", diff --git a/debian/squeeze/applications/tdepowersave/debian/watch b/debian/squeeze/applications/tdepowersave/debian/watch deleted file mode 100644 index 832285e63..000000000 --- a/debian/squeeze/applications/tdepowersave/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://sf.net/powersave/kpowersave-(.*)\.tar\.bz2 diff --git a/debian/wheezy/applications/tdepowersave/debian/control b/debian/wheezy/applications/tdepowersave/debian/control index 3c3de5835..dcd5ab3f9 100644 --- a/debian/wheezy/applications/tdepowersave/debian/control +++ b/debian/wheezy/applications/tdepowersave/debian/control @@ -13,7 +13,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: kpowersave-trinity, kpowersave-nohal-trinity Description: Power management applet for Trinity - KPowersave is a TDE systray applet which allows to control the power + TDEPowersave is a TDE systray applet which allows to control the power management settings and policies of your computer. It relies on the TDE hardware library to do the heavy lifting. . @@ -33,7 +33,7 @@ Description: Power management applet for Trinity * KNotify support * online help * localisations for many languages - KPowersave supports schemes with following configurable specific + TDEPowersave supports schemes with following configurable specific settings for: * screensaver * DPMS diff --git a/debian/wheezy/applications/tdepowersave/debian/install b/debian/wheezy/applications/tdepowersave/debian/install index 4a1194bd1..8d2341734 100644 --- a/debian/wheezy/applications/tdepowersave/debian/install +++ b/debian/wheezy/applications/tdepowersave/debian/install @@ -1 +1 @@ -debian/kpowersave.xpm usr/share/pixmaps +debian/tdepowersave.xpm opt/trinity/share/pixmaps diff --git a/debian/wheezy/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian b/debian/wheezy/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian deleted file mode 100644 index edff50852..000000000 --- a/debian/wheezy/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian +++ /dev/null @@ -1,5 +0,0 @@ -kpowersave: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so -kpowersave: package-name-doesnt-match-sonames libtdeinit-kpowersave -kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so -kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so - diff --git a/debian/wheezy/applications/tdepowersave/debian/manpages b/debian/wheezy/applications/tdepowersave/debian/manpages index c8fa7b85f..aff0f8470 100644 --- a/debian/wheezy/applications/tdepowersave/debian/manpages +++ b/debian/wheezy/applications/tdepowersave/debian/manpages @@ -1 +1 @@ -debian/kpowersave.1 +debian/tdepowersave.1 diff --git a/debian/wheezy/applications/tdepowersave/debian/menu b/debian/wheezy/applications/tdepowersave/debian/menu index 6ae0f9833..c2c6cc3d2 100644 --- a/debian/wheezy/applications/tdepowersave/debian/menu +++ b/debian/wheezy/applications/tdepowersave/debian/menu @@ -1,7 +1,7 @@ -?package(kpowersave):\ +?package(tdepowersave):\ needs="X11"\ section="Applications/System/Monitoring"\ - title="KPowersave"\ + title="TDEPowersave"\ longtitle="Battery monitor and general power management"\ - icon="/usr/share/pixmaps/kpowersave.xpm"\ - command="/opt/trinity/bin/kpowersave" + icon="/opt/trinity/share/pixmaps/tdepowersave.xpm"\ + command="/opt/trinity/bin/tdepowersave" diff --git a/debian/wheezy/applications/tdepowersave/debian/rules b/debian/wheezy/applications/tdepowersave/debian/rules index 97acebf07..485481ef7 100755 --- a/debian/wheezy/applications/tdepowersave/debian/rules +++ b/debian/wheezy/applications/tdepowersave/debian/rules @@ -29,9 +29,9 @@ debian/stamp-bootstrap: make -f admin/Makefile.common cvs touch debian/stamp-bootstrap -install/kpowersave:: - install -p -D -m644 debian/tdepowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave - install -p -D -m644 debian/tdepowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave +install/tdepowersave-trinity:: + install -p -D -m644 debian/tdepowersave-trinity.lintian debian/tdepowersave-trinity/usr/share/lintian/overrides/tdepowersave-trinity + install -p -D -m644 debian/tdepowersave-trinity.linda debian/tdepowersave-trinity/usr/share/linda/overrides/tdepowersave-trinity clean:: find . -name Makefile.in | xargs rm -f diff --git a/debian/wheezy/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda b/debian/wheezy/applications/tdepowersave/debian/tdepowersave-trinity.linda similarity index 100% rename from debian/wheezy/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda rename to debian/wheezy/applications/tdepowersave/debian/tdepowersave-trinity.linda diff --git a/debian/wheezy/applications/tdepowersave/debian/tdepowersave-trinity.lintian b/debian/wheezy/applications/tdepowersave/debian/tdepowersave-trinity.lintian new file mode 100644 index 000000000..e27c64261 --- /dev/null +++ b/debian/wheezy/applications/tdepowersave/debian/tdepowersave-trinity.lintian @@ -0,0 +1,5 @@ +tdepowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdepowersave.so +tdepowersave-trinity: package-name-doesnt-match-sonames libtdeinit-tdepowersave +tdepowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so +tdepowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so + diff --git a/debian/wheezy/applications/tdepowersave/debian/kpowersave.1 b/debian/wheezy/applications/tdepowersave/debian/tdepowersave.1 similarity index 88% rename from debian/wheezy/applications/tdepowersave/debian/kpowersave.1 rename to debian/wheezy/applications/tdepowersave/debian/tdepowersave.1 index 0ab1d6f90..d79cfd21d 100644 --- a/debian/wheezy/applications/tdepowersave/debian/kpowersave.1 +++ b/debian/wheezy/applications/tdepowersave/debian/tdepowersave.1 @@ -1,12 +1,12 @@ .\" This file was generated by kdemangen.pl -.TH KPOWERSAVE 1 "Sep 2005" "K Desktop Environment" "A KDE KPart Application" +.TH TDEPOWERSAVE 1 "Sep 2005" "Trinity Desktop Environment" "A TDE KPart Application" .SH NAME -kpowersave -\- A KDE KPart Application +tdepowersave +\- A TDE KPart Application .SH SYNOPSIS -kpowersave [Qt\-options] [KDE\-options] +tdepowersave [Qt\-options] [TDE\-options] .SH DESCRIPTION -A KDE KPart Application +A TDE KPart Application .SH OPTIONS .SS Generic options: .TP @@ -16,8 +16,8 @@ Show help about options .B \-\-help\-qt Show Qt specific options .TP -.B \-\-help\-kde -Show KDE specific options +.B \-\-help\-tde +Show TDE specific options .TP .B \-\-help\-all Show all options @@ -34,7 +34,7 @@ Show license information .B \-\- End of options .SS -.SS KDE options: +.SS TDE options: .TP .B \-\-caption Use 'caption' as name in the titlebar @@ -133,10 +133,10 @@ mirrors the whole layout of widgets .SS .SH SEE ALSO -Full user documentation is available through the KDE Help Center. You can also enter the URL -.BR help:/kpowersave/ +Full user documentation is available through the TDE Help Center. You can also enter the URL +.BR help:/tdepowersave/ directly into konqueror or you can run -.BR "`khelpcenter help:/kpowersave/'" +.BR "`khelpcenter help:/tdepowersave/'" from the command-line. .br .SH AUTHORS diff --git a/debian/lenny/applications/tdepowersave/debian/kpowersave.xpm b/debian/wheezy/applications/tdepowersave/debian/tdepowersave.xpm similarity index 99% rename from debian/lenny/applications/tdepowersave/debian/kpowersave.xpm rename to debian/wheezy/applications/tdepowersave/debian/tdepowersave.xpm index 99d178492..a7b0f2e7c 100644 --- a/debian/lenny/applications/tdepowersave/debian/kpowersave.xpm +++ b/debian/wheezy/applications/tdepowersave/debian/tdepowersave.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * kpowersave_xpm[] = { +static char * tdepowersave_xpm[] = { "32 32 593 2", " c None", ". c #6D2121", diff --git a/debian/wheezy/applications/tdepowersave/debian/watch b/debian/wheezy/applications/tdepowersave/debian/watch deleted file mode 100644 index 832285e63..000000000 --- a/debian/wheezy/applications/tdepowersave/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://sf.net/powersave/kpowersave-(.*)\.tar\.bz2 diff --git a/ubuntu/maverick/applications/tdepowersave/debian/control b/ubuntu/maverick/applications/tdepowersave/debian/control index 3c3de5835..dcd5ab3f9 100644 --- a/ubuntu/maverick/applications/tdepowersave/debian/control +++ b/ubuntu/maverick/applications/tdepowersave/debian/control @@ -13,7 +13,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: kpowersave-trinity, kpowersave-nohal-trinity Description: Power management applet for Trinity - KPowersave is a TDE systray applet which allows to control the power + TDEPowersave is a TDE systray applet which allows to control the power management settings and policies of your computer. It relies on the TDE hardware library to do the heavy lifting. . @@ -33,7 +33,7 @@ Description: Power management applet for Trinity * KNotify support * online help * localisations for many languages - KPowersave supports schemes with following configurable specific + TDEPowersave supports schemes with following configurable specific settings for: * screensaver * DPMS diff --git a/ubuntu/maverick/applications/tdepowersave/debian/install b/ubuntu/maverick/applications/tdepowersave/debian/install index 4a1194bd1..8d2341734 100644 --- a/ubuntu/maverick/applications/tdepowersave/debian/install +++ b/ubuntu/maverick/applications/tdepowersave/debian/install @@ -1 +1 @@ -debian/kpowersave.xpm usr/share/pixmaps +debian/tdepowersave.xpm opt/trinity/share/pixmaps diff --git a/ubuntu/maverick/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian b/ubuntu/maverick/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian deleted file mode 100644 index edff50852..000000000 --- a/ubuntu/maverick/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian +++ /dev/null @@ -1,5 +0,0 @@ -kpowersave: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so -kpowersave: package-name-doesnt-match-sonames libtdeinit-kpowersave -kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so -kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so - diff --git a/ubuntu/maverick/applications/tdepowersave/debian/manpages b/ubuntu/maverick/applications/tdepowersave/debian/manpages index c8fa7b85f..aff0f8470 100644 --- a/ubuntu/maverick/applications/tdepowersave/debian/manpages +++ b/ubuntu/maverick/applications/tdepowersave/debian/manpages @@ -1 +1 @@ -debian/kpowersave.1 +debian/tdepowersave.1 diff --git a/ubuntu/maverick/applications/tdepowersave/debian/menu b/ubuntu/maverick/applications/tdepowersave/debian/menu index 6ae0f9833..c2c6cc3d2 100644 --- a/ubuntu/maverick/applications/tdepowersave/debian/menu +++ b/ubuntu/maverick/applications/tdepowersave/debian/menu @@ -1,7 +1,7 @@ -?package(kpowersave):\ +?package(tdepowersave):\ needs="X11"\ section="Applications/System/Monitoring"\ - title="KPowersave"\ + title="TDEPowersave"\ longtitle="Battery monitor and general power management"\ - icon="/usr/share/pixmaps/kpowersave.xpm"\ - command="/opt/trinity/bin/kpowersave" + icon="/opt/trinity/share/pixmaps/tdepowersave.xpm"\ + command="/opt/trinity/bin/tdepowersave" diff --git a/ubuntu/maverick/applications/tdepowersave/debian/rules b/ubuntu/maverick/applications/tdepowersave/debian/rules index 97acebf07..485481ef7 100755 --- a/ubuntu/maverick/applications/tdepowersave/debian/rules +++ b/ubuntu/maverick/applications/tdepowersave/debian/rules @@ -29,9 +29,9 @@ debian/stamp-bootstrap: make -f admin/Makefile.common cvs touch debian/stamp-bootstrap -install/kpowersave:: - install -p -D -m644 debian/tdepowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave - install -p -D -m644 debian/tdepowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave +install/tdepowersave-trinity:: + install -p -D -m644 debian/tdepowersave-trinity.lintian debian/tdepowersave-trinity/usr/share/lintian/overrides/tdepowersave-trinity + install -p -D -m644 debian/tdepowersave-trinity.linda debian/tdepowersave-trinity/usr/share/linda/overrides/tdepowersave-trinity clean:: find . -name Makefile.in | xargs rm -f diff --git a/ubuntu/maverick/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda b/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave-trinity.linda similarity index 100% rename from ubuntu/maverick/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda rename to ubuntu/maverick/applications/tdepowersave/debian/tdepowersave-trinity.linda diff --git a/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave-trinity.lintian b/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave-trinity.lintian new file mode 100644 index 000000000..e27c64261 --- /dev/null +++ b/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave-trinity.lintian @@ -0,0 +1,5 @@ +tdepowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdepowersave.so +tdepowersave-trinity: package-name-doesnt-match-sonames libtdeinit-tdepowersave +tdepowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so +tdepowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so + diff --git a/ubuntu/maverick/applications/tdepowersave/debian/kpowersave.1 b/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave.1 similarity index 88% rename from ubuntu/maverick/applications/tdepowersave/debian/kpowersave.1 rename to ubuntu/maverick/applications/tdepowersave/debian/tdepowersave.1 index 0ab1d6f90..d79cfd21d 100644 --- a/ubuntu/maverick/applications/tdepowersave/debian/kpowersave.1 +++ b/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave.1 @@ -1,12 +1,12 @@ .\" This file was generated by kdemangen.pl -.TH KPOWERSAVE 1 "Sep 2005" "K Desktop Environment" "A KDE KPart Application" +.TH TDEPOWERSAVE 1 "Sep 2005" "Trinity Desktop Environment" "A TDE KPart Application" .SH NAME -kpowersave -\- A KDE KPart Application +tdepowersave +\- A TDE KPart Application .SH SYNOPSIS -kpowersave [Qt\-options] [KDE\-options] +tdepowersave [Qt\-options] [TDE\-options] .SH DESCRIPTION -A KDE KPart Application +A TDE KPart Application .SH OPTIONS .SS Generic options: .TP @@ -16,8 +16,8 @@ Show help about options .B \-\-help\-qt Show Qt specific options .TP -.B \-\-help\-kde -Show KDE specific options +.B \-\-help\-tde +Show TDE specific options .TP .B \-\-help\-all Show all options @@ -34,7 +34,7 @@ Show license information .B \-\- End of options .SS -.SS KDE options: +.SS TDE options: .TP .B \-\-caption Use 'caption' as name in the titlebar @@ -133,10 +133,10 @@ mirrors the whole layout of widgets .SS .SH SEE ALSO -Full user documentation is available through the KDE Help Center. You can also enter the URL -.BR help:/kpowersave/ +Full user documentation is available through the TDE Help Center. You can also enter the URL +.BR help:/tdepowersave/ directly into konqueror or you can run -.BR "`khelpcenter help:/kpowersave/'" +.BR "`khelpcenter help:/tdepowersave/'" from the command-line. .br .SH AUTHORS diff --git a/ubuntu/maverick/applications/tdepowersave/debian/kpowersave.xpm b/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave.xpm similarity index 99% rename from ubuntu/maverick/applications/tdepowersave/debian/kpowersave.xpm rename to ubuntu/maverick/applications/tdepowersave/debian/tdepowersave.xpm index 99d178492..a7b0f2e7c 100644 --- a/ubuntu/maverick/applications/tdepowersave/debian/kpowersave.xpm +++ b/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * kpowersave_xpm[] = { +static char * tdepowersave_xpm[] = { "32 32 593 2", " c None", ". c #6D2121", diff --git a/ubuntu/maverick/applications/tdepowersave/debian/watch b/ubuntu/maverick/applications/tdepowersave/debian/watch deleted file mode 100644 index 832285e63..000000000 --- a/ubuntu/maverick/applications/tdepowersave/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://sf.net/powersave/kpowersave-(.*)\.tar\.bz2 diff --git a/ubuntu/precise/applications/tdepowersave/debian/control b/ubuntu/precise/applications/tdepowersave/debian/control index 3c3de5835..dcd5ab3f9 100644 --- a/ubuntu/precise/applications/tdepowersave/debian/control +++ b/ubuntu/precise/applications/tdepowersave/debian/control @@ -13,7 +13,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: kpowersave-trinity, kpowersave-nohal-trinity Description: Power management applet for Trinity - KPowersave is a TDE systray applet which allows to control the power + TDEPowersave is a TDE systray applet which allows to control the power management settings and policies of your computer. It relies on the TDE hardware library to do the heavy lifting. . @@ -33,7 +33,7 @@ Description: Power management applet for Trinity * KNotify support * online help * localisations for many languages - KPowersave supports schemes with following configurable specific + TDEPowersave supports schemes with following configurable specific settings for: * screensaver * DPMS diff --git a/ubuntu/precise/applications/tdepowersave/debian/install b/ubuntu/precise/applications/tdepowersave/debian/install index 4a1194bd1..8d2341734 100644 --- a/ubuntu/precise/applications/tdepowersave/debian/install +++ b/ubuntu/precise/applications/tdepowersave/debian/install @@ -1 +1 @@ -debian/kpowersave.xpm usr/share/pixmaps +debian/tdepowersave.xpm opt/trinity/share/pixmaps diff --git a/ubuntu/precise/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian b/ubuntu/precise/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian deleted file mode 100644 index edff50852..000000000 --- a/ubuntu/precise/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian +++ /dev/null @@ -1,5 +0,0 @@ -kpowersave: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so -kpowersave: package-name-doesnt-match-sonames libtdeinit-kpowersave -kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so -kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so - diff --git a/ubuntu/precise/applications/tdepowersave/debian/kpowersave.1 b/ubuntu/precise/applications/tdepowersave/debian/kpowersave.1 deleted file mode 100644 index 0ab1d6f90..000000000 --- a/ubuntu/precise/applications/tdepowersave/debian/kpowersave.1 +++ /dev/null @@ -1,148 +0,0 @@ -.\" This file was generated by kdemangen.pl -.TH KPOWERSAVE 1 "Sep 2005" "K Desktop Environment" "A KDE KPart Application" -.SH NAME -kpowersave -\- A KDE KPart Application -.SH SYNOPSIS -kpowersave [Qt\-options] [KDE\-options] -.SH DESCRIPTION -A KDE KPart Application -.SH OPTIONS -.SS Generic options: -.TP -.B \-\-help -Show help about options -.TP -.B \-\-help\-qt -Show Qt specific options -.TP -.B \-\-help\-kde -Show KDE specific options -.TP -.B \-\-help\-all -Show all options -.TP -.B \-\-author -Show author information -.TP -.B \-v, \-\-version -Show version information -.TP -.B \-\-license -Show license information -.TP -.B \-\- -End of options -.SS -.SS KDE options: -.TP -.B \-\-caption -Use 'caption' as name in the titlebar -.TP -.B \-\-icon -Use 'icon' as the application icon -.TP -.B \-\-miniicon -Use 'icon' as the icon in the titlebar -.TP -.B \-\-config -Use alternative configuration file -.TP -.B \-\-dcopserver -Use the DCOP Server specified by 'server' -.TP -.B \-\-nocrashhandler -Disable crash handler, to get core dumps -.TP -.B \-\-waitforwm -Waits for a WM_NET compatible windowmanager -.TP -.B \-\-style