From 469a2fea7abec99022999bfd31e6d81c9364e325 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 15:25:21 -0600 Subject: Update Debian and Ubuntu packaging to match recent renaming --- debian/lenny/tdebase/debian/KUBUNTU-DEBIAN-CHANGES | 2 +- debian/lenny/tdebase/debian/changelog | 28 +++++++++++----------- debian/lenny/tdebase/debian/control.in | 2 +- .../lenny/tdebase/debian/kcontrol-trinity.install | 20 ++++++++-------- .../lenny/tdebase/debian/kcontrol-trinity.lintian | 2 +- .../debian/konqueror-nsplugins-trinity.install | 2 +- .../lenny/tdebase/debian/konqueror-trinity.install | 10 ++++---- .../lenny/tdebase/debian/kscreensaver-trinity.pam | 7 ------ debian/lenny/tdebase/debian/rules | 4 ++-- .../tdebase/debian/tdebase-data-trinity.install | 20 ++++++++-------- .../tdebase/debian/tdescreensaver-trinity.pam | 7 ++++++ 11 files changed, 52 insertions(+), 52 deletions(-) delete mode 100644 debian/lenny/tdebase/debian/kscreensaver-trinity.pam create mode 100644 debian/lenny/tdebase/debian/tdescreensaver-trinity.pam (limited to 'debian/lenny/tdebase/debian') diff --git a/debian/lenny/tdebase/debian/KUBUNTU-DEBIAN-CHANGES b/debian/lenny/tdebase/debian/KUBUNTU-DEBIAN-CHANGES index 6abff5d30..2fbbb9969 100644 --- a/debian/lenny/tdebase/debian/KUBUNTU-DEBIAN-CHANGES +++ b/debian/lenny/tdebase/debian/KUBUNTU-DEBIAN-CHANGES @@ -20,7 +20,7 @@ install/klipper:: binary-install/tdebase-bin:: install -p -D -m644 debian/kcheckpass.pam debian/tdebase-bin/etc/pam.d/kcheckpass - install -p -D -m644 debian/kscreensaver.pam debian/tdebase-bin/etc/pam.d/kscreensaver + install -p -D -m644 debian/tdescreensaver.pam debian/tdebase-bin/etc/pam.d/tdescreensaver install -p -D -m644 debian/ubuntu.xmodmap debian/tdebase-bin/usr/share/apps/kxkb/ubuntu.xmodmap install -p -D -m644 debian/80ubuntu-xmodmap debian/tdebase-bin/etc/X11/Xsession.d/80ubuntu-xmodmap diff --git a/debian/lenny/tdebase/debian/changelog b/debian/lenny/tdebase/debian/changelog index fc2c45054..450f25f23 100644 --- a/debian/lenny/tdebase/debian/changelog +++ b/debian/lenny/tdebase/debian/changelog @@ -1,7 +1,7 @@ tdebase-trinity (4:3.5.10-2ubuntu12) karmic; urgency=low * Repaired kdesktop crash on load - * Fixed krandrtray crash when randr X extension is unavailable + * Fixed tderandrtray crash when randr X extension is unavailable * Added option to keys config dialog to alter Win key from modifier status -- Timothy Pearson Mon, 07 Dec 2009 13:24:00 -0600 @@ -67,7 +67,7 @@ tdebase-trinity (4:3.5.10-2ubuntu2) karmic; urgency=low tdebase-trinity (4:3.5.10-1ubuntu5) karmic; urgency=low * Added new ICC loading functionality to kcontrol and tdm - * Added new display output switching functionality to krandrtray + * Added new display output switching functionality to tderandrtray * Beginnings of customizable K menu icon -- Timothy Pearson Thu, 15 Oct 2009 10:46:00 -0600 @@ -750,7 +750,7 @@ tdebase (4:3.5.7-1ubuntu24) gutsy; urgency=low [ Sarah Hobbs ] * Added kubuntu_17_check_for_prelinking.diff. (Closes LP: #107694) * Added konqueror dependancy for konqueror-nsplugins. (LP: #139893) - * Added kubuntu_fix_kscreensaver_with_compiz_fixed_in_3.5.8.diff (LP: + * Added kubuntu_fix_tdescreensaver_with_compiz_fixed_in_3.5.8.diff (LP: #141628) -- Sarah Hobbs Fri, 28 Sep 2007 18:56:10 +1000 @@ -758,7 +758,7 @@ tdebase (4:3.5.7-1ubuntu24) gutsy; urgency=low tdebase (4:3.5.7-1ubuntu23) gutsy; urgency=low * Fixed kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff as $tdehome=$HOME/.kde so we should use + kubuntu_53_tdewallet_config.diff as $tdehome=$HOME/.kde so we should use $tdehome instead of $HOME/$tdehome -- Anthony Mercatante Wed, 19 Sep 2007 12:22:46 +0200 @@ -781,7 +781,7 @@ tdebase (4:3.5.7-1ubuntu21) gutsy; urgency=low tdebase (4:3.5.7-1ubuntu20) gutsy; urgency=low * Changed (again) $TDEHOME to $tdehome in kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff . (LP: #136560) + kubuntu_53_tdewallet_config.diff . (LP: #136560) -- Jonathan Riddell Sat, 15 Sep 2007 23:12:26 +0100 @@ -800,14 +800,14 @@ tdebase (4:3.5.7-1ubuntu18) gutsy; urgency=low * Dropping kubuntu_9902_nspluginviewer_hangs_cpu.diff and the libgtk build-dep as they are no longer needed * Changed $TDEHOME to $tdehome in kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff . (LP: #136560) + kubuntu_53_tdewallet_config.diff . (LP: #136560) -- Ryan Kavanagh Mon, 03 Sep 2007 10:26:36 -0400 tdebase (4:3.5.7-1ubuntu17) gutsy; urgency=low * Edit kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff to use $TDEHOME instead of .kde + kubuntu_53_tdewallet_config.diff to use $TDEHOME instead of .kde * Remove kubuntu_77_kiosystem.diff, home:/ better than /home now * Edit kubuntu_27_aboutscreen_searchbar.diff to work with strigi * Add kubuntu_9903_api_docs_move.diff for new API website @@ -1154,7 +1154,7 @@ tdebase (4:3.5.6-0ubuntu13) feisty; urgency=low tdebase (4:3.5.6-0ubuntu12) feisty; urgency=low - * Add kubuntu_92_krandrtray_config.diff, krandrtray now uses guidance + * Add kubuntu_92_tderandrtray_config.diff, tderandrtray now uses guidance display configuration module in the first place. Closes Malone #46877 @@ -2148,7 +2148,7 @@ tdebase (4:3.5.0-4) unstable; urgency=low +++ Changes by Isaac Clerencia - * Add kdnssd kcontrol module files to kcontrol package + * Add tdednssd kcontrol module files to kcontrol package -- Debian Qt/KDE Maintainers Wed, 11 Jan 2006 23:05:12 +0100 @@ -2210,7 +2210,7 @@ tdebase (4:3.5.2-0ubuntu26) dapper; urgency=low tdebase (4:3.5.2-0ubuntu25) dapper; urgency=low - * Fix kubuntu_53_kwallet_config.diff to not install kwallet + * Fix kubuntu_53_tdewallet_config.diff to not install tdewallet file in wrong directory, closes Malone #45999 * Install filemanagement and webbrowsing konqueror profiles, closes Malone #45004 @@ -2408,7 +2408,7 @@ tdebase (4:3.5.1-0ubuntu13) dapper; urgency=low tdebase (4:3.5.1-0ubuntu12) dapper; urgency=low [ Anthony Mercatante ] - * Add kubuntu_53_kwallet_config.diff copy a default + * Add kubuntu_53_tdewallet_config.diff copy a default KWallet config for new users * Add kubuntu_54_system_protocol_home_dir.diff make system:/ use /home/foo not system:/home/foo keep @@ -2511,7 +2511,7 @@ tdebase (4:3.5.0-0ubuntu16) dapper; urgency=low tdebase (4:3.5.0-0ubuntu15) dapper; urgency=low - * kcontrol replaces old tdebase-bin for kcm_kdnssd.desktop + * kcontrol replaces old tdebase-bin for kcm_tdednssd.desktop -- Jonathan Riddell Tue, 17 Jan 2006 15:20:42 +0000 @@ -2550,7 +2550,7 @@ tdebase (4:3.5.0-0ubuntu10) dapper; urgency=low tdebase (4:3.5.0-0ubuntu9) dapper; urgency=low * Add kubuntu_40_xmkmf.diff for new imake/xmkmf path - * Install kcm_kdnssd in kcontrol + * Install kcm_tdednssd in kcontrol * Add kubuntu_41_kcmdnssd_name_icon.diff to make kcontrol module more recognisable @@ -4332,7 +4332,7 @@ tdebase (4:2.1-20010115-1) unstable; urgency=low * More upstream fixes * ask where the mozilla bookmarks are (Closes: #81710) * tip that was annoying to some seems to be gone (Closes: #82253) - * Adding in kscreensaver pam file + * Adding in tdescreensaver pam file * Updating tdmrc to match current features and all * Add a link in /etc/X11/tdm to tdmrc (Closes: #82643) * Updated kde2 start script that fixes overwriting of gtk confs diff --git a/debian/lenny/tdebase/debian/control.in b/debian/lenny/tdebase/debian/control.in index 8194486c3..136828a50 100644 --- a/debian/lenny/tdebase/debian/control.in +++ b/debian/lenny/tdebase/debian/control.in @@ -97,7 +97,7 @@ Architecture: any Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14) Suggests: khelpcenter, gdb Conflicts: tdebase-libs (<< 4:3.0.0), tdm (<< 4:3.4.1-2) -Replaces: kcontrol (<< 4:3.3.0), tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0), kscreensaver (<< 4:3.0.0), tdm (= 4:3.3.2-1b) +Replaces: kcontrol (<< 4:3.3.0), tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0), tdescreensaver (<< 4:3.0.0), tdm (= 4:3.3.2-1b) Description: core binaries for the KDE base module This package contains miscellaneous programs needed by other KDE applications, particularly those in the KDE base module. diff --git a/debian/lenny/tdebase/debian/kcontrol-trinity.install b/debian/lenny/tdebase/debian/kcontrol-trinity.install index e8df7c819..f18eaea23 100644 --- a/debian/lenny/tdebase/debian/kcontrol-trinity.install +++ b/debian/lenny/tdebase/debian/kcontrol-trinity.install @@ -6,7 +6,7 @@ debian/tmp/opt/trinity/bin/kfontinst debian/tmp/opt/trinity/bin/kfontview debian/tmp/opt/trinity/bin/kinfocenter debian/tmp/opt/trinity/bin/klocaldomainurifilterhelper -debian/tmp/opt/trinity/bin/krandrtray +debian/tmp/opt/trinity/bin/tderandrtray debian/tmp/opt/trinity/bin/krdb debian/tmp/opt/trinity/lib/trinity/fontthumbnail.la debian/tmp/opt/trinity/lib/trinity/fontthumbnail.so @@ -58,8 +58,8 @@ debian/tmp/opt/trinity/lib/trinity/kcm_kded.la debian/tmp/opt/trinity/lib/trinity/kcm_kded.so debian/tmp/opt/trinity/lib/trinity/kcm_tdm.la debian/tmp/opt/trinity/lib/trinity/kcm_tdm.so -debian/tmp/opt/trinity/lib/trinity/kcm_kdnssd.so -debian/tmp/opt/trinity/lib/trinity/kcm_kdnssd.la +debian/tmp/opt/trinity/lib/trinity/kcm_tdednssd.so +debian/tmp/opt/trinity/lib/trinity/kcm_tdednssd.la debian/tmp/opt/trinity/lib/trinity/kcm_keys.la debian/tmp/opt/trinity/lib/trinity/kcm_keys.so debian/tmp/opt/trinity/lib/trinity/kcm_kicker.la @@ -158,7 +158,7 @@ debian/tmp/opt/trinity/share/applications/tde/interrupts.desktop debian/tmp/opt/trinity/share/applications/tde/ioports.desktop debian/tmp/opt/trinity/share/applications/tde/ioslaveinfo.desktop debian/tmp/opt/trinity/share/applications/tde/joystick.desktop -debian/tmp/opt/trinity/share/applications/tde/kcm_kdnssd.desktop +debian/tmp/opt/trinity/share/applications/tde/kcm_tdednssd.desktop debian/tmp/opt/trinity/share/applications/tde/kcmaccess.desktop debian/tmp/opt/trinity/share/applications/tde/kcmcss.desktop debian/tmp/opt/trinity/share/applications/tde/kcmfontinst.desktop @@ -174,11 +174,11 @@ debian/tmp/opt/trinity/share/applications/tde/KControl.desktop debian/tmp/opt/trinity/share/applications/tde/tdm.desktop debian/tmp/opt/trinity/share/applications/tde/keys.desktop debian/tmp/opt/trinity/share/applications/tde/kfontview.desktop -debian/tmp/opt/trinity/share/applications/tde/khtml_behavior.desktop -debian/tmp/opt/trinity/share/applications/tde/khtml_fonts.desktop -debian/tmp/opt/trinity/share/applications/tde/khtml_java_js.desktop -debian/tmp/opt/trinity/share/applications/tde/krandrtray.desktop -debian/tmp/opt/trinity/share/autostart/krandrtray-autostart.desktop +debian/tmp/opt/trinity/share/applications/tde/tdehtml_behavior.desktop +debian/tmp/opt/trinity/share/applications/tde/tdehtml_fonts.desktop +debian/tmp/opt/trinity/share/applications/tde/tdehtml_java_js.desktop +debian/tmp/opt/trinity/share/applications/tde/tderandrtray.desktop +debian/tmp/opt/trinity/share/autostart/tderandrtray-autostart.desktop debian/tmp/opt/trinity/share/applications/tde/kthememanager.desktop debian/tmp/opt/trinity/share/applications/tde/iccconfig.desktop debian/tmp/opt/trinity/share/applications/tde/lanbrowser.desktop @@ -218,7 +218,7 @@ debian/tmp/opt/trinity/share/applnk/Settings/LookNFeel/kcmtaskbar.desktop debian/tmp/opt/trinity/share/applnk/Settings/LookNFeel/panel_appearance.desktop debian/tmp/opt/trinity/share/applnk/Settings/LookNFeel/panel.desktop debian/tmp/opt/trinity/share/applnk/Settings/LookNFeel/Themes/iconthemes.desktop -debian/tmp/opt/trinity/share/applnk/Settings/WebBrowsing/khtml_appearance.desktop +debian/tmp/opt/trinity/share/applnk/Settings/WebBrowsing/tdehtml_appearance.desktop debian/tmp/opt/trinity/share/applnk/Settings/WebBrowsing/nsplugin.desktop debian/tmp/opt/trinity/share/applnk/Settings/WebBrowsing/smb.desktop debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_browser.desktop diff --git a/debian/lenny/tdebase/debian/kcontrol-trinity.lintian b/debian/lenny/tdebase/debian/kcontrol-trinity.lintian index d18964b2d..a1120501f 100644 --- a/debian/lenny/tdebase/debian/kcontrol-trinity.lintian +++ b/debian/lenny/tdebase/debian/kcontrol-trinity.lintian @@ -1,3 +1,3 @@ kcontrol: shlib-missing-in-control-file libtdeinit_kaccess.so usr/lib/libtdeinit_kaccess.so kcontrol: shlib-missing-in-control-file libtdeinit_kcontrol.so usr/lib/libtdeinit_kcontrol.so -kcontrol: shlib-missing-in-control-file libtdeinit_krandrinithack.so usr/lib/libtdeinit_krandrinithack.so +kcontrol: shlib-missing-in-control-file libtdeinit_tderandrinithack.so usr/lib/libtdeinit_tderandrinithack.so diff --git a/debian/lenny/tdebase/debian/konqueror-nsplugins-trinity.install b/debian/lenny/tdebase/debian/konqueror-nsplugins-trinity.install index 923c93227..d916322bc 100644 --- a/debian/lenny/tdebase/debian/konqueror-nsplugins-trinity.install +++ b/debian/lenny/tdebase/debian/konqueror-nsplugins-trinity.install @@ -4,5 +4,5 @@ debian/tmp/opt/trinity/lib/trinity/kcm_nsplugins.la debian/tmp/opt/trinity/lib/trinity/kcm_nsplugins.so debian/tmp/opt/trinity/lib/trinity/libnsplugin.la debian/tmp/opt/trinity/lib/trinity/libnsplugin.so -debian/tmp/opt/trinity/share/applications/tde/khtml_plugins.desktop +debian/tmp/opt/trinity/share/applications/tde/tdehtml_plugins.desktop debian/tmp/opt/trinity/share/apps/plugin/nspluginpart.rc diff --git a/debian/lenny/tdebase/debian/konqueror-trinity.install b/debian/lenny/tdebase/debian/konqueror-trinity.install index 71c1d7215..029f25bb6 100644 --- a/debian/lenny/tdebase/debian/konqueror-trinity.install +++ b/debian/lenny/tdebase/debian/konqueror-trinity.install @@ -35,8 +35,8 @@ debian/tmp/opt/trinity/lib/trinity/konqsidebar_web.la debian/tmp/opt/trinity/lib/trinity/konqsidebar_web.so debian/tmp/opt/trinity/lib/trinity/konqueror.la debian/tmp/opt/trinity/lib/trinity/konqueror.so -debian/tmp/opt/trinity/lib/trinity/libkhtmlkttsdplugin.la -debian/tmp/opt/trinity/lib/trinity/libkhtmlkttsdplugin.so +debian/tmp/opt/trinity/lib/trinity/libtdehtmlkttsdplugin.la +debian/tmp/opt/trinity/lib/trinity/libtdehtmlkttsdplugin.so debian/tmp/opt/trinity/lib/libtdeinit_keditbookmarks.so debian/tmp/opt/trinity/lib/libtdeinit_kfmclient.so debian/tmp/opt/trinity/lib/libtdeinit_konqueror.so @@ -48,7 +48,7 @@ debian/tmp/opt/trinity/share/applications/tde/kfmclient.desktop debian/tmp/opt/trinity/share/applications/tde/kfmclient_dir.desktop debian/tmp/opt/trinity/share/applications/tde/kfmclient_html.desktop debian/tmp/opt/trinity/share/applications/tde/kfmclient_war.desktop -debian/tmp/opt/trinity/share/applications/tde/khtml_filter.desktop +debian/tmp/opt/trinity/share/applications/tde/tdehtml_filter.desktop debian/tmp/opt/trinity/share/applications/tde/konqbrowser.desktop debian/tmp/opt/trinity/share/applications/tde/konquerorsu.desktop debian/tmp/opt/trinity/share/applnk/.hidden/konqfilemgr.desktop @@ -60,8 +60,8 @@ debian/tmp/opt/trinity/share/apps/kconf_update/konqsidebartng.upd debian/tmp/opt/trinity/share/apps/kconf_update/move_konqsidebartng_entries.sh debian/tmp/opt/trinity/share/apps/keditbookmarks/keditbookmarks-genui.rc debian/tmp/opt/trinity/share/apps/keditbookmarks/keditbookmarksui.rc -debian/tmp/opt/trinity/share/apps/khtml/kpartplugins/khtmlkttsd.desktop -debian/tmp/opt/trinity/share/apps/khtml/kpartplugins/khtmlkttsd.rc +debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins/tdehtmlkttsd.desktop +debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins/tdehtmlkttsd.rc debian/tmp/opt/trinity/share/apps/konqiconview/konq_iconview.rc debian/tmp/opt/trinity/share/apps/konqiconview/konq_multicolumnview.rc debian/tmp/opt/trinity/share/apps/konqiconview/kpartplugins/kremoteencodingplugin.desktop diff --git a/debian/lenny/tdebase/debian/kscreensaver-trinity.pam b/debian/lenny/tdebase/debian/kscreensaver-trinity.pam deleted file mode 100644 index 088a00503..000000000 --- a/debian/lenny/tdebase/debian/kscreensaver-trinity.pam +++ /dev/null @@ -1,7 +0,0 @@ -# -# /etc/pam.d/kscreensaver - specify the PAM behaviour of kscreensaver -# -@include common-auth -@include common-account -@include common-password -@include common-session diff --git a/debian/lenny/tdebase/debian/rules b/debian/lenny/tdebase/debian/rules index c72887aaa..04b7019e4 100755 --- a/debian/lenny/tdebase/debian/rules +++ b/debian/lenny/tdebase/debian/rules @@ -20,7 +20,7 @@ DEB_KDE_APIDOX := yes CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG) DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" \ --DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DTDM_PAM_SERVICE="tdm-trinity" -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \ +-DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DTDM_PAM_SERVICE="tdm-trinity" -DKSCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \ -DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="OFF" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_HAL="OFF" -DWITH_TDEHWLIB="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON" -DWITH_XTEST="ON" -DWITH_XSCREENSAVER="ON" -DWITH_UPOWER="ON" -DWITH_LIBART="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo @@ -254,7 +254,7 @@ binary-install/klipper-trinity:: binary-install/tdebase-trinity-bin:: install -p -D -m644 debian/kcheckpass-trinity.pam debian/tdebase-trinity-bin/etc/pam.d/kcheckpass-trinity - install -p -D -m644 debian/kscreensaver-trinity.pam debian/tdebase-trinity-bin/etc/pam.d/kscreensaver-trinity + install -p -D -m644 debian/tdescreensaver-trinity.pam debian/tdebase-trinity-bin/etc/pam.d/tdescreensaver-trinity mkdir -p debian/tdebase-trinity-bin/opt/trinity/share/apps/kxkb/ install -p -D -m644 debian/ubuntu.xmodmap debian/tdebase-trinity-bin/opt/trinity/share/apps/kxkb/system.xmodmap install -p -D -m644 debian/80ubuntu-xmodmap debian/tdebase-trinity-bin/etc/X11/Xsession.d/80ubuntu-trinity-xmodmap diff --git a/debian/lenny/tdebase/debian/tdebase-data-trinity.install b/debian/lenny/tdebase/debian/tdebase-data-trinity.install index 9ac6769ea..7f06b6d76 100644 --- a/debian/lenny/tdebase/debian/tdebase-data-trinity.install +++ b/debian/lenny/tdebase/debian/tdebase-data-trinity.install @@ -223,10 +223,10 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keyboard/index.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khtml/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khtml/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khtml/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khtml/nsplugin.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/nsplugin.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.docbook @@ -357,7 +357,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kcontrol.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/tdmconfig.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/key_bindings.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kfm_home.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/licq.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/linuxconf.png @@ -461,7 +461,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/keyboard_layout.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/keyboard.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kfm_home.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/knotify.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kvirc.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/licq.png @@ -563,7 +563,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kcmx.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/tdmconfig.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/key_bindings.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/keyboard.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kvirc.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/locale.png @@ -648,7 +648,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/keyboard_layout.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/keyboard.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kfm_home.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/knotify.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kvirc.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/licq.png @@ -792,7 +792,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/keyboard_layout.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/keyboard.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kfm_home.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/knotify.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kvirc.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/licq.png @@ -888,7 +888,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/tdmconfig.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/key_bindings.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kfm_home.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/knotify.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kvirc.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/licq.png diff --git a/debian/lenny/tdebase/debian/tdescreensaver-trinity.pam b/debian/lenny/tdebase/debian/tdescreensaver-trinity.pam new file mode 100644 index 000000000..9a2c74519 --- /dev/null +++ b/debian/lenny/tdebase/debian/tdescreensaver-trinity.pam @@ -0,0 +1,7 @@ +# +# /etc/pam.d/tdescreensaver - specify the PAM behaviour of tdescreensaver +# +@include common-auth +@include common-account +@include common-password +@include common-session -- cgit v1.2.1