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: Fix unregistration kdm-trinity as the default display manager in rename-meta on Debian and Ubuntu --- ubuntu/maverick/metapackages/rename-meta/Makefile | 0 .../metapackages/rename-meta/debian/changelog | 0 .../metapackages/rename-meta/debian/compat | 0 .../maverick/metapackages/rename-meta/debian/dirs | 0 .../rename-meta/debian/kdm-kde3.postinst | 89 ---------------------- .../rename-meta/debian/kdm-trinity.postinst | 89 ++++++++++++++++++++++ 6 files changed, 89 insertions(+), 89 deletions(-) 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 delete mode 100644 ubuntu/maverick/metapackages/rename-meta/debian/kdm-kde3.postinst create mode 100644 ubuntu/maverick/metapackages/rename-meta/debian/kdm-trinity.postinst (limited to 'ubuntu/maverick') 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-kde3.postinst deleted file mode 100644 index 8db089c93..000000000 --- a/ubuntu/maverick/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/maverick/metapackages/rename-meta/debian/kdm-trinity.postinst b/ubuntu/maverick/metapackages/rename-meta/debian/kdm-trinity.postinst new file mode 100644 index 000000000..e026f2bfe --- /dev/null +++ b/ubuntu/maverick/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 + -- cgit v1.2.3 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: Fix unintended renames in rename-meta on Debian and Ubuntu --- ubuntu/maverick/metapackages/rename-meta/debian/control | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'ubuntu/maverick') 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 -- cgit v1.2.3 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: Rename packages kde-icons-mono, kdelirc and kdewallpapers on Debian and Ubuntu Fix renaming of kdessh package on Debian and Ubuntu --- .../metapackages/trinity-livecd/debian/control | 2 +- ubuntu/maverick/tdeaccessibility/debian/control | 4 +- .../debian/kde-icons-mono-trinity.install | 2 - .../debian/tde-icons-mono-trinity.install | 2 + ubuntu/maverick/tdeartwork/debian/control | 4 +- .../debian/kdewallpapers-trinity.install | 1 - .../debian/tdewallpapers-trinity.install | 1 + ubuntu/maverick/tdeutils/debian/control | 10 ++--- .../tdeutils/debian/kdelirc-trinity.install | 49 ---------------------- .../tdeutils/debian/kdelirc-trinity.lintian | 3 -- .../tdeutils/debian/kdessh-trinity.install | 1 - .../tdeutils/debian/tdelirc-trinity.install | 49 ++++++++++++++++++++++ .../tdeutils/debian/tdelirc-trinity.lintian | 3 ++ .../tdeutils/debian/tdessh-trinity.install | 1 + 14 files changed, 66 insertions(+), 66 deletions(-) delete mode 100644 ubuntu/maverick/tdeaccessibility/debian/kde-icons-mono-trinity.install create mode 100644 ubuntu/maverick/tdeaccessibility/debian/tde-icons-mono-trinity.install delete mode 100644 ubuntu/maverick/tdeartwork/debian/kdewallpapers-trinity.install create mode 100644 ubuntu/maverick/tdeartwork/debian/tdewallpapers-trinity.install delete mode 100644 ubuntu/maverick/tdeutils/debian/kdelirc-trinity.install delete mode 100644 ubuntu/maverick/tdeutils/debian/kdelirc-trinity.lintian delete mode 100644 ubuntu/maverick/tdeutils/debian/kdessh-trinity.install create mode 100644 ubuntu/maverick/tdeutils/debian/tdelirc-trinity.install create mode 100644 ubuntu/maverick/tdeutils/debian/tdelirc-trinity.lintian create mode 100644 ubuntu/maverick/tdeutils/debian/tdessh-trinity.install (limited to 'ubuntu/maverick') 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/kde-icons-mono-trinity.install deleted file mode 100644 index 8c4265ceb..000000000 --- a/ubuntu/maverick/tdeaccessibility/debian/kde-icons-mono-trinity.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/opt/trinity/share/icons/mono/index.theme -debian/tmp/opt/trinity/share/icons/mono/scalable/*/*.svgz diff --git a/ubuntu/maverick/tdeaccessibility/debian/tde-icons-mono-trinity.install b/ubuntu/maverick/tdeaccessibility/debian/tde-icons-mono-trinity.install new file mode 100644 index 000000000..8c4265ceb --- /dev/null +++ b/ubuntu/maverick/tdeaccessibility/debian/tde-icons-mono-trinity.install @@ -0,0 +1,2 @@ +debian/tmp/opt/trinity/share/icons/mono/index.theme +debian/tmp/opt/trinity/share/icons/mono/scalable/*/*.svgz 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/kdewallpapers-trinity.install deleted file mode 100644 index 681454953..000000000 --- a/ubuntu/maverick/tdeartwork/debian/kdewallpapers-trinity.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/opt/trinity/share/wallpapers diff --git a/ubuntu/maverick/tdeartwork/debian/tdewallpapers-trinity.install b/ubuntu/maverick/tdeartwork/debian/tdewallpapers-trinity.install new file mode 100644 index 000000000..681454953 --- /dev/null +++ b/ubuntu/maverick/tdeartwork/debian/tdewallpapers-trinity.install @@ -0,0 +1 @@ +debian/tmp/opt/trinity/share/wallpapers 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.install b/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.install deleted file mode 100644 index 8570e2ffa..000000000 --- a/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.install +++ /dev/null @@ -1,49 +0,0 @@ -debian/tmp/opt/trinity/bin/irkick -debian/tmp/opt/trinity/lib/trinity/irkick.la -debian/tmp/opt/trinity/lib/trinity/irkick.so -debian/tmp/opt/trinity/lib/trinity/kcm_kcmlirc.la -debian/tmp/opt/trinity/lib/trinity/kcm_kcmlirc.so -debian/tmp/opt/trinity/lib/libtdeinit_irkick.so -debian/tmp/opt/trinity/share/applications/tde/irkick.desktop -debian/tmp/opt/trinity/share/applications/tde/kcmlirc.desktop -debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/16x16/actions/irkick.png -debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/16x16/actions/irkickflash.png -debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/16x16/actions/irkickoff.png -debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/16x16/actions/ledblue.png -debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/16x16/actions/ledgreen.png -debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/16x16/actions/ledlightblue.png -debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/16x16/actions/ledlightgreen.png -debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/16x16/actions/ledorange.png -debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/16x16/actions/ledpurple.png -debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/16x16/actions/ledred.png -debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/16x16/actions/ledyellow.png -debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/32x32/actions/ledblue.png -debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/32x32/actions/ledgreen.png -debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/32x32/actions/ledlightblue.png -debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/32x32/actions/ledlightgreen.png -debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/32x32/actions/ledorange.png -debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/32x32/actions/ledpurple.png -debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/32x32/actions/ledred.png -debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/32x32/actions/ledyellow.png -debian/tmp/opt/trinity/share/apps/profiles/tdelauncher.profile.xml -debian/tmp/opt/trinity/share/apps/profiles/konqueror.profile.xml -debian/tmp/opt/trinity/share/apps/profiles/noatun.profile.xml -debian/tmp/opt/trinity/share/apps/profiles/profile.dtd -debian/tmp/opt/trinity/share/apps/remotes/RM-0010.remote.xml -debian/tmp/opt/trinity/share/apps/remotes/cimr100.remote.xml -debian/tmp/opt/trinity/share/apps/remotes/hauppauge.remote.xml -debian/tmp/opt/trinity/share/apps/remotes/remote.dtd -debian/tmp/opt/trinity/share/apps/remotes/sherwood.remote.xml -debian/tmp/opt/trinity/share/apps/remotes/sonytv.remote.xml -debian/tmp/opt/trinity/share/autostart/irkick.desktop -debian/tmp/opt/trinity/share/doc/tde/HTML/en/irkick/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/irkick/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/irkick/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcmlirc/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcmlirc/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcmlirc/index.docbook -debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/irkick.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/irkick.png -debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/irkick.png -debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/irkick.png -debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/irkick.png 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/kdessh-trinity.install b/ubuntu/maverick/tdeutils/debian/kdessh-trinity.install deleted file mode 100644 index cf26ccd1d..000000000 --- a/ubuntu/maverick/tdeutils/debian/kdessh-trinity.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/opt/trinity/bin/tdessh diff --git a/ubuntu/maverick/tdeutils/debian/tdelirc-trinity.install b/ubuntu/maverick/tdeutils/debian/tdelirc-trinity.install new file mode 100644 index 000000000..8570e2ffa --- /dev/null +++ b/ubuntu/maverick/tdeutils/debian/tdelirc-trinity.install @@ -0,0 +1,49 @@ +debian/tmp/opt/trinity/bin/irkick +debian/tmp/opt/trinity/lib/trinity/irkick.la +debian/tmp/opt/trinity/lib/trinity/irkick.so +debian/tmp/opt/trinity/lib/trinity/kcm_kcmlirc.la +debian/tmp/opt/trinity/lib/trinity/kcm_kcmlirc.so +debian/tmp/opt/trinity/lib/libtdeinit_irkick.so +debian/tmp/opt/trinity/share/applications/tde/irkick.desktop +debian/tmp/opt/trinity/share/applications/tde/kcmlirc.desktop +debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/16x16/actions/irkick.png +debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/16x16/actions/irkickflash.png +debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/16x16/actions/irkickoff.png +debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/16x16/actions/ledblue.png +debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/16x16/actions/ledgreen.png +debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/16x16/actions/ledlightblue.png +debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/16x16/actions/ledlightgreen.png +debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/16x16/actions/ledorange.png +debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/16x16/actions/ledpurple.png +debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/16x16/actions/ledred.png +debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/16x16/actions/ledyellow.png +debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/32x32/actions/ledblue.png +debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/32x32/actions/ledgreen.png +debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/32x32/actions/ledlightblue.png +debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/32x32/actions/ledlightgreen.png +debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/32x32/actions/ledorange.png +debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/32x32/actions/ledpurple.png +debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/32x32/actions/ledred.png +debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/32x32/actions/ledyellow.png +debian/tmp/opt/trinity/share/apps/profiles/tdelauncher.profile.xml +debian/tmp/opt/trinity/share/apps/profiles/konqueror.profile.xml +debian/tmp/opt/trinity/share/apps/profiles/noatun.profile.xml +debian/tmp/opt/trinity/share/apps/profiles/profile.dtd +debian/tmp/opt/trinity/share/apps/remotes/RM-0010.remote.xml +debian/tmp/opt/trinity/share/apps/remotes/cimr100.remote.xml +debian/tmp/opt/trinity/share/apps/remotes/hauppauge.remote.xml +debian/tmp/opt/trinity/share/apps/remotes/remote.dtd +debian/tmp/opt/trinity/share/apps/remotes/sherwood.remote.xml +debian/tmp/opt/trinity/share/apps/remotes/sonytv.remote.xml +debian/tmp/opt/trinity/share/autostart/irkick.desktop +debian/tmp/opt/trinity/share/doc/tde/HTML/en/irkick/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/irkick/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/irkick/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcmlirc/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcmlirc/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcmlirc/index.docbook +debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/irkick.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/irkick.png +debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/irkick.png +debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/irkick.png +debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/irkick.png 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/tdessh-trinity.install b/ubuntu/maverick/tdeutils/debian/tdessh-trinity.install new file mode 100644 index 000000000..cf26ccd1d --- /dev/null +++ b/ubuntu/maverick/tdeutils/debian/tdessh-trinity.install @@ -0,0 +1 @@ +debian/tmp/opt/trinity/bin/tdessh -- cgit v1.2.3 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: Second part of renaming kpowersave-nohal on Debian and Ubuntu --- .../applications/tdepowersave/debian/control | 4 +- .../applications/tdepowersave/debian/install | 2 +- .../debian/kpowersave-nohal-trinity.linda | 4 - .../debian/kpowersave-nohal-trinity.lintian | 5 - .../applications/tdepowersave/debian/kpowersave.1 | 148 ----- .../tdepowersave/debian/kpowersave.xpm | 628 --------------------- .../applications/tdepowersave/debian/manpages | 2 +- .../maverick/applications/tdepowersave/debian/menu | 8 +- .../applications/tdepowersave/debian/rules | 6 +- .../tdepowersave/debian/tdepowersave-trinity.linda | 4 + .../debian/tdepowersave-trinity.lintian | 5 + .../tdepowersave/debian/tdepowersave.1 | 148 +++++ .../tdepowersave/debian/tdepowersave.xpm | 628 +++++++++++++++++++++ .../applications/tdepowersave/debian/watch | 2 - 14 files changed, 796 insertions(+), 798 deletions(-) delete mode 100644 ubuntu/maverick/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda delete mode 100644 ubuntu/maverick/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian delete mode 100644 ubuntu/maverick/applications/tdepowersave/debian/kpowersave.1 delete mode 100644 ubuntu/maverick/applications/tdepowersave/debian/kpowersave.xpm create mode 100644 ubuntu/maverick/applications/tdepowersave/debian/tdepowersave-trinity.linda create mode 100644 ubuntu/maverick/applications/tdepowersave/debian/tdepowersave-trinity.lintian create mode 100644 ubuntu/maverick/applications/tdepowersave/debian/tdepowersave.1 create mode 100644 ubuntu/maverick/applications/tdepowersave/debian/tdepowersave.xpm delete mode 100644 ubuntu/maverick/applications/tdepowersave/debian/watch (limited to 'ubuntu/maverick') 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.linda b/ubuntu/maverick/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda deleted file mode 100644 index ff5153632..000000000 --- a/ubuntu/maverick/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda +++ /dev/null @@ -1,4 +0,0 @@ -Tag: lib-not-in-shlibs - -Tag: no-shlib-file -Data: /usr/trinity/lib/libtdeinit_*.so 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/kpowersave.1 b/ubuntu/maverick/applications/tdepowersave/debian/kpowersave.1 deleted file mode 100644 index 0ab1d6f90..000000000 --- a/ubuntu/maverick/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