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/metapackages') 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.1 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/metapackages') 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.1 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 --- ubuntu/maverick/metapackages/trinity-livecd/debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ubuntu/maverick/metapackages') 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, -- cgit v1.2.1