diff options
Diffstat (limited to 'ubuntu')
1113 files changed, 12907 insertions, 7372 deletions
diff --git a/ubuntu/lucid_automake/applications/kde-guidance/debian/changelog b/ubuntu/lucid_automake/applications/kde-guidance/debian/changelog index 06a005706..45e9980fb 100644 --- a/ubuntu/lucid_automake/applications/kde-guidance/debian/changelog +++ b/ubuntu/lucid_automake/applications/kde-guidance/debian/changelog @@ -229,7 +229,7 @@ kde-guidance (0.8.0svn20080103-0ubuntu4) hardy; urgency=low kde-guidance (0.8.0svn20080103-0ubuntu3) hardy; urgency=low * Add Add kubuntu_09_mountconfig_no_extensions.patch to remove uneeded call - to pykdeextensions in mountconfig so that pyqt3 no longer needs to be + to pytdeextensions in mountconfig so that pyqt3 no longer needs to be patched to provide -dev files in the regular package (LP: #197867) * Add kubuntu_10_displayconfig_tryagain.patch so that if displayconfig thinks a proprietary driver is installed, but it can't find it, it @@ -618,7 +618,7 @@ kde-guidance (0.7.1~svn20061215-0ubuntu1) feisty; urgency=low kde-guidance (0.7.1~svn20061124-0ubuntu2) feisty; urgency=low - * Rebuilt against new pykde. + * Rebuilt against new pytde. -- Anthony Mercatante <tonio@ubuntu.com> Wed, 06 Dec 2006 23:40:32 +0100 @@ -913,7 +913,7 @@ kde-guidance (0.6.4-0ubuntu1) dapper; urgency=low * The screen images in the dualhead widget make better use of available widget space. * Displayconfig: The 40guidance-displayconfig_restore script which is used by - the Xsession script during login via KDM/xdm, has now been fixed to not stop + the Xsession script during login via TDM/xdm, has now been fixed to not stop the login in case of failure. * BUG: Displayconfig was getting confused by unknown graphics cards and crashing. (Malone bug #32915) @@ -1029,7 +1029,7 @@ kde-guidance (0.6.2-0ubuntu1) dapper; urgency=low kde-guidance (0.6.1-0ubuntu0) dapper; urgency=low * New release, sets a fixed DPI for Xft - * Add run time dependency on pykdeextensions + * Add run time dependency on pytdeextensions * Add kubuntu_03_userconfig_shebang.diff fix extra space * Change init script to run at S35, Malone No. 32268 diff --git a/ubuntu/lucid_automake/applications/kde-guidance/debian/control b/ubuntu/lucid_automake/applications/kde-guidance/debian/control index 042153e4c..b10286ffe 100644 --- a/ubuntu/lucid_automake/applications/kde-guidance/debian/control +++ b/ubuntu/lucid_automake/applications/kde-guidance/debian/control @@ -6,13 +6,13 @@ XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.de Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> Build-Depends: cdbs, debhelper (>= 5), chrpath, kdelibs4-kde3-dev, libpythonize0-kde3-dev, libtool, libxml2-utils, libxss-dev, libxxf86vm-dev, - pykdeextensions-kde3, pyqt-tools, python-qt3 (>= 3.17.2-1ubuntu2), python-kde3-kde3, python-kde3-kde3-dev, python-sip4-dev, + pytdeextensions-kde3, pyqt-tools, python-qt3 (>= 3.17.2-1ubuntu2), python-kde3-kde3, python-kde3-kde3-dev, python-sip4-dev, python-support (>= 0.6), python (>= 2.5), python-dev (>= 2.5), x11proto-scrnsaver-dev, python-qt-dev, hwdata Standards-Version: 3.8.3 Package: kde-guidance-kde3 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pykdeextensions-kde3, python-kde3-kde3, sysv-rc, guidance-backends-kde3, hwdata, python (>= 2.5), python-dev (>= 2.5) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pytdeextensions-kde3, python-kde3-kde3, sysv-rc, guidance-backends-kde3, hwdata, python (>= 2.5), python-dev (>= 2.5) Conflicts: guidance-power-manager, kde-guidance-powermanager Provides: ${python:Provides} Description: collection of KDE system administration tools for GNU/Linux [KDE3] diff --git a/ubuntu/lucid_automake/applications/kde-guidance/debian/rules b/ubuntu/lucid_automake/applications/kde-guidance/debian/rules index e43bf0768..6de018978 100755 --- a/ubuntu/lucid_automake/applications/kde-guidance/debian/rules +++ b/ubuntu/lucid_automake/applications/kde-guidance/debian/rules @@ -175,7 +175,7 @@ clean:: fi common-install-prehook-impl:: - # generate form implementation using pykde user interface compiler + # generate form implementation using pytde user interface compiler (cd powermanager; /opt/kde3/bin/kdepyuic --usekdei18n guidance_power_manager_ui.ui) (cd powermanager; /opt/kde3/bin/kdepyuic --usekdei18n tooltip.ui) (cd powermanager; /opt/kde3/bin/kdepyuic --usekdei18n notify.ui) diff --git a/ubuntu/lucid_automake/applications/kdmtheme/debian/README.Debian b/ubuntu/lucid_automake/applications/kdmtheme/debian/README.Debian deleted file mode 100644 index 1291b6a32..000000000 --- a/ubuntu/lucid_automake/applications/kdmtheme/debian/README.Debian +++ /dev/null @@ -1,7 +0,0 @@ -kdmtheme for Debian -------------------- - -kdmtheme is a KDE Control Module (KCM). To run it, open KDE Control Center and -go to System Administration to find KDM Theme Manager. - - -- Fathi Boudra <fabo@debian.org>, Mon, 31 Jul 2006 18:33:26 +0200 diff --git a/ubuntu/lucid_automake/applications/kdmtheme/debian/kdmtheme.lintian-overrides b/ubuntu/lucid_automake/applications/kdmtheme/debian/kdmtheme.lintian-overrides deleted file mode 100644 index d033183c7..000000000 --- a/ubuntu/lucid_automake/applications/kdmtheme/debian/kdmtheme.lintian-overrides +++ /dev/null @@ -1,6 +0,0 @@ -# provided by kdelibs -kdmtheme: desktop-command-not-in-package ./usr/share/applications/kde/kdmtheme.desktop kcmshell -# kcontrol module -kdmtheme: desktop-entry-invalid-category X-KDE-settings-system ./usr/share/applications/kde/kdmtheme.desktop -kdmtheme: desktop-entry-lacks-main-category ./usr/share/applications/kde/kdmtheme.desktop - diff --git a/ubuntu/lucid_automake/applications/kdmtheme/debian/watch b/ubuntu/lucid_automake/applications/kdmtheme/debian/watch deleted file mode 100644 index 5cf8d8c80..000000000 --- a/ubuntu/lucid_automake/applications/kdmtheme/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://beta.smileaf.org/files/kdmtheme/kdmtheme-(.*)\.tar\.bz2 debian svn-upgrade diff --git a/ubuntu/lucid_automake/applications/tdmtheme/debian/README.Debian b/ubuntu/lucid_automake/applications/tdmtheme/debian/README.Debian new file mode 100644 index 000000000..066828faf --- /dev/null +++ b/ubuntu/lucid_automake/applications/tdmtheme/debian/README.Debian @@ -0,0 +1,7 @@ +tdmtheme for Debian +------------------- + +tdmtheme is a KDE Control Module (KCM). To run it, open KDE Control Center and +go to System Administration to find TDM Theme Manager. + + -- Fathi Boudra <fabo@debian.org>, Mon, 31 Jul 2006 18:33:26 +0200 diff --git a/ubuntu/lucid_automake/applications/kdmtheme/debian/cdbs/buildvars.mk b/ubuntu/lucid_automake/applications/tdmtheme/debian/cdbs/buildvars.mk index 23d4709dc..23d4709dc 100644 --- a/ubuntu/lucid_automake/applications/kdmtheme/debian/cdbs/buildvars.mk +++ b/ubuntu/lucid_automake/applications/tdmtheme/debian/cdbs/buildvars.mk diff --git a/ubuntu/lucid_automake/applications/kdmtheme/debian/cdbs/debian-qt-kde.mk b/ubuntu/lucid_automake/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk index 2be8f97f1..2be8f97f1 100644 --- a/ubuntu/lucid_automake/applications/kdmtheme/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/lucid_automake/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk diff --git a/ubuntu/lucid_automake/applications/kdmtheme/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/tdmtheme/debian/cdbs/kde.mk index 9e4117558..9e4117558 100644 --- a/ubuntu/lucid_automake/applications/kdmtheme/debian/cdbs/kde.mk +++ b/ubuntu/lucid_automake/applications/tdmtheme/debian/cdbs/kde.mk diff --git a/ubuntu/lucid_automake/applications/kdmtheme/debian/cdbs/team-members b/ubuntu/lucid_automake/applications/tdmtheme/debian/cdbs/team-members index 05761af6e..05761af6e 100644 --- a/ubuntu/lucid_automake/applications/kdmtheme/debian/cdbs/team-members +++ b/ubuntu/lucid_automake/applications/tdmtheme/debian/cdbs/team-members diff --git a/ubuntu/lucid_automake/applications/kdmtheme/debian/cdbs/uploaders.mk b/ubuntu/lucid_automake/applications/tdmtheme/debian/cdbs/uploaders.mk index 31adfe31e..31adfe31e 100644 --- a/ubuntu/lucid_automake/applications/kdmtheme/debian/cdbs/uploaders.mk +++ b/ubuntu/lucid_automake/applications/tdmtheme/debian/cdbs/uploaders.mk diff --git a/ubuntu/lucid_automake/applications/kdmtheme/debian/cdbs/versions.pl b/ubuntu/lucid_automake/applications/tdmtheme/debian/cdbs/versions.pl index 9ce11d8a3..9ce11d8a3 100644 --- a/ubuntu/lucid_automake/applications/kdmtheme/debian/cdbs/versions.pl +++ b/ubuntu/lucid_automake/applications/tdmtheme/debian/cdbs/versions.pl diff --git a/ubuntu/lucid_automake/applications/kdmtheme/debian/changelog b/ubuntu/lucid_automake/applications/tdmtheme/debian/changelog index 6616a464e..c6ee15979 100644 --- a/ubuntu/lucid_automake/applications/kdmtheme/debian/changelog +++ b/ubuntu/lucid_automake/applications/tdmtheme/debian/changelog @@ -1,17 +1,17 @@ -kdmtheme-kde3 (1.2.2-1ubuntu5) karmic; urgency=low +tdmtheme-kde3 (1.2.2-1ubuntu5) karmic; urgency=low * Karmic rebuild * Fixed theme switching problem -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 02 July 2009 16:08:00 -0600 -kdmtheme-kde3 (1.2.2-1ubuntu1) intrepid; urgency=low +tdmtheme-kde3 (1.2.2-1ubuntu1) intrepid; urgency=low * Added -kde3 suffix -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 27 Apr 2009 19:00:00 -0600 -kdmtheme (1.2.2-1ubuntu1) intrepid; urgency=low +tdmtheme (1.2.2-1ubuntu1) intrepid; urgency=low [ Sergey Rudchenko ] * Merge from debian unstable, remaining changes: @@ -23,7 +23,7 @@ kdmtheme (1.2.2-1ubuntu1) intrepid; urgency=low -- Harald Sitter <apachelogger@ubuntu.com> Fri, 06 Jun 2008 00:46:45 +0200 -kdmtheme (1.2.2-1) unstable; urgency=low +tdmtheme (1.2.2-1) unstable; urgency=low * New upstream release: * actually saves theme changes (Closes: #447683) @@ -33,7 +33,7 @@ kdmtheme (1.2.2-1) unstable; urgency=low * Use Homepage field. [ Kel Modderman ] - * Refresh debian/patches/10_kdmtheme-override-warning.diff to apply against + * Refresh debian/patches/10_tdmtheme-override-warning.diff to apply against new upstream release. [ Fathi Boudra ] @@ -41,22 +41,22 @@ kdmtheme (1.2.2-1) unstable; urgency=low -- Fathi Boudra <fabo@debian.org> Sat, 22 Dec 2007 15:36:15 +0100 -kdmtheme (1.2.2-0ubuntu2) hardy; urgency=low +tdmtheme (1.2.2-0ubuntu2) hardy; urgency=low * Re-adds kubuntu_02_confchanges.diff. Patch from Stefan Skotte -- Anthony Mercatante <tonio@ubuntu.com> Fri, 15 Feb 2008 10:25:44 +0100 -kdmtheme (1.2.2-0ubuntu1) hardy; urgency=low +tdmtheme (1.2.2-0ubuntu1) hardy; urgency=low * New upstream release. - * Removed 10_kdmtheme-override-warning.diff. + * Removed 10_tdmtheme-override-warning.diff. * Removed kubuntu_02_confchanges.diff. * Updated Standards-Version to 3.7.3 -- Jonathan Patrick Davies <jpatrick@kubuntu.org> Mon, 22 Dec 2007 11:48:18 +0100 -kdmtheme (1.2.1-0ubuntu1) hardy; urgency=low +tdmtheme (1.2.1-0ubuntu1) hardy; urgency=low * New upstream release. * Merged new Debian changelog and changes to Ubuntu package. @@ -67,10 +67,10 @@ kdmtheme (1.2.1-0ubuntu1) hardy; urgency=low -- Jonathan Patrick Davies <jpatrick@kubuntu.org> Mon, 22 Oct 2007 21:18:56 +0200 -kdmtheme (1.2-1) unstable; urgency=low +tdmtheme (1.2-1) unstable; urgency=low * New upstream release. - * Update kdmtheme override warning patch. + * Update tdmtheme override warning patch. * Add patch to replace deprecated qlist.h include. * Add Build-Depends: quilt, automake1.7. * Update copyright file. @@ -78,11 +78,11 @@ kdmtheme (1.2-1) unstable; urgency=low -- Fathi Boudra <fboudra@free.fr> Wed, 03 Oct 2007 12:17:40 +0200 -kdmtheme (1.2-0ubuntu2) gutsy; urgency=low +tdmtheme (1.2-0ubuntu2) gutsy; urgency=low [ Stefan Skotte ] - * added support for kdm.d with override files. - * various bugfixes for normal kdmrc usage, including save and apply + * added support for tdm.d with override files. + * various bugfixes for normal tdmrc usage, including save and apply not working, themeDir not set correctly etc. [ Sarah Hobbs ] @@ -91,31 +91,31 @@ kdmtheme (1.2-0ubuntu2) gutsy; urgency=low -- Sarah Hobbs <hobbsee@ubuntu.com> Fri, 05 Oct 2007 19:09:00 +1000 -kdmtheme (1.2-0ubuntu1) gutsy; urgency=low +tdmtheme (1.2-0ubuntu1) gutsy; urgency=low * New upstream release -- Anthony Mercatante <tonio@ubuntu.com> Sat, 29 Sep 2007 11:17:55 +0200 -kdmtheme (1.1.2-2ubuntu1) feisty; urgency=low +tdmtheme (1.1.2-2ubuntu1) feisty; urgency=low * Added kubuntu_01_kcm_systemsettings.diff for kde-systemsettings inclusion in the Appearance section -- Anthony Mercatante <tonio@ubuntu.com> Tue, 13 Feb 2007 06:18:32 +0100 -kdmtheme (1.1.2-2) unstable; urgency=low +tdmtheme (1.1.2-2) unstable; urgency=low [ Mark Purcell ] * Add debian/rules get-orig-source target for http://buildserver.net. [ Fathi Boudra ] - * Add a patch to warn users about kdm override files introduced with + * Add a patch to warn users about tdm override files introduced with desktop-base. Thanks to Sune Vuorela. -- Fathi Boudra <fboudra@free.fr> Wed, 31 Jan 2007 21:11:45 +0100 -kdmtheme (1.1.2-1) unstable; urgency=low +tdmtheme (1.1.2-1) unstable; urgency=low * Initial release (Closes: #380661) diff --git a/ubuntu/lucid_automake/applications/kdmtheme/debian/compat b/ubuntu/lucid_automake/applications/tdmtheme/debian/compat index 7ed6ff82d..7ed6ff82d 100644 --- a/ubuntu/lucid_automake/applications/kdmtheme/debian/compat +++ b/ubuntu/lucid_automake/applications/tdmtheme/debian/compat diff --git a/ubuntu/maverick_automake/applications/kdmtheme/debian/control b/ubuntu/lucid_automake/applications/tdmtheme/debian/control index 01d108f2d..6bbeb4779 100644 --- a/ubuntu/maverick_automake/applications/kdmtheme/debian/control +++ b/ubuntu/lucid_automake/applications/tdmtheme/debian/control @@ -1,4 +1,4 @@ -Source: kdmtheme-kde3 +Source: tdmtheme-kde3 Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> @@ -9,9 +9,9 @@ Build-Depends: cdbs, debhelper (>= 5), quilt, kdelibs4-kde3-dev, automake1.11-kd Standards-Version: 3.8.3 Homepage: http://beta.smileaf.org/projects -Package: kdmtheme-kde3 +Package: tdmtheme-kde3 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, kdm-kde3 -Description: theme manager for KDM [KDE3] - kdmtheme is a theme manager for KDM. It provides a KDE Control Module (KCM) - that allows you to easily install, remove and change your KDM themes. +Depends: ${shlibs:Depends}, ${misc:Depends}, tdm-kde3 +Description: theme manager for TDM [KDE3] + tdmtheme is a theme manager for TDM. It provides a KDE Control Module (KCM) + that allows you to easily install, remove and change your TDM themes. diff --git a/ubuntu/maverick/applications/kdmtheme/debian/copyright b/ubuntu/lucid_automake/applications/tdmtheme/debian/copyright index 23265e2b6..c8d6d972f 100644 --- a/ubuntu/maverick/applications/kdmtheme/debian/copyright +++ b/ubuntu/lucid_automake/applications/tdmtheme/debian/copyright @@ -36,7 +36,7 @@ Public License can be found in `/usr/share/common-licenses/GPL'. The Debian packaging is (C) 2007, Kel Modderman <kel@otaku42.de> and is licensed under the GPL, see above. -The documentations provided with kdmtheme is distributed under +The documentations provided with tdmtheme is distributed under the GNU Free Documentation License (FDL). They are considered free with regards to the Debian Free Software Guidelines (DFSG) because they don't contain any unmodifiable parts (invariant sections). diff --git a/ubuntu/lucid_automake/applications/kdmtheme/debian/docs b/ubuntu/lucid_automake/applications/tdmtheme/debian/docs index e845566c0..e845566c0 100644 --- a/ubuntu/lucid_automake/applications/kdmtheme/debian/docs +++ b/ubuntu/lucid_automake/applications/tdmtheme/debian/docs diff --git a/ubuntu/lucid_automake/applications/kdmtheme/debian/patches/.gitignore b/ubuntu/lucid_automake/applications/tdmtheme/debian/patches/.gitignore index e69de29bb..e69de29bb 100644 --- a/ubuntu/lucid_automake/applications/kdmtheme/debian/patches/.gitignore +++ b/ubuntu/lucid_automake/applications/tdmtheme/debian/patches/.gitignore diff --git a/ubuntu/maverick_automake/applications/kdmtheme/debian/rules b/ubuntu/lucid_automake/applications/tdmtheme/debian/rules index c6fa4d063..bcd40a219 100755 --- a/ubuntu/maverick_automake/applications/kdmtheme/debian/rules +++ b/ubuntu/lucid_automake/applications/tdmtheme/debian/rules @@ -27,9 +27,9 @@ debian/stamp-bootstrap: make -f admin/Makefile.common cvs touch debian/stamp-bootstrap -install/kdmtheme-kde3:: - install -D -p -m644 debian/kdmtheme.lintian-overrides \ - debian/kdmtheme-kde3/usr/share/lintian/overrides/kdmtheme-kde3 +install/tdmtheme-kde3:: + install -D -p -m644 debian/tdmtheme.lintian-overrides \ + debian/tdmtheme-kde3/usr/share/lintian/overrides/tdmtheme-kde3 get-orig-source: @@dh_testdir diff --git a/ubuntu/lucid_automake/applications/tdmtheme/debian/tdmtheme.lintian-overrides b/ubuntu/lucid_automake/applications/tdmtheme/debian/tdmtheme.lintian-overrides new file mode 100644 index 000000000..d27349d54 --- /dev/null +++ b/ubuntu/lucid_automake/applications/tdmtheme/debian/tdmtheme.lintian-overrides @@ -0,0 +1,6 @@ +# provided by kdelibs +tdmtheme: desktop-command-not-in-package ./usr/share/applications/kde/tdmtheme.desktop kcmshell +# kcontrol module +tdmtheme: desktop-entry-invalid-category X-KDE-settings-system ./usr/share/applications/kde/tdmtheme.desktop +tdmtheme: desktop-entry-lacks-main-category ./usr/share/applications/kde/tdmtheme.desktop + diff --git a/ubuntu/lucid_automake/applications/tdmtheme/debian/watch b/ubuntu/lucid_automake/applications/tdmtheme/debian/watch new file mode 100644 index 000000000..82cebbd47 --- /dev/null +++ b/ubuntu/lucid_automake/applications/tdmtheme/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://beta.smileaf.org/files/tdmtheme/tdmtheme-(.*)\.tar\.bz2 debian svn-upgrade diff --git a/ubuntu/lucid_automake/dependencies/arts/debian/patches/11_path_max_hurd.diff b/ubuntu/lucid_automake/dependencies/arts/debian/patches/11_path_max_hurd.diff index e2deeda88..b35d4a2e0 100644 --- a/ubuntu/lucid_automake/dependencies/arts/debian/patches/11_path_max_hurd.diff +++ b/ubuntu/lucid_automake/dependencies/arts/debian/patches/11_path_max_hurd.diff @@ -38,7 +38,7 @@ + string user_tmp_dir; int uid = getuid(); const char *home_dir = getenv("HOME"); - const char *kde_home = uid ? getenv("KDEHOME") : getenv("KDEROOTHOME"); + const char *kde_home = uid ? getenv("TDEHOME") : getenv("KDEROOTHOME"); @@ -88,7 +88,7 @@ if (!tmp || !tmp[0]) tmp = "/tmp"; @@ -54,11 +54,11 @@ - strncpy(user_tmp_dir, tmp, PATH_MAX ); - user_tmp_dir[ PATH_MAX ] = '\0'; -- strncat(user_tmp_dir, "/ksocket-", PATH_MAX - strlen(user_tmp_dir) ); +- strncat(user_tmp_dir, "/tdesocket-", PATH_MAX - strlen(user_tmp_dir) ); - user_tmp_dir[ PATH_MAX ] = '\0'; - strncat(user_tmp_dir, pw_ent->pw_name, PATH_MAX - strlen(user_tmp_dir)); - user_tmp_dir[ PATH_MAX ] = '\0'; -+ user_tmp_dir = string(tmp) + "/ksocket-" + string(pw_ent->pw_name); ++ user_tmp_dir = string(tmp) + "/tdesocket-" + string(pw_ent->pw_name); if (!kde_home || !kde_home[0]) { @@ -110,7 +110,7 @@ + result = lstat(kde_tmp_dir.c_str(), &stat_buf); if ((result == 0) && (S_ISDIR(stat_buf.st_mode))) { - /* $KDEHOME/socket-$HOSTNAME is a normal directory. Do nothing. */ + /* $TDEHOME/socket-$HOSTNAME is a normal directory. Do nothing. */ - tmp_buf = (char *) malloc(PATH_MAX+1); - if (!tmp_buf) - return 0; @@ -184,7 +184,7 @@ + char *tmp_buf; int uid = getuid(); const char *home_dir = getenv("HOME"); - const char *kde_home = uid ? getenv("KDEHOME") : getenv("KDEROOTHOME"); + const char *kde_home = uid ? getenv("TDEHOME") : getenv("KDEROOTHOME"); int result; struct stat stat_buf; @@ -259,7 +259,7 @@ + result = lstat(kde_tmp_dir.c_str(), &stat_buf); if ((result == 0) && (S_ISDIR(stat_buf.st_mode))) { - /* $KDEHOME/tmp is a normal directory. Do nothing. */ + /* $TDEHOME/tmp is a normal directory. Do nothing. */ - printf("Directory \"%s\" already exists.\n", kde_tmp_dir); + printf("Directory \"%s\" already exists.\n", kde_tmp_dir.c_str()); return 0; @@ -363,10 +363,10 @@ - char tmp_prefix[PATH_MAX+1]; - strcpy(tmp_prefix, tmp); -- strcat(tmp_prefix, "/ksocket-"); +- strcat(tmp_prefix, "/tdesocket-"); - - build_link(tmp_prefix, "/socket-"); -+ build_link(string(tmp) + "/ksocket-", "/socket-"); ++ build_link(string(tmp) + "/tdesocket-", "/socket-"); mcop_dir = locate_mcop_dir(); } if (!mcop_dir) diff --git a/ubuntu/lucid_automake/kde-i18n/debian/changelog b/ubuntu/lucid_automake/kde-i18n/debian/changelog index bb07a09c6..b4a427061 100644 --- a/ubuntu/lucid_automake/kde-i18n/debian/changelog +++ b/ubuntu/lucid_automake/kde-i18n/debian/changelog @@ -300,7 +300,7 @@ kde-i18n (4:3.2.2-3) unstable; urgency=low kde-i18n (4:3.2.2-2) unstable; urgency=low - * corrected juk and kcachegrind conflict to <<4:3.2.1-1 + * corrected juk and tdecachegrind conflict to <<4:3.2.1-1 * conflicting with kdevelop-data (kdevelop version 2) because kdevelop version 3 translations are included in kde-i18n @@ -410,7 +410,7 @@ kde-i18n (4:3.1-1) unstable; urgency=low (closes: Bug#172383) * default charset is now utf-8 (closes: Bug#172361) - * kdm in localized for pt_BR + * tdm in localized for pt_BR (closes: Bug#116046) -- Noel Koethe <noel@debian.org> Mon, 3 Feb 2003 20:42:00 +0100 diff --git a/ubuntu/lucid_automake/kdebase/debian/KUBUNTU-DEBIAN-CHANGES b/ubuntu/lucid_automake/kdebase/debian/KUBUNTU-DEBIAN-CHANGES index 830d36711..ab3d75478 100644 --- a/ubuntu/lucid_automake/kdebase/debian/KUBUNTU-DEBIAN-CHANGES +++ b/ubuntu/lucid_automake/kdebase/debian/KUBUNTU-DEBIAN-CHANGES @@ -13,7 +13,7 @@ remove debian/tmp/share/apps/konqsidebartng/entries/system.desktop remove .svgz from kdebase-data.install -replace 10_kdmrc_defaults.diff with 10_kdmrc_defaults_kubuntu.diff +replace 10_tdmrc_defaults.diff with 10_tdmrc_defaults_kubuntu.diff install/klipper:: sed -i '/X-Ubuntu-Gettext-Domain=/d' debian/tmp/etc/kde3/klipperrc @@ -34,7 +34,7 @@ kdebase-data.install: debian/tmp/etc/xdg/menus/applications-merged/kde-essential in konsole.README.Debian s/fontconfig/fontconfig-config -in kdm.postinst install at s/99/13/ +in tdm.postinst install at s/99/13/ from kdebase-kio-plugins.install remove debian/tmp/usr/share/services/kfile_trash.desktop (that's to remove the trash from the "system applet") @@ -42,7 +42,7 @@ add debian/ubuntu.xmodmap debian/80ubuntu-xmodmap and add install rules to bina control: khelpcenter, suggest don't depend on htdig -kdm.init: Launch usplash_down at the end of the stop section +tdm.init: Launch usplash_down at the end of the stop section Added konqueror dependancy for konqueror-nsplugins. (LP: #139893) diff --git a/ubuntu/lucid_automake/kdebase/debian/NEWS b/ubuntu/lucid_automake/kdebase/debian/NEWS index f82a204b7..0424fa2fc 100644 --- a/ubuntu/lucid_automake/kdebase/debian/NEWS +++ b/ubuntu/lucid_automake/kdebase/debian/NEWS @@ -1,44 +1,44 @@ kdebase (4:3.4.2-3) unstable; urgency=low - *** Changes to KDM conffiles: + *** Changes to TDM conffiles: - * Users upgrading KDM from 3.3.x, will find that KDM no longer uses the - /etc/kde3/kdm/Xservers file, if /etc/kde3/kdm/kdmrc was updated to - the version shipped with KDM 3.4.x. The package upgrade scripts - will not remove Xservers even if kdmrc has been upgraded, if they detect + * Users upgrading TDM from 3.3.x, will find that TDM no longer uses the + /etc/kde3/tdm/Xservers file, if /etc/kde3/tdm/tdmrc was updated to + the version shipped with TDM 3.4.x. The package upgrade scripts + will not remove Xservers even if tdmrc has been upgraded, if they detect local modifications. This should allow administrators to merge their - Xservers changes into kdmrc before themselves removing Xservers. The new - ServerArgsLocal key in kdmrc is where most old Xservers customizations + Xservers changes into tdmrc before themselves removing Xservers. The new + ServerArgsLocal key in tdmrc is where most old Xservers customizations should be placed. * Irrespective of the removal of the Xservers file, we highly recommend that - all administrators accept the installation of the updated kdmrc file - during the package upgrade. Many important changes to KDM's defaults have - been made, and KDM is exceedingly bad at handling anything but the latest - kdmrc format, so the nuissance of re-customizing KDM will likely prove - less than the nuissance of dealing with a KDM that isn't working properly. - If you have already upgraded KDM package without accepting the new kdmrc, + all administrators accept the installation of the updated tdmrc file + during the package upgrade. Many important changes to TDM's defaults have + been made, and TDM is exceedingly bad at handling anything but the latest + tdmrc format, so the nuissance of re-customizing TDM will likely prove + less than the nuissance of dealing with a TDM that isn't working properly. + If you have already upgraded TDM package without accepting the new tdmrc, purging and reinstalling the package should achieve the desired result. *** Changes to user login script handling: - * Another important change that users upgrading from KDM 3.3.x may notice - is that KDM's ability to source personal login scripts, long disabled, has + * Another important change that users upgrading from TDM 3.3.x may notice + is that TDM's ability to source personal login scripts, long disabled, has been restored. The exact files sourced on login will depend on the user's - choice of shell. For users of bash, KDM will source /etc/profile, followed - by ~/.bash_profile or, if that is not present, ~/.profile. Note that KDM + choice of shell. For users of bash, TDM will source /etc/profile, followed + by ~/.bash_profile or, if that is not present, ~/.profile. Note that TDM is NOT spawning a login shell, but is merely mimicking the behaviour that popular shells would exhibit if they were login shells, by manually - sourcing the customary login scripts. /etc/kde3/kdm/Xsession controls this + sourcing the customary login scripts. /etc/kde3/tdm/Xsession controls this behaviour. - * The important downside of the above approach is that KDM will utterly fail + * The important downside of the above approach is that TDM will utterly fail to start a user's session if the newly sourced files contain certain types of commands. For instance, many commands will cause the login attempt to fail because they expect an interactive shell, or because you are trying to "exec" something that cannot provide an X session. For instance, "exec ksmserver" will launch KDE, but "exec bash" will fail. Thus if you - are unsure why KDM is refusing to start your session, try commenting out + are unsure why TDM is refusing to start your session, try commenting out elements of the newly sourced login scripts, and you may find the problem resolved. @@ -47,24 +47,24 @@ kdebase (4:3.4.2-3) unstable; urgency=low kdebase (4:3.3.2-1) unstable; urgency=low * Users upgrading from KDE 3.2 might find that their keyboards seem no longer - to work in KDM. This problem is caused by a change in KDE's handling of - virtual terminals. The setting which puts KDM on vt7, which was contained - in /etc/kde3/kdm/Xservers, has changed, and is also now located in - /etc/kde3/kdm/kdmrc. + to work in TDM. This problem is caused by a change in KDE's handling of + virtual terminals. The setting which puts TDM on vt7, which was contained + in /etc/kde3/tdm/Xservers, has changed, and is also now located in + /etc/kde3/tdm/tdmrc. * Users who, when upgrading to KDE 3.3, opted to replace their Xservers file with the version shipped by the package, but chose to retain their - /etc/kde3/kdm/kdmrc file, will thus have a KDM configuration which nowhere - contains a setting which properly places KDM on vt7. This can result in a + /etc/kde3/tdm/tdmrc file, will thus have a TDM configuration which nowhere + contains a setting which properly places TDM on vt7. This can result in a race condition which has the end effect of breaking the keyboard when using - KDM. + TDM. * The solution to the problem is either to replace both of Xservers and - kdmrc, or neither, when upgrading to KDE 3.3 for the first time. + tdmrc, or neither, when upgrading to KDE 3.3 for the first time. - * Users already stuck can, after killing KDE, purge and re-install the kdm + * Users already stuck can, after killing KDE, purge and re-install the tdm package, ensuring that the latest, fresh copies are installed. - Alternatively, they can edit /etc/kde3/kdm/kdmrc and add the following + Alternatively, they can edit /etc/kde3/tdm/tdmrc and add the following line: ServerVTs=-7 diff --git a/ubuntu/lucid_automake/kdebase/debian/changelog b/ubuntu/lucid_automake/kdebase/debian/changelog index 994546f0b..48d83199c 100644 --- a/ubuntu/lucid_automake/kdebase/debian/changelog +++ b/ubuntu/lucid_automake/kdebase/debian/changelog @@ -60,13 +60,13 @@ kdebase-kde3 (4:3.5.10-2ubuntu3) karmic; urgency=low kdebase-kde3 (4:3.5.10-2ubuntu2) karmic; urgency=low * Added Start menu button icon configuration dialog - * Delayed kdm-kde3 startup to allow for graphics device configuration + * Delayed tdm-kde3 startup to allow for graphics device configuration -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sun, 18 Oct 2009 16:21:00 -0600 kdebase-kde3 (4:3.5.10-1ubuntu5) karmic; urgency=low - * Added new ICC loading functionality to kcontrol and kdm + * Added new ICC loading functionality to kcontrol and tdm * Added new display output switching functionality to krandrtray * Beginnings of customizable K menu icon @@ -81,7 +81,7 @@ kdebase-kde3 (4:3.5.10-1ubuntu4) karmic; urgency=low kdebase-kde3 (4:3.5.10-1ubuntu3) karmic; urgency=low - * Default KDM theme set to kubuntu-kde3 + * Default TDM theme set to kubuntu-kde3 -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 10 Oct 2009 12:19:00 -0600 @@ -99,7 +99,7 @@ kdebase-kde3 (4:3.5.10-1ubuntu0) karmic; urgency=low kdebase-kde3 (4:3.5.10-0ubuntu12) karmic; urgency=low - * Repaired kdm looking at the wrong pam.d files + * Repaired tdm looking at the wrong pam.d files -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 10 Sep 2009 11:20:00 -0600 @@ -171,14 +171,14 @@ kdebase-kde3 (4:3.5.10-0ubuntu4~intrepid6) intrepid; urgency=low kdebase-kde3 (4:3.5.10-0ubuntu4~intrepid4) intrepid; urgency=low - * Repaired KDM DATAPATH problem + * Repaired TDM DATAPATH problem -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Fri, 20 Mar 2009 10:22:00 -0600 kdebase-kde3 (4:3.5.10-0ubuntu4~intrepid2) intrepid; urgency=low * Repaired accidental conflict with /etc/sysguarddrc - * Repared KDM PATH (fixes bug #56) + * Repared TDM PATH (fixes bug #56) -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 17 Mar 2009 14:03:00 -0600 @@ -190,13 +190,13 @@ kdebase-kde3 (4:3.5.10-0ubuntu4~intrepid0) intrepid; urgency=low kdebase-kde3 (4:3.5.10-0ubuntu3~intrepid19) intrepid; urgency=low - * Repaired default kdm icons + * Repaired default tdm icons -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 07 Mar 2009 13:18:00 -0600 kdebase-kde3 (4:3.5.10-0ubuntu3~intrepid18) intrepid; urgency=low - * Added XDG_DATA_DIRS and KDEDIRS to startkde, as suggested by zekica on the Kubuntu forums + * Added XDG_DATA_DIRS and TDEDIRS to startkde, as suggested by zekica on the Kubuntu forums -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 07 Mar 2009 13:18:00 -0600 @@ -299,7 +299,7 @@ kdebase (4:3.5.10-0ubuntu1~hardy2) hardy-backports; urgency=low kdebase (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low * New upstream bugfix release (LP: #261366) - - 13_kdm_sessions_fixes.diff freshen patch + - 13_tdm_sessions_fixes.diff freshen patch - kubuntu_9908_nodisplay_opengl.diff freshen patch - Bump version of kdelibs-dev to 3.5.10 @@ -382,14 +382,14 @@ kdebase (4:3.5.9-0ubuntu1) hardy; urgency=low * New upstream release [ Terence Simpson ] - * Fix config script for kdm to detect kdm-kde4 + * Fix config script for tdm to detect tdm-kde4 -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 14 Feb 2008 12:27:06 +0000 kdebase (4:3.5.8-2ubuntu21) hardy; urgency=low - * Add kubuntu_9921_kdm_bulletproof_x.diff, adds bulletproof X - feature to KDM. + * Add kubuntu_9921_tdm_bulletproof_x.diff, adds bulletproof X + feature to TDM. -- Eugene Tretyak <etretyak@gmail.com> Thu, 14 Feb 2008 10:40:12 +0000 @@ -403,15 +403,15 @@ kdebase (4:3.5.8-2ubuntu20) hardy; urgency=low kdebase (4:3.5.8-2ubuntu19) hardy; urgency=low * kdebase-kio-plugins replaces old kdebase-data, closes LP: #189963 - * Remove 70_kdm_consolekit.diff replace with kubuntu_70_kdm_consolekit.diff, + * Remove 70_tdm_consolekit.diff replace with kubuntu_70_tdm_consolekit.diff, updated version from http://bugs.kde.org/show_bug.cgi?id=147790 -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 08 Feb 2008 12:32:50 +0000 kdebase (4:3.5.8-2ubuntu18) hardy; urgency=low - * Edited debian/patches/70_kdm_consolekit.diff to fix a crash - when attempting to connect to local kdm via XDMCP (Closes LP: #178242) + * Edited debian/patches/70_tdm_consolekit.diff to fix a crash + when attempting to connect to local tdm via XDMCP (Closes LP: #178242) Thanks to Paul Brook for debbuging this, and to Zoogie for reporting this -- Maxim Levitsky <maximlevitsky@gmail.com> Tue, 06 Feb 2008 00:39:44 +0000 @@ -461,14 +461,14 @@ kdebase (4:3.5.8-2ubuntu14) hardy; urgency=low kdebase (4:3.5.8-2ubuntu13) hardy; urgency=low - * Added kubuntu_9919_kdm_preferuser.diff, uses the kubuntu-default- + * Added kubuntu_9919_tdm_preferuser.diff, uses the kubuntu-default- settings's settings for facesource if any -- Anthony Mercatante <tonio@kubuntu> Fri, 04 Jan 2008 15:50:02 +0100 kdebase (4:3.5.8-2ubuntu12) hardy; urgency=low - * Really fix kubuntu_9918_kdm_systemlocale.diff + * Really fix kubuntu_9918_tdm_systemlocale.diff -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 04 Jan 2008 11:11:38 +0000 @@ -481,8 +481,8 @@ kdebase (4:3.5.8-2ubuntu11) hardy; urgency=low kdebase (4:3.5.8-2ubuntu10) hardy; urgency=low - * Added kubuntu_9918_kdm_systemlocale.diff: - - KDM uses the system locale + * Added kubuntu_9918_tdm_systemlocale.diff: + - TDM uses the system locale -- Anthony Mercatante <tonio@kubuntu> Wed, 02 Jan 2008 12:56:51 +0100 @@ -522,8 +522,8 @@ kdebase (4:3.5.8-2ubuntu6) hardy; urgency=low kdebase (4:3.5.8-2ubuntu5) hardy; urgency=low - * Add kubuntu_9914_kdm_user_image_check.diff from upstream - fixes potential KDM local DoS if users set an invalid image + * Add kubuntu_9914_tdm_user_image_check.diff from upstream + fixes potential TDM local DoS if users set an invalid image Closes LP: #176347 -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 14 Dec 2007 12:24:17 +0000 @@ -567,7 +567,7 @@ kdebase (4:3.5.8.dfsg.1-2) unstable; urgency=low +++ Changes by Fathi Boudra: - * Remove /usr/bin/X11 from KDM's default session path. (Closes: 441392) + * Remove /usr/bin/X11 from TDM's default session path. (Closes: 441392) * Add support for ConsoleKit. Thanks to Michael Biebl, William Jon McCann and Kevin Kofler. (Closes: #450603) @@ -614,7 +614,7 @@ kdebase (4:3.5.8.dfsg.1-1) unstable; urgency=low - 24_knotify_arts.diff - 41_nspluginviewer_64bit_fix.diff - 50_several-CVE-konqueror.diff - - 51_CVE-2007-4569-kdm-autologin.diff + - 51_CVE-2007-4569-tdm-autologin.diff - 60_new-debshortcut.diff * Redo buildprep. * Bump build-dependencies and stuff to 3.5.8. @@ -648,7 +648,7 @@ kdebase (4:3.5.7.dfsg.1-1) unstable; urgency=low kdebase (4:3.5.7-4) unstable; urgency=low - * Add patch to fix unauthorized login problem in kdm. + * Add patch to fix unauthorized login problem in tdm. CVE-2007-4569. -- Sune Vuorela <debian@pusling.com> Wed, 19 Sep 2007 20:30:01 +0200 @@ -664,7 +664,7 @@ kdebase (4:3.5.7-3) unstable; urgency=low +++ Changes by Fathi Boudra: - * Add xserver-xorg Recommends to kdm. (Closes: #436573) + * Add xserver-xorg Recommends to tdm. (Closes: #436573) -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 27 Jul 2007 16:29:18 +0200 @@ -678,7 +678,7 @@ kdebase (4:3.5.7-2) unstable; urgency=low (Closes: #427843) * Updated nb debconf translation. (Closes: #417942) * Fix typo in startkde manpage. Thanks A. Costa. (Closes: #432062) - * Fix typo in kdmrc. Thanks Greg. (Closes: #422142) + * Fix typo in tdmrc. Thanks Greg. (Closes: #422142) * Updated vi debconf translation. Thanks Clytie Siddall (Closes: #426820) * Updated pt_BR debconf translation. Thanks Eder L. Marques. (Closes: #422285) @@ -735,11 +735,11 @@ kdebase (4:3.5.7-1ubuntu25) gutsy; urgency=low kdebase (4:3.5.7-1ubuntu24) gutsy; urgency=low [ Richard A. Johnson ] - * SECURITY UPDATE: KDM password-less login - * KDM can be tricked into performing a password-less login even for accounts + * SECURITY UPDATE: TDM password-less login + * TDM can be tricked into performing a password-less login even for accounts with a password set under certain circumstances, namely autologin to be configured and "shutdown with password" enabled. - * Add kubuntu_sec_03_kdm_pwless_login.diff for session.c to fix KDM + * Add kubuntu_sec_03_tdm_pwless_login.diff for session.c to fix TDM password-less and autologin configuration. * References: - http://www.kde.org/info/security/advisory-20070919-1.txt @@ -780,7 +780,7 @@ kdebase (4:3.5.7-1ubuntu21) gutsy; urgency=low kdebase (4:3.5.7-1ubuntu20) gutsy; urgency=low - * Changed (again) $KDEHOME to $kdehome in kubuntu_52_gtk_qt_engine_config.diff and + * Changed (again) $TDEHOME to $kdehome in kubuntu_52_gtk_qt_engine_config.diff and kubuntu_53_kwallet_config.diff . (LP: #136560) -- Jonathan Riddell <jriddell@ubuntu.com> Sat, 15 Sep 2007 23:12:26 +0100 @@ -799,7 +799,7 @@ kdebase (4:3.5.7-1ubuntu18) gutsy; urgency=low [ Ryan Kavanagh ] * Dropping kubuntu_9902_nspluginviewer_hangs_cpu.diff and the libgtk build-dep as they are no longer needed - * Changed $KDEHOME to $kdehome in kubuntu_52_gtk_qt_engine_config.diff and + * Changed $TDEHOME to $kdehome in kubuntu_52_gtk_qt_engine_config.diff and kubuntu_53_kwallet_config.diff . (LP: #136560) -- Ryan Kavanagh <ryanakca@kubuntu.org> Mon, 03 Sep 2007 10:26:36 -0400 @@ -807,7 +807,7 @@ kdebase (4:3.5.7-1ubuntu18) gutsy; urgency=low kdebase (4:3.5.7-1ubuntu17) gutsy; urgency=low * Edit kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff to use $KDEHOME instead of .kde + kubuntu_53_kwallet_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 @@ -883,15 +883,15 @@ kdebase (4:3.5.7-1ubuntu9) gutsy; urgency=low kdebase (4:3.5.7-1ubuntu8) gutsy; urgency=low - * Fixed debian/kdm.init - set kdm language to the system default. + * Fixed debian/tdm.init + set tdm language to the system default. * Droped pmount dependancy for kdebase. -- Anthony Mercatante <tonio@ubuntu.com> Thu, 14 Jun 2007 17:15:21 +0200 kdebase (4:3.5.7-1ubuntu7) gutsy; urgency=low - * Fixed debian/kdm.init + * Fixed debian/tdm.init Previous code was bash code while the init script is sh -- Anthony Mercatante <tonio@ubuntu.com> Thu, 14 Jun 2007 13:13:22 +0200 @@ -912,8 +912,8 @@ kdebase (4:3.5.7-1ubuntu5) gutsy; urgency=low kdebase (4:3.5.7-1ubuntu4) gutsy; urgency=low - * Removed kubuntu_55_kdm_usplash_down.diff, usplash is now launched - via the kdm.init script, modified to launch usplash_down + * Removed kubuntu_55_tdm_usplash_down.diff, usplash is now launched + via the tdm.init script, modified to launch usplash_down (Fixes LP: #83727 and LP: #34821) * Added kbuntu_97_khotkeys_alt_print_shortcut.diff, capture a window with khotkeys with alt+print @@ -947,7 +947,7 @@ kdebase (4:3.5.7-1ubuntu1) gutsy; urgency=low * Merge with Debian for new upstream release, remaining changes in KUBUNTU-DEBIAN-CHANGES - * Remove kubuntu_62_genkdmconf_fix.diff, applied upstream + * Remove kubuntu_62_gentdmconf_fix.diff, applied upstream * Update kubuntu_68_xinerama.diff * Remove kubuntu_87_kicker_restore_description_parents.diff, obsoleted by upstream changes * Remove kubuntu_94_konqueror_nsplugins_amd64.diff, now part of Debian @@ -1023,9 +1023,9 @@ kdebase (4:3.5.6.dfsg.2-1) unstable; urgency=low +++ Changes by Sune Vuorela: * Support where the frosty furry animals wants their plugins. (Patch 38) - * Better distinguish wether users has modified their kdm theme. (Patch 39) - * Update kdm debconf template, thanks to Christian Perrier. (Closes: #415941) - Also update kdm debconf translations: + * Better distinguish wether users has modified their tdm theme. (Patch 39) + * Update tdm debconf template, thanks to Christian Perrier. (Closes: #415941) + Also update tdm debconf translations: - Norwegian Bokmal - Swedish thanks to Daniel Nylander (Closes: #417875) - Arabic thanks to Ossama Khayat (Closes: #417886) @@ -1061,7 +1061,7 @@ kdebase (4:3.5.6.dfsg.2-1) unstable; urgency=low * Repackage to remove non-free OpenGL logo and update prune-nonfree script. Also, patch 44 to not install the logo. (Closes: #419962) - * Update spanish kdm debconf template translation, thanks to Enrique MatÃas. + * Update spanish tdm debconf template translation, thanks to Enrique MatÃas. * Fix changelog typos ;-) * And, as always, upload. @@ -1073,9 +1073,9 @@ kdebase (4:3.5.6.dfsg.1-2) experimental; urgency=low * Don't install gvim desktop file in kappfinder. gvim does it by itself - and much better. (Closes: #408233) - * Improve documentation about styling kdm (thanks to Jeremy Bygott). - This is a note in kdm.init, in kdm.README.Debian and in the - generated kdmrc. (Closes: #408418, #403776, #403797, #406438) + * Improve documentation about styling tdm (thanks to Jeremy Bygott). + This is a note in tdm.init, in tdm.README.Debian and in the + generated tdmrc. (Closes: #408418, #403776, #403797, #406438) * Add portuguese debconf translation. Thanks to Carlos Lisboa. (Closes: #408021) @@ -1171,7 +1171,7 @@ kdebase (4:3.5.6-0ubuntu10) feisty; urgency=low * Add kubuntu_91_ksplash_fork_too_early_cond.diff, closes Malone #46682. Patch from Mark Jenkins - * Removed kubuntu_05_kdm_theme_config.diff, kdm config will now be + * Removed kubuntu_05_tdm_theme_config.diff, tdm config will now be set via kubuntu-default-settings postinst script. Closes Malone #58639 @@ -1297,7 +1297,7 @@ kdebase (4:3.5.5a.dfsg.1-1ubuntu14) feisty; urgency=low kdebase (4:3.5.5a.dfsg.1-1ubuntu13) feisty; urgency=low - * Update kdm init script to stop usplash with "start" + * Update tdm init script to stop usplash with "start" -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 4 Jan 2007 23:05:08 +0000 @@ -1389,7 +1389,7 @@ kdebase (4:3.5.5a.dfsg.1-1ubuntu1) feisty; urgency=low kdebase (4:3.5.6.dfsg.1-1) experimental; urgency=low * New upstream release: - * Fixes "kdm does not obey pam_limits". (Closes: #242641) + * Fixes "tdm does not obey pam_limits". (Closes: #242641) * Resolves ksysguard problem that it was not possible to sensor order. (Closes: #350561) * Fixes kdesktop_lock and pam_krb5. (Closes: #374394, #376803) @@ -1443,18 +1443,18 @@ kdebase (4:3.5.5a.dfsg.1-3) unstable; urgency=high * debian-kde_default.png.desktop * 21_default_background_image.diff.uu * 22_default_backgrounds.diff - * Add kdm customization support and update kdm README.Debian. Main changes - can be found in kdm init script: - * use an alternative kdm master configuration file (/var/run/kdm/kdmrc) - and background configuration file (/var/run/kdm/backgroundrc) - * source override file in kdm override directory (/etc/default/kdm.d) + * Add tdm customization support and update tdm README.Debian. Main changes + can be found in tdm init script: + * use an alternative tdm master configuration file (/var/run/tdm/tdmrc) + and background configuration file (/var/run/tdm/backgroundrc) + * source override file in tdm override directory (/etc/default/tdm.d) (Closes: #385839) +++ Changes by Sune Vuorela: * Add kdelibs-dbg to kdebase-dbg dependencies. +++ Changes by Josh Metzler: - * Restore kdm's default user face icon by adding a symlink to kdm.links. + * Restore tdm's default user face icon by adding a symlink to tdm.links. (Closes: #267722) +++ Changes by Modestas Vainius: @@ -1582,7 +1582,7 @@ kdebase (4:3.5.5-1) unstable; urgency=low depends on kdebase, so the kde-desktop task will now pull in hal/pmount as well. (Closes: #384663) - * Fix typo in /etc/pam.d/kdm-np. (Closes: #381908) + * Fix typo in /etc/pam.d/tdm-np. (Closes: #381908) * Remove /usr/share/apps/kappfinder/apps/Office/lyx.desktop, as lyx-qt provides its own better .desktop file. (Closes: #383412) @@ -1663,7 +1663,7 @@ kdebase (4:3.5.4-1) unstable; urgency=low * Add libjessie-java to konqueror's Java Suggests, since it is needed for JSSE in conjunction with GCJ. - * Add a LSB header to the KDM init script, making KDM usable with a parallel + * Add a LSB header to the TDM init script, making TDM usable with a parallel bootscripts setup. Thanks to Carlos Villegas. (Closes: #376958) * 25_khelp_htdig.diff: With the htdig package, searchable indexes should @@ -1741,7 +1741,7 @@ kdebase (4:3.5.4-0ubuntu27) edgy; urgency=low kdebase (4:3.5.4-0ubuntu26) edgy; urgency=low - * Install kdm at init level 13 + * Install tdm at init level 13 -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 22 Sep 2006 01:58:38 +0100 @@ -1790,22 +1790,22 @@ kdebase (4:3.5.4-0ubuntu20) edgy; urgency=low kdebase (4:3.5.4-0ubuntu19) edgy; urgency=low - * Added kubuntu_80_kdm_grub.diff (closes #57066) + * Added kubuntu_80_tdm_grub.diff (closes #57066) * Added kubuntu_81_search_engines_config.diff (closes #60058) -- Anthony Mercatante <tonio@ubuntu.com> Tue, 12 Sep 2006 08:26:23 +0200 kdebase (4:3.5.4-0ubuntu18) edgy; urgency=low - * Improved patch kubuntu_79_kdm_halt.diff since kcontrol connection - manager module also hardcodes the setting, instead of reading kdm + * Improved patch kubuntu_79_tdm_halt.diff since kcontrol connection + manager module also hardcodes the setting, instead of reading tdm settings (evil) -- Anthony Mercatante <tonio@ubuntu.com> Mon, 11 Sep 2006 13:19:23 +0200 kdebase (4:3.5.4-0ubuntu17) edgy; urgency=low - * Added patch kubuntu_79_kdm_halt.diff to change the shutdown command + * Added patch kubuntu_79_tdm_halt.diff to change the shutdown command (closes #59134) -- Anthony Mercatante <tonio@ubuntu.com> Mon, 11 Sep 2006 11:50:23 +0200 @@ -1819,7 +1819,7 @@ kdebase (4:3.5.4-0ubuntu16) edgy; urgency=low kdebase (4:3.5.4-0ubuntu15) edgy; urgency=low - * Improved kubuntu_05_kdm_theme_config.diff (closes #57428) + * Improved kubuntu_05_tdm_theme_config.diff (closes #57428) -- Anthony Mercatante <tonio@ubuntu.com> Fri, 8 Sep 2006 15:06:20 +0200 @@ -2034,7 +2034,7 @@ kdebase (4:3.5.3-1) unstable; urgency=low * Update the kate manpage. (Closes: #347883) - * Manually add /usr/bin/X11 to the KDM's default session path, as otherwise + * Manually add /usr/bin/X11 to the TDM's default session path, as otherwise systems still running X11R6.9 won't be able to find X binaries, which can cause the login process to fail under certain circumstances. This bit of cruft (for X11R7 users) should be harmless, and can be removed post-Etch. @@ -2060,23 +2060,23 @@ kdebase (4:3.5.2-2) unstable; urgency=low +++ Changes by Christopher Martin: * Now that menu-xdg+menu can provide xsession .desktop files for window - managers, add /var/lib/menu-xdg/xsessions to kdmrc's default list of + managers, add /var/lib/menu-xdg/xsessions to tdmrc's default list of places to search. Window managers should continue to provide their own .desktop files, however, since they will be more customized and won't force users to install the menu package. This is merely a fallback. (Closes: #360919) - * Make kdm look for /usr/bin/X by default, now that /usr/X11R6 is on its way - out. Adjust other paths in kdmrc as well. kdm should now work better with + * Make tdm look for /usr/bin/X by default, now that /usr/X11R6 is on its way + out. Adjust other paths in tdmrc as well. tdm should now work better with X.Org 7. (Closes: #362924) - * Patch kdm so that if it can't find the X executable in kdmrc (now + * Patch tdm so that if it can't find the X executable in tdmrc (now /usr/bin/X by default), then try /usr/X11R6/bin/X, then finally - /usr/bin/X. This should keep kdm working for users who have a partial or + /usr/bin/X. This should keep tdm working for users who have a partial or botched dist-upgrade, or neglected to permit the installation of an - up-to-date kdmrc. + up-to-date tdmrc. - * Revamp /etc/pam.d/kdm and the other pam files. They should now find the + * Revamp /etc/pam.d/tdm and the other pam files. They should now find the new /etc/default/locale language settings. (Closes: #361089, #361163) * Remove xlibs-static-pic build-dependency, and replace it with @@ -2111,7 +2111,7 @@ kdebase (4:3.5.2-1) unstable; urgency=low * Add a kpersonalizer manpage from Joe Zonker Brockmeier. Thanks. (Closes: #327395) - * Make the KDM option "Restart X Server" visible by default again. + * Make the TDM option "Restart X Server" visible by default again. * Fix the logitechmouse udev rules. Thanks to Henrique de Moraes Holschuh for spotting the problems. (Closes: #359751, #359773) @@ -2156,7 +2156,7 @@ kdebase (4:3.5.0-3) unstable; urgency=low +++ Changes by Christopher Martin: - * Install kdm's NEWS file in all kdebase packages. This ensures that + * Install tdm's NEWS file in all kdebase packages. This ensures that apt-listchanges will display the news to all users. (Closes: #344947) +++ Changes by Adeodato Simó: @@ -2189,11 +2189,11 @@ kdebase (4:3.5.0-2) experimental; urgency=low kdebase (4:3.5.2-0ubuntu27) dapper-security; urgency=low - * SECURITY UPDATE: KDM symlink attack vulnerability - * Add kubuntu_65_kdm_symlink_vunerability.diff - * KDM allows the user to select the session type for login. This + * SECURITY UPDATE: TDM symlink attack vulnerability + * Add kubuntu_65_tdm_symlink_vunerability.diff + * TDM allows the user to select the session type for login. This setting is permanently stored in the user home directory. By - using a symlink attack, KDM can be tricked into allowing the + using a symlink attack, TDM can be tricked into allowing the user to read file content that would otherwise be unreadable to this particular user. * References: @@ -2253,13 +2253,13 @@ kdebase (4:3.5.2-0ubuntu20) dapper; urgency=low kdebase (4:3.5.2-0ubuntu19) dapper; urgency=low - * Add kubuntu_62_genkdmconf_fix.diff, closes Malone #39599 + * Add kubuntu_62_gentdmconf_fix.diff, closes Malone #39599 -- Frode M. Doeving <frode@lnix.net> Mon, 1 May 2006 15:25:48 +0100 kdebase (4:3.5.2-0ubuntu18) dapper; urgency=low - * Fix wallpaper in kubuntu_05_kdm_theme_config.diff + * Fix wallpaper in kubuntu_05_tdm_theme_config.diff * Alter kubuntu_52_gtk_qt_engine_config.diff, don't make use of gtk_qt_engine if gnome or xfce are already installed (Malone #36256) @@ -2275,7 +2275,7 @@ kdebase (4:3.5.2-0ubuntu17) dapper; urgency=low kdebase (4:3.5.2-0ubuntu16) dapper; urgency=low - * Update kubuntu_05_kdm_theme_config.diff for dapper wallpaper + * Update kubuntu_05_tdm_theme_config.diff for dapper wallpaper -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 27 Apr 2006 15:45:33 +0100 @@ -2394,13 +2394,13 @@ kdebase (4:3.5.2-0ubuntu1) dapper; urgency=low kdebase (4:3.5.1-0ubuntu14) dapper; urgency=low - * Add kubuntu_55_kdm_usplash_down.diff run usplash on exit from KDM + * Add kubuntu_55_tdm_usplash_down.diff run usplash on exit from TDM -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 17 Mar 2006 12:26:58 +0000 kdebase (4:3.5.1-0ubuntu13) dapper; urgency=low - * Update kdm background colour in kubuntu_05_kdm_theme_config.diff + * Update tdm background colour in kubuntu_05_tdm_theme_config.diff to match current artwork -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 15 Mar 2006 21:17:36 +0000 @@ -2427,7 +2427,7 @@ kdebase (4:3.5.1-0ubuntu11) dapper; urgency=low kdebase (4:3.5.1-0ubuntu10) dapper; urgency=low * Add kubuntu_50_kate_desktop.diff use existing Kate session - * Add kubuntu_51_kdmrc_options.diff add back restart X option + * Add kubuntu_51_tdmrc_options.diff add back restart X option * Patches by Anthony Mercatante <tonio@ubuntu.com> -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 27 Feb 2006 15:18:06 +0000 @@ -2565,9 +2565,9 @@ kdebase (4:3.5.0-0ubuntu8) dapper; urgency=low kdebase (4:3.5.0-0ubuntu7) dapper; urgency=low - * Update 10_kdmrc_defaults_kubuntu.diff changing Debian to Kubuntu - and rename to kubuntu_10_kdmrc_defaults_kubuntu.diff - * Remove kdm dependency on kubuntu-default-settings, setting KDM + * Update 10_tdmrc_defaults_kubuntu.diff changing Debian to Kubuntu + and rename to kubuntu_10_tdmrc_defaults_kubuntu.diff + * Remove tdm dependency on kubuntu-default-settings, setting TDM theme now scripted in kubuntu-default-settings -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 10 Jan 2006 00:26:23 +0000 @@ -2629,7 +2629,7 @@ kdebase (4:3.5-rc2-0ubuntu1) dapper; urgency=low * New upstream pre-release * Tighten kdelibs-dev build-dep for libstdc++ transition - * kdm depends on xauth not xbase-clients + * tdm depends on xauth not xbase-clients * Update 18_default_fonts.diff * Generate .pot files * Remove kubuntu_26_startkde.diff, no need to start ivman in 3.5 @@ -2640,9 +2640,9 @@ kdebase (4:3.5-rc1-1ubuntu1) dapper; urgency=low * New upstream pre-release * Sync with Debian - * Update kubuntu_05_kdm_theme_config.diff + * Update kubuntu_05_tdm_theme_config.diff * Update kubuntu_16_hide_kpager_menu_entry.diff - * Update kubuntu_19_kdm_zsh_emulate.diff + * Update kubuntu_19_tdm_zsh_emulate.diff * Update kubuntu_25_kcontrol_only_in_kde.diff * Update kubuntu_30_startkde_background_colour.diff * Update kubuntu_32_usplash_console_font.diff @@ -2691,7 +2691,7 @@ kdebase (4:3.4.3-3) unstable; urgency=low kdelibs4c2. * Add "noextendedglob" to zsh's options when reading the X startup scripts - for kdm. This works around some of its quirks. (Closes: #336305) + for tdm. This works around some of its quirks. (Closes: #336305) * Backport a fix from KDE 3.5 for a bug that caused switching to Administrator mode in KControl to fail on occasion. (Closes: #306951) @@ -2744,8 +2744,8 @@ kdebase (4:3.4.2-3) unstable; urgency=low +++ Changes by Christopher Martin: - * Add a NEWS entry that explains the KDM upgrade process for users moving - from KDM 3.3.x, as well as KDM's new behaviour regarding login scripts. + * Add a NEWS entry that explains the TDM upgrade process for users moving + from TDM 3.3.x, as well as TDM's new behaviour regarding login scripts. (Closes: #326542, #327191) * Add a patch from the "Improving KDE" set that eliminates a superfluous @@ -2783,11 +2783,11 @@ kdebase (4:3.4.2-1) unstable; urgency=low * Bugs reported in the Debian BTS fixed by this release: - - kdm uses /dev/urandom instead of /dev/random as the default source + - tdm uses /dev/urandom instead of /dev/random as the default source of entropy. This solves myriad issues on low-entropy systems. (Closes: #240027, #294267, #298254, #320838) - - "-nolisten tcp" no longer prevents kdm from connecting to remote + - "-nolisten tcp" no longer prevents tdm from connecting to remote hosts. (Closes: #263449) +++ Changes by Pierre Habouzit: @@ -2808,7 +2808,7 @@ kdebase (4:3.4.2-1) unstable; urgency=low * Tighten all package relations between packages in kdebase, preventing many instances of potentially harmful partial upgrades. In particular, ensure - that kdm is upgraded along with kdebase-bin. (Closes: #312358) + that tdm is upgraded along with kdebase-bin. (Closes: #312358) * Fix typos in the kappfinder manpage. Thanks to A Costa. (Closes: #312767) @@ -2817,11 +2817,11 @@ kdebase (4:3.4.2-1) unstable; urgency=low did not work with arts, had arts ever once been unavailable. (Closes: #312217) - * No longer set a random ForgingSeed in the kdmrc conffile, for this caused - each kdebase build to generate a different kdmrc, and therefore made + * No longer set a random ForgingSeed in the tdmrc conffile, for this caused + each kdebase build to generate a different tdmrc, and therefore made updates a nuissance. - * Make kdm Suggest kdepasswd, since the later contains icons that can be + * Make tdm Suggest kdepasswd, since the later contains icons that can be used to provide users with 'face' icons. * Fix formatting of the kdepasswd manpage. (Closes: #313472) @@ -2829,10 +2829,10 @@ kdebase (4:3.4.2-1) unstable; urgency=low * Add the Arabic debconf translation by Mohammed Adnene Trojette. (Closes: #320768) - * Fix kdm session files that contain the incorrent binary names. + * Fix tdm session files that contain the incorrent binary names. (Closes: #320628) - * Change kdm's debconf dependency into a dependency on debconf | + * Change tdm's debconf dependency into a dependency on debconf | debconf-2.0, as this allows the installation of cdebconf. * Move all of konsole's README documentation into /opt/kde3/share/doc/konsole. @@ -2863,7 +2863,7 @@ kdebase (4:3.4.3-0ubuntu5) breezy-updates; urgency=low kdebase (4:3.4.3-0ubuntu4) breezy; urgency=low * Fix typo in kubuntu_18_default_fonts.diff to give anti-aliased - fonts in kdm + fonts in tdm -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 11 Oct 2005 22:50:44 +0100 @@ -2895,7 +2895,7 @@ kdebase (4:3.4.2-0ubuntu5) breezy; urgency=low before X is started (ubuntu No 15344 , No 15102) * Ensure kubuntu_27_aboutscreen_searchbar.diff is not applied before upload - * Fix kdm.postinst to move kdm back to S21 + * Fix tdm.postinst to move tdm back to S21 -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 27 Sep 2005 12:50:34 +0100 @@ -2937,7 +2937,7 @@ kdebase (4:3.4.2-0ubuntu2) breezy; urgency=low kdebase (4:3.4.2-0ubuntu1) breezy; urgency=low * New upstream release - * Move 10_kdmrc_defaults.diff to kubuntu_10_kdmrc_defaults.diff + * Move 10_tdmrc_defaults.diff to kubuntu_10_tdmrc_defaults.diff and s/Debian/Kubuntu * Add kubuntu_27_aboutscreen_searchbar.diff @@ -2985,7 +2985,7 @@ kdebase (4:3.4.1-0ubuntu2) breezy; urgency=low kdebase (4:3.4.1-0ubuntu1) breezy; urgency=low * Update version number following KDE 3.4.1 release - * Add kde-base conflict with kdm << 3.4.1 + * Add kde-base conflict with tdm << 3.4.1 * Add back ktip to meta package -- Jonathan Riddell <jr@jriddell.org> Wed, 1 Jun 2005 00:15:47 +0000 @@ -2999,7 +2999,7 @@ kdebase (4:3.4.1-0ubuntu0pre3) breezy; urgency=low kdebase (4:3.4.1-0ubuntu0pre2) breezy; urgency=low - * Add build-dep on libxau-dev, libxdmcp-dev to let KDM compile + * Add build-dep on libxau-dev, libxdmcp-dev to let TDM compile -- Jonathan Riddell <jr@jriddell.org> Tue, 24 May 2005 19:23:39 +0000 @@ -3007,8 +3007,8 @@ kdebase (4:3.4.1-0ubuntu0pre1) breezy; urgency=low * New upstream release. * Sync with Debian - * Change /usr/bin/X11 to /usr/X11R6/bin in kdm.README.Debian and - patches/11_genkdmconf.diff renamed to kubuntu_01_genkdmconf.diff + * Change /usr/bin/X11 to /usr/X11R6/bin in tdm.README.Debian and + patches/11_gentdmconf.diff renamed to kubuntu_01_gentdmconf.diff and alter PATH in debian/rules -- Jonathan Riddell <jr@jriddell.org> Tue, 24 May 2005 11:34:02 +0000 @@ -3033,18 +3033,18 @@ kdebase (4:3.4.0-0pre4) alioth; urgency=low +++ Changes by Christopher Martin: * Added a patch to set reasonable default fonts, using the fontconfig - defaults, for kpersonalizer, kcontrol, kdm, and the Plastik theme. We + defaults, for kpersonalizer, kcontrol, tdm, and the Plastik theme. We also use the Debian Blue artwork to provide a standard desktop background. - * KDM no longer shows the Custom session. When it works at all, it simply + * TDM no longer shows the Custom session. When it works at all, it simply duplicates Default's behaviour anyway. (Closes: #251602) - * New KDM patches source /etc/profile and the user's normal shell startup + * New TDM patches source /etc/profile and the user's normal shell startup scripts. (Closes: #173802, #211953, #250645, #250765, #289143) - * KDM once again looks for window manager session definitions in - /usr/share/apps/kdm/sessions by default. (Closes: #293645, #310155) + * TDM once again looks for window manager session definitions in + /usr/share/apps/tdm/sessions by default. (Closes: #293645, #310155) * USB usermap for Logitech mice is now installed, with device permissions set so that members of the plugdev group can make use of the Logitech @@ -3092,7 +3092,7 @@ kdebase (4:3.3.2-1) unstable; urgency=low * Update kdeprint documentation to sync with kdelibs patches. - * Add NEWS.Debian for kdm, explaining the "keyboard doesn't work" + * Add NEWS.Debian for tdm, explaining the "keyboard doesn't work" problem when upgrading to KDE 3.3, and how to deal with it. (Closes: #266106, #267622) @@ -3146,7 +3146,7 @@ kdebase (4:3.4.0-0ubuntu18) hoary; urgency=low kdebase (4:3.4.0-0ubuntu17) hoary; urgency=low - * Changed kdm start from S13 to S21 (Ubuntu: 8029) + * Changed tdm start from S13 to S21 (Ubuntu: 8029) * More Linitian cleanup -- Andreas Mueller <amu@ubuntu.com> Tue, 5 Apr 2005 16:00:01 +0200 @@ -3173,8 +3173,8 @@ kdebase (4:3.4.0-0ubuntu14) hoary; urgency=low kdebase (4:3.4.0-0ubuntu13) hoary; urgency=low - * Fix kdm login when shell is zsh. Thanks Antti S. Lankila for the hint. - 19_kdm_zsh_emulate.diff (Hoary #7620) + * Fix tdm login when shell is zsh. Thanks Antti S. Lankila for the hint. + 19_tdm_zsh_emulate.diff (Hoary #7620) * Fix init script output (Hoary #7180) -- Chris Halls <chris.halls@credativ.co.uk> Wed, 30 Mar 2005 01:01:26 +0100 @@ -3207,7 +3207,7 @@ kdebase (4:3.4.0-0ubuntu9) hoary; urgency=low kdebase (4:3.4.0-0ubuntu8) hoary; urgency=low - * Make default background colour of kdm match wallpaper + * Make default background colour of tdm match wallpaper * Add kubuntu_17_hide_desktop_trash.diff to hide desktop wastebin * Remove dependency on ktip from kdebase * Change Hidden to OnlyShowIn in knetattach.desktop so it isn't hidden from remote:/ @@ -3216,7 +3216,7 @@ kdebase (4:3.4.0-0ubuntu8) hoary; urgency=low kdebase (4:3.4.0-0ubuntu7) hoary; urgency=low - * Make kdm depend on kubuntu-default-settings + * Make tdm depend on kubuntu-default-settings -- Jonathan Riddell <jr@jriddell.org> Thu, 17 Mar 2005 07:11:28 +0000 @@ -3240,16 +3240,16 @@ kdebase (4:3.4.0-0ubuntu4) hoary; urgency=low kdebase (4:3.4.0-0ubuntu3) hoary; urgency=low - * Fix kdm.postinst to correctly update existing S99kdm links to S13kdm + * Fix tdm.postinst to correctly update existing S99tdm links to S13tdm -- Jonathan Riddell <jr@jriddell.org> Wed, 16 Mar 2005 23:43:54 +0000 kdebase (4:3.4.0-0ubuntu2) hoary; urgency=low - * Fix kdm.postinst to update existing S99kdm links to S13kdm + * Fix tdm.postinst to update existing S99tdm links to S13tdm * Fix kubuntu_03_ksplash_settings.diff to change all references to icon * Remove depend on kde-style-lipstik while still in universe - * Add kubuntu_05_kdm_theme_config.diff to make kdm use Kubuntu theme + * Add kubuntu_05_tdm_theme_config.diff to make tdm use Kubuntu theme * Add kubuntu_06_hide_home_menu_entry.diff to hide Home from KMenu -- Jonathan Riddell <jr@jriddell.org> Wed, 16 Mar 2005 17:26:25 +0000 @@ -3266,7 +3266,7 @@ kdebase (4:3.4.0-0ubuntu1) hoary; urgency=low kdebase (4:3.4.0-0pre1ubuntu6) hoary; urgency=low - * Make kdm start at at S13 rather than S99 (see Ubuntu Bugzilla No 3143 + * Make tdm start at at S13 rather than S99 (see Ubuntu Bugzilla No 3143 for gdm). * Make kdebase-bin depend on gdb for drkonqi * Add patch kubuntu_02_kcontrol_only_kde_menu.diff making KControl only @@ -3313,11 +3313,11 @@ kdebase (4:3.3.2-0pre1) experimental; urgency=low for CAN-2004-1158. * Lower kdeprint's dependency on gv to a Suggests. (Closes: #269590) * kwin is now registered as an x-window-manager. (Closes: #249162) - * Added /usr/share/xsessions to KDM's default session path, so + * Added /usr/share/xsessions to TDM's default session path, so .desktop files installed there are found. (Closes: #243770, #247365, #247747, #250384) - * kdm can now be installed while building kdebase, without affecting - the generated kdmrc and other config files. + * tdm can now be installed while building kdebase, without affecting + the generated tdmrc and other config files. * Adjust documentation to reflect the CUPS document path used by Debian. * Incorporate new manpages, for kdepasswd, kappfinder, kfind, @@ -3385,7 +3385,7 @@ kdebase (4:3.3.1-1) unstable; urgency=low * New upstream release. * KDE_3_3_BRANCH update. * ksmserver: only reset x-session-manager on install. (Closes: #247243) - * kdm: remove log files on purge. (Closes: #273542) + * tdm: remove log files on purge. (Closes: #273542) * Correct Danish po-debconf translations. (Closes: #273832) -- Christopher L Cheney <ccheney@debian.org> Thu, 4 Nov 2004 04:00:00 -0600 @@ -3396,10 +3396,10 @@ kdebase (4:3.3.0a-1) unstable; urgency=low * KDE_3_3_BRANCH update. * Add Turkish po-debconf translations. (Closes: #248326) * Add German po-deconf translations. (Closes: #264608) - * Correct /etc/kde3/kdm/Xsession file. (Closes: #265795) + * Correct /etc/kde3/tdm/Xsession file. (Closes: #265795) * Correct usage of "its" in konsole description. (Closes: #268517) * Correct Danish po-debconf translations. (Closes: #269575) - * Correct kdm name in /etc/init.d/kdm. (Closes: #272062) + * Correct tdm name in /etc/init.d/tdm. (Closes: #272062) -- Christopher L Cheney <ccheney@debian.org> Sat, 25 Sep 2004 20:00:00 -0500 @@ -3422,17 +3422,17 @@ kdebase (4:3.2.2-1) unstable; urgency=low * New upstream release. * Added Build-Depends: libsensors-dev. - * Corrected kdm postinst startup code. (Closes: #195052) + * Corrected tdm postinst startup code. (Closes: #195052) * Removed Debian menu desktop files. (Closes: #198661) * Added a README.linux.console document. (Closes: #218035) - * Remove kdm log files on purge. (Closes: #225157) + * Remove tdm log files on purge. (Closes: #225157) * Corrected kate/konqueror mime nametemplate support. (Closes: #235216) - * Removed "FIXME - observe" lines from kdm scripts. (Closes: #236422) + * Removed "FIXME - observe" lines from tdm scripts. (Closes: #236422) * Added Danish po-debconf translations. (Closes: #236480) * Remove old x-session-manager alternatives. (Closes: #236515, #236795, #237081, #240773) * Removed kdebase and kicker menu-methods. (Closes: #236700) - * Corrected kdm-np PAM service. (Closes: #236750, #238182, #242381) + * Corrected tdm-np PAM service. (Closes: #236750, #238182, #242381) * Added kcontrol Depends: kdebase-data. (Closes: #239297) * Updated GDM session file. (Closes: #240980) * debian/*.menu: remove the obsolete kderemove tag. @@ -3447,8 +3447,8 @@ kdebase (4:3.2.1-1) unstable; urgency=low * Added Japanese po-deconf translations. (Closes: #137940, #210431) * Updated kate Recommends: kregexpeditor. (Closes: #227677) * Added konqueror Depends: kdebase-kio-plugins. (Closes: #230203) - * Added kdm Provides: x-display-manager. (Closes: #231442) - * Added kdebase-bin/kdm Depends libpam-runtime. (Closes: #233562, #236078) + * Added tdm Provides: x-display-manager. (Closes: #231442) + * Added kdebase-bin/tdm Depends libpam-runtime. (Closes: #233562, #236078) * Added kate/konqueror mime nametemplate support. (Closes: #235216) -- Christopher L Cheney <ccheney@debian.org> Fri, 5 Mar 2004 04:00:00 -0600 @@ -3486,8 +3486,8 @@ kdebase (4:3.1.4-2) unstable; urgency=low * Corrected konqueror gs mime tests. (Closes: #160428) * kdesktop Recommends eject. (Closes: #223642) * konqueror Provides info-browser. (Closes: #223913) - * Added '|| true' to db_input lines in kdm debconf support. (Closes: #224548) - * Corrected typo in kdm.config script. (Closes: #224578) + * Added '|| true' to db_input lines in tdm debconf support. (Closes: #224548) + * Corrected typo in tdm.config script. (Closes: #224578) -- Christopher L Cheney <ccheney@debian.org> Mon, 5 Jan 2004 23:00:00 -0600 @@ -3506,7 +3506,7 @@ kdebase (4:3.1.4-1) unstable; urgency=low * Update pam support to use new common module fragments. (Closes: #206958) * Update package descriptions. (Closes: #209532, #209856) * Strip SUID root from kcheckpass since its not needed. (Closes: #212212) - * Update kdm debconf and use po-debconf. (Closes: #218731) + * Update tdm debconf and use po-debconf. (Closes: #218731) * Make kicker depend on kdebase-data. (Closes: #223407) -- Christopher L Cheney <ccheney@debian.org> Thu, 18 Dec 2003 13:30:00 -0600 @@ -3544,8 +3544,8 @@ kdebase (4:3.1.2-1) unstable; urgency=low * Add kfind to konqueror Depends. (Closes: #192859) * Fix KDE GDM Session file. (Closes: #144206, #154519, #188560, #189438, #193274) - * Add log rotation for KDM logfile. (Closes: #145345, #153728) - * Add screen number to KDM Xservers file. (Closes: #182708, #184737, #187257) + * Add log rotation for TDM logfile. (Closes: #145345, #153728) + * Add screen number to TDM Xservers file. (Closes: #182708, #184737, #187257) * Moved xfonts-konsole fonts to /usr/X11R6/lib/X11/fonts/misc/ (Closes: #184548) @@ -3554,13 +3554,13 @@ kdebase (4:3.1.2-1) unstable; urgency=low kdebase (4:3.1.1-1) unstable; urgency=low * New upstream release. (Closes: #180816, #181309) - * Corrected kdm-update-menu.sh kdm.options path. (Closes: #180355) - * Added xbase-clients depend to kdm. (Closes: #180536) + * Corrected tdm-update-menu.sh tdm.options path. (Closes: #180355) + * Added xbase-clients depend to tdm. (Closes: #180536) * Added xutils depend to xfonts-konsole. (Closes: #180695) * Improved xfonts-konsole description. (Closes: #180696) * Remove upgrade from alternatives removal prerm script. (Closes: #180927) * Change Xservers to launch /usr/X11R6/bin/X. (Closes: #182037) - * Add entries for kdm reserve xserver feature. (Closes: #182708) + * Add entries for tdm reserve xserver feature. (Closes: #182708) * Add kcontrol depends to konqueror (Closes: #182724) * Change konqueror menu entry to allow execution. (Closes: #183225) * Make konqueror provide www-browser. (Closes: #183391) @@ -3600,7 +3600,7 @@ kdebase (4:2.2.2-14.5) stable-security; urgency=high * Non-maintainer upload by the Security Team * Apply patch from KDE advisory 20030908 to fix local root vulnerability in - PAM authentication in KDM + PAM authentication in TDM -- Matt Zimmerman <mdz@debian.org> Sun, 31 Aug 2003 04:39:47 -0400 @@ -3653,7 +3653,7 @@ kdebase (4:2.2.2-13) unstable; urgency=low * debian/rules, debian/konsole.dirs: - Make symlinks in the X fonts directory to Konsole fonts in /usr/share/fonts in the install target. (closes: #127871) - * debian/kdmrc: + * debian/tdmrc: - Disallow remote users from shutting down the machine. (Yeah, yeah, I know - dodgy grammar). (closes: #127616) * debian/control: @@ -3739,7 +3739,7 @@ kdebase (4:2.2.2-4) unstable; urgency=low * Build cleanup * Build with xinerama support for i386 * Another update for Nedit.ad to work with newer Nedit - * Cleanup kdmrc for release..default to security + * Cleanup tdmrc for release..default to security * Update documentation for freeze -- Ivan E. Moore II <rkrusty@debian.org> Fri, 30 Nov 2001 02:30:00 -0700 @@ -3747,7 +3747,7 @@ kdebase (4:2.2.2-4) unstable; urgency=low kdebase (4:2.2.2-3) unstable; urgency=low * Update Brazilian Portuguese debconf entries (Closes: #120841) - * Remove kdmrc debconf note + * Remove tdmrc debconf note * Add in replaces to fix those people using testing who don't know how to use --force-overwrite or don't know how to let dpkg fix things on the second go around. What a waste of disk space. @@ -3767,14 +3767,14 @@ kdebase (4:2.2.2-2) unstable; urgency=low kdebase (4:2.2.2-1) unstable; urgency=low * new upstream version - * Add in suggests for libpam-krb/heimdel to kdm so we can get rid of the - kdm-krb package + * Add in suggests for libpam-krb/heimdel to tdm so we can get rid of the + tdm-krb package * Update Nedit.ad (Closes: #117881) - * Apply kdm cleanup patch by Branden (Closes: #118217) + * Apply tdm cleanup patch by Branden (Closes: #118217) * Fix mime checks (Closes: #117747) * Fix kate syntax highlights (Closes: #113773) * Add kate undocumented manpage - * Run lilo query for kdm with -w + * Run lilo query for tdm with -w * Fix konsole crashes (Closes: #119480) -- Ivan E. Moore II <rkrusty@debian.org> Wed, 21 Nov 2001 16:18:00 -0700 @@ -3867,9 +3867,9 @@ kdebase (4:2.2.1-3) unstable; urgency=low kdebase (4:2.2.1-2) unstable; urgency=low - * fix kdm preinst (Closes: #112900) + * fix tdm preinst (Closes: #112900) * fix overwrite (Closes: #112903) - * A couple kdm fixes and on keditbookmarks fix from upstream + * A couple tdm fixes and on keditbookmarks fix from upstream * Use usbutils's usb.ids if it exists (Closes: #112879) * konsole save fixes (Closes: #112982, 112943) @@ -3905,8 +3905,8 @@ kdebase (4:2.2.0.20010822-1) unstable; urgency=low * Remove gvim.desktop and gvim.png files so there is no confliction with new vim package. * sync with upstream - * Fix kdm not allowing typing after the first boot - * kdm now uses new x-display-manager bits + * Fix tdm not allowing typing after the first boot + * tdm now uses new x-display-manager bits * Fix typos and update script bits from Branden -- Ivan E. Moore II <rkrusty@debian.org> Wed, 22 Aug 2001 00:01:00 -0700 @@ -3922,10 +3922,10 @@ kdebase (4:2.2.0-final-3) unstable; urgency=low kdebase (4:2.2.0-final-2) unstable; urgency=low * Re-Add the *proper* Xsession script that will use the one provided - by Debian's X rather than the one provided by kdm which is broken. + by Debian's X rather than the one provided by tdm which is broken. The one provided by Debian works better anyways. (Closes: #108736) * Fix klipperrc (Closes: #108856) - * Add a debconf note to kdm about SessionTypes being auto-generated. This + * Add a debconf note to tdm about SessionTypes being auto-generated. This is now noted in 3 locations. -- Ivan E. Moore II <rkrusty@debian.org> Tue, 14 Aug 2001 16:53:00 -0700 @@ -3964,7 +3964,7 @@ kdebase (4:2.2.0-0.2beta1-1) unstable; urgency=low * Update Build-Depends and Depends * Fix pdf viewing problem (Closes: #88006) * Fix reference to woody's version in userguide (Closes: #105301) - * kdm Brazilian debconf translations (Closes: #105374) + * tdm Brazilian debconf translations (Closes: #105374) * Fix kde-update-menu script so that it can be run as a normal user (Closes: #105786) * sync with upstream @@ -4003,22 +4003,22 @@ kdebase (4:2.2.0-0beta1-3) unstable; urgency=low kdebase (4:2.2.0-0beta1-2) unstable; urgency=low - * Fix kdm preinst + * Fix tdm preinst -- Ivan E. Moore II <rkrusty@debian.org> Fri, 29 Jun 2001 09:51:00 -0700 kdebase (4:2.2.0-0beta1-1) unstable; urgency=low - * Update path info in kdm files...these were in the comments so + * Update path info in tdm files...these were in the comments so it wasn't a big deal - * Add a comment to default kdmrc about SessionType generation - * Re-hash kdm README + * Add a comment to default tdmrc about SessionType generation + * Re-hash tdm README * KDE 2.2 beta1 * Sync with upstream * Fix typo in Xsetup * Fix dup dependencies (Closes: #99690) * Fix other replaces and whatnot (Closes: #101187) - * Add filterproxy,freenet user to kdmrc (Closes: #96707, #98746) + * Add filterproxy,freenet user to tdmrc (Closes: #96707, #98746) * Upstream reports these bugs fixed (Closes: #77151) * Adding in a note about kwrited (Closes: #97245) * Add w3m to klipperrc @@ -4032,7 +4032,7 @@ kdebase (4:2.2.0-0beta1-1) unstable; urgency=low date listed in the version number states when the initial pull was made however updates may and most likely will have taken place since that date. Look at it as a >= cvs{date} - * Generate SessionTypes line in kdmrc during kdm postinst. + * Generate SessionTypes line in tdmrc during tdm postinst. * Change KDE logo's in konq's about:konqueror to Debian powered-by logo with link to debian.org instead of kde.org * Remove old menu debian xpm files and use existing debian png mimetype @@ -4049,11 +4049,11 @@ kdebase (4:2.2.0-0beta1-1) unstable; urgency=low we were using. * Fix description of kate...oops..thanks Oswald. :) * More menu clean...full pathing - * ton of kdm updates...basically syncing conffiles with those from + * ton of tdm updates...basically syncing conffiles with those from the xdm from 4.0.3 * More build-deps: libogg-dev, libvorbis-dev (For auidocd:/ support) - * Provide man link from kdm to chooser + * Provide man link from tdm to chooser * More build cleanup..take more of the automation out to make sure things are constant * Remove custom startkde @@ -4085,9 +4085,9 @@ kdebase (4:2.2.0-0beta1-1) unstable; urgency=low * New man pages for: konqueror * More debconf cleanup * Adding in suggests for xearth - * Add in Dependency for x-window-manager | x-session-manager to kdm + * Add in Dependency for x-window-manager | x-session-manager to tdm * Add icons to debian sub menus - * kdm auto-generation of session list + * tdm auto-generation of session list * Merging Debian and KDE menus a bit * Add lynx and links to default klipperc * Fixed communicator entry in klipperrc so that it will actually launch @@ -4123,7 +4123,7 @@ kdebase (4:2.1.1-4) unstable; urgency=low kdebase (4:2.1.1-3) unstable; urgency=low - * Fix kdmrc file (Closes: #92415) + * Fix tdmrc file (Closes: #92415) * Update XftConfig example * Fix kfmclient and kicker crashes (Closes: #89146, #88647) * More upstream fixes @@ -4156,7 +4156,7 @@ kdebase (4:2.1.0.1-5) unstable; urgency=low kdebase (4:2.1.0.1-4) unstable; urgency=low - * pam_env fixes for kdm as well as a ton of other updates to kdm + * pam_env fixes for tdm as well as a ton of other updates to tdm * Fixing a problem with the default AA settings. It looks like I "fixed" the wrong bit when I first fixed this. (Closes: #89741) @@ -4165,14 +4165,14 @@ kdebase (4:2.1.0.1-4) unstable; urgency=low kdebase (4:2.1.0.1-3) unstable; urgency=low * Adding in debconf note for systems that have a /.kde directory - * Adding debconf dependency to kdm + * Adding debconf dependency to tdm * More upstream fixes -- Ivan E. Moore II <rkrusty@debian.org> Tue, 13 Mar 2001 18:20:00 -0700 kdebase (4:2.1.0.1-2) unstable; urgency=low - * Fix kdm init script. actually stop when we tell you to stop (Closes: #89235) + * Fix tdm init script. actually stop when we tell you to stop (Closes: #89235) * More documentation added to the QT AA Font Howto * Fix for K Menu restarts and other funky behaviour * XftConfig example included @@ -4253,19 +4253,19 @@ kdebase (4:2.1.0-1) unstable; urgency=low kdebase (4:2.1-final-1) unstable; urgency=low * New upstream version - * Fix kdm init.d script + * Fix tdm init.d script * Upping standards version - * Fix for "chooser not running from kdm" (Closes: #76586) + * Fix for "chooser not running from tdm" (Closes: #76586) * Fix graphics display (Closes: #85166) * Fix bg clear issue (Closes: #77649) - * Fix kdm and expiring passwords + * Fix tdm and expiring passwords * Fix for konq crash on startup and other crashes (Closes: 84472, #77151, #80102) * Moving task-kde* packages out of kdebase source * Fixes for khelpcenter hangs (Closes: #81683) * konq provides ftp-client as well * Update /usr/bin/kde2 script * Compile ldap kioslave - * Updated kdm init.d script + * Updated tdm init.d script * Fix these rendering issues (Closes: #87183) -- Ivan E. Moore II <rkrusty@debian.org> Mon, 19 Feb 2001 02:31:00 -0700 @@ -4301,7 +4301,7 @@ kdebase (4:2.1-beta2-2) unstable; urgency=low * Updating menu entries (Closes: #83216) * Fixes form content memory in konq (Closes: #77317) * Fixes problem with version numbers not showing - * Adding Build-Depends for xutils as it seems kdm needs imake + * Adding Build-Depends for xutils as it seems tdm needs imake * Applied patch for konq template (Closes: #83355) -- Ivan E. Moore II <rkrusty@debian.org> Tue, 23 Jan 2001 12:36:00 -0700 @@ -4333,8 +4333,8 @@ kdebase (4:2.1-20010115-1) unstable; urgency=low * 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 - * Updating kdmrc to match current features and all - * Add a link in /etc/X11/kdm to kdmrc (Closes: #82643) + * 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 * This version fixes smb problems...you just need to make sure you have smbclient installed. Added that as a Recommend (Closes: #82612) @@ -4384,7 +4384,7 @@ kdebase (4:2.1-20001218-1) unstable; urgency=low * More upstream fixes * Fix for GDM Session (Closes: #79987) - * Update to kdm man page and README + * Update to tdm man page and README * Adding /usr/bin/kde2 as a x-session-manager * Adding new menu hints (Closes: #80022, #80020) * Fixing menu-method to handle new hints @@ -4406,13 +4406,13 @@ kdebase (4:2.1-20001213-1) unstable; urgency=low * New upstream beta * Fixing alternative priority for konsole * Adding in a session for gdm (Closes: #74678) - * new x4 port of xdm -> kdm (Closes: #79196, #79509) + * new x4 port of xdm -> tdm (Closes: #79196, #79509) * Fix whatis typo (Closes: #78178) * Fix segfaults (Closes: #78903) * Adding in a Recommend for kview to konqueror (Closes: #79201) * Changing x-window-manager alternative from kde2 to kwin - * KDM init.d script cleanup (Closes: #79320) - * Fixed default kdmrc script to show new options + * TDM init.d script cleanup (Closes: #79320) + * Fixed default tdmrc script to show new options * Adding in a kwm script for non-session launches * Adding new users to NoUsers (Closes: #79617) @@ -4457,21 +4457,21 @@ kdebase (4:2.0-final-4) unstable; urgency=low * more kdebase-libs work now properly handles pop3 and other services correctly now allows for email configuration without kdebase installed - * more dependency work with kdm (Closes: #76565) + * more dependency work with tdm (Closes: #76565) -- Ivan E. Moore II <rkrusty@debian.org> Wed, 08 Nov 2000 17:30:00 -0700 kdebase (4:2.0-final-3.1) unstable; urgency=low * applying i18n patch (Closes: #75831) - * more kdmrc default setting updates + * more tdmrc default setting updates -- Ivan E. Moore II <rkrusty@debian.org> Sun, 05 Nov 2000 23:00:00 -0700 kdebase (4:2.0-final-3) unstable; urgency=low * more upstream fixes - * more kdmrc default setting updates + * more tdmrc default setting updates * build against new xlibs and updating depends -- Ivan E. Moore II <rkrusty@debian.org> Sat, 04 Nov 2000 01:00:00 -0700 @@ -4509,7 +4509,7 @@ kdebase (4:2.0-20001015-0) unstable; urgency=low kdebase (4:2.0-20001013-0) unstable; urgency=low - * kdmdesktop fixes from upstream + * tdmdesktop fixes from upstream * more i18n work * applying i18n patche * more fixes for konqueror @@ -4533,7 +4533,7 @@ kdebase (4:2.0-20001009-0) unstable; urgency=low * KDE 2.0 RC2 * more upstream fixes - * minor kdmdekstop fix + * minor tdmdekstop fix -- Ivan E. Moore II <rkrusty@debian.org> Mon, 09 Oct 2000 08:00:00 -0700 @@ -4561,8 +4561,8 @@ kdebase (4:2.0-20001004-0) unstable; urgency=low * More upstream fixes * No longer depend on versioned kdelibs - * Fixing up kdm's postinst to better handle kdmrc - * More spice for kdm + * Fixing up tdm's postinst to better handle tdmrc + * More spice for tdm * Fixes the following: (Closes: #73057, #73015, #73002, #72921, #72989, #72919, #72638) -- Ivan E. Moore II <rkrusty@debian.org> Mon, 02 Oct 2000 01:00:00 -0700 @@ -4647,14 +4647,14 @@ kdebase (4:2.0-20000912-0) unstable; urgency=low kdebase (4:2.0-20000910-2) unstable; urgency=low * Fixing Debian menu graphic problem - * More cleanup of kdm settings + * More cleanup of tdm settings * More dependency fixes -- Ivan E. Moore II <rkrusty@debian.org> Sun, 10 Sep 2000 23:00:00 -0700 kdebase (4:2.0-20000910-0) unstable; urgency=low - * Changing kdm banner graphic to be the Debian swirl + * Changing tdm banner graphic to be the Debian swirl * Fixing start script so that kde actually starts with the desktop functional. (sorry) @@ -4663,7 +4663,7 @@ kdebase (4:2.0-20000910-0) unstable; urgency=low kdebase (4:2.0-20000909-0) unstable; urgency=low * More upstream updates - * More kdm cleanup (star'd password option added) + * More tdm cleanup (star'd password option added) * Migrating binary-indep build pieces into their own area -- Ivan E. Moore II <rkrusty@debian.org> Sat, 09 Sep 2000 01:00:00 -0700 @@ -4693,9 +4693,9 @@ kdebase (4:2.0-20000901-0) unstable; urgency=low kdebase (4:2.0-20000825-0) unstable; urgency=low * New upstream fixes - * Updating kdm init script to match current xdm one - * Typo fixes in kdmrc - * Turning off xconsole by default for kdm + * Updating tdm init script to match current xdm one + * Typo fixes in tdmrc + * Turning off xconsole by default for tdm * Some work on menus -- Ivan E. Moore II <rkrusty@debian.org> Fri, 25 Aug 2000 21:30:00 -0700 @@ -4703,9 +4703,9 @@ kdebase (4:2.0-20000825-0) unstable; urgency=low kdebase (4:2.0-20000821-1.0) experimental; urgency=low * New upstream fixes - * changed xdm.options to kdm.options to seperate from xdm - * cleaned up pre/post scripts for kdm to handle proper upgrade from - kdm1. Forcing a restart (if possible and without killing the upgrade) + * changed xdm.options to tdm.options to seperate from xdm + * cleaned up pre/post scripts for tdm to handle proper upgrade from + tdm1. Forcing a restart (if possible and without killing the upgrade) during an upgrade. -- Ivan E. Moore II <rkrusty@debian.org> Mon, 21 Aug 2000 22:45:00 -0700 @@ -4727,7 +4727,7 @@ kdebase-cvs (4:2.0-20000521-1.0) experimental; urgency=low * Adding in a conflict for man2html since we provide it * Fixing ln issues with documentation * Fixing file permissions in CVS tree - * Fixing some kdm issues + * Fixing some tdm issues * Changing suggest to depend for kde-i18n since some documentation, etc resides in that package now. (including english) @@ -4755,9 +4755,9 @@ kdebase-cvs (4:2.0-20000306-1.1) experimental; urgency=low kdebase-cvs (4:2.0-20000302-1.0) experimental; urgency=low * New upstream CVS fixes - * Migrating chooser over to kdm-cvs package - * Updating kdm config files to match current versions of xdm - * Fixing kdm init.d scripts to handle now missing parser script + * Migrating chooser over to tdm-cvs package + * Updating tdm config files to match current versions of xdm + * Fixing tdm init.d scripts to handle now missing parser script * Fixing kicker applet issues (required -dev to be installed to work) -- Ivan E. Moore II <rkrusty@debian.org> Thu, 02 Mar 2000 22:00:00 -0700 @@ -4773,7 +4773,7 @@ kdebase-cvs (4:2.0-20000223-1.0) experimental; urgency=low * New upstream CVS fixes * Fixing pathing for kde help files - * Adding in md5 options to pam.d file for kdm + * Adding in md5 options to pam.d file for tdm -- Ivan E. Moore II <rkrusty@debian.org> Wed, 23 Feb 2000 22:00:36 -0700 @@ -4833,7 +4833,7 @@ kdebase-cvs (4:2.0-19990825-1) experimental; urgency=low kdebase-cvs (4:2.0-19990823-1) experimental; urgency=low * New upstream CVS changes - * Fixes bug with init.d script for kdm2 + * Fixes bug with init.d script for tdm2 -- Ivan E. Moore II <rkrusty@debian.org> Mon, 23 Aug 1999 07:00:56 -0400 @@ -4877,12 +4877,12 @@ kdebase-cvs (4:2.0-19990601-1) experimental; urgency=low kdebase-cvs (4:2.0-19990531-1) experimental; urgency=low - * Making kdm not require xdm + * Making tdm not require xdm * Fixing some pam stuff which includes a /etc/pam.d/kde file, making the pam name=kde so that it uses the /etc/pam.d/kde file instead of - xdm, kdm, or whatever. + xdm, tdm, or whatever. * Fixing the linux fonts for konsole. - * Fixing the /var/state/kdm issue + * Fixing the /var/state/tdm issue -- Ivan E. Moore II <rkrusty@debian.org> Mon, 31 May 1999 19:30:29 -0400 @@ -4940,7 +4940,7 @@ kdebase (4:1.1-19990217-1) unstable; urgency=low kdebase (4:1.1-19990214-2) unstable; urgency=low * move the link from /var/ to /usr, since /usr may be read only - * patch Xserver_0 to run kdmgreeter if kdm runs + * patch Xserver_0 to run tdmgreeter if tdm runs -- Stephan Kulow <coolo@kde.org> Tue, 16 Feb 1999 18:52:03 +0100 @@ -4952,7 +4952,7 @@ kdebase (4:1.1-19990214-1) unstable; urgency=low kdebase (4:1.1-19990207-3) unstable; urgency=low - * new kdmrc handling + * new tdmrc handling -- Stephan Kulow <coolo@kde.org> Fri, 12 Feb 1999 11:03:56 +0100 @@ -4990,7 +4990,7 @@ kdebase (2:980312-5) unstable; urgency=low kdebase (2:980312-4) frozen; urgency=low * added undocumented man page - * renamed kdmconfig to switchdm. This name existed twice + * renamed tdmconfig to switchdm. This name existed twice * new compile with latest kdelibs shlibs -- Stephan Kulow <coolo@kde.org> Tue, 31 Mar 1998 20:26:23 +0200 @@ -5001,7 +5001,7 @@ kdebase (2:980312-3) unstable; urgency=low * changed the directory for debian apps to /var/spool/applnk * set the correct UTMP file * test prefix() before removing it. This should avoid a rm -rf /, when possible - * new kdm (with bugfixes and new location for configuration files) + * new tdm (with bugfixes and new location for configuration files) -- Stephan Kulow <coolo@kde.org> Fri, 27 Mar 1998 16:07:37 +0100 diff --git a/ubuntu/lucid_automake/kdebase/debian/control b/ubuntu/lucid_automake/kdebase/debian/control index f2fe71262..dfae80fa1 100644 --- a/ubuntu/lucid_automake/kdebase/debian/control +++ b/ubuntu/lucid_automake/kdebase/debian/control @@ -13,7 +13,7 @@ Package: kdebase-kde3 Section: kde Architecture: all Depends: kappfinder-kde3 (>= ${Source-Version}), kate-kde3 (>= ${Source-Version}), kcontrol-kde3 (>= ${Source-Version}), kdebase-kde3-bin (>= ${Source-Version}), kdebase-data-kde3 (>= ${Source-Version}), kdebase-kio-plugins-kde3 (>= ${Source-Version}), kdepasswd-kde3 (>= ${Source-Version}), kdeprint-kde3 (>= ${Source-Version}), kdesktop-kde3 (>= ${Source-Version}), kfind-kde3 (>= ${Source-Version}), khelpcenter-kde3 (>= ${Source-Version}), kicker-kde3 (>= ${Source-Version}), klipper-kde3 (>= ${Source-Version}), kmenuedit-kde3 (>= ${Source-Version}), konqueror-nsplugins-kde3 (>= ${Source-Version}), konqueror-kde3 (>= ${Source-Version}), konsole-kde3 (>= ${Source-Version}), kpager-kde3 (>= ${Source-Version}), kpersonalizer-kde3 (>= ${Source-Version}), ksmserver-kde3 (>= ${Source-Version}), ksplash-kde3 (>= ${Source-Version}), ksysguard-kde3 (>= ${Source-Version}), ktip-kde3 (>= ${Source-Version}), kwin-kde3 (>= ${Source-Version}), libkonq4-kde3 (>= ${Source-Version}), hal-kde3 | kfreebsd-gnu | hurd, xcalib -Recommends: kdm-kde3 (>= ${Source-Version}), kdebase-runtime-data-common-kde3 +Recommends: tdm-kde3 (>= ${Source-Version}), kdebase-runtime-data-common-kde3 Suggests: kdebase-kde3-doc-html (>= ${Source-Version}) Description: base components from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -105,8 +105,8 @@ Section: kde Architecture: any Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14) Suggests: khelpcenter-kde3, gdb -Conflicts: kdebase-libs-kde3 (<< 4:3.0.0), kdm-kde3 (<< 4:3.4.1-2), kdebase-workspace-data-kde3 (<< 7:3.5.0) -Replaces: kcontrol-kde3 (<< 4:3.3.0), kdebase-kde3 (<< 4:3.0.0), kdebase-kde3-doc (<< 4:3.0.0), kdebase-libs-kde3 (<< 4:3.0.0), kscreensaver-kde3 (<< 4:3.0.0), kdm-kde3 (= 4:3.3.2-1b) +Conflicts: kdebase-libs-kde3 (<< 4:3.0.0), tdm-kde3 (<< 4:3.4.1-2), kdebase-workspace-data-kde3 (<< 7:3.5.0) +Replaces: kcontrol-kde3 (<< 4:3.3.0), kdebase-kde3 (<< 4:3.0.0), kdebase-kde3-doc (<< 4:3.0.0), kdebase-libs-kde3 (<< 4:3.0.0), kscreensaver-kde3 (<< 4:3.0.0), tdm-kde3 (= 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. @@ -230,7 +230,7 @@ Description: miscellaneous binaries and files for the KDE desktop This package is part of KDE, and a component of the KDE base module. See the 'kde-kde3' and 'kdebase-kde3' packages for more information. -Package: kdm-kde3 +Package: tdm-kde3 Section: kde Architecture: any Depends: ${shlibs:Depends}, kdebase-kde3-bin (= ${Source-Version}), kdebase-data-kde3 (>> ${KDE-Version3}), kdebase-data-kde3 (<< ${KDE-Next-Version3}), debconf (>= 1.2.9) | debconf-2.0, libpam-runtime (>= 0.76-14), xbase-clients @@ -238,10 +238,10 @@ Recommends: logrotate, xserver-xorg Suggests: khelpcenter-kde3, ksmserver-kde3 (= ${Source-Version}), kdepasswd-kde3 (= ${Source-Version}), menu Provides: x-display-manager Description: X display manager for KDE - kdm manages a collection of X servers, which may be on the local host or + tdm manages a collection of X servers, which may be on the local host or remote machines. It provides services similar to those provided by init, getty, and login on character-based terminals: prompting for login name and - password, authenticating the user, and running a session. kdm supports XDMCP + password, authenticating the user, and running a session. tdm supports XDMCP (X Display Manager Control Protocol) and can also be used to run a chooser process which presents the user with a menu of possible hosts that offer XDMCP display management. @@ -249,8 +249,8 @@ Description: X display manager for KDE A collection of icons to associate with individual users is included with KDE, but as part of the kdepasswd package. . - The menu package will help to provide KDM with a list of window managers - that can be launched, if the window manager does not register with KDM + The menu package will help to provide TDM with a list of window managers + that can be launched, if the window manager does not register with TDM already. Most users won't need this. . This package is part of KDE, and a component of the KDE base module. diff --git a/ubuntu/lucid_automake/kdebase/debian/control.in b/ubuntu/lucid_automake/kdebase/debian/control.in index 62116ce88..61d7197f8 100644 --- a/ubuntu/lucid_automake/kdebase/debian/control.in +++ b/ubuntu/lucid_automake/kdebase/debian/control.in @@ -14,7 +14,7 @@ Package: kdebase Section: kde Architecture: all Depends: kappfinder (>= ${Source-Version}), kate (>= ${Source-Version}), kcontrol (>= ${Source-Version}), kdebase-bin (>= ${Source-Version}), kdebase-data (>= ${Source-Version}), kdebase-kio-plugins (>= ${Source-Version}), kdepasswd (>= ${Source-Version}), kdeprint (>= ${Source-Version}), kdesktop (>= ${Source-Version}), kfind (>= ${Source-Version}), khelpcenter (>= ${Source-Version}), kicker (>= ${Source-Version}), klipper (>= ${Source-Version}), kmenuedit (>= ${Source-Version}), konqueror-nsplugins (>= ${Source-Version}), konqueror (>= ${Source-Version}), konsole (>= ${Source-Version}), kpager (>= ${Source-Version}), kpersonalizer (>= ${Source-Version}), ksmserver (>= ${Source-Version}), ksplash (>= ${Source-Version}), ksysguard (>= ${Source-Version}), ktip (>= ${Source-Version}), kwin (>= ${Source-Version}), libkonq4 (>= ${Source-Version}), hal | kfreebsd-gnu | hurd, pmount | kfreebsd-gnu | hurd -Recommends: kdm (>= ${Source-Version}) +Recommends: tdm (>= ${Source-Version}) Suggests: kdebase-doc-html (>= ${Source-Version}) Description: base components from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -97,8 +97,8 @@ Section: kde Architecture: any Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14) Suggests: khelpcenter, gdb -Conflicts: kdebase-libs (<< 4:3.0.0), kdm (<< 4:3.4.1-2) -Replaces: kcontrol (<< 4:3.3.0), kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0), kscreensaver (<< 4:3.0.0), kdm (= 4:3.3.2-1b) +Conflicts: kdebase-libs (<< 4:3.0.0), tdm (<< 4:3.4.1-2) +Replaces: kcontrol (<< 4:3.3.0), kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0), kscreensaver (<< 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. @@ -222,7 +222,7 @@ Description: miscellaneous binaries and files for the KDE desktop This package is part of KDE, and a component of the KDE base module. See the 'kde' and 'kdebase' packages for more information. -Package: kdm +Package: tdm Section: kde Architecture: any Depends: ${shlibs:Depends}, kdebase-bin (= ${Source-Version}), kdebase-data (>> ${KDE-Version3}), kdebase-data (<< ${KDE-Next-Version3}), debconf (>= 1.2.9) | debconf-2.0, libpam-runtime (>= 0.76-14), xbase-clients @@ -230,10 +230,10 @@ Recommends: logrotate, xserver-xorg Suggests: khelpcenter, ksmserver (= ${Source-Version}), kdepasswd (= ${Source-Version}), menu Provides: x-display-manager Description: X display manager for KDE - kdm manages a collection of X servers, which may be on the local host or + tdm manages a collection of X servers, which may be on the local host or remote machines. It provides services similar to those provided by init, getty, and login on character-based terminals: prompting for login name and - password, authenticating the user, and running a session. kdm supports XDMCP + password, authenticating the user, and running a session. tdm supports XDMCP (X Display Manager Control Protocol) and can also be used to run a chooser process which presents the user with a menu of possible hosts that offer XDMCP display management. @@ -241,8 +241,8 @@ Description: X display manager for KDE A collection of icons to associate with individual users is included with KDE, but as part of the kdepasswd package. . - The menu package will help to provide KDM with a list of window managers - that can be launched, if the window manager does not register with KDM + The menu package will help to provide TDM with a list of window managers + that can be launched, if the window manager does not register with TDM already. Most users won't need this. . This package is part of KDE, and a component of the KDE base module. diff --git a/ubuntu/lucid_automake/kdebase/debian/copyright b/ubuntu/lucid_automake/kdebase/debian/copyright index 8e0933735..721e1fd93 100644 --- a/ubuntu/lucid_automake/kdebase/debian/copyright +++ b/ubuntu/lucid_automake/kdebase/debian/copyright @@ -24,7 +24,7 @@ drkonqi, kaddressbook, kicker, ksmserver, ksplash, kwin, legacyimport GPL --- -kappfinder, kate, kcheckpass, kdeprint, kdm, kfind, khelpcenter, kmenuedit, +kappfinder, kate, kcheckpass, kdeprint, tdm, kfind, khelpcenter, kmenuedit, konqueror, konsole, kpager, kpersonalizer, kreadconfig, kstart, ksysguard, ktip LGPL diff --git a/ubuntu/lucid_automake/kdebase/debian/img/medialuks/cr128-device-compact_flash_unmount_encrypt.png.uu b/ubuntu/lucid_automake/kdebase/debian/img/medialuks/cr128-device-compact_flash_unmount_encrypt.png.uu index 1bcc196b8..99b1e61f2 100644 --- a/ubuntu/lucid_automake/kdebase/debian/img/medialuks/cr128-device-compact_flash_unmount_encrypt.png.uu +++ b/ubuntu/lucid_automake/kdebase/debian/img/medialuks/cr128-device-compact_flash_unmount_encrypt.png.uu @@ -205,7 +205,7 @@ MU?^>>^ZYYYY[9$)56T>^W(PM6[9LV;(E<.+$B1,G3LCK]_3ITZ=/GY8C!BGK M%/CHHX\^^N@CV4BIM`EX5Q8:/YY^Q5=I,78/LG>@Z>!/"8!T^>CHCAT[=NS8 M<?%B>L`E2W@:>(*(L^;FT@X?&DJ$[]EMS7NB?>GR:A]&[7ALK,%@-@/WWY^2 MLG\_,&A0>'A^/A$<[92-V]D;J^LK2V#Q3B\GN]2=]FH_K=D?N`TH'(W]2:\# -MKDM#2M+6`=%2RATM$X#8RUM<$Y\"1$1$1(2$R"*U9^U`LYEVT(H*(._@Z:0S +MTDM#2M+6`=%2RATM$X#8RUM<$Y\"1$1$1(2$R"*U9^U`LYEVT(H*(._@Z:0S M1X'\_J?&9+\*N(<777?T32!FG37@]R>!V,>EBLSG`'-^2.?T9P%L&/W@BSN` MSN^.N/W&54#4%5%=HHWRCFB\W'BY\7*@RE9EJ[(!$"#@*\#O<K_+C>,!;8HV M17LUX+C/<9_3#W!&."/<^P"WP^T0!P+N%NX68K!<HHL9&1OKF`#,9K/9:@4L diff --git a/ubuntu/lucid_automake/kdebase/debian/img/medialuks/cr128-device-sd_mmc_unmount_encrypt.png.uu b/ubuntu/lucid_automake/kdebase/debian/img/medialuks/cr128-device-sd_mmc_unmount_encrypt.png.uu index 53ba3286d..edc1cc809 100644 --- a/ubuntu/lucid_automake/kdebase/debian/img/medialuks/cr128-device-sd_mmc_unmount_encrypt.png.uu +++ b/ubuntu/lucid_automake/kdebase/debian/img/medialuks/cr128-device-sd_mmc_unmount_encrypt.png.uu @@ -226,7 +226,7 @@ M9`ANV!`;F<4P#*/7&PP\7UY.0H>!Y.2DI-@TV5,UUX\')5B;P2S@%:#SM,XW MI"9KA"%)FI&/&,_J;VM3!8V05!60_R'_`P#D#<H8;`#4>_`]`T`=ITYA[@68 ME<Q*YDD`*[&2>2JF;2&:96@_*@HV`-($>9BBT^Y+5>G:?%HD'BWB6;\E*C=M ME1_5*>K3`%:B`V,$]/.%BYBW@58_'6BM1("L^ZKN4G8!NGNY=.9SH"'!UR?H -MA@1?GS'$,HC8XS3(IU4KDMY-02,S#0:3R6QNJ.%8K293UZXC1@!DF39R5E86 +MA@1?GS'$,HC8XS3(IU4TDMY-02,S#0:3R6QNJ.%8K293UZXC1@!DF39R5E86 M:6-C64\OG+8,@(+4?*NO"=!BD`QS_ODLRW$,$XFDI!`_>DMQLC0#:O4VWFNZ M5S<-8/R,GXEJ12EC";^^U5\C?,H(ZA6S'*9V4#L`>%A]&`#41:K*C`70%FV8 MV0!N0[TY/VV/%\.3OY&^EGV`^J.Z#NLUB5C?I*DMEJK=?_WG^T-OZ*W\QLP% diff --git a/ubuntu/lucid_automake/kdebase/debian/img/medialuks/cr128-device-usbpendrive_unmount_encrypt.png.uu b/ubuntu/lucid_automake/kdebase/debian/img/medialuks/cr128-device-usbpendrive_unmount_encrypt.png.uu index 95cd850b0..b989c74df 100644 --- a/ubuntu/lucid_automake/kdebase/debian/img/medialuks/cr128-device-usbpendrive_unmount_encrypt.png.uu +++ b/ubuntu/lucid_automake/kdebase/debian/img/medialuks/cr128-device-usbpendrive_unmount_encrypt.png.uu @@ -301,7 +301,7 @@ MZ`\>/'"@ID8I:LH:G]QQQQUW7'ZYDCQ%])>_D&T@+^_LW7G7I#KY2Q!16N6. M'?2@[[Q#$V+.G)T[=^TZ?)AJNA45`11;U[F99R3O;J^O'.MY"]!=[4)&1J/! M0`+7NQJ'L050V-58]N'6K=NV554!%17EY7EYM$)$QN;+T^2IF`9P5:)+/%^Y M3FSY;V;E9X(?VW69V3)"5\A3Y#%`:)[\,1\",%$8J&X'PL.$%,U'@-2FOD-S -M!<`]J59IC@+B<,&BK@?\YW$K>"<@NR@KDM5B8(5;`P%ZLF"0M5/_+K;>(EOY +M!<`]J59IC@+B<,&BK@?\YW$K>"<@NR@TDM5B8(5;`P%ZLF"0M5/_+K;>(EOY M?$#:P6TP)`*N]P2]IAH(5$O[<#^@&A0.AP<H]\L$WN?S^7P^Q3VHT5!1U=C< M!?%IZ6GI:4!Z4GR:TP#2'"E#\@!2H50J^0%YC;Q!?@O`Y9B*A-,G$"83N0'3 MTM+367-<:O22D9&:"J2F4E?DV/MGE)9&G]]VVVVW77()\/CCCS_^VFL&`P'Z diff --git a/ubuntu/lucid_automake/kdebase/debian/kcontrol-kde3.install b/ubuntu/lucid_automake/kdebase/debian/kcontrol-kde3.install index bce0878ab..cb7900105 100644 --- a/ubuntu/lucid_automake/kdebase/debian/kcontrol-kde3.install +++ b/ubuntu/lucid_automake/kdebase/debian/kcontrol-kde3.install @@ -52,8 +52,8 @@ debian/tmp/opt/kde3/lib/kde3/kcm_joystick.la debian/tmp/opt/kde3/lib/kde3/kcm_joystick.so debian/tmp/opt/kde3/lib/kde3/kcm_kded.la debian/tmp/opt/kde3/lib/kde3/kcm_kded.so -debian/tmp/opt/kde3/lib/kde3/kcm_kdm.la -debian/tmp/opt/kde3/lib/kde3/kcm_kdm.so +debian/tmp/opt/kde3/lib/kde3/kcm_tdm.la +debian/tmp/opt/kde3/lib/kde3/kcm_tdm.so debian/tmp/opt/kde3/lib/kde3/kcm_kdnssd.so debian/tmp/opt/kde3/lib/kde3/kcm_kdnssd.la debian/tmp/opt/kde3/lib/kde3/kcm_keys.la @@ -165,7 +165,7 @@ debian/tmp/opt/kde3/share/applications/kde/kcmtaskbar.desktop debian/tmp/opt/kde3/share/applications/kde/kcmusb.desktop debian/tmp/opt/kde3/share/applications/kde/kcmview1394.desktop debian/tmp/opt/kde3/share/applications/kde/KControl.desktop -debian/tmp/opt/kde3/share/applications/kde/kdm.desktop +debian/tmp/opt/kde3/share/applications/kde/tdm.desktop debian/tmp/opt/kde3/share/applications/kde/keys.desktop debian/tmp/opt/kde3/share/applications/kde/kfontview.desktop debian/tmp/opt/kde3/share/applications/kde/khtml_behavior.desktop diff --git a/ubuntu/lucid_automake/kdebase/debian/kdebase-data-kde3.install b/ubuntu/lucid_automake/kdebase/debian/kdebase-data-kde3.install index 820a63da9..d6dc0841f 100644 --- a/ubuntu/lucid_automake/kdebase/debian/kdebase-data-kde3.install +++ b/ubuntu/lucid_automake/kdebase/debian/kdebase-data-kde3.install @@ -202,9 +202,9 @@ debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/kcmstyle/index.docbook debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/kcmtaskbar/common debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/kcmtaskbar/index.cache.bz2 debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/kcmtaskbar/index.docbook -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/kdm/common -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/kdm/index.cache.bz2 -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/kdm/index.docbook +debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/tdm/common +debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/tdm/index.cache.bz2 +debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/tdm/index.docbook debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/keyboard/common debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/keyboard/index.cache.bz2 debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/keyboard/index.docbook @@ -342,7 +342,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/kcmmemory.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/kcmpartitions.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/kcmpci.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/kcontrol.png -debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/kdmconfig.png +debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/tdmconfig.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/key_bindings.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/kfm_home.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/kscreensaver.png @@ -443,7 +443,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/kcmsound.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/kcmsystem.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/kcmx.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/kcontrol.png -debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/kdmconfig.png +debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/tdmconfig.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/key_bindings.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/keyboard_layout.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/keyboard.png @@ -548,7 +548,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/kcmdevices.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/kcmkicker.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/kcmkwm.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/kcmx.png -debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/kdmconfig.png +debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/tdmconfig.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/key_bindings.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/keyboard.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/kscreensaver.png @@ -630,7 +630,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/kcmsound.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/kcmsystem.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/kcmx.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/kcontrol.png -debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/kdmconfig.png +debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/tdmconfig.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/key_bindings.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/keyboard_layout.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/keyboard.png @@ -774,7 +774,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/kcmscsi.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/kcmsystem.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/kcmx.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/kcontrol.png -debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/kdmconfig.png +debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/tdmconfig.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/key_bindings.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/keyboard_layout.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/keyboard.png @@ -872,7 +872,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/kcmpartitions.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/kcmpci.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/kcmx.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/kcontrol.png -debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/kdmconfig.png +debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/tdmconfig.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/key_bindings.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/kfm_home.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/knotify.png diff --git a/ubuntu/lucid_automake/kdebase/debian/kdebase-doc-html.doc-base.kdm b/ubuntu/lucid_automake/kdebase/debian/kdebase-doc-html.doc-base.kdm deleted file mode 100644 index 759e6ea04..000000000 --- a/ubuntu/lucid_automake/kdebase/debian/kdebase-doc-html.doc-base.kdm +++ /dev/null @@ -1,10 +0,0 @@ -Document: kdebase-doc-html-kdm -Title: KDM Handbook -Author: Oswald Buddenhagen -Abstract: This document describes KDM, the KDE Display Manager, an X session manager. -Section: System - -Format: HTML -Index: /opt/kde3/share/doc/kde/HTML/en/kdm/index.html -Files: /opt/kde3/share/doc/kde/HTML/en/kdm/*.html - diff --git a/ubuntu/lucid_automake/kdebase/debian/kdebase-doc-html.doc-base.tdm b/ubuntu/lucid_automake/kdebase/debian/kdebase-doc-html.doc-base.tdm new file mode 100644 index 000000000..b2fae568e --- /dev/null +++ b/ubuntu/lucid_automake/kdebase/debian/kdebase-doc-html.doc-base.tdm @@ -0,0 +1,10 @@ +Document: kdebase-doc-html-tdm +Title: TDM Handbook +Author: Oswald Buddenhagen +Abstract: This document describes TDM, the KDE Display Manager, an X session manager. +Section: System + +Format: HTML +Index: /opt/kde3/share/doc/kde/HTML/en/tdm/index.html +Files: /opt/kde3/share/doc/kde/HTML/en/tdm/*.html + diff --git a/ubuntu/lucid_automake/kdebase/debian/kdebase-kde3.README.Debian b/ubuntu/lucid_automake/kdebase/debian/kdebase-kde3.README.Debian index d225a3b34..f8dba94d8 100644 --- a/ubuntu/lucid_automake/kdebase/debian/kdebase-kde3.README.Debian +++ b/ubuntu/lucid_automake/kdebase/debian/kdebase-kde3.README.Debian @@ -1,7 +1,7 @@ Kdm === -For notes on kdm, read: /opt/kde3/share/doc/kdm/README.Debian +For notes on tdm, read: /opt/kde3/share/doc/tdm/README.Debian KDE and media kioslave support diff --git a/ubuntu/lucid_automake/kdebase/debian/kdepasswd-kde3.install b/ubuntu/lucid_automake/kdebase/debian/kdepasswd-kde3.install index 977b01e59..8e5e2315b 100644 --- a/ubuntu/lucid_automake/kdebase/debian/kdepasswd-kde3.install +++ b/ubuntu/lucid_automake/kdebase/debian/kdepasswd-kde3.install @@ -3,33 +3,33 @@ debian/tmp/opt/kde3/lib/kde3/kcm_useraccount.la debian/tmp/opt/kde3/lib/kde3/kcm_useraccount.so debian/tmp/opt/kde3/share/applications/kde/kcm_useraccount.desktop debian/tmp/opt/kde3/share/applications/kde/kdepasswd.desktop -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Apple.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/BeachBall.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Blowfish.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Bug.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Butterfly.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Car.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Cow.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Daemon.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Dog.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Elephant.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Flower.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Frog.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Ghost.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Guitar.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Heart.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Konqui.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Lion.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Monkey.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Penguin.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Pig.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Rabbit.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Ring.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Scream.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Shark.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Splash.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Star.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Teddybear.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Turtle.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Apple.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/BeachBall.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Blowfish.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Bug.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Butterfly.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Car.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Cow.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Daemon.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Dog.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Elephant.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Flower.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Frog.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Ghost.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Guitar.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Heart.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Konqui.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Lion.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Monkey.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Penguin.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Pig.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Rabbit.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Ring.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Scream.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Shark.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Splash.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Star.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Teddybear.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Turtle.png debian/tmp/opt/kde3/share/config.kcfg/kcm_useraccount.kcfg debian/tmp/opt/kde3/share/config.kcfg/kcm_useraccount_pass.kcfg diff --git a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.dirs b/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.dirs deleted file mode 100644 index aaf81895f..000000000 --- a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.dirs +++ /dev/null @@ -1,2 +0,0 @@ -etc/default/kdm-kde3.d -var/lib/kdm-kde3 diff --git a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.install b/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.install deleted file mode 100644 index ca77735d7..000000000 --- a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.install +++ /dev/null @@ -1,52 +0,0 @@ -debian/local/kdm.options etc/kde3/kdm/ -debian/tmp/etc/kde3/kdm/kdmrc -debian/tmp/etc/kde3/kdm/Xaccess -debian/tmp/etc/kde3/kdm/Xreset -debian/tmp/etc/kde3/kdm/Xsession -debian/tmp/etc/kde3/kdm/Xsetup -debian/tmp/etc/kde3/kdm/Xstartup -debian/tmp/etc/kde3/kdm/Xwilling -debian/tmp/opt/kde3/bin/genkdmconf -debian/tmp/opt/kde3/bin/kdm -debian/tmp/opt/kde3/bin/kdm_config -debian/tmp/opt/kde3/bin/kdmctl -debian/tmp/opt/kde3/bin/kdm_greet -debian/tmp/opt/kde3/bin/krootimage -debian/tmp/opt/kde3/share/apps/kdm/pics/kdelogo-crystal.png -debian/tmp/opt/kde3/share/apps/kdm/pics/kdelogo.png -debian/tmp/opt/kde3/share/apps/kdm/pics/shutdown.jpg -debian/tmp/opt/kde3/share/apps/kdm/pics/users/default1.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/default2.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/default3.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/root1.png -debian/tmp/opt/kde3/share/apps/kdm/sessions/9wm.desktop -debian/tmp/opt/kde3/share/apps/kdm/sessions/aewm.desktop -debian/tmp/opt/kde3/share/apps/kdm/sessions/amaterus.desktop -debian/tmp/opt/kde3/share/apps/kdm/sessions/asclassic.desktop -debian/tmp/opt/kde3/share/apps/kdm/sessions/ctwm.desktop -debian/tmp/opt/kde3/share/apps/kdm/sessions/evilwm.desktop -debian/tmp/opt/kde3/share/apps/kdm/sessions/flwm.desktop -debian/tmp/opt/kde3/share/apps/kdm/sessions/lwm.desktop -debian/tmp/opt/kde3/share/apps/kdm/sessions/matchbox.desktop -debian/tmp/opt/kde3/share/apps/kdm/sessions/mwm.desktop -debian/tmp/opt/kde3/share/apps/kdm/sessions/olvwm.desktop -debian/tmp/opt/kde3/share/apps/kdm/sessions/olwm.desktop -debian/tmp/opt/kde3/share/apps/kdm/sessions/oroborus.desktop -debian/tmp/opt/kde3/share/apps/kdm/sessions/pwm.desktop -debian/tmp/opt/kde3/share/apps/kdm/sessions/twm.desktop -debian/tmp/opt/kde3/share/apps/kdm/sessions/ude.desktop -debian/tmp/opt/kde3/share/apps/kdm/sessions/vtwm.desktop -debian/tmp/opt/kde3/share/apps/kdm/sessions/wm2.desktop -debian/tmp/opt/kde3/share/apps/kdm/themes/circles/background.svg -debian/tmp/opt/kde3/share/apps/kdm/themes/circles/circles.xml -debian/tmp/opt/kde3/share/apps/kdm/themes/circles/flower.png -debian/tmp/opt/kde3/share/apps/kdm/themes/circles/GdmGreeterTheme.desktop -debian/tmp/opt/kde3/share/apps/kdm/themes/circles/help.png -debian/tmp/opt/kde3/share/apps/kdm/themes/circles/options.png -debian/tmp/opt/kde3/share/apps/kdm/themes/circles/screenshot.png -debian/tmp/opt/kde3/share/apps/kdm/themes/o2_enterprise -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kdm/common -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kdm/index.cache.bz2 -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kdm/index.docbook -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kdm/kdmrc-ref.docbook -debian/tmp/opt/kde3/share/doc/kdm/README diff --git a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.links b/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.links deleted file mode 100644 index 1a3c396b9..000000000 --- a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.links +++ /dev/null @@ -1 +0,0 @@ -opt/kde3/share/apps/kdm/pics/users/default1.png opt/kde3/share/apps/kdm/faces/.default.face diff --git a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.manpages b/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.manpages deleted file mode 100644 index a071eaabb..000000000 --- a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.manpages +++ /dev/null @@ -1,6 +0,0 @@ -debian/man/genkdmconf-kde3.1 -debian/man/kdm-kde3.1 -debian/man/kdm_config-kde3.1 -debian/man/kdmctl-kde3.1 -debian/man/kdm_greet-kde3.1 -debian/man/krootimage-kde3.1 diff --git a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.preinst b/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.preinst deleted file mode 100644 index 636c7d840..000000000 --- a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.preinst +++ /dev/null @@ -1,29 +0,0 @@ -#! /bin/sh -e - -case "$1" in - - upgrade) - rm -f /etc/kde3/debian/kdm-update-menu.sh - rm -f /etc/kde3/debian/kdm.options - rm -f /etc/kde3/kdm/pixmaps/XFree86bw.xpm - rm -f /etc/kde3/kdm/pixmaps/XFree86.xpm - rm -f /etc/kde3/kdm/Xresources - rm -f /etc/menu-methods/kdm - ;; - - install) - ;; - - abort-upgrade) - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; - -esac - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/lucid_automake/kdebase/debian/local/kdm.options b/ubuntu/lucid_automake/kdebase/debian/local/kdm.options deleted file mode 100644 index 5d8bbb624..000000000 --- a/ubuntu/lucid_automake/kdebase/debian/local/kdm.options +++ /dev/null @@ -1,8 +0,0 @@ -# /etc/kde3/kdm/kdm.options -# -# configuration options for kdm -# See kdm.options(5) for an explanation of the available options. - -no-ignore-nologin -no-restart-on-upgrade -use-sessreg diff --git a/ubuntu/lucid_automake/kdebase/debian/local/tdm.options b/ubuntu/lucid_automake/kdebase/debian/local/tdm.options new file mode 100644 index 000000000..2993b7f09 --- /dev/null +++ b/ubuntu/lucid_automake/kdebase/debian/local/tdm.options @@ -0,0 +1,8 @@ +# /etc/kde3/tdm/tdm.options +# +# configuration options for tdm +# See tdm.options(5) for an explanation of the available options. + +no-ignore-nologin +no-restart-on-upgrade +use-sessreg diff --git a/ubuntu/maverick_automake/kdebase/debian/local/kdm.options.5 b/ubuntu/lucid_automake/kdebase/debian/local/tdm.options.5 index 1b235c2ce..36189b00a 100644 --- a/ubuntu/maverick_automake/kdebase/debian/local/kdm.options.5 +++ b/ubuntu/lucid_automake/kdebase/debian/local/tdm.options.5 @@ -1,4 +1,4 @@ -.\" $Id: kdm.options.5,v 1.2 2004/02/27 22:45:20 ccheney Exp $ +.\" $Id: tdm.options.5,v 1.2 2004/02/27 22:45:20 ccheney Exp $ .\" .\" Copyright 1998, 2002, 2003 Branden Robinson <branden@debian.org>. .\" @@ -15,16 +15,16 @@ .\" the Debian operating system, in /usr/share/common-licenses/GPL; if .\" not, write to the Free Software Foundation, Inc., 59 Temple Place, .\" Suite 330, Boston, MA 02111-1307 USA -.TH kdm.options 5 "2003\-09\-18" "Debian Project" +.TH tdm.options 5 "2003\-09\-18" "Debian Project" .SH NAME -kdm.options \- configuration options for X display manager +tdm.options \- configuration options for X display manager .SH DESCRIPTION -.I /etc/kde3/kdm/kdm.options +.I /etc/kde3/tdm/tdm.options contains a set of flags that determine some of the behavior of the X display manager -.BR kdm (1). +.BR tdm (1). .PP -.I /etc/kde3/kdm/kdm.options +.I /etc/kde3/tdm/tdm.options may contain comments, which begin with a hash mark and end at the next newline, just like comments in shell scripts. The rest of the file consists of options which are expressed as words separated by hyphens, with @@ -38,50 +38,50 @@ Normally, the contents of the /etc/nologin file will be displayed using .BR xmessage (1x) (if .B xmessage -is available), and the user will be returned to the kdm login screen after -the xmessage is dismissed. If this option is enabled, kdm starts a session +is available), and the user will be returned to the tdm login screen after +the xmessage is dismissed. If this option is enabled, tdm starts a session as usual (after the xmessage is dismissed, if xmessage is available). .TP .B restart\-on\-upgrade Enable this option with caution on \(oqproduction\(cq machines; it causes -the kdm daemon to be stopped and restarted on upgrade, even if the process +the tdm daemon to be stopped and restarted on upgrade, even if the process has children (which means it is managing X sessions). Typically when a package that contains a daemon is being installed or upgraded, its maintainer scripts stop a running daemon process before installing the new -binary, and restart it after the new binary is installed. Stopping kdm +binary, and restart it after the new binary is installed. Stopping tdm causes immediate termination of any sessions it manages; in some situations -this could be an unwelcome surprise (for instance, for remote kdm users who +this could be an unwelcome surprise (for instance, for remote tdm users who had no idea the administrator was performing system maintenance). On the other hand, for machines that stay up for long periods of time, leaving the old daemon running can be a bad idea if the new version has, for instance, -a fix for a security vulnerability (overwriting kdm's executable on the -file system has no effect on the copy of kdm in memory). The kdm -pre\-removal script checks to see if the kdm process has any children; if +a fix for a security vulnerability (overwriting tdm's executable on the +file system has no effect on the copy of tdm in memory). The tdm +pre\-removal script checks to see if the tdm process has any children; if it does, it is possible that someone's session would be killed by stopping -kdm, so a warning is issued and an opportunity to abort the upgrade of kdm -is provided. If this option is disabled (the Debian default), kdm will be +tdm, so a warning is issued and an opportunity to abort the upgrade of tdm +is provided. If this option is disabled (the Debian default), tdm will be not be stopped or started during an install or upgrade; the administrator -will have to do so by hand (with \(oq/etc/init.d/kdm restart\(cq, or by -rebooting the system) before the newly installed kdm binary is used. +will have to do so by hand (with \(oq/etc/init.d/tdm restart\(cq, or by +rebooting the system) before the newly installed tdm binary is used. .TP .B use\-sessreg If this option is enabled (the Debian default), the sessreg program will be -invoked to register X sessions managed by kdm in the utmp and wtmp files. +invoked to register X sessions managed by tdm in the utmp and wtmp files. Otherwise, it is not, and the utmp and wtmp files will have no record of -kdm sessions. +tdm sessions. .PP Users of older versions of the Debian system should note that the \(oqrun\-xconsole\(cq option has been removed. Shell scripts named -.I /etc/kde3/kdm/Xsetup +.I /etc/kde3/tdm/Xsetup and -.I /etc/kde3/kdm/Xreset -can be edited to disable or modify the running of xconsole on the kdm +.I /etc/kde3/tdm/Xreset +can be edited to disable or modify the running of xconsole on the tdm greeter screen; see the -.B kdm +.B tdm manual page for more information. .SH AUTHOR This manpage was written by Branden Robinson for the Debian Project. .SH SEE ALSO .BR sessreg (1x), .BR xmessage (1x), -.BR kdm (1x) +.BR tdm (1x) diff --git a/ubuntu/maverick_automake/kdebase/debian/man/genkdmconf-kde3.1 b/ubuntu/lucid_automake/kdebase/debian/man/gentdmconf-kde3.1 index e627bdaf0..fe759bed4 100644 --- a/ubuntu/maverick_automake/kdebase/debian/man/genkdmconf-kde3.1 +++ b/ubuntu/lucid_automake/kdebase/debian/man/gentdmconf-kde3.1 @@ -1,12 +1,12 @@ .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH GENKDMCONF 1 "June 2006" "K Desktop Environment" "generate configuration files for kdm" +.TH GENTDMCONF 1 "June 2006" "K Desktop Environment" "generate configuration files for tdm" .SH NAME -genkdmconf -\- generate configuration files for kdm +gentdmconf +\- generate configuration files for tdm .SH SYNOPSIS -\fBgenkdmconf\fP +\fBgentdmconf\fP .RB [ \-\-in -.IR /path/to/new/kdm\-config\-dir ] +.IR /path/to/new/tdm\-config\-dir ] .RS 11 .RB [ \-\-old\-xdm .IR /path/to/old/xdm\-dir ] @@ -27,49 +27,49 @@ genkdmconf .RE .SH DESCRIPTION -\fBgenkdmconf\fP is used to generate configuration files for \fBkdm\fP. +\fBgentdmconf\fP is used to generate configuration files for \fBtdm\fP. .br -If an older xdm/kdm configuration is found, its config files are "absorbed"; +If an older xdm/tdm configuration is found, its config files are "absorbed"; if it lives in the new target directory, its scripts are reused (and possibly modified) as well, otherwise the scripts are ignored and default scripts are installed. .SH OPTIONS .TP -.BI \-\-in \ /path/to/new/kdm\-config\-dir +.BI \-\-in \ /path/to/new/tdm\-config\-dir In which directory to put the new configuration. You can use this to support a $(DESTDIR), but not to change the final location of the installation \- the paths inside the files are not affected. .br -Default is \fI/etc/kde3/kdm\fP. +Default is \fI/etc/kde3/tdm\fP. .TP .BI \-\-old\-xdm \ /path/to/old/xdm\-dir -Where to look for the config files of an \fBxdm\fP / older \fBkdm\fP. Default is to scan -.IR /etc/X11/kdm , \ $XLIBDIR/kdm , \ /etc/X11/xdm , \ $XLIBDIR/xdm ; -there in turn look for \fIkdm\-config\fP and \fIxdm\-config\fP. +Where to look for the config files of an \fBxdm\fP / older \fBtdm\fP. Default is to scan +.IR /etc/X11/tdm , \ $XLIBDIR/tdm , \ /etc/X11/xdm , \ $XLIBDIR/xdm ; +there in turn look for \fItdm\-config\fP and \fIxdm\-config\fP. .br Note that you possibly need to use \fB\-\-no\-old\-kde\fP to make this take effect. .TP .BI \-\-old\-kde \ /path/to/old/kde\-config\-dir -Where to look for the \fIkdmrc\fP of an older \fBkdm\fP. +Where to look for the \fItdmrc\fP of an older \fBtdm\fP. .br .RI Default\ is\ to\ scan\ /etc/kde3 \ and\ { /usr,/usr/local , .RI { /opt,/usr/local }{ kde3,kde,kde2,kde1 }} /share/config . .TP .B \-\-no\-old -Don't look at older xdm/kdm configurations, just create default config. +Don't look at older xdm/tdm configurations, just create default config. .TP .B \-\-no\-old\-xdm Don't look at older xdm configurations. .TP .B \-\-no\-old\-kde -Don't look at older kdm configurations. +Don't look at older tdm configurations. .TP .B \-\-old\-scripts -Directly use all scripts from the older xdm/kdm configuration. +Directly use all scripts from the older xdm/tdm configuration. .TP .B \-\-no\-old\-scripts -Don't use scripts from the older xdm/kdm configuration even if it lives in the new target directory. +Don't use scripts from the older xdm/tdm configuration even if it lives in the new target directory. .TP .B \-\-old\-confs -Directly use all ancillary config files from the older xdm/kdm configuration. This is usually a bad idea. +Directly use all ancillary config files from the older xdm/tdm configuration. This is usually a bad idea. .TP .B \-\-no\-backup Overwrite/delete old config files instead of backing them up. @@ -77,7 +77,7 @@ Overwrite/delete old config files instead of backing them up. .B \-\-no\-in\-notice Don't put the notice about \fB\-\-in\fP being used into the generated README. .SH SEE ALSO -.BR kdm (1) +.BR tdm (1) .SH AUTHORS .nf Oswald Buddenhagen <ossi@kde.org> diff --git a/ubuntu/lucid_automake/kdebase/debian/man/krootimage-kde3.1 b/ubuntu/lucid_automake/kdebase/debian/man/krootimage-kde3.1 index 2b683c19e..66464cf62 100644 --- a/ubuntu/lucid_automake/kdebase/debian/man/krootimage-kde3.1 +++ b/ubuntu/lucid_automake/kdebase/debian/man/krootimage-kde3.1 @@ -2,11 +2,11 @@ .TH KROOTIMAGE 1 "June 2006" "K Desktop Environment" "helper program" .SH NAME krootimage -\- set desktop background for kdm +\- set desktop background for tdm .SH SYNOPSIS \fBkrootimage\fP [Qt\-options] [KDE\-options] config .SH DESCRIPTION -\fBkrootimage\fP is a helper program for \fBkdm\fP to set the desktop background. +\fBkrootimage\fP is a helper program for \fBtdm\fP to set the desktop background. .SH OPTIONS .SS .SS Arguments: @@ -135,7 +135,7 @@ sets the application GUI style sets the client geometry of the main widget \- see man X for the argument format .SS .SH SEE ALSO -.BR kdm (1) +.BR tdm (1) .SH AUTHORS .nf Matthias Hoelzer\-Kluepfel <hoelzer@kde.org> diff --git a/ubuntu/lucid_automake/kdebase/debian/man/startkde-kde3.1 b/ubuntu/lucid_automake/kdebase/debian/man/startkde-kde3.1 index f26b7f128..bb279319f 100644 --- a/ubuntu/lucid_automake/kdebase/debian/man/startkde-kde3.1 +++ b/ubuntu/lucid_automake/kdebase/debian/man/startkde-kde3.1 @@ -12,7 +12,7 @@ This manual page was written for the Debian distribution because the original program does not have a manual page. .PP The \fBstartkde\fP script starts up the K Desktop Environment and -is typically executed by your login manager (e.g. xdm, gdm, kdm, wdm or from +is typically executed by your login manager (e.g. xdm, gdm, tdm, wdm or from your X startup scripts). \fBstartkde\fP in turn launches ksmserver, which will load your last session, or a default session that includes the standard KDE programs if no saved session is available. diff --git a/ubuntu/maverick_automake/kdebase/debian/man/kdm-kde3.1 b/ubuntu/lucid_automake/kdebase/debian/man/tdm-kde3.1 index 48637989d..d7eb868fa 100644 --- a/ubuntu/maverick_automake/kdebase/debian/man/kdm-kde3.1 +++ b/ubuntu/lucid_automake/kdebase/debian/man/tdm-kde3.1 @@ -1,16 +1,16 @@ .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH KDM 1 "June 2006" "K Desktop Environment" "KDE Display Manager" +.TH TDM 1 "June 2006" "K Desktop Environment" "KDE Display Manager" .SH NAME -kdm +tdm \- KDE Display Manager .SH SYNOPSIS -\fBkdm\fP [options] [tty] +\fBtdm\fP [options] [tty] .SH DESCRIPTION -\fBkdm\fP is the KDE display manager also known as login manager. It shows a graphical login screen for username and password. After authenticating the user it starts a session. +\fBtdm\fP is the KDE display manager also known as login manager. It shows a graphical login screen for username and password. After authenticating the user it starts a session. .br -\fBkdm\fP can be configured for remote login via XDMCP. XDMCP is the "X Display Manager Control Protocol" which is used to set up connections between remote systems over the network. +\fBtdm\fP can be configured for remote login via XDMCP. XDMCP is the "X Display Manager Control Protocol" which is used to set up connections between remote systems over the network. .sp 1 -\fBkdm\fP is a derivative of \fBxdm\fP. \fBman 1 xdm\fP may provide useful information (requires installed \fBxdm\fP). For X-related problems try \fBman 7x X\fP and \fBman 1 startx\fP. +\fBtdm\fP is a derivative of \fBxdm\fP. \fBman 1 xdm\fP may provide useful information (requires installed \fBxdm\fP). For X-related problems try \fBman 7x X\fP and \fBman 1 startx\fP. .SH OPTIONS .TP .B \-daemon @@ -55,48 +55,48 @@ Debug option bitfield: .RE .SH FILES .TP -.I /etc/kde3/kdm/backgroundrc +.I /etc/kde3/tdm/backgroundrc configuration file with background settings .TP -.I /etc/kde3/kdm/kdm.options -options for X display manager kdm +.I /etc/kde3/tdm/tdm.options +options for X display manager tdm .TP -.I /etc/kde3/kdm/kdmrc -the kdm configuration file +.I /etc/kde3/tdm/tdmrc +the tdm configuration file .TP -.I /etc/kde3/kdm/Xaccess +.I /etc/kde3/tdm/Xaccess access control file for XDMCP connections .TP -.I /etc/kde3/kdm/Xservers +.I /etc/kde3/tdm/Xservers list of local X-servers .TP -.I /etc/kde3/kdm/Xreset +.I /etc/kde3/tdm/Xreset script to run as root after session exits .TP -.I /etc/kde3/kdm/Xsession +.I /etc/kde3/tdm/Xsession script to run as user after login of user .TP -.I /etc/kde3/kdm/Xsetup +.I /etc/kde3/tdm/Xsetup script to run as root before the login dialog appears .sp 1 -this script can be edited to disable or modify the running of \fBxconsole\fP on the kdm greeter screen +this script can be edited to disable or modify the running of \fBxconsole\fP on the tdm greeter screen .TP -.I /etc/kde3/kdm/Xstartup +.I /etc/kde3/tdm/Xstartup script to run as root before session starts .TP -.I /etc/kde3/kdm/Xwilling +.I /etc/kde3/tdm/Xwilling output of this script is displayed in the chooser window .SH SEE ALSO -.BR kdm.options (5),\ kdmctl (1),\ kdm_config (1),\ kdm_greet (1),\ startx (1),\ X (7x),\ xconsole (1),\ xdm (1) +.BR tdm.options (5),\ tdmctl (1),\ tdm_config (1),\ tdm_greet (1),\ startx (1),\ X (7x),\ xconsole (1),\ xdm (1) .TP -.I /opt/kde3/share/doc/kdm/README.gz -Information about \fBkdm\fP and its options +.I /opt/kde3/share/doc/tdm/README.gz +Information about \fBtdm\fP and its options .sp 1 .RE Full user documentation is available through the KDE Help Center. You can also enter the URL -.BR help:/kdm/ +.BR help:/tdm/ directly into konqueror or you can run -.BR "khelpcenter help:/kdm/" +.BR "khelpcenter help:/tdm/" from the command\-line. .br .SH AUTHORS diff --git a/ubuntu/maverick_automake/kdebase/debian/man/kdm_config-kde3.1 b/ubuntu/lucid_automake/kdebase/debian/man/tdm_config-kde3.1 index d1cbfea1d..d9325214a 100644 --- a/ubuntu/maverick_automake/kdebase/debian/man/kdm_config-kde3.1 +++ b/ubuntu/lucid_automake/kdebase/debian/man/tdm_config-kde3.1 @@ -1,14 +1,14 @@ .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH KDM_CONFIG 1 "June 2006" "K Desktop Environment" "helper program" +.TH TDM_CONFIG 1 "June 2006" "K Desktop Environment" "helper program" .SH NAME -kdm_config -\- helper programm for kdm to read configuration files +tdm_config +\- helper programm for tdm to read configuration files .SH SYNOPSIS -\fBkdm_config\fP +\fBtdm_config\fP .SH DESCRIPTION -\fBkdm_config\fP is a helper program for \fBkdm\fP to read configuration files. +\fBtdm_config\fP is a helper program for \fBtdm\fP to read configuration files. .SH SEE ALSO -\fBkdm\fP(1) +\fBtdm\fP(1) .SH AUTHORS .nf Oswald Buddenhagen <ossi@kde.org> diff --git a/ubuntu/lucid_automake/kdebase/debian/man/kdm_greet-kde3.1 b/ubuntu/lucid_automake/kdebase/debian/man/tdm_greet-kde3.1 index f1607e2b1..c33f57d5f 100644 --- a/ubuntu/lucid_automake/kdebase/debian/man/kdm_greet-kde3.1 +++ b/ubuntu/lucid_automake/kdebase/debian/man/tdm_greet-kde3.1 @@ -1,14 +1,14 @@ .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH KDM_GREET 1 "June 2006" "K Desktop Environment" "KDE greeter module" +.TH TDM_GREET 1 "June 2006" "K Desktop Environment" "KDE greeter module" .SH NAME -kdm_greet -\- KDE greeter module for kdm +tdm_greet +\- KDE greeter module for tdm .SH SYNOPSIS -\fBkdm_greet\fP +\fBtdm_greet\fP .SH DESCRIPTION -\fBkdm_greet\fP is a KDE greeter module for \fBkdm\fP. It shows the login dialog. +\fBtdm_greet\fP is a KDE greeter module for \fBtdm\fP. It shows the login dialog. .SH SEE ALSO -.BR kdm (1) +.BR tdm (1) .SH AUTHORS .nf Oswald Buddenhagen <ossi@kde.org> diff --git a/ubuntu/maverick_automake/kdebase/debian/man/kdmctl-kde3.1 b/ubuntu/lucid_automake/kdebase/debian/man/tdmctl-kde3.1 index 6e5ab781f..9833845bf 100644 --- a/ubuntu/maverick_automake/kdebase/debian/man/kdmctl-kde3.1 +++ b/ubuntu/lucid_automake/kdebase/debian/man/tdmctl-kde3.1 @@ -1,12 +1,12 @@ .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH KDMCTL 1 "June 2006" "K Desktop Environment" "KDM remote control application" +.TH TDMCTL 1 "June 2006" "K Desktop Environment" "TDM remote control application" .SH NAME -kdmctl -\- kdm remote control application +tdmctl +\- tdm remote control application .SH SYNOPSIS -\fBkdmctl\fP [options] [command [command arguments]] +\fBtdmctl\fP [options] [command [command arguments]] .SH DESCRIPTION -\fBkdmctl\fP is an application to remote\-control \fBkdm\fP. It makes use of UNIX domain sockets. +\fBtdmctl\fP is an application to remote\-control \fBtdm\fP. It makes use of UNIX domain sockets. .sp 1 There are two types of sockets: the global one (dmctl) and the per\-display ones (dmctl\-<display>). The global one's subdir is owned by root, the subdirs of the per\-display ones' are owned by the user currently owning the session (root or the logged in user). .sp 1 @@ -16,7 +16,7 @@ The directory in which the sockets are located is determined this way: .br \- the $DM_CONTROL variable is examined .br -\- the kdm config file is searched for the FifoDir key +\- the tdm config file is searched for the FifoDir key .br .RI \- /var/run/xdmctl \ and\ /var/run \ are\ tried .RE @@ -28,7 +28,7 @@ Tokens in the command and the reply are tab\-separated. Command arguments can be specified as separate command line parameters, in which case they are simply concatenated with tabs in between. .sp 1 -If the command is '\-', \fBkdmctl\fP reads commands from stdin. +If the command is '\-', \fBtdmctl\fP reads commands from stdin. The default command is 'caps'. .SH OPTIONS .SS @@ -47,7 +47,7 @@ Override $DISPLAY Override $DM_CONTROL .TP .B \-c \-config -Use alternative kdm config file +Use alternative tdm config file .SS Commands: .br .SS Global commands: @@ -72,8 +72,8 @@ The currently running session is forcibly terminated. No auto\-relogin is attemp .TP .B caps Returns a list of this socket's capabilities: -.IP " \- kdm" -identifies kdm, in case some other DM implements this protocol, too. +.IP " \- tdm" +identifies tdm, in case some other DM implements this protocol, too. .IP " \- list, activate, lock, suicide, login" the respective command is supported. .IP " \- bootoptions" @@ -155,7 +155,7 @@ Shutdowns requested from per\-display sockets are executed when the current sess .sp 1 start is the time for which the shutdown is scheduled. If it starts with a plus\-sign, the current time is added. Zero means immediately. .sp 1 -end is the latest time at which the shutdown should be performed if active sessions are still running. If it starts with a plus\-sign, the start time is added. Minus one means wait infinitely. If end is through and active sessions are still running, \fBKDM\fP can do one of the following: +end is the latest time at which the shutdown should be performed if active sessions are still running. If it starts with a plus\-sign, the start time is added. Minus one means wait infinitely. If end is through and active sessions are still running, \fBTDM\fP can do one of the following: .RS 3 - "cancel" \- give up the shutdown. .br @@ -203,10 +203,10 @@ The entries are comma\-separated tuples of: \- New fields might be added later. .RE .SH SEE ALSO -.BR kdm (1) +.BR tdm (1) .TP -.I /opt/kde3/share/doc/kdm/README.gz -Information about the command sockets (and \fBkdm\fP) +.I /opt/kde3/share/doc/tdm/README.gz +Information about the command sockets (and \fBtdm\fP) .SH AUTHORS .nf Oswald Buddenhagen <ossi@kde.org> diff --git a/ubuntu/lucid_automake/kdebase/debian/not-installed.list b/ubuntu/lucid_automake/kdebase/debian/not-installed.list index 28d931349..06a9e8a78 100644 --- a/ubuntu/lucid_automake/kdebase/debian/not-installed.list +++ b/ubuntu/lucid_automake/kdebase/debian/not-installed.list @@ -1,12 +1,12 @@ The following files are not installed in any binary package. This is deliberate. -/usr/share/apps/kdm/sessions/*.desktop +/usr/share/apps/tdm/sessions/*.desktop - many .desktop files are not included since they either do not have Debian packages, or their Debian packages include their own .desktop session - files for gdm/kdm, or they're not intended to be stand-alone window + files for gdm/tdm, or they're not intended to be stand-alone window managers. Eventually, these should ALL be dropped, since they aren't - really maintained upstream, and kdm isn't the correct place to ship these + really maintained upstream, and tdm isn't the correct place to ship these anyway. Here's the current list of those dropped: aewm++ @@ -38,7 +38,7 @@ This is deliberate. xfce4 xfce -/etc/kde3/kdm/README +/etc/kde3/tdm/README - useless comments, not intended for the end user. /usr/share/fonts/override/fonts.dir diff --git a/ubuntu/lucid_automake/kdebase/debian/patches/kubuntu_89_new_logout_ui.diff b/ubuntu/lucid_automake/kdebase/debian/patches/kubuntu_89_new_logout_ui.diff index 52fa6a4d5..2c106549e 100644 --- a/ubuntu/lucid_automake/kdebase/debian/patches/kubuntu_89_new_logout_ui.diff +++ b/ubuntu/lucid_automake/kdebase/debian/patches/kubuntu_89_new_logout_ui.diff @@ -1,5 +1,5 @@ ---- kdm/kfrontend/kdmshutdown.cpp -+++ kdm/kfrontend/kdmshutdown.cpp +--- tdm/kfrontend/tdmshutdown.cpp ++++ tdm/kfrontend/tdmshutdown.cpp @@ -467,7 +467,7 @@ , targetList( 0 ) { diff --git a/ubuntu/lucid_automake/kdebase/debian/patches/kubuntu_9921_kdm_bulletproof_x.diff b/ubuntu/lucid_automake/kdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff index 4aad9f8e3..f2584303c 100644 --- a/ubuntu/lucid_automake/kdebase/debian/patches/kubuntu_9921_kdm_bulletproof_x.diff +++ b/ubuntu/lucid_automake/kdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff @@ -1,5 +1,5 @@ ---- kdebase-3.5.8/kdm/backend/dm.c 2008-02-13 23:59:17.000000000 +0200 -+++ kdebase-3.5.8/kdm/backend/dm.c 2008-02-14 11:22:41.000000000 +0200 +--- kdebase-3.5.8/tdm/backend/dm.c 2008-02-13 23:59:17.000000000 +0200 ++++ kdebase-3.5.8/tdm/backend/dm.c 2008-02-14 11:22:41.000000000 +0200 @@ -996,9 +996,14 @@ ReapChildren( void ) /* don't kill again */ break; @@ -18,8 +18,8 @@ StartServerFailed(); break; } ---- kdebase-3.5.8/kdm/backend/server.c 2008-02-13 23:59:17.000000000 +0200 -+++ kdebase-3.5.8/kdm/backend/server.c 2008-02-14 11:41:20.000000000 +0200 +--- kdebase-3.5.8/tdm/backend/server.c 2008-02-13 23:59:17.000000000 +0200 ++++ kdebase-3.5.8/tdm/backend/server.c 2008-02-14 11:41:20.000000000 +0200 @@ -48,6 +48,10 @@ from the copyright holder. struct display *startingServer; time_t serverTimeout = TO_INF; diff --git a/ubuntu/lucid_automake/kdebase/debian/po/POTFILES.in b/ubuntu/lucid_automake/kdebase/debian/po/POTFILES.in index 416e5f394..1f7bb4d7d 100644 --- a/ubuntu/lucid_automake/kdebase/debian/po/POTFILES.in +++ b/ubuntu/lucid_automake/kdebase/debian/po/POTFILES.in @@ -1 +1 @@ -[type: gettext/rfc822deb] kdm.templates +[type: gettext/rfc822deb] tdm.templates diff --git a/ubuntu/lucid_automake/kdebase/debian/po/ar.po b/ubuntu/lucid_automake/kdebase/debian/po/ar.po index a8dc77710..d2da9442b 100644 --- a/ubuntu/lucid_automake/kdebase/debian/po/ar.po +++ b/ubuntu/lucid_automake/kdebase/debian/po/ar.po @@ -28,13 +28,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "مدير العرض الاÙتراضي:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -44,7 +44,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -56,7 +56,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -70,29 +70,29 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "هل تود إيقا٠تشغيل عÙريت kdmØŸ" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "هل تود إيقا٠تشغيل عÙريت tdmØŸ" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"يكون عÙريت مدير Ø³Ø·Ø Ù…ÙƒØªØ¨ كي (kdm) عادة موقÙاً عند ترقية الØزمة " +"يكون عÙريت مدير Ø³Ø·Ø Ù…ÙƒØªØ¨ كي (tdm) عادة موقÙاً عند ترقية الØزمة " "وإزالتها، ولكن يبدو أنه يدير على الأقل جلسة X واØدة تعمل Øالياً." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"إن تم إيقا٠kdm الآن، Ùستنهى أي جلسات X يقوم بإدارتها. " +"إن تم إيقا٠tdm الآن، Ùستنهى أي جلسات X يقوم بإدارتها. " "عدى ذلك، سيسري Ù…Ùعول النسخة الجديدة ÙÙŠ المرة التالية التي " "يتم Ùيها إعادة تشغيل العÙريت." diff --git a/ubuntu/lucid_automake/kdebase/debian/po/ca.po b/ubuntu/lucid_automake/kdebase/debian/po/ca.po index 88ea30560..c483cfd6f 100644 --- a/ubuntu/lucid_automake/kdebase/debian/po/ca.po +++ b/ubuntu/lucid_automake/kdebase/debian/po/ca.po @@ -39,13 +39,13 @@ msgstr "" #. Type: select
#. Description
-#: ../kdm.templates:1001
+#: ../tdm.templates:1001
msgid "Default display manager:"
msgstr "Escolliu el gestor de pantalla:"
#. Type: select
#. Description
-#: ../kdm.templates:1001
+#: ../tdm.templates:1001
msgid ""
"A display manager is a program that provides graphical login capabilities "
"for the X Window System."
@@ -55,7 +55,7 @@ msgstr "" #. Type: select
#. Description
-#: ../kdm.templates:1001
+#: ../tdm.templates:1001
msgid ""
"Only one display manager can manage a given X server, but multiple display "
"manager packages are installed. Please select which display manager should "
@@ -67,7 +67,7 @@ msgstr "" #. Type: select
#. Description
-#: ../kdm.templates:1001
+#: ../tdm.templates:1001
msgid ""
"Multiple display managers can run simultaneously if they are configured to "
"manage different servers; to achieve this, configure the display managers "
@@ -82,39 +82,39 @@ msgstr "" #. Type: boolean
#. Description
-#: ../kdm.templates:3001
-msgid "Stop the kdm daemon?"
-msgstr "Voleu detenir el dimoni «kdm»?"
+#: ../tdm.templates:3001
+msgid "Stop the tdm daemon?"
+msgstr "Voleu detenir el dimoni «tdm»?"
#. Type: boolean
#. Description
-#: ../kdm.templates:3001
+#: ../tdm.templates:3001
msgid ""
-"The K Desktop manager (kdm) daemon is typically stopped on package upgrade "
+"The K Desktop manager (tdm) daemon is typically stopped on package upgrade "
"and removal, but it appears to be managing at least one running X session."
msgstr ""
-"El dimoni gestor de pantalla de KDE, (kdm), sol ser detingut en actualitzar-ne "
+"El dimoni gestor de pantalla de KDE, (tdm), sol ser detingut en actualitzar-ne "
"i eliminar-ne el paquet, però sembla que ara està gestionant almenys una "
"sessió X activa."
#. Type: boolean
#. Description
-#: ../kdm.templates:3001
+#: ../tdm.templates:3001
msgid ""
-"If kdm is stopped now, any X sessions it manages will be terminated. "
+"If tdm is stopped now, any X sessions it manages will be terminated. "
"Otherwise, the new version will take effect the next time the daemon is "
"restarted."
msgstr ""
-"Si es deté «kdm» ara, terminaran totes les sessions X que està gestionant. "
-"Altrament, podeu deixar corrent «kdm», i la nova versió surtirà efecte a la "
+"Si es deté «tdm» ara, terminaran totes les sessions X que està gestionant. "
+"Altrament, podeu deixar corrent «tdm», i la nova versió surtirà efecte a la "
"següent volta que el dimoni es reinicie."
msgid ""
-"The X display manager (kdm) daemon is typically stopped on package "
+"The X display manager (tdm) daemon is typically stopped on package "
"upgrade and removal, but it appears to be managing at least one running X "
"session."
msgstr ""
-"El dimoni gestor de pantalla d’X, «kdm», sol ser detingut en actualitzarâ€ne"
+"El dimoni gestor de pantalla d’X, «tdm», sol ser detingut en actualitzarâ€ne"
"i eliminarâ€ne el paquet, però sembla que ara està gestionant almenys "
"una sessió X activa."
diff --git a/ubuntu/lucid_automake/kdebase/debian/po/cs.po b/ubuntu/lucid_automake/kdebase/debian/po/cs.po index e1f71369f..cf9809978 100644 --- a/ubuntu/lucid_automake/kdebase/debian/po/cs.po +++ b/ubuntu/lucid_automake/kdebase/debian/po/cs.po @@ -1,4 +1,4 @@ -# debconf templates for kdm package +# debconf templates for tdm package # Czech translation # # $Id: cs.po 1042 2006-01-09 07:55:08Z ender $ @@ -24,7 +24,7 @@ # msgid "" msgstr "" -"Project-Id-Version: kdm\n" +"Project-Id-Version: tdm\n" "Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n" "POT-Creation-Date: 2007-03-23 07:15+0100\n" "PO-Revision-Date: 2007-04-10 18:15+0200\n" @@ -36,13 +36,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Výchozà správce obrazovky:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -52,7 +52,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -63,7 +63,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -77,38 +77,38 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Zastavit démona kdm?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Zastavit démona tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Démon kdm (K Desktop manager) je obvykle pÅ™i aktualizaci nebo odstranÄ›nà " +"Démon tdm (K Desktop manager) je obvykle pÅ™i aktualizaci nebo odstranÄ›nà " "balÃku zastaven, ale zdá se, že spravuje minimálnÄ› jedno X sezenÃ." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Pokud by byl kdm zastaven nynÃ, vÅ¡echna jÃm spravovaná X sezenà by se " -"ukonÄila. V opaÄném pÅ™ÃpadÄ› zůstane kdm běžet a nová verze se spustà s " +"Pokud by byl tdm zastaven nynÃ, vÅ¡echna jÃm spravovaná X sezenà by se " +"ukonÄila. V opaÄném pÅ™ÃpadÄ› zůstane tdm běžet a nová verze se spustà s " "pÅ™ÃÅ¡tÃm restartem démona." #~ msgid "" -#~ "The X display manager (kdm) daemon is typically stopped on package " +#~ "The X display manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " #~ "session." #~ msgstr "" -#~ "Démon kdm (X display manager) je obvykle pÅ™i aktualizaci nebo odstranÄ›nà " +#~ "Démon tdm (X display manager) je obvykle pÅ™i aktualizaci nebo odstranÄ›nà " #~ "balÃku zastaven, ale zdá se, že spravuje minimálnÄ› jedno X sezenÃ." #~ msgid "Select the desired default display manager." @@ -134,18 +134,18 @@ msgstr "" #~ "nakonfigurovat, upravit jejich spouÅ¡tÄ›cà skripty v /etc/init.d a zakázat " #~ "kontrolu standardnÃho správce obrazovky.)" -#~ msgid "Do you wish to stop the kdm daemon?" -#~ msgstr "Chcete zastavit daemona kdm?" +#~ msgid "Do you wish to stop the tdm daemon?" +#~ msgstr "Chcete zastavit daemona tdm?" #~ msgid "" -#~ "The K Desktop manager (kdm) daemon is typically stopped on package " +#~ "The K Desktop manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " -#~ "session. If kdm is stopped now, any X sessions it manages will be " -#~ "terminated. Otherwise you may leave kdm running, and the new version will " +#~ "session. If tdm is stopped now, any X sessions it manages will be " +#~ "terminated. Otherwise you may leave tdm running, and the new version will " #~ "take effect the next time the daemon is restarted." #~ msgstr "" -#~ "Daemon kdm (K Desktop manager) je obvykle pÅ™i aktualizaci nebo odstranÄ›nà " +#~ "Daemon tdm (K Desktop manager) je obvykle pÅ™i aktualizaci nebo odstranÄ›nà " #~ "balÃku zastaven, ale zdá se, že právÄ› spravuje minimálnÄ› jedno X sezenÃ. " -#~ "Pokud by byl kdm zastaven nynÃ, vÅ¡echna jÃm spravovaná X sezenà by byla " -#~ "ukonÄena. V opaÄném pÅ™ÃpadÄ› můžene nechat kdm běžet a nová verze se " +#~ "Pokud by byl tdm zastaven nynÃ, vÅ¡echna jÃm spravovaná X sezenà by byla " +#~ "ukonÄena. V opaÄném pÅ™ÃpadÄ› můžene nechat tdm běžet a nová verze se " #~ "spustà s pÅ™ÃÅ¡tÃm restartem daemona." diff --git a/ubuntu/lucid_automake/kdebase/debian/po/da.po b/ubuntu/lucid_automake/kdebase/debian/po/da.po index d41e03dba..394004a2e 100644 --- a/ubuntu/lucid_automake/kdebase/debian/po/da.po +++ b/ubuntu/lucid_automake/kdebase/debian/po/da.po @@ -29,13 +29,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Standard logind-håndtering:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -45,7 +45,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -57,7 +57,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -71,30 +71,30 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Stop kdm-dæmonen?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Stop tdm-dæmonen?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Skrivebordshåndterings-dæmonen kdm stoppes typisk ved opgradering og " +"Skrivebordshåndterings-dæmonen tdm stoppes typisk ved opgradering og " "fjernelse af pakken, men den lader til at være beskæftiget med mindst én " "kørende X-session." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Hvis kdm stoppes nu, vil de X-sessioner, den håndterer, " -"blive afsluttet. Ellers kan du lade kdm køre. Så vil den nye version først " +"Hvis tdm stoppes nu, vil de X-sessioner, den håndterer, " +"blive afsluttet. Ellers kan du lade tdm køre. Så vil den nye version først " "tage over når dæmonen genstartes." diff --git a/ubuntu/lucid_automake/kdebase/debian/po/de.po b/ubuntu/lucid_automake/kdebase/debian/po/de.po index e71aa86b2..d635bf7df 100644 --- a/ubuntu/lucid_automake/kdebase/debian/po/de.po +++ b/ubuntu/lucid_automake/kdebase/debian/po/de.po @@ -45,13 +45,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Standardmäßiger Display-Manager:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -61,7 +61,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -73,7 +73,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -88,30 +88,30 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Soll der kdm-Dienst gestoppt werden?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Soll der tdm-Dienst gestoppt werden?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Der K Display Manager (kdm) Dienst wird meist beim Aktualisieren oder " +"Der K Display Manager (tdm) Dienst wird meist beim Aktualisieren oder " "Entfernen eines Pakets gestoppt, aber er scheint mindestens eine laufende X-" "Sitzung zu verwalten." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Wenn kdm jetzt gestoppt wird, werden alle Sitzungen beendet, die er gerade " -"verwaltet. Alternativ können Sie kdm weiter laufen lassen, die neue Version " +"Wenn tdm jetzt gestoppt wird, werden alle Sitzungen beendet, die er gerade " +"verwaltet. Alternativ können Sie tdm weiter laufen lassen, die neue Version " "wird dann aktiv, sobald der Dienst das nächste Mal gestartet wird." diff --git a/ubuntu/lucid_automake/kdebase/debian/po/el.po b/ubuntu/lucid_automake/kdebase/debian/po/el.po index c0ced55f3..9723b2f9f 100644 --- a/ubuntu/lucid_automake/kdebase/debian/po/el.po +++ b/ubuntu/lucid_automake/kdebase/debian/po/el.po @@ -36,14 +36,14 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "Default display manager:" msgstr "ΕπιλÎξτε τον επιθυμητό διαχειÏιστή οθόνης." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -53,7 +53,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "" "Only one display manager can manage a given X server, but multiple display " @@ -66,7 +66,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "" "Multiple display managers can run simultaneously if they are configured to " @@ -82,54 +82,54 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy -msgid "Stop the kdm daemon?" -msgstr "ΘÎλετε να σταματήσετε να χÏησιμοποιείτε τον δαίμονα kdm;" +msgid "Stop the tdm daemon?" +msgstr "ΘÎλετε να σταματήσετε να χÏησιμοποιείτε τον δαίμονα tdm;" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Κανονικά, η λειτουÏγία του δαίμονα του διαχειÏιστή οθόνης των X (kdm) " +"Κανονικά, η λειτουÏγία του δαίμονα του διαχειÏιστή οθόνης των X (tdm) " "διακόπτεται με κάθε αναβάθμιση και διαγÏαφή του πακÎτου, αλλά στη " "συγκεκÏιμÎνη πεÏίπτωση φαίνεται ότι διαχειÏίζεται ήδη τουλάχιστον μια " -"συνεδÏία των X (X session). Αν ο kdm τεÏματιστεί Ï„ÏŽÏα, οποιεσδήποτε " +"συνεδÏία των X (X session). Αν ο tdm τεÏματιστεί Ï„ÏŽÏα, οποιεσδήποτε " "συνεδÏίες των X χειÏίζεται θα τεÏματιστοÏν επίσης. ΔιαφοÏετικά, μποÏείτε να " -"αφήσετε τον kdm να συνεχίσει τη λειτουÏγία του και η νÎα Îκδοση να " +"αφήσετε τον tdm να συνεχίσει τη λειτουÏγία του και η νÎα Îκδοση να " "χÏησιμοποιηθεί την επόμενη φοÏά που θα Ï„ÏÎξει ο δαίμονας." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Κανονικά, η λειτουÏγία του δαίμονα του διαχειÏιστή οθόνης των X (kdm) " +"Κανονικά, η λειτουÏγία του δαίμονα του διαχειÏιστή οθόνης των X (tdm) " "διακόπτεται με κάθε αναβάθμιση και διαγÏαφή του πακÎτου, αλλά στη " "συγκεκÏιμÎνη πεÏίπτωση φαίνεται ότι διαχειÏίζεται ήδη τουλάχιστον μια " -"συνεδÏία των X (X session). Αν ο kdm τεÏματιστεί Ï„ÏŽÏα, οποιεσδήποτε " +"συνεδÏία των X (X session). Αν ο tdm τεÏματιστεί Ï„ÏŽÏα, οποιεσδήποτε " "συνεδÏίες των X χειÏίζεται θα τεÏματιστοÏν επίσης. ΔιαφοÏετικά, μποÏείτε να " -"αφήσετε τον kdm να συνεχίσει τη λειτουÏγία του και η νÎα Îκδοση να " +"αφήσετε τον tdm να συνεχίσει τη λειτουÏγία του και η νÎα Îκδοση να " "χÏησιμοποιηθεί την επόμενη φοÏά που θα Ï„ÏÎξει ο δαίμονας." #, fuzzy #~ msgid "" -#~ "The X display manager (kdm) daemon is typically stopped on package " +#~ "The X display manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " #~ "session." #~ msgstr "" -#~ "Κανονικά, η λειτουÏγία του δαίμονα του διαχειÏιστή οθόνης των X (kdm) " +#~ "Κανονικά, η λειτουÏγία του δαίμονα του διαχειÏιστή οθόνης των X (tdm) " #~ "διακόπτεται με κάθε αναβάθμιση και διαγÏαφή του πακÎτου, αλλά στη " #~ "συγκεκÏιμÎνη πεÏίπτωση φαίνεται ότι διαχειÏίζεται ήδη τουλάχιστον μια " -#~ "συνεδÏία των X (X session). Αν ο kdm τεÏματιστεί Ï„ÏŽÏα, οποιεσδήποτε " +#~ "συνεδÏία των X (X session). Αν ο tdm τεÏματιστεί Ï„ÏŽÏα, οποιεσδήποτε " #~ "συνεδÏίες των X χειÏίζεται θα τεÏματιστοÏν επίσης. ΔιαφοÏετικά, μποÏείτε " -#~ "να αφήσετε τον kdm να συνεχίσει τη λειτουÏγία του και η νÎα Îκδοση να " +#~ "να αφήσετε τον tdm να συνεχίσει τη λειτουÏγία του και η νÎα Îκδοση να " #~ "χÏησιμοποιηθεί την επόμενη φοÏά που θα Ï„ÏÎξει ο δαίμονας." diff --git a/ubuntu/lucid_automake/kdebase/debian/po/es.po b/ubuntu/lucid_automake/kdebase/debian/po/es.po index bf23041ba..04d93a9a2 100644 --- a/ubuntu/lucid_automake/kdebase/debian/po/es.po +++ b/ubuntu/lucid_automake/kdebase/debian/po/es.po @@ -40,13 +40,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Gestor de sesiones predefinido:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -56,7 +56,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -65,7 +65,7 @@ msgstr "Cada servidor X s�lo puede ser gestionado por un �nico gestor de ses #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -77,24 +77,24 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "�Desea detener el daemon kdm?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "�Desea detener el daemon tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." -msgstr "Normalmente se detiene el daemon del gestor de sesiones de KDE (kdm) al actualizar o borrar el paquete, pero parece que est� gestionando al menos una sesi�n X activa." +msgstr "Normalmente se detiene el daemon del gestor de sesiones de KDE (tdm) al actualizar o borrar el paquete, pero parece que est� gestionando al menos una sesi�n X activa." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." -msgstr "Si detiene kdm ahora, se finalizar�n todas las sesiones X que est� gestionando. La otra posibilidad es mantener kdm en ejecuci�n, con lo que la nueva versi�n no se activar� hasta la pr�xima vez que se reinicie el daemon." +msgstr "Si detiene tdm ahora, se finalizar�n todas las sesiones X que est� gestionando. La otra posibilidad es mantener tdm en ejecuci�n, con lo que la nueva versi�n no se activar� hasta la pr�xima vez que se reinicie el daemon." diff --git a/ubuntu/lucid_automake/kdebase/debian/po/eu.po b/ubuntu/lucid_automake/kdebase/debian/po/eu.po index 406af4b13..76252143d 100644 --- a/ubuntu/lucid_automake/kdebase/debian/po/eu.po +++ b/ubuntu/lucid_automake/kdebase/debian/po/eu.po @@ -39,13 +39,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Lehenetsiriko pantaila kudeatzailea:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -55,7 +55,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -67,7 +67,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -81,30 +81,30 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" msgstr "Kdm deabrua gelditu?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"K Pantaila Kudeatzaile (kdm) deabrua arruntean gelditu egiten da pakete " +"K Pantaila Kudeatzaile (tdm) deabrua arruntean gelditu egiten da pakete " "bertsio berritze edo ezabaketa egiterakoan, baina dirudienez martxan dagoen " "X saio bat behintzat kudeatzen ari da." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"kdm orain gelditu ezkero, kudeatzen ari den edozein X saio itxi egingo da. " -"Bestela kdm martxan utz dezakezu eta bertsio berria deabrua abiarazten den " +"tdm orain gelditu ezkero, kudeatzen ari den edozein X saio itxi egingo da. " +"Bestela tdm martxan utz dezakezu eta bertsio berria deabrua abiarazten den " "hurrengo aldian erabiliko da." diff --git a/ubuntu/lucid_automake/kdebase/debian/po/fi.po b/ubuntu/lucid_automake/kdebase/debian/po/fi.po index 3fbbd16d4..fee2513e5 100644 --- a/ubuntu/lucid_automake/kdebase/debian/po/fi.po +++ b/ubuntu/lucid_automake/kdebase/debian/po/fi.po @@ -14,43 +14,43 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Oletusnäytönhallintaohjelma:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "A display manager is a program that provides graphical login capabilities for the X Window System." msgstr "Näytönhallintaohjelma on ohjelma, joka tarjoaa graafisen sisäänkirjautumisruudun X-ikkunointijärjestelmään." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Only one display manager can manage a given X server, but multiple display manager packages are installed. Please select which display manager should run by default." msgstr "Kutakin X-palvelinta voi hoitaa vain yksi näytönhallintaohjelma, mutta useampia näytönhallintaohjelmapaketteja on asennettuna. Valitse mikä näytönhallintaohjelma tulisi ajaa oletuksena." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Multiple display managers can run simultaneously if they are configured to manage different servers; to achieve this, configure the display managers accordingly, edit each of their init scripts in /etc/init.d, and disable the check for a default display manager." msgstr "Useampi näytönhallintaohjelma voi olla ajossa yhtäaikaisesti, jos ne on asetettu hoitamaan eri palvelimia. Saadaksesi tämän aikaan, aseta näytönhallintaohjelmat tämän mukaisesti, muokkaa kunkin niistä alustustiedostoja hakemistossa /etc/init.d ja poista oletusnäytönhallintaohjelman tarkistus käytöstä." #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Pysäytetäänkö kdm-taustaohjelma?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Pysäytetäänkö tdm-taustaohjelma?" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "The K Desktop manager (kdm) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session." -msgstr "K Desktop manager (kdm) -taustaohjelma pysäytetään yleensä päivitettäessä tai poistettaessa pakettia, mutta se näyttää hoitavan ainakin yhtä ajossa olevaa X-istuntoa." +#: ../tdm.templates:3001 +msgid "The K Desktop manager (tdm) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session." +msgstr "K Desktop manager (tdm) -taustaohjelma pysäytetään yleensä päivitettäessä tai poistettaessa pakettia, mutta se näyttää hoitavan ainakin yhtä ajossa olevaa X-istuntoa." #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "If kdm is stopped now, any X sessions it manages will be terminated. Otherwise, the new version will take effect the next time the daemon is restarted." -msgstr "Jos kdm pysäytetään nyt, kaikki sen hoitamat X-istunnot lopetetaan. Muussa tapauksessa uusi versio otetaan käyttöön ensi kerralla, kun taustaohjelma käynnistetään uudelleen." +#: ../tdm.templates:3001 +msgid "If tdm is stopped now, any X sessions it manages will be terminated. Otherwise, the new version will take effect the next time the daemon is restarted." +msgstr "Jos tdm pysäytetään nyt, kaikki sen hoitamat X-istunnot lopetetaan. Muussa tapauksessa uusi versio otetaan käyttöön ensi kerralla, kun taustaohjelma käynnistetään uudelleen." diff --git a/ubuntu/lucid_automake/kdebase/debian/po/fr.po b/ubuntu/lucid_automake/kdebase/debian/po/fr.po index ba49906b6..90e090ddb 100644 --- a/ubuntu/lucid_automake/kdebase/debian/po/fr.po +++ b/ubuntu/lucid_automake/kdebase/debian/po/fr.po @@ -44,13 +44,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Gestionnaire graphique de session par défaut :" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -60,7 +60,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -72,7 +72,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -86,30 +86,30 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Faut-il arrêter le démon kdm ?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Faut-il arrêter le démon tdm ?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Le gestionnaire de sessions KDE (kdm) est généralement arrêté lors de la mise " +"Le gestionnaire de sessions KDE (tdm) est généralement arrêté lors de la mise " "à jour ou de la suppression du paquet. Cependant, il semble qu'il gère " "actuellement encore au moins une session X." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Si kdm est arrêté maintenant, toutes les sessions X qu'il gère seront " -"terminées. L'autre possibilité est de laisser fonctionner kdm, la nouvelle " +"Si tdm est arrêté maintenant, toutes les sessions X qu'il gère seront " +"terminées. L'autre possibilité est de laisser fonctionner tdm, la nouvelle " "version ne devenant active qu'au prochain redémarrage du démon." diff --git a/ubuntu/lucid_automake/kdebase/debian/po/gl.po b/ubuntu/lucid_automake/kdebase/debian/po/gl.po index 896b37aae..173f4f8ed 100644 --- a/ubuntu/lucid_automake/kdebase/debian/po/gl.po +++ b/ubuntu/lucid_automake/kdebase/debian/po/gl.po @@ -18,13 +18,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Xestor de pantalla por defecto:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -34,7 +34,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -46,7 +46,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -60,38 +60,38 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "¿Deter o servizo de kdm?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "¿Deter o servizo de tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Adoita se deter o servizo do xestor de pantalla de KDE (kdm) ao actualizar " +"Adoita se deter o servizo do xestor de pantalla de KDE (tdm) ao actualizar " "ou eliminar o paquete, pero semella que está a xestionar alomenos unha " "sesión X en execución." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Se se detén kdm agora, hase cortar calquera sesión X que xestione. Se non, a " +"Se se detén tdm agora, hase cortar calquera sesión X que xestione. Se non, a " "nova versión ha tomar efecto a próxima vez que reinicie o servizo." #~ msgid "" -#~ "The X display manager (kdm) daemon is typically stopped on package " +#~ "The X display manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " #~ "session." #~ msgstr "" -#~ "Adoita se deter o servizo do xestor de pantalla de X (kdm) ao actualizar " +#~ "Adoita se deter o servizo do xestor de pantalla de X (tdm) ao actualizar " #~ "ou eliminar o paquete, pero semella que está a xestionar alomenos unha " #~ "sesión X en execución." @@ -118,18 +118,18 @@ msgstr "" #~ "xestores de pantalla, edite os seus scripts de inicio de /etc/init.d e " #~ "desactive a comprobación do xestor de pantalla por defecto)." -#~ msgid "Do you wish to stop the kdm daemon?" -#~ msgstr "¿Quere deter o daemon de kdm?" +#~ msgid "Do you wish to stop the tdm daemon?" +#~ msgstr "¿Quere deter o daemon de tdm?" #~ msgid "" -#~ "The K Desktop manager (kdm) daemon is typically stopped on package " +#~ "The K Desktop manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " -#~ "session. If kdm is stopped now, any X sessions it manages will be " -#~ "terminated. Otherwise you may leave kdm running, and the new version will " +#~ "session. If tdm is stopped now, any X sessions it manages will be " +#~ "terminated. Otherwise you may leave tdm running, and the new version will " #~ "take effect the next time the daemon is restarted." #~ msgstr "" -#~ "Normalmente adóitase deter o daemon do xestor de pantalla de KDE (kdm) ao " +#~ "Normalmente adóitase deter o daemon do xestor de pantalla de KDE (tdm) ao " #~ "actualizar ou eliminar o paquete, pero semella que está a xestionar " -#~ "alomenos unha sesión X en execución. Se se detén kdm agora, hase cortar " -#~ "calquera sesión X que xestione. Se non, pode deixar kdm a se executar, e " +#~ "alomenos unha sesión X en execución. Se se detén tdm agora, hase cortar " +#~ "calquera sesión X que xestione. Se non, pode deixar tdm a se executar, e " #~ "a nova versión ha tomar efecto a próxima vez que reinicie o daemon." diff --git a/ubuntu/lucid_automake/kdebase/debian/po/it.po b/ubuntu/lucid_automake/kdebase/debian/po/it.po index 76de3e664..d93fad397 100644 --- a/ubuntu/lucid_automake/kdebase/debian/po/it.po +++ b/ubuntu/lucid_automake/kdebase/debian/po/it.po @@ -39,13 +39,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Display manager predefinito." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -55,7 +55,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -67,7 +67,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -82,29 +82,29 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Arrestare il demone kdm?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Arrestare il demone tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Il demone del display manager KDE (kdm) viene tipicamente fermato in fase " +"Il demone del display manager KDE (tdm) viene tipicamente fermato in fase " "di aggiornamento o rimozione del pacchetto, ma pare che al momento stia " "gestendo almeno una sessione attiva di X." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Se kdm viene arrestato ora, anche tutte le sessioni di X che gestisce " +"Se tdm viene arrestato ora, anche tutte le sessioni di X che gestisce " "verranno terminate. In alternativa, la nuova versione sarà usata a partire " "dal prossimo avvio del demone." diff --git a/ubuntu/lucid_automake/kdebase/debian/po/ja.po b/ubuntu/lucid_automake/kdebase/debian/po/ja.po index 1f876f9c6..74863f343 100644 --- a/ubuntu/lucid_automake/kdebase/debian/po/ja.po +++ b/ubuntu/lucid_automake/kdebase/debian/po/ja.po @@ -39,13 +39,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "デフォルトã®ãƒ‡ã‚£ã‚¹ãƒ—レイマãƒãƒ¼ã‚¸ãƒ£:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -55,7 +55,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -67,7 +67,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -81,37 +81,37 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "kdm デーモンをåœæ¢ã—ã¾ã™ã‹?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "tdm デーモンをåœæ¢ã—ã¾ã™ã‹?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." -msgstr "K デスクトップマãƒãƒ¼ã‚¸ãƒ£ (kdm) デーモンã¯ã€æ™®é€šã€ãƒ‘ッケージã®æ›´æ–°ã‚„削除ã®éš›ã«åœæ¢ã•ã›ã‚‰ã‚Œã¾ã™ã€‚ã—ã‹ã— kdm ã¯ç¾åœ¨å‹•ä½œä¸ã® X セッションを最低ã²ã¨ã¤ã¯ç®¡ç†ã—ã¦ã„るよã†ã§ã™ã€‚" +msgstr "K デスクトップマãƒãƒ¼ã‚¸ãƒ£ (tdm) デーモンã¯ã€æ™®é€šã€ãƒ‘ッケージã®æ›´æ–°ã‚„削除ã®éš›ã«åœæ¢ã•ã›ã‚‰ã‚Œã¾ã™ã€‚ã—ã‹ã— tdm ã¯ç¾åœ¨å‹•ä½œä¸ã® X セッションを最低ã²ã¨ã¤ã¯ç®¡ç†ã—ã¦ã„るよã†ã§ã™ã€‚" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"ã„ã¾ kdm ã‚’åœæ¢ã™ã‚‹ã¨ã€ã“ã® kdm ãŒç®¡ç†ã—ã¦ã„ã‚‹ X セッションã¯åœæ¢ã—ã¾ã™ã€‚ã‚ã‚‹" -"ã„ã¯æ¬¡ã«ãƒ‡ãƒ¼ãƒ¢ãƒ³ã‚’リスタートã—ãŸã¨ãã«æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã® kdm を有効ã«ã™ã‚‹ã“ã¨" +"ã„ã¾ tdm ã‚’åœæ¢ã™ã‚‹ã¨ã€ã“ã® tdm ãŒç®¡ç†ã—ã¦ã„ã‚‹ X セッションã¯åœæ¢ã—ã¾ã™ã€‚ã‚ã‚‹" +"ã„ã¯æ¬¡ã«ãƒ‡ãƒ¼ãƒ¢ãƒ³ã‚’リスタートã—ãŸã¨ãã«æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã® tdm を有効ã«ã™ã‚‹ã“ã¨" "ã‚‚ã§ãã¾ã™ã€‚" #~ msgid "" -#~ "The X display manager (kdm) daemon is typically stopped on package " +#~ "The X display manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " #~ "session." #~ msgstr "" -#~ "X ディスプレイマãƒãƒ¼ã‚¸ãƒ£ (kdm) デーモンã¯ã€æ™®é€šã€ãƒ‘ッケージã®æ›´æ–°ã‚„削除ã®" -#~ "éš›ã«åœæ¢ã•ã›ã‚‰ã‚Œã¾ã™ã€‚ã—ã‹ã— kdm ã¯ç¾åœ¨å‹•ä½œä¸ã® X セッションを最低ã²ã¨ã¤ã¯" +#~ "X ディスプレイマãƒãƒ¼ã‚¸ãƒ£ (tdm) デーモンã¯ã€æ™®é€šã€ãƒ‘ッケージã®æ›´æ–°ã‚„削除ã®" +#~ "éš›ã«åœæ¢ã•ã›ã‚‰ã‚Œã¾ã™ã€‚ã—ã‹ã— tdm ã¯ç¾åœ¨å‹•ä½œä¸ã® X セッションを最低ã²ã¨ã¤ã¯" #~ "管ç†ã—ã¦ã„るよã†ã§ã™ã€‚" #~ msgid "Select the desired default display manager." @@ -139,18 +139,18 @@ msgstr "" #~ "切ã«è¨å®šã—ã¦ã€/etc/init.d ã«ã‚ã‚‹å„ init スクリプトを編集ã—ã€ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®" #~ "ディスプレイマãƒãƒ¼ã‚¸ãƒ£ã®ç¢ºèªã‚’無効ã«ã—ã¦ãã ã•ã„。)" -#~ msgid "Do you wish to stop the kdm daemon?" -#~ msgstr "kdm デーモンをåœæ¢ã—ãŸã„ã§ã™ã‹?" +#~ msgid "Do you wish to stop the tdm daemon?" +#~ msgstr "tdm デーモンをåœæ¢ã—ãŸã„ã§ã™ã‹?" #~ msgid "" -#~ "The K Desktop manager (kdm) daemon is typically stopped on package " +#~ "The K Desktop manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " -#~ "session. If kdm is stopped now, any X sessions it manages will be " -#~ "terminated. Otherwise you may leave kdm running, and the new version will " +#~ "session. If tdm is stopped now, any X sessions it manages will be " +#~ "terminated. Otherwise you may leave tdm running, and the new version will " #~ "take effect the next time the daemon is restarted." #~ msgstr "" -#~ "K Desktop manager (kdm) デーモンã¯é€šå¸¸ã€ãƒ‘ッケージã®æ›´æ–°ãŠã‚ˆã³å‰Šé™¤æ™‚ã«åœæ¢" +#~ "K Desktop manager (tdm) デーモンã¯é€šå¸¸ã€ãƒ‘ッケージã®æ›´æ–°ãŠã‚ˆã³å‰Šé™¤æ™‚ã«åœæ¢" #~ "ã—ã¾ã™ãŒã€å°‘ãªãã¨ã‚‚ 1 ã¤ã®å‹•ä½œä¸ã® X セッションを管ç†ã—ã¦ã„るよã†ã§ã™ã€‚" -#~ "kdm を今åœæ¢ã™ã‚‹ã¨ã€ã“ã‚ŒãŒç®¡ç†ã™ã‚‹ X セッションã¯æ®ºã•ã‚Œã¾ã™ã€‚ãã®ä»£ã‚ã‚Š" -#~ "ã«ã€kdm を動作ã—ã¦ã„ã‚‹ã¾ã¾ã«ã—ã¦ãŠãã€æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯æ¬¡å›žã®ãƒ‡ãƒ¼ãƒ¢ãƒ³ã®å†" +#~ "tdm を今åœæ¢ã™ã‚‹ã¨ã€ã“ã‚ŒãŒç®¡ç†ã™ã‚‹ X セッションã¯æ®ºã•ã‚Œã¾ã™ã€‚ãã®ä»£ã‚ã‚Š" +#~ "ã«ã€tdm を動作ã—ã¦ã„ã‚‹ã¾ã¾ã«ã—ã¦ãŠãã€æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯æ¬¡å›žã®ãƒ‡ãƒ¼ãƒ¢ãƒ³ã®å†" #~ "起動時ã«åŠ¹æžœã‚’表ã™ã‚ˆã†ã«ã§ãã¾ã™ã€‚" diff --git a/ubuntu/lucid_automake/kdebase/debian/po/ko.po b/ubuntu/lucid_automake/kdebase/debian/po/ko.po index 6200caa12..6bde61a03 100644 --- a/ubuntu/lucid_automake/kdebase/debian/po/ko.po +++ b/ubuntu/lucid_automake/kdebase/debian/po/ko.po @@ -19,13 +19,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "기본 화면관리ìž:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -35,7 +35,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -46,7 +46,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -59,27 +59,27 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "kdm ë°ëª¬ì„ 중지시킬까요?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "tdm ë°ëª¬ì„ 중지시킬까요?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"K ë°ìŠ¤í¬íƒ‘ 관리ìž(kdm) ë°ëª¬ì€ ì¼ë°˜ì 으로 꾸러미를 ì„¤ì¹˜í•˜ê³ ì—…ê·¸ë ˆì´ë“œí• ë•Œ " +"K ë°ìŠ¤í¬íƒ‘ 관리ìž(tdm) ë°ëª¬ì€ ì¼ë°˜ì 으로 꾸러미를 ì„¤ì¹˜í•˜ê³ ì—…ê·¸ë ˆì´ë“œí• ë•Œ " "중지ë˜ì§€ë§Œ 현재 하나 ì´ìƒì˜ X ì„¸ì…˜ì„ ê´€ë¦¬í•˜ëŠ” ì¤‘ì¸ ê²ƒ 같습니다." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"kdmì„ ì§€ê¸ˆ 중지시키면 kdmì´ ê´€ë¦¬í•˜ê³ ìžˆëŠ” X ì„¸ì…˜ì€ ëª¨ë‘ ì¤‘ë‹¨ë©ë‹ˆë‹¤. 지금 중지" +"tdmì„ ì§€ê¸ˆ 중지시키면 tdmì´ ê´€ë¦¬í•˜ê³ ìžˆëŠ” X ì„¸ì…˜ì€ ëª¨ë‘ ì¤‘ë‹¨ë©ë‹ˆë‹¤. 지금 중지" "시키지 않으면 새로 설치한 ë²„ì „ì€ ë°ëª¬ì„ 다시 ì‹œìž‘í• ë•Œë¶€í„° 사용ë©ë‹ˆë‹¤." diff --git a/ubuntu/lucid_automake/kdebase/debian/po/ml.po b/ubuntu/lucid_automake/kdebase/debian/po/ml.po index b4b07f9b2..9e28db764 100644 --- a/ubuntu/lucid_automake/kdebase/debian/po/ml.po +++ b/ubuntu/lucid_automake/kdebase/debian/po/ml.po @@ -1,11 +1,11 @@ -# Malayalam translation of kdm debconf template. +# Malayalam translation of tdm debconf template. # Copyright (C) 2007 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the kdm package. +# This file is distributed under the same license as the tdm package. # Praveen|à´ªàµà´°à´µàµ€à´£àµâ€ A|à´Ž <pravi.a@gmail.com>, Anivar|അനിവരàµâ€ Aravind|അരവിനàµà´¦àµ <anivar@movingrepublic.org> 2007. # msgid "" msgstr "" -"Project-Id-Version: kdm 1.0\n" +"Project-Id-Version: tdm 1.0\n" "Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n" "POT-Creation-Date: 2007-03-23 07:15+0100\n" "PO-Revision-Date: 2007-03-23 09:46+0530\n" @@ -18,13 +18,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "ഡിഫാളàµâ€à´Ÿàµà´Ÿà´¾à´¯à´¿ വേണàµà´Ÿ à´ªàµà´°à´¦à´°àµâ€à´¶à´¨ മാനേജരàµâ€:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -33,7 +33,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -45,7 +45,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -59,29 +59,29 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "kdm ഡീമണെ നിരàµâ€à´¤àµà´¤à´¿à´•àµà´•àµ‡à´¾à´Ÿàµà´Ÿàµ†?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "tdm ഡീമണെ നിരàµâ€à´¤àµà´¤à´¿à´•àµà´•àµ‡à´¾à´Ÿàµà´Ÿàµ†?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"കെ à´ªàµà´°à´¦à´°àµâ€à´¶à´¨ മാനേജരàµâ€ (kdm) ഡീമണàµâ€ സാധാരണയായി പാകàµà´•àµ‡à´œàµ à´ªàµà´¤àµà´•àµà´•à´²à´¿à´¨àµà´±àµ‡à´¯àµà´‚ നീകàµà´•à´‚ " +"കെ à´ªàµà´°à´¦à´°àµâ€à´¶à´¨ മാനേജരàµâ€ (tdm) ഡീമണàµâ€ സാധാരണയായി പാകàµà´•àµ‡à´œàµ à´ªàµà´¤àµà´•àµà´•à´²à´¿à´¨àµà´±àµ‡à´¯àµà´‚ നീകàµà´•à´‚ " "ചെയàµà´¯à´²à´¿à´¨àµà´±àµ‡à´¯àµà´‚ സമയതàµà´¤à´¾à´£àµ നിരàµâ€à´¤àµà´¤à´¾à´±àµà´³àµà´³à´¤àµ, പകàµà´·àµ‡ à´ªàµà´°à´µà´°àµâ€à´¤àµà´¤à´¿à´šàµà´šàµà´•àµŠà´£àµà´Ÿà´¿à´°à´¿à´•àµà´•àµà´¨àµà´¨ ഒരൠഎകàµà´¸àµ " "സെഷനെയെങàµà´•à´¿à´²àµà´‚ ഇപàµà´ªàµ‹à´³àµâ€ ഇതൠനിയനàµà´¤àµà´°à´¿à´šàµà´šàµà´•àµŠà´£àµà´Ÿà´¿à´°à´¿à´•àµà´•àµà´¨àµà´¨à´¤àµ പോലെ തോനàµà´¨àµà´¨àµà´¨àµ." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"kdm ഇപàµà´ªàµ‹à´³àµâ€ നിരàµâ€à´¤àµà´¤àµà´•à´¯à´¾à´£àµ†à´™àµà´•à´¿à´²àµâ€, ഇതൠനിയനàµà´¤àµà´°à´¿à´šàµà´šàµà´•àµŠà´£àµà´Ÿà´¿à´°à´¿à´•àµà´•àµà´¨àµà´¨ à´Žà´•àµà´¸àµ സെഷനàµà´•à´³àµà´‚ " +"tdm ഇപàµà´ªàµ‹à´³àµâ€ നിരàµâ€à´¤àµà´¤àµà´•à´¯à´¾à´£àµ†à´™àµà´•à´¿à´²àµâ€, ഇതൠനിയനàµà´¤àµà´°à´¿à´šàµà´šàµà´•àµŠà´£àµà´Ÿà´¿à´°à´¿à´•àµà´•àµà´¨àµà´¨ à´Žà´•àµà´¸àµ സെഷനàµà´•à´³àµà´‚ " "അവസാനിപàµà´ªà´¿à´•àµà´•àµà´¨àµà´¨à´¤à´¾à´¯à´¿à´°à´¿à´•àµà´•àµà´‚. à´…à´²àµà´²àµ†à´™àµà´•à´¿à´²àµâ€, à´…à´Ÿàµà´¤àµà´¤ തവണ ഡീമണàµâ€ വീണàµà´Ÿàµà´‚ à´¤àµà´Ÿà´™àµà´™àµà´®àµà´ªàµ‹à´³àµâ€ à´ªàµà´¤à´¿à´¯ ലകàµà´•à´‚ " "നിലവിലàµâ€ വരàµà´‚." diff --git a/ubuntu/lucid_automake/kdebase/debian/po/nb.po b/ubuntu/lucid_automake/kdebase/debian/po/nb.po index f770838af..87e1fefb3 100644 --- a/ubuntu/lucid_automake/kdebase/debian/po/nb.po +++ b/ubuntu/lucid_automake/kdebase/debian/po/nb.po @@ -18,13 +18,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Standard skjermstyrer:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -34,7 +34,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -45,7 +45,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -59,26 +59,26 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Stoppe kdm-nissen?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Stoppe tdm-nissen?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Nissen K Desktop Manager (kdm) stoppes normalt nÃ¥r dens pakke fjernes eller " +"Nissen K Desktop Manager (tdm) stoppes normalt nÃ¥r dens pakke fjernes eller " "oppgraderes, men det ser ut til at den styrer minst en pÃ¥gÃ¥ende X-økt." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." -msgstr "Hvis kdm stoppes nÃ¥ blir alle X-økter den styrer avbrutt. Ellers vil den nye versjonen blir tatt i bruk neste gang nissen startes." +msgstr "Hvis tdm stoppes nÃ¥ blir alle X-økter den styrer avbrutt. Ellers vil den nye versjonen blir tatt i bruk neste gang nissen startes." diff --git a/ubuntu/lucid_automake/kdebase/debian/po/nl.po b/ubuntu/lucid_automake/kdebase/debian/po/nl.po index 548713017..6956057bc 100644 --- a/ubuntu/lucid_automake/kdebase/debian/po/nl.po +++ b/ubuntu/lucid_automake/kdebase/debian/po/nl.po @@ -25,7 +25,7 @@ # msgid "" msgstr "" -"Project-Id-Version: kdm\n" +"Project-Id-Version: tdm\n" "Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n" "POT-Creation-Date: 2007-03-23 07:15+0100\n" "PO-Revision-Date: 2007-04-05 17:35+0100\n" @@ -38,52 +38,52 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Standaard beeldschermbeheerder:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "A display manager is a program that provides graphical login capabilities for the X Window System." msgstr "Een beeldschermbeheerder is een programma waarmee u zich grafisch op het systeem kunt aanmelden, waarna u in de grafische omgeving (het X Window System) terecht komt." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Only one display manager can manage a given X server, but multiple display manager packages are installed. Please select which display manager should run by default." msgstr "Elke X-server kan door slechts één beeldschermbeheerder beheerd worden, hoewel er meerdere beeldschermbeheerders geïnstalleerd kunnen zijn. Welke beeldschermbeheerder dient standaard gebruikt te worden?" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Multiple display managers can run simultaneously if they are configured to manage different servers; to achieve this, configure the display managers accordingly, edit each of their init scripts in /etc/init.d, and disable the check for a default display manager." msgstr "Het is mogelijk om meerdere beeldschermbeheerders tegelijk te draaien zolang deze verschillende servers beheren. Om dat te bereiken dient u de beeldschermbeheerders overeenkomstig in te stellen door in hun init-scripts (in /etc/init.d) de controle of ze de standaard beeldschermbeheerder zijn uit te schakelen." #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Wilt u de kdm-achtergronddienst stoppen?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Wilt u de tdm-achtergronddienst stoppen?" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "The K Desktop manager (kdm) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session." -msgstr "Normaal wordt de kdm-achtergronddienst gestopt bij opwaardering en verwijdering van het pakket kdm; momenteel blijkt deze echter minstens 1 X-sessie te beheren." +#: ../tdm.templates:3001 +msgid "The K Desktop manager (tdm) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session." +msgstr "Normaal wordt de tdm-achtergronddienst gestopt bij opwaardering en verwijdering van het pakket tdm; momenteel blijkt deze echter minstens 1 X-sessie te beheren." #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "If kdm is stopped now, any X sessions it manages will be terminated. Otherwise, the new version will take effect the next time the daemon is restarted." -msgstr "Als kdm nu gestopt wordt, worden alle door kdm beheerde X-sessies afgesloten. Als u kdm nu laat draaien wordt de nieuwe versie pas actief de eerstvolgende keer dat de achtergronddienst herstart wordt. " +#: ../tdm.templates:3001 +msgid "If tdm is stopped now, any X sessions it manages will be terminated. Otherwise, the new version will take effect the next time the daemon is restarted." +msgstr "Als tdm nu gestopt wordt, worden alle door tdm beheerde X-sessies afgesloten. Als u tdm nu laat draaien wordt de nieuwe versie pas actief de eerstvolgende keer dat de achtergronddienst herstart wordt. " #~ msgid "" -#~ "The X display manager (kdm) daemon is typically stopped on package " +#~ "The X display manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " #~ "session." #~ msgstr "" -#~ "Normaal wordt de beeldschermbeheerder (kdm) gestopt bij opwaardering en " +#~ "Normaal wordt de beeldschermbeheerder (tdm) gestopt bij opwaardering en " #~ "verwijdering van dit pakket; momenteel is er echter minstens één lopende " #~ "X-sessie actief." #~ msgid "Select the desired default display manager." @@ -107,19 +107,19 @@ msgstr "Als kdm nu gestopt wordt, worden alle door kdm beheerde X-sessies afgesl #~ "bereiken, configureert u de weergavebeheerders op de gepaste wijze, " #~ "bewerkt u hun startscripts in /etc/init.d en schakelt u de controle voor " #~ "een standaard weergavebeheerder uit.)" -#~ msgid "Do you wish to stop the kdm daemon?" -#~ msgstr "Wilt u de kdm-achtergronddienst stoppen?" +#~ msgid "Do you wish to stop the tdm daemon?" +#~ msgstr "Wilt u de tdm-achtergronddienst stoppen?" #~ msgid "" -#~ "The K Desktop manager (kdm) daemon is typically stopped on package " +#~ "The K Desktop manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " -#~ "session. If kdm is stopped now, any X sessions it manages will be " -#~ "terminated. Otherwise you may leave kdm running, and the new version will " +#~ "session. If tdm is stopped now, any X sessions it manages will be " +#~ "terminated. Otherwise you may leave tdm running, and the new version will " #~ "take effect the next time the daemon is restarted." #~ msgstr "" -#~ "De K Desktop manager (kdm) achtergronddienst wordt typisch gestopt bij " +#~ "De K Desktop manager (tdm) achtergronddienst wordt typisch gestopt bij " #~ "pakketopwaarderingen en -verwijderingen, maar het blijkt minstens één " -#~ "actieve X-sessie te beheren. Als kdm nu wordt gestopt, dan zullen alle X-" -#~ "sessies die het beheert worden beëindigd. Anders kunt u kdm laten draaien " +#~ "actieve X-sessie te beheren. Als tdm nu wordt gestopt, dan zullen alle X-" +#~ "sessies die het beheert worden beëindigd. Anders kunt u tdm laten draaien " #~ "en zal de nieuwe versie gebruikt worden wanneer de achtergronddienst de " #~ "volgende keer wordt gestart." diff --git a/ubuntu/lucid_automake/kdebase/debian/po/pl.po b/ubuntu/lucid_automake/kdebase/debian/po/pl.po index 9f4940f7b..ff2df8574 100644 --- a/ubuntu/lucid_automake/kdebase/debian/po/pl.po +++ b/ubuntu/lucid_automake/kdebase/debian/po/pl.po @@ -26,14 +26,14 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "Default display manager:" msgstr "Wybierz domy¶lny display manager." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -43,7 +43,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "" "Only one display manager can manage a given X server, but multiple display " @@ -56,7 +56,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "" "Multiple display managers can run simultaneously if they are configured to " @@ -71,21 +71,21 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy -msgid "Stop the kdm daemon?" -msgstr "Czy chcesz zatrzymaæ daemona kdm?" +msgid "Stop the tdm daemon?" +msgstr "Czy chcesz zatrzymaæ daemona tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" "Daemon K Desktop manager jest zazwyczaj zatrzymywany w czasie aktualizacji i " -"usuwania pakietu kdm, ale wygl±da na to, ¿e w tej chwili zarz±dza on " +"usuwania pakietu tdm, ale wygl±da na to, ¿e w tej chwili zarz±dza on " "conajmniej jedn± sesj± X Window. Je¶li zostanie on teraz zatrzymany, " "wszystkie zarz±dzane przez niego sesje zostan± przerwane. Mo¿na jednak nie " "zatrzymywaæ teraz tego daemona -- nowa wersja zacznie dzia³aæ przy jego " @@ -93,15 +93,15 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" "Daemon K Desktop manager jest zazwyczaj zatrzymywany w czasie aktualizacji i " -"usuwania pakietu kdm, ale wygl±da na to, ¿e w tej chwili zarz±dza on " +"usuwania pakietu tdm, ale wygl±da na to, ¿e w tej chwili zarz±dza on " "conajmniej jedn± sesj± X Window. Je¶li zostanie on teraz zatrzymany, " "wszystkie zarz±dzane przez niego sesje zostan± przerwane. Mo¿na jednak nie " "zatrzymywaæ teraz tego daemona -- nowa wersja zacznie dzia³aæ przy jego " diff --git a/ubuntu/lucid_automake/kdebase/debian/po/pt.po b/ubuntu/lucid_automake/kdebase/debian/po/pt.po index 9720aa0f0..7526913c8 100644 --- a/ubuntu/lucid_automake/kdebase/debian/po/pt.po +++ b/ubuntu/lucid_automake/kdebase/debian/po/pt.po @@ -20,13 +20,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Gestor de ecrã por omissão:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -36,7 +36,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -48,7 +48,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -63,39 +63,39 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Deseja parar o daemon kdm?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Deseja parar o daemon tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"O daemon do gestor de ecrã X (kdm) é tipicamente parado na actualização ou " +"O daemon do gestor de ecrã X (tdm) é tipicamente parado na actualização ou " "remoção de pacotes, mas parece que este está a gerir pelo menos uma sessão X " "activa." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Se o kdm for parado agora, todas as sessões X que este estiver a gerir serão " +"Se o tdm for parado agora, todas as sessões X que este estiver a gerir serão " "terminadas. Caso contrário, a nova versão terá efeito da próxima vez que o " "daemon for reiniciado." #~ msgid "" -#~ "The X display manager (kdm) daemon is typically stopped on package " +#~ "The X display manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " #~ "session." #~ msgstr "" -#~ "O daemon do gestor de ecrã X (kdm) é tipicamente parado na actualização " +#~ "O daemon do gestor de ecrã X (tdm) é tipicamente parado na actualização " #~ "ou remoção de pacotes, mas parece que este está a gerir pelo menos uma " #~ "sessão X activa." @@ -122,18 +122,18 @@ msgstr "" #~ "e edite um dos seus 'init scripts' em /etc/init.d, e desligue a " #~ "verificação do gestor de ecrã por omissão.)" -#~ msgid "Do you wish to stop the kdm daemon?" -#~ msgstr "Deseja desligar o daemon kdm?" +#~ msgid "Do you wish to stop the tdm daemon?" +#~ msgstr "Deseja desligar o daemon tdm?" #~ msgid "" -#~ "The K Desktop manager (kdm) daemon is typically stopped on package " +#~ "The K Desktop manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " -#~ "session. If kdm is stopped now, any X sessions it manages will be " -#~ "terminated. Otherwise you may leave kdm running, and the new version will " +#~ "session. If tdm is stopped now, any X sessions it manages will be " +#~ "terminated. Otherwise you may leave tdm running, and the new version will " #~ "take effect the next time the daemon is restarted." #~ msgstr "" -#~ "O daemon K Destop manager (kdm) é normalmente parado quando ocorre um " +#~ "O daemon K Destop manager (tdm) é normalmente parado quando ocorre um " #~ "upgrade ou remoção do pacote, no entanto parece que se encontra pelo " -#~ "menos uma sessão X em andamento. Se o kdm for parado agora, todas as " -#~ "sessões X serão terminadas. Por outro lado, pode deixar o kdm a correr e " +#~ "menos uma sessão X em andamento. Se o tdm for parado agora, todas as " +#~ "sessões X serão terminadas. Por outro lado, pode deixar o tdm a correr e " #~ "a nova versão irá ser usada na próxima vez que o daemon for reiniciado." diff --git a/ubuntu/lucid_automake/kdebase/debian/po/pt_BR.po b/ubuntu/lucid_automake/kdebase/debian/po/pt_BR.po index 8cf324e24..b24bcdadd 100644 --- a/ubuntu/lucid_automake/kdebase/debian/po/pt_BR.po +++ b/ubuntu/lucid_automake/kdebase/debian/po/pt_BR.po @@ -22,13 +22,13 @@ msgstr "pt_BR utf-8\n" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Gerenciador de sessão padrão:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -38,7 +38,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -50,7 +50,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -65,28 +65,28 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Deseja parar o daemon kdm?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Deseja parar o daemon tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." -msgstr "O K Desktop manager (kdm) é tipicamente parado em atualizações e " +msgstr "O K Desktop manager (tdm) é tipicamente parado em atualizações e " "remoções de pacotes, mas parece que ele está gerenciando pelo menos uma " "seção X em execução." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Caso o kdm seja parado agora, quaisquer sessões X que ele esteja gerenciando " +"Caso o tdm seja parado agora, quaisquer sessões X que ele esteja gerenciando " "serão encerradas. Caso contrário a nova versão terá efeito na próxima vez " "que o daemon for reiniciado." diff --git a/ubuntu/lucid_automake/kdebase/debian/po/ro.po b/ubuntu/lucid_automake/kdebase/debian/po/ro.po index 13bc24c72..f5e0f91d6 100644 --- a/ubuntu/lucid_automake/kdebase/debian/po/ro.po +++ b/ubuntu/lucid_automake/kdebase/debian/po/ro.po @@ -20,14 +20,14 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "Default display manager:" msgstr "AlegeÅ£i administratorul de ecran implicit, pe care îl doriÅ£i." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -37,7 +37,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "" "Only one display manager can manage a given X server, but multiple display " @@ -50,7 +50,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "" "Multiple display managers can run simultaneously if they are configured to " @@ -66,36 +66,36 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy -msgid "Stop the kdm daemon?" -msgstr "DoriÅ£i să opriÅ£i demonul kdm?" +msgid "Stop the tdm daemon?" +msgstr "DoriÅ£i să opriÅ£i demonul tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Demonul K Desktop manager (kdm) este oprit de obicei la actualizarea " +"Demonul K Desktop manager (tdm) este oprit de obicei la actualizarea " "pachetuluiÅŸi la eliminarea sa, dar se pare că acum administrează o sesiune X " -"de lucru.Dacă demonul kdm este oprit acum, orice sesiune X pe care o " -"administrează va fi oprită. O alternativă ar fi să lăsaÅ£i kdm să ruleze, iar " +"de lucru.Dacă demonul tdm este oprit acum, orice sesiune X pe care o " +"administrează va fi oprită. O alternativă ar fi să lăsaÅ£i tdm să ruleze, iar " "noua versiune va ruladata viitoare când demonul va fi repornit." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Demonul K Desktop manager (kdm) este oprit de obicei la actualizarea " +"Demonul K Desktop manager (tdm) este oprit de obicei la actualizarea " "pachetuluiÅŸi la eliminarea sa, dar se pare că acum administrează o sesiune X " -"de lucru.Dacă demonul kdm este oprit acum, orice sesiune X pe care o " -"administrează va fi oprită. O alternativă ar fi să lăsaÅ£i kdm să ruleze, iar " +"de lucru.Dacă demonul tdm este oprit acum, orice sesiune X pe care o " +"administrează va fi oprită. O alternativă ar fi să lăsaÅ£i tdm să ruleze, iar " "noua versiune va ruladata viitoare când demonul va fi repornit." diff --git a/ubuntu/lucid_automake/kdebase/debian/po/ru.po b/ubuntu/lucid_automake/kdebase/debian/po/ru.po index 08b8d489e..e1a392d8c 100644 --- a/ubuntu/lucid_automake/kdebase/debian/po/ru.po +++ b/ubuntu/lucid_automake/kdebase/debian/po/ru.po @@ -42,13 +42,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Менеджер диÑплеев по умолчанию:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -58,7 +58,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -70,7 +70,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -84,30 +84,30 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "ОÑтановить Ñервер-демон kdm?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "ОÑтановить Ñервер-демон tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Сервер-демон менеджера K Desktop (kdm) обычно оÑтанавливают при обновлении " -"или удалении пакета, но, кажетÑÑ, что kdm ÑÐµÐ¹Ñ‡Ð°Ñ ÑƒÐ¿Ñ€Ð°Ð²Ð»Ñет по крайней мере " +"Сервер-демон менеджера K Desktop (tdm) обычно оÑтанавливают при обновлении " +"или удалении пакета, но, кажетÑÑ, что tdm ÑÐµÐ¹Ñ‡Ð°Ñ ÑƒÐ¿Ñ€Ð°Ð²Ð»Ñет по крайней мере " "одним X-ÑеанÑом." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"ЕÑли ÑÐµÐ¹Ñ‡Ð°Ñ Ð¾Ñтановить kdm, то вÑе управлÑемые им X-ÑеанÑÑ‹ будут прерваны. " -"Или вы можете не оÑтанавливать kdm, и тогда Ð½Ð¾Ð²Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ð±ÑƒÐ´ÐµÑ‚ загружена " -"тогда, когда kdm Ñнова перезапуÑÑ‚ÑÑ‚." +"ЕÑли ÑÐµÐ¹Ñ‡Ð°Ñ Ð¾Ñтановить tdm, то вÑе управлÑемые им X-ÑеанÑÑ‹ будут прерваны. " +"Или вы можете не оÑтанавливать tdm, и тогда Ð½Ð¾Ð²Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ð±ÑƒÐ´ÐµÑ‚ загружена " +"тогда, когда tdm Ñнова перезапуÑÑ‚ÑÑ‚." diff --git a/ubuntu/lucid_automake/kdebase/debian/po/sk.po b/ubuntu/lucid_automake/kdebase/debian/po/sk.po index e7b350961..4c6241e4a 100644 --- a/ubuntu/lucid_automake/kdebase/debian/po/sk.po +++ b/ubuntu/lucid_automake/kdebase/debian/po/sk.po @@ -21,13 +21,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Zvoľte predvoleného správcu obrazovky:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -37,7 +37,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -48,7 +48,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -62,30 +62,30 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "ZastaviÅ¥ správcu obrazovky kdm?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "ZastaviÅ¥ správcu obrazovky tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Správca obrazovky K desktop manager (kdm) sa zvykne zastaviÅ¥ pri " +"Správca obrazovky K desktop manager (tdm) sa zvykne zastaviÅ¥ pri " "aktualizácii alebo odstraňovanà balÃka, lenže teraz to vyzerá tak, že má na " "starosti aspoň jedno ÄalÅ¡ie spustené X sedenie." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Ak by sa teraz kdm zastavil, vÅ¡etky nÃm ovládané X sedenia by sa ukonÄili. V " -"opaÄnom prÃpade môžete nechaÅ¥ kdm spustený, priÄom nová verzia sa spustà pri " -"ÄalÅ¡om reÅ¡tarte kdm." +"Ak by sa teraz tdm zastavil, vÅ¡etky nÃm ovládané X sedenia by sa ukonÄili. V " +"opaÄnom prÃpade môžete nechaÅ¥ tdm spustený, priÄom nová verzia sa spustà pri " +"ÄalÅ¡om reÅ¡tarte tdm." diff --git a/ubuntu/lucid_automake/kdebase/debian/po/sv.po b/ubuntu/lucid_automake/kdebase/debian/po/sv.po index fd2409ee1..080dde351 100644 --- a/ubuntu/lucid_automake/kdebase/debian/po/sv.po +++ b/ubuntu/lucid_automake/kdebase/debian/po/sv.po @@ -41,52 +41,52 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Standarddisplayhanterare:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "A display manager is a program that provides graphical login capabilities for the X Window System." msgstr "En displayhanterare är ett program som tillhandahÃ¥ller grafiska inloggningsmöjligheter för X Window System." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Only one display manager can manage a given X server, but multiple display manager packages are installed. Please select which display manager should run by default." msgstr "Endast en displayhanterare kan hantera en angiven X-server men flera displayhanterarpaket är installerade. Välj vilken displayhanterare som skall köras som standard." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Multiple display managers can run simultaneously if they are configured to manage different servers; to achieve this, configure the display managers accordingly, edit each of their init scripts in /etc/init.d, and disable the check for a default display manager." msgstr "Flera displayhanterare kan köras samtidigt om de är konfigurerade att hantera olika servrar. För att uppnÃ¥ detta ska du konfigurera displayhanterarnas pÃ¥ lämpligt sätt, redigera dess init-skript under /etc/init.d och inaktivera kontrollen efter en standarddisplayhanterare." #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Stoppa kdm-demonen?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Stoppa tdm-demonen?" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "The K Desktop manager (kdm) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session." -msgstr "K Desktop manager-demonen (kdm) stoppas vanligtvis vid paketuppgradering och borttagning men det verkar som om den hanterar Ã¥tminstone en körande X-session." +#: ../tdm.templates:3001 +msgid "The K Desktop manager (tdm) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session." +msgstr "K Desktop manager-demonen (tdm) stoppas vanligtvis vid paketuppgradering och borttagning men det verkar som om den hanterar Ã¥tminstone en körande X-session." #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "If kdm is stopped now, any X sessions it manages will be terminated. Otherwise, the new version will take effect the next time the daemon is restarted." -msgstr "Om kdm stoppas nu kommer de X-sessioner som den hanterar att avslutas. Om inte kommer den nya versionen att bli aktiverad nästa gÃ¥ng som demonen startas om." +#: ../tdm.templates:3001 +msgid "If tdm is stopped now, any X sessions it manages will be terminated. Otherwise, the new version will take effect the next time the daemon is restarted." +msgstr "Om tdm stoppas nu kommer de X-sessioner som den hanterar att avslutas. Om inte kommer den nya versionen att bli aktiverad nästa gÃ¥ng som demonen startas om." #~ msgid "" -#~ "The X display manager (kdm) daemon is typically stopped on package " +#~ "The X display manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " #~ "session." #~ msgstr "" -#~ "X-displayhanterardemonen (kdm) stoppas vanligtvis vid paketuppgradering " +#~ "X-displayhanterardemonen (tdm) stoppas vanligtvis vid paketuppgradering " #~ "och borttagning men det verkar som om den hanterar Ã¥tminstone en körande " #~ "X-session." #~ msgid "Select the desired default display manager." @@ -109,18 +109,18 @@ msgstr "Om kdm stoppas nu kommer de X-sessioner som den hanterar att avslutas. O #~ "hantera olika servrar, för att göra detta, konfigurera fönsterhanterarna " #~ "genom att ändra respektives init-skript i /etc/init.d och stäng av " #~ "kontrollen för standard fönsterhanterare.)" -#~ msgid "Do you wish to stop the kdm daemon?" -#~ msgstr "Vill du stoppa kdm-daemonen?" +#~ msgid "Do you wish to stop the tdm daemon?" +#~ msgstr "Vill du stoppa tdm-daemonen?" #~ msgid "" -#~ "The K Desktop manager (kdm) daemon is typically stopped on package " +#~ "The K Desktop manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " -#~ "session. If kdm is stopped now, any X sessions it manages will be " -#~ "terminated. Otherwise you may leave kdm running, and the new version will " +#~ "session. If tdm is stopped now, any X sessions it manages will be " +#~ "terminated. Otherwise you may leave tdm running, and the new version will " #~ "take effect the next time the daemon is restarted." #~ msgstr "" -#~ "Daemonen (kdm) för skrivbordsmiljön KDE stoppas normalt vid uppgradering " +#~ "Daemonen (tdm) för skrivbordsmiljön KDE stoppas normalt vid uppgradering " #~ "och avinstallation av paketet men det verkar som om den hanterar " -#~ "Ã¥tminstone en körande X-session. Om kdm stoppas nu kommer de X-sessioner " -#~ "den hanterar att avslutas. Annars kan du lämna kdm körande och den nya " +#~ "Ã¥tminstone en körande X-session. Om tdm stoppas nu kommer de X-sessioner " +#~ "den hanterar att avslutas. Annars kan du lämna tdm körande och den nya " #~ "versioner blir aktiverad nästa gÃ¥ng daemonen startas om." diff --git a/ubuntu/lucid_automake/kdebase/debian/po/ta.po b/ubuntu/lucid_automake/kdebase/debian/po/ta.po index 993ae3933..eb68492d6 100644 --- a/ubuntu/lucid_automake/kdebase/debian/po/ta.po +++ b/ubuntu/lucid_automake/kdebase/debian/po/ta.po @@ -18,13 +18,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "à®®à¯à®©à¯à®©à®¿à®°à¯à®ªà¯à®ªà¯ காடà¯à®šà®¿ மேலாளரà¯:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -34,7 +34,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -45,7 +45,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -59,15 +59,15 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "கேடிஎம௠கிஙà¯à®•à®°à®©à¯ˆ (kdm daemon) நிறà¯à®¤à¯à®¤à®µà®¾?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "கேடிஎம௠கிஙà¯à®•à®°à®©à¯ˆ (tdm daemon) நிறà¯à®¤à¯à®¤à®µà®¾?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" "கே மேலà¯à®®à¯‡à®šà¯ˆ மேலாளர௠(கேடிஎமà¯) கிஙà¯à®•à®°à®©à¯ வழகà¯à®•à®®à®¾à®• பொதி மேலாகà¯à®•à®®à¯ அலà¯à®²à®¤à¯ நீகà¯à®•à®®à¯ நிகழà¯à®®à¯ போத௠நிறà¯à®¤à¯à®¤à®ªà¯ படà¯à®®à¯. " @@ -75,9 +75,9 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" diff --git a/ubuntu/lucid_automake/kdebase/debian/po/templates.pot b/ubuntu/lucid_automake/kdebase/debian/po/templates.pot index f8b19923e..42689d3b2 100644 --- a/ubuntu/lucid_automake/kdebase/debian/po/templates.pot +++ b/ubuntu/lucid_automake/kdebase/debian/po/templates.pot @@ -18,13 +18,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -32,7 +32,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -41,7 +41,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -51,23 +51,23 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" diff --git a/ubuntu/lucid_automake/kdebase/debian/po/tr.po b/ubuntu/lucid_automake/kdebase/debian/po/tr.po index bc0e664d2..2cc7c274e 100644 --- a/ubuntu/lucid_automake/kdebase/debian/po/tr.po +++ b/ubuntu/lucid_automake/kdebase/debian/po/tr.po @@ -16,14 +16,14 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "Default display manager:" msgstr "Kullanmak istediÄŸiniz öntanımlı ekran yöneticisini seçin." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -32,7 +32,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "" "Only one display manager can manage a given X server, but multiple display " @@ -45,7 +45,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "" "Multiple display managers can run simultaneously if they are configured to " @@ -60,38 +60,38 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy -msgid "Stop the kdm daemon?" -msgstr "kdm servisini durdurmak istiyor musunuz?" +msgid "Stop the tdm daemon?" +msgstr "tdm servisini durdurmak istiyor musunuz?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"K Masaüstü yöneticisi (kdm) servisi, paket güncelleme ve kaldırma sırasında " -"genellikle durdurulur. Fakat öyle görünüyor ki kdm, çalışan (en az) bir X " -"oturumunu yönetiyor. EÄŸer kdm ÅŸimdi durdurulursa, yönetilen X oturumları da " -"sonlandırılacaktır. Böyle yapmak yerine kdm'i çalışır vaziyette " -"bırakabilirsiniz. Yeni sürüm, kdm servisinin bir sonraki çalıştırılışında " +"K Masaüstü yöneticisi (tdm) servisi, paket güncelleme ve kaldırma sırasında " +"genellikle durdurulur. Fakat öyle görünüyor ki tdm, çalışan (en az) bir X " +"oturumunu yönetiyor. EÄŸer tdm ÅŸimdi durdurulursa, yönetilen X oturumları da " +"sonlandırılacaktır. Böyle yapmak yerine tdm'i çalışır vaziyette " +"bırakabilirsiniz. Yeni sürüm, tdm servisinin bir sonraki çalıştırılışında " "etkin olacaktır." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"K Masaüstü yöneticisi (kdm) servisi, paket güncelleme ve kaldırma sırasında " -"genellikle durdurulur. Fakat öyle görünüyor ki kdm, çalışan (en az) bir X " -"oturumunu yönetiyor. EÄŸer kdm ÅŸimdi durdurulursa, yönetilen X oturumları da " -"sonlandırılacaktır. Böyle yapmak yerine kdm'i çalışır vaziyette " -"bırakabilirsiniz. Yeni sürüm, kdm servisinin bir sonraki çalıştırılışında " +"K Masaüstü yöneticisi (tdm) servisi, paket güncelleme ve kaldırma sırasında " +"genellikle durdurulur. Fakat öyle görünüyor ki tdm, çalışan (en az) bir X " +"oturumunu yönetiyor. EÄŸer tdm ÅŸimdi durdurulursa, yönetilen X oturumları da " +"sonlandırılacaktır. Böyle yapmak yerine tdm'i çalışır vaziyette " +"bırakabilirsiniz. Yeni sürüm, tdm servisinin bir sonraki çalıştırılışında " "etkin olacaktır." diff --git a/ubuntu/lucid_automake/kdebase/debian/po/vi.po b/ubuntu/lucid_automake/kdebase/debian/po/vi.po index 0875e65e8..f45153cdb 100644 --- a/ubuntu/lucid_automake/kdebase/debian/po/vi.po +++ b/ubuntu/lucid_automake/kdebase/debian/po/vi.po @@ -18,13 +18,13 @@ msgstr "Project-Id-Version: kdebase_4-3.5.7-1\n" #.Type: select #.Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Bá»™ quản lý trình bà y mặc định:" #.Type: select #.Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -32,7 +32,7 @@ msgstr "Bá»™ quản lý trình bà y là chÆ°Æ¡ng trình cung cấp khả năng Ä #.Type: select #.Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -41,7 +41,7 @@ msgstr "Chỉ má»™t bá»™ quản lý trình bà y có quyá»n quản lý trình ph #.Type: select #.Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -51,23 +51,23 @@ msgstr "Nhiá»u bá»™ quản lý trình bà y vẫn có thể chạy đồng thá» #.Type: boolean #.Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Thôi trình ná»n kdm không?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Thôi trình ná»n tdm không?" #.Type: boolean #.Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." -msgstr "Trình ná»n quản lý mà n hình ná»n K (kdm) thÆ°á»ng bị thôi khi nâng cấp/gỡ bá» gói, nhÆ°ng hiện thá»i có vẻ là nó quản lý Ãt nhất má»™t phiên chạy X Ä‘ang hoạt Ä‘á»™ng." +msgstr "Trình ná»n quản lý mà n hình ná»n K (tdm) thÆ°á»ng bị thôi khi nâng cấp/gỡ bá» gói, nhÆ°ng hiện thá»i có vẻ là nó quản lý Ãt nhất má»™t phiên chạy X Ä‘ang hoạt Ä‘á»™ng." #.Type: boolean #.Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." -msgstr "Thôi chạy kdm ngay bây giá» thì phiên chạy X nà o được quản lý bởi nó sẽ bị chấm dứt. Không thì phiên bản má»›i sẽ có tác Ä‘á»™ng lần tá»›i khởi chạy lại trình ná»n." +msgstr "Thôi chạy tdm ngay bây giá» thì phiên chạy X nà o được quản lý bởi nó sẽ bị chấm dứt. Không thì phiên bản má»›i sẽ có tác Ä‘á»™ng lần tá»›i khởi chạy lại trình ná»n." diff --git a/ubuntu/lucid_automake/kdebase/debian/po/zh_CN.po b/ubuntu/lucid_automake/kdebase/debian/po/zh_CN.po index 31aca54f6..49be70d4b 100644 --- a/ubuntu/lucid_automake/kdebase/debian/po/zh_CN.po +++ b/ubuntu/lucid_automake/kdebase/debian/po/zh_CN.po @@ -6,7 +6,7 @@ # Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2005 # Ming Hua <minghua@rice.edu>, 2005,2007 # -# This file is distributed under the same license as the kdm package. +# This file is distributed under the same license as the tdm package. # Please see debian/copyright. # # Translators, if you are not familiar with the PO format, gettext @@ -36,13 +36,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "默认显示管ç†å™¨ï¼š" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -50,7 +50,7 @@ msgstr "显示管ç†å™¨æ˜¯ä¸º X 窗å£ç³»ç»Ÿæ供图形界é¢ç™»å½•æ¨¡å¼çš„程 #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -61,7 +61,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -74,27 +74,27 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "åœæ¢ kdm 守护进程å—？" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "åœæ¢ tdm 守护进程å—？" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"K æ¡Œé¢ç®¡ç†å™¨ (kdm) 守护进程通常会在软件包å‡çº§å’Œå¸è½½æ—¶è¢«åœæ¢ï¼Œä½†çœ‹èµ·æ¥å®ƒç›®å‰åœ¨" +"K æ¡Œé¢ç®¡ç†å™¨ (tdm) 守护进程通常会在软件包å‡çº§å’Œå¸è½½æ—¶è¢«åœæ¢ï¼Œä½†çœ‹èµ·æ¥å®ƒç›®å‰åœ¨" "管ç†ä¸€ä¸ªæˆ–多个æ£åœ¨è¿è¡Œçš„ X 会è¯ã€‚" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"如果 kdm 现在就被åœæ¢ï¼Œå®ƒæ‰€ç®¡ç†çš„全部 X 会è¯éƒ½ä¼šè¢«ä¸æ¢ã€‚如果ä¸åœæ¢ kdm，新安" +"如果 tdm 现在就被åœæ¢ï¼Œå®ƒæ‰€ç®¡ç†çš„全部 X 会è¯éƒ½ä¼šè¢«ä¸æ¢ã€‚如果ä¸åœæ¢ tdm，新安" "装的版本将会在守护进程下次é‡æ–°å¯åŠ¨æ—¶ç”Ÿæ•ˆã€‚" diff --git a/ubuntu/lucid_automake/kdebase/debian/rules b/ubuntu/lucid_automake/kdebase/debian/rules index a3d4dcc03..5451ff821 100755 --- a/ubuntu/lucid_automake/kdebase/debian/rules +++ b/ubuntu/lucid_automake/kdebase/debian/rules @@ -17,7 +17,7 @@ DEB_KDE_APIDOX := yes CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG) DEB_CONFIGURE_EXTRA_FLAGS := --with-shadow --without-java --with-pam=kde-kde3 --prefix=/opt/kde3 \ - --with-kcp-pam=kcheckpass-kde3 --with-kdm-pam=kdm-kde3 --with-kss-pam=kscreensaver-kde3 --with-extra-libs=/opt/kde3/lib \ + --with-kcp-pam=kcheckpass-kde3 --with-tdm-pam=tdm-kde3 --with-kss-pam=kscreensaver-kde3 --with-extra-libs=/opt/kde3/lib \ --with-extra-includes=/usr/include/sasl --with-usbids=/usr/share/misc/usb.ids --with-sudo-kdesu-backend \ --enable-closure @@ -225,15 +225,15 @@ binary-install/kdebase-data-kde3:: rm -rf debian/tmp/etc/xdg/* rm -rf debian/kdebase-data-kde3/etc/xdg/* -install/kdm-kde3:: - sed -i 's/#UseTheme=true/UseTheme=true/g' debian/tmp/etc/kde3/kdm/kdmrc - sed -i 's/Theme=@@@ToBeReplacedByDesktopBase@@@/Theme=\/opt\/kde3\/share\/apps\/kdm\/themes\/kubuntu-kde3/g' debian/tmp/etc/kde3/kdm/kdmrc +install/tdm-kde3:: + sed -i 's/#UseTheme=true/UseTheme=true/g' debian/tmp/etc/kde3/tdm/tdmrc + sed -i 's/Theme=@@@ToBeReplacedByDesktopBase@@@/Theme=\/opt\/kde3\/share\/apps\/tdm\/themes\/kubuntu-kde3/g' debian/tmp/etc/kde3/tdm/tdmrc -binary-install/kdm-kde3:: - mkdir -p debian/kdm-kde3/etc/init - install -p -D -m644 debian/kdm-kde3.conf debian/kdm-kde3/etc/init/kdm-kde3.conf - install -p -D -m644 debian/kdm-kde3.pam debian/kdm-kde3/etc/pam.d/kdm-kde3 - install -p -D -m644 debian/kdm-kde3-np.pam debian/kdm-kde3/etc/pam.d/kdm-kde3-np +binary-install/tdm-kde3:: + mkdir -p debian/tdm-kde3/etc/init + install -p -D -m644 debian/tdm-kde3.conf debian/tdm-kde3/etc/init/tdm-kde3.conf + install -p -D -m644 debian/tdm-kde3.pam debian/tdm-kde3/etc/pam.d/tdm-kde3 + install -p -D -m644 debian/tdm-kde3-np.pam debian/tdm-kde3/etc/pam.d/tdm-kde3-np binary-install/kcontrol-kde3:: mkdir -p debian/kcontrol/etc/udev/rules.d @@ -267,6 +267,6 @@ install/ksysguardd-kde3:: install -D -p -m0644 debian/tmp/etc/ksysguarddrc debian/ksysguardd-kde3/etc/kde3/ binary-install/ksmserver-kde3:: - install -p -D -m644 debian/tmp/opt/kde3/share/apps/kdm/sessions/kde.desktop debian/ksmserver-kde3/usr/share/xsessions/kde3.desktop + install -p -D -m644 debian/tmp/opt/kde3/share/apps/tdm/sessions/kde.desktop debian/ksmserver-kde3/usr/share/xsessions/kde3.desktop install -p -D -m755 debian/plasma.autodetect debian/ksmserver-kde3/usr/bin/plasma.autodetect install -p -D -m755 debian/plasma-desktop.autodetect debian/ksmserver-kde3/usr/bin/plasma-desktop.autodetect diff --git a/ubuntu/lucid_automake/kdebase/debian/source.lintian-overrides b/ubuntu/lucid_automake/kdebase/debian/source.lintian-overrides index 0787795d0..620c1d904 100644 --- a/ubuntu/lucid_automake/kdebase/debian/source.lintian-overrides +++ b/ubuntu/lucid_automake/kdebase/debian/source.lintian-overrides @@ -1,2 +1,2 @@ -kdebase source: maintainer-script-lacks-debhelper-token debian/kdm-kde3.postinst -kdebase source: maintainer-script-lacks-debhelper-token debian/kdm-kde3.prerm +kdebase source: maintainer-script-lacks-debhelper-token debian/tdm-kde3.postinst +kdebase source: maintainer-script-lacks-debhelper-token debian/tdm-kde3.prerm diff --git a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3-np.pam b/ubuntu/lucid_automake/kdebase/debian/tdm-kde3-np.pam index a13232b98..4cada235b 100644 --- a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3-np.pam +++ b/ubuntu/lucid_automake/kdebase/debian/tdm-kde3-np.pam @@ -1,5 +1,5 @@ # -# /etc/pam.d/kdm-np - specify the PAM behaviour of kdm for passwordless logins +# /etc/pam.d/tdm-np - specify the PAM behaviour of tdm for passwordless logins # auth required pam_nologin.so auth required pam_env.so readenv=1 diff --git a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.README.Debian b/ubuntu/lucid_automake/kdebase/debian/tdm-kde3.README.Debian index 438b8d910..f7f09290b 100644 --- a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.README.Debian +++ b/ubuntu/lucid_automake/kdebase/debian/tdm-kde3.README.Debian @@ -1,23 +1,23 @@ -KDM in Debian +TDM in Debian ============= -This package comes with a copy of the KDM handbook in docbook format. -To read it, run "khelpcenter help:/kdm" from a command-line or go to the -URL "help:/kdm" in konqueror. +This package comes with a copy of the TDM handbook in docbook format. +To read it, run "khelpcenter help:/tdm" from a command-line or go to the +URL "help:/tdm" in konqueror. -By default, the use of special graphical themes with KDM is disabled. -If you wish to use the 'Circles' theme that comes with the kdm package, or +By default, the use of special graphical themes with TDM is disabled. +If you wish to use the 'Circles' theme that comes with the tdm package, or any other theme that you have installed, you should research the -'UseTheme' and 'Theme' fields in /etc/kde3/kdm/kdmrc. This can be done +'UseTheme' and 'Theme' fields in /etc/kde3/tdm/tdmrc. This can be done by browsing this URL in Konqueror: -help:/kdm/kdm-files.html#kdmrc-greeter +help:/tdm/tdm-files.html#tdmrc-greeter -KDM Customization +TDM Customization ================= We provide a way to override theme-related values normally set in the -master configuration file (kdmrc): +master configuration file (tdmrc): * USEBACKGROUND * BACKGROUNDCFG * USETHEME @@ -31,7 +31,7 @@ and background configuration file (backgroundrc): * WALLPAPER You just need to create a file with overridden value(s) and put it in -kdm override directory (default is /etc/default/kdm.d). +tdm override directory (default is /etc/default/tdm.d). ================================================ Below this is direct from the xdm package README diff --git a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.conf b/ubuntu/lucid_automake/kdebase/debian/tdm-kde3.conf index 40acdd6b6..f6da8a4b0 100755 --- a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.conf +++ b/ubuntu/lucid_automake/kdebase/debian/tdm-kde3.conf @@ -1,4 +1,4 @@ -# kdm-kde3 - K Display Manager +# tdm-kde3 - K Display Manager # # The display manager service manages the X servers running on the # system, providing login and auto-login services @@ -18,7 +18,7 @@ emits starting-dm respawn script - [ ! -f /etc/X11/default-display-manager -o "$(cat /etc/X11/default-display-manager 2>/dev/null)" = "/opt/kde3/bin/kdm" ] + [ ! -f /etc/X11/default-display-manager -o "$(cat /etc/X11/default-display-manager 2>/dev/null)" = "/opt/kde3/bin/tdm" ] # Check kernel command-line for inhibitors for ARG in $(cat /proc/cmdline) @@ -38,11 +38,11 @@ script export LANG LANGUAGE fi - KDEDIRS=/opt/kde3/ + TDEDIRS=/opt/kde3/ PATH=/opt/kde3/bin:/bin:/usr/bin:/sbin:/usr/sbin - initctl emit starting-dm DM=kdm-kde3 + initctl emit starting-dm DM=tdm-kde3 - exec /opt/kde3/bin/kdm + exec /opt/kde3/bin/tdm end script diff --git a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.config b/ubuntu/lucid_automake/kdebase/debian/tdm-kde3.config index 9a19df1e0..1ecedb65c 100644 --- a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.config +++ b/ubuntu/lucid_automake/kdebase/debian/tdm-kde3.config @@ -1,5 +1,5 @@ #!/bin/sh -# Debian kdm package configuration script +# Debian tdm package configuration script # stolen from the xdm scripts # Copyright 2000--2003 Branden Robinson. # Licensed under the GNU General Public License, version 2. See the file @@ -10,7 +10,7 @@ set -e # source debconf library . /usr/share/debconf/confmodule -THIS_PACKAGE=kdm-kde3 +THIS_PACKAGE=tdm-kde3 # set default display manager DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager @@ -38,9 +38,9 @@ if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then CURRENT_DEFAULT=$(grep -v '^[[:space:]]*#' \ "$DEFAULT_DISPLAY_MANAGER_FILE" | head -n 1) - # both the binaries for kdm and kdm-kde4 share the same basename - # so we need to check if it's kdm-kde4 or another display manager - if [ "$CURRENT_DEFAULT" = "/usr/lib/kde4/bin/kdm" ]; then + # both the binaries for tdm and tdm-kde4 share the same basename + # so we need to check if it's tdm-kde4 or another display manager + if [ "$CURRENT_DEFAULT" = "/usr/lib/kde4/bin/tdm" ]; then CURRENT_DEFAULT=${THIS_PACKAGE}-kde4 else CURRENT_DEFAULT=$(basename $CURRENT_DEFAULT) diff --git a/ubuntu/lucid_automake/kdebase/debian/tdm-kde3.dirs b/ubuntu/lucid_automake/kdebase/debian/tdm-kde3.dirs new file mode 100644 index 000000000..38d09f9d8 --- /dev/null +++ b/ubuntu/lucid_automake/kdebase/debian/tdm-kde3.dirs @@ -0,0 +1,2 @@ +etc/default/tdm-kde3.d +var/lib/tdm-kde3 diff --git a/ubuntu/lucid_automake/kdebase/debian/tdm-kde3.install b/ubuntu/lucid_automake/kdebase/debian/tdm-kde3.install new file mode 100644 index 000000000..f5747fbba --- /dev/null +++ b/ubuntu/lucid_automake/kdebase/debian/tdm-kde3.install @@ -0,0 +1,52 @@ +debian/local/tdm.options etc/kde3/tdm/ +debian/tmp/etc/kde3/tdm/tdmrc +debian/tmp/etc/kde3/tdm/Xaccess +debian/tmp/etc/kde3/tdm/Xreset +debian/tmp/etc/kde3/tdm/Xsession +debian/tmp/etc/kde3/tdm/Xsetup +debian/tmp/etc/kde3/tdm/Xstartup +debian/tmp/etc/kde3/tdm/Xwilling +debian/tmp/opt/kde3/bin/gentdmconf +debian/tmp/opt/kde3/bin/tdm +debian/tmp/opt/kde3/bin/tdm_config +debian/tmp/opt/kde3/bin/tdmctl +debian/tmp/opt/kde3/bin/tdm_greet +debian/tmp/opt/kde3/bin/krootimage +debian/tmp/opt/kde3/share/apps/tdm/pics/kdelogo-crystal.png +debian/tmp/opt/kde3/share/apps/tdm/pics/kdelogo.png +debian/tmp/opt/kde3/share/apps/tdm/pics/shutdown.jpg +debian/tmp/opt/kde3/share/apps/tdm/pics/users/default1.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/default2.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/default3.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/root1.png +debian/tmp/opt/kde3/share/apps/tdm/sessions/9wm.desktop +debian/tmp/opt/kde3/share/apps/tdm/sessions/aewm.desktop +debian/tmp/opt/kde3/share/apps/tdm/sessions/amaterus.desktop +debian/tmp/opt/kde3/share/apps/tdm/sessions/asclassic.desktop +debian/tmp/opt/kde3/share/apps/tdm/sessions/ctwm.desktop +debian/tmp/opt/kde3/share/apps/tdm/sessions/evilwm.desktop +debian/tmp/opt/kde3/share/apps/tdm/sessions/flwm.desktop +debian/tmp/opt/kde3/share/apps/tdm/sessions/lwm.desktop +debian/tmp/opt/kde3/share/apps/tdm/sessions/matchbox.desktop +debian/tmp/opt/kde3/share/apps/tdm/sessions/mwm.desktop +debian/tmp/opt/kde3/share/apps/tdm/sessions/olvwm.desktop +debian/tmp/opt/kde3/share/apps/tdm/sessions/olwm.desktop +debian/tmp/opt/kde3/share/apps/tdm/sessions/oroborus.desktop +debian/tmp/opt/kde3/share/apps/tdm/sessions/pwm.desktop +debian/tmp/opt/kde3/share/apps/tdm/sessions/twm.desktop +debian/tmp/opt/kde3/share/apps/tdm/sessions/ude.desktop +debian/tmp/opt/kde3/share/apps/tdm/sessions/vtwm.desktop +debian/tmp/opt/kde3/share/apps/tdm/sessions/wm2.desktop +debian/tmp/opt/kde3/share/apps/tdm/themes/circles/background.svg +debian/tmp/opt/kde3/share/apps/tdm/themes/circles/circles.xml +debian/tmp/opt/kde3/share/apps/tdm/themes/circles/flower.png +debian/tmp/opt/kde3/share/apps/tdm/themes/circles/GdmGreeterTheme.desktop +debian/tmp/opt/kde3/share/apps/tdm/themes/circles/help.png +debian/tmp/opt/kde3/share/apps/tdm/themes/circles/options.png +debian/tmp/opt/kde3/share/apps/tdm/themes/circles/screenshot.png +debian/tmp/opt/kde3/share/apps/tdm/themes/o2_enterprise +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdm/common +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdm/index.cache.bz2 +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdm/index.docbook +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdm/tdmrc-ref.docbook +debian/tmp/opt/kde3/share/doc/tdm/README diff --git a/ubuntu/lucid_automake/kdebase/debian/tdm-kde3.links b/ubuntu/lucid_automake/kdebase/debian/tdm-kde3.links new file mode 100644 index 000000000..1bdab2cb6 --- /dev/null +++ b/ubuntu/lucid_automake/kdebase/debian/tdm-kde3.links @@ -0,0 +1 @@ +opt/kde3/share/apps/tdm/pics/users/default1.png opt/kde3/share/apps/tdm/faces/.default.face diff --git a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.logrotate b/ubuntu/lucid_automake/kdebase/debian/tdm-kde3.logrotate index 174e086b6..99853b7ba 100644 --- a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.logrotate +++ b/ubuntu/lucid_automake/kdebase/debian/tdm-kde3.logrotate @@ -1,4 +1,4 @@ -/var/log/kdm-kde3.log { +/var/log/tdm-kde3.log { rotate 7 daily compress diff --git a/ubuntu/lucid_automake/kdebase/debian/tdm-kde3.manpages b/ubuntu/lucid_automake/kdebase/debian/tdm-kde3.manpages new file mode 100644 index 000000000..3c0748068 --- /dev/null +++ b/ubuntu/lucid_automake/kdebase/debian/tdm-kde3.manpages @@ -0,0 +1,6 @@ +debian/man/gentdmconf-kde3.1 +debian/man/tdm-kde3.1 +debian/man/tdm_config-kde3.1 +debian/man/tdmctl-kde3.1 +debian/man/tdm_greet-kde3.1 +debian/man/krootimage-kde3.1 diff --git a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.pam b/ubuntu/lucid_automake/kdebase/debian/tdm-kde3.pam index 1c6ebce63..6fc929be0 100644 --- a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.pam +++ b/ubuntu/lucid_automake/kdebase/debian/tdm-kde3.pam @@ -1,5 +1,5 @@ # -# /etc/pam.d/kdm-kde3 - specify the PAM behaviour of kdm +# /etc/pam.d/tdm-kde3 - specify the PAM behaviour of tdm # auth required pam_nologin.so auth required pam_env.so readenv=1 diff --git a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.postinst b/ubuntu/lucid_automake/kdebase/debian/tdm-kde3.postinst index 4df633c59..93207ff88 100644 --- a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.postinst +++ b/ubuntu/lucid_automake/kdebase/debian/tdm-kde3.postinst @@ -10,7 +10,7 @@ set -e DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager if [ ! -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then - DEFAULT_DISPLAY_MANAGER=kdm-kde3 + DEFAULT_DISPLAY_MANAGER=tdm-kde3 if db_get shared/default-x-display-manager; then DEFAULT_DISPLAY_MANAGER="$RET" fi @@ -48,9 +48,9 @@ fi # restarting the daemon may cause output to stdout db_stop -# don't start kdm if we are upgrading without stopping it +# don't start tdm if we are upgrading without stopping it NOSTART= -if [ -e /var/run/kdm-kde3.upgrade ]; then +if [ -e /var/run/tdm-kde3.upgrade ]; then NOSTART=yes fi # or if we're currently in X on the display it attempts to manage by default @@ -64,11 +64,11 @@ for HOST in "" \ fi done # or if it's already running -if start-stop-daemon --stop --quiet --signal 0 --pid /var/run/kdm.pid --name kdm-kde3; then +if start-stop-daemon --stop --quiet --signal 0 --pid /var/run/tdm.pid --name tdm-kde3; then NOSTART=yes fi # or if the options file says not to -if ! grep -qs ^restart-on-upgrade /etc/kde3/kdm/kdm.options; then +if ! grep -qs ^restart-on-upgrade /etc/kde3/tdm/tdm.options; then NOSTART=yes fi @@ -76,40 +76,40 @@ fi # md5sum of the stock Xservers shipped with KDE 3.3.2, which shipped with Sarge SARGEXSERVERS=d3ab063f564492e0e31830f56ccd350e -CONFIGLEVEL=`grep -s ^ConfigVersion= /etc/kde3/kdm/kdmrc | sed s/^ConfigVersion=//` +CONFIGLEVEL=`grep -s ^ConfigVersion= /etc/kde3/tdm/tdmrc | sed s/^ConfigVersion=//` -if [ -e /etc/kde3/kdm/kdmrc ]; then +if [ -e /etc/kde3/tdm/tdmrc ]; then if dpkg --compare-versions "$CONFIGLEVEL" ge "2.3"; then - KDMRCUPDATED=yes + TDMRCUPDATED=yes fi fi -if [ -e /etc/kde3/kdm/Xservers ]; then - if [ `md5sum /etc/kde3/kdm/Xservers | sed s/\ .*$//` = $SARGEXSERVERS ]; then +if [ -e /etc/kde3/tdm/Xservers ]; then + if [ `md5sum /etc/kde3/tdm/Xservers | sed s/\ .*$//` = $SARGEXSERVERS ]; then XSERVERSUNCHANGED=yes fi fi -# With KDE 3.4, /etc/kde3/kdm/Xservers is no longer required, so we remove it, if -# the user has updated their kdmrc (if they haven't, kdm notices and keeps using +# With KDE 3.4, /etc/kde3/tdm/Xservers is no longer required, so we remove it, if +# the user has updated their tdmrc (if they haven't, tdm notices and keeps using # Xservers), and if it wasn't touched, i.e. there are no local changes the user -# will want to merge into kdmrc. +# will want to merge into tdmrc. case "$1" in configure) - if [ ! -z $KDMRCUPDATED ] && [ ! -z $XSERVERSUNCHANGED ]; then - echo "Removing obsolete /etc/kde3/kdm/Xservers (detected no user changes)." - rm -f /etc/kde3/kdm/Xservers - elif [ ! -z $KDMRCUPDATED ] && [ -e /etc/kde3/kdm/Xservers ]; then - echo "Note that /etc/kde3/kdm/Xservers is no longer used by KDM." - echo "You must merge your changes (if any) into /etc/kde3/kdm/kdmrc manually." - echo "Otherwise, /etc/kde3/kdm/Xservers is safe to remove." + if [ ! -z $TDMRCUPDATED ] && [ ! -z $XSERVERSUNCHANGED ]; then + echo "Removing obsolete /etc/kde3/tdm/Xservers (detected no user changes)." + rm -f /etc/kde3/tdm/Xservers + elif [ ! -z $TDMRCUPDATED ] && [ -e /etc/kde3/tdm/Xservers ]; then + echo "Note that /etc/kde3/tdm/Xservers is no longer used by TDM." + echo "You must merge your changes (if any) into /etc/kde3/tdm/tdmrc manually." + echo "Otherwise, /etc/kde3/tdm/Xservers is safe to remove." fi - rm -f /etc/init.d/kdm-kde3 - ln -s /lib/init/upstart-job /etc/init.d/kdm-kde3 + rm -f /etc/init.d/tdm-kde3 + ln -s /lib/init/upstart-job /etc/init.d/tdm-kde3 ;; diff --git a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.postrm b/ubuntu/lucid_automake/kdebase/debian/tdm-kde3.postrm index 77e9f362d..f33a54fc4 100644 --- a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.postrm +++ b/ubuntu/lucid_automake/kdebase/debian/tdm-kde3.postrm @@ -2,7 +2,7 @@ case "$1" in purge) - rm -rf /var/log/kdm-kde3.log* + rm -rf /var/log/tdm-kde3.log* ;; remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) @@ -25,12 +25,12 @@ if [ "$1" = "abort-install" -o "$1" = "abort-upgrade" ]; then fi if [ "$1" = "purge" ]; then - for DIR in /var/lib/kdm-kde3; do + for DIR in /var/lib/tdm-kde3; do if [ -d "$DIR" ]; then rm -rf "$DIR" fi done - rm -f /var/log/kdm-kde3.log* + rm -f /var/log/tdm-kde3.log* fi #DEBHELPER# diff --git a/ubuntu/lucid_automake/kdebase/debian/tdm-kde3.preinst b/ubuntu/lucid_automake/kdebase/debian/tdm-kde3.preinst new file mode 100644 index 000000000..8160e6810 --- /dev/null +++ b/ubuntu/lucid_automake/kdebase/debian/tdm-kde3.preinst @@ -0,0 +1,29 @@ +#! /bin/sh -e + +case "$1" in + + upgrade) + rm -f /etc/kde3/debian/tdm-update-menu.sh + rm -f /etc/kde3/debian/tdm.options + rm -f /etc/kde3/tdm/pixmaps/XFree86bw.xpm + rm -f /etc/kde3/tdm/pixmaps/XFree86.xpm + rm -f /etc/kde3/tdm/Xresources + rm -f /etc/menu-methods/tdm + ;; + + install) + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; + +esac + +#DEBHELPER# + +exit 0 diff --git a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.prerm b/ubuntu/lucid_automake/kdebase/debian/tdm-kde3.prerm index 7142a2b61..6c3e8fb97 100644 --- a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.prerm +++ b/ubuntu/lucid_automake/kdebase/debian/tdm-kde3.prerm @@ -1,5 +1,5 @@ #! /bin/sh -# prerm script for kdm-kde3 +# prerm script for tdm-kde3 # # see: dh_installdeb(1) @@ -24,14 +24,14 @@ if [ -e /usr/share/debconf/confmodule ]; then fi case "$1" in - # we NEVER want to unconditionally stop kdm; see below + # we NEVER want to unconditionally stop tdm; see below upgrade|failed-upgrade) REMOVING= ;; remove|deconfigure) REMOVING=yes - rm -f /etc/init.d/kdm-kde3 + rm -f /etc/init.d/tdm-kde3 ;; *) @@ -41,14 +41,14 @@ case "$1" in esac STOP= -# are we supposed to restart on upgrade? if REMOVING kdm, we don't care what +# are we supposed to restart on upgrade? if REMOVING tdm, we don't care what # the user says, we have to stop the daemon -if grep -qs ^restart-on-upgrade /etc/kde3/kdm/kdm.options || +if grep -qs ^restart-on-upgrade /etc/kde3/tdm/tdm.options || [ -n "$REMOVING" ]; then - # is there an kdm process running? - if start-stop-daemon --stop --quiet --signal 0 --name kdm-kde3; then + # is there an tdm process running? + if start-stop-daemon --stop --quiet --signal 0 --name tdm-kde3; then # any children? - PARENTS=$(pidof /usr/bin/kdm-kde3 || true) + PARENTS=$(pidof /usr/bin/tdm-kde3 || true) CHILDREN= if [ -n "$PARENTS" ]; then for PROCESS in $PARENTS; do @@ -65,11 +65,11 @@ if grep -qs ^restart-on-upgrade /etc/kde3/kdm/kdm.options || if [ -n "$CHILDREN" ]; then if [ -n "$HAVE_DEBCONF" ]; then # ask the question - db_input high kdm/stop_running_server_with_children || true + db_input high tdm/stop_running_server_with_children || true db_go # what did the user say? ANSWER= - if db_get kdm/stop_running_server_with_children; then + if db_get tdm/stop_running_server_with_children; then ANSWER="$RET" fi if [ "$ANSWER" = "true" ]; then @@ -77,7 +77,7 @@ if grep -qs ^restart-on-upgrade /etc/kde3/kdm/kdm.options || fi # forget that we have seen the question; this is the sort of # non-configuration question that should be asked every time - db_fset kdm/stop_running_server_with_children seen false + db_fset tdm/stop_running_server_with_children seen false fi else STOP=yes @@ -88,13 +88,13 @@ fi if [ -n "$STOP" ]; then if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then - invoke-rc.d kdm-kde3 stop || true + invoke-rc.d tdm-kde3 stop || true else - /etc/init.d/kdm-kde3 stop || true + /etc/init.d/tdm-kde3 stop || true fi else if [ "$1" = "upgrade" -o "$1" = "failed-upgrade" ]; then - touch /var/run/kdm-kde3.upgrade + touch /var/run/tdm-kde3.upgrade fi fi @@ -117,7 +117,7 @@ if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then fi # are we removing the currently selected display manager? if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then - if [ "kdm-kde3" = "$DEFAULT_DISPLAY_MANAGER" ]; then + if [ "tdm-kde3" = "$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 diff --git a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.templates b/ubuntu/lucid_automake/kdebase/debian/tdm-kde3.templates index 99aa93d7a..9730af3ff 100644 --- a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.templates +++ b/ubuntu/lucid_automake/kdebase/debian/tdm-kde3.templates @@ -14,19 +14,19 @@ _Description: Default display manager: accordingly, edit each of their init scripts in /etc/init.d, and disable the check for a default display manager. -Template: kdm-kde3/daemon_name +Template: tdm-kde3/daemon_name Type: string -Default: /opt/kde3/bin/kdm +Default: /opt/kde3/bin/tdm Description: internal use only This template is never shown to the user and does not require translation. -Template: kdm-kde3/stop_running_server_with_children +Template: tdm-kde3/stop_running_server_with_children Type: boolean Default: false -_Description: Stop the kdm-kde3 daemon? - The K Desktop manager (kdm-kde3) daemon is typically stopped on package upgrade +_Description: Stop the tdm-kde3 daemon? + The K Desktop manager (tdm-kde3) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session. . - If kdm is stopped now, any X sessions it manages will be terminated. + If tdm is stopped now, any X sessions it manages will be terminated. Otherwise, the new version will take effect the next time the daemon is restarted. diff --git a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.txt b/ubuntu/lucid_automake/kdebase/debian/tdm-kde3.txt index 191c344fd..edbfdd647 100644 --- a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.txt +++ b/ubuntu/lucid_automake/kdebase/debian/tdm-kde3.txt @@ -1,6 +1,6 @@ #!/bin/sh ### BEGIN INIT INFO -# Provides: x-display-manager kdm-kde3 +# Provides: x-display-manager tdm-kde3 # Required-Start: $local_fs $remote_fs # Required-Stop: $local_fs $remote_fs # Should-Start: console-screen @@ -8,40 +8,40 @@ # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: X display manager for KDE3 -# Description: KDM manages a collection of X servers, which may be on the local host or remote machines. +# Description: TDM manages a collection of X servers, which may be on the local host or remote machines. ### END INIT INFO -# /etc/init.d/kdm-kde3: start or stop the X display manager +# /etc/init.d/tdm-kde3: start or stop the X display manager # Script originally stolen from the xdm package # # description: K Display Manager # set -e -# To start kdm-kde3 even if it is not the default display manager, change +# To start tdm-kde3 even if it is not the default display manager, change # HEED_DEFAULT_DISPLAY_MANAGER to "false." HEED_DEFAULT_DISPLAY_MANAGER=true DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager -KDEDIRS=/opt/kde3/ +TDEDIRS=/opt/kde3/ PATH=/opt/kde3/bin:/bin:/usr/bin:/sbin:/usr/sbin -DAEMON=/opt/kde3/bin/kdm -PIDFILE=/var/run/kdm.pid -UPGRADEFILE=/var/run/kdm.upgrade +DAEMON=/opt/kde3/bin/tdm +PIDFILE=/var/run/tdm.pid +UPGRADEFILE=/var/run/tdm.upgrade -# parameters to support kdm customization -KDMRC=/etc/kde3/kdm/kdmrc -BACKGROUNDRC=/etc/kde3/kdm/backgroundrc +# parameters to support tdm customization +TDMRC=/etc/kde3/tdm/tdmrc +BACKGROUNDRC=/etc/kde3/tdm/backgroundrc -#if configuration is changed by kdmtheme or other tools, don't do magick -if grep -q "Theme=@@@ToBeReplacedByDesktopBase@@@" ${KDMRC} && grep -q "Wallpaper=default_blue.jpg" ${BACKGROUNDRC} +#if configuration is changed by tdmtheme or other tools, don't do magick +if grep -q "Theme=@@@ToBeReplacedByDesktopBase@@@" ${TDMRC} && grep -q "Wallpaper=default_blue.jpg" ${BACKGROUNDRC} then -KDMOVERRIDEDIR=/etc/default/kdm-kde3.d -KDMCFGDIR=/var/run/kdm-kde3 -KDMCFG=$KDMCFGDIR/kdmrc -BACKGROUNDCFG=$KDMCFGDIR/backgroundrc +TDMOVERRIDEDIR=/etc/default/tdm-kde3.d +TDMCFGDIR=/var/run/tdm-kde3 +TDMCFG=$TDMCFGDIR/tdmrc +BACKGROUNDCFG=$TDMCFGDIR/backgroundrc test -x $DAEMON || exit 0 @@ -52,36 +52,36 @@ test -x $DAEMON || exit 0 # uncomment, if you want tons of debug info in your syslog #ARG="$ARG -debug 255" -# we use an alternative kdm master configuration file -ARG="$ARG -config $KDMCFG" +# we use an alternative tdm master configuration file +ARG="$ARG -config $TDMCFG" # we source overrides. run-parts sorts the list in a predictable order -if [ -d "$KDMOVERRIDEDIR" ]; then - for part in $(run-parts --list "$KDMOVERRIDEDIR" 2>/dev/null || true); do +if [ -d "$TDMOVERRIDEDIR" ]; then + for part in $(run-parts --list "$TDMOVERRIDEDIR" 2>/dev/null || true); do . "$part" done fi -# we generate kdm configuration files -genkdmconf --in $KDMCFGDIR 1> /dev/null +# we generate tdm configuration files +gentdmconf --in $TDMCFGDIR 1> /dev/null -# we update kdm configuration files (only overridden values) -[ -n "$USEBACKGROUND" ] && sed -i "s|^#\?UseBackground=.*|UseBackground=$USEBACKGROUND|" $KDMCFG -[ -n "$BACKGROUNDCFG" ] && sed -i "s|^#\?BackgroundCfg=.*|BackgroundCfg=$BACKGROUNDCFG|" $KDMCFG -[ -n "$USETHEME" ] && sed -i "s|^#\?UseTheme=.*|UseTheme=$USETHEME|" $KDMCFG -[ -n "$THEME" ] && sed -i "s|^#\?Theme=.*|Theme=$THEME|" $KDMCFG +# we update tdm configuration files (only overridden values) +[ -n "$USEBACKGROUND" ] && sed -i "s|^#\?UseBackground=.*|UseBackground=$USEBACKGROUND|" $TDMCFG +[ -n "$BACKGROUNDCFG" ] && sed -i "s|^#\?BackgroundCfg=.*|BackgroundCfg=$BACKGROUNDCFG|" $TDMCFG +[ -n "$USETHEME" ] && sed -i "s|^#\?UseTheme=.*|UseTheme=$USETHEME|" $TDMCFG +[ -n "$THEME" ] && sed -i "s|^#\?Theme=.*|Theme=$THEME|" $TDMCFG [ -n "$WALLPAPER" ] && sed -i "s|^#\?Wallpaper=.*|Wallpaper=`readlink -f $WALLPAPER`|" $BACKGROUNDCFG fi # autologin overrides are useful for live debian environment if [ -n "$AUTOLOGINUSER" ]; then - sed -i "s|^#\?AutoLoginEnable=.*|AutoLoginEnable=true|" $KDMCFG - sed -i "s|^#\?AutoLoginUser=.*|AutoLoginUser=$AUTOLOGINUSER|" $KDMCFG + sed -i "s|^#\?AutoLoginEnable=.*|AutoLoginEnable=true|" $TDMCFG + sed -i "s|^#\?AutoLoginUser=.*|AutoLoginUser=$AUTOLOGINUSER|" $TDMCFG fi -[ -n "$AUTOLOGINDELAY" ] && sed -i "s|^#\?AutoLoginDelay=.*|AutoLoginDelay=$AUTOLOGINDELAY|" $KDMCFG -[ -n "$AUTOLOGINAGAIN" ] && sed -i "s|^#\?AutoLoginAgain=.*|AutoLoginAgain=$AUTOLOGINAGAIN|" $KDMCFG -[ -n "$AUTOLOGINLOCKED" ] && sed -i "s|^#\?AutoLoginLocked=.*|AutoLoginLocked=$AUTOLOGINLOCKED|" $KDMCFG +[ -n "$AUTOLOGINDELAY" ] && sed -i "s|^#\?AutoLoginDelay=.*|AutoLoginDelay=$AUTOLOGINDELAY|" $TDMCFG +[ -n "$AUTOLOGINAGAIN" ] && sed -i "s|^#\?AutoLoginAgain=.*|AutoLoginAgain=$AUTOLOGINAGAIN|" $TDMCFG +[ -n "$AUTOLOGINLOCKED" ] && sed -i "s|^#\?AutoLoginLocked=.*|AutoLoginLocked=$AUTOLOGINLOCKED|" $TDMCFG # If we upgraded the daemon, we can't use the --exec argument to # start-stop-daemon since the inode will have changed. The risk here is that @@ -110,22 +110,22 @@ case "$1" in if [ -e $DEFAULT_DISPLAY_MANAGER_FILE ] && [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] && [ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" != "$DAEMON" ]; then - echo "Not starting K Display Manager (kdm-kde3); it is not the default display manager." + echo "Not starting K Display Manager (tdm-kde3); it is not the default display manager." else - echo -n "Starting K Display Manager: kdm-kde3" + echo -n "Starting K Display Manager: tdm-kde3" start-stop-daemon --start --quiet $SSD_ARGS -- $ARG || echo -n " already running" echo "." fi ;; restart) - /etc/init.d/kdm-kde3 stop + /etc/init.d/tdm-kde3 stop if [ -f $PIDFILE ]; then if stillrunning; then exit 1 fi fi - /etc/init.d/kdm-kde3 start + /etc/init.d/tdm-kde3 start ;; reload) @@ -133,16 +133,16 @@ case "$1" in if start-stop-daemon --stop --signal 1 --quiet $SSD_ARGS; then echo "done." else - echo "kdm-kde3 not running." + echo "tdm-kde3 not running." fi ;; force-reload) - /etc/init.d/kdm-kde3 reload + /etc/init.d/tdm-kde3 reload ;; stop) - echo -n "Stopping K Display Manager: kdm-kde3" + echo -n "Stopping K Display Manager: tdm-kde3" if [ ! -f $PIDFILE ]; then echo " not running ($PIDFILE not found)." exit 0 @@ -151,7 +151,7 @@ case "$1" in KILLCOUNT=1 if [ ! -e $UPGRADEFILE ]; then if start-stop-daemon --stop --quiet $SSD_ARGS; then - # give kdm's signal handler a second to catch its breath + # give tdm's signal handler a second to catch its breath sleep 1 else echo -n " not running" @@ -181,7 +181,7 @@ case "$1" in ;; *) - echo "Usage: /etc/init.d/kdm-kde3 {start|stop|restart|reload|force-reload}" + echo "Usage: /etc/init.d/tdm-kde3 {start|stop|restart|reload|force-reload}" exit 1 ;; esac diff --git a/ubuntu/lucid_automake/kdebindings/debian/changelog b/ubuntu/lucid_automake/kdebindings/debian/changelog index 381d60921..b1b390990 100644 --- a/ubuntu/lucid_automake/kdebindings/debian/changelog +++ b/ubuntu/lucid_automake/kdebindings/debian/changelog @@ -483,7 +483,7 @@ kdebindings (4:3.2.92-1) unstable; urgency=low was accepted upstream. * debian/libkjsembed1.install: install the qprocess kjsembed plugin. * debian/rules: disable the python directory, as sip, pyqt and - pykde are all packaged in Debian already. + pytde are all packaged in Debian already. * debian/control: added the libsmokekde1, libsmokekde-dev, libkorundum-ruby1.8 and libqtruby-ruby1.8 packages because of upstream additions. diff --git a/ubuntu/lucid_automake/kdeedu/debian/copyright b/ubuntu/lucid_automake/kdeedu/debian/copyright index 272e4f376..fca32cf86 100644 --- a/ubuntu/lucid_automake/kdeedu/debian/copyright +++ b/ubuntu/lucid_automake/kdeedu/debian/copyright @@ -30,7 +30,7 @@ Upstream Authors: KLettres: Anne-Marie Mahfouf <annma@kde.org> and many others KMathTool: Birgit Schulz <B.Schulz@Superlehrer.de>, Marco Wegner <mail@marcowegner.de> - KmPlot: Klaus-Dieter Möller <kdmoeller@foni.net>, + KmPlot: Klaus-Dieter Möller <tdmoeller@foni.net>, Matthias Messmer <bmlmessmer@web.de>, Fredrik Edemar <f_edemar@linux.se> KPercentage: Matthias Messmer <bmlmessmer@web.de>, diff --git a/ubuntu/lucid_automake/kdeedu/debian/man/kmplot-kde3.1 b/ubuntu/lucid_automake/kdeedu/debian/man/kmplot-kde3.1 index 99478b688..904fac69d 100644 --- a/ubuntu/lucid_automake/kdeedu/debian/man/kmplot-kde3.1 +++ b/ubuntu/lucid_automake/kdeedu/debian/man/kmplot-kde3.1 @@ -51,7 +51,7 @@ If the KDE Help Centre is not installed then you can install the package \fIkdeedu-doc-html\fP and read this documentation in HTML format from \fI/opt/kde3/share/doc/kde/HTML/en/kmplot/\fP. .SH AUTHOR -KmPlot was written by Klaus-Dieter Moeller <kdmoeller@foni.net>, +KmPlot was written by Klaus-Dieter Moeller <tdmoeller@foni.net>, Matthias Messmer <bmlmessmer@web.de> and Fredrik Edemar <f_edemar@linux.se>. .br This manual page was prepared by Ben Burton <bab@debian.org> diff --git a/ubuntu/lucid_automake/kdelibs/debian/changelog b/ubuntu/lucid_automake/kdelibs/debian/changelog index 323cc6749..9e6d8143f 100644 --- a/ubuntu/lucid_automake/kdelibs/debian/changelog +++ b/ubuntu/lucid_automake/kdelibs/debian/changelog @@ -520,7 +520,7 @@ kdelibs (4:3.5.7-1ubuntu9) gutsy; urgency=low [ Sarah Hobbs ] * Added kubuntu_93_kdelibs-kdesudo-support-wflags-and-kab-fix.diff. Thankyou to Stefan Skotte for this patch - * Removed kubuntu_28_fix_sudo.diff to fix KDM memory corruption + * Removed kubuntu_28_fix_sudo.diff to fix TDM memory corruption (LP: #47455, KDE bug #147454) -- Sarah Hobbs <hobbsee@ubuntu.com> Sat, 14 Jul 2007 01:51:38 +1000 @@ -2087,7 +2087,7 @@ kdelibs (4:3.4.0-0pre5) alioth; urgency=low output them expanded even when --expandvars is not used. (Closes: #287822) * Fixed the ability of the build system to find kde.pot, even when it is not - located at KDEDIR/include/kde.pot. This allows the use of targets such as + located at TDEDIR/include/kde.pot. This allows the use of targets such as "package-messages" without specifying includedir. (Closes: #283858) * Now that graphviz is in main, add it to Build-Depends-Indep together with diff --git a/ubuntu/lucid_automake/kdelibs/debian/kcmshell b/ubuntu/lucid_automake/kdelibs/debian/kcmshell index 4ca9629ed..57d0e82bb 100755 --- a/ubuntu/lucid_automake/kdelibs/debian/kcmshell +++ b/ubuntu/lucid_automake/kdelibs/debian/kcmshell @@ -1,4 +1,4 @@ #!/bin/sh -export KDEDIRS=/usr/:/opt/kde3/ +export TDEDIRS=/usr/:/opt/kde3/ /opt/kde3/bin/kcmshell.real $1 $2 $3 $4 $5 $6 $7 $8 diff --git a/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.install b/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.install index 57b3291f2..e2b5d076c 100644 --- a/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.install +++ b/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.install @@ -532,9 +532,9 @@ debian/tmp/opt/kde3/include/kde/kshred.h debian/tmp/opt/kde3/include/kde/ksimpleconfig.h debian/tmp/opt/kde3/include/kde/ksmimecrypto.h debian/tmp/opt/kde3/include/kde/ksockaddr.h -debian/tmp/opt/kde3/include/kde/ksocketaddress.h -debian/tmp/opt/kde3/include/kde/ksocketbase.h -debian/tmp/opt/kde3/include/kde/ksocketdevice.h +debian/tmp/opt/kde3/include/kde/tdesocketaddress.h +debian/tmp/opt/kde3/include/kde/tdesocketbase.h +debian/tmp/opt/kde3/include/kde/tdesocketdevice.h debian/tmp/opt/kde3/include/kde/ksock.h debian/tmp/opt/kde3/include/kde/ksocks.h debian/tmp/opt/kde3/include/kde/ksockssocketdevice.h diff --git a/ubuntu/lucid_automake/kdelibs/debian/man/kstartupconfig-kde3.1 b/ubuntu/lucid_automake/kdelibs/debian/man/kstartupconfig-kde3.1 index dca82fb5e..87733d37f 100644 --- a/ubuntu/lucid_automake/kdelibs/debian/man/kstartupconfig-kde3.1 +++ b/ubuntu/lucid_automake/kdelibs/debian/man/kstartupconfig-kde3.1 @@ -4,7 +4,7 @@ kstartupconfig, kdostartupconfig \- KDE configuration options loader .SH SYNOPSIS -\fBkstartupconfig\fP [$KDEHOME] +\fBkstartupconfig\fP [$TDEHOME] .sp 1 \fBkdostartupconfig\fP .SH DESCRIPTION @@ -27,19 +27,19 @@ do not use frequently changed config files since the checking is timestamp\-base if \fBkconf_update\fP is used to update an option also touch the matching global config file to allow \fBkstartupconfig\fP to see changes .SH OPTIONS .TP -.B $KDEHOME +.B $TDEHOME KDE home directory, if different to ~/.kde .SS .SH FILES -In case $KDEHOME is not set ~/.kde is assumed. +In case $TDEHOME is not set ~/.kde is assumed. .TP -.I $KDEHOME/share/config/startupconfig +.I $TDEHOME/share/config/startupconfig script, sourced to set shell variables with configuration options .TP -.I $KDEHOME/share/config/startupconfigfiles +.I $TDEHOME/share/config/startupconfigfiles configuration options and files they belong to .TP -.I $KDEHOME/share/config/startupconfigkeys +.I $TDEHOME/share/config/startupconfigkeys configuration options to load .SH SEE ALSO .BR kconf_update (1),\ startkde (1) diff --git a/ubuntu/lucid_automake/kdelibs/debian/man/lnusertemp-kde3.sgml b/ubuntu/lucid_automake/kdelibs/debian/man/lnusertemp-kde3.sgml index c40c64520..a75709316 100644 --- a/ubuntu/lucid_automake/kdelibs/debian/man/lnusertemp-kde3.sgml +++ b/ubuntu/lucid_automake/kdelibs/debian/man/lnusertemp-kde3.sgml @@ -72,7 +72,7 @@ manpage.1: manpage.sgml <para><command>&dhpackage;</command> is used to create KDE resources in temporary directories and symlinks to them in - <envar>KDEHOME</envar>. The resource that needs to be created is + <envar>TDEHOME</envar>. The resource that needs to be created is given as an argument and can be anyone of:</para> <itemizedlist> diff --git a/ubuntu/lucid_automake/kdelibs/debian/man/make_driver_db_cups-kde3.1 b/ubuntu/lucid_automake/kdelibs/debian/man/make_driver_db_cups-kde3.1 index e4eb8251f..15d534206 100644 --- a/ubuntu/lucid_automake/kdelibs/debian/man/make_driver_db_cups-kde3.1 +++ b/ubuntu/lucid_automake/kdelibs/debian/man/make_driver_db_cups-kde3.1 @@ -25,10 +25,10 @@ directory with ppd files write printer database into this file .SH FILES .TP -.I $KDEHOME/share/apps/kdeprint/printerdb_cups.txt +.I $TDEHOME/share/apps/kdeprint/printerdb_cups.txt KDE printer database .br -(if $KDEHOME is not set ~/.kde is used) +(if $TDEHOME is not set ~/.kde is used) .SH SEE ALSO .BR make_driver_db_lpr (1) .TP diff --git a/ubuntu/lucid_automake/kdemultimedia/debian/man/kaboodle-kde3.1 b/ubuntu/lucid_automake/kdemultimedia/debian/man/kaboodle-kde3.1 index c7852c5db..ef2e440bd 100644 --- a/ubuntu/lucid_automake/kdemultimedia/debian/man/kaboodle-kde3.1 +++ b/ubuntu/lucid_automake/kdemultimedia/debian/man/kaboodle-kde3.1 @@ -70,7 +70,7 @@ Use an alternative configuration file, instead of the default, which is normally located in .I /usr/share/config or in -.RB $ KDEHOME\fI/share/config +.RB $ TDEHOME\fI/share/config .TP .BI \-\-dcopserver \ server Set the address of the DCOP server to attach to. @@ -218,7 +218,7 @@ The session manager to use. This option is set automatically by KDE and is a network path to the session manager socket. .IP HOME Path to the home directory for the current user. -.IP KDEHOME +.IP TDEHOME The KDE per-user setting directory. Default if not specified is .I $HOME/.kde .lf 55 info/kdemultimedia.kaboodle.1 diff --git a/ubuntu/lucid_automake/kdesdk/debian/changelog b/ubuntu/lucid_automake/kdesdk/debian/changelog index 25885a31a..6e4dc71dc 100644 --- a/ubuntu/lucid_automake/kdesdk/debian/changelog +++ b/ubuntu/lucid_automake/kdesdk/debian/changelog @@ -153,7 +153,7 @@ kdesdk (4:3.5.6-2) unstable; urgency=low +++ Changes by Sune Vuorela: - * Promote graphviz from kcachegrind Suggests to Recommends. (Closes: #407043) + * Promote graphviz from tdecachegrind Suggests to Recommends. (Closes: #407043) * Don't install the licensecheck script in kdesdk. The devscripts package has taken it and is working actively on it. Let kdesdk-scripts suggest devscripts instead. (Closes: #420154) @@ -617,7 +617,7 @@ kdesdk (4:3.3.2-3) unstable; urgency=high under the LGPL. * Fix kdemangen.pl output to use minus instead of hyphen where appropriate, thanks to Achim Bohnet (closes: #295454). - * Fixed amd64/gcc-4.0 build by using longs for node IDs in kcachegrind, + * Fixed amd64/gcc-4.0 build by using longs for node IDs in tdecachegrind, thanks to Andreas Jochens (closes: #287032). -- Ben Burton <bab@debian.org> Thu, 31 Mar 2005 19:59:13 +1000 @@ -672,8 +672,8 @@ kdesdk (4:3.3.1-1) unstable; urgency=medium kdesdk (4:3.3.0-1) unstable; urgency=low * New upstream release. - * New package kcachegrind-converters. These foreign format converters - are packaged separately so that kcachegrind need not depend on php. + * New package tdecachegrind-converters. These foreign format converters + are packaged separately so that tdecachegrind need not depend on php. * Binary package kmtrace has returned. Note that the kmtrace libraries for debian are now installed in /usr/lib/kmtrace, not in /usr/lib as is done upstream. @@ -712,7 +712,7 @@ kdesdk (4:3.2.2-1) unstable; urgency=low * New upstream bugfix release. * Add Conflicts/Replaces for umbrello-manual (closes: #237173). * Don't use Conflicts/Replaces elsewhere where we should just use Replaces. - * Have kcachegrind suggest graphviz (closes: #243883). + * Have tdecachegrind suggest graphviz (closes: #243883). -- Ben Burton <bab@debian.org> Tue, 16 Mar 2004 09:15:01 +1100 @@ -735,8 +735,8 @@ kdesdk (4:3.2.0-1) unstable; urgency=low * New upstream release. * Many thanks to Ralf Nolden for all his help with packaging KDE 3.2. * Thanks to Robert Lemmen for previous packaging work on umbrello and - to Philipp Frauenfelder for previous packaging work on kcachegrind. - * New binary packages kcachegrind, kuiviewer and umbrello. + to Philipp Frauenfelder for previous packaging work on tdecachegrind. + * New binary packages tdecachegrind, kuiviewer and umbrello. * Created a new package kdesdk-doc-html for HTML documentation. -- Ben Burton <bab@debian.org> Sat, 31 Jan 2004 12:08:48 +1100 diff --git a/ubuntu/lucid_automake/kdesdk/debian/control b/ubuntu/lucid_automake/kdesdk/debian/control index dcd924a55..995f4136f 100644 --- a/ubuntu/lucid_automake/kdesdk/debian/control +++ b/ubuntu/lucid_automake/kdesdk/debian/control @@ -14,8 +14,8 @@ Standards-Version: 3.8.3 Package: kdesdk-kde3 Architecture: all Section: kde -Depends: cervisia-kde3 (>= ${Source-Version}), kapptemplate-kde3 (>= ${Source-Version}), kbabel-kde3 (>= ${Source-Version}), kbugbuster-kde3 (>= ${Source-Version}), kcachegrind-kde3 (>= ${Source-Version}), kdesdk-kfile-plugins-kde3 (>= ${Source-Version}), kdesdk-kio-plugins-kde3 (>= ${Source-Version}) | kdesvn-kio-plugins-kde3, kdesdk-misc-kde3 (>= ${Source-Version}), kdesdk-scripts-kde3, kmtrace-kde3 (>= ${Source-Version}), kompare-kde3 (>= ${Source-Version}), kspy-kde3 (>= ${Source-Version}), kuiviewer-kde3 (>= ${Source-Version}), kunittest-kde3 (>= ${Source-Version}), poxml-kde3 (>= ${Source-Version}), umbrello-kde3 (>= ${Source-Version}) -Suggests: kcachegrind-converters-kde3, kbabel-kde3-dev, kdesdk-kde3-doc-html +Depends: cervisia-kde3 (>= ${Source-Version}), kapptemplate-kde3 (>= ${Source-Version}), kbabel-kde3 (>= ${Source-Version}), kbugbuster-kde3 (>= ${Source-Version}), tdecachegrind-kde3 (>= ${Source-Version}), kdesdk-kfile-plugins-kde3 (>= ${Source-Version}), kdesdk-kio-plugins-kde3 (>= ${Source-Version}) | kdesvn-kio-plugins-kde3, kdesdk-misc-kde3 (>= ${Source-Version}), kdesdk-scripts-kde3, kmtrace-kde3 (>= ${Source-Version}), kompare-kde3 (>= ${Source-Version}), kspy-kde3 (>= ${Source-Version}), kuiviewer-kde3 (>= ${Source-Version}), kunittest-kde3 (>= ${Source-Version}), poxml-kde3 (>= ${Source-Version}), umbrello-kde3 (>= ${Source-Version}) +Suggests: tdecachegrind-converters-kde3, kbabel-kde3-dev, kdesdk-kde3-doc-html Description: software development kit from the official KDE3 release KDE (the K Desktop Environment) is a powerful Open Source graphical desktop environment for Unix workstations. It combines ease of use, @@ -133,13 +133,13 @@ Description: a front end for the KDE3 bug tracking system This package is part of KDE3, and a component of the KDE SDK module. See the 'kde-kde3' and 'kdesdk-kde3' packages for more information. -Package: kcachegrind-kde3 +Package: tdecachegrind-kde3 Architecture: any Section: devel Depends: ${shlibs:Depends} -Conflicts: kcachegrind +Conflicts: tdecachegrind Recommends: valgrind-callgrind-kde3 | valgrind-calltree-kde3, graphviz -Suggests: kcachegrind-converters-kde3, khelpcenter-kde3, kdesdk-kde3-doc-html +Suggests: tdecachegrind-converters-kde3, khelpcenter-kde3, kdesdk-kde3-doc-html Description: visualisation tool for valgrind profiling output KCachegrind is a visualisation tool for the profiling data generated by calltree, a profiling skin for valgrind. Applications can be @@ -147,17 +147,17 @@ Description: visualisation tool for valgrind profiling output and plugin architectures are supported. . For visualising the output from other profiling tools, several converters - can be found in the kcachegrind-converters package. + can be found in the tdecachegrind-converters package. . This package is part of KDE3, and a component of the KDE SDK module. See the 'kde-kde3' and 'kdesdk-kde3' packages for more information. -Package: kcachegrind-converters-kde3 +Package: tdecachegrind-converters-kde3 Architecture: all Section: devel Depends: ${perl:Depends}, php5-cli, python -Conflicts: kcachegrind-converters -Recommends: kcachegrind-kde3 +Conflicts: tdecachegrind-converters +Recommends: tdecachegrind-kde3 Description: format converters for KCachegrind profiling visualisation tool This is a collection of scripts for converting the output from different profiling tools into a format that KCachegrind can use. diff --git a/ubuntu/lucid_automake/kdesdk/debian/control.in b/ubuntu/lucid_automake/kdesdk/debian/control.in index 3a8aa1ced..fb2d6cec3 100644 --- a/ubuntu/lucid_automake/kdesdk/debian/control.in +++ b/ubuntu/lucid_automake/kdesdk/debian/control.in @@ -13,8 +13,8 @@ Standards-Version: 3.7.2 Package: kdesdk Architecture: all Section: kde -Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), kcachegrind (>= ${Source-Version}), kdesdk-kfile-plugins (>= ${Source-Version}), kdesdk-kio-plugins (>= ${Source-Version}) | kdesvn-kio-plugins, kdesdk-misc (>= ${Source-Version}), kdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), kunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version}) -Suggests: kcachegrind-converters, kbabel-dev, kdesdk-doc-html +Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), tdecachegrind (>= ${Source-Version}), kdesdk-kfile-plugins (>= ${Source-Version}), kdesdk-kio-plugins (>= ${Source-Version}) | kdesvn-kio-plugins, kdesdk-misc (>= ${Source-Version}), kdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), kunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version}) +Suggests: tdecachegrind-converters, kbabel-dev, kdesdk-doc-html Description: software development kit from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical desktop environment for Unix workstations. It combines ease of use, @@ -127,12 +127,12 @@ Description: a front end for the KDE bug tracking system This package is part of KDE, and a component of the KDE SDK module. See the 'kde' and 'kdesdk' packages for more information. -Package: kcachegrind +Package: tdecachegrind Architecture: any Section: devel Depends: ${shlibs:Depends} Recommends: valgrind-callgrind | valgrind-calltree, graphviz -Suggests: kcachegrind-converters, khelpcenter, kdesdk-doc-html +Suggests: tdecachegrind-converters, khelpcenter, kdesdk-doc-html Description: visualisation tool for valgrind profiling output KCachegrind is a visualisation tool for the profiling data generated by calltree, a profiling skin for valgrind. Applications can be @@ -140,16 +140,16 @@ Description: visualisation tool for valgrind profiling output and plugin architectures are supported. . For visualising the output from other profiling tools, several converters - can be found in the kcachegrind-converters package. + can be found in the tdecachegrind-converters package. . This package is part of KDE, and a component of the KDE SDK module. See the 'kde' and 'kdesdk' packages for more information. -Package: kcachegrind-converters +Package: tdecachegrind-converters Architecture: all Section: devel Depends: ${perl:Depends}, php5-cli, python -Recommends: kcachegrind +Recommends: tdecachegrind Description: format converters for KCachegrind profiling visualisation tool This is a collection of scripts for converting the output from different profiling tools into a format that KCachegrind can use. diff --git a/ubuntu/lucid_automake/kdesdk/debian/copyright b/ubuntu/lucid_automake/kdesdk/debian/copyright index 57c7c1593..ac5587a4a 100644 --- a/ubuntu/lucid_automake/kdesdk/debian/copyright +++ b/ubuntu/lucid_automake/kdesdk/debian/copyright @@ -3,7 +3,7 @@ Fri, 26 Jan 2001 18:00:00 -0700. It was brought up to date by Ben Burton <bab@debian.org> on Mon, 26 Mar 2001 09:10:56 -0600. Thanks to Robert Lemmen and Philipp Frauenfelder for originally packaging -umbrello and kcachegrind respectively. +umbrello and tdecachegrind respectively. It was downloaded from: http://www.kde.org/download diff --git a/ubuntu/maverick_automake/kdesdk/debian/icons/kcachegrind.xpm b/ubuntu/lucid_automake/kdesdk/debian/icons/tdecachegrind.xpm index 843263759..bfcdfc6e2 100644 --- a/ubuntu/maverick_automake/kdesdk/debian/icons/kcachegrind.xpm +++ b/ubuntu/lucid_automake/kdesdk/debian/icons/tdecachegrind.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * kcachegrind_xpm[] = { +static char * tdecachegrind_xpm[] = { "32 30 256 2", " c None", ". c #0036CA", diff --git a/ubuntu/lucid_automake/kdesdk/debian/kcachegrind-converters-kde3.docs b/ubuntu/lucid_automake/kdesdk/debian/kcachegrind-converters-kde3.docs deleted file mode 100644 index b19a948df..000000000 --- a/ubuntu/lucid_automake/kdesdk/debian/kcachegrind-converters-kde3.docs +++ /dev/null @@ -1 +0,0 @@ -kcachegrind/converters/README diff --git a/ubuntu/lucid_automake/kdesdk/debian/kcachegrind-kde3.docs b/ubuntu/lucid_automake/kdesdk/debian/kcachegrind-kde3.docs deleted file mode 100644 index aef510285..000000000 --- a/ubuntu/lucid_automake/kdesdk/debian/kcachegrind-kde3.docs +++ /dev/null @@ -1,3 +0,0 @@ -kcachegrind/AUTHORS -kcachegrind/README -kcachegrind/TODO diff --git a/ubuntu/lucid_automake/kdesdk/debian/kcachegrind-kde3.install b/ubuntu/lucid_automake/kdesdk/debian/kcachegrind-kde3.install deleted file mode 100644 index 7b5f5605a..000000000 --- a/ubuntu/lucid_automake/kdesdk/debian/kcachegrind-kde3.install +++ /dev/null @@ -1,19 +0,0 @@ -debian/tmp/opt/kde3/bin/kcachegrind -debian/tmp/opt/kde3/share/applications/kde/kcachegrind.desktop -debian/tmp/opt/kde3/share/apps/kcachegrind/icons/hicolor/16x16/actions/fromrec.png -debian/tmp/opt/kde3/share/apps/kcachegrind/icons/hicolor/16x16/actions/percent.png -debian/tmp/opt/kde3/share/apps/kcachegrind/icons/hicolor/16x16/actions/recrec.png -debian/tmp/opt/kde3/share/apps/kcachegrind/icons/hicolor/16x16/actions/torec.png -debian/tmp/opt/kde3/share/apps/kcachegrind/icons/hicolor/22x22/actions/percent.png -debian/tmp/opt/kde3/share/apps/kcachegrind/icons/hicolor/32x32/actions/percent.png -debian/tmp/opt/kde3/share/apps/kcachegrind/kcachegrindui.rc -debian/tmp/opt/kde3/share/apps/kcachegrind/tips -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcachegrind/*.bz2 -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcachegrind/common -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcachegrind/*.docbook -debian/tmp/opt/kde3/share/icons/locolor/32x32/apps/kcachegrind.png -debian/tmp/opt/kde3/share/icons/locolor/16x16/apps/kcachegrind.png -debian/tmp/opt/kde3/share/icons/hicolor/48x48/apps/kcachegrind.png -debian/tmp/opt/kde3/share/icons/hicolor/32x32/apps/kcachegrind.png -debian/tmp/opt/kde3/share/mimelnk/application/x-kcachegrind.desktop -debian/icons/kcachegrind.xpm /opt/kde3/share/pixmaps diff --git a/ubuntu/lucid_automake/kdesdk/debian/kcachegrind-kde3.manpages b/ubuntu/lucid_automake/kdesdk/debian/kcachegrind-kde3.manpages deleted file mode 100644 index f994baff0..000000000 --- a/ubuntu/lucid_automake/kdesdk/debian/kcachegrind-kde3.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/man/kcachegrind.1 diff --git a/ubuntu/maverick_automake/kdesdk/debian/kdesdk-doc-html.doc-base.kcachegrind b/ubuntu/lucid_automake/kdesdk/debian/kdesdk-doc-html.doc-base.tdecachegrind index d105a0bc8..23c698acb 100644 --- a/ubuntu/maverick_automake/kdesdk/debian/kdesdk-doc-html.doc-base.kcachegrind +++ b/ubuntu/lucid_automake/kdesdk/debian/kdesdk-doc-html.doc-base.tdecachegrind @@ -1,4 +1,4 @@ -Document: kdesdk-doc-html-kcachegrind +Document: kdesdk-doc-html-tdecachegrind Title: KCachegrind Handbook Author: Josef Weidendorfer <Josef.Weidendorfer@gmx.de> Abstract: KCachegrind is a profile data visualization tool, written @@ -6,6 +6,6 @@ Abstract: KCachegrind is a profile data visualization tool, written Section: Apps/Programming Format: HTML -Index: /usr/share/doc/kde/HTML/en/kcachegrind/index.html -Files: /usr/share/doc/kde/HTML/en/kcachegrind/*.html +Index: /usr/share/doc/kde/HTML/en/tdecachegrind/index.html +Files: /usr/share/doc/kde/HTML/en/tdecachegrind/*.html diff --git a/ubuntu/lucid_automake/kdesdk/debian/man/dprof2calltree.1 b/ubuntu/lucid_automake/kdesdk/debian/man/dprof2calltree.1 index f1e7691a4..ce66a6b30 100644 --- a/ubuntu/lucid_automake/kdesdk/debian/man/dprof2calltree.1 +++ b/ubuntu/lucid_automake/kdesdk/debian/man/dprof2calltree.1 @@ -49,10 +49,10 @@ work with this data in KCachegrind as follows: .RS dprof2calltree -f tmin.out -o cachegrind.out.foo .br -kcachegrind cachegrind.out.foo +tdecachegrind cachegrind.out.foo .RE .SH SEE ALSO -.BR kcachegrind (1). +.BR tdecachegrind (1). .SH AUTHOR This converter was written by George Schlossnagle <george@omniti.com>. .br diff --git a/ubuntu/lucid_automake/kdesdk/debian/man/hotshot2calltree.1 b/ubuntu/lucid_automake/kdesdk/debian/man/hotshot2calltree.1 index 3b31794aa..a07ce76b4 100644 --- a/ubuntu/lucid_automake/kdesdk/debian/man/hotshot2calltree.1 +++ b/ubuntu/lucid_automake/kdesdk/debian/man/hotshot2calltree.1 @@ -46,10 +46,10 @@ data in KCachegrind as follows. .RS hotshot2cachegrind \-o cachegrind.out.0 pythongrind.prof .br -kcachegrind cachegrind.out.0 +tdecachegrind cachegrind.out.0 .RE .SH SEE ALSO -.BR kcachegrind (1). +.BR tdecachegrind (1). .SH AUTHOR This converter was written by Jorg Beyer <job@webde-ag.de>. .br diff --git a/ubuntu/lucid_automake/kdesdk/debian/man/memprof2calltree.1 b/ubuntu/lucid_automake/kdesdk/debian/man/memprof2calltree.1 index 0bd0582a3..c4042c126 100644 --- a/ubuntu/lucid_automake/kdesdk/debian/man/memprof2calltree.1 +++ b/ubuntu/lucid_automake/kdesdk/debian/man/memprof2calltree.1 @@ -28,7 +28,7 @@ corresponding calltree data will be written to standard output. .PP This utility is part of the KDE Software Development Kit. .SH SEE ALSO -.BR kcachegrind (1). +.BR tdecachegrind (1). .SH AUTHOR This converter was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>. .br diff --git a/ubuntu/lucid_automake/kdesdk/debian/man/op2calltree.1 b/ubuntu/lucid_automake/kdesdk/debian/man/op2calltree.1 index c81836a46..d18231d3e 100644 --- a/ubuntu/lucid_automake/kdesdk/debian/man/op2calltree.1 +++ b/ubuntu/lucid_automake/kdesdk/debian/man/op2calltree.1 @@ -35,7 +35,7 @@ application, to a file of the form \fIoprof.out.<app>\fP. .PP This utility is part of the KDE Software Development Kit. .SH SEE ALSO -.BR kcachegrind (1). +.BR tdecachegrind (1). .SH AUTHOR This converter was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>. .br diff --git a/ubuntu/lucid_automake/kdesdk/debian/man/pprof2calltree.1 b/ubuntu/lucid_automake/kdesdk/debian/man/pprof2calltree.1 index dc80f91ad..b98a06aec 100644 --- a/ubuntu/lucid_automake/kdesdk/debian/man/pprof2calltree.1 +++ b/ubuntu/lucid_automake/kdesdk/debian/man/pprof2calltree.1 @@ -40,11 +40,11 @@ follows. .RS pprof2calltree -f pprof.12345.1 .br -kcachegrind cachegrind.out.12345.1 +tdecachegrind cachegrind.out.12345.1 .RE .PP .SH SEE ALSO -.BR kcachegrind (1). +.BR tdecachegrind (1). .SH AUTHOR This converter was written by George Schlossnagle <george@omniti.com>. .br diff --git a/ubuntu/lucid_automake/kdesdk/debian/man/kcachegrind.1 b/ubuntu/lucid_automake/kdesdk/debian/man/tdecachegrind.1 index 4f7db6435..47f4c27b3 100644 --- a/ubuntu/lucid_automake/kdesdk/debian/man/kcachegrind.1 +++ b/ubuntu/lucid_automake/kdesdk/debian/man/tdecachegrind.1 @@ -2,7 +2,7 @@ .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) -.TH KCACHEGRIND 1 "March 25, 2005" +.TH TDECACHEGRIND 1 "March 25, 2005" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -16,9 +16,9 @@ .\" .sp <n> insert n+1 empty lines .\" for manpage-specific macros, see man(7) .SH NAME -kcachegrind \- a visualisation tool for valgrind profiling output +tdecachegrind \- a visualisation tool for valgrind profiling output .SH SYNOPSIS -.B kcachegrind +.B tdecachegrind .RI "[ " generic-options " ]" [ \fB\-r\fP \fIexec\fP ] [ \fItrace-file\fP ] .SH DESCRIPTION @@ -29,12 +29,12 @@ and plugin architectures are supported. .PP For visualising the output from other profiling tools, several converters are available. On Debian systems these can be found in the -\fIkcachegrind-converters\fP package. +\fItdecachegrind-converters\fP package. .PP This application is part of the KDE Software Development Kit. .SH OPTIONS -Below are the kcachegrind-specific options. -For a full summary of options, run \fIkcachegrind \-\-help\fP. +Below are the tdecachegrind-specific options. +For a full summary of options, run \fItdecachegrind \-\-help\fP. .TP \fB\-r\fP \fIexec\fP Run the program \fIexec\fP under cachegrind. @@ -52,14 +52,14 @@ Visualise data from the given trace. .PP Full user documentation is available through the KDE Help Centre. You can also enter the URL -\fIhelp:/kcachegrind/\fP +\fIhelp:/tdecachegrind/\fP directly into konqueror or you can run -`\fIkhelpcenter help:/kcachegrind/\fP' +`\fIkhelpcenter help:/tdecachegrind/\fP' from the command-line. .PP If the KDE Help Centre is not installed then you can install the package \fIkdesdk-doc-html\fP and read this documentation in HTML format from -\fI/usr/share/doc/kde/HTML/en/kcachegrind/\fP. +\fI/usr/share/doc/kde/HTML/en/tdecachegrind/\fP. .SH AUTHOR KCachegrind was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>. .br diff --git a/ubuntu/lucid_automake/kdesdk/debian/rules b/ubuntu/lucid_automake/kdesdk/debian/rules index d1da98bcc..bab4e2b82 100755 --- a/ubuntu/lucid_automake/kdesdk/debian/rules +++ b/ubuntu/lucid_automake/kdesdk/debian/rules @@ -31,7 +31,7 @@ DEB_DH_MAKESHLIBS_ARGS_umbrello-kde3 := -V'umbrello-kde3 (>= 4:3.5.8-1)' DEB_INSTALL_CHANGELOGS_cervisia-kde3 := cervisia/ChangeLog DEB_INSTALL_CHANGELOGS_kapptemplate-kde3 := kapptemplate/ChangeLog DEB_INSTALL_CHANGELOGS_kbabel-kde3 := kbabel/ChangeLog -DEB_INSTALL_CHANGELOGS_kcachegrind-kde3 := kcachegrind/ChangeLog +DEB_INSTALL_CHANGELOGS_tdecachegrind-kde3 := tdecachegrind/ChangeLog DEB_INSTALL_CHANGELOGS_kompare-kde3 := kompare/ChangeLog DEB_INSTALL_CHANGELOGS_umbrello-kde3 := umbrello/ChangeLog diff --git a/ubuntu/lucid_automake/kdesdk/debian/tdecachegrind-converters-kde3.docs b/ubuntu/lucid_automake/kdesdk/debian/tdecachegrind-converters-kde3.docs new file mode 100644 index 000000000..613037510 --- /dev/null +++ b/ubuntu/lucid_automake/kdesdk/debian/tdecachegrind-converters-kde3.docs @@ -0,0 +1 @@ +tdecachegrind/converters/README diff --git a/ubuntu/lucid_automake/kdesdk/debian/kcachegrind-converters-kde3.install b/ubuntu/lucid_automake/kdesdk/debian/tdecachegrind-converters-kde3.install index c45981077..c45981077 100644 --- a/ubuntu/lucid_automake/kdesdk/debian/kcachegrind-converters-kde3.install +++ b/ubuntu/lucid_automake/kdesdk/debian/tdecachegrind-converters-kde3.install diff --git a/ubuntu/lucid_automake/kdesdk/debian/kcachegrind-converters-kde3.manpages b/ubuntu/lucid_automake/kdesdk/debian/tdecachegrind-converters-kde3.manpages index 977c48e2d..977c48e2d 100644 --- a/ubuntu/lucid_automake/kdesdk/debian/kcachegrind-converters-kde3.manpages +++ b/ubuntu/lucid_automake/kdesdk/debian/tdecachegrind-converters-kde3.manpages diff --git a/ubuntu/lucid_automake/kdesdk/debian/kcachegrind-kde3.README.Debian b/ubuntu/lucid_automake/kdesdk/debian/tdecachegrind-kde3.README.Debian index 3b9a9f290..3b9a9f290 100644 --- a/ubuntu/lucid_automake/kdesdk/debian/kcachegrind-kde3.README.Debian +++ b/ubuntu/lucid_automake/kdesdk/debian/tdecachegrind-kde3.README.Debian diff --git a/ubuntu/lucid_automake/kdesdk/debian/tdecachegrind-kde3.docs b/ubuntu/lucid_automake/kdesdk/debian/tdecachegrind-kde3.docs new file mode 100644 index 000000000..dd7f4d534 --- /dev/null +++ b/ubuntu/lucid_automake/kdesdk/debian/tdecachegrind-kde3.docs @@ -0,0 +1,3 @@ +tdecachegrind/AUTHORS +tdecachegrind/README +tdecachegrind/TODO diff --git a/ubuntu/lucid_automake/kdesdk/debian/tdecachegrind-kde3.install b/ubuntu/lucid_automake/kdesdk/debian/tdecachegrind-kde3.install new file mode 100644 index 000000000..0a1090e0c --- /dev/null +++ b/ubuntu/lucid_automake/kdesdk/debian/tdecachegrind-kde3.install @@ -0,0 +1,19 @@ +debian/tmp/opt/kde3/bin/tdecachegrind +debian/tmp/opt/kde3/share/applications/kde/tdecachegrind.desktop +debian/tmp/opt/kde3/share/apps/tdecachegrind/icons/hicolor/16x16/actions/fromrec.png +debian/tmp/opt/kde3/share/apps/tdecachegrind/icons/hicolor/16x16/actions/percent.png +debian/tmp/opt/kde3/share/apps/tdecachegrind/icons/hicolor/16x16/actions/recrec.png +debian/tmp/opt/kde3/share/apps/tdecachegrind/icons/hicolor/16x16/actions/torec.png +debian/tmp/opt/kde3/share/apps/tdecachegrind/icons/hicolor/22x22/actions/percent.png +debian/tmp/opt/kde3/share/apps/tdecachegrind/icons/hicolor/32x32/actions/percent.png +debian/tmp/opt/kde3/share/apps/tdecachegrind/tdecachegrindui.rc +debian/tmp/opt/kde3/share/apps/tdecachegrind/tips +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdecachegrind/*.bz2 +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdecachegrind/common +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdecachegrind/*.docbook +debian/tmp/opt/kde3/share/icons/locolor/32x32/apps/tdecachegrind.png +debian/tmp/opt/kde3/share/icons/locolor/16x16/apps/tdecachegrind.png +debian/tmp/opt/kde3/share/icons/hicolor/48x48/apps/tdecachegrind.png +debian/tmp/opt/kde3/share/icons/hicolor/32x32/apps/tdecachegrind.png +debian/tmp/opt/kde3/share/mimelnk/application/x-tdecachegrind.desktop +debian/icons/tdecachegrind.xpm /opt/kde3/share/pixmaps diff --git a/ubuntu/lucid_automake/kdesdk/debian/tdecachegrind-kde3.manpages b/ubuntu/lucid_automake/kdesdk/debian/tdecachegrind-kde3.manpages new file mode 100644 index 000000000..367c3db5d --- /dev/null +++ b/ubuntu/lucid_automake/kdesdk/debian/tdecachegrind-kde3.manpages @@ -0,0 +1 @@ +debian/man/tdecachegrind.1 diff --git a/ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.menu b/ubuntu/lucid_automake/kdesdk/debian/tdecachegrind-kde3.menu index 83cd74714..fb9e177a0 100644 --- a/ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.menu +++ b/ubuntu/lucid_automake/kdesdk/debian/tdecachegrind-kde3.menu @@ -1,9 +1,9 @@ -?package(kcachegrind):\ +?package(tdecachegrind):\ needs="x11"\ section="Applications/Programming"\ hints="KDE"\ title="KCachegrind"\ longtitle="KCachegrind (Profiler Frontend)"\ - icon="/usr/share/pixmaps/kcachegrind.xpm"\ - command="/opt/trinity/bin/kcachegrind" + icon="/usr/share/pixmaps/tdecachegrind.xpm"\ + command="/opt/kde3/bin/tdecachegrind" diff --git a/ubuntu/lucid_automake/kdeutils/debian/man/kcharselect-kde3.1 b/ubuntu/lucid_automake/kdeutils/debian/man/kcharselect-kde3.1 index bc0fb442b..63429d234 100644 --- a/ubuntu/lucid_automake/kdeutils/debian/man/kcharselect-kde3.1 +++ b/ubuntu/lucid_automake/kdeutils/debian/man/kcharselect-kde3.1 @@ -69,7 +69,7 @@ Use an alternative configuration file, instead of the default, which is normally located in .I /usr/share/config or in -.RB $ KDEHOME\fI/share/config +.RB $ TDEHOME\fI/share/config .TP .BI \-\-dcopserver \ server Set the address of the DCOP server to attach to. @@ -217,7 +217,7 @@ The session manager to use. This option is set automatically by KDE and is a network path to the session manager socket. .IP HOME Path to the home directory for the current user. -.IP KDEHOME +.IP TDEHOME The KDE per-user setting directory. Default if not specified is .I $HOME/.kde .lf 50 info/kdeutils.kcharselect.1 diff --git a/ubuntu/lucid_automake/libraries/pykdeextensions/debian/pykdeextensions-kde3.install b/ubuntu/lucid_automake/libraries/pykdeextensions/debian/pykdeextensions-kde3.install deleted file mode 100644 index 7fa6e9508..000000000 --- a/ubuntu/lucid_automake/libraries/pykdeextensions/debian/pykdeextensions-kde3.install +++ /dev/null @@ -1,7 +0,0 @@ -usr/lib/python*/dist-packages -opt/kde3/share/apps/pykdeextensions/AUTHORS -opt/kde3/share/apps/pykdeextensions/ChangeLog -opt/kde3/share/apps/pykdeextensions/INSTALL -opt/kde3/share/apps/pykdeextensions/NEWS -opt/kde3/share/apps/pykdeextensions/app_templates -opt/kde3/share/doc/kde/HTML/en/pykdeextensions diff --git a/ubuntu/lucid_automake/libraries/pykdeextensions/debian/pykdeextensions-kde3.lintian-overrides b/ubuntu/lucid_automake/libraries/pykdeextensions/debian/pykdeextensions-kde3.lintian-overrides deleted file mode 100644 index 06b60205b..000000000 --- a/ubuntu/lucid_automake/libraries/pykdeextensions/debian/pykdeextensions-kde3.lintian-overrides +++ /dev/null @@ -1,10 +0,0 @@ -pykdeextensions: desktop-entry-contains-unknown-key ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop:4 name[en_GB] -pykdeextensions: desktop-command-not-in-package ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop kcmshell -pykdeextensions: desktop-entry-invalid-category QT ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop -pykdeextensions: desktop-entry-invalid-category X-KDE-settings-system ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop -pykdeextensions: desktop-entry-lacks-main-category ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop -pykdeextensions: desktop-command-not-in-package ./usr/share/apps/pykdeextensions/app_templates/kdeapp/src/kdeapp.desktop $APPNAMELC$ -pykdeextensions: desktop-command-not-in-package ./usr/share/apps/pykdeextensions/app_templates/kdeutility/src/kdeutility.desktop $APPNAMELC$ - -pykdeextensions: executable-not-elf-or-script ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py -pykdeextensions: executable-not-elf-or-script ./usr/share/apps/pykdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py diff --git a/ubuntu/lucid_automake/libraries/pykdeextensions/debian/README.Debian b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/README.Debian index b0302c211..b0302c211 100644 --- a/ubuntu/lucid_automake/libraries/pykdeextensions/debian/README.Debian +++ b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/README.Debian diff --git a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/changelog b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/changelog index 6e632ec6b..9a5d57c27 100644 --- a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/changelog +++ b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/changelog @@ -1,23 +1,23 @@ -pykdeextensions-kde3 (0.4.0-6ubuntu6) karmic; urgency=low +pytdeextensions-kde3 (0.4.0-6ubuntu6) karmic; urgency=low * Karmic rebuild -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 02 July 2009 16:08:00 -0600 -pykdeextensions-kde3 (0.4.0-5ubuntu5) intrepid; urgency=low +pytdeextensions-kde3 (0.4.0-5ubuntu5) intrepid; urgency=low * Added -kde3 suffix -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Wed, 03 Dec 2008 21:38:00 -0600 -pykdeextensions (0.4.0-5ubuntu3) hardy; urgency=low +pytdeextensions (0.4.0-5ubuntu3) hardy; urgency=low * Re-add libpythoniz0 dependency on python-dev to work around libpythonize0 dlopening libpython2.5.so and not ...so.1 (LP: #179668) -- Scott Kitterman <scott@kitterman.com> Sat, 01 Mar 2008 11:15:08 -0500 -pykdeextensions (0.4.0-5ubuntu2) hardy; urgency=low +pytdeextensions (0.4.0-5ubuntu2) hardy; urgency=low * debian/control: - remove the python-all-dev dependency in libpythonize0 @@ -26,14 +26,14 @@ pykdeextensions (0.4.0-5ubuntu2) hardy; urgency=low -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 17 Dec 2007 12:38:49 +0100 -pykdeextensions (0.4.0-5ubuntu1) hardy; urgency=low +pytdeextensions (0.4.0-5ubuntu1) hardy; urgency=low * Merge with Debian, remaining changes: - libpythonize0 depends on python2.5-dev, it tries to load .so file -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 29 Nov 2007 17:59:47 +0000 -pykdeextensions (0.4.0-5) unstable; urgency=low +pytdeextensions (0.4.0-5) unstable; urgency=low * Add python-qt-dev build dependency. pyqtconfig moved from python-qt3 to python-qt-dev. (Closes: #439504) @@ -44,17 +44,17 @@ pykdeextensions (0.4.0-5) unstable; urgency=low * Remove *.py[co] files. * lintian cleanup: substvar-source-version-is-deprecated. Use ${binary:Version}. - * Make pykdeextensions package arch all. + * Make pytdeextensions package arch all. -- Fathi Boudra <fboudra@free.fr> Sun, 07 Oct 2007 12:06:15 +0200 -pykdeextensions (0.4.0-4ubuntu4) gutsy; urgency=low +pytdeextensions (0.4.0-4ubuntu4) gutsy; urgency=low * Fix depends to python2.5-dev -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 25 Sep 2007 18:48:45 +0100 -pykdeextensions (0.4.0-4ubuntu3) gutsy; urgency=low +pytdeextensions (0.4.0-4ubuntu3) gutsy; urgency=low * Add libpython2.5-dev as a depends for libpythonize0, it wants to load libpython2.5.so, reverts change from previous upload, LP: #84689, @@ -62,7 +62,7 @@ pykdeextensions (0.4.0-4ubuntu3) gutsy; urgency=low -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 25 Sep 2007 16:32:17 +0100 -pykdeextensions (0.4.0-4ubuntu2) gutsy; urgency=low +pytdeextensions (0.4.0-4ubuntu2) gutsy; urgency=low * Fix build failure, build-depend on python-qt-dev. * Use the unversioned python interpreter for scripts. @@ -71,14 +71,14 @@ pykdeextensions (0.4.0-4ubuntu2) gutsy; urgency=low -- Matthias Klose <doko@ubuntu.com> Wed, 29 Aug 2007 20:48:25 +0000 -pykdeextensions (0.4.0-4ubuntu1) gutsy; urgency=low +pytdeextensions (0.4.0-4ubuntu1) gutsy; urgency=low * Merge with Debian, remaining changes: - build on python 2.5 -- Jonathan Riddell <jriddell@ubuntu.com> Sun, 03 Jun 2007 13:51:42 +0100 -pykdeextensions (0.4.0-4) unstable; urgency=low +pytdeextensions (0.4.0-4) unstable; urgency=low * Update pyversions. Force to build with python2.4 only. (Closes: #424505) * Remove python-all-dev build dependency. Replaced by python-dev. @@ -86,7 +86,7 @@ pykdeextensions (0.4.0-4) unstable; urgency=low -- Fathi Boudra <fboudra@free.fr> Wed, 16 May 2007 11:02:06 +0200 -pykdeextensions (0.4.0-3ubuntu1) feisty; urgency=low +pytdeextensions (0.4.0-3ubuntu1) feisty; urgency=low * Force to build with python2.5. * FIXME: The package is unlikely to work with python2.4; maybe @@ -94,20 +94,20 @@ pykdeextensions (0.4.0-3ubuntu1) feisty; urgency=low -- Matthias Klose <doko@ubuntu.com> Sun, 14 Jan 2007 16:42:27 +0000 -pykdeextensions (0.4.0-3) unstable; urgency=low +pytdeextensions (0.4.0-3) unstable; urgency=low * Converted package to python-support * Added pycompat and pyversions * Force to use python2.4 (Closes: #375618) * Added to Build-Depends: python-support, python-all-dev, kdelibs4c2a (for kde-config) - * Updated libpythonize0-dev, libpythonize0, and pykdextensions install files + * Updated libpythonize0-dev, libpythonize0, and pytdextensions install files * Cleaned up rules * Added 12_force_python2.4_script.diff to force python2.4 in scripts -- Fathi Boudra <fboudra@free.fr> Thu, 29 Jun 2006 15:41:39 +0200 -pykdeextensions (0.4.0-2) unstable; urgency=low +pytdeextensions (0.4.0-2) unstable; urgency=low * Converted package to cdbs * Added 2 patches (thanks to Jonathan Riddell) @@ -118,7 +118,7 @@ pykdeextensions (0.4.0-2) unstable; urgency=low -- Fathi Boudra <fboudra@free.fr> Tue, 6 Jun 2006 08:56:40 +0200 -pykdeextensions (0.4.0-1) unstable; urgency=low +pytdeextensions (0.4.0-1) unstable; urgency=low [ Fathi Boudra ] * Initial Debian release Closes: #340141 diff --git a/ubuntu/lucid_automake/libraries/pykdeextensions/debian/compat b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/compat index 7ed6ff82d..7ed6ff82d 100644 --- a/ubuntu/lucid_automake/libraries/pykdeextensions/debian/compat +++ b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/compat diff --git a/ubuntu/lucid_automake/libraries/pykdeextensions/debian/control b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/control index 9adc365d1..14412fec1 100644 --- a/ubuntu/lucid_automake/libraries/pykdeextensions/debian/control +++ b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/control @@ -1,4 +1,4 @@ -Source: pykdeextensions-kde3 +Source: pytdeextensions-kde3 Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> @@ -8,16 +8,16 @@ Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, kdelibs4c2a-kde3, libtool python-qt-dev, python-sip4-dev, python-support (>= 0.6), python (>= 2.5), python-dev (>= 2.5) Standards-Version: 3.8.3 -Package: pykdeextensions-kde3 +Package: pytdeextensions-kde3 Architecture: all Depends: ${python:Depends} -Conflicts: pykdeextensions +Conflicts: pytdeextensions Provides: ${python:Provides} Description: Python packages to support KDE applications (scripts) [KDE3] PyKDE Extensions is a collection of software and Python packages to support the creation and installation of KDE applications. . - Homepage: http://www.simonzone.com/software/pykdeextensions + Homepage: http://www.simonzone.com/software/pytdeextensions Package: libpythonize0-kde3-dev Architecture: any @@ -29,7 +29,7 @@ Description: Python packages to support KDE applications (development) [KDE3] . This package contains the libpythonize development files. . - Homepage: http://www.simonzone.com/software/pykdeextensions + Homepage: http://www.simonzone.com/software/pytdeextensions Package: libpythonize0-kde3 Architecture: any @@ -42,4 +42,4 @@ Description: Python packages to support KDE applications (library) [KDE3] . This package contains the libpythonize library files. . - Homepage: http://www.simonzone.com/software/pykdeextensions + Homepage: http://www.simonzone.com/software/pytdeextensions diff --git a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/copyright b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/copyright index a90a21587..9ed7bf6cd 100644 --- a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/copyright +++ b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/copyright @@ -1,9 +1,9 @@ This package was debianized by Fathi Boudra <fboudra@free.fr> on Wed, 27 Jul 2005 20:19:26 +0200. -It was downloaded from <http://www.simonzone.com/software/pykdeextensions> +It was downloaded from <http://www.simonzone.com/software/pytdeextensions> -Application templates and pykde helper modules copyright: +Application templates and pytde helper modules copyright: Simon Edwards <simon@simonzone.com> License: diff --git a/ubuntu/lucid_automake/libraries/pykdeextensions/debian/docs b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/docs index e845566c0..e845566c0 100644 --- a/ubuntu/lucid_automake/libraries/pykdeextensions/debian/docs +++ b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/docs diff --git a/ubuntu/lucid_automake/libraries/pykdeextensions/debian/libpythonize0-kde3-dev.install b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/libpythonize0-kde3-dev.install index fa6727d83..fa6727d83 100644 --- a/ubuntu/lucid_automake/libraries/pykdeextensions/debian/libpythonize0-kde3-dev.install +++ b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/libpythonize0-kde3-dev.install diff --git a/ubuntu/lucid_automake/libraries/pykdeextensions/debian/libpythonize0-kde3.install b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/libpythonize0-kde3.install index 774c4fddf..774c4fddf 100644 --- a/ubuntu/lucid_automake/libraries/pykdeextensions/debian/libpythonize0-kde3.install +++ b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/libpythonize0-kde3.install diff --git a/ubuntu/lucid_automake/libraries/pykdeextensions/debian/patches/.gitignore b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/patches/.gitignore index e69de29bb..e69de29bb 100644 --- a/ubuntu/lucid_automake/libraries/pykdeextensions/debian/patches/.gitignore +++ b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/patches/.gitignore diff --git a/ubuntu/lucid_automake/libraries/pykdeextensions/debian/pycompat b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/pycompat index 0cfbf0888..0cfbf0888 100644 --- a/ubuntu/lucid_automake/libraries/pykdeextensions/debian/pycompat +++ b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/pycompat diff --git a/ubuntu/lucid_automake/libraries/pytdeextensions/debian/pytdeextensions-kde3.install b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/pytdeextensions-kde3.install new file mode 100644 index 000000000..60b8f3085 --- /dev/null +++ b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/pytdeextensions-kde3.install @@ -0,0 +1,7 @@ +usr/lib/python*/dist-packages +opt/kde3/share/apps/pytdeextensions/AUTHORS +opt/kde3/share/apps/pytdeextensions/ChangeLog +opt/kde3/share/apps/pytdeextensions/INSTALL +opt/kde3/share/apps/pytdeextensions/NEWS +opt/kde3/share/apps/pytdeextensions/app_templates +opt/kde3/share/doc/kde/HTML/en/pytdeextensions diff --git a/ubuntu/lucid_automake/libraries/pytdeextensions/debian/pytdeextensions-kde3.lintian-overrides b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/pytdeextensions-kde3.lintian-overrides new file mode 100644 index 000000000..3b34d51a5 --- /dev/null +++ b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/pytdeextensions-kde3.lintian-overrides @@ -0,0 +1,10 @@ +pytdeextensions: desktop-entry-contains-unknown-key ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop:4 name[en_GB] +pytdeextensions: desktop-command-not-in-package ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop kcmshell +pytdeextensions: desktop-entry-invalid-category QT ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop +pytdeextensions: desktop-entry-invalid-category X-KDE-settings-system ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop +pytdeextensions: desktop-entry-lacks-main-category ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop +pytdeextensions: desktop-command-not-in-package ./usr/share/apps/pytdeextensions/app_templates/kdeapp/src/kdeapp.desktop $APPNAMELC$ +pytdeextensions: desktop-command-not-in-package ./usr/share/apps/pytdeextensions/app_templates/kdeutility/src/kdeutility.desktop $APPNAMELC$ + +pytdeextensions: executable-not-elf-or-script ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py +pytdeextensions: executable-not-elf-or-script ./usr/share/apps/pytdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py diff --git a/ubuntu/lucid_automake/libraries/pykdeextensions/debian/python-distutils-jaunty.mk b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/python-distutils-jaunty.mk index 63fce07d5..63fce07d5 100644 --- a/ubuntu/lucid_automake/libraries/pykdeextensions/debian/python-distutils-jaunty.mk +++ b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/python-distutils-jaunty.mk diff --git a/ubuntu/lucid_automake/libraries/pykdeextensions/debian/pyversions b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/pyversions index b3dc41ebc..b3dc41ebc 100644 --- a/ubuntu/lucid_automake/libraries/pykdeextensions/debian/pyversions +++ b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/pyversions diff --git a/ubuntu/lucid_automake/libraries/pykdeextensions/debian/rules b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/rules index 38e8bfc86..f6a1d85e6 100755 --- a/ubuntu/lucid_automake/libraries/pykdeextensions/debian/rules +++ b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/rules @@ -18,14 +18,14 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde -install/pykdeextensions-kde3:: +install/pytdeextensions-kde3:: # We have no idea if the built product is site-packages or dist-packages cd debian/tmp/usr/lib/python*/ && mv site-packages/ dist-packages/ || echo "site-packages --> dist-packages" rm -rf debian/tmp/usr/lib/python*/site-packages/ # install lintian overrides - install -D -p -m0644 debian/pykdeextensions-kde3.lintian-overrides \ - debian/pykdeextensions-kde3/usr/share/lintian/overrides/pykdeextensions-kde3 + install -D -p -m0644 debian/pytdeextensions-kde3.lintian-overrides \ + debian/pytdeextensions-kde3/usr/share/lintian/overrides/pytdeextensions-kde3 # fix script-not-executable find debian -type f -name '*.py' | xargs chmod 0755 diff --git a/ubuntu/lucid_automake/libraries/python-kde3/debian/changelog b/ubuntu/lucid_automake/libraries/python-kde3/debian/changelog index 948b079e2..afeaa1689 100644 --- a/ubuntu/lucid_automake/libraries/python-kde3/debian/changelog +++ b/ubuntu/lucid_automake/libraries/python-kde3/debian/changelog @@ -320,7 +320,7 @@ python-kde3 (3.11.3+20050829-1) unstable; urgency=low * Added the homepage of PyKDE to the package descriptions * HTML documentations is now installed into /usr/share/doc/python-kde3-doc/html - * pykdeconfig.py now also knows that the sip files + * pytdeconfig.py now also knows that the sip files are in /usr/share/sip/kde3, not in /usr/share/sip/kde (Closes: #312708) diff --git a/ubuntu/lucid_automake/libraries/python-kde3/debian/control b/ubuntu/lucid_automake/libraries/python-kde3/debian/control index 617cc9a1b..da397514b 100644 --- a/ubuntu/lucid_automake/libraries/python-kde3/debian/control +++ b/ubuntu/lucid_automake/libraries/python-kde3/debian/control @@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Ricardo Javier Cardenes Medina <rcardenes@debian.org> Uploaders: Torsten Marek <shlomme@debian.org>, Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> Build-Depends: debhelper (>= 5.0.38), libqt3-mt-dev (>= 3:3.3.7), qt3-dev-tools (>= 3:3.3.7), qt3-apps-dev (>= 3:3.3.7), python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-qt-dev (>= 3.18), kdelibs4-kde3-dev, python-central (>= 0.6.11), dpatch, python-sip4, python-sip4-dbg, python-sip4-dev Standards-Version: 3.8.3 -Homepage: http://www.riverbankcomputing.co.uk/pykde/index.php +Homepage: http://www.riverbankcomputing.co.uk/pytde/index.php XS-Python-Version: all Package: python-kde3-kde3 diff --git a/ubuntu/maverick_automake/libraries/python-kde3/debian/pykdeconfig.py b/ubuntu/lucid_automake/libraries/python-kde3/debian/pytdeconfig.py index b6c29318e..baab0b1cf 100644 --- a/ubuntu/maverick_automake/libraries/python-kde3/debian/pykdeconfig.py +++ b/ubuntu/lucid_automake/libraries/python-kde3/debian/pytdeconfig.py @@ -4,8 +4,8 @@ import sys if getattr(sys, "pydebug", False): try: - from pykdeconfig_d import * + from pytdeconfig_d import * except ImportError, msg: - raise ImportError, 'No module named pykdeconfig; package python-kde3-dbg not installed' + raise ImportError, 'No module named pytdeconfig; package python-kde3-dbg not installed' else: - from pykdeconfig_nd import * + from pytdeconfig_nd import * diff --git a/ubuntu/lucid_automake/libraries/python-kde3/debian/rules b/ubuntu/lucid_automake/libraries/python-kde3/debian/rules index bc3dd4991..553c08f56 100755 --- a/ubuntu/lucid_automake/libraries/python-kde3/debian/rules +++ b/ubuntu/lucid_automake/libraries/python-kde3/debian/rules @@ -93,12 +93,12 @@ install-indep: for version in ${PYTHONS};\ do\ mkdir -p debian/python-kde3-kde3-dev/opt/kde3/lib/python-$$version/site-packages;\ - cp debian/pykdeconfig.py debian/python-kde3-kde3-dev/opt/kde3/lib/python-$$version/site-packages/;\ - cp build-$$version/pykdeconfig.py debian/python-kde3-kde3-dev/opt/kde3/lib/python-$$version/site-packages/pykdeconfig_nd.py;\ + cp debian/pytdeconfig.py debian/python-kde3-kde3-dev/opt/kde3/lib/python-$$version/site-packages/;\ + cp build-$$version/pytdeconfig.py debian/python-kde3-kde3-dev/opt/kde3/lib/python-$$version/site-packages/pytdeconfig_nd.py;\ done for version in ${DBG_PYTHONS};\ do\ - cp dbg-build-$$version/pykdeconfig.py debian/python-kde3-kde3-dev/opt/kde3/lib/python-$$version/site-packages/pykdeconfig_d.py;\ + cp dbg-build-$$version/pytdeconfig.py debian/python-kde3-kde3-dev/opt/kde3/lib/python-$$version/site-packages/pytdeconfig_d.py;\ done install-arch: diff --git a/ubuntu/maverick/applications/kdmtheme/debian/cdbs/buildvars.mk b/ubuntu/maverick/applications/abakus/debian/cdbs/buildvars.mk index 23d4709dc..23d4709dc 100644 --- a/ubuntu/maverick/applications/kdmtheme/debian/cdbs/buildvars.mk +++ b/ubuntu/maverick/applications/abakus/debian/cdbs/buildvars.mk diff --git a/ubuntu/maverick/applications/abakus/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/abakus/debian/cdbs/debian-qt-kde.mk new file mode 100644 index 000000000..856fa4932 --- /dev/null +++ b/ubuntu/maverick/applications/abakus/debian/cdbs/debian-qt-kde.mk @@ -0,0 +1,110 @@ +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: + touch debian/stamp-cvs-make + +include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) +include debian/cdbs/uploaders.mk + +DEB_PATCHDIRS := debian/patches/common debian/patches + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \ + done + +clean:: + rm -f debian/stamp-cvs-make + +endif + +#common-build-indep:: debian/stamp-kde-apidox +#debian/stamp-kde-apidox: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) +# touch $@ +# +#common-install-indep:: common-install-kde-apidox +#common-install-kde-apidox:: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) +# +#clean:: +# rm -f debian/stamp-kde-apidox diff --git a/ubuntu/maverick/applications/abakus/debian/cdbs/kde.mk b/ubuntu/maverick/applications/abakus/debian/cdbs/kde.mk new file mode 100644 index 000000000..9dbcfbafd --- /dev/null +++ b/ubuntu/maverick/applications/abakus/debian/cdbs/kde.mk @@ -0,0 +1,97 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Description: A class for KDE packages; sets KDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class + +ifndef _cdbs_class_kde +_cdbs_class_kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +# include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/kde/HTML + +ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/" +DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +common-build-arch common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-prehook-impl:: + mkdir -p po + -XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages + -for file in po/*pot; do \ + sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \ + done + +common-install-arch common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + +clean:: + rm -f debian/stamp-kde-apidox + rm -rf po/*.pot + +# This is a convenience target for calling manually. It's not part of +# the build process. +buildprep: clean apply-patches + $(MAKE) -f admin/Makefile.common dist + debian/rules clean + +endif diff --git a/ubuntu/maverick/applications/kdmtheme/debian/cdbs/team-members b/ubuntu/maverick/applications/abakus/debian/cdbs/team-members index 05761af6e..05761af6e 100644 --- a/ubuntu/maverick/applications/kdmtheme/debian/cdbs/team-members +++ b/ubuntu/maverick/applications/abakus/debian/cdbs/team-members diff --git a/ubuntu/maverick/applications/kdmtheme/debian/cdbs/uploaders.mk b/ubuntu/maverick/applications/abakus/debian/cdbs/uploaders.mk index 31adfe31e..31adfe31e 100644 --- a/ubuntu/maverick/applications/kdmtheme/debian/cdbs/uploaders.mk +++ b/ubuntu/maverick/applications/abakus/debian/cdbs/uploaders.mk diff --git a/ubuntu/maverick/applications/kdmtheme/debian/cdbs/versions.pl b/ubuntu/maverick/applications/abakus/debian/cdbs/versions.pl index 9ce11d8a3..9ce11d8a3 100644 --- a/ubuntu/maverick/applications/kdmtheme/debian/cdbs/versions.pl +++ b/ubuntu/maverick/applications/abakus/debian/cdbs/versions.pl diff --git a/ubuntu/maverick/applications/abakus/debian/control b/ubuntu/maverick/applications/abakus/debian/control index 4f6f51257..5aebafb8b 100644 --- a/ubuntu/maverick/applications/abakus/debian/control +++ b/ubuntu/maverick/applications/abakus/debian/control @@ -3,14 +3,14 @@ Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Steffen Joeris <steffen.joeris@skolelinux.de> -Build-Depends: autotools-dev, debhelper (>= 4.1.0), cdbs (>= 0.4.0), scons (>= 0.96), imagemagick, tdelibs4-trinity-dev, chrpath, bison, flex +Build-Depends: autotools-dev, debhelper (>= 4.1.0), cdbs (>= 0.4.0), cmake, imagemagick, tdelibs4-trinity-dev, chrpath, bison, flex Standards-Version: 3.8.4 Package: abakus-trinity Architecture: any Depends: ${shlibs:Depends} -Replaces: abakus-kde3 (<< 4:3.5.13) -Breaks: abakus-kde3 (<< 4:3.5.13) +Replaces: abakus-trinity (<< 4:14.0.0) +Breaks: abakus-trinity (<< 4:14.0.0) Description: calculator for KDE [Trinity] AbaKus is a complex calculator, which provides many different kinds of calculations. diff --git a/ubuntu/maverick/applications/abakus/debian/control.in b/ubuntu/maverick/applications/abakus/debian/control.in new file mode 100644 index 000000000..3b8ff361e --- /dev/null +++ b/ubuntu/maverick/applications/abakus/debian/control.in @@ -0,0 +1,22 @@ +Source: abakus-trinity +Section: kde +Priority: optional +Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +XSBC-Original-Maintainer: @@@MAINTAINER@@@ +Uploaders: @@@UPLOADERS@@@ +Build-Depends: autotools-dev, debhelper (>= 4.1.0), cdbs (>= 0.4.0), cmake, imagemagick, tdelibs4-trinity-dev, chrpath, bison, flex +Standards-Version: 3.8.4 + +Package: abakus-trinity +Architecture: any +Depends: ${shlibs:Depends} +Replaces: abakus-kde3 (<< 4:3.5.13) +Breaks: abakus-kde3 (<< 4:3.5.13) +Description: calculator for KDE [Trinity] + AbaKus is a complex calculator, which provides + many different kinds of calculations. + Think of it as bc (the command-line calculator) with a nice GUI. + It also gives information about mathematical variables and + has the user-friendly menu options of a normal KDE application. + . + Web site: http://grammarian.homelinux.net/abakus/ diff --git a/ubuntu/maverick/applications/abakus/debian/rules b/ubuntu/maverick/applications/abakus/debian/rules index b434be427..10ec1e1b3 100755 --- a/ubuntu/maverick/applications/abakus/debian/rules +++ b/ubuntu/maverick/applications/abakus/debian/rules @@ -1,41 +1,39 @@ #!/usr/bin/make -f +# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function +# Also include the main Trinity path +ifeq ("$(LD_LIBRARY_PATH)", "") +LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib +else +LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib +endif +export LD_LIBRARY_PATH + include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/langcore.mk +include /usr/share/cdbs/1/class/cmake.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk +include debian/cdbs/debian-qt-kde.mk + +DEB_KDE_APIDOX := yes -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info +CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG) -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +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" -SCONS = scons --no-cache -Q -DEB_INSTALL_DOCS_ALL = -DEB_COMPRESS_EXCLUDE = .docbook +# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to +# never build in parallel, regardless of DEB_BUILD_OPTIONS. +DEB_BUILD_PARALLEL = true -debian/abakus.xpm: src/hi64-app-abakus.png +debian/abakus.xpm: icons/hi64-app-abakus.png convert -resize 32 $< $@ -common-build-arch:: build-stamp -build-stamp: debian/abakus.xpm - env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde DESTDIR=$(DEB_DESTDIR)/opt/trinity $(SCONS) configure prefix=/opt/trinity - env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde DESTDIR=$(DEB_DESTDIR)/opt/trinity $(SCONS) - touch build-stamp +common-build-arch:: debian/abakus.xpm common-install-arch:: - env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde DESTDIR=$(DEB_DESTDIR)/opt/trinity $(SCONS) install install -D -m 644 debian/abakus.xpm debian/abakus-trinity/opt/trinity/share/pixmaps/abakus.xpm chrpath -d debian/abakus-trinity/opt/trinity/bin/abakus dh_icons -pabakus clean:: - #env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde DESTDIR=$(DEB_DESTDIR)/opt/trinity $(SCONS) --clean rm -f debian/abakus.xpm - rm -rf cache - rm -rf .sconf_temp - rm -f bksys/generic.pyc - rm -f bksys/abakus.pyc - rm -f bksys/help.pyc - rm -f bksys/kde.pyc - rm -f config.log diff --git a/ubuntu/maverick/applications/abakus/debian/source/format b/ubuntu/maverick/applications/abakus/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/abakus/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/abakus/debian/source/options b/ubuntu/maverick/applications/abakus/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/abakus/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/adept/debian/control b/ubuntu/maverick/applications/adept/debian/control index f14bf6ffd..8e2160fb7 100644 --- a/ubuntu/maverick/applications/adept/debian/control +++ b/ubuntu/maverick/applications/adept/debian/control @@ -10,8 +10,8 @@ Standards-Version: 3.8.4 Package: adept-trinity Section: kde Depends: adept-manager-trinity, adept-installer-trinity, adept-updater-trinity, adept-notifier-trinity, adept-batch-trinity -Replaces: adept-kde3 (<< 4:3.5.13) -Breaks: adept-kde3 (<< 4:3.5.13) +Replaces: adept-trinity (<< 4:14.0.0) +Breaks: adept-trinity (<< 4:14.0.0) Architecture: all Description: package management suite for Trinity These packages belong to the adept suite: @@ -23,8 +23,8 @@ Description: package management suite for Trinity Package: adept-common-trinity Section: kde Depends: debtags (>= 1.6.1), konsole-trinity (>= 3.5.0), ${shlibs:Depends} -Replaces: adept-common-kde3 (<< 4:3.5.13) -Breaks: adept-common-kde3 (<< 4:3.5.13) +Replaces: adept-common-trinity (<< 4:14.0.0) +Breaks: adept-common-trinity (<< 4:14.0.0) Architecture: all Description: package manager for Trinity -- common files Icons and other common files for all adept components. @@ -32,9 +32,9 @@ Description: package manager for Trinity -- common files Package: adept-manager-trinity Section: kde Depends: adept-common-trinity, ${shlibs:Depends} -Replaces: adept-manager-kde3 (<< 4:3.5.13) -Breaks: adept-manager-kde3 (<< 4:3.5.13) -Recommends: libqt-perl +Replaces: adept-manager-trinity (<< 4:14.0.0) +Breaks: adept-manager-trinity (<< 4:14.0.0) +Recommends: libtqt-perl Architecture: any Description: package manager for Trinity Adept Manager is a graphical user interface for package management. @@ -45,15 +45,15 @@ Description: package manager for Trinity * Edit the list of used repositories (sources.list) * Configure packages through the debconf system . - Please also install libqt-perl if you want the KDE Debconf frontend + Please also install libtqt-perl if you want the KDE Debconf frontend to function. Package: adept-installer-trinity Section: kde Depends: adept-common-trinity, app-install-data, ${shlibs:Depends} -Replaces: adept-installer-kde3 (<< 4:3.5.13) -Breaks: adept-installer-kde3 (<< 4:3.5.13) -Recommends: libqt-perl +Replaces: adept-installer-trinity (<< 4:14.0.0) +Breaks: adept-installer-trinity (<< 4:14.0.0) +Recommends: libtqt-perl Architecture: any Description: simple user interface for application management (for Trinity) Adept Installer presents a list of applications available through the @@ -61,28 +61,28 @@ Description: simple user interface for application management (for Trinity) that contains a .desktop file for use with KDE, GNOME or other desktop environment. . - Please also install libqt-perl if you want the KDE Debconf frontend + Please also install libtqt-perl if you want the KDE Debconf frontend to function. Package: adept-updater-trinity Section: kde Depends: adept-common-trinity, ${shlibs:Depends} -Replaces: adept-updater-kde3 (<< 4:3.5.13) -Breaks: adept-updater-kde3 (<< 4:3.5.13) -Recommends: libqt-perl +Replaces: adept-updater-trinity (<< 4:14.0.0) +Breaks: adept-updater-trinity (<< 4:14.0.0) +Recommends: libtqt-perl Architecture: any Description: system update tool for Trinity Adept Updater provides a simple wizard-style user interface to system upgrades. It uses same algorithms as apt-get dist-upgrade. . - Please also install libqt-perl if you want the KDE Debconf frontend + Please also install libtqt-perl if you want the KDE Debconf frontend to function. Package: adept-notifier-trinity Section: kde Depends: ${shlibs:Depends}, adept-updater-trinity, update-notifier-common -Replaces: adept-notifier-kde3 (<< 4:3.5.13) -Breaks: adept-notifier-kde3 (<< 4:3.5.13) +Replaces: adept-notifier-trinity (<< 4:14.0.0) +Breaks: adept-notifier-trinity (<< 4:14.0.0) Architecture: any Description: system tray notifier of available system updates Adept Notifier provides a system tray icon notifying the user of @@ -92,8 +92,8 @@ Description: system tray notifier of available system updates Package: adept-batch-trinity Section: kde Depends: ${shlibs:Depends}, adept-manager-trinity -Replaces: adept-batch-kde3 (<< 4:3.5.13) -Breaks: adept-batch-kde3 (<< 4:3.5.13) +Replaces: adept-batch-trinity (<< 4:14.0.0) +Breaks: adept-batch-trinity (<< 4:14.0.0) Architecture: any Description: command line install for Adept Adept Batch lets you install packages with Adept from the diff --git a/ubuntu/maverick/applications/adept/debian/control.in b/ubuntu/maverick/applications/adept/debian/control.in index a313fdbae..d272f82b2 100644 --- a/ubuntu/maverick/applications/adept/debian/control.in +++ b/ubuntu/maverick/applications/adept/debian/control.in @@ -28,7 +28,7 @@ Description: package manager for Trinity -- common files Package: adept-manager-trinity Section: kde Depends: adept-common-trinity, ${shlibs:Depends} -Recommends: libqt-perl +Recommends: libtqt-perl Architecture: any Description: package manager for Trinity Adept Manager is a graphical user interface for package management. @@ -39,13 +39,13 @@ Description: package manager for Trinity * Edit the list of used repositories (sources.list) * Configure packages through the debconf system . - Please also install libqt-perl if you want the KDE Debconf frontend + Please also install libtqt-perl if you want the KDE Debconf frontend to function. Package: adept-installer-trinity Section: kde Depends: adept-common-trinity, app-install-data, ${shlibs:Depends} -Recommends: libqt-perl +Recommends: libtqt-perl Architecture: any Description: simple user interface for application management (for Trinity) Adept Installer presents a list of applications available through the @@ -53,19 +53,19 @@ Description: simple user interface for application management (for Trinity) that contains a .desktop file for use with KDE, GNOME or other desktop environment. . - Please also install libqt-perl if you want the KDE Debconf frontend + Please also install libtqt-perl if you want the KDE Debconf frontend to function. Package: adept-updater-trinity Section: kde Depends: adept-common-trinity, ${shlibs:Depends} -Recommends: libqt-perl +Recommends: libtqt-perl Architecture: any Description: system update tool for Trinity Adept Updater provides a simple wizard-style user interface to system upgrades. It uses same algorithms as apt-get dist-upgrade. . - Please also install libqt-perl if you want the KDE Debconf frontend + Please also install libtqt-perl if you want the KDE Debconf frontend to function. Package: adept-notifier-trinity diff --git a/ubuntu/maverick/applications/adept/debian/source/format b/ubuntu/maverick/applications/adept/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/adept/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/adept/debian/source/options b/ubuntu/maverick/applications/adept/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/adept/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/control b/ubuntu/maverick/applications/amarok.cmake/debian/control index def456393..a07b416a8 100644 --- a/ubuntu/maverick/applications/amarok.cmake/debian/control +++ b/ubuntu/maverick/applications/amarok.cmake/debian/control @@ -19,10 +19,10 @@ Homepage: http://amarok.kde.org Package: amarok-trinity Architecture: any Depends: amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engine-yauap-trinity (= ${binary:Version}), unzip, ${shlibs:Depends} -Replaces: amarok-kde3 (<< 4:3.5.13) -Breaks: amarok-kde3 (<< 4:3.5.13) +Replaces: amarok-trinity (<< 4:14.0.0) +Breaks: amarok-trinity (<< 4:14.0.0) Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser, - python, python-qt3, libqt0-ruby1.8, libvisual-0.4-plugins + python, python-qt3, libqt0-ruby1.8-trinity, libvisual-0.4-plugins Description: versatile and easy to use audio player for Trinity Amarok tries to be a little different, providing a simple drag and drop interface that really makes playlist handling easy. @@ -49,10 +49,10 @@ Description: versatile and easy to use audio player for Trinity Package: amarok-common-trinity Architecture: all Depends: ruby -Replaces: amarok-common-kde3 (<< 4:3.5.13) -Breaks: amarok-common-kde3 (<< 4:3.5.13) +Replaces: amarok-common-trinity (<< 4:14.0.0) +Breaks: amarok-common-trinity (<< 4:14.0.0) Recommends: amarok-trinity (>= ${source:Version}) -Suggests: libqt0-ruby1.8, python, python-qt3 +Suggests: libqt0-ruby1.8-trinity, python, python-qt3 Description: architecture independent files for Amarok [Trinity] This package contains architecture independent files needed for Amarok to run properly. It also provides Amarok documentation. Therefore, unless you have @@ -65,8 +65,8 @@ Description: architecture independent files for Amarok [Trinity] Package: amarok-engines-trinity Architecture: all Depends: amarok-engine-xine-trinity (>= ${source:Version}), amarok-engine-yauap-trinity (>= ${source:Version}) -Replaces: amarok-engines-kde3 (<< 4:3.5.13) -Breaks: amarok-engines-kde3 (<< 4:3.5.13) +Replaces: amarok-engines-trinity (<< 4:14.0.0) +Breaks: amarok-engines-trinity (<< 4:14.0.0) Description: output engines for the Amarok music player [Trinity] This package serves merely as a reference point if you want to install all available Amarok engines. It depends on those Amarok engines that @@ -76,8 +76,8 @@ Description: output engines for the Amarok music player [Trinity] Package: amarok-engine-xine-trinity Architecture: any Depends: ${shlibs:Depends} -Replaces: amarok-engine-xine-kde3 (<< 4:3.5.13) -Breaks: amarok-engine-xine-kde3 (<< 4:3.5.13) +Replaces: amarok-engine-xine-trinity (<< 4:14.0.0) +Breaks: amarok-engine-xine-trinity (<< 4:14.0.0) Recommends: amarok-trinity (= ${binary:Version}) Description: xine engine for the Amarok audio player [Trinity] This package provides the xine engine for Amarok, which you may prefer @@ -87,8 +87,8 @@ Description: xine engine for the Amarok audio player [Trinity] Package: amarok-engine-yauap-trinity Architecture: any Depends: yauap, ${shlibs:Depends} -Replaces: amarok-engine-yauap-kde3 (<< 4:3.5.13) -Breaks: amarok-engine-yauap-kde3 (<< 4:3.5.13) +Replaces: amarok-engine-yauap-trinity (<< 4:14.0.0) +Breaks: amarok-engine-yauap-trinity (<< 4:14.0.0) Recommends: amarok-trinity (= ${binary:Version}) Description: Yauap engine for the Amarok audio player [Trinity] This package includes Amarok yauap engine, which provides a frontend @@ -99,8 +99,8 @@ Description: Yauap engine for the Amarok audio player [Trinity] Package: amarok-trinity-dbg Priority: extra Architecture: any -Replaces: amarok-kde3-dbg (<< 4:3.5.13) -Breaks: amarok-kde3-dbg (<< 4:3.5.13) +Replaces: amarok-trinity-dbg (<< 4:14.0.0) +Breaks: amarok-trinity-dbg (<< 4:14.0.0) Depends: amarok-trinity (= ${binary:Version}) Recommends: tdelibs-trinity-dbg Description: debugging symbols for Amarok [Trinity] diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/source/format b/ubuntu/maverick/applications/amarok.cmake/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/amarok.cmake/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/source/options b/ubuntu/maverick/applications/amarok.cmake/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/amarok.cmake/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/amarok/debian/control b/ubuntu/maverick/applications/amarok/debian/control index 0b36962a8..715ec98c4 100644 --- a/ubuntu/maverick/applications/amarok/debian/control +++ b/ubuntu/maverick/applications/amarok/debian/control @@ -19,10 +19,10 @@ Homepage: http://amarok.kde.org Package: amarok-trinity Architecture: any Depends: amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engine-yauap-trinity (= ${binary:Version}), unzip, ${shlibs:Depends} -Replaces: amarok-kde3 (<< 4:3.5.13) -Breaks: amarok-kde3 (<< 4:3.5.13) +Replaces: amarok-trinity (<< 4:14.0.0) +Breaks: amarok-trinity (<< 4:14.0.0) Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser, - python, python-qt3, libqt0-ruby1.8, libvisual-0.4-plugins + python, python-qt3, libqt0-ruby1.8-trinity, libvisual-0.4-plugins Description: versatile and easy to use audio player for Trinity Amarok tries to be a little different, providing a simple drag and drop interface that really makes playlist handling easy. @@ -49,10 +49,10 @@ Description: versatile and easy to use audio player for Trinity Package: amarok-common-trinity Architecture: all Depends: ruby -Replaces: amarok-common-kde3 (<< 4:3.5.13) -Breaks: amarok-common-kde3 (<< 4:3.5.13) +Replaces: amarok-common-trinity (<< 4:14.0.0) +Breaks: amarok-common-trinity (<< 4:14.0.0) Recommends: amarok-trinity (>= ${source:Version}) -Suggests: libqt0-ruby1.8, python, python-qt3 +Suggests: libqt0-ruby1.8-trinity, python, python-qt3 Description: architecture independent files for Amarok [Trinity] This package contains architecture independent files needed for Amarok to run properly. It also provides Amarok documentation. Therefore, unless you have @@ -65,8 +65,8 @@ Description: architecture independent files for Amarok [Trinity] Package: amarok-engines-trinity Architecture: all Depends: amarok-engine-xine-trinity (>= ${source:Version}), amarok-engine-yauap-trinity (>= ${source:Version}) -Replaces: amarok-engines-kde3 (<< 4:3.5.13) -Breaks: amarok-engines-kde3 (<< 4:3.5.13) +Replaces: amarok-engines-trinity (<< 4:14.0.0) +Breaks: amarok-engines-trinity (<< 4:14.0.0) Description: output engines for the Amarok music player [Trinity] This package serves merely as a reference point if you want to install all available Amarok engines. It depends on those Amarok engines that @@ -76,8 +76,8 @@ Description: output engines for the Amarok music player [Trinity] Package: amarok-engine-xine-trinity Architecture: any Depends: ${shlibs:Depends} -Replaces: amarok-engine-xine-kde3 (<< 4:3.5.13) -Breaks: amarok-engine-xine-kde3 (<< 4:3.5.13) +Replaces: amarok-engine-xine-trinity (<< 4:14.0.0) +Breaks: amarok-engine-xine-trinity (<< 4:14.0.0) Recommends: amarok-trinity (= ${binary:Version}) Description: xine engine for the Amarok audio player [Trinity] This package provides the xine engine for Amarok, which you may prefer @@ -87,8 +87,8 @@ Description: xine engine for the Amarok audio player [Trinity] Package: amarok-engine-yauap-trinity Architecture: any Depends: yauap, ${shlibs:Depends} -Replaces: amarok-engine-yauap-kde3 (<< 4:3.5.13) -Breaks: amarok-engine-yauap-kde3 (<< 4:3.5.13) +Replaces: amarok-engine-yauap-trinity (<< 4:14.0.0) +Breaks: amarok-engine-yauap-trinity (<< 4:14.0.0) Recommends: amarok-trinity (= ${binary:Version}) Description: Yauap engine for the Amarok audio player [Trinity] This package includes Amarok yauap engine, which provides a frontend @@ -99,8 +99,8 @@ Description: Yauap engine for the Amarok audio player [Trinity] Package: amarok-trinity-dbg Priority: extra Architecture: any -Replaces: amarok-kde3-dbg (<< 4:3.5.13) -Breaks: amarok-kde3-dbg (<< 4:3.5.13) +Replaces: amarok-trinity-dbg (<< 4:14.0.0) +Breaks: amarok-trinity-dbg (<< 4:14.0.0) Depends: amarok-trinity (= ${binary:Version}) Recommends: tdelibs-trinity-dbg Description: debugging symbols for Amarok [Trinity] diff --git a/ubuntu/maverick/applications/amarok/debian/source/format b/ubuntu/maverick/applications/amarok/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/amarok/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/amarok/debian/source/options b/ubuntu/maverick/applications/amarok/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/amarok/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/basket/debian/control b/ubuntu/maverick/applications/basket/debian/control index 45319008f..0f23477d8 100644 --- a/ubuntu/maverick/applications/basket/debian/control +++ b/ubuntu/maverick/applications/basket/debian/control @@ -10,9 +10,9 @@ Standards-Version: 3.8.4 Package: basket-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: basket-trinity (<< 4:14.0.0) +Breaks: basket-trinity (<< 4:14.0.0) Recommends: basket-kontact-integration-trinity -Replaces: basket-kde3 (<< 4:3.5.13) -Breaks: basket-kde3 (<< 4:3.5.13) Description: a multi-purpose note-taking application for TDE [Trinity] This application provides as many baskets (drawers) as you wish; Several kinds of objects (texts, URLs, images,...) can be drag-n-drop'd into it. @@ -26,8 +26,8 @@ Description: a multi-purpose note-taking application for TDE [Trinity] Package: basket-kontact-integration-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: basket-trinity (<< 4:3.5.13-0debian9+r1258873+pr4) -Breaks: basket-trinity (<< 4:3.5.13-0debian9+r1258873+pr4) +Replaces: basket-kontact-integration-trinity (<< 4:14.0.0) +Breaks: basket-kontact-integration-trinity (<< 4:14.0.0) Description: a multi-purpose note-taking appliction, Kontact integration [Trinity] This application provides as many baskets (drawers) as you wish; Several kinds of objects (texts, URLs, images,...) can be drag-n-drop'd into it. diff --git a/ubuntu/maverick/applications/basket/debian/source/format b/ubuntu/maverick/applications/basket/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/basket/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/basket/debian/source/options b/ubuntu/maverick/applications/basket/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/basket/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/bibletime/debian/control b/ubuntu/maverick/applications/bibletime/debian/control index 74815a5f1..cadc5f7d8 100644 --- a/ubuntu/maverick/applications/bibletime/debian/control +++ b/ubuntu/maverick/applications/bibletime/debian/control @@ -8,8 +8,8 @@ Standards-Version: 3.8.4 Package: bibletime-trinity Architecture: any Section: kde -Replaces: bibletime-kde3 (<< 4:3.5.13) -Breaks: bibletime-kde3 (<< 4:3.5.13) +Replaces: bibletime-trinity (<< 4:14.0.0) +Breaks: bibletime-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: sword-text, sword-dict, sword-comm Suggests: bibletime-i18n-trinity diff --git a/ubuntu/maverick/applications/bibletime/debian/source/format b/ubuntu/maverick/applications/bibletime/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/bibletime/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/bibletime/debian/source/options b/ubuntu/maverick/applications/bibletime/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/bibletime/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/control b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/control index b473b03c8..57cfdd8b3 100644 --- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/control +++ b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/control @@ -8,8 +8,8 @@ Standards-Version: 3.8.4 Package: compizconfig-backend-kconfig-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: compizconfig-backend-kconfig-kde3 (<< 4:3.5.13) -Breaks: compizconfig-backend-kconfig-kde3 (<< 4:3.5.13) +Replaces: compizconfig-backend-kconfig-trinity (<< 4:14.0.0) +Breaks: compizconfig-backend-kconfig-trinity (<< 4:14.0.0) Conflicts: libcompizconfig-backend-kconfig-trinity Description: KConfig [Trinity] Settings library for plugins - OpenCompositing Project The OpenCompositing Project brings 3D desktop visual effects that improve diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/source/format b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/source/options b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/desktop-effects-tde/debian/control b/ubuntu/maverick/applications/desktop-effects-tde/debian/control index 00ddd4bd1..c9fd9a263 100644 --- a/ubuntu/maverick/applications/desktop-effects-tde/debian/control +++ b/ubuntu/maverick/applications/desktop-effects-tde/debian/control @@ -9,8 +9,8 @@ XS-Python-Version: all Package: desktop-effects-tde-trinity Architecture: all Depends: ${python:Depends}, python-qt4 -Replaces: desktop-effects-tde-kde3 (<< 4:3.5.13) -Breaks: desktop-effects-tde-kde3 (<< 4:3.5.13) +Replaces: desktop-effects-kde-trinity (<< 4:14.0.0) +Breaks: desktop-effects-kde-trinity (<< 4:14.0.0) XB-Python-Version: ${python:Versions} Description: compiz setup tool for Trinity A simple Compiz configuration tool for Trinity. Installs and sets Compiz diff --git a/ubuntu/maverick/applications/desktop-effects-tde/debian/source/format b/ubuntu/maverick/applications/desktop-effects-tde/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/desktop-effects-tde/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/desktop-effects-tde/debian/source/options b/ubuntu/maverick/applications/desktop-effects-tde/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/desktop-effects-tde/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/digikam/debian/control b/ubuntu/maverick/applications/digikam/debian/control index c62380338..3fc492330 100644 --- a/ubuntu/maverick/applications/digikam/debian/control +++ b/ubuntu/maverick/applications/digikam/debian/control @@ -16,8 +16,8 @@ Homepage: http://www.digikam.org Package: digikam-trinity Architecture: any Depends: ${shlibs:Depends} -Replaces: digikam-kde3 (<< 4:3.5.13) -Breaks: digikam-kde3 (<< 4:3.5.13) +Replaces: digikam-trinity (<< 4:14.0.0) +Breaks: digikam-trinity (<< 4:14.0.0) Recommends: kipi-plugins-trinity, tdeprint-trinity, konqueror-trinity Suggests: digikam-trinity-doc Description: digital photo management application for KDE [Trinity] @@ -43,8 +43,8 @@ Description: digital photo management application for KDE [Trinity] Package: showfoto-trinity Architecture: any Section: graphics -Replaces: showfoto-kde3 (<< 4:3.5.13) -Breaks: showfoto-kde3 (<< 4:3.5.13) +Replaces: showfoto-trinity (<< 4:14.0.0) +Breaks: showfoto-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, digikam-trinity Recommends: kipi-plugins-trinity, tdeprint-trinity, konqueror-trinity Description: image viewer/editor for KDE [Trinity] @@ -54,8 +54,8 @@ Description: image viewer/editor for KDE [Trinity] Package: digikam-trinity-dbg Architecture: any Section: devel -Replaces: digikam-kde3-dbg (<< 4:3.5.13) -Breaks: digikam-kde3-dbg (<< 4:3.5.13) +Replaces: digikam-trinity-dbg (<< 4:14.0.0) +Breaks: digikam-trinity-dbg (<< 4:14.0.0) Depends: ${shlibs:Depends}, digikam-trinity (= ${binary:Version}), showfoto-trinity (= ${binary:Version}), tdelibs-trinity-dbg Priority: extra Description: debugging symbols for digikam [Trinity] diff --git a/ubuntu/maverick/applications/digikam/debian/source/format b/ubuntu/maverick/applications/digikam/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/digikam/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/digikam/debian/source/options b/ubuntu/maverick/applications/digikam/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/digikam/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/dolphin/debian/control b/ubuntu/maverick/applications/dolphin/debian/control index 70a5a26dc..225c29e0c 100644 --- a/ubuntu/maverick/applications/dolphin/debian/control +++ b/ubuntu/maverick/applications/dolphin/debian/control @@ -9,8 +9,8 @@ Standards-Version: 3.8.4 Package: dolphin-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: dolphin-kde3 (<< 4:3.5.13) -Breaks: dolphin-kde3 (<< 4:3.5.13) +Replaces: dolphin-trinity (<< 4:14.0.0) +Breaks: dolphin-trinity (<< 4:14.0.0) Recommends: amarok-trinity, ark-trinity, k3b-trinity, kmail-trinity, digikam-trinity Suggests: kfloppy-trinity Description: File manager for KDE focusing on usability [Trinity] diff --git a/ubuntu/maverick/applications/dolphin/debian/source/format b/ubuntu/maverick/applications/dolphin/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/dolphin/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/dolphin/debian/source/options b/ubuntu/maverick/applications/dolphin/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/dolphin/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/control b/ubuntu/maverick/applications/filelight-l10n/debian/control index 091af9d3e..a15255751 100644 --- a/ubuntu/maverick/applications/filelight-l10n/debian/control +++ b/ubuntu/maverick/applications/filelight-l10n/debian/control @@ -9,9 +9,9 @@ Homepage: http://www.methylblue.com/filelight/ Package: filelight-l10n-trinity Architecture: any -Depends: ${shlibs:Depends} , filelight-trinity (>= ${source:Version}) -Replaces: filelight-l10n-kde3 (<< 4:3.5.13) -Breaks: filelight-l10n-kde3 (<< 4:3.5.13) +Depends: ${shlibs:Depends} , filelight-trinity +Replaces: filelight-l10n-trinity (<< 4:14.0.0) +Breaks: filelight-l10n-trinity (<< 4:14.0.0) Description: Localization (l10n) for Filelight, disk space usage tool [Trinity] This package provides localization(l10n) files (translations and docs) for Filelight, Filelight allows you to understand your disk usage by graphically diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/source/format b/ubuntu/maverick/applications/filelight-l10n/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/filelight-l10n/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/source/options b/ubuntu/maverick/applications/filelight-l10n/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/filelight-l10n/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/filelight/debian/control b/ubuntu/maverick/applications/filelight/debian/control index 47b3e6eaf..943ff1166 100644 --- a/ubuntu/maverick/applications/filelight/debian/control +++ b/ubuntu/maverick/applications/filelight/debian/control @@ -11,8 +11,8 @@ Homepage: http://www.methylblue.com/filelight/ Package: filelight-trinity Architecture: any Depends: ${shlibs:Depends} -Replaces: filelight-kde3 (<< 4:3.5.13) -Breaks: filelight-kde3 (<< 4:3.5.13) +Replaces: filelight-trinity (<< 4:14.0.0) +Breaks: filelight-trinity (<< 4:14.0.0) Description: show where your diskspace is being used [Trinity] Filelight allows you to understand your disk usage by graphically representing your filesystem as a set of concentric, segmented rings. diff --git a/ubuntu/maverick/applications/filelight/debian/source/format b/ubuntu/maverick/applications/filelight/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/filelight/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/filelight/debian/source/options b/ubuntu/maverick/applications/filelight/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/filelight/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/fusion-icon/debian/control b/ubuntu/maverick/applications/fusion-icon/debian/control index 07b9e7ebd..25234c2dd 100644 --- a/ubuntu/maverick/applications/fusion-icon/debian/control +++ b/ubuntu/maverick/applications/fusion-icon/debian/control @@ -11,8 +11,8 @@ Standards-Version: 3.8.4 Package: fusion-icon-trinity Architecture: all XB-Python-Version: ${python:Versions} -Replaces: fusion-icon-kde3 (<< 4:3.5.13) -Breaks: fusion-icon-kde3 (<< 4:3.5.13) +Replaces: fusion-icon-trinity (<< 4:14.0.0) +Breaks: fusion-icon-trinity (<< 4:14.0.0) Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 | python-qt4, python-compizconfig-trinity, compiz-trinity Description: tray icon to launch and manage Compiz Fusion [Trinity] The OpenCompositing Project brings 3D desktop visual effects that diff --git a/ubuntu/maverick/applications/fusion-icon/debian/source/format b/ubuntu/maverick/applications/fusion-icon/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/fusion-icon/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/fusion-icon/debian/source/options b/ubuntu/maverick/applications/fusion-icon/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/fusion-icon/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/control b/ubuntu/maverick/applications/gtk-qt-engine/debian/control index 84b2b015d..1db192bc3 100644 --- a/ubuntu/maverick/applications/gtk-qt-engine/debian/control +++ b/ubuntu/maverick/applications/gtk-qt-engine/debian/control @@ -9,8 +9,8 @@ Standards-Version: 3.8.4 Package: gtk-qt-engine-trinity Architecture: any Provides: gtk2-engines-gtk-qt-trinity -Replaces: gtk-qt-engine-kde3 (<< 4:3.5.13) -Breaks: gtk-qt-engine-kde3 (<< 4:3.5.13) +Replaces: gtk-qt-engine-trinity (<< 4:14.0.0) +Breaks: gtk-qt-engine-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, ${misc:Depends} Description: theme engine using Qt for GTK+ 2.x and Trinity The GTK-Qt Theme Engine (also known as gtk-qt-engine) is a GTK 2 theme engine diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/source/format b/ubuntu/maverick/applications/gtk-qt-engine/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/gtk-qt-engine/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/source/options b/ubuntu/maverick/applications/gtk-qt-engine/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/gtk-qt-engine/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/gwenview/debian/control b/ubuntu/maverick/applications/gwenview/debian/control index 33ab3069d..736286221 100644 --- a/ubuntu/maverick/applications/gwenview/debian/control +++ b/ubuntu/maverick/applications/gwenview/debian/control @@ -9,8 +9,8 @@ Homepage: http://gwenview.sourceforge.net Package: gwenview-trinity Architecture: any Depends: ${shlibs:Depends} -Replaces: gwenview-kde3 (<< 4:3.5.13) -Breaks: gwenview-kde3 (<< 4:3.5.13) +Replaces: gwenview-trinity (<< 4:14.0.0) +Breaks: gwenview-trinity (<< 4:14.0.0) Recommends: tdegraphics-kfile-plugins-trinity, kipi-plugins-trinity Suggests: gwenview-i18n Description: image viewer for TDE diff --git a/ubuntu/maverick/applications/gwenview/debian/source/format b/ubuntu/maverick/applications/gwenview/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/gwenview/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/gwenview/debian/source/options b/ubuntu/maverick/applications/gwenview/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/gwenview/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/k3b/debian/control b/ubuntu/maverick/applications/k3b/debian/control index 4dda755d0..74cfc4638 100644 --- a/ubuntu/maverick/applications/k3b/debian/control +++ b/ubuntu/maverick/applications/k3b/debian/control @@ -11,8 +11,8 @@ Homepage: http://www.k3b.org Package: k3b-trinity Architecture: any Depends: ${shlibs:Depends}, wodim | cdrskin, cdparanoia (>= 3a9.8), genisoimage, tdelibs-data-trinity (>= 4:3.1.4-2), cdrdao (>= 1.1.7-5), k3b-data-trinity (= ${source:Version}), libk3b3-trinity (= ${binary:Version}) -Replaces: k3b-kde3 (<< 4:3.5.13) -Breaks: k3b-kde3 (<< 4:3.5.13) +Replaces: k3b-trinity (<< 4:14.0.0) +Breaks: k3b-trinity (<< 4:14.0.0) Recommends: dvd+rw-tools, libk3b3-extracodecs-trinity Suggests: k3b-i18n, normalize-audio, toolame, sox, movixmaker-2, vcdimager (>= 0.7) Description: A sophisticated KDE CD burning application [Trinity] @@ -31,8 +31,8 @@ Description: A sophisticated KDE CD burning application [Trinity] Package: k3b-data-trinity Conflicts: k3b-trinity (<< 1.0.4-4) Architecture: all -Replaces: k3b-data-kde3 (<< 4:3.5.13) -Breaks: k3b-data-kde3 (<< 4:3.5.13) +Replaces: k3b-data-trinity (<< 4:14.0.0) +Breaks: k3b-data-trinity (<< 4:14.0.0) Description: A sophisticated KDE CD burning application - data files [Trinity] K3b is a GUI frontend to the CD recording programs cdrdao and cdrecord. Its aim is to provide a very user friendly interface to all the tasks @@ -43,8 +43,8 @@ Description: A sophisticated KDE CD burning application - data files [Trinity] Package: libk3b-trinity-dev Conflicts: libk3bcore-trinity-dev, libk3bplugin-trinity-dev, libk3btools-trinity-dev, libk3bproject-trinity-dev, k3blibs-trinity-dev, k3blibs-trinity Section: libdevel -Replaces: libk3b-kde3-dev (<< 4:3.5.13) -Breaks: libk3b-kde3-dev (<< 4:3.5.13) +Replaces: libk3b-trinity-dev (<< 4:14.0.0) +Breaks: libk3b-trinity-dev (<< 4:14.0.0) Architecture: any Depends: libk3b3-trinity (= ${binary:Version}) Description: The KDE cd burning application library - development files [Trinity] @@ -57,8 +57,8 @@ Description: The KDE cd burning application library - development files [Trinity Package: libk3b3-trinity Section: libs Architecture: any -Replaces: libk3b3-kde3 (<< 4:3.5.13) -Breaks: libk3b3-kde3 (<< 4:3.5.13) +Replaces: libk3b3-trinity (<< 4:14.0.0) +Breaks: libk3b3-trinity (<< 4:14.0.0) Conflicts: libk3bcore-trinity, libk3bplugin-trinity, libk3btools-trinity, libk3bproject-trinity, k3blibs-trinity, libk3b2-trinity Depends: ${shlibs:Depends} Description: The KDE cd burning application library - runtime files [Trinity] @@ -71,8 +71,8 @@ Description: The KDE cd burning application library - runtime files [Trinity] Package: libk3b3-extracodecs-trinity Section: libs Architecture: any -Replaces: libk3b3-extracodecs-kde3 (<< 4:3.5.13) -Breaks: libk3b3-extracodecs-kde3 (<< 4:3.5.13) +Replaces: libk3b3-extracodecs-trinity (<< 4:14.0.0) +Breaks: libk3b3-extracodecs-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Conflicts: libk3b2-mp3-trinity Description: The KDE cd burning application library - extra decoders [Trinity] @@ -85,8 +85,8 @@ Description: The KDE cd burning application library - extra decoders [Trinity] Package: libk3b2-extracodecs-trinity Architecture: all Priority: extra -Replaces: libk3b2-extracodecs-kde3 (<< 4:3.5.13) -Breaks: libk3b2-extracodecs-kde3 (<< 4:3.5.13) +Replaces: libk3b2-extracodecs-trinity (<< 4:14.0.0) +Breaks: libk3b2-extracodecs-trinity (<< 4:14.0.0) Depends: libk3b3-extracodecs-trinity Description: transitional package for K3b's extra decoders [Trinity] This is a dummy transitional package to enable a smooth transition from diff --git a/ubuntu/maverick/applications/k3b/debian/source/format b/ubuntu/maverick/applications/k3b/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/k3b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/k3b/debian/source/options b/ubuntu/maverick/applications/k3b/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/k3b/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/k9copy/debian/control b/ubuntu/maverick/applications/k9copy/debian/control index d35e678ee..a54326497 100644 --- a/ubuntu/maverick/applications/k9copy/debian/control +++ b/ubuntu/maverick/applications/k9copy/debian/control @@ -10,8 +10,8 @@ Homepage: http://k9copy.sourceforge.net/ Package: k9copy-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, vamps, dvd+rw-tools, dvdauthor, mencoder, libdvdnav4 -Replaces: k9copy-kde3 (<< 4:3.5.13) -Breaks: k9copy-kde3 (<< 4:3.5.13) +Replaces: k9copy-trinity (<< 4:14.0.0) +Breaks: k9copy-trinity (<< 4:14.0.0) Description: DVD backup tool for Trinity k9copy is a tabbed tool that allows to copy of one or more titles from a DVD9 to a DVD5, in thesame way than DVDShrink for Microsoft Windows (R). diff --git a/ubuntu/maverick/applications/k9copy/debian/source/format b/ubuntu/maverick/applications/k9copy/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/k9copy/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/k9copy/debian/source/options b/ubuntu/maverick/applications/k9copy/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/k9copy/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/kaffeine-mozilla/debian/control b/ubuntu/maverick/applications/kaffeine-mozilla/debian/control index afc97f80f..38270dc34 100644 --- a/ubuntu/maverick/applications/kaffeine-mozilla/debian/control +++ b/ubuntu/maverick/applications/kaffeine-mozilla/debian/control @@ -9,8 +9,8 @@ Standards-Version: 3.8.4 Package: kaffeine-mozilla-trinity Architecture: any Depends: kaffeine-trinity, ${shlibs:Depends}, ${misc:Depends} -Replaces: kaffeine-mozilla-kde3 (<< 4:3.5.13) -Breaks: kaffeine-mozilla-kde3 (<< 4:3.5.13) +Replaces: kaffeine-mozilla-trinity (<< 4:14.0.0) +Breaks: kaffeine-mozilla-trinity (<< 4:14.0.0) Description: mozilla plugin that lanches kaffeine for supported media types [Trinity] This mozilla plugin launches kaffeine, the xine-based media player for KDE, when a page containing a supported media format is loaded. diff --git a/ubuntu/maverick/applications/kaffeine-mozilla/debian/source/format b/ubuntu/maverick/applications/kaffeine-mozilla/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/kaffeine-mozilla/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/kaffeine-mozilla/debian/source/options b/ubuntu/maverick/applications/kaffeine-mozilla/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/kaffeine-mozilla/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/kaffeine/debian/control b/ubuntu/maverick/applications/kaffeine/debian/control index 660e771c3..5aa779d25 100644 --- a/ubuntu/maverick/applications/kaffeine/debian/control +++ b/ubuntu/maverick/applications/kaffeine/debian/control @@ -15,8 +15,8 @@ Standards-Version: 3.8.4 Package: kaffeine-trinity Architecture: any Depends: ${shlibs:Depends}, hdparm -Replaces: kaffeine-kde3 (<< 4:3.5.13) -Breaks: kaffeine-kde3 (<< 4:3.5.13) +Replaces: kaffeine-trinity (<< 4:14.0.0) +Breaks: kaffeine-trinity (<< 4:14.0.0) Recommends: tdesudo-trinity, kpackage-trinity Description: versatile media player for TDE Kaffeine is a media player for KDE. While it supports multiple player @@ -32,8 +32,8 @@ Description: versatile media player for TDE Package: kaffeine-trinity-dbg Section: devel Architecture: any -Replaces: kaffeine-kde3-dbg (<< 4:3.5.13) -Breaks: kaffeine-kde3-dbg (<< 4:3.5.13) +Replaces: kaffeine-trinity-dbg (<< 4:14.0.0) +Breaks: kaffeine-trinity-dbg (<< 4:14.0.0) Priority: extra Depends: kaffeine-trinity (= ${binary:Version}), tdelibs-trinity-dbg Recommends: tdesudo-trinity, kpackage-trinity @@ -45,8 +45,8 @@ Description: debugging symbols for kaffeine [Trinity] Package: kaffeine-gstreamer-trinity Architecture: any Depends: ${shlibs:Depends}, kaffeine-trinity -Replaces: kaffeine-gstreamer-kde3 (<< 4:3.5.13) -Breaks: kaffeine-gstreamer-kde3 (<< 4:3.5.13) +Replaces: kaffeine-gstreamer-trinity (<< 4:14.0.0) +Breaks: kaffeine-gstreamer-trinity (<< 4:14.0.0) Description: Gstreamer engine for kaffeine media player [Trinity] Kaffeine is a media player for KDE. While it supports multiple player engines, its default engine is Gstreamer, giving Kaffeine a wide variety of diff --git a/ubuntu/maverick/applications/kaffeine/debian/source/format b/ubuntu/maverick/applications/kaffeine/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/kaffeine/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/kaffeine/debian/source/options b/ubuntu/maverick/applications/kaffeine/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/kaffeine/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/katapult/debian/control b/ubuntu/maverick/applications/katapult/debian/control index 4d7a1b588..003a6d5da 100644 --- a/ubuntu/maverick/applications/katapult/debian/control +++ b/ubuntu/maverick/applications/katapult/debian/control @@ -8,8 +8,8 @@ Standards-Version: 3.8.4 Package: katapult-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: katapult-kde3 (<< 4:3.5.13) -Breaks: katapult-kde3 (<< 4:3.5.13) +Replaces: katapult-trinity (<< 4:14.0.0) +Breaks: katapult-trinity (<< 4:14.0.0) Description: item launcher for KDE [Trinity] Katapult is an application, which analyses text-based queries to launch items, such as bookmarks, directories or programs. diff --git a/ubuntu/maverick/applications/katapult/debian/source/format b/ubuntu/maverick/applications/katapult/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/katapult/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/katapult/debian/source/options b/ubuntu/maverick/applications/katapult/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/katapult/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/kbarcode/debian/control b/ubuntu/maverick/applications/kbarcode/debian/control index e9fc1c3bd..d2341bf16 100644 --- a/ubuntu/maverick/applications/kbarcode/debian/control +++ b/ubuntu/maverick/applications/kbarcode/debian/control @@ -9,8 +9,8 @@ Standards-Version: 3.8.4 Package: kbarcode-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, barcode, imagemagick -Replaces: kbarcode-kde3 (<< 4:3.5.13) -Breaks: kbarcode-kde3 (<< 4:3.5.13) +Replaces: kbarcode-trinity (<< 4:14.0.0) +Breaks: kbarcode-trinity (<< 4:14.0.0) Recommends: libqt3-mt-mysql | libqt3-mt-psql | libqt3-mt-odbc | libqt3-mt-sqlite | libqt3-mt-ibase Description: barcode and label printing application for Trinity diff --git a/ubuntu/maverick/applications/kbarcode/debian/source/format b/ubuntu/maverick/applications/kbarcode/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/kbarcode/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/kbarcode/debian/source/options b/ubuntu/maverick/applications/kbarcode/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/kbarcode/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/kbfx/debian/control b/ubuntu/maverick/applications/kbfx/debian/control index 2f0099a65..d3830e6d6 100644 --- a/ubuntu/maverick/applications/kbfx/debian/control +++ b/ubuntu/maverick/applications/kbfx/debian/control @@ -9,8 +9,8 @@ Standards-Version: 3.8.4 Package: kbfx-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: kbfx-kde3 (<< 4:3.5.13) -Breaks: kbfx-kde3 (<< 4:3.5.13) +Replaces: kbfx-trinity (<< 4:14.0.0) +Breaks: kbfx-trinity (<< 4:14.0.0) Description: an alternative to K-Menu for KDE [Trinity] KBFX is an alternative to the classical K-Menu button and its menu. It improves the user experience by enabling him to set a bigger (and thus more diff --git a/ubuntu/maverick/applications/kbfx/debian/source/format b/ubuntu/maverick/applications/kbfx/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/kbfx/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/kbfx/debian/source/options b/ubuntu/maverick/applications/kbfx/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/kbfx/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/kbookreader/debian/control b/ubuntu/maverick/applications/kbookreader/debian/control index cbea39b39..c6ab189eb 100644 --- a/ubuntu/maverick/applications/kbookreader/debian/control +++ b/ubuntu/maverick/applications/kbookreader/debian/control @@ -10,8 +10,8 @@ Homepage: http://k9copy.sourceforge.net/ Package: kbookreader-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: kbookreader-kde3 (<< 4:3.5.13) -Breaks: kbookreader-kde3 (<< 4:3.5.13) +Replaces: kbookreader-trinity (<< 4:14.0.0) +Breaks: kbookreader-trinity (<< 4:14.0.0) Description: eBook reader for Trinity kbookreader is an application which allows you to view eBooks within the Trinity Desktop Environment diff --git a/ubuntu/maverick/applications/kbookreader/debian/source/format b/ubuntu/maverick/applications/kbookreader/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/kbookreader/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/kbookreader/debian/source/options b/ubuntu/maverick/applications/kbookreader/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/kbookreader/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/kchmviewer/debian/control b/ubuntu/maverick/applications/kchmviewer/debian/control index 3a8e5bf73..93a25020d 100644 --- a/ubuntu/maverick/applications/kchmviewer/debian/control +++ b/ubuntu/maverick/applications/kchmviewer/debian/control @@ -10,8 +10,8 @@ Homepage: http://www.kchmviewer.net/ Package: kchmviewer-trinity Architecture: any Conflicts: kchmviewer-nokde-trinity -Replaces: kchmviewer-kde3 (<< 4:3.5.13) -Breaks: kchmviewer-kde3 (<< 4:3.5.13) +Replaces: kchmviewer-trinity (<< 4:14.0.0) +Breaks: kchmviewer-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, ${misc:Depends} Description: CHM viewer for Trinity KchmViewer is a chm (MS HTML help file format) viewer, written in C++. diff --git a/ubuntu/maverick/applications/kchmviewer/debian/source/format b/ubuntu/maverick/applications/kchmviewer/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/kchmviewer/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/kchmviewer/debian/source/options b/ubuntu/maverick/applications/kchmviewer/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/kchmviewer/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/kcpuload/debian/control b/ubuntu/maverick/applications/kcpuload/debian/control index ee0499761..8b5024c98 100644 --- a/ubuntu/maverick/applications/kcpuload/debian/control +++ b/ubuntu/maverick/applications/kcpuload/debian/control @@ -9,8 +9,8 @@ Standards-Version: 3.8.4 Package: kcpuload-trinity Architecture: any Section: kde -Replaces: kcpuload-kde3 (<< 4:3.5.13) -Breaks: kcpuload-kde3 (<< 4:3.5.13) +Replaces: kcpuload-trinity (<< 4:14.0.0) +Breaks: kcpuload-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: knetload-trinity Description: a CPU meter for Kicker [Trinity] diff --git a/ubuntu/maverick/applications/kcpuload/debian/source/format b/ubuntu/maverick/applications/kcpuload/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/kcpuload/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/kcpuload/debian/source/options b/ubuntu/maverick/applications/kcpuload/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/kcpuload/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/control b/ubuntu/maverick/applications/kdbusnotification/debian/control index b08146fc3..cd2ef673b 100644 --- a/ubuntu/maverick/applications/kdbusnotification/debian/control +++ b/ubuntu/maverick/applications/kdbusnotification/debian/control @@ -8,6 +8,8 @@ Standards-Version: 3.8.4 Package: kdbusnotification-trinity Architecture: any Section: kde +Replaces: kdbusnotification-trinity (<< 4:14.0.0) +Breaks: kdbusnotification-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: a DBUS notification service [Trinity] kdbusnotification is a small program for Trinity that displays diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/source/format b/ubuntu/maverick/applications/kdbusnotification/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/kdbusnotification/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/source/options b/ubuntu/maverick/applications/kdbusnotification/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/kdbusnotification/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/kdiff3/debian/control b/ubuntu/maverick/applications/kdiff3/debian/control index 9caa5fa2e..01e6d6a24 100644 --- a/ubuntu/maverick/applications/kdiff3/debian/control +++ b/ubuntu/maverick/applications/kdiff3/debian/control @@ -9,8 +9,8 @@ Standards-Version: 3.8.4 Package: kdiff3-trinity Architecture: any Depends: ${shlibs:Depends} -Replaces: kdiff3-kde3 (<< 4:3.5.13) -Breaks: kdiff3-kde3 (<< 4:3.5.13) +Replaces: kdiff3-trinity (<< 4:14.0.0) +Breaks: kdiff3-trinity (<< 4:14.0.0) Recommends: kdiff3-trinity-doc Description: compares and merges 2 or 3 files or directories [Trinity] KDiff3 compares two or three input files and shows the differences @@ -22,8 +22,8 @@ Description: compares and merges 2 or 3 files or directories [Trinity] Package: kdiff3-trinity-doc Architecture: all Recommends: kdiff3-trinity -Replaces: kdiff3-kde3-doc (<< 4:3.5.13) -Breaks: kdiff3-kde3-doc (<< 4:3.5.13) +Replaces: kdiff3-trinity-doc (<< 4:14.0.0) +Breaks: kdiff3-trinity-doc (<< 4:14.0.0) Description: documentation for kdiff3 [Trinity] KDiff3 compares two or three input files and shows the differences line by line and character by character. This package contains the diff --git a/ubuntu/maverick/applications/kdiff3/debian/source/format b/ubuntu/maverick/applications/kdiff3/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/kdiff3/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/kdiff3/debian/source/options b/ubuntu/maverick/applications/kdiff3/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/kdiff3/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/kdirstat/debian/control b/ubuntu/maverick/applications/kdirstat/debian/control index e8946bff5..27e47ff0e 100644 --- a/ubuntu/maverick/applications/kdirstat/debian/control +++ b/ubuntu/maverick/applications/kdirstat/debian/control @@ -9,8 +9,8 @@ Homepage: http://kdirstat.sourceforge.net/ Package: kdirstat-trinity Architecture: any Depends: ${shlibs:Depends} -Replaces: kdirstat-kde3 (<< 4:3.5.13) -Breaks: kdirstat-kde3 (<< 4:3.5.13) +Replaces: kdirstat-trinity (<< 4:14.0.0) +Breaks: kdirstat-trinity (<< 4:14.0.0) Description: graphical disk usage display with cleanup facilities [Trinity] KDirStat (KDE Directory Statistics) is a small utility program that sums up disk usage for directory trees, very much like the Unix 'du' command. diff --git a/ubuntu/maverick/applications/kdirstat/debian/source/format b/ubuntu/maverick/applications/kdirstat/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/kdirstat/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/kdirstat/debian/source/options b/ubuntu/maverick/applications/kdirstat/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/kdirstat/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/kdmtheme/debian/README.Debian b/ubuntu/maverick/applications/kdmtheme/debian/README.Debian deleted file mode 100644 index 1291b6a32..000000000 --- a/ubuntu/maverick/applications/kdmtheme/debian/README.Debian +++ /dev/null @@ -1,7 +0,0 @@ -kdmtheme for Debian -------------------- - -kdmtheme is a KDE Control Module (KCM). To run it, open KDE Control Center and -go to System Administration to find KDM Theme Manager. - - -- Fathi Boudra <fabo@debian.org>, Mon, 31 Jul 2006 18:33:26 +0200 diff --git a/ubuntu/maverick/applications/kdmtheme/debian/kdmtheme.lintian-overrides b/ubuntu/maverick/applications/kdmtheme/debian/kdmtheme.lintian-overrides deleted file mode 100644 index 4932c5f8a..000000000 --- a/ubuntu/maverick/applications/kdmtheme/debian/kdmtheme.lintian-overrides +++ /dev/null @@ -1,6 +0,0 @@ -# provided by tdelibs -kdmtheme: desktop-command-not-in-package ./usr/share/applications/kde/kdmtheme.desktop kcmshell -# kcontrol module -kdmtheme: desktop-entry-invalid-category X-KDE-settings-system ./usr/share/applications/kde/kdmtheme.desktop -kdmtheme: desktop-entry-lacks-main-category ./usr/share/applications/kde/kdmtheme.desktop - diff --git a/ubuntu/maverick/applications/kdmtheme/debian/watch b/ubuntu/maverick/applications/kdmtheme/debian/watch deleted file mode 100644 index 5cf8d8c80..000000000 --- a/ubuntu/maverick/applications/kdmtheme/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://beta.smileaf.org/files/kdmtheme/kdmtheme-(.*)\.tar\.bz2 debian svn-upgrade diff --git a/ubuntu/maverick/applications/kdpkg/debian/control b/ubuntu/maverick/applications/kdpkg/debian/control index 5bf5bb345..15d673216 100644 --- a/ubuntu/maverick/applications/kdpkg/debian/control +++ b/ubuntu/maverick/applications/kdpkg/debian/control @@ -9,8 +9,8 @@ Standards-Version: 3.8.4 Package: kdpkg-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, apt, dpkg (>=1.14), sudo-trinity, menu -Replaces: kdpkg-kde3 (<< 4:3.5.13) -Breaks: kdpkg-kde3 (<< 4:3.5.13) +Replaces: kdpkg-trinity (<< 4:14.0.0) +Breaks: kdpkg-trinity (<< 4:14.0.0) Description: KDE frontend for dpkg [Trinity] kdpkg is a utility for installing .deb package files. It is similar to gdebi, except that kdpkg is a KDE application diff --git a/ubuntu/maverick/applications/kdpkg/debian/source/format b/ubuntu/maverick/applications/kdpkg/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/kdpkg/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/kdpkg/debian/source/options b/ubuntu/maverick/applications/kdpkg/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/kdpkg/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/keep/debian/control b/ubuntu/maverick/applications/keep/debian/control index 98d816db0..536f0d010 100644 --- a/ubuntu/maverick/applications/keep/debian/control +++ b/ubuntu/maverick/applications/keep/debian/control @@ -10,8 +10,8 @@ Standards-Version: 3.8.4 Package: keep-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, rdiff-backup -Replaces: keep-kde3 (<< 4:3.5.13) -Breaks: keep-kde3 (<< 4:3.5.13) +Replaces: keep-trinity (<< 4:14.0.0) +Breaks: keep-trinity (<< 4:14.0.0) Description: backup system for KDE [Trinity] Keep is an automatic backup program that allows users to set the parameters of the backup, including the frequency and the number of backups. diff --git a/ubuntu/maverick/applications/keep/debian/source/format b/ubuntu/maverick/applications/keep/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/keep/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/keep/debian/source/options b/ubuntu/maverick/applications/keep/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/keep/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/kerry/debian/control b/ubuntu/maverick/applications/kerry/debian/control index 1775ae6ad..f43dc07dd 100644 --- a/ubuntu/maverick/applications/kerry/debian/control +++ b/ubuntu/maverick/applications/kerry/debian/control @@ -9,8 +9,8 @@ Standards-Version: 3.8.4 Package: kerry-trinity Architecture: any Depends: ${shlibs:Depends}, beagle (>= 0.2.3) -Replaces: kerry-kde3 (<< 4:3.5.13) -Breaks: kerry-kde3 (<< 4:3.5.13) +Replaces: kerry-trinity (<< 4:14.0.0) +Breaks: kerry-trinity (<< 4:14.0.0) Description: a KDE frontend for the Beagle desktop search daemon [Trinity] Kerry is a Trinity frontend for the Beagle desktop search daemon. . diff --git a/ubuntu/maverick/applications/kerry/debian/source/format b/ubuntu/maverick/applications/kerry/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/kerry/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/kerry/debian/source/options b/ubuntu/maverick/applications/kerry/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/kerry/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk index 47e83ef4a..856fa4932 100644 --- a/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk @@ -10,9 +10,6 @@ _cdbs_class_debian-qt-kde := 1 # Note: This _must_ be included before autotools.mk, or it won't work. common-configure-arch common-configure-indep:: debian/stamp-cvs-make debian/stamp-cvs-make: - cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in - cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh - $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) @@ -96,14 +93,18 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: done clean:: - if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ - cd $(DEB_SRCDIR); \ - find . -name Makefile.in -print | \ - xargs --no-run-if-empty rm -f; \ - rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ - configure configure.files configure.in stamp-h.in \ - subdirs; \ - fi rm -f debian/stamp-cvs-make endif + +#common-build-indep:: debian/stamp-kde-apidox +#debian/stamp-kde-apidox: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) +# touch $@ +# +#common-install-indep:: common-install-kde-apidox +#common-install-kde-apidox:: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) +# +#clean:: +# rm -f debian/stamp-kde-apidox diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/kde.mk index 5b6508f8c..9dbcfbafd 100644 --- a/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/kde.mk @@ -35,7 +35,7 @@ else DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) endif -include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +# include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) export kde_cgidir = \$${libdir}/cgi-bin export kde_confdir = \$${sysconfdir}/trinity @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: @@ -70,7 +70,7 @@ cleanbuilddir:: common-build-arch common-build-indep:: debian/stamp-kde-apidox debian/stamp-kde-apidox: - $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) touch $@ common-install-prehook-impl:: @@ -82,7 +82,7 @@ common-install-prehook-impl:: common-install-arch common-install-indep:: common-install-kde-apidox common-install-kde-apidox:: - $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) clean:: rm -f debian/stamp-kde-apidox diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/control b/ubuntu/maverick/applications/kgtk-qt3/debian/control index 8152e92eb..5ba35f8d3 100644 --- a/ubuntu/maverick/applications/kgtk-qt3/debian/control +++ b/ubuntu/maverick/applications/kgtk-qt3/debian/control @@ -9,8 +9,8 @@ Homepage: http://trinity.pearsoncomputing.net Package: kgtk-qt3-trinity Architecture: any Depends: ${shlibs:Depends} -Replaces: kgtk-qt3-kde3 (<< 4:3.5.13) -Breaks: kgtk-qt3-kde3 (<< 4:3.5.13) +Replaces: kgtk-qt3-trinity (<< 4:14.0.0) +Breaks: kgtk-qt3-trinity (<< 4:14.0.0) Conflicts: kgtk-config-bluefish, kgtk-config-eclipse, kgtk-config-firefox, kgtk-config-gimp, kgtk-config-inkscape, kgtk-config-kino, kgtk-config-openoffice, kgtk-config-opera-qt3, kgtk-config-opera-qt4, kgtk-config-scribus, kgtk-config-thunderbird, kubuntu-kgtk-trinity Description: Use KDE dialogs in Gtk apps This is an LD_PRELOAD hack that allows most GTK diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/control.in b/ubuntu/maverick/applications/kgtk-qt3/debian/control.in new file mode 100644 index 000000000..b31284ac4 --- /dev/null +++ b/ubuntu/maverick/applications/kgtk-qt3/debian/control.in @@ -0,0 +1,24 @@ +Source: kgtk-qt3-trinity +Section: kde +Priority: optional +Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +XSBC-Original-Maintainer: @@@MAINTAINER@@@ +Uploaders: @@@UPLOADERS@@@ +Build-Depends: debhelper (>= 7), cdbs, tdelibs4-trinity-dev, libgtk2.0-dev, libtqtinterface-dev, cmake +Standards-Version: 3.8.4 +Homepage: http://trinity.pearsoncomputing.net + +Package: kgtk-qt3-trinity +Architecture: any +Depends: ${shlibs:Depends} +Replaces: kgtk-qt3-kde3 (<< 4:3.5.13) +Breaks: kgtk-qt3-kde3 (<< 4:3.5.13) +Conflicts: kgtk-config-bluefish, kgtk-config-eclipse, kgtk-config-firefox, kgtk-config-gimp, kgtk-config-inkscape, kgtk-config-kino, kgtk-config-openoffice, kgtk-config-opera-qt3, kgtk-config-opera-qt4, kgtk-config-scribus, kgtk-config-thunderbird, kubuntu-kgtk-trinity +Description: Use KDE dialogs in Gtk apps + This is an LD_PRELOAD hack that allows most GTK + applications to use Trinity's file dialogs when run under Trinity. + . + The Gtk file chooser functions have been overridden to communicate + with this KDE module/application. + . + This package includes the kqt3-wrapper diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/rules b/ubuntu/maverick/applications/kgtk-qt3/debian/rules index 333c9807f..1948d86d6 100755 --- a/ubuntu/maverick/applications/kgtk-qt3/debian/rules +++ b/ubuntu/maverick/applications/kgtk-qt3/debian/rules @@ -1,31 +1,31 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function +# Also include the main Trinity path +ifeq ("$(LD_LIBRARY_PATH)", "") +LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib +else +LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib +endif +export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk +include debian/cdbs/debian-qt-kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info -DEB_CMAKE_CUSTOM_FLAGS := -DKGTK_KDE3=true -DKGTK_QT3=true - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_KDE_APIDOX := yes -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG) -configure/kgtk-qt3-trinity:: - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde cmake -D CMAKE_INSTALL_PREFIX=/opt/trinity . +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" -build/kgtk-qt3-trinity:: - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) +# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to +# never build in parallel, regardless of DEB_BUILD_OPTIONS. +DEB_BUILD_PARALLEL = true -install/kgtk-qt3-trinity:: - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/kgtk-qt3-trinity +binary-install/kgtk-qt3-trinity:: mkdir -p $(CURDIR)/debian/kgtk-qt3-trinity/opt/trinity/share/kgtk/ cp -Rp $(CURDIR)/debian/preload $(CURDIR)/debian/kgtk-qt3-trinity/opt/trinity/share/kgtk/ + diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/source/format b/ubuntu/maverick/applications/kgtk-qt3/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/kgtk-qt3/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/source/options b/ubuntu/maverick/applications/kgtk-qt3/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/kgtk-qt3/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/kile/debian/control b/ubuntu/maverick/applications/kile/debian/control index 18bfb1feb..b39ba1894 100644 --- a/ubuntu/maverick/applications/kile/debian/control +++ b/ubuntu/maverick/applications/kile/debian/control @@ -11,8 +11,8 @@ Homepage: http://kile.sourceforge.net Package: kile-trinity Architecture: any Section: tex -Replaces: kile-kde3 (<< 4:3.5.13) -Breaks: kile-kde3 (<< 4:3.5.13) +Replaces: kile-trinity (<< 4:14.0.0) +Breaks: kile-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, konsole-trinity, texlive-latex-base Recommends: kdvi-trinity, dvipng, kghostview-trinity, kpdf-trinity Suggests: gbib, latex2html, pybliographer, xfig, kile-trinity-i18n, gv @@ -33,8 +33,8 @@ Description: KDE Integrated LaTeX Environment [Trinity] Package: kile-trinity-i18n-ar Architecture: all Section: tex -Replaces: kile-kde3-i18n-ar (<< 4:3.5.13) -Breaks: kile-kde3-i18n-ar (<< 4:3.5.13) +Replaces: kile-trinity-i18n-ar (<< 4:14.0.0) +Breaks: kile-trinity-i18n-ar (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-ar Provides: kile-trinity-i18n @@ -44,8 +44,8 @@ Description: Arabic (ar) translations for Kile [Trinity] Package: kile-trinity-i18n-bg Architecture: all Section: tex -Replaces: kile-kde3-i18n-bg (<< 4:3.5.13) -Breaks: kile-kde3-i18n-bg (<< 4:3.5.13) +Replaces: kile-trinity-i18n-bg (<< 4:14.0.0) +Breaks: kile-trinity-i18n-bg (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-bg Provides: kile-trinity-i18n @@ -55,8 +55,8 @@ Description: Bulgarian (bg) translations for Kile [Trinity] Package: kile-trinity-i18n-br Architecture: all Section: tex -Replaces: kile-kde3-i18n-br (<< 4:3.5.13) -Breaks: kile-kde3-i18n-br (<< 4:3.5.13) +Replaces: kile-trinity-i18n-br (<< 4:14.0.0) +Breaks: kile-trinity-i18n-br (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-br Provides: kile-trinity-i18n @@ -66,8 +66,8 @@ Description: Brazilian (br) translations for Kile [Trinity] Package: kile-trinity-i18n-ca Architecture: all Section: tex -Replaces: kile-kde3-i18n-ca (<< 4:3.5.13) -Breaks: kile-kde3-i18n-ca (<< 4:3.5.13) +Replaces: kile-trinity-i18n-ca (<< 4:14.0.0) +Breaks: kile-trinity-i18n-ca (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-ca Provides: kile-trinity-i18n @@ -77,8 +77,8 @@ Description: Catalan (ca) translations for Kile [Trinity] Package: kile-trinity-i18n-cs Architecture: all Section: tex -Replaces: kile-kde3-i18n-cs (<< 4:3.5.13) -Breaks: kile-kde3-i18n-cs (<< 4:3.5.13) +Replaces: kile-trinity-i18n-cs (<< 4:14.0.0) +Breaks: kile-trinity-i18n-cs (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-cs Provides: kile-trinity-i18n @@ -88,8 +88,8 @@ Description: Czech (cs) translations for Kile [Trinity] Package: kile-trinity-i18n-cy Architecture: all Section: tex -Replaces: kile-kde3-i18n-cy (<< 4:3.5.13) -Breaks: kile-kde3-i18n-cy (<< 4:3.5.13) +Replaces: kile-trinity-i18n-cy (<< 4:14.0.0) +Breaks: kile-trinity-i18n-cy (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-cy Provides: kile-trinity-i18n @@ -99,8 +99,8 @@ Description: Welsh (cy) translations for Kile [Trinity] Package: kile-trinity-i18n-da Architecture: all Section: tex -Replaces: kile-kde3-i18n-da (<< 4:3.5.13) -Breaks: kile-kde3-i18n-da (<< 4:3.5.13) +Replaces: kile-trinity-i18n-da (<< 4:14.0.0) +Breaks: kile-trinity-i18n-da (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-da Provides: kile-trinity-i18n @@ -110,8 +110,8 @@ Description: Danish (da) translations for Kile [Trinity] Package: kile-trinity-i18n-de Architecture: all Section: tex -Replaces: kile-kde3-i18n-de (<< 4:3.5.13) -Breaks: kile-kde3-i18n-de (<< 4:3.5.13) +Replaces: kile-trinity-i18n-de (<< 4:14.0.0) +Breaks: kile-trinity-i18n-de (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-de Provides: kile-trinity-i18n @@ -121,8 +121,8 @@ Description: German (de) translations for Kile [Trinity] Package: kile-trinity-i18n-el Architecture: all Section: tex -Replaces: kile-kde3-i18n-el (<< 4:3.5.13) -Breaks: kile-kde3-i18n-el (<< 4:3.5.13) +Replaces: kile-trinity-i18n-el (<< 4:14.0.0) +Breaks: kile-trinity-i18n-el (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-el Provides: kile-trinity-i18n @@ -132,8 +132,8 @@ Description: Greek (el) translations for Kile [Trinity] Package: kile-trinity-i18n-engb Architecture: all Section: tex -Replaces: kile-kde3-i18n-engb (<< 4:3.5.13) -Breaks: kile-kde3-i18n-engb (<< 4:3.5.13) +Replaces: kile-trinity-i18n-engb (<< 4:14.0.0) +Breaks: kile-trinity-i18n-engb (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-engb Provides: kile-trinity-i18n @@ -143,8 +143,8 @@ Description: British English (en_GB) translations for Kile [Trinity] Package: kile-trinity-i18n-es Architecture: all Section: tex -Replaces: kile-kde3-i18n-es (<< 4:3.5.13) -Breaks: kile-kde3-i18n-es (<< 4:3.5.13) +Replaces: kile-trinity-i18n-es (<< 4:14.0.0) +Breaks: kile-trinity-i18n-es (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-es Provides: kile-trinity-i18n @@ -154,8 +154,8 @@ Description: Spanish (es) translations for Kile [Trinity] Package: kile-trinity-i18n-et Architecture: all Section: tex -Replaces: kile-kde3-i18n-et (<< 4:3.5.13) -Breaks: kile-kde3-i18n-et (<< 4:3.5.13) +Replaces: kile-trinity-i18n-et (<< 4:14.0.0) +Breaks: kile-trinity-i18n-et (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-et Provides: kile-trinity-i18n @@ -165,8 +165,8 @@ Description: Estonian (et) translations for Kile [Trinity] Package: kile-trinity-i18n-eu Architecture: all Section: tex -Replaces: kile-kde3-i18n-eu (<< 4:3.5.13) -Breaks: kile-kde3-i18n-eu (<< 4:3.5.13) +Replaces: kile-trinity-i18n-eu (<< 4:14.0.0) +Breaks: kile-trinity-i18n-eu (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-eu Provides: kile-trinity-i18n @@ -176,8 +176,8 @@ Description: Basque (eu) translations for Kile [Trinity] Package: kile-trinity-i18n-fi Architecture: all Section: tex -Replaces: kile-kde3-i18n-fi (<< 4:3.5.13) -Breaks: kile-kde3-i18n-fi (<< 4:3.5.13) +Replaces: kile-trinity-i18n-fi (<< 4:14.0.0) +Breaks: kile-trinity-i18n-fi (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-fi Provides: kile-trinity-i18n @@ -187,8 +187,8 @@ Description: Finnish (fi) translations for Kile [Trinity] Package: kile-trinity-i18n-fr Architecture: all Section: tex -Replaces: kile-kde3-i18n-fr (<< 4:3.5.13) -Breaks: kile-kde3-i18n-fr (<< 4:3.5.13) +Replaces: kile-trinity-i18n-fr (<< 4:14.0.0) +Breaks: kile-trinity-i18n-fr (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-fr Provides: kile-trinity-i18n @@ -198,8 +198,8 @@ Description: French (fr) translations for Kile [Trinity] Package: kile-trinity-i18n-ga Architecture: all Section: tex -Replaces: kile-kde3-i18n-ga (<< 4:3.5.13) -Breaks: kile-kde3-i18n-ga (<< 4:3.5.13) +Replaces: kile-trinity-i18n-ga (<< 4:14.0.0) +Breaks: kile-trinity-i18n-ga (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-ga Provides: kile-trinity-i18n @@ -209,8 +209,8 @@ Description: Irish Gaelic (ga) translations for Kile [Trinity] Package: kile-trinity-i18n-gl Architecture: all Section: tex -Replaces: kile-kde3-i18n-gl (<< 4:3.5.13) -Breaks: kile-kde3-i18n-gl (<< 4:3.5.13) +Replaces: kile-trinity-i18n-gl (<< 4:14.0.0) +Breaks: kile-trinity-i18n-gl (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-gl Provides: kile-trinity-i18n @@ -220,8 +220,8 @@ Description: Galician (gl) translations for Kile [Trinity] Package: kile-trinity-i18n-hi Architecture: all Section: tex -Replaces: kile-kde3-i18n-hi (<< 4:3.5.13) -Breaks: kile-kde3-i18n-hi (<< 4:3.5.13) +Replaces: kile-trinity-i18n-hi (<< 4:14.0.0) +Breaks: kile-trinity-i18n-hi (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-hi Provides: kile-trinity-i18n @@ -231,8 +231,8 @@ Description: Hindi (hi) translations for Kile [Trinity] Package: kile-trinity-i18n-hu Architecture: all Section: tex -Replaces: kile-kde3-i18n-hu (<< 4:3.5.13) -Breaks: kile-kde3-i18n-hu (<< 4:3.5.13) +Replaces: kile-trinity-i18n-hu (<< 4:14.0.0) +Breaks: kile-trinity-i18n-hu (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-hu Provides: kile-trinity-i18n @@ -242,8 +242,8 @@ Description: Hungarian (hu) translations for Kile [Trinity] Package: kile-trinity-i18n-is Architecture: all Section: tex -Replaces: kile-kde3-i18n-is (<< 4:3.5.13) -Breaks: kile-kde3-i18n-is (<< 4:3.5.13) +Replaces: kile-trinity-i18n-is (<< 4:14.0.0) +Breaks: kile-trinity-i18n-is (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-is Provides: kile-trinity-i18n @@ -253,8 +253,8 @@ Description: Icelandic (is) translations for Kile [Trinity] Package: kile-trinity-i18n-it Architecture: all Section: tex -Replaces: kile-kde3-i18n-it (<< 4:3.5.13) -Breaks: kile-kde3-i18n-it (<< 4:3.5.13) +Replaces: kile-trinity-i18n-it (<< 4:14.0.0) +Breaks: kile-trinity-i18n-it (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-it Provides: kile-trinity-i18n @@ -264,8 +264,8 @@ Description: Italian (it) translations for Kile [Trinity] Package: kile-trinity-i18n-ja Architecture: all Section: tex -Replaces: kile-kde3-i18n-ja (<< 4:3.5.13) -Breaks: kile-kde3-i18n-ja (<< 4:3.5.13) +Replaces: kile-trinity-i18n-ja (<< 4:14.0.0) +Breaks: kile-trinity-i18n-ja (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-ja Provides: kile-trinity-i18n @@ -275,8 +275,8 @@ Description: Japanese (ja) translations for Kile [Trinity] Package: kile-trinity-i18n-lt Architecture: all Section: tex -Replaces: kile-kde3-i18n-lt (<< 4:3.5.13) -Breaks: kile-kde3-i18n-lt (<< 4:3.5.13) +Replaces: kile-trinity-i18n-lt (<< 4:14.0.0) +Breaks: kile-trinity-i18n-lt (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-lt Provides: kile-trinity-i18n @@ -286,8 +286,8 @@ Description: Lithuanian (lt) translations for Kile [Trinity] Package: kile-trinity-i18n-ms Architecture: all Section: tex -Replaces: kile-kde3-i18n-ms (<< 4:3.5.13) -Breaks: kile-kde3-i18n-ms (<< 4:3.5.13) +Replaces: kile-trinity-i18n-ms (<< 4:14.0.0) +Breaks: kile-trinity-i18n-ms (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-ms Provides: kile-trinity-i18n @@ -297,8 +297,8 @@ Description: Malay (ms) translations for Kile [Trinity] Package: kile-trinity-i18n-mt Architecture: all Section: tex -Replaces: kile-kde3-i18n-mt (<< 4:3.5.13) -Breaks: kile-kde3-i18n-mt (<< 4:3.5.13) +Replaces: kile-trinity-i18n-mt (<< 4:14.0.0) +Breaks: kile-trinity-i18n-mt (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Provides: kile-trinity-i18n Description: Maltese (mt) translations for Kile [Trinity] @@ -307,8 +307,8 @@ Description: Maltese (mt) translations for Kile [Trinity] Package: kile-trinity-i18n-nb Architecture: all Section: tex -Replaces: kile-kde3-i18n-nb (<< 4:3.5.13) -Breaks: kile-kde3-i18n-nb (<< 4:3.5.13) +Replaces: kile-trinity-i18n-nb (<< 4:14.0.0) +Breaks: kile-trinity-i18n-nb (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-nb Provides: kile-trinity-i18n @@ -318,8 +318,8 @@ Description: Norwegian Bookmal (nb) translations for Kile [Trinity] Package: kile-trinity-i18n-nds Architecture: all Section: tex -Replaces: kile-kde3-i18n-nds (<< 4:3.5.13) -Breaks: kile-kde3-i18n-nds (<< 4:3.5.13) +Replaces: kile-trinity-i18n-nds (<< 4:14.0.0) +Breaks: kile-trinity-i18n-nds (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-nds Provides: kile-trinity-i18n @@ -329,8 +329,8 @@ Description: Low Saxon (nds) translations for Kile [Trinity] Package: kile-trinity-i18n-nl Architecture: all Section: tex -Replaces: kile-kde3-i18n-nl (<< 4:3.5.13) -Breaks: kile-kde3-i18n-nl (<< 4:3.5.13) +Replaces: kile-trinity-i18n-nl (<< 4:14.0.0) +Breaks: kile-trinity-i18n-nl (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-nl Provides: kile-trinity-i18n @@ -340,8 +340,8 @@ Description: Dutch (nl) translations for Kile [Trinity] Package: kile-trinity-i18n-nn Architecture: all Section: tex -Replaces: kile-kde3-i18n-nn (<< 4:3.5.13) -Breaks: kile-kde3-i18n-nn (<< 4:3.5.13) +Replaces: kile-trinity-i18n-nn (<< 4:14.0.0) +Breaks: kile-trinity-i18n-nn (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-nn Provides: kile-trinity-i18n @@ -351,8 +351,8 @@ Description: Norwegian Nynorsk (nn) translations for Kile [Trinity] Package: kile-trinity-i18n-pa Architecture: all Section: tex -Replaces: kile-kde3-i18n-pa (<< 4:3.5.13) -Breaks: kile-kde3-i18n-pa (<< 4:3.5.13) +Replaces: kile-trinity-i18n-pa (<< 4:14.0.0) +Breaks: kile-trinity-i18n-pa (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-pa Provides: kile-trinity-i18n @@ -362,8 +362,8 @@ Description: Punjabi (pa) translations for Kile [Trinity] Package: kile-trinity-i18n-pl Architecture: all Section: tex -Replaces: kile-kde3-i18n-pl (<< 4:3.5.13) -Breaks: kile-kde3-i18n-pl (<< 4:3.5.13) +Replaces: kile-trinity-i18n-pl (<< 4:14.0.0) +Breaks: kile-trinity-i18n-pl (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-pl Provides: kile-trinity-i18n @@ -373,8 +373,8 @@ Description: Polish (pl) translations for Kile [Trinity] Package: kile-trinity-i18n-pt Architecture: all Section: tex -Replaces: kile-kde3-i18n-pt (<< 4:3.5.13) -Breaks: kile-kde3-i18n-pt (<< 4:3.5.13) +Replaces: kile-trinity-i18n-pt (<< 4:14.0.0) +Breaks: kile-trinity-i18n-pt (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-pt Provides: kile-trinity-i18n @@ -384,8 +384,8 @@ Description: Portuguese (pt) translations for Kile [Trinity] Package: kile-trinity-i18n-ptbr Architecture: all Section: tex -Replaces: kile-kde3-i18n-ptbr (<< 4:3.5.13) -Breaks: kile-kde3-i18n-ptbr (<< 4:3.5.13) +Replaces: kile-trinity-i18n-ptbr (<< 4:14.0.0) +Breaks: kile-trinity-i18n-ptbr (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-ptbr Provides: kile-trinity-i18n @@ -395,8 +395,8 @@ Description: Brazilian Portuguese (pt_BR) translations for Kile [Trinity] Package: kile-trinity-i18n-ro Architecture: all Section: tex -Replaces: kile-kde3-i18n-ro (<< 4:3.5.13) -Breaks: kile-kde3-i18n-ro (<< 4:3.5.13) +Replaces: kile-trinity-i18n-ro (<< 4:14.0.0) +Breaks: kile-trinity-i18n-ro (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-ro Provides: kile-trinity-i18n @@ -406,8 +406,8 @@ Description: Romanian (ro) translations for Kile [Trinity] Package: kile-trinity-i18n-ru Architecture: all Section: tex -Replaces: kile-kde3-i18n-ru (<< 4:3.5.13) -Breaks: kile-kde3-i18n-ru (<< 4:3.5.13) +Replaces: kile-trinity-i18n-ru (<< 4:14.0.0) +Breaks: kile-trinity-i18n-ru (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-ru Provides: kile-trinity-i18n @@ -417,8 +417,8 @@ Description: Russian (ru) translations for Kile [Trinity] Package: kile-trinity-i18n-rw Architecture: all Section: tex -Replaces: kile-kde3-i18n-rw (<< 4:3.5.13) -Breaks: kile-kde3-i18n-rw (<< 4:3.5.13) +Replaces: kile-trinity-i18n-rw (<< 4:14.0.0) +Breaks: kile-trinity-i18n-rw (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-rw Provides: kile-trinity-i18n @@ -428,8 +428,8 @@ Description: Kinyarwanda (rw) translations for Kile [Trinity] Package: kile-trinity-i18n-sk Architecture: all Section: tex -Replaces: kile-kde3-i18n-sk (<< 4:3.5.13) -Breaks: kile-kde3-i18n-sk (<< 4:3.5.13) +Replaces: kile-trinity-i18n-sk (<< 4:14.0.0) +Breaks: kile-trinity-i18n-sk (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-sk Provides: kile-trinity-i18n @@ -439,8 +439,8 @@ Description: Slovak (sk) translations for Kile [Trinity] Package: kile-trinity-i18n-sr Architecture: all Section: tex -Replaces: kile-kde3-i18n-sr (<< 4:3.5.13) -Breaks: kile-kde3-i18n-sr (<< 4:3.5.13) +Replaces: kile-trinity-i18n-sr (<< 4:14.0.0) +Breaks: kile-trinity-i18n-sr (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-sr Provides: kile-trinity-i18n @@ -450,8 +450,8 @@ Description: Serbian (sr) translations for Kile [Trinity] Package: kile-trinity-i18n-srlatin Architecture: all Section: tex -Replaces: kile-kde3-i18n-srlatin (<< 4:3.5.13) -Breaks: kile-kde3-i18n-srlatin (<< 4:3.5.13) +Replaces: kile-trinity-i18n-srlatin (<< 4:14.0.0) +Breaks: kile-trinity-i18n-srlatin (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-srlatin Provides: kile-trinity-i18n @@ -461,8 +461,8 @@ Description: Latin Serbian (sr@Latn) translations for Kile [Trinity] Package: kile-trinity-i18n-sv Architecture: all Section: tex -Replaces: kile-kde3-i18n-sv (<< 4:3.5.13) -Breaks: kile-kde3-i18n-sv (<< 4:3.5.13) +Replaces: kile-trinity-i18n-sv (<< 4:14.0.0) +Breaks: kile-trinity-i18n-sv (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-sv Provides: kile-trinity-i18n @@ -472,8 +472,8 @@ Description: Swedish (sv) translations for Kile [Trinity] Package: kile-trinity-i18n-ta Architecture: all Section: tex -Replaces: kile-kde3-i18n-ta (<< 4:3.5.13) -Breaks: kile-kde3-i18n-ta (<< 4:3.5.13) +Replaces: kile-trinity-i18n-ta (<< 4:14.0.0) +Breaks: kile-trinity-i18n-ta (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-ta Provides: kile-trinity-i18n @@ -483,8 +483,8 @@ Description: Tamil (ta) translations for Kile [Trinity] Package: kile-trinity-i18n-th Architecture: all Section: tex -Replaces: kile-kde3-i18n-th (<< 4:3.5.13) -Breaks: kile-kde3-i18n-th (<< 4:3.5.13) +Replaces: kile-trinity-i18n-th (<< 4:14.0.0) +Breaks: kile-trinity-i18n-th (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-th Provides: kile-trinity-i18n @@ -494,8 +494,8 @@ Description: Thai (th) translations for Kile [Trinity] Package: kile-trinity-i18n-tr Architecture: all Section: tex -Replaces: kile-kde3-i18n-tr (<< 4:3.5.13) -Breaks: kile-kde3-i18n-tr (<< 4:3.5.13) +Replaces: kile-trinity-i18n-tr (<< 4:14.0.0) +Breaks: kile-trinity-i18n-tr (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-tr Provides: kile-trinity-i18n @@ -505,8 +505,8 @@ Description: Turkish (tr) translations for Kile [Trinity] Package: kile-trinity-i18n-uk Architecture: all Section: tex -Replaces: kile-kde3-i18n-uk (<< 4:3.5.13) -Breaks: kile-kde3-i18n-uk (<< 4:3.5.13) +Replaces: kile-trinity-i18n-uk (<< 4:14.0.0) +Breaks: kile-trinity-i18n-uk (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-uk Provides: kile-trinity-i18n @@ -516,8 +516,8 @@ Description: Ukrainian (uk) translations for Kile [Trinity] Package: kile-trinity-i18n-zhcn Architecture: all Section: tex -Replaces: kile-kde3-i18n-zhcn (<< 4:3.5.13) -Breaks: kile-kde3-i18n-zhcn (<< 4:3.5.13) +Replaces: kile-trinity-i18n-zhcn (<< 4:14.0.0) +Breaks: kile-trinity-i18n-zhcn (<< 4:14.0.0) Depends: kile-trinity (>= ${source:Version}) Recommends: kde-trinity-i18n-zhcn Provides: kile-trinity-i18n diff --git a/ubuntu/maverick/applications/kile/debian/source/format b/ubuntu/maverick/applications/kile/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/kile/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/kile/debian/source/options b/ubuntu/maverick/applications/kile/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/kile/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/kima/debian/control b/ubuntu/maverick/applications/kima/debian/control index 59fc2c85b..3f2b78348 100644 --- a/ubuntu/maverick/applications/kima/debian/control +++ b/ubuntu/maverick/applications/kima/debian/control @@ -8,8 +8,8 @@ Standards-Version: 3.8.4 Package: kima-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: kima-kde3 (<< 4:3.5.13) -Breaks: kima-kde3 (<< 4:3.5.13) +Replaces: kima-trinity (<< 4:14.0.0) +Breaks: kima-trinity (<< 4:14.0.0) Description: kicker monitoring applet [Trinity] This applet monitors various temperature, frequency and fan sources in your kicker diff --git a/ubuntu/maverick/applications/kima/debian/source/format b/ubuntu/maverick/applications/kima/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/kima/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/kima/debian/source/options b/ubuntu/maverick/applications/kima/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/kima/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/kio-apt/debian/control b/ubuntu/maverick/applications/kio-apt/debian/control index ca97e58b9..46eec78e4 100644 --- a/ubuntu/maverick/applications/kio-apt/debian/control +++ b/ubuntu/maverick/applications/kio-apt/debian/control @@ -9,8 +9,8 @@ Standards-Version: 3.8.4 Package: kio-apt-trinity Architecture: any Depends: ${shlibs:Depends}, apt, adept-batch-trinity -Replaces: kio-apt-kde3 (<< 4:3.5.13) -Breaks: kio-apt-kde3 (<< 4:3.5.13) +Replaces: kio-apt-trinity (<< 4:14.0.0) +Breaks: kio-apt-trinity (<< 4:14.0.0) Description: an apt-cache ioslave for Trinity kio-apt is an ioslave which provides the apt:/ protocol. It integrates apt-cache functionalities into Konqueror, making diff --git a/ubuntu/maverick/applications/kio-apt/debian/source/format b/ubuntu/maverick/applications/kio-apt/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/kio-apt/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/kio-apt/debian/source/options b/ubuntu/maverick/applications/kio-apt/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/kio-apt/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick_automake/applications/kdmtheme/debian/cdbs/buildvars.mk b/ubuntu/maverick/applications/kio-locate/debian/cdbs/buildvars.mk index 23d4709dc..23d4709dc 100644 --- a/ubuntu/maverick_automake/applications/kdmtheme/debian/cdbs/buildvars.mk +++ b/ubuntu/maverick/applications/kio-locate/debian/cdbs/buildvars.mk diff --git a/ubuntu/maverick/applications/kio-locate/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kio-locate/debian/cdbs/debian-qt-kde.mk new file mode 100644 index 000000000..856fa4932 --- /dev/null +++ b/ubuntu/maverick/applications/kio-locate/debian/cdbs/debian-qt-kde.mk @@ -0,0 +1,110 @@ +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: + touch debian/stamp-cvs-make + +include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) +include debian/cdbs/uploaders.mk + +DEB_PATCHDIRS := debian/patches/common debian/patches + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \ + done + +clean:: + rm -f debian/stamp-cvs-make + +endif + +#common-build-indep:: debian/stamp-kde-apidox +#debian/stamp-kde-apidox: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) +# touch $@ +# +#common-install-indep:: common-install-kde-apidox +#common-install-kde-apidox:: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) +# +#clean:: +# rm -f debian/stamp-kde-apidox diff --git a/ubuntu/maverick/applications/kio-locate/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kio-locate/debian/cdbs/kde.mk new file mode 100644 index 000000000..9dbcfbafd --- /dev/null +++ b/ubuntu/maverick/applications/kio-locate/debian/cdbs/kde.mk @@ -0,0 +1,97 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Description: A class for KDE packages; sets KDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class + +ifndef _cdbs_class_kde +_cdbs_class_kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +# include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/kde/HTML + +ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/" +DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +common-build-arch common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-prehook-impl:: + mkdir -p po + -XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages + -for file in po/*pot; do \ + sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \ + done + +common-install-arch common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + +clean:: + rm -f debian/stamp-kde-apidox + rm -rf po/*.pot + +# This is a convenience target for calling manually. It's not part of +# the build process. +buildprep: clean apply-patches + $(MAKE) -f admin/Makefile.common dist + debian/rules clean + +endif diff --git a/ubuntu/maverick_automake/applications/kdmtheme/debian/cdbs/team-members b/ubuntu/maverick/applications/kio-locate/debian/cdbs/team-members index 05761af6e..05761af6e 100644 --- a/ubuntu/maverick_automake/applications/kdmtheme/debian/cdbs/team-members +++ b/ubuntu/maverick/applications/kio-locate/debian/cdbs/team-members diff --git a/ubuntu/maverick_automake/applications/kdmtheme/debian/cdbs/uploaders.mk b/ubuntu/maverick/applications/kio-locate/debian/cdbs/uploaders.mk index 31adfe31e..31adfe31e 100644 --- a/ubuntu/maverick_automake/applications/kdmtheme/debian/cdbs/uploaders.mk +++ b/ubuntu/maverick/applications/kio-locate/debian/cdbs/uploaders.mk diff --git a/ubuntu/maverick_automake/applications/kdmtheme/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kio-locate/debian/cdbs/versions.pl index 9ce11d8a3..9ce11d8a3 100644 --- a/ubuntu/maverick_automake/applications/kdmtheme/debian/cdbs/versions.pl +++ b/ubuntu/maverick/applications/kio-locate/debian/cdbs/versions.pl diff --git a/ubuntu/maverick/applications/kio-locate/debian/control b/ubuntu/maverick/applications/kio-locate/debian/control index a66f03f96..5c668f1bf 100644 --- a/ubuntu/maverick/applications/kio-locate/debian/control +++ b/ubuntu/maverick/applications/kio-locate/debian/control @@ -3,14 +3,14 @@ Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Tobi Vollebregt <tobivollebregt@gmail.com> -Build-Depends: cdbs, debhelper (>= 5), tdelibs4-trinity-dev, bzip2, python (>= 2.3), scons +Build-Depends: cdbs, debhelper (>= 5), tdelibs4-trinity-dev, bzip2, python (>= 2.3), cmake Standards-Version: 3.8.4 Package: kio-locate-trinity Architecture: any Depends: ${shlibs:Depends} -Replaces: kio-locate-kde3 (<< 4:3.5.13) -Breaks: kio-locate-kde3 (<< 4:3.5.13) +Replaces: kio-locate-trinity (<< 4:14.0.0) +Breaks: kio-locate-trinity (<< 4:14.0.0) Description: kio-slave for the locate command [Trinity] Adds support for the "locate:" and "locater:" protocols to Konqueror and other KDE applications. diff --git a/ubuntu/maverick/applications/kio-locate/debian/control.in b/ubuntu/maverick/applications/kio-locate/debian/control.in new file mode 100644 index 000000000..cabae4597 --- /dev/null +++ b/ubuntu/maverick/applications/kio-locate/debian/control.in @@ -0,0 +1,21 @@ +Source: kio-locate-trinity +Section: kde +Priority: optional +Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +XSBC-Original-Maintainer: @@@MAINTAINER@@@ +Uploaders: @@@UPLOADERS@@@ +Build-Depends: cdbs, debhelper (>= 5), tdelibs4-trinity-dev, bzip2, python (>= 2.3), cmake +Standards-Version: 3.8.4 + +Package: kio-locate-trinity +Architecture: any +Depends: ${shlibs:Depends} +Replaces: kio-locate-kde3 (<< 4:3.5.13) +Breaks: kio-locate-kde3 (<< 4:3.5.13) +Description: kio-slave for the locate command [Trinity] + Adds support for the "locate:" and "locater:" + protocols to Konqueror and other KDE applications. + . + This enables you to perform locate searches as you + would in a terminal. The result is displayed just + as a directory. diff --git a/ubuntu/maverick/applications/kio-locate/debian/rules b/ubuntu/maverick/applications/kio-locate/debian/rules index f10f5f7c1..4a1d73457 100755 --- a/ubuntu/maverick/applications/kio-locate/debian/rules +++ b/ubuntu/maverick/applications/kio-locate/debian/rules @@ -1,37 +1,28 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk - -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function +# Also include the main Trinity path +ifeq ("$(LD_LIBRARY_PATH)", "") +LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib +else +LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib +endif +export LD_LIBRARY_PATH -DEB_COMPRESS_EXCLUDE=.docbook -DEB_SCONS_PREFIX=/opt/trinity - -CONFIG_STATUS=$(DEB_BUILDDIR)/config.status -SCONS_CMD=/usr/bin/scons +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk +include debian/cdbs/debian-qt-kde.mk -common-configure-arch common-configure-indep:: common-configure-impl -common-configure-impl:: $(CONFIG_STATUS) -$(CONFIG_STATUS): - env PATH=/opt/trinity/bin:$(PATH) $(SCONS_CMD) configure prefix=$(DEB_DESTDIR)$(DEB_SCONS_PREFIX) - touch $(CONFIG_STATUS) +DEB_KDE_APIDOX := yes -common-build-arch common-build-indep:: common-build-impl -common-build-impl:: - env PATH=/opt/trinity/bin:$(PATH) $(SCONS_CMD) - rm -f doc/en/index.cache.bz2 +CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG) -common-install-arch common-install-indep:: common-install-impl -common-install-impl:: - env PATH=/opt/trinity/bin:$(PATH) DESTDIR=$(DEB_DESTDIR) $(SCONS_CMD) install +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" -clean:: - rm -rf build cache scons-mini - rm -f admin/*.pyc $(CONFIG_STATUS) +# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to +# never build in parallel, regardless of DEB_BUILD_OPTIONS. +DEB_BUILD_PARALLEL = true DEB_INSTALL_DOCS_kio-locate-trinity := -XREADME -XNEWS -XTODO -XAUTHORS diff --git a/ubuntu/maverick/applications/kio-locate/debian/source/format b/ubuntu/maverick/applications/kio-locate/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/kio-locate/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/kio-locate/debian/source/options b/ubuntu/maverick/applications/kio-locate/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/kio-locate/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/kio-umountwrapper/debian/control b/ubuntu/maverick/applications/kio-umountwrapper/debian/control index ac759122d..413c8c66b 100644 --- a/ubuntu/maverick/applications/kio-umountwrapper/debian/control +++ b/ubuntu/maverick/applications/kio-umountwrapper/debian/control @@ -8,8 +8,8 @@ Standards-Version: 3.8.4 Package: kio-umountwrapper-trinity Architecture: any Depends: ${shlibs:Depends} -Replaces: kio-umountwrapper-kde3 (<< 4:3.5.13) -Breaks: kio-umountwrapper-kde3 (<< 4:3.5.13) +Replaces: kio-umountwrapper-trinity (<< 4:14.0.0) +Breaks: kio-umountwrapper-trinity (<< 4:14.0.0) Description: progress dialog for safely removing devices in Trinity. Wrapper around kio_media_mountwrapper. Provides a progress dialog for Safely Removing of devices in Trinity. diff --git a/ubuntu/maverick/applications/kio-umountwrapper/debian/source/format b/ubuntu/maverick/applications/kio-umountwrapper/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/kio-umountwrapper/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/kio-umountwrapper/debian/source/options b/ubuntu/maverick/applications/kio-umountwrapper/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/kio-umountwrapper/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/kiosktool/debian/control b/ubuntu/maverick/applications/kiosktool/debian/control index 68d0b7404..068639c25 100644 --- a/ubuntu/maverick/applications/kiosktool/debian/control +++ b/ubuntu/maverick/applications/kiosktool/debian/control @@ -9,6 +9,8 @@ Standards-Version: 3.8.4 Package: kiosktool-trinity Architecture: any Depends: ${shlibs:Depends}, tdesudo-trinity +Replaces: kiosktool-trinity (<< 4:14.0.0) +Breaks: kiosktool-trinity (<< 4:14.0.0) Description: tool to configure the TDE kiosk framework A Point&Click tool for system administrators to enable TDE's KIOSK features or otherwise preconfigure TDE for diff --git a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1 b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1 index 62faad5d3..e44c4cd99 100644 --- a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1 +++ b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1 @@ -1,10 +1,10 @@ .\" This file was generated by kdemangen.pl -.TH KIOSKTOOL\-KDEDIRS 1 "Ago 2004" "K Desktop Environment" "A tool to set $KDEDIRS according to the current user profile." +.TH KIOSKTOOL\-TDEDIRS 1 "Ago 2004" "K Desktop Environment" "A tool to set $TDEDIRS according to the current user profile." .SH NAME -kiosktool\-kdedirs -\- A tool to set $KDEDIRS according to the current user profile. +kiosktool\-tdedirs +\- A tool to set $TDEDIRS according to the current user profile. .SH SYNOPSIS -kiosktool\-kdedirs [Qt\-options] [KDE\-options] [options] +kiosktool\-tdedirs [Qt\-options] [KDE\-options] [options] .SH DESCRIPTION .SH OPTIONS @@ -136,9 +136,9 @@ mirrors the whole layout of widgets. .SH SEE ALSO Full user documentation is available through the KDE Help Center. You can also enter the URL -.BR help:/kiosktool\-kdedirs/ +.BR help:/kiosktool\-tdedirs/ directly into konqueror or you can run -.BR "`khelpcenter help:/kiosktool\-kdedirs/'" +.BR "`khelpcenter help:/kiosktool\-tdedirs/'" from the command\-line. .br .SH AUTHORS diff --git a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages index 2d009e1db..43bd4d1b8 100644 --- a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages +++ b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages @@ -1,2 +1,2 @@ debian/kiosktool-trinity.1 -debian/kiosktool-kdedirs-trinity.1 +debian/kiosktool-tdedirs-trinity.1 diff --git a/ubuntu/maverick/applications/kiosktool/debian/source/format b/ubuntu/maverick/applications/kiosktool/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/kiosktool/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/kiosktool/debian/source/options b/ubuntu/maverick/applications/kiosktool/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/kiosktool/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/kmatplot/debian/changelog b/ubuntu/maverick/applications/kmatplot/debian/changelog new file mode 100644 index 000000000..6bd58f944 --- /dev/null +++ b/ubuntu/maverick/applications/kmatplot/debian/changelog @@ -0,0 +1,81 @@ +kmatplot-trinity (0.4-9-0ubuntu0) lucid; urgency=low + + * Initial import + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 10 Dec 2011 18:34:00 -0600 + +kmatplot (0.4-8) unstable; urgency=low + + * Orphan package + + -- Hugo van der Merwe <hvdm@debian.org> Wed, 11 Jan 2006 12:29:07 +0200 + +kmatplot (0.4-7.2) unstable; urgency=low + + * 0-day NMU during BSP. + * Build-conflicts on autoconf and autoconf2.13 to fix FTBFS on sparc. + + -- Aurelien Jarno <aurel32@debian.org> Sat, 17 Dec 2005 17:00:30 +0100 + +kmatplot (0.4-7.1) unstable; urgency=low + + * 0-day NMU during BSP. + * Rebuild for the Qt/KDE transition (closes: bug#327980). + * Rebuilt for libreadline transition (closes: bug#326338). + * Applied a patch from Andreas Jochen to make the package buildable with + gcc-4.0 (closes: bug#300867). + * Build the shared libraries with -fPIC (closes: bug#286533). + * Added support for GNU/kFreeBSD. + + -- Aurelien Jarno <aurel32@debian.org> Sat, 17 Dec 2005 15:43:54 +0100 + +kmatplot (0.4-7) unstable; urgency=low + + * Rebuild with latest unstable packages (Closes: #249482) + + -- Hugo van der Merwe <hvdm@debian.org> Wed, 15 Dec 2004 09:57:20 +0200 + +kmatplot (0.4-6) unstable; urgency=low + + * Build with new octave (Closes: #240548) + + -- Hugo van der Merwe <hvdm@debian.org> Mon, 29 Mar 2004 02:11:03 +0200 + +kmatplot (0.4-5) unstable; urgency=low + + * Update build-dependencies (Closes: #224711,#219556) + (ACK NMU by J.H.M. Dassen, thanks.) + * Build with octave-2.1.52 (Closes: #210510) + * Switched to cdbs. + * (0.4-4 never uploaded due to dead hard-drive, and long GPG key + salvaging operation - I don't keep backups of secret keys ;-) + + -- Hugo van der Merwe <hvdm@debian.org> Wed, 31 Dec 2003 18:09:41 +0200 + +kmatplot (0.4-3.1) unstable; urgency=medium + + * NMU + * [debian/control] Updated build dependencies to fix FTBFS. (Closes: #219556) + + -- J.H.M. Dassen (Ray) <jdassen@debian.org> Sun, 21 Dec 2003 12:39:58 +0100 + +kmatplot (0.4-3) unstable; urgency=low + + * Applied patch from John Lightsey fixing G++ and QT3 build + problems. (Closes: #184028) + + -- Hugo van der Merwe <hvdm@debian.org> Sun, 1 Jun 2003 12:55:36 +0200 + +kmatplot (0.4-2) unstable; urgency=low + + * Fixed SearchPath so that kmatplot finds its rc file. Thanks Laurent + Jacques. + + -- Hugo van der Merwe <hvdm@debian.org> Sun, 12 May 2002 00:01:15 +0200 + +kmatplot (0.4-1) unstable; urgency=low + + * Initial Release. (Closes: #144363) + + -- Hugo van der Merwe <hvdm@debian.org> Wed, 24 Apr 2002 17:24:30 +0200 + diff --git a/ubuntu/maverick/applications/kmatplot/debian/compat b/ubuntu/maverick/applications/kmatplot/debian/compat new file mode 100644 index 000000000..b8626c4cf --- /dev/null +++ b/ubuntu/maverick/applications/kmatplot/debian/compat @@ -0,0 +1 @@ +4 diff --git a/ubuntu/maverick/applications/kmatplot/debian/control b/ubuntu/maverick/applications/kmatplot/debian/control new file mode 100644 index 000000000..3204688e6 --- /dev/null +++ b/ubuntu/maverick/applications/kmatplot/debian/control @@ -0,0 +1,28 @@ +Source: kmatplot-trinity +Section: math +Priority: optional +Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Build-Depends: debhelper (>> 3.0.0), libtqtinterface-dev, xlibmesa-gl-dev, octave2.1-headers, cdbs, automake, autoconf, libtool, libltdl-dev +Build-Conflicts: scilab +Standards-Version: 3.8.4 + +Package: kmatplot-trinity +Architecture: any +Depends: ${shlibs:Depends} +Replaces: kmatplot-trinity (<< 4:14.0.0) +Breaks: kmatplot-trinity (<< 4:14.0.0) +Recommends: octave2.1 +Description: A Gnuplot-like tool for plotting data sets in 2D or 3D + KMatplot is a gnuplot-like tool for plotting data sets in either two or + three dimensions. It can plot many types of 2d plots, including pixmaps + and contours, and 3d surfaces. It offers a full WYSIWYG mode with + multiple objects on a single page. + . + As opposite to Gnuplot, KMatplot is very clickable, so easier to use + for unexperienced users. It can be used instead of Gnuplot with Octave + and Scilab - there are new dll functions installed in those packages, + which communicate with KMatplot through an Unix socket. Those functions + are named 'kplot', 'kimage', kmesh', ... and are similar to those found + in Octave by default. + . + The Debian package is not built with Scilab support by default. diff --git a/ubuntu/maverick/applications/kmatplot/debian/copyright b/ubuntu/maverick/applications/kmatplot/debian/copyright new file mode 100644 index 000000000..e61cc889c --- /dev/null +++ b/ubuntu/maverick/applications/kmatplot/debian/copyright @@ -0,0 +1,18 @@ +This package was debianized by Hugo van der Merwe <hvdm@debian.org> on +Wed, 24 Apr 2002 15:23:52 +0200. + +It was downloaded from http://kmatplot.sourceforge.net/ + +Upstream Author: Kamil Dobkowski <kamildobk@poczta.onet.pl> + +Copyright: + +This software is copyright (c) 2000-2002 by Kamil Dobkowski + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +On Debian systems, the complete text of the GNU General Public +License can be found in /usr/share/common-licenses/GPL file. diff --git a/ubuntu/maverick/applications/kmatplot/debian/debianrules b/ubuntu/maverick/applications/kmatplot/debian/debianrules new file mode 100644 index 000000000..7cfb17bd9 --- /dev/null +++ b/ubuntu/maverick/applications/kmatplot/debian/debianrules @@ -0,0 +1,84 @@ +#!/usr/bin/perl -w + +use Shell qw(mv cp mkdir rm) ; +use File::Find; +use Cwd; + +$origPwd = `pwd`; +chomp $origPwd; + + +if (@ARGV && $ARGV[0] eq 'cleanup') { + +if (-d "debian/tmp/usr/share/config") { + if (! -d "debian/tmp/$tde_confdir") { + system("mv debian/tmp/usr/share/config debian/tmp/$tde_confdir"); + } +} +system("rm -f `find debian/ -name \".anchors\"`"); +system("chmod 755 debian/*preinst debian/*postinst"); + +exit; +} + +$TQTDIR="/usr/share/tqt3"; +$tde_prefix="/opt/trinity"; +$tde_htmldir="$tde_prefix/share/doc/kde/HTML"; +$tde_icondir="$tde_prefix/share/icons"; +$tde_sounddir="$tde_prefix/share/sounds"; +$tde_datadir="$tde_prefix/share/apps"; +$tde_locale="$tde_prefix/share/locale"; +$tde_confdir="/etc/tde2"; +$tde_cgidir="$tde_prefix/lib/cgi-bin"; +$tde_appsdir="$tde_prefix/share/applnk"; +$tde_mimedir="$tde_prefix/share/mimelnk"; +$tde_wallpaperdir="$tde_prefix/share/wallpapers"; +$tde_bindir="$tde_prefix/bin"; +$tde_servicesdir="$tde_prefix/share/services"; +$tde_servicetypesdir="$tde_prefix/share/servicetypes"; +$tde_includedir="$tde_prefix/include/tde"; +$tde_libdir="$tde_prefix/lib"; +$tde_moduledir="$tde_prefix/lib/tde"; +$mandir="$tde_prefix/share/man"; +$infodir="$tde_prefix/share/info"; +$IDL="$tde_bindir/cuteidl"; +$DCOPIDL="$tde_bindir/dcopidl"; +$DCOPIDL2CPP="$tde_bindir/dcopidl2cpp"; +$KDB2HTML="$tde_bindir/kdb2html"; +$MCOPIDL="$tde_bindir/mcopidl"; +$ARTSCCONFIG="$tde_bindir/artsc-config"; + +if (@ARGV && $ARGV[0] eq 'echodirs') { + print STDOUT "export tde_htmldir=$tde_htmldir\n"; + print STDOUT "export tde_appsdir=$tde_appsdir\n"; + print STDOUT "export tde_icondir=$tde_icondir\n"; + print STDOUT "export tde_sounddir=$tde_sounddir\n"; + print STDOUT "export tde_datadir=$tde_datadir\n"; + print STDOUT "export tde_cgidir=$tde_cgidir\n"; + print STDOUT "export tde_locale=$tde_locale\n"; + print STDOUT "export tde_confdir=$tde_confdir\n"; + print STDOUT "export tde_mimedir=$tde_mimedir\n"; + print STDOUT "export tde_wallpaperdir=$tde_wallpaperdir\n"; + print STDOUT "export tde_bindir=$tde_bindir\n"; + print STDOUT "export tde_servicesdir=$tde_servicesdir\n"; + print STDOUT "export tde_servicetypesdir=$tde_servicetypesdir\n"; + print STDOUT "export tde_includedir=$tde_includedir\n"; + print STDOUT "export tde_libdir=$tde_libdir\n"; + print STDOUT "export tde_moduledir=$tde_moduledir\n"; + print STDOUT "export mandir=$mandir\n"; + print STDOUT "export infodir=$infodir\n"; + print STDOUT "export TQTDIR=$TQTDIR\n"; + print STDOUT "export tde_prefix=$tde_prefix\n"; + print STDOUT "export INSTALL_DATA=install -p -c -m 644\n"; + print STDOUT "export IDL=$IDL\n"; + print STDOUT "export DCOPIDL=$DCOPIDL\n"; + print STDOUT "export DCOPIDL2CPP=$DCOPIDL2CPP\n"; + print STDOUT "export KDB2HTML=$KDB2HTML\n"; + print STDOUT "export MCOPIDL=$MCOPIDL\n"; + print STDOUT "export ARTSCCONFIG=$ARTSCCONFIG\n"; + print STDOUT "configtde=--disable-debug --disable-rpath --prefix=\$(tde_prefix) --libexecdir=\$(tde_bindir) --libdir=\$(tde_libdir) --includedir=\$(tde_includedir) --with-qt-includes=/usr/include/qt --mandir=\$(mandir) --infodir=\$(infodir)\n"; + print STDOUT "configtdevelop=--disable-debug --enable-docbase --enable-kdoc2 --disable-rpath --libdir=\$(tde_libdir) --includedir=\$(tde_includedir) --with-qt-includes=/usr/include/qt --mandir=\$(mandir) --with-tdelibsdoc-dir=/usr/share/doc/tdelibs3-doc/html\n"; + print STDOUT "configtdepim=--disable-debug --with-extra-includes=/usr/include/libpisock --enable-shared --disable-rpath --libdir=\$(tde_libdir) --includedir=\$(tde_includedir) --prefix=\$(tde_prefix) --libexecdir=\$(tde_bindir) --with-qt-includes=/usr/include/qt --mandir=\$(mandir) --infodir=\$(infodir)\n"; + exit +} + diff --git a/ubuntu/maverick/applications/kmatplot/debian/dirs b/ubuntu/maverick/applications/kmatplot/debian/dirs new file mode 100644 index 000000000..e77248175 --- /dev/null +++ b/ubuntu/maverick/applications/kmatplot/debian/dirs @@ -0,0 +1 @@ +usr/bin diff --git a/ubuntu/maverick/applications/kmatplot/debian/kmatplot.1 b/ubuntu/maverick/applications/kmatplot/debian/kmatplot.1 new file mode 100644 index 000000000..0937e379f --- /dev/null +++ b/ubuntu/maverick/applications/kmatplot/debian/kmatplot.1 @@ -0,0 +1,38 @@ +.\" Hey, EMACS: -*- nroff -*- +.TH KMATPLOT 1 "May 1, 2002" +.\" Please adjust this date whenever revising the manpage. + +.SH NAME +kmatplot \- A Gnuplot-like tool for plotting data sets in 2D or 3D. + +.SH SYNOPSIS +.B kmatplot + +.SH DESCRIPTION +This manual page briefly documents +.B KMatplot. +This manual page was written for the Debian GNU/Linux distribution +because the original program does not have a manual page. +.PP +.B KMatplot +is a Gnuplot-like tool for plotting data sets in either two or +three dimensions. It can plot many types of 2d plots, including pixmaps +and contours, and 3d surfaces. It offers a full WYSIWYG mode with +multiple objects on a single page. + +As opposite to Gnuplot, +.B KMatplot is very clickable, so easier to use for unexperienced users. +It can be used instead of Gnuplot with Octave and Scilab (although the +Debian package is not built with Scilab support by default) - there are +new dll functions installed in those packages, which communicate with +.B KMatplot +through a Unix socket. Those functions are named 'kplot', 'kimage', +kmesh', and are similar to those found in Octave by default. + +Example plots can be found in the Help menu of the program. Help for +many of the Octave functions can be found within Octave, for example: +"help kplot", "help kaddaxes". + +.SH AUTHOR +This manual page was written by Hugo van der Merwe <hvdm@debian.org>, +for the Debian GNU/Linux system (but may be used by others). diff --git a/ubuntu/maverick/applications/kmatplot/debian/kmatplot.manpages b/ubuntu/maverick/applications/kmatplot/debian/kmatplot.manpages new file mode 100644 index 000000000..e093ba20c --- /dev/null +++ b/ubuntu/maverick/applications/kmatplot/debian/kmatplot.manpages @@ -0,0 +1 @@ +debian/kmatplot.1 diff --git a/ubuntu/maverick/applications/kmatplot/debian/menu b/ubuntu/maverick/applications/kmatplot/debian/menu new file mode 100644 index 000000000..6cb3a60a8 --- /dev/null +++ b/ubuntu/maverick/applications/kmatplot/debian/menu @@ -0,0 +1,2 @@ +?package(kmatplot):needs="X11" section="Apps/Math"\ + title="kmatplot" command="/usr/bin/kmatplot" diff --git a/ubuntu/maverick/applications/kmatplot/debian/rules b/ubuntu/maverick/applications/kmatplot/debian/rules new file mode 100755 index 000000000..0df925fe4 --- /dev/null +++ b/ubuntu/maverick/applications/kmatplot/debian/rules @@ -0,0 +1,6 @@ +#!/usr/bin/make -f +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +export QSETTINGSDIR=/etc +DEB_CONFIGURE_EXTRA_FLAGS := --enable-mt --with-qsettings-dir=/etc +DEB_INSTALL_DOCS_ALL := diff --git a/ubuntu/maverick/applications/kmatplot/debian/source/format b/ubuntu/maverick/applications/kmatplot/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/kmatplot/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/kmatplot/debian/source/options b/ubuntu/maverick/applications/kmatplot/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/kmatplot/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/kmplayer/debian/control b/ubuntu/maverick/applications/kmplayer/debian/control index 0af2ebb6d..f182f5290 100644 --- a/ubuntu/maverick/applications/kmplayer/debian/control +++ b/ubuntu/maverick/applications/kmplayer/debian/control @@ -14,8 +14,8 @@ Homepage: http://kmplayer.kde.org Package: kmplayer-trinity Architecture: any Depends: ${shlibs:Depends}, kmplayer-base-trinity (= ${binary:Version}), libxine1-x | libxine1 (<< 1.1.8-2) -Replaces: kmplayer-kde3 (<< 4:3.5.13) -Breaks: kmplayer-kde3 (<< 4:3.5.13) +Replaces: kmplayer-trinity (<< 4:14.0.0) +Breaks: kmplayer-trinity (<< 4:14.0.0) Recommends: kmplayer-plugin-trinity (= ${binary:Version}) Suggests: ffmpeg, vdr, xawtv, mplayer Description: media player for Trinity @@ -37,8 +37,8 @@ Description: media player for Trinity Package: kmplayer-base-trinity Architecture: any Section: kde -Replaces: kmplayer-base-kde3 (<< 4:3.5.13) -Breaks: kmplayer-base-kde3 (<< 4:3.5.13) +Replaces: kmplayer-base-trinity (<< 4:14.0.0) +Breaks: kmplayer-base-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Base files for KMPlayer [Trinity] Core files needed for KMPlayer. @@ -48,8 +48,8 @@ Description: Base files for KMPlayer [Trinity] Package: kmplayer-konq-plugins-trinity Architecture: any Section: kde -Replaces: kmplayer-konq-plugins-kde3 (<< 4:3.5.13) -Breaks: kmplayer-konq-plugins-kde3 (<< 4:3.5.13) +Replaces: kmplayer-konq-plugins-trinity (<< 4:14.0.0) +Breaks: kmplayer-konq-plugins-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, kmplayer-base-trinity (= ${binary:Version}), konqueror-trinity Description: KMPlayer plugin for KHTML/Konqueror [Trinity] This plugin enables audio/video playback inside konqueror, using Xine (with @@ -60,8 +60,8 @@ Description: KMPlayer plugin for KHTML/Konqueror [Trinity] Package: kmplayer-trinity-doc Architecture: all Section: kde -Replaces: kmplayer-kde3-doc (<< 4:3.5.13) -Breaks: kmplayer-kde3-doc (<< 4:3.5.13) +Replaces: kmplayer-trinity-doc (<< 4:14.0.0) +Breaks: kmplayer-trinity-doc (<< 4:14.0.0) Depends: ${shlibs:Depends}, kmplayer-trinity Description: Handbook for KMPlayer [Trinity] Documention for KMPlayer, a basic audio/video viewer application for KDE. diff --git a/ubuntu/maverick/applications/kmplayer/debian/source/format b/ubuntu/maverick/applications/kmplayer/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/kmplayer/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/kmplayer/debian/source/options b/ubuntu/maverick/applications/kmplayer/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/kmplayer/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/control b/ubuntu/maverick/applications/kmyfirewall/debian/control index 234dbbc8e..dfa0bd20f 100644 --- a/ubuntu/maverick/applications/kmyfirewall/debian/control +++ b/ubuntu/maverick/applications/kmyfirewall/debian/control @@ -9,8 +9,8 @@ Homepage: http://kmyfirewall.sourceforge.net/ Package: kmyfirewall-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: kmyfirewall-kde3 (<< 4:3.5.13) -Breaks: kmyfirewall-kde3 (<< 4:3.5.13) +Replaces: kmyfirewall-trinity (<< 4:14.0.0) +Breaks: kmyfirewall-trinity (<< 4:14.0.0) Description: iptables based firewall configuration tool for KDE [Trinity] KMyFirewall attempts to make it easier to setup iptables based firewalls on Linux systems. It will be the right tool if you like to have a so called diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/source/format b/ubuntu/maverick/applications/kmyfirewall/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/kmyfirewall/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/source/options b/ubuntu/maverick/applications/kmyfirewall/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/kmyfirewall/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/kmymoney/debian/control b/ubuntu/maverick/applications/kmymoney/debian/control index edca3a474..316e96269 100644 --- a/ubuntu/maverick/applications/kmymoney/debian/control +++ b/ubuntu/maverick/applications/kmymoney/debian/control @@ -9,9 +9,9 @@ Standards-Version: 3.8.4 Package: kmymoney2-trinity Architecture: any -Depends: ${shlibs:Depends}, ${shlibs:Misc}, ${misc:Depends}, -Replaces: kmymoney2-kde3 (<< 4:3.5.13) -Breaks: kmymoney2-kde3 (<< 4:3.5.13) +Depends: ${shlibs:Depends}, ${shlibs:Misc}, ${misc:Depends}, kmymoney2-common-trinity (>= ${source:Version}) +Replaces: kmymoney2-trinity (<< 4:14.0.0) +Breaks: kmymoney2-trinity (<< 4:14.0.0) Recommends: kmymoney2-plugin-aqbanking-trinity Description: personal finance manager for TDE KMyMoney is the Personal Finance Manager for TDE. It operates similar to @@ -22,8 +22,8 @@ Description: personal finance manager for TDE Package: kmymoney2-common-trinity Architecture: all Depends: ${misc:Depends} -Replaces: kmymoney2-common-kde3 (<< 4:3.5.13) -Breaks: kmymoney2-common-kde3 (<< 4:3.5.13) +Replaces: kmymoney2-common-trinity (<< 4:14.0.0) +Breaks: kmymoney2-common-trinity (<< 4:14.0.0) Recommends: kmymoney2-trinity (>= ${source:Version}) Description: KMyMoney architecture independent files This package contains architecture independent files needed for KMyMoney to @@ -33,8 +33,8 @@ Description: KMyMoney architecture independent files Package: kmymoney2-trinity-dev Section: libdevel Architecture: any -Replaces: kmymoney2-kde3-dev (<< 4:3.5.13) -Breaks: kmymoney2-kde3-dev (<< 4:3.5.13) +Replaces: kmymoney2-trinity-dev (<< 4:14.0.0) +Breaks: kmymoney2-trinity-dev (<< 4:14.0.0) Depends: ${misc:Depends}, kmymoney2-trinity (= ${binary:Version}) Description: KMyMoney development files This package contains development files needed for KMyMoney plugins. diff --git a/ubuntu/maverick/applications/kmymoney/debian/source/format b/ubuntu/maverick/applications/kmymoney/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/kmymoney/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/kmymoney/debian/source/options b/ubuntu/maverick/applications/kmymoney/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/kmymoney/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/knemo/debian/control b/ubuntu/maverick/applications/knemo/debian/control index c6c92cded..81781eeb0 100644 --- a/ubuntu/maverick/applications/knemo/debian/control +++ b/ubuntu/maverick/applications/knemo/debian/control @@ -9,8 +9,8 @@ Standards-Version: 3.8.4 Package: knemo-trinity Architecture: any Depends: kicker-trinity, net-tools, ${shlibs:Depends} -Replaces: knemo-kde3 (<< 4:3.5.13) -Breaks: knemo-kde3 (<< 4:3.5.13) +Replaces: knemo-trinity (<< 4:14.0.0) +Breaks: knemo-trinity (<< 4:14.0.0) Recommends: kcontrol-trinity, wireless-tools Description: network interfaces monitor for the Trinity systray KNemo displays an icon in the systray for every network interface. diff --git a/ubuntu/maverick/applications/knemo/debian/source/format b/ubuntu/maverick/applications/knemo/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/knemo/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/knemo/debian/source/options b/ubuntu/maverick/applications/knemo/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/knemo/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/knetload/debian/control b/ubuntu/maverick/applications/knetload/debian/control index de847a599..b7db52c53 100644 --- a/ubuntu/maverick/applications/knetload/debian/control +++ b/ubuntu/maverick/applications/knetload/debian/control @@ -9,8 +9,8 @@ Standards-Version: 3.8.4 Package: knetload-trinity Architecture: any Section: kde -Replaces: knetload-kde3 (<< 4:3.5.13) -Breaks: knetload-kde3 (<< 4:3.5.13) +Replaces: knetload-trinity (<< 4:14.0.0) +Breaks: knetload-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Conflicts: knetload Suggests: kcpuload-trinity diff --git a/ubuntu/maverick/applications/knetload/debian/source/format b/ubuntu/maverick/applications/knetload/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/knetload/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/knetload/debian/source/options b/ubuntu/maverick/applications/knetload/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/knetload/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/knetstats/debian/control b/ubuntu/maverick/applications/knetstats/debian/control index 5b8d1d972..06d91fef6 100644 --- a/ubuntu/maverick/applications/knetstats/debian/control +++ b/ubuntu/maverick/applications/knetstats/debian/control @@ -9,8 +9,8 @@ Homepage: http://knetstats.sourceforge.net/ Package: knetstats-trinity Architecture: any Depends: ${shlibs:Depends} -Replaces: knetstats-kde3 (<< 4:3.5.13) -Breaks: knetstats-kde3 (<< 4:3.5.13) +Replaces: knetstats-trinity (<< 4:14.0.0) +Breaks: knetstats-trinity (<< 4:14.0.0) Description: network interfaces monitor for the Trinity systray A simple KDE network monitor that show rx/tx LEDs of any network interface on a system tray icon diff --git a/ubuntu/maverick/applications/knetstats/debian/source/format b/ubuntu/maverick/applications/knetstats/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/knetstats/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/knetstats/debian/source/options b/ubuntu/maverick/applications/knetstats/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/knetstats/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/control b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/control index 4a5c6e077..649c51085 100644 --- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/control +++ b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/control @@ -25,8 +25,8 @@ Homepage: http://opensuse.org/Projects/KNetworkManager Package: network-manager-tde Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0) -Replaces: network-manager-tde (<< 4:3.5.13) -Breaks: network-manager-tde (<< 4:3.5.13) +Replaces: network-manager-kde (<< 4:14.0.0) +Breaks: network-manager-kde (<< 4:14.0.0) Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp Provides: knetworkmanager-trinity Conflicts: network-manager-kde diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/source/format b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/source/options b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/control b/ubuntu/maverick/applications/knetworkmanager8/debian/control index bae087017..3136bba7f 100644 --- a/ubuntu/maverick/applications/knetworkmanager8/debian/control +++ b/ubuntu/maverick/applications/knetworkmanager8/debian/control @@ -26,8 +26,8 @@ Homepage: http://opensuse.org/Projects/KNetworkManager Package: network-manager-kde-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0), network-manager (<< 0.8.9) -Replaces: network-manager-kde-kde3 (<< 4:3.5.13) -Breaks: network-manager-kde-kde3 (<< 4:3.5.13) +Replaces: network-manager-kde-trinity (<< 4:14.0.0) +Breaks: network-manager-kde-trinity (<< 4:14.0.0) Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp Provides: knetworkmanager-trinity Conflicts: network-manager-kde diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/source/format b/ubuntu/maverick/applications/knetworkmanager8/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/knetworkmanager8/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/source/options b/ubuntu/maverick/applications/knetworkmanager8/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/knetworkmanager8/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/knights/debian/control b/ubuntu/maverick/applications/knights/debian/control index 0e9ef19ce..0e64bc23f 100644 --- a/ubuntu/maverick/applications/knights/debian/control +++ b/ubuntu/maverick/applications/knights/debian/control @@ -11,8 +11,8 @@ Homepage: http://knights.sourceforge.net/ Package: knights-trinity Architecture: any Depends: ${shlibs:Depends}, tdebase-kio-plugins-trinity -Replaces: knights-kde3 (<< 4:3.5.13) -Breaks: knights-kde3 (<< 4:3.5.13) +Replaces: knights-trinity (<< 4:14.0.0) +Breaks: knights-trinity (<< 4:14.0.0) Suggests: gnuchess | crafty | sjeng, knights-themepack-trinity Description: A chess interface for the K Desktop Environment [Trinity] Knights aims to be the ultimate chess resource on your computer. diff --git a/ubuntu/maverick/applications/knights/debian/source/format b/ubuntu/maverick/applications/knights/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/knights/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/knights/debian/source/options b/ubuntu/maverick/applications/knights/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/knights/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/knowit/debian/control b/ubuntu/maverick/applications/knowit/debian/control index 735520a53..8f36965d7 100644 --- a/ubuntu/maverick/applications/knowit/debian/control +++ b/ubuntu/maverick/applications/knowit/debian/control @@ -10,8 +10,8 @@ Homepage: http://knowit.sourceforge.net/ Package: knowit-trinity Architecture: any Depends: ${shlibs:Depends} -Replaces: knowit-kde3 (<< 4:3.5.13) -Breaks: knowit-kde3 (<< 4:3.5.13) +Replaces: knowit-trinity (<< 4:14.0.0) +Breaks: knowit-trinity (<< 4:14.0.0) Description: Tool for managing notes [Trinity] KnowIt is a tool for managing notes which are organized in tree-like hierarchy. It is similar to TuxCards, diff --git a/ubuntu/maverick/applications/knowit/debian/source/format b/ubuntu/maverick/applications/knowit/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/knowit/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/knowit/debian/source/options b/ubuntu/maverick/applications/knowit/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/knowit/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/knutclient/debian/control b/ubuntu/maverick/applications/knutclient/debian/control index 5661d50df..57a2f7bf5 100644 --- a/ubuntu/maverick/applications/knutclient/debian/control +++ b/ubuntu/maverick/applications/knutclient/debian/control @@ -10,8 +10,8 @@ Homepage: http://www.knut.noveradsl.cz/knutclient/ Package: knutclient-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: knutclient-kde3 (<< 4:3.5.13) -Breaks: knutclient-kde3 (<< 4:3.5.13) +Replaces: knutclient-trinity (<< 4:14.0.0) +Breaks: knutclient-trinity (<< 4:14.0.0) Description: A KDE GUI that displays UPS statistics from NUT's upsd [Trinity] KNutClient monitors UPS statistics through the NUT (Network UPS Tools, http://www.networkupstools.org/) framework on Linux and other systems. This diff --git a/ubuntu/maverick/applications/knutclient/debian/source/format b/ubuntu/maverick/applications/knutclient/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/knutclient/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/knutclient/debian/source/options b/ubuntu/maverick/applications/knutclient/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/knutclient/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/koffice/debian/control b/ubuntu/maverick/applications/koffice/debian/control index 57911e8ba..4aba97f07 100644 --- a/ubuntu/maverick/applications/koffice/debian/control +++ b/ubuntu/maverick/applications/koffice/debian/control @@ -12,8 +12,8 @@ Homepage: http://www.koffice.org Package: koffice-trinity Architecture: all Section: kde -Replaces: koffice-kde3 (<< 4:3.5.13) -Breaks: koffice-kde3 (<< 4:3.5.13) +Replaces: koffice-trinity (<< 4:14.0.0) +Breaks: koffice-trinity (<< 4:14.0.0) Depends: karbon-trinity (>= ${source:Version}), kchart-trinity (>= ${source:Version}), kexi-trinity (>= ${source:Version}), kformula-trinity (>= ${source:Version}), kivio-trinity (>= ${source:Version}), koshell-trinity (>= ${source:Version}), kplato-trinity (>= ${source:Version}), kpresenter-trinity (>= ${source:Version}), chalk-trinity (>= ${source:Version}), kspread-trinity (>= ${source:Version}), kugar-trinity (>= ${source:Version}), kword-trinity (>= ${source:Version}), kthesaurus-trinity (>= ${source:Version}) Suggests: koffice-i18n-trinity, koffice-trinity-dev (>= ${source:Version}), koffice-trinity-doc (>= ${source:Version}), koffice-trinity-doc-html (= ${source:Version}) Description: KDE Office Suite [Trinity] @@ -26,8 +26,8 @@ Description: KDE Office Suite [Trinity] Package: koffice-trinity-doc Section: doc Architecture: all -Replaces: koffice-kde3-doc (<< 4:3.5.13) -Breaks: koffice-kde3-doc (<< 4:3.5.13) +Replaces: koffice-trinity-doc (<< 4:14.0.0) +Breaks: koffice-trinity-doc (<< 4:14.0.0) Description: developer documentation for the KDE Office Suite [Trinity] This package contains documentation for the KDE Office Suite, of use more for developers creating applications than regular users. @@ -37,8 +37,8 @@ Description: developer documentation for the KDE Office Suite [Trinity] Package: koffice-trinity-doc-html Architecture: all Section: doc -Replaces: koffice-kde3-doc-html (<< 4:3.5.13) -Breaks: koffice-kde3-doc-html (<< 4:3.5.13) +Replaces: koffice-trinity-doc-html (<< 4:14.0.0) +Breaks: koffice-trinity-doc-html (<< 4:14.0.0) Suggests: konqueror-trinity | www-browser, koffice-trinity Description: KDE Office Suite documentation in HTML format [Trinity] KOffice is an integrated office suite for KDE, the K Desktop @@ -59,8 +59,8 @@ Description: KDE Office Suite documentation in HTML format [Trinity] Package: karbon-trinity Architecture: any Section: graphics -Replaces: karbon-kde3 (<< 4:3.5.13) -Breaks: karbon-kde3 (<< 4:3.5.13) +Replaces: karbon-trinity (<< 4:14.0.0) +Breaks: karbon-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3}) Description: a vector graphics application for the KDE Office Suite Karbon is a vector graphics application. @@ -70,8 +70,8 @@ Description: a vector graphics application for the KDE Office Suite Package: kchart-trinity Architecture: any Section: kde -Replaces: kchart-kde3 (<< 4:3.5.13) -Breaks: kchart-kde3 (<< 4:3.5.13) +Replaces: kchart-trinity (<< 4:14.0.0) +Breaks: kchart-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3}) Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version}) Description: a chart drawing program for the KDE Office Suite [Trinity] @@ -83,8 +83,8 @@ Description: a chart drawing program for the KDE Office Suite [Trinity] Package: kexi-trinity Architecture: any Section: kde -Replaces: kexi-kde3 (<< 4:3.5.13) -Breaks: kexi-kde3 (<< 4:3.5.13) +Replaces: kexi-trinity (<< 4:14.0.0) +Breaks: kexi-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3}) Suggests: kexi-mdb-plugin-trinity Description: integrated database environment for the KDE Office Suite [Trinity] @@ -105,8 +105,8 @@ Description: integrated database environment for the KDE Office Suite [Trinity] Package: kformula-trinity Architecture: any Section: kde -Replaces: kformula-kde3 (<< 4:3.5.13) -Breaks: kformula-kde3 (<< 4:3.5.13) +Replaces: kformula-trinity (<< 4:14.0.0) +Breaks: kformula-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3}) Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version}) Description: a formula editor for the KDE Office Suite [Trinity] @@ -122,8 +122,8 @@ Description: a formula editor for the KDE Office Suite [Trinity] Package: kivio-trinity Architecture: any Section: graphics -Replaces: kivio-kde3 (<< 4:3.5.13) -Breaks: kivio-kde3 (<< 4:3.5.13) +Replaces: kivio-trinity (<< 4:14.0.0) +Breaks: kivio-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, kivio-data-trinity (>> 1:1.4.90.2-1), kivio-data-trinity (>> ${KDE-Version3}), kivio-data-trinity (<< ${KDE-Next-Version3}), koffice-libs-trinity (<< ${KDE-Next-Version3}) Description: a flowcharting program for the KDE Office Suite [Trinity] Kivio is a flowcharting program that offers basic flowcharting abilities, @@ -135,8 +135,8 @@ Description: a flowcharting program for the KDE Office Suite [Trinity] Package: kivio-data-trinity Architecture: all Section: graphics -Replaces: kivio-data-kde3 (<< 4:3.5.13) -Breaks: kivio-data-kde3 (<< 4:3.5.13) +Replaces: kivio-data-trinity (<< 4:14.0.0) +Breaks: kivio-data-trinity (<< 4:14.0.0) Description: data files for Kivio flowcharting program [Trinity] This package contains architecture-independent data files for Kivio, the flowcharting program shipped with the KDE Office Suite. @@ -148,8 +148,8 @@ Description: data files for Kivio flowcharting program [Trinity] Package: koshell-trinity Architecture: any Section: kde -Replaces: koshell-kde3 (<< 4:3.5.13) -Breaks: koshell-kde3 (<< 4:3.5.13) +Replaces: koshell-trinity (<< 4:14.0.0) +Breaks: koshell-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3}) Recommends: koffice-trinity, khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version}) Description: the KDE Office Suite workspace [Trinity] @@ -161,8 +161,8 @@ Description: the KDE Office Suite workspace [Trinity] Package: kplato-trinity Architecture: any Section: kde -Replaces: kplato-kde3 (<< 4:3.5.13) -Breaks: kplato-kde3 (<< 4:3.5.13) +Replaces: kplato-trinity (<< 4:14.0.0) +Breaks: kplato-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3}) Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version}) Description: an integrated project management and planning tool [Trinity] @@ -175,8 +175,8 @@ Description: an integrated project management and planning tool [Trinity] Package: kpresenter-trinity Architecture: any Section: kde -Replaces: kpresenter-kde3 (<< 4:3.5.13) -Breaks: kpresenter-kde3 (<< 4:3.5.13) +Replaces: kpresenter-trinity (<< 4:14.0.0) +Breaks: kpresenter-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, ${perl:Depends}, kpresenter-data-trinity (>> ${KDE-Version3}), kpresenter-data-trinity (<< ${KDE-Next-Version3}), koffice-libs-trinity (<< ${KDE-Next-Version3}) Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version}) Description: a presentation program for the KDE Office Suite [Trinity] @@ -189,8 +189,8 @@ Description: a presentation program for the KDE Office Suite [Trinity] Package: kpresenter-data-trinity Architecture: all Section: kde -Replaces: kpresenter-data-kde3 (<< 4:3.5.13) -Breaks: kpresenter-data-kde3 (<< 4:3.5.13) +Replaces: kpresenter-data-trinity (<< 4:14.0.0) +Breaks: kpresenter-data-trinity (<< 4:14.0.0) Description: data files for KPresenter presentation program [Trinity] This package contains architecture-independent data files for KPresenter, the presentation program shipped with the KDE Office Suite. @@ -202,8 +202,8 @@ Description: data files for KPresenter presentation program [Trinity] Package: chalk-trinity Architecture: any Section: kde -Replaces: chalk-kde3 (<< 4:3.5.13) -Breaks: chalk-kde3 (<< 4:3.5.13) +Replaces: chalk-trinity (<< 4:14.0.0) +Breaks: chalk-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, chalk-data-trinity (>> ${KDE-Version3}), chalk-data-trinity (<< ${KDE-Next-Version3}), koffice-libs-trinity (<< ${KDE-Next-Version3}) Recommends: dcraw, khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version}) Description: a pixel-based image manipulation program for the KDE Office Suite [Trinity] @@ -215,8 +215,8 @@ Description: a pixel-based image manipulation program for the KDE Office Suite [ Package: chalk-data-trinity Architecture: all Section: kde -Replaces: chalk-data-kde3 (<< 4:3.5.13) -Breaks: chalk-data-kde3 (<< 4:3.5.13) +Replaces: chalk-data-trinity (<< 4:14.0.0) +Breaks: chalk-data-trinity (<< 4:14.0.0) Description: data files for Chalk painting program [Trinity] This package contains architecture-independent data files for Chalk, the painting program shipped with the KDE Office Suite. @@ -228,8 +228,8 @@ Description: data files for Chalk painting program [Trinity] Package: kspread-trinity Architecture: any Section: kde -Replaces: kspread-kde3 (<< 4:3.5.13) -Breaks: kspread-kde3 (<< 4:3.5.13) +Replaces: kspread-trinity (<< 4:14.0.0) +Breaks: kspread-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3}) Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version}) Description: a spreadsheet for the KDE Office Suite [Trinity] @@ -242,8 +242,8 @@ Description: a spreadsheet for the KDE Office Suite [Trinity] Package: kugar-trinity Architecture: any Section: kde -Replaces: kugar-kde3 (<< 4:3.5.13) -Breaks: kugar-kde3 (<< 4:3.5.13) +Replaces: kugar-trinity (<< 4:14.0.0) +Breaks: kugar-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3}) Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version}) Description: a business report maker for the KDE Office Suite [Trinity] @@ -258,8 +258,8 @@ Description: a business report maker for the KDE Office Suite [Trinity] Package: kword-trinity Architecture: any Section: kde -Replaces: kword-kde3 (<< 4:3.5.13) -Breaks: kword-kde3 (<< 4:3.5.13) +Replaces: kword-trinity (<< 4:14.0.0) +Breaks: kword-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, kword-data-trinity (>> ${KDE-Version3}), kword-data-trinity (<< ${KDE-Next-Version3}), koffice-libs-trinity (<< ${KDE-Next-Version3}) Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version}) Description: a word processor for the KDE Office Suite [Trinity] @@ -273,8 +273,8 @@ Description: a word processor for the KDE Office Suite [Trinity] Package: kword-data-trinity Architecture: all Section: kde -Replaces: kword-data-kde3 (<< 4:3.5.13) -Breaks: kword-data-kde3 (<< 4:3.5.13) +Replaces: kword-data-trinity (<< 4:14.0.0) +Breaks: kword-data-trinity (<< 4:14.0.0) Description: data files for KWord word processor [Trinity] This package contains architecture-independent data files for KWord, the word processor shipped with the KDE Office Suite. @@ -286,8 +286,8 @@ Description: data files for KWord word processor [Trinity] Package: kthesaurus-trinity Architecture: any Section: kde -Replaces: kthesaurus-kde3 (<< 4:3.5.13) -Breaks: kthesaurus-kde3 (<< 4:3.5.13) +Replaces: kthesaurus-trinity (<< 4:14.0.0) +Breaks: kthesaurus-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3}) Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version}) Description: thesaurus for the KDE Office Suite [Trinity] @@ -300,8 +300,8 @@ Description: thesaurus for the KDE Office Suite [Trinity] Package: koffice-libs-trinity Architecture: any Section: libs -Replaces: koffice-libs-kde3 (<< 4:3.5.13) -Breaks: koffice-libs-kde3 (<< 4:3.5.13) +Replaces: koffice-libs-trinity (<< 4:14.0.0) +Breaks: koffice-libs-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, koffice-data-trinity (>> ${KDE-Version3}), koffice-data-trinity (<< ${KDE-Next-Version3}) Recommends: latex-xft-fonts, ruby, python Suggests: wordnet, texlive-base @@ -314,8 +314,8 @@ Description: common libraries and binaries for the KDE Office Suite [Trinity] Package: koffice-data-trinity Architecture: all Section: libs -Replaces: koffice-data-kde3 (<< 4:3.5.13) -Breaks: koffice-data-kde3 (<< 4:3.5.13) +Replaces: koffice-data-trinity (<< 4:14.0.0) +Breaks: koffice-data-trinity (<< 4:14.0.0) Recommends: khelpcenter-trinity | koffice-trinity-doc-html Description: common shared data for the KDE Office Suite [Trinity] This package provides the architecture-independent data that is shared @@ -326,8 +326,8 @@ Description: common shared data for the KDE Office Suite [Trinity] Package: koffice-trinity-dev Architecture: any Section: libdevel -Replaces: koffice-kde3-dev (<< 4:3.5.13) -Breaks: koffice-kde3-dev (<< 4:3.5.13) +Replaces: koffice-trinity-dev (<< 4:14.0.0) +Breaks: koffice-trinity-dev (<< 4:14.0.0) Depends: koffice-libs-trinity (= ${binary:Version}), karbon-trinity (= ${binary:Version}), kchart-trinity (= ${binary:Version}), kexi-trinity (= ${binary:Version}), kformula-trinity (= ${binary:Version}), kivio-trinity (= ${binary:Version}), koshell-trinity (= ${binary:Version}), kplato-trinity (= ${binary:Version}), kpresenter-trinity (= ${binary:Version}), chalk-trinity (= ${binary:Version}), kspread-trinity (= ${binary:Version}), kthesaurus-trinity (= ${binary:Version}), kugar-trinity (= ${binary:Version}), kword-trinity (= ${binary:Version}), tdelibs4-trinity-dev Description: common libraries for KOffice (development files) [Trinity] This package provides the development files for the libraries that are @@ -338,8 +338,8 @@ Description: common libraries for KOffice (development files) [Trinity] Package: koffice-trinity-dbg Section: libdevel Architecture: any -Replaces: koffice-kde3-dbg (<< 4:3.5.13) -Breaks: koffice-kde3-dbg (<< 4:3.5.13) +Replaces: koffice-trinity-dbg (<< 4:14.0.0) +Breaks: koffice-trinity-dbg (<< 4:14.0.0) Priority: extra Depends: koffice-libs-trinity (= ${binary:Version}) Description: debugging symbols for koffice [Trinity] diff --git a/ubuntu/maverick/applications/koffice/debian/source/format b/ubuntu/maverick/applications/koffice/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/koffice/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/koffice/debian/source/options b/ubuntu/maverick/applications/koffice/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/koffice/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/konversation/debian/control b/ubuntu/maverick/applications/konversation/debian/control index 37a646f93..5fbefbb2f 100644 --- a/ubuntu/maverick/applications/konversation/debian/control +++ b/ubuntu/maverick/applications/konversation/debian/control @@ -12,8 +12,8 @@ Homepage: http://konversation.kde.org/ Package: konversation-trinity Architecture: any Depends: ${shlibs:Depends} -Replaces: konversation-kde3 (<< 4:3.5.13) -Breaks: konversation-kde3 (<< 4:3.5.13) +Replaces: konversation-trinity (<< 4:14.0.0) +Breaks: konversation-trinity (<< 4:14.0.0) Recommends: python, ruby Suggests: libsoap-lite-perl Description: user friendly Internet Relay Chat (IRC) client for KDE [Trinity] @@ -37,8 +37,8 @@ Description: user friendly Internet Relay Chat (IRC) client for KDE [Trinity] Package: konversation-trinity-dbg Architecture: any Priority: extra -Replaces: konversation-kde3-dbg (<< 4:3.5.13) -Breaks: konversation-kde3-dbg (<< 4:3.5.13) +Replaces: konversation-trinity-dbg (<< 4:14.0.0) +Breaks: konversation-trinity-dbg (<< 4:14.0.0) Depends: konversation-trinity (= ${binary:Version}) Recommends: tdelibs-trinity-dbg Description: debugging symbols for konversation diff --git a/ubuntu/maverick/applications/konversation/debian/source/format b/ubuntu/maverick/applications/konversation/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/konversation/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/konversation/debian/source/options b/ubuntu/maverick/applications/konversation/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/konversation/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/kopete-otr/debian/control b/ubuntu/maverick/applications/kopete-otr/debian/control index a6fd2d0c7..ba54b5a52 100644 --- a/ubuntu/maverick/applications/kopete-otr/debian/control +++ b/ubuntu/maverick/applications/kopete-otr/debian/control @@ -10,8 +10,8 @@ Homepage: http://kopete-otr.follefuder.org/ Package: kopete-otr-trinity Architecture: any Depends: ${shlibs:Depends} -Replaces: kopete-otr-kde3 (<< 4:3.5.13) -Breaks: kopete-otr-kde3 (<< 4:3.5.13) +Replaces: kopete-otr-trinity (<< 4:14.0.0) +Breaks: kopete-otr-trinity (<< 4:14.0.0) Description: Off-The-Record encryption for Kopete [Trinity] This plugin enables Off-The-Record encryption for the KDE instant messenger Kopete. Using this plugin you can encrypt chatsessions to other diff --git a/ubuntu/maverick/applications/kopete-otr/debian/source/format b/ubuntu/maverick/applications/kopete-otr/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/kopete-otr/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/kopete-otr/debian/source/options b/ubuntu/maverick/applications/kopete-otr/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/kopete-otr/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/kpicosim/debian/control b/ubuntu/maverick/applications/kpicosim/debian/control index 329129a04..ea7e0db48 100644 --- a/ubuntu/maverick/applications/kpicosim/debian/control +++ b/ubuntu/maverick/applications/kpicosim/debian/control @@ -8,8 +8,8 @@ Standards-Version: 3.8.4 Package: kpicosim-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: kpicosim-kde3 (<< 4:3.5.13) -Breaks: kpicosim-kde3 (<< 4:3.5.13) +Replaces: kpicosim-trinity (<< 4:14.0.0) +Breaks: kpicosim-trinity (<< 4:14.0.0) Description: IDE and simulator for the Xilinx PicoBlaze-3 [Trinity] kpicosim is a development environment for the Xilinx PicoBlaze-3 soft-core processor for the KDE Desktop (Linux). diff --git a/ubuntu/maverick/applications/kpicosim/debian/source/format b/ubuntu/maverick/applications/kpicosim/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/kpicosim/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/kpicosim/debian/source/options b/ubuntu/maverick/applications/kpicosim/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/kpicosim/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/kpilot/debian/control b/ubuntu/maverick/applications/kpilot/debian/control index 44ba65f05..da2241070 100644 --- a/ubuntu/maverick/applications/kpilot/debian/control +++ b/ubuntu/maverick/applications/kpilot/debian/control @@ -12,8 +12,8 @@ Standards-Version: 3.8.4 Package: kpilot-trinity Section: utils Architecture: any -Replaces: kpilot-kde3 (<< 4:3.5.13) -Breaks: kpilot-kde3 (<< 4:3.5.13) +Replaces: kpilot-trinity (<< 4:14.0.0) +Breaks: kpilot-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 0.5) | debconf-2.0 Suggests: knotes-trinity, korganizer-trinity Description: TDE Palm Pilot hot-sync tool diff --git a/ubuntu/maverick/applications/kpilot/debian/source/format b/ubuntu/maverick/applications/kpilot/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/kpilot/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/kpilot/debian/source/options b/ubuntu/maverick/applications/kpilot/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/kpilot/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/control b/ubuntu/maverick/applications/kpowersave.cmake/debian/control index 2cab05a96..1ec23555d 100644 --- a/ubuntu/maverick/applications/kpowersave.cmake/debian/control +++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/control @@ -10,8 +10,8 @@ Homepage: http://sourceforge.net/projects/powersave/ Package: kpowersave-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, hal (>= 0.5.8.1) -Replaces: kpowersave-kde3 (<< 4:3.5.13) -Breaks: kpowersave-kde3 (<< 4:3.5.13) +Replaces: kpowersave-trinity (<< 4:14.0.0) +Breaks: kpowersave-trinity (<< 4:14.0.0) Description: HAL based power management applet for Trinity KPowersave is a TDE systray applet which allows to control the power management settings and policies of your computer. diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/source/format b/ubuntu/maverick/applications/kpowersave.cmake/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/source/options b/ubuntu/maverick/applications/kpowersave.cmake/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/kpowersave/debian/control b/ubuntu/maverick/applications/kpowersave/debian/control index 886aab9b3..45b18d711 100644 --- a/ubuntu/maverick/applications/kpowersave/debian/control +++ b/ubuntu/maverick/applications/kpowersave/debian/control @@ -11,8 +11,8 @@ Homepage: http://sourceforge.net/projects/powersave/ Package: kpowersave-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, hal (>= 0.5.8.1) -Replaces: kpowersave-kde3 (<< 4:3.5.13) -Breaks: kpowersave-kde3 (<< 4:3.5.13) +Replaces: kpowersave-trinity (<< 4:14.0.0) +Breaks: kpowersave-trinity (<< 4:14.0.0) Description: HAL based power management applet for Trinity KPowersave is a KDE systray applet which allows to control the power management settings and policies of your computer. diff --git a/ubuntu/maverick/applications/kpowersave/debian/source/format b/ubuntu/maverick/applications/kpowersave/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/kpowersave/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/kpowersave/debian/source/options b/ubuntu/maverick/applications/kpowersave/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/kpowersave/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/kradio/debian/control b/ubuntu/maverick/applications/kradio/debian/control index cc803208e..3631e61e3 100644 --- a/ubuntu/maverick/applications/kradio/debian/control +++ b/ubuntu/maverick/applications/kradio/debian/control @@ -9,8 +9,8 @@ Homepage: http://kradio.sourceforge.net/ Package: kradio-trinity Architecture: any Depends: ${shlibs:Depends} -Replaces: kradio-kde3 (<< 4:3.5.13) -Breaks: kradio-kde3 (<< 4:3.5.13) +Replaces: kradio-trinity (<< 4:14.0.0) +Breaks: kradio-trinity (<< 4:14.0.0) Description: Comfortable Radio Application for KDE [Trinity] KRadio is a comfortable radio application for KDE 3.x with support for V4L and V4L2 radio cards drivers. diff --git a/ubuntu/maverick/applications/kradio/debian/source/format b/ubuntu/maverick/applications/kradio/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/kradio/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/kradio/debian/source/options b/ubuntu/maverick/applications/kradio/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/kradio/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/krename/debian/control b/ubuntu/maverick/applications/krename/debian/control index 42389bc1a..a9a37b47c 100644 --- a/ubuntu/maverick/applications/krename/debian/control +++ b/ubuntu/maverick/applications/krename/debian/control @@ -9,8 +9,8 @@ Standards-Version: 3.8.4 Package: krename-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: krename-kde3 (<< 4:3.5.13) -Breaks: krename-kde3 (<< 4:3.5.13) +Replaces: krename-trinity (<< 4:14.0.0) +Breaks: krename-trinity (<< 4:14.0.0) Description: Powerful batch renamer for KDE 3.x [Trinity] This package contains a very powerful batch file renamer for Trinity which can rename a list of files based on a set of expressions. diff --git a/ubuntu/maverick/applications/krename/debian/source/format b/ubuntu/maverick/applications/krename/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/krename/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/krename/debian/source/options b/ubuntu/maverick/applications/krename/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/krename/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/krusader/debian/control b/ubuntu/maverick/applications/krusader/debian/control index cf8f42e14..df68f5511 100644 --- a/ubuntu/maverick/applications/krusader/debian/control +++ b/ubuntu/maverick/applications/krusader/debian/control @@ -10,8 +10,8 @@ Homepage: http://krusader.sourceforge.net Package: krusader-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: krusader-kde3 (<< 4:3.5.13) -Breaks: krusader-kde3 (<< 4:3.5.13) +Replaces: krusader-trinity (<< 4:14.0.0) +Breaks: krusader-trinity (<< 4:14.0.0) Suggests: md5deep | cfv, kedit-trinity, khexedit-trinity, konsole-trinity, kmail-trinity, krename-trinity, kdiff3-trinity | kompare-trinity | xxdiff, ark-trinity, arj, bzip2, cpio, lha, unrar | unrar-free | rar, rpm, unace, unzip, zip, p7zip, tdebase-trinity-bin, @@ -38,8 +38,8 @@ Description: twin-panel (commander-style) file manager for KDE (and other deskto Package: krusader-trinity-dbg Section: devel Architecture: any -Replaces: krusader-kde3-dbg (<< 4:3.5.13) -Breaks: krusader-kde3-dbg (<< 4:3.5.13) +Replaces: krusader-trinity-dbg (<< 4:14.0.0) +Breaks: krusader-trinity-dbg (<< 4:14.0.0) Priority: extra Depends: krusader-trinity (= ${binary:Version}) Description: debugging symbols for krusader-trinity diff --git a/ubuntu/maverick/applications/krusader/debian/source/format b/ubuntu/maverick/applications/krusader/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/krusader/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/krusader/debian/source/options b/ubuntu/maverick/applications/krusader/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/krusader/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/control b/ubuntu/maverick/applications/ksplash-engine-moodin/debian/control index c4a15afc4..25f0639e4 100644 --- a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/control +++ b/ubuntu/maverick/applications/ksplash-engine-moodin/debian/control @@ -10,8 +10,8 @@ Standards-Version: 3.8.4 Package: ksplash-engine-moodin-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: ksplash-engine-moodin-kde3 (<< 4:3.5.13) -Breaks: ksplash-engine-moodin-kde3 (<< 4:3.5.13) +Replaces: ksplash-engine-moodin-trinity (<< 4:14.0.0) +Breaks: ksplash-engine-moodin-trinity (<< 4:14.0.0) Description: fading splash screen engine for Trinity Heavily customizable engine for various types of themes. . diff --git a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/source/format b/ubuntu/maverick/applications/ksplash-engine-moodin/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/ksplash-engine-moodin/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/source/options b/ubuntu/maverick/applications/ksplash-engine-moodin/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/ksplash-engine-moodin/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/ksquirrel/debian/control b/ubuntu/maverick/applications/ksquirrel/debian/control index 147fff2eb..d2c01e591 100644 --- a/ubuntu/maverick/applications/ksquirrel/debian/control +++ b/ubuntu/maverick/applications/ksquirrel/debian/control @@ -16,8 +16,8 @@ Standards-Version: 3.8.4 Package: ksquirrel-trinity Architecture: any Depends: libksquirrel0-trinity, ${shlibs:Depends}, ${misc:Depends} -Replaces: ksquirrel-kde3 (<< 4:3.5.13) -Breaks: ksquirrel-kde3 (<< 4:3.5.13) +Replaces: ksquirrel-trinity (<< 4:14.0.0) +Breaks: ksquirrel-trinity (<< 4:14.0.0) Description: Powerful Trinity image viewer KSquirrel is an image viewer for KDE with disk navigator, file tree, multiple directory view, thumbnails, extended thumbnails, dynamic diff --git a/ubuntu/maverick/applications/ksquirrel/debian/source/format b/ubuntu/maverick/applications/ksquirrel/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/ksquirrel/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/ksquirrel/debian/source/options b/ubuntu/maverick/applications/ksquirrel/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/ksquirrel/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/kstreamripper/debian/control b/ubuntu/maverick/applications/kstreamripper/debian/control index 47563dcb8..96ea4651d 100644 --- a/ubuntu/maverick/applications/kstreamripper/debian/control +++ b/ubuntu/maverick/applications/kstreamripper/debian/control @@ -8,8 +8,8 @@ Standards-Version: 3.8.4 Package: kstreamripper-trinity Architecture: any Depends: ${shlibs:Depends}, streamripper -Replaces: kstreamripper-kde3 (<< 4:3.5.13) -Breaks: kstreamripper-kde3 (<< 4:3.5.13) +Replaces: kstreamripper-trinity (<< 4:14.0.0) +Breaks: kstreamripper-trinity (<< 4:14.0.0) Description: TDE frontend for streamripper KStreamRipper is a small frontend for the streamripper command line utility. Streamripper captures internet shoutcast radio streams diff --git a/ubuntu/maverick/applications/kstreamripper/debian/source/format b/ubuntu/maverick/applications/kstreamripper/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/kstreamripper/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/kstreamripper/debian/source/options b/ubuntu/maverick/applications/kstreamripper/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/kstreamripper/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/ksystemlog/debian/control b/ubuntu/maverick/applications/ksystemlog/debian/control index abeeea972..4dc7c09a5 100644 --- a/ubuntu/maverick/applications/ksystemlog/debian/control +++ b/ubuntu/maverick/applications/ksystemlog/debian/control @@ -10,8 +10,8 @@ Standards-Version: 3.8.4 Package: ksystemlog-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: ksystemlog-kde3 (<< 4:3.5.13) -Breaks: ksystemlog-kde3 (<< 4:3.5.13) +Replaces: ksystemlog-trinity (<< 4:14.0.0) +Breaks: ksystemlog-trinity (<< 4:14.0.0) Description: system log viewer tool for Trinity ksystemlog is a system log viewer tool for Trinity. . diff --git a/ubuntu/maverick/applications/ksystemlog/debian/source/format b/ubuntu/maverick/applications/ksystemlog/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/ksystemlog/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/ksystemlog/debian/source/options b/ubuntu/maverick/applications/ksystemlog/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/ksystemlog/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/ktechlab/debian/control b/ubuntu/maverick/applications/ktechlab/debian/control index a7a59162a..7bc68b3c5 100644 --- a/ubuntu/maverick/applications/ktechlab/debian/control +++ b/ubuntu/maverick/applications/ktechlab/debian/control @@ -8,8 +8,8 @@ Standards-Version: 3.8.4 Package: ktechlab-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: ktechlab-kde3 (<< 4:3.5.13) -Breaks: ktechlab-kde3 (<< 4:3.5.13) +Replaces: ktechlab-trinity (<< 4:14.0.0) +Breaks: ktechlab-trinity (<< 4:14.0.0) Recommends: gputils Description: circuit simulator for microcontrollers and electronics [Trinity] KTechlab is a circuit simulator with a nice, clickable and discoverable diff --git a/ubuntu/maverick/applications/ktechlab/debian/source/format b/ubuntu/maverick/applications/ktechlab/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/ktechlab/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/ktechlab/debian/source/options b/ubuntu/maverick/applications/ktechlab/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/ktechlab/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/ktorrent/debian/control b/ubuntu/maverick/applications/ktorrent/debian/control index ada1f4cb0..4438d11ce 100644 --- a/ubuntu/maverick/applications/ktorrent/debian/control +++ b/ubuntu/maverick/applications/ktorrent/debian/control @@ -2,14 +2,14 @@ Source: ktorrent-trinity Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Build-Depends: debhelper (>= 5.0), cdbs, docbook2x, tdelibs4-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5.0), cdbs, docbook2x, tdelibs4-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, libavahi-tqt-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: ktorrent-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: ktorrent-kde3 (<< 4:3.5.13) -Breaks: ktorrent-kde3 (<< 4:3.5.13) +Replaces: ktorrent-trinity (<< 4:14.0.0) +Breaks: ktorrent-trinity (<< 4:14.0.0) Suggests: php5-cli Recommends: tdebase-kio-plugins-trinity Description: BitTorrent client for Trinity diff --git a/ubuntu/maverick/applications/ktorrent/debian/source/format b/ubuntu/maverick/applications/ktorrent/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/ktorrent/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/ktorrent/debian/source/options b/ubuntu/maverick/applications/ktorrent/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/ktorrent/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/kuickshow/debian/control b/ubuntu/maverick/applications/kuickshow/debian/control index 49b582716..3cf2ee2de 100644 --- a/ubuntu/maverick/applications/kuickshow/debian/control +++ b/ubuntu/maverick/applications/kuickshow/debian/control @@ -8,8 +8,8 @@ Standards-Version: 3.8.4 Package: kuickshow-trinity Section: graphics Architecture: any -Replaces: kuickshow-kde3 (<< 4:3.5.13) -Breaks: kuickshow-kde3 (<< 4:3.5.13) +Replaces: kuickshow-trinity (<< 4:14.0.0) +Breaks: kuickshow-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: KDE image/slideshow viewer [Trinity] diff --git a/ubuntu/maverick/applications/kuickshow/debian/source/format b/ubuntu/maverick/applications/kuickshow/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/kuickshow/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/kuickshow/debian/source/options b/ubuntu/maverick/applications/kuickshow/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/kuickshow/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/kvirc/debian/control b/ubuntu/maverick/applications/kvirc/debian/control index 01e7eb13a..8f5023ee6 100644 --- a/ubuntu/maverick/applications/kvirc/debian/control +++ b/ubuntu/maverick/applications/kvirc/debian/control @@ -11,8 +11,8 @@ Homepage: http://kvirc.net/ Package: kvirc-trinity Architecture: any Depends: kvirc-data-trinity (= ${source:Version}), ${shlibs:Depends} -Replaces: kvirc-kde3 (<< 4:3.5.13) -Breaks: kvirc-kde3 (<< 4:3.5.13) +Replaces: kvirc-trinity (<< 4:14.0.0) +Breaks: kvirc-trinity (<< 4:14.0.0) Description: Trinity based next generation IRC client with module support A highly configurable graphical IRC client with an MDI interface, built-in scripting language, support for IRC DCC, drag & drop file @@ -26,8 +26,8 @@ Description: Trinity based next generation IRC client with module support Package: kvirc-data-trinity Section: net Architecture: all -Replaces: kvirc-data-kde3 (<< 4:3.5.13) -Breaks: kvirc-data-kde3 (<< 4:3.5.13) +Replaces: kvirc-data-trinity (<< 4:14.0.0) +Breaks: kvirc-data-trinity (<< 4:14.0.0) Depends: kvirc-trinity (>= ${source:Version}) Description: Data files for KVIrc This package contains the architecture-independent data needed by KVIrc in @@ -43,8 +43,8 @@ Description: Data files for KVIrc Package: kvirc-trinity-dev Section: devel Architecture: any -Replaces: kvirc-kde3-dev (<< 4:3.5.13) -Breaks: kvirc-kde3-dev (<< 4:3.5.13) +Replaces: kvirc-trinity-dev (<< 4:14.0.0) +Breaks: kvirc-trinity-dev (<< 4:14.0.0) Depends: kvirc-trinity (>= ${source:Version}) Description: Development files for KVIrc This package contains KVIrc libraries and include files you need if you diff --git a/ubuntu/maverick/applications/kvirc/debian/source/format b/ubuntu/maverick/applications/kvirc/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/kvirc/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/kvirc/debian/source/options b/ubuntu/maverick/applications/kvirc/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/kvirc/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/kvkbd/debian/control b/ubuntu/maverick/applications/kvkbd/debian/control index f4a40a1e8..e82a50439 100644 --- a/ubuntu/maverick/applications/kvkbd/debian/control +++ b/ubuntu/maverick/applications/kvkbd/debian/control @@ -9,8 +9,8 @@ Homepage: http://pan4os.info/main/index.php Package: kvkbd-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: kvkbd-kde3 (<< 4:3.5.13) -Breaks: kvkbd-kde3 (<< 4:3.5.13) +Replaces: kvkbd-trinity (<< 4:14.0.0) +Breaks: kvkbd-trinity (<< 4:14.0.0) Description: Virtual keyboard for KDE [Trinity] Virtual keyboard for KDE for use with accessibility. Application contains a systray widget as well as a dockwidget. diff --git a/ubuntu/maverick/applications/kvkbd/debian/source/format b/ubuntu/maverick/applications/kvkbd/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/kvkbd/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/kvkbd/debian/source/options b/ubuntu/maverick/applications/kvkbd/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/kvkbd/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/kvpnc/debian/README.Debian b/ubuntu/maverick/applications/kvpnc/debian/README.Debian new file mode 100644 index 000000000..a65e1a72c --- /dev/null +++ b/ubuntu/maverick/applications/kvpnc/debian/README.Debian @@ -0,0 +1,32 @@ +kvpnc for Debian +---------------- + +kvpnc for Debian uses su-to-root from menu package instead kdesu. + +Howto setup kvpnc for use without root password using sudo: + + * Install sudo + + aptitude install sudo + + * Edit /etc/sudoers + + # Cmnd alias specification + Cmnd_Alias KVPNC = /usr/bin/kvpnc + + # User privilege specification + ALL ALL=NOPASSWD:KVPNC + + * Edit desktop link /usr/share/applications/kde/Internet/kvpnc.desktop + + * replace the folling lines: + + Exec=su-to-root -X -c /usr/bin/kvpnc + X-KDE-SubstituteUID=true + + with: + + Exec=sudo kvpnc + X-KDE-SubstituteUID=false + + -- Fathi Boudra <fboudra@free.fr>, Thu, 18 May 2006 15:17:52 +0100 diff --git a/ubuntu/maverick/applications/kvpnc/debian/changelog b/ubuntu/maverick/applications/kvpnc/debian/changelog new file mode 100644 index 000000000..f8be4973c --- /dev/null +++ b/ubuntu/maverick/applications/kvpnc/debian/changelog @@ -0,0 +1,6 @@ +kvpnc-trinity (0.9.6a-1) lucid; urgency=low + + * Initial build + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Tue, 06 Dec 2011 12:26:00 -0600 + diff --git a/ubuntu/maverick/applications/kdmtheme/debian/compat b/ubuntu/maverick/applications/kvpnc/debian/compat index 7ed6ff82d..7ed6ff82d 100644 --- a/ubuntu/maverick/applications/kdmtheme/debian/compat +++ b/ubuntu/maverick/applications/kvpnc/debian/compat diff --git a/ubuntu/maverick/applications/kvpnc/debian/control b/ubuntu/maverick/applications/kvpnc/debian/control new file mode 100644 index 000000000..6a8196662 --- /dev/null +++ b/ubuntu/maverick/applications/kvpnc/debian/control @@ -0,0 +1,22 @@ +Source: kvpnc-trinity +Section: kde +Priority: optional +Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org> +Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs4-trinity-dev, libgcrypt11-dev, automake, autoconf, libtool, libltdl-dev +Standards-Version: 3.8.4 + +Package: kvpnc-trinity +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, menu, net-tools, psmisc, tdebase-trinity-bin | gksu | sux, module-init-tools | modutils +Replaces: kvpnc-trinity (<< 4:14.0.0) +Breaks: kvpnc-trinity (<< 4:14.0.0) +Suggests: iptables, openssl, openvpn, racoon, vpnc, pptp-linux, openswan, xl2tpd, openct, opensc +Description: vpn clients frontend for TDE + KVpnc is a TDE frontend for various vpn clients. + . + It supports : + * Cisco-compatible VPN client (vpnc) + * IPSec (freeswan, openswan, racoon) + * Point-to-Point Tunneling Protocol (PPTP) client (pptp-linux) + * Virtual Private Network daemon (openvpn) diff --git a/ubuntu/maverick/applications/kvpnc/debian/copyright b/ubuntu/maverick/applications/kvpnc/debian/copyright new file mode 100644 index 000000000..d6c60aaf4 --- /dev/null +++ b/ubuntu/maverick/applications/kvpnc/debian/copyright @@ -0,0 +1,65 @@ +This package was debianized by Fathi Boudra <fboudra@free.fr> on +Thu, 26 Jan 2006 11:49:10 +0100. + +It was downloaded from http://home.gna.org/kvpnc + +Copyright Holder: Christoph Thielecke <crissi99@gmx.de> + +Copyright for ciscopasswddecoder : + (C) 2005 hal9000 <hal9000@evilscientists.de> + (C) 2005 Maurice Massar <vpnc@unix-ag.uni-kl.de> + (C) 2005 Christoph Thielecke <crissi99@gmx.de> + +Copyright for openvpn-kde-dialogs.pl: + Alon Bar-Lev <alon.barlev@gmail.com> + +kvpnc contains parts of code from klcc project: + Peter Simonsson <psn@linux.se> + +Copyright for kfeedback (user feedback form and mailing utilities) and +parts of code from kdirstat project: + Stefan Hundhammer <sh@suse.de> + +preferencesdialog contains parts of code from konversation project +(konvisettingsdialog.cpp) + (C) 2006 John Tapsell <johnflux@gmail.com> + (C) 2006 Eike Hein <hein@kde.org> + +kfeedback license: + + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL'. + +kvpnc license: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-2'. + diff --git a/ubuntu/maverick/applications/kvpnc/debian/docs b/ubuntu/maverick/applications/kvpnc/debian/docs new file mode 100644 index 000000000..724e08449 --- /dev/null +++ b/ubuntu/maverick/applications/kvpnc/debian/docs @@ -0,0 +1,2 @@ +README +TODO diff --git a/ubuntu/maverick/applications/kvpnc/debian/kvpnc-trinity.1 b/ubuntu/maverick/applications/kvpnc/debian/kvpnc-trinity.1 new file mode 100644 index 000000000..4111d5ff4 --- /dev/null +++ b/ubuntu/maverick/applications/kvpnc/debian/kvpnc-trinity.1 @@ -0,0 +1,69 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH KVPNC 1 "novembre 16, 2005" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp <n> insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +kvpnc \- vpn clients frontend for KDE +.SH SYNOPSIS +.B kvpnc +.RI [ options ] +.br +.SH DESCRIPTION +.\" TeX users may be more comfortable with the \fB<whatever>\fP and +.\" \fI<whatever>\fP escape sequences to invode bold face and italics, +.\" respectively. +\fBkvpnc\fP is a KDE frontend for various vpn clients. +.br +It supports : +.br + * Cisco-compatible VPN client (vpnc) +.br + * IPSec (freeswan, openswan, racoon) +.br + * Point-to-Point Tunneling Protocol (PPTP) client (pptp-linux) +.br + * Virtual Private Network daemon (openvpn) +.SH OPTIONS +All KDE and Qt programs accept some common command\-line options. +.br +Kvpnc has no application\-specific options. +.PP +.TP +\fB\-\-help\fR +Show help about options +.TP +\fB\-\-help\-qt\fR +Show Qt specific options +.TP +\fB\-\-help\-kde\fR +Show KDE specific options +.TP +\fB\-\-help\-all\fR +Show all options +.TP +\fB\-\-author\fR +Show author information +.TP +\fB\-v\fR, \fB\-\-version\fR +Show version information +.TP +\fB\-\-license\fR +Show license information +.SH AUTHOR +kvpnc was written by Christoph Thielecke <crissi99@gmx.de>. +.PP +This manual page was written by Fathi Boudra <fboudra@free.fr>, +for the Debian project (but may be used by others). diff --git a/ubuntu/maverick/applications/kvpnc/debian/menu b/ubuntu/maverick/applications/kvpnc/debian/menu new file mode 100644 index 000000000..1f3e59d31 --- /dev/null +++ b/ubuntu/maverick/applications/kvpnc/debian/menu @@ -0,0 +1,6 @@ +?package(kvpnc):\ + needs="X11"\ + section="Applications/Network/Communication"\ + title="kvpnc"\ + hints="KDE"\ + command="su-to-root -X -c kvpnc" diff --git a/ubuntu/maverick/applications/kvpnc/debian/patches/10_su-to-root_usage.diff b/ubuntu/maverick/applications/kvpnc/debian/patches/10_su-to-root_usage.diff new file mode 100644 index 000000000..9630fd3f8 --- /dev/null +++ b/ubuntu/maverick/applications/kvpnc/debian/patches/10_su-to-root_usage.diff @@ -0,0 +1,11 @@ +--- a/src/kvpnc.desktop ++++ b/src/kvpnc.desktop +@@ -18,7 +18,7 @@ + GenericName[xx]=xxVPN Client GUIxx + + Categories=Network;RemoteAccess;KDE;Qt +-Exec=kvpnc ++Exec=su-to-root -X -c /opt/trinity/bin/kvpnc + X-KDE-SubstituteUID=true + Icon=kvpnc + Type=Application diff --git a/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff new file mode 100644 index 000000000..70fd0192e --- /dev/null +++ b/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff @@ -0,0 +1,29 @@ +diff --git a/src/main.cpp b/src/main.cpp +index 7c45fcf..b933832 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -24,6 +24,7 @@ + #include <kmessagebox.h> + #include <kmainwindow.h> + #include <kapp.h> ++#include <kuser.h> + + #include <klocale.h> + #include <dcopclient.h> +@@ -134,11 +135,11 @@ int main ( int argc, char *argv[] ) + } + else + { +-// if (getenv("USER") != "root") +-// { +-// KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); +-// exit(0); +-// } ++ if (getenv("USER") != "root") ++ { ++ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); ++ exit(0); ++ } + + KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + diff --git a/ubuntu/maverick/applications/kvpnc/debian/patches/series b/ubuntu/maverick/applications/kvpnc/debian/patches/series new file mode 100644 index 000000000..09040ada9 --- /dev/null +++ b/ubuntu/maverick/applications/kvpnc/debian/patches/series @@ -0,0 +1,2 @@ +10_su-to-root_usage.diff +13_add_kuser_issuperuser.diff diff --git a/ubuntu/maverick/applications/kvpnc/debian/rules b/ubuntu/maverick/applications/kvpnc/debian/rules new file mode 100755 index 000000000..8e7f6fc6f --- /dev/null +++ b/ubuntu/maverick/applications/kvpnc/debian/rules @@ -0,0 +1,42 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/kde.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/utils.mk + +DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" +DEB_INSTALL_MANPAGES_kvpnc-trinity := debian/kvpnc-trinity.1 + +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_MANDIR := /opt/trinity/share/man +DEB_CONFIGURE_PREFIX := /opt/trinity +DEB_CONFIGURE_INFODIR := /opt/trinity/share/info + +cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) + +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde + +makebuilddir/kvpnc-trinity:: + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; + touch debian/stamp-cvs-make + +install/kvpnc-trinity:: + # fix script-not-executable + chmod 0755 debian/kvpnc-trinity/opt/trinity/share/apps/kvpnc/ping_check.sh + + # remove uneeded dir + rm -rf debian/kvpnc-trinity/opt/trinity/share/doc/kde/HTML/kvpnc + + # install desktop file in applications + install -D -p -m0644 src/kvpnc.desktop \ + debian/kvpnc-trinity/opt/trinity/share/applications/kde/kvpnc.desktop + +binary-post-install/kvpnc-trinity:: + rm -rf debian/kvpnc-trinity/opt/trinity/share/applnk/ + +clean:: + rm -f config.status config.log + find . -type f -name '*.gmo' | xargs rm -f diff --git a/ubuntu/maverick/applications/kvpnc/debian/source/format b/ubuntu/maverick/applications/kvpnc/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/kvpnc/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/kvpnc/debian/source/options b/ubuntu/maverick/applications/kvpnc/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/kvpnc/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/kvpnc/debian/watch b/ubuntu/maverick/applications/kvpnc/debian/watch new file mode 100644 index 000000000..5c0ec1d76 --- /dev/null +++ b/ubuntu/maverick/applications/kvpnc/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://download.gna.org/kvpnc/kvpnc-(0.*)\.tar\.bz2 debian svn-upgrade diff --git a/ubuntu/maverick/applications/piklab/debian/control b/ubuntu/maverick/applications/piklab/debian/control index 1bfd9448a..81db97ac2 100644 --- a/ubuntu/maverick/applications/piklab/debian/control +++ b/ubuntu/maverick/applications/piklab/debian/control @@ -10,8 +10,8 @@ Homepage: http://piklab.sourceforge.net/ Package: piklab-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: piklab-kde3 (<< 4:3.5.13) -Breaks: piklab-kde3 (<< 4:3.5.13) +Replaces: piklab-trinity (<< 4:14.0.0) +Breaks: piklab-trinity (<< 4:14.0.0) Recommends: gputils, libusb-dev Suggests: sdcc (>= 2.5.0), sdcc-libraries Description: IDE for PIC-microcontroller development [Trinity] diff --git a/ubuntu/maverick/applications/piklab/debian/source/format b/ubuntu/maverick/applications/piklab/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/piklab/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/piklab/debian/source/options b/ubuntu/maverick/applications/piklab/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/piklab/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/potracegui/debian/control b/ubuntu/maverick/applications/potracegui/debian/control index c4c1925dc..01aaf4e52 100644 --- a/ubuntu/maverick/applications/potracegui/debian/control +++ b/ubuntu/maverick/applications/potracegui/debian/control @@ -10,8 +10,8 @@ Standards-Version: 3.8.4 Package: potracegui-trinity Architecture: any Depends: ${shlibs:Depends}, potrace -Replaces: potracegui-kde3 (<< 4:3.5.13) -Breaks: potracegui-kde3 (<< 4:3.5.13) +Replaces: potracegui-trinity (<< 4:14.0.0) +Breaks: potracegui-trinity (<< 4:14.0.0) Suggests: autotrace Description: KDE frontend for potrace [Trinity] A KDE interface for the commandline tracing tools potrace and/or autotrace. It diff --git a/ubuntu/maverick/applications/potracegui/debian/source/format b/ubuntu/maverick/applications/potracegui/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/potracegui/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/potracegui/debian/source/options b/ubuntu/maverick/applications/potracegui/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/potracegui/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/rosegarden/debian/cdbs/buildvars.mk b/ubuntu/maverick/applications/rosegarden/debian/cdbs/buildvars.mk new file mode 100644 index 000000000..23d4709dc --- /dev/null +++ b/ubuntu/maverick/applications/rosegarden/debian/cdbs/buildvars.mk @@ -0,0 +1,86 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2002,2003 Colin Walters <walters@debian.org> +# Description: Defines some useful variables, but no rules +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class + +ifndef _cdbs_rules_buildvars +_cdbs_rules_buildvars = 1 + +CDBS_VERSION = something + +# Common useful variables +DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':')) +DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') +DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-) +DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//') +DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;') + +# Split into arch/indep packages +ifneq ($(DEB_INDEP_PACKAGES),cdbs) +DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep))) +DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same)))) +endif +# Split into normal and udeb packages +ifeq ($(DEB_UDEB_PACKAGES),) +DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) +DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) +else +DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) +endif +# Too much bother for now. If someone complains we'll fix it. +#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES)) +#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES)) +# A handy list of every package, udeb or not +DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES)) +DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES))) +DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES))) + +DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) + +# Some support for srcdir != builddir builds. +# These are relative to the root of the package +DEB_SRCDIR ?= . +DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR)) + +# Miscellaneous bits +DEB_ARCH = $(shell dpkg --print-architecture) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM) +DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM) +DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU) +DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) +DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU) +DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) + +ifeq ($(words $(DEB_ALL_PACKAGES)),1) + DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/ +else + DEB_DESTDIR = $(CURDIR)/debian/tmp/ +endif + +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1) + +endif diff --git a/ubuntu/maverick/applications/rosegarden/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/rosegarden/debian/cdbs/debian-qt-kde.mk new file mode 100644 index 000000000..856fa4932 --- /dev/null +++ b/ubuntu/maverick/applications/rosegarden/debian/cdbs/debian-qt-kde.mk @@ -0,0 +1,110 @@ +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: + touch debian/stamp-cvs-make + +include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) +include debian/cdbs/uploaders.mk + +DEB_PATCHDIRS := debian/patches/common debian/patches + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \ + done + +clean:: + rm -f debian/stamp-cvs-make + +endif + +#common-build-indep:: debian/stamp-kde-apidox +#debian/stamp-kde-apidox: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) +# touch $@ +# +#common-install-indep:: common-install-kde-apidox +#common-install-kde-apidox:: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) +# +#clean:: +# rm -f debian/stamp-kde-apidox diff --git a/ubuntu/maverick/applications/rosegarden/debian/cdbs/kde.mk b/ubuntu/maverick/applications/rosegarden/debian/cdbs/kde.mk new file mode 100644 index 000000000..9dbcfbafd --- /dev/null +++ b/ubuntu/maverick/applications/rosegarden/debian/cdbs/kde.mk @@ -0,0 +1,97 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Description: A class for KDE packages; sets KDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class + +ifndef _cdbs_class_kde +_cdbs_class_kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +# include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/kde/HTML + +ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/" +DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +common-build-arch common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-prehook-impl:: + mkdir -p po + -XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages + -for file in po/*pot; do \ + sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \ + done + +common-install-arch common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + +clean:: + rm -f debian/stamp-kde-apidox + rm -rf po/*.pot + +# This is a convenience target for calling manually. It's not part of +# the build process. +buildprep: clean apply-patches + $(MAKE) -f admin/Makefile.common dist + debian/rules clean + +endif diff --git a/ubuntu/maverick/applications/rosegarden/debian/cdbs/team-members b/ubuntu/maverick/applications/rosegarden/debian/cdbs/team-members new file mode 100644 index 000000000..05761af6e --- /dev/null +++ b/ubuntu/maverick/applications/rosegarden/debian/cdbs/team-members @@ -0,0 +1,16 @@ +Sune Vuorela <debian@pusling.com> +Ana Beatriz Guerrero Lopez <ana@debian.org> +Fathi Boudra <fboudra@free.fr> +Modestas Vainius <geromanas@mailas.com> +Josh Metzler <joshdeb@metzlers.org> +Isaac Clerencia <isaac@debian.org> +Adeodato Simó <dato@net.com.org.es> +Adeodato Simo <dato@net.com.org.es> +Christopher Martin <chrsmrtn@debian.org> +Daniel Schepler <schepler@debian.org> +Sarah Hobbs <hobbsee@ubuntu.com> +Nacho Barrientos Arias <nacho@debian.org> +Ricardo Javier Cardenes Medina <rcardenes@debian.org> +Ricardo Cardenes <rcardenes@debian.org> +Armin Berres <trigger+debian@space-based.de> +Francesco Pedrini <francesco.pedrini@gmail.com> diff --git a/ubuntu/maverick/applications/rosegarden/debian/cdbs/uploaders.mk b/ubuntu/maverick/applications/rosegarden/debian/cdbs/uploaders.mk new file mode 100644 index 000000000..31adfe31e --- /dev/null +++ b/ubuntu/maverick/applications/rosegarden/debian/cdbs/uploaders.mk @@ -0,0 +1,29 @@ + +MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> +UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//') + + +debian/control.tmp: + @if [ ! -e debian/control.in ] ; then \ + echo "this package is not yet prepared for using automatic update of uploaders"; \ + echo "Please do so."; \ + exit 1; \ + fi + @sed 's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in > debian/control.tmp + +check-uploaders: debian/control.tmp + @if ! diff -q debian/control debian/control.tmp ; then \ + echo "WARNING:: Control file differs from manually generated one" ; \ + echo "WARNING:: Please update it manually and check it afterwards" ; \ + echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\ + echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\ + fi + + +clean:: + rm -f debian/control.tmp + +update-uploaders: debian/control.tmp + @mv -f debian/control.tmp debian/control + +makebuilddir:: check-uploaders diff --git a/ubuntu/maverick/applications/rosegarden/debian/cdbs/versions.pl b/ubuntu/maverick/applications/rosegarden/debian/cdbs/versions.pl new file mode 100644 index 000000000..9ce11d8a3 --- /dev/null +++ b/ubuntu/maverick/applications/rosegarden/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/-[^-]+$//; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "KDE-Version3=$version3\n"; +print "KDE-Version2=$version2\n"; +print "KDE-Next-Version3=$version3_next\n"; +print "KDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/maverick/applications/rosegarden/debian/control b/ubuntu/maverick/applications/rosegarden/debian/control index 639d9bd43..d29778110 100644 --- a/ubuntu/maverick/applications/rosegarden/debian/control +++ b/ubuntu/maverick/applications/rosegarden/debian/control @@ -4,15 +4,15 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Debian Multimedia Team <debian-multimedia@lists.debian.org> Uploaders: Mike O'Connor <stew@debian.org>, Free Ekanayaka <freee@debian.org> -Build-Depends: debhelper (>> 5.0.0), cmake, tdelibs4-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, dpatch, libfftw3-dev +Build-Depends: debhelper (>> 5.0.0), cdbs, cmake, tdelibs4-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, dpatch, libfftw3-dev Standards-Version: 3.8.4 Homepage: http://www.rosegardenmusic.com/ Package: rosegarden-trinity Architecture: any Depends: ${shlibs:Depends}, khelpcenter-trinity, rosegarden-data-trinity (= ${source:Version}), libxml-twig-perl, sndfile-programs, xterm, tdebase-trinity-bin, konqueror-trinity | www-browser, flac -Replaces: rosegarden-kde3 (<< 4:3.5.13) -Breaks: rosegarden-kde3 (<< 4:3.5.13) +Replaces: rosegarden-trinity (<< 4:14.0.0) +Breaks: rosegarden-trinity (<< 4:14.0.0) Recommends: jackd, lilypond, swh-plugins | ladspa-plugin Suggests: qjackctl Description: music editor and MIDI/audio sequencer [Trinity] @@ -24,8 +24,8 @@ Description: music editor and MIDI/audio sequencer [Trinity] Package: rosegarden-data-trinity Architecture: all Recommends: rosegarden-trinity -Replaces: rosegarden-data-kde3 (<< 4:3.5.13) -Breaks: rosegarden-data-kde3 (<< 4:3.5.13) +Replaces: rosegarden-data-trinity (<< 4:14.0.0) +Breaks: rosegarden-data-trinity (<< 4:14.0.0) Priority: optional Description: music editor and MIDI/audio sequencer data files [Trinity] Rosegarden is a KDE application which provides a mixed Audio/MIDI diff --git a/ubuntu/maverick/applications/rosegarden/debian/control.in b/ubuntu/maverick/applications/rosegarden/debian/control.in new file mode 100644 index 000000000..157cd071e --- /dev/null +++ b/ubuntu/maverick/applications/rosegarden/debian/control.in @@ -0,0 +1,37 @@ +Source: rosegarden-trinity +Section: sound +Priority: optional +Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +XSBC-Original-Maintainer: @@@MAINTAINER@@@ +Uploaders: @@@UPLOADERS@@@ +Build-Depends: debhelper (>> 5.0.0), cdbs, cmake, tdelibs4-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, dpatch, libfftw3-dev +Standards-Version: 3.8.4 +Homepage: http://www.rosegardenmusic.com/ + +Package: rosegarden-trinity +Architecture: any +Depends: ${shlibs:Depends}, khelpcenter-trinity, rosegarden-data-trinity (= ${source:Version}), libxml-twig-perl, sndfile-programs, xterm, tdebase-trinity-bin, konqueror-trinity | www-browser, flac +Replaces: rosegarden-kde3 (<< 4:3.5.13) +Breaks: rosegarden-kde3 (<< 4:3.5.13) +Recommends: jackd, lilypond, swh-plugins | ladspa-plugin +Suggests: qjackctl +Description: music editor and MIDI/audio sequencer [Trinity] + Rosegarden is a KDE application which provides a mixed Audio/MIDI + sequencer (for playback and recording), a multi-track editor, music + editing using both piano-roll and score notation, MIDI file IO, + lilypond and Csound files export, etc. + +Package: rosegarden-data-trinity +Architecture: all +Recommends: rosegarden-trinity +Replaces: rosegarden-data-kde3 (<< 4:3.5.13) +Breaks: rosegarden-data-kde3 (<< 4:3.5.13) +Priority: optional +Description: music editor and MIDI/audio sequencer data files [Trinity] + Rosegarden is a KDE application which provides a mixed Audio/MIDI + sequencer (for playback and recording), a multi-track editor, music + editing using both piano-roll and score notation, MIDI file IO, + lilypond and Csound files export, etc. + . + This package provides the data files necessary for running Rosegarden + diff --git a/ubuntu/maverick/applications/rosegarden/debian/rules b/ubuntu/maverick/applications/rosegarden/debian/rules index 34af02e91..4e4718806 100755 --- a/ubuntu/maverick/applications/rosegarden/debian/rules +++ b/ubuntu/maverick/applications/rosegarden/debian/rules @@ -1,75 +1,29 @@ #!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -include /usr/share/dpatch/dpatch.make - -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - -DEB_BUILD_ARCH := $(shell dpkg --print-installation-architecture) -ARCH=$(DEB_BUILD_ARCH) - -ifeq ($(ARCH),alpha) -CXXFLAGS+=-O0 -mieee +# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function +# Also include the main Trinity path +ifeq ("$(LD_LIBRARY_PATH)", "") +LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib else -CXXFLAGS+=-O2 +LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib endif +export LD_LIBRARY_PATH -# DEBUGGING FLAGS. -# CXXFLAGS+=-g3 -gstabs+ -fexceptions -# DEB_BUILD_OPTIONS+=nostrip -# export CXXFLAGS -# export DEB_BUILD_OPTIONS - -### - -configure: configure-stamp - -configure-stamp: - dh_testdir - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde CMAKE_INSTALL_PREFIX=/usr cmake . - touch configure-stamp - -build: build-stamp - -build-stamp: configure-stamp patch-stamp - dh_testdir - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde make - touch build-stamp +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk +include debian/cdbs/debian-qt-kde.mk -clean: unpatch - dh_testdir - dh_testroot +DEB_KDE_APIDOX := yes - [ ! -f Makefile ] || make clean - rm -rf RGbuild - rm -rf CMakeCache.txt - rm -rf CMakeFiles - rm -f build-stamp - rm -f configure-stamp - rm -f config.log - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs +CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG) - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde make install DESTDIR=`pwd`/debian/tmp - find debian/tmp/opt/trinity/share -type f -exec chmod 664 {} \; +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" -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. +# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to +# never build in parallel, regardless of DEB_BUILD_OPTIONS. +DEB_BUILD_PARALLEL = true # Build architecture-dependent files here. binary-arch: build install diff --git a/ubuntu/maverick/applications/rosegarden/debian/source/format b/ubuntu/maverick/applications/rosegarden/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/rosegarden/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/rosegarden/debian/source/options b/ubuntu/maverick/applications/rosegarden/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/rosegarden/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/smartcardauth/debian/control b/ubuntu/maverick/applications/smartcardauth/debian/control index aef949062..e264a68e3 100644 --- a/ubuntu/maverick/applications/smartcardauth/debian/control +++ b/ubuntu/maverick/applications/smartcardauth/debian/control @@ -9,8 +9,8 @@ Standards-Version: 3.8.4 Package: smartcardauth Architecture: any Depends: pcsc-tools, pcscd-nodbus, initramfs-tools, libpcsc-perl, libpcsclite1, libccid, opensc, zenity, gksu -Replaces: smartcardauth (<< 4:3.5.13) -Breaks: smartcardauth (<< 4:3.5.13) +Replaces: smartcardauth (<< 4:14.0.0) +Breaks: smartcardauth (<< 4:14.0.0) Conflicts: openct Description: SmartCard Login and LUKS Decrypt, Setup Utility This utility will allow you to set up your computer to accept a SmartCard as an authentication source for: diff --git a/ubuntu/maverick/applications/smartcardauth/debian/source/format b/ubuntu/maverick/applications/smartcardauth/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/smartcardauth/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/smartcardauth/debian/source/options b/ubuntu/maverick/applications/smartcardauth/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/smartcardauth/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/smb4k/debian/control b/ubuntu/maverick/applications/smb4k/debian/control index c684c3fd1..ba0821187 100644 --- a/ubuntu/maverick/applications/smb4k/debian/control +++ b/ubuntu/maverick/applications/smb4k/debian/control @@ -9,8 +9,8 @@ Homepage: http://smb4k.berlios.de/ Package: smb4k-trinity Architecture: any Depends: ${shlibs:Depends}, samba-common, smbclient, smbfs -Replaces: smb4k-kde3 (<< 4:3.5.13) -Breaks: smb4k-kde3 (<< 4:3.5.13) +Replaces: smb4k-trinity (<< 4:14.0.0) +Breaks: smb4k-trinity (<< 4:14.0.0) Recommends: super | sudo-trinity Description: A Samba (SMB) share advanced browser for Trinity Smb4K is a SMB (Windows) share browser for KDE. It uses the Samba software diff --git a/ubuntu/maverick/applications/smb4k/debian/source/format b/ubuntu/maverick/applications/smb4k/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/smb4k/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/smb4k/debian/source/options b/ubuntu/maverick/applications/smb4k/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/smb4k/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/soundkonverter/debian/control b/ubuntu/maverick/applications/soundkonverter/debian/control index 77c4c1dd7..16ecbcabd 100644 --- a/ubuntu/maverick/applications/soundkonverter/debian/control +++ b/ubuntu/maverick/applications/soundkonverter/debian/control @@ -10,8 +10,8 @@ Homepage: http://www.kde-apps.org/content/show.php?content=29024 Package: soundkonverter-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: soundkonverter-kde3 (<< 4:3.5.13) -Breaks: soundkonverter-kde3 (<< 4:3.5.13) +Replaces: soundkonverter-trinity (<< 4:14.0.0) +Breaks: soundkonverter-trinity (<< 4:14.0.0) Recommends: cdda2wav, cdparanoia, faad, ffmpeg, flac, tdemultimedia-kio-plugins-trinity, mp3gain, mplayer, mppenc, speex, timidity, vorbis-tools, vorbisgain, wavpack Suggests: soundkonverter-amarok-trinity Description: audio converter frontend for Trinity @@ -33,9 +33,9 @@ Description: audio converter frontend for Trinity Package: soundkonverter-amarok-trinity Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, soundkonverter-trinity, amarok-trinity, ruby, libqt0-ruby1.8 -Replaces: soundkonverter-amarok-kde3 (<< 4:3.5.13) -Breaks: soundkonverter-amarok-kde3 (<< 4:3.5.13) +Depends: ${shlibs:Depends}, ${misc:Depends}, soundkonverter-trinity, amarok-trinity, ruby, libqt0-ruby1.8-trinity +Replaces: soundkonverter-amarok-trinity (<< 4:14.0.0) +Breaks: soundkonverter-amarok-trinity (<< 4:14.0.0) Description: audio converter frontend for Trinity (Amarok script) Amarok script for soundKonverter. It allows you to easily transcode files when transferring them to your media device. diff --git a/ubuntu/maverick/applications/soundkonverter/debian/source/format b/ubuntu/maverick/applications/soundkonverter/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/soundkonverter/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/soundkonverter/debian/source/options b/ubuntu/maverick/applications/soundkonverter/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/soundkonverter/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/tde-guidance/debian/changelog b/ubuntu/maverick/applications/tde-guidance/debian/changelog index f73cc1d80..fb3aec362 100644 --- a/ubuntu/maverick/applications/tde-guidance/debian/changelog +++ b/ubuntu/maverick/applications/tde-guidance/debian/changelog @@ -229,7 +229,7 @@ tde-guidance (0.8.0svn20080103-0ubuntu4) hardy; urgency=low tde-guidance (0.8.0svn20080103-0ubuntu3) hardy; urgency=low * Add Add kubuntu_09_mountconfig_no_extensions.patch to remove uneeded call - to pykdeextensions in mountconfig so that pyqt3 no longer needs to be + to pytdeextensions in mountconfig so that pyqt3 no longer needs to be patched to provide -dev files in the regular package (LP: #197867) * Add kubuntu_10_displayconfig_tryagain.patch so that if displayconfig thinks a proprietary driver is installed, but it can't find it, it @@ -618,7 +618,7 @@ tde-guidance (0.7.1~svn20061215-0ubuntu1) feisty; urgency=low tde-guidance (0.7.1~svn20061124-0ubuntu2) feisty; urgency=low - * Rebuilt against new pykde. + * Rebuilt against new pytde. -- Anthony Mercatante <tonio@ubuntu.com> Wed, 06 Dec 2006 23:40:32 +0100 @@ -913,7 +913,7 @@ tde-guidance (0.6.4-0ubuntu1) dapper; urgency=low * The screen images in the dualhead widget make better use of available widget space. * Displayconfig: The 40guidance-displayconfig_restore script which is used by - the Xsession script during login via KDM/xdm, has now been fixed to not stop + the Xsession script during login via TDM/xdm, has now been fixed to not stop the login in case of failure. * BUG: Displayconfig was getting confused by unknown graphics cards and crashing. (Malone bug #32915) @@ -1029,7 +1029,7 @@ tde-guidance (0.6.2-0ubuntu1) dapper; urgency=low tde-guidance (0.6.1-0ubuntu0) dapper; urgency=low * New release, sets a fixed DPI for Xft - * Add run time dependency on pykdeextensions + * Add run time dependency on pytdeextensions * Add kubuntu_03_userconfig_shebang.diff fix extra space * Change init script to run at S35, Malone No. 32268 diff --git a/ubuntu/maverick/applications/tde-guidance/debian/control b/ubuntu/maverick/applications/tde-guidance/debian/control index 8446115c3..1887cb23e 100644 --- a/ubuntu/maverick/applications/tde-guidance/debian/control +++ b/ubuntu/maverick/applications/tde-guidance/debian/control @@ -6,15 +6,15 @@ XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.de Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> Build-Depends: cdbs, debhelper (>= 5), chrpath, tdelibs4-trinity-dev, libpythonize0-trinity-dev, libtool, libxml2-utils, libxss-dev, libxxf86vm-dev, - pykdeextensions-trinity, pyqt-tools, python-qt3 (>= 3.17.2-1ubuntu2), python-trinity-trinity, python-trinity-trinity-dev, python-sip4-dev, - python-support (>= 0.6), python2.6 (>= 2.5), python2.6-dev (>= 2.5), x11proto-scrnsaver-dev, python-qt-dev, hwdata + pytdeextensions-trinity, pytqt-tools, python-tqt, python-trinity-trinity, python-trinity-trinity-dev, python-sip4-dev, + python-support (>= 0.6), python2.6 (>= 2.5), python2.6-dev (>= 2.5), x11proto-scrnsaver-dev, python-tqt-dev, hwdata Standards-Version: 3.8.4 Package: tde-guidance-trinity Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pykdeextensions-trinity, python-trinity-trinity, sysv-rc, guidance-backends-trinity, hwdata, python (>= 2.5), python-dev (>= 2.5) -Replaces: tde-guidance-kde3 (<< 4:3.5.13) -Breaks: tde-guidance-kde3 (<< 4:3.5.13) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pytdeextensions-trinity, python-trinity-trinity, sysv-rc, guidance-backends-trinity, hwdata, python (>= 2.5), python-dev (>= 2.5) +Replaces: kde-guidance-trinity (<< 4:14.0.0) +Breaks: kde-guidance-trinity (<< 4:14.0.0) Conflicts: guidance-power-manager, tde-guidance-powermanager Provides: ${python:Provides} Description: collection of KDE system administration tools for GNU/Linux [Trinity] @@ -34,8 +34,8 @@ Description: collection of KDE system administration tools for GNU/Linux [Trinit Package: guidance-backends-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, hwdata, python (>= 2.5), python-dev (>= 2.5) -Replaces: guidance-backends-kde3 (<< 4:3.5.13) -Breaks: guidance-backends-kde3 (<< 4:3.5.13) +Replaces: guidance-backends-trinity (<< 4:14.0.0) +Breaks: guidance-backends-trinity (<< 4:14.0.0) Conflicts: guidance-power-manager, tde-guidance-powermanager Provides: ${python:Provides} Description: collection of system administration tools for GNU/Linux [Trinity] @@ -47,8 +47,8 @@ Description: collection of system administration tools for GNU/Linux [Trinity] Package: tde-guidance-powermanager-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, tde-guidance-trinity, python-trinity-trinity, python-dbus, hal, python-gobject, python (>= 2.5), python-dev (>= 2.5) -Replaces: tde-guidance-powermanager-kde3 (<< 4:3.5.13) -Breaks: tde-guidance-powermanager-kde3 (<< 4:3.5.13) +Replaces: kde-guidance-powermanager-trinity (<< 4:14.0.0) +Breaks: kde-guidance-powermanager-trinity (<< 4:14.0.0) Conflicts: guidance-power-manager, tde-guidance-powermanager Provides: ${python:Provides} Description: HAL based power manager applet [Trinity] diff --git a/ubuntu/maverick/applications/tde-guidance/debian/rules b/ubuntu/maverick/applications/tde-guidance/debian/rules index 2bb582451..f3f46453f 100755 --- a/ubuntu/maverick/applications/tde-guidance/debian/rules +++ b/ubuntu/maverick/applications/tde-guidance/debian/rules @@ -175,7 +175,7 @@ clean:: fi common-install-prehook-impl:: - # generate form implementation using pykde user interface compiler + # generate form implementation using pytde user interface compiler (cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n guidance_power_manager_ui.ui) (cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n tooltip.ui) (cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n notify.ui) diff --git a/ubuntu/maverick/applications/tde-guidance/debian/source/format b/ubuntu/maverick/applications/tde-guidance/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/tde-guidance/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/tde-guidance/debian/source/options b/ubuntu/maverick/applications/tde-guidance/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/tde-guidance/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/tde-style-lipstik/debian/control b/ubuntu/maverick/applications/tde-style-lipstik/debian/control index 157fb6c46..5b79a0aed 100644 --- a/ubuntu/maverick/applications/tde-style-lipstik/debian/control +++ b/ubuntu/maverick/applications/tde-style-lipstik/debian/control @@ -8,8 +8,8 @@ Standards-Version: 3.8.4 Package: tde-style-lipstik-trinity Section: kde Architecture: any -Replaces: tde-style-lipstik-kde3 (<< 4:3.5.13) -Breaks: tde-style-lipstik-kde3 (<< 4:3.5.13) +Replaces: kde-style-lipstik-trinity (<< 4:14.0.0) +Breaks: kde-style-lipstik-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, ${misc:Depends} Description: Lipstik style for TDE Based on the plastik style, Lipstik is a purified style with many options to diff --git a/ubuntu/maverick/applications/tde-style-lipstik/debian/source/format b/ubuntu/maverick/applications/tde-style-lipstik/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/tde-style-lipstik/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/tde-style-lipstik/debian/source/options b/ubuntu/maverick/applications/tde-style-lipstik/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/tde-style-lipstik/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/buildvars.mk b/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/buildvars.mk new file mode 100644 index 000000000..23d4709dc --- /dev/null +++ b/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/buildvars.mk @@ -0,0 +1,86 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2002,2003 Colin Walters <walters@debian.org> +# Description: Defines some useful variables, but no rules +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class + +ifndef _cdbs_rules_buildvars +_cdbs_rules_buildvars = 1 + +CDBS_VERSION = something + +# Common useful variables +DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':')) +DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') +DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-) +DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//') +DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;') + +# Split into arch/indep packages +ifneq ($(DEB_INDEP_PACKAGES),cdbs) +DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep))) +DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same)))) +endif +# Split into normal and udeb packages +ifeq ($(DEB_UDEB_PACKAGES),) +DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) +DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) +else +DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) +endif +# Too much bother for now. If someone complains we'll fix it. +#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES)) +#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES)) +# A handy list of every package, udeb or not +DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES)) +DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES))) +DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES))) + +DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) + +# Some support for srcdir != builddir builds. +# These are relative to the root of the package +DEB_SRCDIR ?= . +DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR)) + +# Miscellaneous bits +DEB_ARCH = $(shell dpkg --print-architecture) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM) +DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM) +DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU) +DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) +DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU) +DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) + +ifeq ($(words $(DEB_ALL_PACKAGES)),1) + DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/ +else + DEB_DESTDIR = $(CURDIR)/debian/tmp/ +endif + +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1) + +endif diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/debian-qt-kde.mk new file mode 100644 index 000000000..856fa4932 --- /dev/null +++ b/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/debian-qt-kde.mk @@ -0,0 +1,110 @@ +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: + touch debian/stamp-cvs-make + +include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) +include debian/cdbs/uploaders.mk + +DEB_PATCHDIRS := debian/patches/common debian/patches + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \ + done + +clean:: + rm -f debian/stamp-cvs-make + +endif + +#common-build-indep:: debian/stamp-kde-apidox +#debian/stamp-kde-apidox: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) +# touch $@ +# +#common-install-indep:: common-install-kde-apidox +#common-install-kde-apidox:: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) +# +#clean:: +# rm -f debian/stamp-kde-apidox diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/kde.mk new file mode 100644 index 000000000..9dbcfbafd --- /dev/null +++ b/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/kde.mk @@ -0,0 +1,97 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Description: A class for KDE packages; sets KDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class + +ifndef _cdbs_class_kde +_cdbs_class_kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +# include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/kde/HTML + +ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/" +DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +common-build-arch common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-prehook-impl:: + mkdir -p po + -XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages + -for file in po/*pot; do \ + sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \ + done + +common-install-arch common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + +clean:: + rm -f debian/stamp-kde-apidox + rm -rf po/*.pot + +# This is a convenience target for calling manually. It's not part of +# the build process. +buildprep: clean apply-patches + $(MAKE) -f admin/Makefile.common dist + debian/rules clean + +endif diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/team-members b/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/team-members new file mode 100644 index 000000000..05761af6e --- /dev/null +++ b/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/team-members @@ -0,0 +1,16 @@ +Sune Vuorela <debian@pusling.com> +Ana Beatriz Guerrero Lopez <ana@debian.org> +Fathi Boudra <fboudra@free.fr> +Modestas Vainius <geromanas@mailas.com> +Josh Metzler <joshdeb@metzlers.org> +Isaac Clerencia <isaac@debian.org> +Adeodato Simó <dato@net.com.org.es> +Adeodato Simo <dato@net.com.org.es> +Christopher Martin <chrsmrtn@debian.org> +Daniel Schepler <schepler@debian.org> +Sarah Hobbs <hobbsee@ubuntu.com> +Nacho Barrientos Arias <nacho@debian.org> +Ricardo Javier Cardenes Medina <rcardenes@debian.org> +Ricardo Cardenes <rcardenes@debian.org> +Armin Berres <trigger+debian@space-based.de> +Francesco Pedrini <francesco.pedrini@gmail.com> diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/uploaders.mk b/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/uploaders.mk new file mode 100644 index 000000000..31adfe31e --- /dev/null +++ b/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/uploaders.mk @@ -0,0 +1,29 @@ + +MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> +UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//') + + +debian/control.tmp: + @if [ ! -e debian/control.in ] ; then \ + echo "this package is not yet prepared for using automatic update of uploaders"; \ + echo "Please do so."; \ + exit 1; \ + fi + @sed 's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in > debian/control.tmp + +check-uploaders: debian/control.tmp + @if ! diff -q debian/control debian/control.tmp ; then \ + echo "WARNING:: Control file differs from manually generated one" ; \ + echo "WARNING:: Please update it manually and check it afterwards" ; \ + echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\ + echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\ + fi + + +clean:: + rm -f debian/control.tmp + +update-uploaders: debian/control.tmp + @mv -f debian/control.tmp debian/control + +makebuilddir:: check-uploaders diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/versions.pl b/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/versions.pl new file mode 100644 index 000000000..9ce11d8a3 --- /dev/null +++ b/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/-[^-]+$//; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "KDE-Version3=$version3\n"; +print "KDE-Version2=$version2\n"; +print "KDE-Next-Version3=$version3_next\n"; +print "KDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/control b/ubuntu/maverick/applications/tde-style-qtcurve/debian/control index 6c7103211..ca85f86b5 100644 --- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/control +++ b/ubuntu/maverick/applications/tde-style-qtcurve/debian/control @@ -3,14 +3,14 @@ Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Bastian Venthur <venthur@debian.org> -Build-Depends: debhelper (>= 5), tdelibs4-trinity-dev, cmake +Build-Depends: debhelper (>= 5), tdelibs4-trinity-dev, cmake, cdbs Standards-Version: 3.8.4 Package: tde-style-qtcurve-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: tde-style-qtcurve-kde3 (<< 4:3.5.13) -Breaks: tde-style-qtcurve-kde3 (<< 4:3.5.13) +Replaces: kde-style-qtcurve-trinity (<< 4:14.0.0) +Breaks: kde-style-qtcurve-trinity (<< 4:14.0.0) Recommends: gtk2-engines-qtcurve Provides: tde-style-qtcurve Description: This is a set of widget styles for Trinity based apps @@ -23,8 +23,8 @@ Description: This is a set of widget styles for Trinity based apps Package: qtcurve-trinity Architecture: any Depends: tde-style-qtcurve-trinity, gtk2-engines-qtcurve -Replaces: qtcurve-kde3 (<< 4:3.5.13) -Breaks: qtcurve-kde3 (<< 4:3.5.13) +Replaces: qtcurve-trinity (<< 4:14.0.0) +Breaks: qtcurve-trinity (<< 4:14.0.0) Description: This is a set of widget styles for Trinity and Gtk2 based apps This is an empty dummy package which will drag the packages tde-style-qtcurve and gtk2-engines-qtcurve in your system. diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/control.in b/ubuntu/maverick/applications/tde-style-qtcurve/debian/control.in new file mode 100644 index 000000000..3e8b07e49 --- /dev/null +++ b/ubuntu/maverick/applications/tde-style-qtcurve/debian/control.in @@ -0,0 +1,32 @@ +Source: tde-style-qtcurve-trinity +Section: kde +Priority: optional +Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +XSBC-Original-Maintainer: @@@MAINTAINER@@@ +Uploaders: @@@UPLOADERS@@@ +Build-Depends: debhelper (>= 5), tdelibs4-trinity-dev, cmake +Standards-Version: 3.8.4 + +Package: tde-style-qtcurve-trinity +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: tde-style-qtcurve-kde3 (<< 4:3.5.13) +Breaks: tde-style-qtcurve-kde3 (<< 4:3.5.13) +Recommends: gtk2-engines-qtcurve +Provides: tde-style-qtcurve +Description: This is a set of widget styles for Trinity based apps + This package together with gtk2-engines-qtcurve aim to provide a unified look + and feel on the desktop when using KDE and Gnome applications. + . + This package is most useful when installed together with + gtk2-engines-qtcurve. + +Package: qtcurve-trinity +Architecture: any +Depends: tde-style-qtcurve-trinity, gtk2-engines-qtcurve +Replaces: qtcurve-kde3 (<< 4:3.5.13) +Breaks: qtcurve-kde3 (<< 4:3.5.13) +Description: This is a set of widget styles for Trinity and Gtk2 based apps + This is an empty dummy package which will drag the packages + tde-style-qtcurve and gtk2-engines-qtcurve in your system. + diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/rules b/ubuntu/maverick/applications/tde-style-qtcurve/debian/rules index 3d090390b..8041bcf1e 100755 --- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/rules +++ b/ubuntu/maverick/applications/tde-style-qtcurve/debian/rules @@ -1,120 +1,26 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - - -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 +# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function +# Also include the main Trinity path +ifeq ("$(LD_LIBRARY_PATH)", "") +LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib else - CFLAGS += -O2 -endif - -config.status: CMakeLists.txt config.h.cmake - dh_testdir - # Add here commands to configure the package. - -ifneq "$(wildcard /usr/share/misc/config.sub)" "" - cp -f /usr/share/misc/config.sub config.sub -endif -ifneq "$(wildcard /usr/share/misc/config.guess)" "" - cp -f /usr/share/misc/config.guess config.guess +LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib endif - mkdir build - cd build; env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde cmake -DKDE3PREFIX=/opt/trinity .. - touch config.status - -build: build-stamp - -build-stamp: config.status - dh_testdir - - # Add here commands to compile the package. - cd build; env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) - #docbook-to-man debian/tde-style-qtcurve.sgml > tde-style-qtcurve.1 - - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - # Add here commands to clean up after the build process. - rm -rf build - rm -f config.sub config.guess - rm -f config.status - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/tde-style-qtcurve-trinity. - cd build; env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) DESTDIR=$(CURDIR)/debian/tde-style-qtcurve-trinity install - +export LD_LIBRARY_PATH -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk +include debian/cdbs/debian-qt-kde.mk -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs ChangeLog - dh_installdocs - dh_installexamples -# dh_install -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_python -# dh_installinit -# dh_installcron -# dh_installinfo - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_perl -# dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb +DEB_KDE_APIDOX := yes -get-orig-source: - debian/scan-version get-orig-source +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" -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to +# never build in parallel, regardless of DEB_BUILD_OPTIONS. +DEB_BUILD_PARALLEL = true
\ No newline at end of file diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/source/format b/ubuntu/maverick/applications/tde-style-qtcurve/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/tde-style-qtcurve/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/source/options b/ubuntu/maverick/applications/tde-style-qtcurve/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/tde-style-qtcurve/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/control b/ubuntu/maverick/applications/tde-systemsettings/debian/control index d0ddb0d48..e6f064f55 100644 --- a/ubuntu/maverick/applications/tde-systemsettings/debian/control +++ b/ubuntu/maverick/applications/tde-systemsettings/debian/control @@ -8,8 +8,8 @@ Standards-Version: 3.8.4 Package: tde-systemsettings-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, kcontrol-trinity -Replaces: tde-systemsettings-kde3 (<< 4:3.5.13) -Breaks: tde-systemsettings-kde3 (<< 4:3.5.13) +Replaces: kde-systemsettings-trinity (<< 4:14.0.0) +Breaks: kde-systemsettings-trinity (<< 4:14.0.0) Description: easy to use control centre for TDE System preferences is a replacement for the TDE Control Centre with an improved user interface. diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/source/format b/ubuntu/maverick/applications/tde-systemsettings/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/tde-systemsettings/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/source/options b/ubuntu/maverick/applications/tde-systemsettings/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/tde-systemsettings/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/tdesudo/debian/control b/ubuntu/maverick/applications/tdesudo/debian/control index c541b6b90..67646ec9f 100644 --- a/ubuntu/maverick/applications/tdesudo/debian/control +++ b/ubuntu/maverick/applications/tdesudo/debian/control @@ -8,8 +8,8 @@ Standards-Version: 3.8.4 Package: tdesudo-trinity Architecture: any Depends: ${shlibs:Depends}, sudo -Replaces: tdesudo-kde3 (<< 4:3.5.13) -Breaks: tdesudo-kde3 (<< 4:3.5.13) +Replaces: kdesudo-trinity (<< 4:14.0.0) +Breaks: kdesudo-trinity (<< 4:14.0.0) Description: sudo frontend for Trinity KdeSudo is a graphical frontend for the sudo utility. It allows you to run programs as another user by entering your password. diff --git a/ubuntu/maverick/applications/tdesudo/debian/source/format b/ubuntu/maverick/applications/tdesudo/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/tdesudo/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/tdesudo/debian/source/options b/ubuntu/maverick/applications/tdesudo/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/tdesudo/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/tdesvn/debian/cdbs/buildvars.mk b/ubuntu/maverick/applications/tdesvn/debian/cdbs/buildvars.mk new file mode 100644 index 000000000..23d4709dc --- /dev/null +++ b/ubuntu/maverick/applications/tdesvn/debian/cdbs/buildvars.mk @@ -0,0 +1,86 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2002,2003 Colin Walters <walters@debian.org> +# Description: Defines some useful variables, but no rules +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class + +ifndef _cdbs_rules_buildvars +_cdbs_rules_buildvars = 1 + +CDBS_VERSION = something + +# Common useful variables +DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':')) +DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') +DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-) +DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//') +DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;') + +# Split into arch/indep packages +ifneq ($(DEB_INDEP_PACKAGES),cdbs) +DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep))) +DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same)))) +endif +# Split into normal and udeb packages +ifeq ($(DEB_UDEB_PACKAGES),) +DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) +DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) +else +DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) +endif +# Too much bother for now. If someone complains we'll fix it. +#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES)) +#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES)) +# A handy list of every package, udeb or not +DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES)) +DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES))) +DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES))) + +DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) + +# Some support for srcdir != builddir builds. +# These are relative to the root of the package +DEB_SRCDIR ?= . +DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR)) + +# Miscellaneous bits +DEB_ARCH = $(shell dpkg --print-architecture) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM) +DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM) +DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU) +DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) +DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU) +DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) + +ifeq ($(words $(DEB_ALL_PACKAGES)),1) + DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/ +else + DEB_DESTDIR = $(CURDIR)/debian/tmp/ +endif + +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1) + +endif diff --git a/ubuntu/maverick/applications/tdesvn/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/tdesvn/debian/cdbs/debian-qt-kde.mk new file mode 100644 index 000000000..856fa4932 --- /dev/null +++ b/ubuntu/maverick/applications/tdesvn/debian/cdbs/debian-qt-kde.mk @@ -0,0 +1,110 @@ +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: + touch debian/stamp-cvs-make + +include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) +include debian/cdbs/uploaders.mk + +DEB_PATCHDIRS := debian/patches/common debian/patches + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \ + done + +clean:: + rm -f debian/stamp-cvs-make + +endif + +#common-build-indep:: debian/stamp-kde-apidox +#debian/stamp-kde-apidox: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) +# touch $@ +# +#common-install-indep:: common-install-kde-apidox +#common-install-kde-apidox:: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) +# +#clean:: +# rm -f debian/stamp-kde-apidox diff --git a/ubuntu/maverick/applications/tdesvn/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tdesvn/debian/cdbs/kde.mk new file mode 100644 index 000000000..9dbcfbafd --- /dev/null +++ b/ubuntu/maverick/applications/tdesvn/debian/cdbs/kde.mk @@ -0,0 +1,97 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Description: A class for KDE packages; sets KDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class + +ifndef _cdbs_class_kde +_cdbs_class_kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +# include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/kde/HTML + +ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/" +DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +common-build-arch common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-prehook-impl:: + mkdir -p po + -XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages + -for file in po/*pot; do \ + sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \ + done + +common-install-arch common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + +clean:: + rm -f debian/stamp-kde-apidox + rm -rf po/*.pot + +# This is a convenience target for calling manually. It's not part of +# the build process. +buildprep: clean apply-patches + $(MAKE) -f admin/Makefile.common dist + debian/rules clean + +endif diff --git a/ubuntu/maverick/applications/tdesvn/debian/cdbs/team-members b/ubuntu/maverick/applications/tdesvn/debian/cdbs/team-members new file mode 100644 index 000000000..05761af6e --- /dev/null +++ b/ubuntu/maverick/applications/tdesvn/debian/cdbs/team-members @@ -0,0 +1,16 @@ +Sune Vuorela <debian@pusling.com> +Ana Beatriz Guerrero Lopez <ana@debian.org> +Fathi Boudra <fboudra@free.fr> +Modestas Vainius <geromanas@mailas.com> +Josh Metzler <joshdeb@metzlers.org> +Isaac Clerencia <isaac@debian.org> +Adeodato Simó <dato@net.com.org.es> +Adeodato Simo <dato@net.com.org.es> +Christopher Martin <chrsmrtn@debian.org> +Daniel Schepler <schepler@debian.org> +Sarah Hobbs <hobbsee@ubuntu.com> +Nacho Barrientos Arias <nacho@debian.org> +Ricardo Javier Cardenes Medina <rcardenes@debian.org> +Ricardo Cardenes <rcardenes@debian.org> +Armin Berres <trigger+debian@space-based.de> +Francesco Pedrini <francesco.pedrini@gmail.com> diff --git a/ubuntu/maverick/applications/tdesvn/debian/cdbs/uploaders.mk b/ubuntu/maverick/applications/tdesvn/debian/cdbs/uploaders.mk new file mode 100644 index 000000000..31adfe31e --- /dev/null +++ b/ubuntu/maverick/applications/tdesvn/debian/cdbs/uploaders.mk @@ -0,0 +1,29 @@ + +MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> +UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//') + + +debian/control.tmp: + @if [ ! -e debian/control.in ] ; then \ + echo "this package is not yet prepared for using automatic update of uploaders"; \ + echo "Please do so."; \ + exit 1; \ + fi + @sed 's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in > debian/control.tmp + +check-uploaders: debian/control.tmp + @if ! diff -q debian/control debian/control.tmp ; then \ + echo "WARNING:: Control file differs from manually generated one" ; \ + echo "WARNING:: Please update it manually and check it afterwards" ; \ + echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\ + echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\ + fi + + +clean:: + rm -f debian/control.tmp + +update-uploaders: debian/control.tmp + @mv -f debian/control.tmp debian/control + +makebuilddir:: check-uploaders diff --git a/ubuntu/maverick/applications/tdesvn/debian/cdbs/versions.pl b/ubuntu/maverick/applications/tdesvn/debian/cdbs/versions.pl new file mode 100644 index 000000000..9ce11d8a3 --- /dev/null +++ b/ubuntu/maverick/applications/tdesvn/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/-[^-]+$//; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "KDE-Version3=$version3\n"; +print "KDE-Version2=$version2\n"; +print "KDE-Next-Version3=$version3_next\n"; +print "KDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/maverick/applications/tdesvn/debian/control b/ubuntu/maverick/applications/tdesvn/debian/control index e8d828bb8..0c1f99451 100644 --- a/ubuntu/maverick/applications/tdesvn/debian/control +++ b/ubuntu/maverick/applications/tdesvn/debian/control @@ -5,13 +5,12 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Uploaders: Michael Biebl <biebl@debian.org> Build-Depends: cdbs (>= 0.4.50), debhelper (>= 5.0.0), cmake (>= 2.4), tdelibs4-trinity-dev (>= 4:3.4.3-2), libsvn-dev (>= 1.2.0), libssl-dev (>= 0.9.8a), libsqlite3-dev, gettext, quilt, libaprutil1-dev Standards-Version: 3.8.4 -Homepage: http://tdesvn.alwins-world.de/ Package: libsvnqt4-trinity Section: libs Architecture: any -Replaces: libsvnqt4-kde3 (<< 4:3.5.13) -Breaks: libsvnqt4-kde3 (<< 4:3.5.13) +Replaces: libsvnqt4-trinity (<< 4:14.0.0) +Breaks: libsvnqt4-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, ${misc:Depends} Description: Qt wrapper library for subversion [Trinity] This package provides svnqt, a Qt wrapper library around the @@ -23,8 +22,8 @@ Description: Qt wrapper library for subversion [Trinity] Package: libsvnqt-trinity-dev Section: libdevel Architecture: any -Replaces: libsvnqt-kde3-dev (<< 4:3.5.13) -Breaks: libsvnqt-kde3-dev (<< 4:3.5.13) +Replaces: libsvnqt-trinity-dev (<< 4:14.0.0) +Breaks: libsvnqt-trinity-dev (<< 4:14.0.0) Depends: libsvnqt4-trinity (= ${binary:Version}), libqt3-mt-dev, libsvn-dev Description: Qt wrapper library for subversion (development files) [Trinity] This package contains the header files and symbolic links that developers @@ -33,8 +32,8 @@ Description: Qt wrapper library for subversion (development files) [Trinity] Package: tdesvn-trinity Section: devel Architecture: any -Replaces: tdesvn-kde3 (<< 4:3.5.13) -Breaks: tdesvn-kde3 (<< 4:3.5.13) +Replaces: kdesvn-trinity (<< 4:14.0.0) +Breaks: kdesvn-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-kio-plugins-trinity (= ${binary:Version}) Recommends: kompare-trinity, graphviz Suggests: khelpcenter-trinity, kdiff3-trinity @@ -49,8 +48,8 @@ Description: subversion client with tight KDE integration [Trinity] Package: tdesvn-kio-plugins-trinity Section: devel Architecture: any -Replaces: tdesvn-kio-plugins-kde3 (<< 4:3.5.13) -Breaks: tdesvn-kio-plugins-kde3 (<< 4:3.5.13) +Replaces: kdesvn-kio-plugins-trinity (<< 4:14.0.0) +Breaks: kdesvn-kio-plugins-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: tdesdk-kio-plugins-trinity Description: subversion I/O slaves for Trinity diff --git a/ubuntu/maverick/applications/tdesvn/debian/control.in b/ubuntu/maverick/applications/tdesvn/debian/control.in new file mode 100644 index 000000000..dc185ccef --- /dev/null +++ b/ubuntu/maverick/applications/tdesvn/debian/control.in @@ -0,0 +1,61 @@ +Source: tdesvn-trinity +Section: devel +Priority: optional +Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +XSBC-Original-Maintainer: @@@MAINTAINER@@@ +Uploaders: @@@UPLOADERS@@@ +Build-Depends: cdbs (>= 0.4.50), debhelper (>= 5.0.0), cmake (>= 2.4), tdelibs4-trinity-dev (>= 4:3.4.3-2), libsvn-dev (>= 1.2.0), libssl-dev (>= 0.9.8a), libsqlite3-dev, gettext, quilt, libaprutil1-dev +Standards-Version: 3.8.4 + +Package: libsvnqt4-trinity +Section: libs +Architecture: any +Replaces: libsvnqt4-kde3 (<< 4:3.5.13) +Breaks: libsvnqt4-kde3 (<< 4:3.5.13) +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Qt wrapper library for subversion [Trinity] + This package provides svnqt, a Qt wrapper library around the + subversion library. + . + It is based on the RapidSvn SvnCpp library, a subversion client API + written in C++. + +Package: libsvnqt-trinity-dev +Section: libdevel +Architecture: any +Replaces: libsvnqt-kde3-dev (<< 4:3.5.13) +Breaks: libsvnqt-kde3-dev (<< 4:3.5.13) +Depends: libsvnqt4-trinity (= ${binary:Version}), libqt3-mt-dev, libsvn-dev +Description: Qt wrapper library for subversion (development files) [Trinity] + This package contains the header files and symbolic links that developers + using svnqt will need. + +Package: tdesvn-trinity +Section: devel +Architecture: any +Replaces: tdesvn-kde3 (<< 4:3.5.13) +Breaks: tdesvn-kde3 (<< 4:3.5.13) +Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-kio-plugins-trinity (= ${binary:Version}) +Recommends: kompare-trinity, graphviz +Suggests: khelpcenter-trinity, kdiff3-trinity +Description: subversion client with tight KDE integration [Trinity] + KDESvn is a graphical client for the subversion revision control + system (svn). + . + Besides offering common and advanced svn operations, it features + a tight integration into KDE and can be embedded into other KDE + applications like konqueror via the KDE component technology KParts. + +Package: tdesvn-kio-plugins-trinity +Section: devel +Architecture: any +Replaces: tdesvn-kio-plugins-kde3 (<< 4:3.5.13) +Breaks: tdesvn-kio-plugins-kde3 (<< 4:3.5.13) +Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: tdesdk-kio-plugins-trinity +Description: subversion I/O slaves for Trinity + This packages includes KIO slaves for svn, svn+file, svn+http, + svn+https, svn+ssh. This allows you to access subversion repositories + inside any KIO enabled KDE application. + . + This package is part of tdesvn-trinity. diff --git a/ubuntu/maverick/applications/tdesvn/debian/libsvnqt-trinity-dev.install b/ubuntu/maverick/applications/tdesvn/debian/libsvnqt-trinity-dev.install index 798378e12..fb3c81018 100644 --- a/ubuntu/maverick/applications/tdesvn/debian/libsvnqt-trinity-dev.install +++ b/ubuntu/maverick/applications/tdesvn/debian/libsvnqt-trinity-dev.install @@ -1,2 +1,2 @@ debian/tmp/opt/trinity/lib*/*.so -debian/tmp/opt/trinity/include/kde/svnqt/ +debian/tmp/opt/trinity/include/svnqt/ diff --git a/ubuntu/maverick/applications/tdesvn/debian/rules b/ubuntu/maverick/applications/tdesvn/debian/rules index 6e339cd2e..8041bcf1e 100755 --- a/ubuntu/maverick/applications/tdesvn/debian/rules +++ b/ubuntu/maverick/applications/tdesvn/debian/rules @@ -1,53 +1,26 @@ #!/usr/bin/make -f -PATH := /opt/trinity/bin:$(PATH) - +# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function +# Also include the main Trinity path +ifeq ("$(LD_LIBRARY_PATH)", "") +LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib +else +LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib +endif +export LD_LIBRARY_PATH + include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -include /usr/share/cdbs/1/rules/patchsys-quilt.mk - -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - -DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DCMAKE_CXX_FLAGS="-I/opt/trinity/include/kde" -DCMAKE_LDFLAGS="-L/opt/trinity/lib" +include debian/cdbs/debian-qt-kde.mk -DEB_COMPRESS_EXCLUDE := .dcl .docbook -license .tag .sty .el +DEB_KDE_APIDOX := yes -DEB_DH_MAKESHLIBS_ARGS_libsvnqt4 := -V +CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG) -# Tell dh_shlibdeps where to find our own libs. -DEB_SHLIBDEPS_INCLUDE := debian/tmp/opt/trinity/lib +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" -common-install-impl:: - mkdir -p debian/tmp/opt/trinity - mkdir -p debian/tmp/opt/trinity/include/kde - mkdir -p debian/tmp/usr/lib - mkdir -p debian/tmp/opt/trinity/lib - mkdir -p debian/tmp/usr/lib/trinity - mkdir -p debian/tmp/usr/lib64/trinity - touch debian/tmp/usr/lib/trinity/removeme - touch debian/tmp/usr/lib64/trinity/removeme - mv debian/tmp/usr/lib/trinity/* debian/tmp/usr/lib/ - mv debian/tmp/usr/lib64/trinity/* debian/tmp/usr/lib64/ - rm -rf debian/tmp/usr/lib/trinity - rm -rf debian/tmp/usr/lib64/trinity - cp -Rp debian/tmp/usr/bin debian/tmp/opt/trinity/ - cp -Rp debian/tmp/usr/lib/* debian/tmp/opt/trinity/lib/ - cp -Rp debian/tmp/usr/lib64/* debian/tmp/opt/trinity/lib/ - cp -Rp debian/tmp/usr/share debian/tmp/opt/trinity/ - cp -Rp debian/tmp/usr/include/* debian/tmp/opt/trinity/include/kde/ - rm -rf debian/tmp/usr/bin - rm -rf debian/tmp/usr/lib/trinity - rm -rf debian/tmp/usr/lib64/trinity - rm -rf debian/tmp/usr/share - rm -rf debian/tmp/usr/include - mkdir -p debian/tmp/opt/trinity/lib/trinity - touch debian/tmp/opt/trinity/lib/trinity/removeme - cp -Rp debian/tmp/opt/trinity/lib/trinity/* debian/tmp/opt/trinity/lib/ - rm -rf debian/tmp/opt/trinity/lib/trinity - rm -rf debian/tmp/opt/trinity/lib/removeme +# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to +# never build in parallel, regardless of DEB_BUILD_OPTIONS. +DEB_BUILD_PARALLEL = true
\ No newline at end of file diff --git a/ubuntu/maverick/applications/tdesvn/debian/source/format b/ubuntu/maverick/applications/tdesvn/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/tdesvn/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/tdesvn/debian/source/options b/ubuntu/maverick/applications/tdesvn/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/tdesvn/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/tdesvn/debian/tdesvn-kio-plugins-trinity.install b/ubuntu/maverick/applications/tdesvn/debian/tdesvn-kio-plugins-trinity.install index 32155110b..edba29129 100644 --- a/ubuntu/maverick/applications/tdesvn/debian/tdesvn-kio-plugins-trinity.install +++ b/ubuntu/maverick/applications/tdesvn/debian/tdesvn-kio-plugins-trinity.install @@ -1,4 +1,4 @@ debian/tmp/opt/trinity/share/services/*.protocol -debian/tmp/opt/trinity/lib/kio* -debian/tmp/opt/trinity/lib/kded_tdesvnd.* +debian/tmp/opt/trinity/lib/trinity/kio* +debian/tmp/opt/trinity/lib/trinity/kded_tdesvnd.* debian/tmp/opt/trinity/share/services/kded/ diff --git a/ubuntu/maverick/applications/tdesvn/debian/tdesvn-trinity.install b/ubuntu/maverick/applications/tdesvn/debian/tdesvn-trinity.install index f3c840c12..348be90e8 100644 --- a/ubuntu/maverick/applications/tdesvn/debian/tdesvn-trinity.install +++ b/ubuntu/maverick/applications/tdesvn/debian/tdesvn-trinity.install @@ -1,6 +1,7 @@ debian/icons/tdesvn.xpm /opt/trinity/share/pixmaps/ debian/tmp/opt/trinity/bin/ -debian/tmp/opt/trinity/lib/libtdesvnpart.* +debian/tmp/opt/trinity/lib/*.so* +debian/tmp/opt/trinity/lib/trinity/tdesvnpart* debian/tmp/opt/trinity/share/apps/tdesvn/ debian/tmp/opt/trinity/share/apps/tdesvnpart/ debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/ @@ -9,5 +10,5 @@ debian/tmp/opt/trinity/share/icons/ debian/tmp/opt/trinity/share/locale/*/LC_MESSAGES/*.mo debian/tmp/opt/trinity/share/config.kcfg/ debian/tmp/opt/trinity/share/applications/kde/*.desktop -debian/tmp/opt/trinity/share/doc/HTML/ /opt/trinity/share/doc/kde/ +debian/tmp/opt/trinity/share/doc/kde/ diff --git a/ubuntu/maverick/applications/tdmtheme/debian/README.Debian b/ubuntu/maverick/applications/tdmtheme/debian/README.Debian new file mode 100644 index 000000000..066828faf --- /dev/null +++ b/ubuntu/maverick/applications/tdmtheme/debian/README.Debian @@ -0,0 +1,7 @@ +tdmtheme for Debian +------------------- + +tdmtheme is a KDE Control Module (KCM). To run it, open KDE Control Center and +go to System Administration to find TDM Theme Manager. + + -- Fathi Boudra <fabo@debian.org>, Mon, 31 Jul 2006 18:33:26 +0200 diff --git a/ubuntu/maverick/applications/tdmtheme/debian/cdbs/buildvars.mk b/ubuntu/maverick/applications/tdmtheme/debian/cdbs/buildvars.mk new file mode 100644 index 000000000..23d4709dc --- /dev/null +++ b/ubuntu/maverick/applications/tdmtheme/debian/cdbs/buildvars.mk @@ -0,0 +1,86 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2002,2003 Colin Walters <walters@debian.org> +# Description: Defines some useful variables, but no rules +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class + +ifndef _cdbs_rules_buildvars +_cdbs_rules_buildvars = 1 + +CDBS_VERSION = something + +# Common useful variables +DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':')) +DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') +DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-) +DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//') +DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;') + +# Split into arch/indep packages +ifneq ($(DEB_INDEP_PACKAGES),cdbs) +DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep))) +DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same)))) +endif +# Split into normal and udeb packages +ifeq ($(DEB_UDEB_PACKAGES),) +DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) +DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) +else +DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) +endif +# Too much bother for now. If someone complains we'll fix it. +#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES)) +#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES)) +# A handy list of every package, udeb or not +DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES)) +DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES))) +DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES))) + +DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) + +# Some support for srcdir != builddir builds. +# These are relative to the root of the package +DEB_SRCDIR ?= . +DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR)) + +# Miscellaneous bits +DEB_ARCH = $(shell dpkg --print-architecture) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM) +DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM) +DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU) +DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) +DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU) +DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) + +ifeq ($(words $(DEB_ALL_PACKAGES)),1) + DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/ +else + DEB_DESTDIR = $(CURDIR)/debian/tmp/ +endif + +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1) + +endif diff --git a/ubuntu/maverick/applications/kdmtheme/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk index 47e83ef4a..47e83ef4a 100644 --- a/ubuntu/maverick/applications/kdmtheme/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/maverick/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk diff --git a/ubuntu/maverick/applications/kdmtheme/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tdmtheme/debian/cdbs/kde.mk index 5b6508f8c..5b6508f8c 100644 --- a/ubuntu/maverick/applications/kdmtheme/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/tdmtheme/debian/cdbs/kde.mk diff --git a/ubuntu/maverick/applications/tdmtheme/debian/cdbs/team-members b/ubuntu/maverick/applications/tdmtheme/debian/cdbs/team-members new file mode 100644 index 000000000..05761af6e --- /dev/null +++ b/ubuntu/maverick/applications/tdmtheme/debian/cdbs/team-members @@ -0,0 +1,16 @@ +Sune Vuorela <debian@pusling.com> +Ana Beatriz Guerrero Lopez <ana@debian.org> +Fathi Boudra <fboudra@free.fr> +Modestas Vainius <geromanas@mailas.com> +Josh Metzler <joshdeb@metzlers.org> +Isaac Clerencia <isaac@debian.org> +Adeodato Simó <dato@net.com.org.es> +Adeodato Simo <dato@net.com.org.es> +Christopher Martin <chrsmrtn@debian.org> +Daniel Schepler <schepler@debian.org> +Sarah Hobbs <hobbsee@ubuntu.com> +Nacho Barrientos Arias <nacho@debian.org> +Ricardo Javier Cardenes Medina <rcardenes@debian.org> +Ricardo Cardenes <rcardenes@debian.org> +Armin Berres <trigger+debian@space-based.de> +Francesco Pedrini <francesco.pedrini@gmail.com> diff --git a/ubuntu/maverick/applications/tdmtheme/debian/cdbs/uploaders.mk b/ubuntu/maverick/applications/tdmtheme/debian/cdbs/uploaders.mk new file mode 100644 index 000000000..31adfe31e --- /dev/null +++ b/ubuntu/maverick/applications/tdmtheme/debian/cdbs/uploaders.mk @@ -0,0 +1,29 @@ + +MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> +UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//') + + +debian/control.tmp: + @if [ ! -e debian/control.in ] ; then \ + echo "this package is not yet prepared for using automatic update of uploaders"; \ + echo "Please do so."; \ + exit 1; \ + fi + @sed 's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in > debian/control.tmp + +check-uploaders: debian/control.tmp + @if ! diff -q debian/control debian/control.tmp ; then \ + echo "WARNING:: Control file differs from manually generated one" ; \ + echo "WARNING:: Please update it manually and check it afterwards" ; \ + echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\ + echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\ + fi + + +clean:: + rm -f debian/control.tmp + +update-uploaders: debian/control.tmp + @mv -f debian/control.tmp debian/control + +makebuilddir:: check-uploaders diff --git a/ubuntu/maverick/applications/tdmtheme/debian/cdbs/versions.pl b/ubuntu/maverick/applications/tdmtheme/debian/cdbs/versions.pl new file mode 100644 index 000000000..9ce11d8a3 --- /dev/null +++ b/ubuntu/maverick/applications/tdmtheme/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/-[^-]+$//; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "KDE-Version3=$version3\n"; +print "KDE-Version2=$version2\n"; +print "KDE-Next-Version3=$version3_next\n"; +print "KDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/maverick/applications/kdmtheme/debian/changelog b/ubuntu/maverick/applications/tdmtheme/debian/changelog index 120d16cf8..4097b1255 100644 --- a/ubuntu/maverick/applications/kdmtheme/debian/changelog +++ b/ubuntu/maverick/applications/tdmtheme/debian/changelog @@ -1,17 +1,17 @@ -kdmtheme-trinity (1.2.2-1ubuntu5) karmic; urgency=low +tdmtheme-trinity (1.2.2-1ubuntu5) karmic; urgency=low * Karmic rebuild * Fixed theme switching problem -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 02 July 2009 16:08:00 -0600 -kdmtheme-trinity (1.2.2-1ubuntu1) intrepid; urgency=low +tdmtheme-trinity (1.2.2-1ubuntu1) intrepid; urgency=low * Added -trinity suffix -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 27 Apr 2009 19:00:00 -0600 -kdmtheme (1.2.2-1ubuntu1) intrepid; urgency=low +tdmtheme (1.2.2-1ubuntu1) intrepid; urgency=low [ Sergey Rudchenko ] * Merge from debian unstable, remaining changes: @@ -23,7 +23,7 @@ kdmtheme (1.2.2-1ubuntu1) intrepid; urgency=low -- Harald Sitter <apachelogger@ubuntu.com> Fri, 06 Jun 2008 00:46:45 +0200 -kdmtheme (1.2.2-1) unstable; urgency=low +tdmtheme (1.2.2-1) unstable; urgency=low * New upstream release: * actually saves theme changes (Closes: #447683) @@ -33,7 +33,7 @@ kdmtheme (1.2.2-1) unstable; urgency=low * Use Homepage field. [ Kel Modderman ] - * Refresh debian/patches/10_kdmtheme-override-warning.diff to apply against + * Refresh debian/patches/10_tdmtheme-override-warning.diff to apply against new upstream release. [ Fathi Boudra ] @@ -41,22 +41,22 @@ kdmtheme (1.2.2-1) unstable; urgency=low -- Fathi Boudra <fabo@debian.org> Sat, 22 Dec 2007 15:36:15 +0100 -kdmtheme (1.2.2-0ubuntu2) hardy; urgency=low +tdmtheme (1.2.2-0ubuntu2) hardy; urgency=low * Re-adds kubuntu_02_confchanges.diff. Patch from Stefan Skotte -- Anthony Mercatante <tonio@ubuntu.com> Fri, 15 Feb 2008 10:25:44 +0100 -kdmtheme (1.2.2-0ubuntu1) hardy; urgency=low +tdmtheme (1.2.2-0ubuntu1) hardy; urgency=low * New upstream release. - * Removed 10_kdmtheme-override-warning.diff. + * Removed 10_tdmtheme-override-warning.diff. * Removed kubuntu_02_confchanges.diff. * Updated Standards-Version to 3.7.3 -- Jonathan Patrick Davies <jpatrick@kubuntu.org> Mon, 22 Dec 2007 11:48:18 +0100 -kdmtheme (1.2.1-0ubuntu1) hardy; urgency=low +tdmtheme (1.2.1-0ubuntu1) hardy; urgency=low * New upstream release. * Merged new Debian changelog and changes to Ubuntu package. @@ -67,10 +67,10 @@ kdmtheme (1.2.1-0ubuntu1) hardy; urgency=low -- Jonathan Patrick Davies <jpatrick@kubuntu.org> Mon, 22 Oct 2007 21:18:56 +0200 -kdmtheme (1.2-1) unstable; urgency=low +tdmtheme (1.2-1) unstable; urgency=low * New upstream release. - * Update kdmtheme override warning patch. + * Update tdmtheme override warning patch. * Add patch to replace deprecated qlist.h include. * Add Build-Depends: quilt, automake1.7. * Update copyright file. @@ -78,11 +78,11 @@ kdmtheme (1.2-1) unstable; urgency=low -- Fathi Boudra <fboudra@free.fr> Wed, 03 Oct 2007 12:17:40 +0200 -kdmtheme (1.2-0ubuntu2) gutsy; urgency=low +tdmtheme (1.2-0ubuntu2) gutsy; urgency=low [ Stefan Skotte ] - * added support for kdm.d with override files. - * various bugfixes for normal kdmrc usage, including save and apply + * added support for tdm.d with override files. + * various bugfixes for normal tdmrc usage, including save and apply not working, themeDir not set correctly etc. [ Sarah Hobbs ] @@ -91,31 +91,31 @@ kdmtheme (1.2-0ubuntu2) gutsy; urgency=low -- Sarah Hobbs <hobbsee@ubuntu.com> Fri, 05 Oct 2007 19:09:00 +1000 -kdmtheme (1.2-0ubuntu1) gutsy; urgency=low +tdmtheme (1.2-0ubuntu1) gutsy; urgency=low * New upstream release -- Anthony Mercatante <tonio@ubuntu.com> Sat, 29 Sep 2007 11:17:55 +0200 -kdmtheme (1.1.2-2ubuntu1) feisty; urgency=low +tdmtheme (1.1.2-2ubuntu1) feisty; urgency=low * Added kubuntu_01_kcm_systemsettings.diff for tde-systemsettings inclusion in the Appearance section -- Anthony Mercatante <tonio@ubuntu.com> Tue, 13 Feb 2007 06:18:32 +0100 -kdmtheme (1.1.2-2) unstable; urgency=low +tdmtheme (1.1.2-2) unstable; urgency=low [ Mark Purcell ] * Add debian/rules get-orig-source target for http://buildserver.net. [ Fathi Boudra ] - * Add a patch to warn users about kdm override files introduced with + * Add a patch to warn users about tdm override files introduced with desktop-base. Thanks to Sune Vuorela. -- Fathi Boudra <fboudra@free.fr> Wed, 31 Jan 2007 21:11:45 +0100 -kdmtheme (1.1.2-1) unstable; urgency=low +tdmtheme (1.1.2-1) unstable; urgency=low * Initial release (Closes: #380661) diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/compat b/ubuntu/maverick/applications/tdmtheme/debian/compat index 7ed6ff82d..7ed6ff82d 100644 --- a/ubuntu/maverick/libraries/pykdeextensions/debian/compat +++ b/ubuntu/maverick/applications/tdmtheme/debian/compat diff --git a/ubuntu/maverick/applications/kdmtheme/debian/control b/ubuntu/maverick/applications/tdmtheme/debian/control index ff09f4750..c615c56fd 100644 --- a/ubuntu/maverick/applications/kdmtheme/debian/control +++ b/ubuntu/maverick/applications/tdmtheme/debian/control @@ -1,4 +1,4 @@ -Source: kdmtheme-trinity +Source: tdmtheme-trinity Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> @@ -9,11 +9,11 @@ Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs4-trinity-dev, automake, au Standards-Version: 3.8.4 Homepage: http://beta.smileaf.org/projects -Package: kdmtheme-trinity +Package: tdmtheme-trinity Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, kdm-trinity -Replaces: kdmtheme-kde3 (<< 4:3.5.13) -Breaks: kdmtheme-kde3 (<< 4:3.5.13) -Description: theme manager for KDM [Trinity] - kdmtheme is a theme manager for KDM. It provides a KDE Control Module (KCM) - that allows you to easily install, remove and change your KDM themes. +Depends: ${shlibs:Depends}, ${misc:Depends}, tdm-trinity +Replaces: tdmtheme-trinity (<< 4:14.0.0) +Breaks: tdmtheme-trinity (<< 4:14.0.0) +Description: theme manager for TDM [Trinity] + tdmtheme is a theme manager for TDM. It provides a KDE Control Module (KCM) + that allows you to easily install, remove and change your TDM themes. diff --git a/ubuntu/lucid_automake/applications/kdmtheme/debian/copyright b/ubuntu/maverick/applications/tdmtheme/debian/copyright index 23265e2b6..c8d6d972f 100644 --- a/ubuntu/lucid_automake/applications/kdmtheme/debian/copyright +++ b/ubuntu/maverick/applications/tdmtheme/debian/copyright @@ -36,7 +36,7 @@ Public License can be found in `/usr/share/common-licenses/GPL'. The Debian packaging is (C) 2007, Kel Modderman <kel@otaku42.de> and is licensed under the GPL, see above. -The documentations provided with kdmtheme is distributed under +The documentations provided with tdmtheme is distributed under the GNU Free Documentation License (FDL). They are considered free with regards to the Debian Free Software Guidelines (DFSG) because they don't contain any unmodifiable parts (invariant sections). diff --git a/ubuntu/maverick/applications/kdmtheme/debian/docs b/ubuntu/maverick/applications/tdmtheme/debian/docs index e845566c0..e845566c0 100644 --- a/ubuntu/maverick/applications/kdmtheme/debian/docs +++ b/ubuntu/maverick/applications/tdmtheme/debian/docs diff --git a/ubuntu/maverick/applications/kdmtheme/debian/patches/.gitignore b/ubuntu/maverick/applications/tdmtheme/debian/patches/.gitignore index e69de29bb..e69de29bb 100644 --- a/ubuntu/maverick/applications/kdmtheme/debian/patches/.gitignore +++ b/ubuntu/maverick/applications/tdmtheme/debian/patches/.gitignore diff --git a/ubuntu/maverick/applications/kdmtheme/debian/rules b/ubuntu/maverick/applications/tdmtheme/debian/rules index 0049d9a98..0eb4fad95 100755 --- a/ubuntu/maverick/applications/kdmtheme/debian/rules +++ b/ubuntu/maverick/applications/tdmtheme/debian/rules @@ -27,9 +27,9 @@ debian/stamp-bootstrap: make -f admin/Makefile.common cvs touch debian/stamp-bootstrap -install/kdmtheme-trinity:: - install -D -p -m644 debian/kdmtheme.lintian-overrides \ - debian/kdmtheme-trinity/usr/share/lintian/overrides/kdmtheme-trinity +install/tdmtheme-trinity:: + install -D -p -m644 debian/tdmtheme.lintian-overrides \ + debian/tdmtheme-trinity/usr/share/lintian/overrides/tdmtheme-trinity get-orig-source: @@dh_testdir diff --git a/ubuntu/maverick/applications/tdmtheme/debian/source/format b/ubuntu/maverick/applications/tdmtheme/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/tdmtheme/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/tdmtheme/debian/source/options b/ubuntu/maverick/applications/tdmtheme/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/tdmtheme/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/tdmtheme/debian/tdmtheme.lintian-overrides b/ubuntu/maverick/applications/tdmtheme/debian/tdmtheme.lintian-overrides new file mode 100644 index 000000000..88969d336 --- /dev/null +++ b/ubuntu/maverick/applications/tdmtheme/debian/tdmtheme.lintian-overrides @@ -0,0 +1,6 @@ +# provided by tdelibs +tdmtheme: desktop-command-not-in-package ./usr/share/applications/kde/tdmtheme.desktop kcmshell +# kcontrol module +tdmtheme: desktop-entry-invalid-category X-KDE-settings-system ./usr/share/applications/kde/tdmtheme.desktop +tdmtheme: desktop-entry-lacks-main-category ./usr/share/applications/kde/tdmtheme.desktop + diff --git a/ubuntu/maverick/applications/tdmtheme/debian/watch b/ubuntu/maverick/applications/tdmtheme/debian/watch new file mode 100644 index 000000000..82cebbd47 --- /dev/null +++ b/ubuntu/maverick/applications/tdmtheme/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://beta.smileaf.org/files/tdmtheme/tdmtheme-(.*)\.tar\.bz2 debian svn-upgrade diff --git a/ubuntu/maverick/applications/tellico/debian/control b/ubuntu/maverick/applications/tellico/debian/control index d1f2283c5..7cf6f01fd 100644 --- a/ubuntu/maverick/applications/tellico/debian/control +++ b/ubuntu/maverick/applications/tellico/debian/control @@ -10,8 +10,8 @@ Homepage: http://periapsis.org/tellico/ Package: tellico-trinity Architecture: any Depends: tellico-data-trinity (= ${source:Version}), tellico-scripts-trinity, ${shlibs:Depends} -Replaces: tellico-kde3 (<< 4:3.5.13) -Breaks: tellico-kde3 (<< 4:3.5.13) +Replaces: tellico-trinity (<< 4:14.0.0) +Breaks: tellico-trinity (<< 4:14.0.0) Description: collection manager for books, videos, music [Trinity] Tellico is a collection manager for KDE. It includes default collections for books, bibliographies, comic books, videos, music, coins, stamps, trading @@ -29,8 +29,8 @@ Description: collection manager for books, videos, music [Trinity] Package: tellico-data-trinity Architecture: all Depends: tdelibs-data-trinity -Replaces: tellico-data-kde3 (<< 4:3.5.13) -Breaks: tellico-data-kde3 (<< 4:3.5.13) +Replaces: tellico-data-trinity (<< 4:14.0.0) +Breaks: tellico-data-trinity (<< 4:14.0.0) Recommends: tellico-trinity Suggests: python Description: collection manager for books, videos, music [data] [Trinity] @@ -53,8 +53,8 @@ Description: collection manager for books, videos, music [data] [Trinity] Package: tellico-scripts-trinity Architecture: all Recommends: tellico-trinity -Replaces: tellico-scripts-kde3 (<< 4:3.5.13) -Breaks: tellico-scripts-kde3 (<< 4:3.5.13) +Replaces: tellico-scripts-trinity (<< 4:14.0.0) +Breaks: tellico-scripts-trinity (<< 4:14.0.0) Suggests: python, ruby Description: collection manager for books, videos, music [scripts] [Trinity] Tellico is a collection manager for KDE. It includes default collections for diff --git a/ubuntu/maverick/applications/tellico/debian/source/format b/ubuntu/maverick/applications/tellico/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/tellico/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/tellico/debian/source/options b/ubuntu/maverick/applications/tellico/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/tellico/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/control b/ubuntu/maverick/applications/twin-style-crystal/debian/control index a22f0413b..9e966189c 100644 --- a/ubuntu/maverick/applications/twin-style-crystal/debian/control +++ b/ubuntu/maverick/applications/twin-style-crystal/debian/control @@ -9,8 +9,8 @@ Standards-Version: 3.8.4 Package: twin-style-crystal-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: twin-style-crystal-kde3 (<< 4:3.5.13) -Breaks: twin-style-crystal-kde3 (<< 4:3.5.13) +Replaces: kwin-style-crystal-trinity (<< 4:14.0.0) +Breaks: kwin-style-crystal-trinity (<< 4:14.0.0) Description: semi transparant window decoration for Trinity Crystal offers you pseudo transparent titlebar, buttons and borders transparent, so you can see more of your lovely background image diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/dirs b/ubuntu/maverick/applications/twin-style-crystal/debian/dirs index af39e99b5..93234e6f8 100644 --- a/ubuntu/maverick/applications/twin-style-crystal/debian/dirs +++ b/ubuntu/maverick/applications/twin-style-crystal/debian/dirs @@ -1,2 +1,2 @@ usr/trinity/lib/trinity -usr/share/apps/kwin +usr/share/apps/twin diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/source/format b/ubuntu/maverick/applications/twin-style-crystal/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/twin-style-crystal/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/source/options b/ubuntu/maverick/applications/twin-style-crystal/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/twin-style-crystal/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/wlassistant/debian/cdbs/buildvars.mk b/ubuntu/maverick/applications/wlassistant/debian/cdbs/buildvars.mk new file mode 100644 index 000000000..23d4709dc --- /dev/null +++ b/ubuntu/maverick/applications/wlassistant/debian/cdbs/buildvars.mk @@ -0,0 +1,86 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2002,2003 Colin Walters <walters@debian.org> +# Description: Defines some useful variables, but no rules +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class + +ifndef _cdbs_rules_buildvars +_cdbs_rules_buildvars = 1 + +CDBS_VERSION = something + +# Common useful variables +DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':')) +DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') +DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-) +DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//') +DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;') + +# Split into arch/indep packages +ifneq ($(DEB_INDEP_PACKAGES),cdbs) +DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep))) +DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same)))) +endif +# Split into normal and udeb packages +ifeq ($(DEB_UDEB_PACKAGES),) +DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) +DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) +else +DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) +endif +# Too much bother for now. If someone complains we'll fix it. +#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES)) +#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES)) +# A handy list of every package, udeb or not +DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES)) +DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES))) +DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES))) + +DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) + +# Some support for srcdir != builddir builds. +# These are relative to the root of the package +DEB_SRCDIR ?= . +DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR)) + +# Miscellaneous bits +DEB_ARCH = $(shell dpkg --print-architecture) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM) +DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM) +DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU) +DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) +DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU) +DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) + +ifeq ($(words $(DEB_ALL_PACKAGES)),1) + DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/ +else + DEB_DESTDIR = $(CURDIR)/debian/tmp/ +endif + +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1) + +endif diff --git a/ubuntu/maverick/applications/wlassistant/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/wlassistant/debian/cdbs/debian-qt-kde.mk new file mode 100644 index 000000000..856fa4932 --- /dev/null +++ b/ubuntu/maverick/applications/wlassistant/debian/cdbs/debian-qt-kde.mk @@ -0,0 +1,110 @@ +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: + touch debian/stamp-cvs-make + +include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) +include debian/cdbs/uploaders.mk + +DEB_PATCHDIRS := debian/patches/common debian/patches + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \ + done + +clean:: + rm -f debian/stamp-cvs-make + +endif + +#common-build-indep:: debian/stamp-kde-apidox +#debian/stamp-kde-apidox: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) +# touch $@ +# +#common-install-indep:: common-install-kde-apidox +#common-install-kde-apidox:: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) +# +#clean:: +# rm -f debian/stamp-kde-apidox diff --git a/ubuntu/maverick/applications/wlassistant/debian/cdbs/kde.mk b/ubuntu/maverick/applications/wlassistant/debian/cdbs/kde.mk new file mode 100644 index 000000000..9dbcfbafd --- /dev/null +++ b/ubuntu/maverick/applications/wlassistant/debian/cdbs/kde.mk @@ -0,0 +1,97 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Description: A class for KDE packages; sets KDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class + +ifndef _cdbs_class_kde +_cdbs_class_kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +# include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/kde/HTML + +ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/" +DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +common-build-arch common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-prehook-impl:: + mkdir -p po + -XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages + -for file in po/*pot; do \ + sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \ + done + +common-install-arch common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + +clean:: + rm -f debian/stamp-kde-apidox + rm -rf po/*.pot + +# This is a convenience target for calling manually. It's not part of +# the build process. +buildprep: clean apply-patches + $(MAKE) -f admin/Makefile.common dist + debian/rules clean + +endif diff --git a/ubuntu/maverick/applications/wlassistant/debian/cdbs/team-members b/ubuntu/maverick/applications/wlassistant/debian/cdbs/team-members new file mode 100644 index 000000000..05761af6e --- /dev/null +++ b/ubuntu/maverick/applications/wlassistant/debian/cdbs/team-members @@ -0,0 +1,16 @@ +Sune Vuorela <debian@pusling.com> +Ana Beatriz Guerrero Lopez <ana@debian.org> +Fathi Boudra <fboudra@free.fr> +Modestas Vainius <geromanas@mailas.com> +Josh Metzler <joshdeb@metzlers.org> +Isaac Clerencia <isaac@debian.org> +Adeodato Simó <dato@net.com.org.es> +Adeodato Simo <dato@net.com.org.es> +Christopher Martin <chrsmrtn@debian.org> +Daniel Schepler <schepler@debian.org> +Sarah Hobbs <hobbsee@ubuntu.com> +Nacho Barrientos Arias <nacho@debian.org> +Ricardo Javier Cardenes Medina <rcardenes@debian.org> +Ricardo Cardenes <rcardenes@debian.org> +Armin Berres <trigger+debian@space-based.de> +Francesco Pedrini <francesco.pedrini@gmail.com> diff --git a/ubuntu/maverick/applications/wlassistant/debian/cdbs/uploaders.mk b/ubuntu/maverick/applications/wlassistant/debian/cdbs/uploaders.mk new file mode 100644 index 000000000..31adfe31e --- /dev/null +++ b/ubuntu/maverick/applications/wlassistant/debian/cdbs/uploaders.mk @@ -0,0 +1,29 @@ + +MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> +UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//') + + +debian/control.tmp: + @if [ ! -e debian/control.in ] ; then \ + echo "this package is not yet prepared for using automatic update of uploaders"; \ + echo "Please do so."; \ + exit 1; \ + fi + @sed 's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in > debian/control.tmp + +check-uploaders: debian/control.tmp + @if ! diff -q debian/control debian/control.tmp ; then \ + echo "WARNING:: Control file differs from manually generated one" ; \ + echo "WARNING:: Please update it manually and check it afterwards" ; \ + echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\ + echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\ + fi + + +clean:: + rm -f debian/control.tmp + +update-uploaders: debian/control.tmp + @mv -f debian/control.tmp debian/control + +makebuilddir:: check-uploaders diff --git a/ubuntu/maverick/applications/wlassistant/debian/cdbs/versions.pl b/ubuntu/maverick/applications/wlassistant/debian/cdbs/versions.pl new file mode 100644 index 000000000..9ce11d8a3 --- /dev/null +++ b/ubuntu/maverick/applications/wlassistant/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/-[^-]+$//; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "KDE-Version3=$version3\n"; +print "KDE-Version2=$version2\n"; +print "KDE-Next-Version3=$version3_next\n"; +print "KDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/maverick/applications/wlassistant/debian/control b/ubuntu/maverick/applications/wlassistant/debian/control index 896dcc318..7eff62514 100644 --- a/ubuntu/maverick/applications/wlassistant/debian/control +++ b/ubuntu/maverick/applications/wlassistant/debian/control @@ -3,14 +3,14 @@ Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org> -Build-Depends: debhelper (>= 4.1.0), scons, cdbs, tdelibs4-trinity-dev, net-tools, wireless-tools, libiw-dev +Build-Depends: debhelper (>= 4.1.0), cmake, cdbs, tdelibs4-trinity-dev, net-tools, wireless-tools, libiw-dev Standards-Version: 3.8.4 Package: wlassistant-trinity Architecture: any Depends: kicker-trinity, net-tools, wireless-tools, menu, ${shlibs:Depends} -Replaces: wlassistant-kde3 (<< 4:3.5.13) -Breaks: wlassistant-kde3 (<< 4:3.5.13) +Replaces: wlassistant-trinity (<< 4:14.0.0) +Breaks: wlassistant-trinity (<< 4:14.0.0) Recommends: dhcp3-client | dhcp-client | dhcpcd Description: User friendly KDE frontend for wireless network connection [Trinity] Wireless Assistant scans for wireless access points and displays link quality, diff --git a/ubuntu/maverick/applications/wlassistant/debian/control.in b/ubuntu/maverick/applications/wlassistant/debian/control.in new file mode 100644 index 000000000..0ed1a07ea --- /dev/null +++ b/ubuntu/maverick/applications/wlassistant/debian/control.in @@ -0,0 +1,23 @@ +Source: wlassistant-trinity +Section: kde +Priority: optional +Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +XSBC-Original-Maintainer: @@@MAINTAINER@@@ +Uploaders: @@@UPLOADERS@@@ +Build-Depends: debhelper (>= 4.1.0), cmake, cdbs, tdelibs4-trinity-dev, net-tools, wireless-tools, libiw-dev +Standards-Version: 3.8.4 + +Package: wlassistant-trinity +Architecture: any +Depends: kicker-trinity, net-tools, wireless-tools, menu, ${shlibs:Depends} +Replaces: wlassistant-kde3 (<< 4:3.5.13) +Breaks: wlassistant-kde3 (<< 4:3.5.13) +Recommends: dhcp3-client | dhcp-client | dhcpcd +Description: User friendly KDE frontend for wireless network connection [Trinity] + Wireless Assistant scans for wireless access points and displays link quality, + encryption and other useful information. When user wants to connect to a + network, Wireless Assistant opens up its wizards and guides the user through + Wi-Fi settings. After a successful connection is made the settings are + remembered so next time the user won't have to enter them again. + . + Homepage: http://wlassistant.sourceforge.net/ diff --git a/ubuntu/maverick/applications/wlassistant/debian/rules b/ubuntu/maverick/applications/wlassistant/debian/rules index 53862cce6..a73dcca3d 100755 --- a/ubuntu/maverick/applications/wlassistant/debian/rules +++ b/ubuntu/maverick/applications/wlassistant/debian/rules @@ -1,66 +1,26 @@ #!/usr/bin/make -f -FILENAME = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz -UPFILENAME = $(DEB_SOURCE_PACKAGE)-$(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/~/-/').tar.bz2 -URL = http://heanet.dl.sourceforge.net/$(DEB_SOURCE_PACKAGE)/$(UPFILENAME) +# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function +# Also include the main Trinity path +ifeq ("$(LD_LIBRARY_PATH)", "") +LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib +else +LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib +endif +export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk +include debian/cdbs/debian-qt-kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info +DEB_KDE_APIDOX := yes -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG) -PATH := /opt/trinity/bin:${PATH} +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" -DEB_SCONS_PREFIX=/opt/trinity - -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde - -CONFIG_STATUS=$(DEB_BUILDDIR)/config.status -SCONS_CMD=scons - -common-configure-arch common-configure-indep:: common-configure-impl -common-configure-impl:: $(CONFIG_STATUS) -$(CONFIG_STATUS): - $(SCONS_CMD) configure prefix=$(DEB_SCONS_PREFIX) - touch $(CONFIG_STATUS) - -common-build-arch common-build-indep:: common-build-impl -common-build-impl:: - $(SCONS_CMD) - -common-install-arch common-install-indep:: common-install-impl -common-install-impl:: - DESTDIR=$(DEB_DESTDIR) $(SCONS_CMD) install - -install/wlassistant-trinity:: - mv $(CURDIR)/debian/wlassistant-trinity/opt/trinity/share/applnk/Utilities/wlassistant.desktop \ - $(CURDIR)/debian/wlassistant-trinity/opt/trinity/share/applications/kde/ - rmdir $(CURDIR)/debian/wlassistant-trinity/opt/trinity/share/applnk/Utilities - rmdir $(CURDIR)/debian/wlassistant-trinity/opt/trinity/share/applnk - -clean:: - rm -f $(CONFIG_STATUS) - rm -rf cache - rm -rf .sconf_temp - rm -rf admin - rm -rf build/ - rm -f bksys/*.pyc - rm -f generic.cache.py kde.cache.py configure.log - rm -f scons/*.pyc scons/signatures.dblite - -cleanbuilddir common-configure-arch:: - -DEB_INSTALL_MANPAGES_wlassistant-trinity = debian/wlassistant-trinity.manpage - -get-orig-source: - @@dh_testdir - @@[ -d ../tarballs/. ] - @@echo Downloading $(UPFILENAME) from $(URL) ... - @@wget -N -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL) - @@echo Converting $(UPFILENAME) to $(FILENAME) - @@bzcat ../tarballs/$(UPFILENAME) | gzip -9 > ../tarballs/$(FILENAME) +# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to +# never build in parallel, regardless of DEB_BUILD_OPTIONS. +DEB_BUILD_PARALLEL = true diff --git a/ubuntu/maverick/applications/wlassistant/debian/source/format b/ubuntu/maverick/applications/wlassistant/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/wlassistant/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/wlassistant/debian/source/options b/ubuntu/maverick/applications/wlassistant/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/wlassistant/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/yakuake/debian/control b/ubuntu/maverick/applications/yakuake/debian/control index 98569dd19..8204e37de 100644 --- a/ubuntu/maverick/applications/yakuake/debian/control +++ b/ubuntu/maverick/applications/yakuake/debian/control @@ -10,8 +10,8 @@ Homepage: http://extragear.kde.org/apps/yakuake/ Package: yakuake-trinity Architecture: any Depends: ${shlibs:Depends}, konsole-trinity -Replaces: yakuake-kde3 (<< 4:3.5.13) -Breaks: yakuake-kde3 (<< 4:3.5.13) +Replaces: yakuake-trinity (<< 4:14.0.0) +Breaks: yakuake-trinity (<< 4:14.0.0) Description: a Quake-style terminal emulator based on KDE Konsole technology [Trinity] YaKuake is inspired from the terminal in the Quake game: when you press a key (by default F12, but that can be changed) a terminal window slides down from diff --git a/ubuntu/maverick/applications/yakuake/debian/source/format b/ubuntu/maverick/applications/yakuake/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/yakuake/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/yakuake/debian/source/options b/ubuntu/maverick/applications/yakuake/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/applications/yakuake/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/yakuake/debian/yakuake.1 b/ubuntu/maverick/applications/yakuake/debian/yakuake-trinity.1 index 7b404d01e..7b404d01e 100644 --- a/ubuntu/maverick/applications/yakuake/debian/yakuake.1 +++ b/ubuntu/maverick/applications/yakuake/debian/yakuake-trinity.1 diff --git a/ubuntu/maverick/applications/yakuake/debian/yakuake-trinity.manpages b/ubuntu/maverick/applications/yakuake/debian/yakuake-trinity.manpages index 72280ef49..f9a1365b5 100644 --- a/ubuntu/maverick/applications/yakuake/debian/yakuake-trinity.manpages +++ b/ubuntu/maverick/applications/yakuake/debian/yakuake-trinity.manpages @@ -1 +1 @@ -debian/yakuake.1 +debian/yakuake-trinity.1 diff --git a/ubuntu/maverick/dependencies/arts/debian/control b/ubuntu/maverick/dependencies/arts/debian/control index e2fd25718..9c9e910c3 100644 --- a/ubuntu/maverick/dependencies/arts/debian/control +++ b/ubuntu/maverick/dependencies/arts/debian/control @@ -16,8 +16,8 @@ Standards-Version: 3.8.4 Package: arts-trinity Architecture: all Section: sound -Replaces: arts-kde3 (<< 4:3.5.13) -Breaks: arts-kde3 (<< 4:3.5.13) +Replaces: arts-trinity (<< 4:14.0.0) +Breaks: arts-trinity (<< 4:14.0.0) Depends: libartsc0-trinity (>= ${source:Version}), libarts1c2a-trinity (>= ${source:Version}) Description: sound system from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -31,8 +31,8 @@ Description: sound system from the official KDE release Package: libarts1c2a-trinity Architecture: any Section: libs -Replaces: libarts1c2a-kde3 (<< 4:3.5.13) -Breaks: libarts1c2a-kde3 (<< 4:3.5.13) +Replaces: libarts1c2a-trinity (<< 4:14.0.0) +Breaks: libarts1c2a-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: libarts1-akode Description: aRts sound system core components @@ -55,8 +55,8 @@ Description: aRts sound system core components Package: libarts1-trinity-dev Architecture: any Section: libdevel -Replaces: libarts1-kde3-dev (<< 4:3.5.13) -Breaks: libarts1-kde3-dev (<< 4:3.5.13) +Replaces: libarts1-trinity-dev (<< 4:14.0.0) +Breaks: libarts1-trinity-dev (<< 4:14.0.0) Depends: libarts1c2a-trinity (= ${binary:Version}), libartsc0-trinity-dev (= ${binary:Version}), ${libasound2-dev}, libaudio-dev, libaudiofile-dev, libesd0-dev, libglib2.0-dev, libogg-dev, libogg-dev-la, libvorbis-dev, libtqtinterface-dev Description: development files for the aRts sound system core components This package contains the header files needed to build applications that @@ -68,8 +68,8 @@ Description: development files for the aRts sound system core components Package: libartsc0-trinity Architecture: any Section: libs -Replaces: libartsc0-kde3 (<< 4:3.5.13) -Breaks: libartsc0-kde3 (<< 4:3.5.13) +Replaces: libartsc0-trinity (<< 4:14.0.0) +Breaks: libartsc0-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: aRts sound system C support library This package contains the C bindings for the aRts sound daemon. @@ -80,8 +80,8 @@ Description: aRts sound system C support library Package: libartsc0-trinity-dev Architecture: any Section: libdevel -Replaces: libartsc0-kde3-dev (<< 4:3.5.13) -Breaks: libartsc0-kde3-dev (<< 4:3.5.13) +Replaces: libartsc0-trinity-dev (<< 4:14.0.0) +Breaks: libartsc0-trinity-dev (<< 4:14.0.0) Depends: libartsc0-trinity (= ${binary:Version}), libglib2.0-dev Description: development files for the aRts sound system C support library This package contains the header files needed to build applications that @@ -93,8 +93,8 @@ Description: development files for the aRts sound system C support library Package: arts-trinity-dbg Section: libdevel Architecture: any -Replaces: arts-kde3-dbg (<< 4:3.5.13) -Breaks: arts-kde3-dbg (<< 4:3.5.13) +Replaces: arts-trinity-dbg (<< 4:14.0.0) +Breaks: arts-trinity-dbg (<< 4:14.0.0) Priority: extra Depends: libarts1c2a-trinity (= ${binary:Version}) Description: debugging symbols for arts diff --git a/ubuntu/maverick/dependencies/arts/debian/rules b/ubuntu/maverick/dependencies/arts/debian/rules index 7be8b0057..c6720ab40 100755 --- a/ubuntu/maverick/dependencies/arts/debian/rules +++ b/ubuntu/maverick/dependencies/arts/debian/rules @@ -14,7 +14,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk -DEB_CMAKE_EXTRA_FLAGS := -DPKGCONFIG_INSTALL_DIR="/usr/lib/pkgconfig" -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" +DEB_CMAKE_EXTRA_FLAGS := -DPKGCONFIG_INSTALL_DIR="/usr/lib/pkgconfig" -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. diff --git a/ubuntu/maverick/dependencies/arts/debian/source/format b/ubuntu/maverick/dependencies/arts/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/dependencies/arts/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/dependencies/arts/debian/source/options b/ubuntu/maverick/dependencies/arts/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/dependencies/arts/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/dependencies/avahi-tqt/debian/control b/ubuntu/maverick/dependencies/avahi-tqt/debian/control index 607e76dd1..8b0c55500 100644 --- a/ubuntu/maverick/dependencies/avahi-tqt/debian/control +++ b/ubuntu/maverick/dependencies/avahi-tqt/debian/control @@ -23,6 +23,8 @@ Standards-Version: 3.9.1 Package: libavahi-tqt-1 Section: libs Architecture: any +Replaces: libavahi-tqt-1 (<< 4:14.0.0) +Breaks: libavahi-tqt-1 (<< 4:14.0.0) Depends: ${shlibs:Depends}, ${misc:Depends} Pre-Depends: ${misc:Pre-Depends} @@ -40,6 +42,8 @@ Description: Avahi TQt integration library Package: libavahi-tqt-dev Section: libdevel Architecture: any +Replaces: libavahi-tqt-dev (<< 4:14.0.0) +Breaks: libavahi-tqt-dev (<< 4:14.0.0) Depends: libavahi-tqt-1 (= ${binary:Version}), ${misc:Depends}, libtqtinterface-dev, @@ -52,4 +56,4 @@ Description: Development headers for the Avahi TQt integration library print to, files to look at and people to talk to. . This package contains the development headers for the interface - to integrate the Avahi libraries into a TQt main loop application.
\ No newline at end of file + to integrate the Avahi libraries into a TQt main loop application. diff --git a/ubuntu/maverick/dependencies/avahi-tqt/debian/source/format b/ubuntu/maverick/dependencies/avahi-tqt/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/dependencies/avahi-tqt/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/dependencies/avahi-tqt/debian/source/options b/ubuntu/maverick/dependencies/avahi-tqt/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/dependencies/avahi-tqt/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/control b/ubuntu/maverick/dependencies/dbus-1-tqt/debian/control index efc9239a4..36e73bbb1 100644 --- a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/control +++ b/ubuntu/maverick/dependencies/dbus-1-tqt/debian/control @@ -8,8 +8,8 @@ Standards-Version: 3.8.3 Package: libdbus-1-tqt-dev Section: libdevel Architecture: any -Replaces: libdbus-1-tqt-dev (<< 4:3.5.13) -Breaks: libdbus-1-tqt-dev (<< 4:3.5.13) +Replaces: libdbus-1-tqt-dev (<< 4:14.0.0) +Breaks: libdbus-1-tqt-dev (<< 4:14.0.0) Depends: libdbus-1-tqt (= ${binary:Version}), libdbus-1-dev (>= 0.90), libtqtinterface-dev Description: dbus bindings for the Trinity Qt [TQt] interface D-BUS is a message bus, used for sending messages between applications. @@ -23,8 +23,8 @@ Description: dbus bindings for the Trinity Qt [TQt] interface Package: libdbus-1-tqt Section: libs Architecture: any -Replaces: libdbus-1-tqt (<< 4:3.5.13) -Breaks: libdbus-1-tqt (<< 4:3.5.13) +Replaces: libdbus-1-tqt (<< 4:14.0.0) +Breaks: libdbus-1-tqt (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: dbus bindings for the Trinity Qt [TQt] interface D-BUS is a message bus, used for sending messages between applications. diff --git a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/source/format b/ubuntu/maverick/dependencies/dbus-1-tqt/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/dependencies/dbus-1-tqt/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/source/options b/ubuntu/maverick/dependencies/dbus-1-tqt/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/dependencies/dbus-1-tqt/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/dependencies/dbus-tqt/debian/control b/ubuntu/maverick/dependencies/dbus-tqt/debian/control index 38bca796a..cdf2d334a 100644 --- a/ubuntu/maverick/dependencies/dbus-tqt/debian/control +++ b/ubuntu/maverick/dependencies/dbus-tqt/debian/control @@ -9,8 +9,8 @@ Standards-Version: 3.8.3 Package: libdbus-tqt-1-dev Section: libdevel Architecture: any -Replaces: libdbus-tqt-1-dev (<< 4:3.5.13) -Breaks: libdbus-tqt-1-dev (<< 4:3.5.13) +Replaces: libdbus-tqt-1-dev (<< 4:14.0.0) +Breaks: libdbus-tqt-1-dev (<< 4:14.0.0) Depends: libdbus-tqt-1-1c2 (= ${Source-Version}), libdbus-1-dev (>= 0.90), libtqtinterface-dev Conflicts: dbus-tqt-1-dev Description: simple interprocess messaging system (TQt interface) @@ -25,8 +25,8 @@ Description: simple interprocess messaging system (TQt interface) Package: libdbus-tqt-1-1c2 Section: libs Architecture: any -Replaces: libdbus-tqt-1-1c2 (<< 4:3.5.13) -Breaks: libdbus-tqt-1-1c2 (<< 4:3.5.13) +Replaces: libdbus-tqt-1-1c2 (<< 4:14.0.0) +Breaks: libdbus-tqt-1-1c2 (<< 4:14.0.0) Depends: ${shlibs:Depends} Conflicts: dbus-tqt-1, dbus-tqt-1c2, libdbus-tqt-1-1 Description: simple interprocess messaging system (TQt-based shared library) diff --git a/ubuntu/maverick/dependencies/dbus-tqt/debian/source/format b/ubuntu/maverick/dependencies/dbus-tqt/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/dependencies/dbus-tqt/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/dependencies/dbus-tqt/debian/source/options b/ubuntu/maverick/dependencies/dbus-tqt/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/dependencies/dbus-tqt/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/changelog b/ubuntu/maverick/dependencies/libart-lgpl/debian/changelog new file mode 100644 index 000000000..d9238f241 --- /dev/null +++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/changelog @@ -0,0 +1,252 @@ +libart-lgpl (2.3.22-0ubuntu0) lucid; urgency=low + + * Build patched/maintained TDE version instead of unmaintained upstream + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Wed, 07 Dec 2011 17:50:00 -0600 + +libart-lgpl (2.3.21-1) unstable; urgency=low + + [ Loic Minier ] + * Properly anchor package name regexp. + + [ Sebastian Dröge ] + * New upstream bugfix release: + + debian/control.in: + - Update Standards-Version and build-depend on autotools-dev. + + debian/patches/70_relibtoolize.patch: + - Regenerated for the new version. + + -- Sebastian Dröge <slomo@debian.org> Sun, 25 Apr 2010 11:35:30 +0200 + +libart-lgpl (2.3.20-2) unstable; urgency=low + + * Let libart-2.0-dev depend on shlibs:Depends. + * Extract library package name from control instead of hardcoding it in + rules. + * New patch, 60_libart-config-static, adds --static flag to libart2-config + to avoid -lm in the output of --libs; please consider switching to + pkg-config instead; GNOME #531278; closes: #375812. + * Fix copyright to state LGPL 2 or later as checked with licensecheck; + thanks Thomas Viehmann; closes: #478766. + + -- Loic Minier <lool@dooz.org> Sat, 03 May 2008 22:21:18 +0200 + +libart-lgpl (2.3.20-1) unstable; urgency=low + + [ Kilian Krause ] + * Use binary:version and source:Version for binNMU-safe uploads as + added in dpkg-dev 1.13.19. Add to Build-Depends accordingly. + + [ Sebastian Dröge ] + * New upstream bugfix release: + + debian/patches/90_fix-headers-for-cplusplus.patch: + - Dropped, merged upstream. + + debian/patches/70_relibtoolize.patch: + - Regenerated for the new version. + * debian/control.in: + + Update Standards-Version to 3.7.3, no additional changes needed. + + -- Sebastian Dröge <slomo@debian.org> Wed, 30 Jan 2008 13:38:26 +0100 + +libart-lgpl (2.3.19-3) unstable; urgency=low + + * Upload to unstable; drop check-dist include. + * Wrap build-deps and deps. + * Drop libc6-dev dep in libart-2.0-dev. + * Add ${misc:Depends}. + + -- Loic Minier <lool@dooz.org> Wed, 11 Apr 2007 16:23:30 +0200 + +libart-lgpl (2.3.19-2) experimental; urgency=high + + * Use clean-la.mk and require gnome-pkg-tools 0.7. + * New patch, 90_fix-headers-for-cplusplus.patch, fixes linking with C++ + applications; GNOME #413197; SVN r278; closes: #417568. + * Rename patch 070_relibtoolize to 70_relibtoolize. + + -- Loic Minier <lool@dooz.org> Tue, 03 Apr 2007 15:23:09 +0200 + +libart-lgpl (2.3.19-1) experimental; urgency=low + + * Add a get-orig-source target to retrieve the upstream tarball. + * Add complete licensing information in copyright file. + * Update upstream URL in copyright file. + * Bump up Standards-Version to 3.7.2. + * Use debian/libart-2.0-dev.manpages instead of + DEB_INSTALL_MANPAGES_libart-2.0-dev. + * Use HTTP in watch file and track all branches. + * Include CDBS's utils. + * New upstream releases with API additions. + - Include the new check-dist Makefile to prevent accidental uploads to + unstable; bump build-dep on gnome-pkg-tools to >= 0.10. + - Set shlibs to >= 2.3.18. + - Update and rename relibtoolizing patch, 070_relibtoolize. + * Drop useless libart-2.0-dev.files. + * Drop build-dep on libc6-dev | libc-dev; doh. + * Bump up DebHelper compatibility level to 5. + + -- Loic Minier <lool@dooz.org> Wed, 28 Feb 2007 15:20:45 +0100 + +libart-lgpl (2.3.17-1) unstable; urgency=low + + * GNOME Team Upload. + * New upstream release. + * debian/patches/001_relibtoolize.patch: + - updated. + * debian/watch: + - added. + + -- Sebastien Bacher <seb128@debian.org> Tue, 25 Jan 2005 23:51:07 +0100 + +libart-lgpl (2.3.16-6) unstable; urgency=low + + * Relibtoolize (Closes: #260639) + + -- OndÅ™ej Surý <ondrej@debian.org> Wed, 21 Jul 2004 17:27:15 +0200 + +libart-lgpl (2.3.16-5) unstable; urgency=low + + * Set shlibs version to current. + + -- OndÅ™ej Surý <ondrej@debian.org> Mon, 19 Apr 2004 18:49:50 +0200 + +libart-lgpl (2.3.16-4) unstable; urgency=low + + * Gnome Team upload. + * Setting again the shlibs file. + + -- Sebastien Bacher <seb128@debian.org> Thu, 15 Apr 2004 19:35:09 +0200 + +libart-lgpl (2.3.16-3) unstable; urgency=low + + * New maintainer (Closes: #238891) + + -- OndÅ™ej Surý <ondrej@debian.org> Sat, 20 Mar 2004 15:14:54 +0100 + +libart-lgpl (2.3.16-2) unstable; urgency=low + + * Orphaned package. + + -- Christian Marillat <marillat@debian.org> Fri, 19 Mar 2004 16:06:24 +0100 + +libart-lgpl (2.3.16-1) unstable; urgency=low + + * New upstream release. + * Fix an "assertion failed" who crash gdm (Closes: #208919) + + -- Christian Marillat <marillat@debian.org> Wed, 10 Sep 2003 09:48:22 +0200 + +libart-lgpl (2.3.15-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat <marillat@debian.org> Tue, 2 Sep 2003 14:14:16 +0200 + +libart-lgpl (2.3.14-2) unstable; urgency=low + + * Compiled with -mieee for alpha (Closes: #207748) + + -- Christian Marillat <marillat@debian.org> Fri, 29 Aug 2003 19:24:46 +0200 + +libart-lgpl (2.3.14-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat <marillat@debian.org> Fri, 8 Aug 2003 10:23:11 +0200 + +libart-lgpl (2.3.13-1) unstable; urgency=low + + * new upstream release. + + -- Christian Marillat <marillat@debian.org> Fri, 11 Jul 2003 14:59:55 +0200 + +libart-lgpl (2.3.12-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat <marillat@debian.org> Mon, 5 May 2003 12:58:07 +0200 + +libart-lgpl (2.3.11-4) unstable; urgency=low + + * Update section + + -- Christian Marillat <marillat@debian.org> Tue, 1 Apr 2003 18:52:25 +0200 + +libart-lgpl (2.3.11-3) unstable; urgency=low + + * Add a patche to fix configure for mipsel + + -- Christian Marillat <marillat@debian.org> Sat, 18 Jan 2003 10:11:41 +0100 + +libart-lgpl (2.3.11-2) unstable; urgency=low + + * Update description (Closes: #177003) + + -- Christian Marillat <marillat@debian.org> Fri, 17 Jan 2003 21:27:15 +0100 + +libart-lgpl (2.3.11-1) unstable; urgency=low + + * New upstream release. + * Bump Standards-Version to 3.5.8 + + -- Christian Marillat <marillat@debian.org> Tue, 7 Jan 2003 19:40:48 +0100 + +libart-lgpl (2.3.10-4) unstable; urgency=low + + * Update to standards version 3.5.7 + + -- Christian Marillat <marillat@debian.org> Sat, 21 Sep 2002 14:41:00 +0200 + +libart-lgpl (2.3.10-3) unstable; urgency=low + + * Replace libc6-dev by libc-dev for -dev package. + + -- Christian Marillat <marillat@debian.org> Thu, 5 Sep 2002 18:25:28 +0200 + +libart-lgpl (2.3.10-2) unstable; urgency=low + + * Move libc6-dev dependency in the -dev package. + + -- Christian Marillat <marillat@debian.org> Thu, 8 Aug 2002 14:34:51 +0200 + +libart-lgpl (2.3.10-1) unstable; urgency=low + + * New upstream release (Closes: #151622) + + -- Christian Marillat <marillat@debian.org> Tue, 2 Jul 2002 01:38:03 +0200 + +libart-lgpl (2.3.9-2) unstable; urgency=low + + * debian/control add a versioned dependency for the -dev package + (Closes: #151369) + + -- Christian Marillat <marillat@debian.org> Sat, 29 Jun 2002 17:39:39 +0200 + +libart-lgpl (2.3.9-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat <marillat@debian.org> Tue, 25 Jun 2002 10:26:05 +0200 + +libart-lgpl (2.3.8-2) unstable; urgency=low + + * Add support for DEB_HOST_GNU_TYPE DEB_BUILD_GNU_TYPE and + DEB_BUILD_OPTIONS + + -- Christian Marillat <marillat@debian.org> Wed, 15 May 2002 22:28:40 +0200 + +libart-lgpl (2.3.8-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat <marillat@debian.org> Mon, 14 Jan 2002 10:58:19 +0100 + +libart-lgpl (2.3.7-1) unstable; urgency=low + + * Initial Release. + + -- Christian Marillat <marillat@debian.org> Mon, 19 Nov 2001 18:29:06 +0100 + +Local variables: +mode: debian-changelog +End: diff --git a/ubuntu/maverick_automake/applications/kdmtheme/debian/compat b/ubuntu/maverick/dependencies/libart-lgpl/debian/compat index 7ed6ff82d..7ed6ff82d 100644 --- a/ubuntu/maverick_automake/applications/kdmtheme/debian/compat +++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/compat diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/control b/ubuntu/maverick/dependencies/libart-lgpl/debian/control new file mode 100644 index 000000000..d131211f3 --- /dev/null +++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/control @@ -0,0 +1,46 @@ +# This file is autogenerated. DO NOT EDIT! +# +# Modifications should be made to debian/control.in instead. +# This file is regenerated automatically in the clean target. + +Source: libart-lgpl +Section: devel +Priority: optional +Maintainer: Josselin Mouette <joss@debian.org> +Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Loic Minier <lool@dooz.org>, Sebastian Drge <slomo@debian.org>, Sebastien Bacher <seb128@debian.org> +Standards-Version: 3.8.4 +Build-Depends: debhelper (>= 5), + gnome-pkg-tools (>= 0.7), + cdbs, + dpkg-dev (>= 1.13.19), + automake, autoconf, libtool, libltdl-dev + +Package: libart-2.0-2 +Architecture: any +Section: libs +Replaces: libart-2.0-2 (<< 4:14.0.0) +Breaks: libart-2.0-2 (<< 4:14.0.0) +Depends: ${misc:Depends}, + ${shlibs:Depends} +Description: Library of functions for 2D graphics - runtime files + A library of functions for 2D graphics supporting a superset of the + PostScript imaging model, designed to be integrated with graphics, artwork, + and illustration programs. It is written in optimized C, and is fully + compatible with C++. With a small footprint of 10,000 lines of code, it is + especially suitable for embedded applications. + +Package: libart-2.0-dev +Architecture: any +Section: libdevel +Replaces: libart-2.0-dev (<< 4:14.0.0) +Breaks: libart-2.0-dev (<< 4:14.0.0) +Depends: ${misc:Depends}, + ${shlibs:Depends}, + libart-2.0-2 (= ${binary:Version}), + pkg-config +Description: Library of functions for 2D graphics - development files + A library of functions for 2D graphics supporting a superset of the + PostScript imaging model, designed to be integrated with graphics, artwork, + and illustration programs. It is written in optimized C, and is fully + compatible with C++. With a small footprint of 10,000 lines of code, it is + especially suitable for embedded applications. diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/control.in b/ubuntu/maverick/dependencies/libart-lgpl/debian/control.in new file mode 100644 index 000000000..12f7ab436 --- /dev/null +++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/control.in @@ -0,0 +1,37 @@ +Source: libart-lgpl +Section: devel +Priority: optional +Maintainer: Josselin Mouette <joss@debian.org> +Uploaders: @GNOME_TEAM@ +Standards-Version: 3.8.4 +Build-Depends: debhelper (>= 5), + gnome-pkg-tools (>= 0.7), + cdbs, + dpkg-dev (>= 1.13.19), + autotools-dev + +Package: libart-2.0-2 +Architecture: any +Section: libs +Depends: ${misc:Depends}, + ${shlibs:Depends} +Description: Library of functions for 2D graphics - runtime files + A library of functions for 2D graphics supporting a superset of the + PostScript imaging model, designed to be integrated with graphics, artwork, + and illustration programs. It is written in optimized C, and is fully + compatible with C++. With a small footprint of 10,000 lines of code, it is + especially suitable for embedded applications. + +Package: libart-2.0-dev +Architecture: any +Section: libdevel +Depends: ${misc:Depends}, + ${shlibs:Depends}, + libart-2.0-2 (= ${binary:Version}), + pkg-config +Description: Library of functions for 2D graphics - development files + A library of functions for 2D graphics supporting a superset of the + PostScript imaging model, designed to be integrated with graphics, artwork, + and illustration programs. It is written in optimized C, and is fully + compatible with C++. With a small footprint of 10,000 lines of code, it is + especially suitable for embedded applications. diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/copyright b/ubuntu/maverick/dependencies/libart-lgpl/debian/copyright new file mode 100644 index 000000000..6c6d40347 --- /dev/null +++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/copyright @@ -0,0 +1,27 @@ +This package was debianized by Christian Marillat <marillat@debian.org> on +Mon, 19 Nov 2001 18:29:06 +0100 + +It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/ + +Upstream Author: Raph Levien <raph@acm.org> + +Copyright: 1998, 1999, 2000, 2001 Raph Levien <raph@acm.org> + +License: + + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL'. diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/libart-2.0-2.install b/ubuntu/maverick/dependencies/libart-lgpl/debian/libart-2.0-2.install new file mode 100644 index 000000000..be04efa71 --- /dev/null +++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/libart-2.0-2.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libart_lgpl_2.so.* diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/libart-2.0-dev.install b/ubuntu/maverick/dependencies/libart-lgpl/debian/libart-2.0-dev.install new file mode 100644 index 000000000..154d573e6 --- /dev/null +++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/libart-2.0-dev.install @@ -0,0 +1,6 @@ +debian/tmp/usr/include +debian/tmp/usr/lib/pkgconfig +debian/tmp/usr/bin/libart2-config +debian/tmp/usr/lib/libart_lgpl_2.a +debian/tmp/usr/lib/libart_lgpl_2.la +debian/tmp/usr/lib/libart_lgpl_2.so diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/libart-2.0-dev.manpages b/ubuntu/maverick/dependencies/libart-lgpl/debian/libart-2.0-dev.manpages new file mode 100644 index 000000000..d9f908cc0 --- /dev/null +++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/libart-2.0-dev.manpages @@ -0,0 +1 @@ +debian/libart2-config.1 diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/libart2-config.1 b/ubuntu/maverick/dependencies/libart-lgpl/debian/libart2-config.1 new file mode 100644 index 000000000..7439b2923 --- /dev/null +++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/libart2-config.1 @@ -0,0 +1,52 @@ +.\" This manpage has been automatically generated by docbook2man +.\" from a DocBook document. This tool can be found at: +.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> +.\" Please send any bug reports, improvements, comments, patches, +.\" etc. to Steve Cheng <steve@ggi-project.org>. +.TH "LIBART2-CONFIG" "1" "08 August 2003" "" "" +.SH NAME +libart2-config \- script to get information about the installed version of libart 2.x +.SH SYNOPSIS + +\fBlibart2-config\fR [ \fB --prefix\fI[=DIR]\fB \fR ] [ \fB --exec-prefix\fI[=DIR]\fB \fR ] [ \fB --libs \fR ] [ \fB --cflags \fR ] [ \fB --version \fR ] + +.SH "DESCRIPTION" +.PP +\fBlibart2-config\fR is a tool that is used to determine +the compiler and linker flags that should be used to compile and +link programs that use \fIlibart\fR library. +.SH "OPTIONS" +.TP +\fB--prefix=PREFIX\fR +If specified, use \fIPREFIX\fR instead +of the installation prefix that +\fIlibart\fR was built with when computing +the output for the \fB--cflags\fR and +\fB--libs\fR options. This option is also used for +the exec prefix if \fB--exec-prefix\fR was +not specified. This option must be specified before any +\fB--libs\fR or \fB--cflags\fR options. +.TP +\fB--exec-prefix=PREFIX\fR +If specified, use \fIPREFIX\fR instead +of the installation exec prefix that +\fIlibart\fR was built with when computing +the output for the \fB--cflags\fR and +\fB--libs\fR options. This option must be specified +before any \fB--libs\fR or \fB--cflags\fR options. +.TP +\fB--libs\fR +Print the linker flags that are necessary to link a +\fIlibart\fR program. +.TP +\fB--cflags\fR +Print the compiler flags that are necessary to compile a +\fIlibart\fR program. +.TP +\fB--version\fR +Print the currently installed version of +\fIlibart\fR on the standard output. +.SH "AUTHOR" +.PP +This manual page was written by Christian Marillat <marillat@debian.org> for +the Debian GNU/Linux system (but may be used by others). diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/rules b/ubuntu/maverick/dependencies/libart-lgpl/debian/rules new file mode 100755 index 000000000..4390434f7 --- /dev/null +++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/rules @@ -0,0 +1,22 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +makebuilddir/kvpnc-trinity:: + cp -Rp /usr/share/aclocal/libtool.m4 libtool.m4.in + cp -Rp /usr/share/libtool/config/ltmain.sh ltmain.sh + autoconf + automake + +libart-2.0-N := $(shell sed -rn 's/^Package:[[:space:]]*(libart-2\.0-[0-9]+)[[:space:]]*$$/\1/p' debian/control) + +GNOME_MODULE := libart_lgpl + +DEB_DH_MAKESHLIBS_ARGS_$(libart-2.0-N) += -V '$(libart-2.0-N)(>= 2.3.18)' + diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/source/format b/ubuntu/maverick/dependencies/libart-lgpl/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/source/options b/ubuntu/maverick/dependencies/libart-lgpl/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/watch b/ubuntu/maverick/dependencies/libart-lgpl/debian/watch new file mode 100644 index 000000000..8acf72053 --- /dev/null +++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/watch @@ -0,0 +1,4 @@ +version=2 +http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/([\d\.]+)/ \ + libart_lgpl-(.*)\.tar\.gz \ + debian uupdate diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/README.Debian b/ubuntu/maverick/dependencies/python-tqt/debian/README.Debian new file mode 100644 index 000000000..aabb494aa --- /dev/null +++ b/ubuntu/maverick/dependencies/python-tqt/debian/README.Debian @@ -0,0 +1,4 @@ +DOCUMENTATION +------------- +You can find doc and examples about PyQt in the package python-qt-doc + diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/changelog b/ubuntu/maverick/dependencies/python-tqt/debian/changelog new file mode 100644 index 000000000..95e2f0cce --- /dev/null +++ b/ubuntu/maverick/dependencies/python-tqt/debian/changelog @@ -0,0 +1,6 @@ +python-tqt (3.18.1-4ubuntu0) lucid; urgency=low + + * Initial build + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Tue, 29 Nov 2011 01:16:00 -0600 + diff --git a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/compat b/ubuntu/maverick/dependencies/python-tqt/debian/compat index 7ed6ff82d..7ed6ff82d 100644 --- a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/compat +++ b/ubuntu/maverick/dependencies/python-tqt/debian/compat diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/control b/ubuntu/maverick/dependencies/python-tqt/debian/control new file mode 100644 index 000000000..71f586675 --- /dev/null +++ b/ubuntu/maverick/dependencies/python-tqt/debian/control @@ -0,0 +1,126 @@ +Source: python-tqt +Section: python +Priority: optional +Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> +Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org> +Build-Depends: debhelper (>= 6.0.7~), python-all-dev (>= 2.3.5-10), libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python-sip-dev (>= 4.10.0-2ubuntu1), libtqscintilla-dev, python-support (>= 0.7.1), python-sip-dbg, python-all-dbg +Standards-Version: 3.8.4 + +Package: python-tqt +Architecture: any +Depends: ${shlibs:Depends}, ${python:Depends}, ${sip:Depends}, ${misc:Depends} +Replaces: python-tqt (<< 4:14.0.0) +Breaks: python-tqt (<< 4:14.0.0) +Suggests: python-tqt-gl, python-tqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql +Provides: ${python:Provides} +Description: TQt bindings for Python + Python binding module that allows use of TQt X Window toolkit v3. + You can use it to create portable graphics-capable scripts (there + are PyQt versions for Linux, Windows and MacOS X). + . + At this moment PyQt offers a vast subset of TQt API. There are + some minor issues related to the differences between C++ and Python + (types, etc), but usually you'll be able to write code pretty much the + same way in both languages (with syntax differences, of course) + +Package: python-tqt-dbg +Architecture: any +Priority: extra +Replaces: python-tqt-dbg (<< 4:14.0.0) +Breaks: python-tqt-dbg (<< 4:14.0.0) +Section: debug +Depends: ${shlibs:Depends}, python-dbg, python-tqt (= ${binary:Version}), python-sip-dbg, ${misc:Depends} +Description: TQt bindings for Python (debug extension) + Python binding module that allows use of TQt X Window toolkit v3. + You can use it to create portable graphics-capable scripts (there + are PyQt versions for Linux, Windows and MacOS X). + . + This package contains the extension built for the Python debug interpreter. + +Package: python-tqt-gl +Architecture: any +Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), python-opengl (>= 2.0.1.09-2.2), ${misc:Depends} +Replaces: python-tqt-gl (<< 4:14.0.0) +Breaks: python-tqt-gl (<< 4:14.0.0) +Suggests: python-tqt-doc +Provides: ${python:Provides} +Description: TQt OpenGL bindings for Python + Python binding module that allows use of the OpenGL facilities + offered by the TQt X Window toolkit v3. You can use it to create + portable graphics-capable scripts (there are PyQt versions for + Linux, Windows and MacOS X). + +Package: python-tqt-gl-dbg +Priority: extra +Section: debug +Replaces: python-tqt-gl-dbg (<< 4:14.0.0) +Breaks: python-tqt-gl-dbg (<< 4:14.0.0) +Architecture: any +Depends: ${shlibs:Depends}, python-dbg, python-tqt-gl (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends} +Description: TQt OpenGL bindings for Python (debug extension) + Python binding module that allows use of the OpenGL facilities + offered by the TQt X Window toolkit v3. You can use it to create + portable graphics-capable scripts (there are PyQt versions for + Linux, Windows and MacOS X). + . + This package contains the extension built for the Python debug interpreter. + +Package: python-tqtext +Architecture: any +Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), ${misc:Depends} +Replaces: python-tqtext (<< 4:14.0.0) +Breaks: python-tqtext (<< 4:14.0.0) +Provides: ${python:Provides} +Description: TQt extensions for PyQt + PyQt Extensions. Contains: + . + * QScintilla: a featureful TQt source code editing component based + on Scintilla. + +Package: python-tqtext-dbg +Priority: extra +Section: debug +Replaces: python-tqtext-dbg (<< 4:14.0.0) +Breaks: python-tqtext-dbg (<< 4:14.0.0) +Architecture: any +Depends: ${shlibs:Depends}, python-dbg, python-tqtext (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends} +Description: TQt debug extensions for PyQt + PyQt debug Extensions. Contains: + . + * QScintilla: a featureful TQt source code editing component based + on Scintilla. + +Package: pytqt-tools +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: pytqt-tools (<< 4:14.0.0) +Breaks: pytqt-tools (<< 4:14.0.0) +Description: pyuic and pylupdate for TQt + pyuic is the PyQt counterpart for TQt's uic. It takes an XML + user interface file and generates Python code. + . + pylupdate is the counterpart for TQt's lupdate. It updates TQt + Linguist translation files from Python code. + +Package: python-tqt-dev +Depends: ${python:Depends}, ${misc:Depends} +Suggests: python-sip-dev +Replaces: python-tqt-dev (<< 4:14.0.0) +Breaks: python-tqt-dev (<< 4:14.0.0) +Architecture: all +Description: TQt bindings for Python - Development files + Development .sip files with definitions of PyQt classes. They + are needed to build PyQt, but also as building blocks of other + packages based on them, like PyKDE. + +Package: python-tqt-doc +Section: doc +Architecture: all +Replaces: python-tqt-doc (<< 4:14.0.0) +Breaks: python-tqt-doc (<< 4:14.0.0) +Depends: ${misc:Depends} +Suggests: python-tqt +Description: TQt bindings for Python - Documentation and examples + Documentation and examples for the PyQt (bindings that allow + the use of TQt library from within a Python script). diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/copyright b/ubuntu/maverick/dependencies/python-tqt/debian/copyright new file mode 100644 index 000000000..715a83f24 --- /dev/null +++ b/ubuntu/maverick/dependencies/python-tqt/debian/copyright @@ -0,0 +1,52 @@ +This package was debianized by Ricardo Javier Cardenes Medina <rcardenes@debian.org> on +Tue, 7 May 2002 04:02:33 +0100 + +It was downloaded from http://www.riverbankcomputing.co.uk + +Upstream Author: Phil Thompson (phil@river-bank.demon.co.uk) + +Terms and Conditions + +Copyright (c) 1998, 1999, 2000, 2001 + Phil Thompson <phil@river-bank.demon.co.uk> +Copyright (c) 2002 + Riverbank Computing Limited <info@riverbankcomputing.co.uk> + +pylupdate is Copyright (c) 2002 + Detlev Offenbach <detlev@die-offenbachs.de> + +Both PyQt and its utils, and pylupdate are free software; you may +redistribute them and/or modify it under the terms of the GNU General +Public License as published by the Free Software Foundation; either +version 2, or (at your option) any later version. + +A copy of the GNU General Public License is available as +/usr/share/common-licenses/GPL in the Debian GNU/Linux distribution +or on the World Wide Web at http://www.gnu.org/copyleft/gpl.html. +You can also obtain it by writing to the Free Software Foundation, Inc., +51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +parts of the code are Copyright (c) 2000 Trolltech AS, under the following +license: + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the copyright holder shall not +be used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from the copyright holder. diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/docs b/ubuntu/maverick/dependencies/python-tqt/debian/docs new file mode 100644 index 000000000..50bd824bb --- /dev/null +++ b/ubuntu/maverick/dependencies/python-tqt/debian/docs @@ -0,0 +1,2 @@ +NEWS +README diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/manpages/pylupdate.1 b/ubuntu/maverick/dependencies/python-tqt/debian/manpages/pylupdate.1 new file mode 100644 index 000000000..4d2c8919a --- /dev/null +++ b/ubuntu/maverick/dependencies/python-tqt/debian/manpages/pylupdate.1 @@ -0,0 +1,83 @@ +.TH pylupdate 1 "18 October 2001" "Trolltech AS" \" -*- nroff -*- +.\" +.\" Copyright 2001 Trolltech AS. All rights reserved. +.\" Copyright 2004 Ricardo Cardenes. All rights reserved. +.\" +.\" This file may be distributed and/or modified under the terms of the +.\" GNU General Public License version 2 as published by the Free Software +.\" Foundation and appearing in the file LICENSE.GPL included in the +.\" packaging of this file. +.\" +.\" This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +.\" WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +.\" +.\" See http://www.trolltech.com/gpl/ for GPL licensing information. +.\" +.SH NAME +pylupdate \- update Qt Linguist translation files from Python sources +.SH SYNOPSIS +.B pylupdate +.RI "[ " options " ] " project-file... +.SH DESCRIPTION +This page documents the +.B Qt Linguist Update +tool for the Qt GUI toolkit, for Python source files. +.B PyLupdate +reads a qmake project file (.pro file), finds the translatable +strings in the specified source, header and interface files, and +updates the translation files (.ts files) specified in it. The +translation files are given to the translator who uses +.B Qt Linguist +to read the files and insert the translations. +.PP +The .ts file format is a simple human-readable XML format that can be +used with version control systems if required. +.PP +.SH OPTIONS +.TP +.I "-help" +Display the usage and exit. +.TP +.I "-noobsolete" +Drop all obsolete strings. +.TP +.I "-verbose" +Explain what is being done. +.TP +.I "-version" +Display the version of +.B pylupdate +and exit. +.SH USAGE +Here is an example .pro file that can be given to +.B pylupdate: +.PP +.in +4 +.nf +SOURCES = funnydialog.py \\ + main.py \\ + wackywidget.py +FORMS = fancybox.ui +TRANSLATIONS = gnomovision_dk.ts \\ + gnomovision_fi.ts \\ + gnomovision_no.ts \\ + gnomovision_se.ts +.fi +.in -4 +.PP +When running +.B pylupdate +on this project file, the translatable strings in all the files +listed in the SOURCES and FORMS entries will be put in +the translation files listed in the TRANSLATIONS entry. Previous +translations will be reused as far as possible, and translated +strings that have vanished from the source files are marked obsolete. +.SH "SEE ALSO" +.BR lupdate (1), +.BR lrelease (1) +and +.BR http://doc.trolltech.com/i18n.html +.SH AUTHOR +This manual page was written by Ricardo J. Cárdenes Medina +for the Debian GNU/Linux System (but may be used by others), based +on Trolltech's <info@trolltech.com> manual page for lupdate diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/manpages/pyuic.1 b/ubuntu/maverick/dependencies/python-tqt/debian/manpages/pyuic.1 new file mode 100644 index 000000000..f1ffa41ff --- /dev/null +++ b/ubuntu/maverick/dependencies/python-tqt/debian/manpages/pyuic.1 @@ -0,0 +1,74 @@ +.TH pyuic 1 "25 June 2001" \" -*- nroff -*- +.SH NAME +pyuic \- Qt user interface compiler for Python +.SH SYNOPSIS +.B pyuic +[options] <uifile> +.SH DESCRIPTION +This page documents the +.B Python User Interface Compiler +for the Qt GUI application framework. The +.B pyuic +reads a user interface definition file (.ui) in XML as generated by Qt +Designer and creates corresponding Python module. +.PP +.PP +Generate implementation: +.br +.I "\fB pyuic [options] \fI<uifile>" +.br +.PP +Generate image collection: +.br +.I "\fB pyuic [options] -embed \fI<project> <image1> <image2> <image3>\fP ..." +.br + \fI<project>\fP: project name + \fI<image[1..n]>\fP: image files +.br +.PP +Generate subclass implementation: +.br +.I "\fB pyuic [options] -subimpl <classname> \fI<uifile>" +.br + \fI<classname>\fP: name of the subclass to generate +.PP + +.SH GENERAL OPTIONS +.TP +.I "-o file" +Write output to +.I file +rather than to stdout. +.TP +.I "-p indent" +Set the Python +.I indent +in spaces (0 to use a tab) +.TP +.I "-tr func" +Use +.I func(...) +rather than tr(...) for i18n. +.TP +.I -x +Generate extra code to test the class +.TP +.I -test +Generate extra code to test but not display the class +.TP +.I -version +Display version of pyuic +.TP +.I -help +Display this information + +.SH "SEE ALSO" +.BR uic (1) + +.BR http://www.trolltech.com/ + +.BR http://www.riverbankcomputing.co.uk/ +.SH AUTHOR +This manual page was written by Ricardo J. Cárdenes Medina +for the Debian GNU/Linux System (but may be used by others), based +on Trolltech's <info@trolltech.com> manual page for uic diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/patches/debian_configure_changes.diff b/ubuntu/maverick/dependencies/python-tqt/debian/patches/debian_configure_changes.diff new file mode 100644 index 000000000..131e9dbdc --- /dev/null +++ b/ubuntu/maverick/dependencies/python-tqt/debian/patches/debian_configure_changes.diff @@ -0,0 +1,95 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_configure.dpatch by Torsten Marek <shlomme@debian.org> +## +## DP: Add object directory build support to configure.py + +@DPATCH@ +Index: python-qt3-3.18.1/configure.py +=================================================================== +--- python-qt3-3.18.1.orig/configure.py 2010-01-27 22:24:38.555856708 +0100 ++++ python-qt3-3.18.1/configure.py 2010-01-27 22:41:45.876854625 +0100 +@@ -30,6 +30,7 @@ + + import sipconfig + ++src_dir = os.path.dirname(os.path.abspath(__file__)) + + # Initialise the globals. + pyqt_version = 0x031201 +@@ -299,7 +300,7 @@ + + makefile = sipconfig.ProgramMakefile( + configuration=sipcfg, +- build_file=buildfile, ++ build_file=os.path.join(src_dir, "pyuic3", buildfile), + dir="pyuic3", + install_dir=opt_pyqtbindir, + console=1, +@@ -315,7 +316,8 @@ + + if qt_version < 0x030100: + makefile.extra_include_dirs.append(qt_dir + "/src/3rdparty/zlib") +- ++ makefile.extra_include_dirs.append(os.path.join(src_dir, "pyuic3")) ++ + makefile.generate() + tool_dirs.append("pyuic3") + +@@ -330,7 +332,7 @@ + + makefile = sipconfig.ProgramMakefile( + configuration=sipcfg, +- build_file=buildfile, ++ build_file=os.path.join(src_dir, "pylupdate3", buildfile), + dir="pylupdate3", + install_dir=opt_pyqtbindir, + console=1, +@@ -343,6 +345,8 @@ + if prof or "qtxml" not in pyqt_modules: + makefile.extra_defines.append("QT_MODULE_XML") + ++ makefile.extra_include_dirs.append(os.path.join(src_dir, "pylupdate3")) ++ + makefile.generate() + tool_dirs.append("pylupdate3") + elif qt_version >= 0x020000: +@@ -606,7 +610,7 @@ + opengl is set if the application uses OpenGL. + """ + # Check the module's main .sip file exists. +- if os.access(os.path.join("sip", mname, mname + "mod.sip"), os.F_OK): ++ if os.access(os.path.join(src_dir, "sip", mname, mname + "mod.sip"), os.F_OK): + sipconfig.inform("Checking to see if the %s module should be built..." % mname) + + if check_class(incfile, ctor, define, include_dir, lib_dir, lib, opengl): +@@ -908,10 +912,10 @@ + argv.append(buildfile) + + argv.append("-I") +- argv.append("sip") ++ argv.append(os.path.join(src_dir, "sip")) + + # SIP assumes POSIX style path separators. +- argv.append(string.join(["sip", mname, mname + "mod.sip"], "/")) ++ argv.append(string.join([src_dir, "sip", mname, mname + "mod.sip"], "/")) + + os.system(string.join(argv)) + +@@ -926,7 +930,7 @@ + sipfiles = [] + + for s in glob.glob("sip/" + mname + "/*.sip"): +- sipfiles.append(os.path.join("..", "sip", mname, os.path.basename(s))) ++ sipfiles.append(os.path.join(src_dir, "sip", mname, os.path.basename(s))) + + installs.append([sipfiles, os.path.join(pyqt.sip_dir(), mname)]) + +@@ -1433,7 +1437,7 @@ + ).generate() + + # Install the configuration module. +- create_config("pyqtconfig.py", "pyqtconfig.py.in", macros) ++ create_config("pyqtconfig.py", os.path.join(src_dir, "pyqtconfig.py.in"), macros) + + + ############################################################################### diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/patches/series b/ubuntu/maverick/dependencies/python-tqt/debian/patches/series new file mode 100644 index 000000000..15bc57c10 --- /dev/null +++ b/ubuntu/maverick/dependencies/python-tqt/debian/patches/series @@ -0,0 +1 @@ +debian_configure_changes.diff diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-dev.dirs b/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-dev.dirs new file mode 100644 index 000000000..ae635cbcd --- /dev/null +++ b/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-dev.dirs @@ -0,0 +1 @@ +usr/share/sip/tqt diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-dev.install b/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-dev.install new file mode 100644 index 000000000..7b6aca191 --- /dev/null +++ b/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-dev.install @@ -0,0 +1,2 @@ +sip/* usr/share/sip/tqt + diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides b/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides new file mode 100644 index 000000000..3d0ed6137 --- /dev/null +++ b/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides @@ -0,0 +1,15 @@ +# lintian test overriden as the files tripping this error are put into the source +# of the generated package. This is a false-positive + +python-qt-dev binary: extra-license-file usr/share/sip/qt/qt/copying.sip +python-qt-dev binary: extra-license-file usr/share/sip/qt/qtaxcontainer/copying.sip +python-qt-dev binary: extra-license-file usr/share/sip/qt/qtcanvas/copying.sip +python-qt-dev binary: extra-license-file usr/share/sip/qt/qtext/copying.sip +python-qt-dev binary: extra-license-file usr/share/sip/qt/qtgl/copying.sip +python-qt-dev binary: extra-license-file usr/share/sip/qt/qtnetwork/copying.sip +python-qt-dev binary: extra-license-file usr/share/sip/qt/qtpe/copying.sip +python-qt-dev binary: extra-license-file usr/share/sip/qt/qtsql/copying.sip +python-qt-dev binary: extra-license-file usr/share/sip/qt/qttable/copying.sip +python-qt-dev binary: extra-license-file usr/share/sip/qt/qtui/copying.sip +python-qt-dev binary: extra-license-file usr/share/sip/qt/qtxml/copying.sip + diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-dev.preinst b/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-dev.preinst new file mode 100644 index 000000000..b17b35a44 --- /dev/null +++ b/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-dev.preinst @@ -0,0 +1,35 @@ +#!/bin/sh +# TODO: remove this file after releasing Squeeze +set -e +if [ "$1" = upgrade ] +then + if dpkg --compare-versions "$2" lt 3.17.6-2; then + if which python >/dev/null 2>&1 && which pycentral >/dev/null 2>&1; then + pycentral pkgremove python-qt-dev + else + flist=$(tempfile) + find /usr/share/pycentral/python-qt-dev -depth -mindepth 2 \ + \( -name '*.py' -printf 'p %P\n' -o -printf '%y %P\n' \) \ + > $flist 2>/dev/null || true + if [ -s $flist ]; then + for d in /usr/lib/python[0-9].[0-9]; do + case "$d" in */python2.1|*/python2.2) continue; esac + while read t n; do + case "$t" in + p) rm -f $d/$n $d/${n}[co];; + d) rmdir $d/$n 2>/dev/null || true;; + *) rm -f $d/$n + esac + done < $flist + done + fi + rm -f $flist + dpkg -L python-qt-dev \ + | awk '/\/usr\/share\/pycentral/ {next} /\.py$/ {print $0"c\n" $0"o"}' \ + | xargs rm -f >&2 + fi + fi +fi + +#DEBHELPER# + diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-doc.dirs b/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-doc.dirs new file mode 100644 index 000000000..dcd0e5b12 --- /dev/null +++ b/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-doc.dirs @@ -0,0 +1,2 @@ +usr/share/doc/python-qt3-doc/html +usr/share/doc/python-qt3-doc/examples diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-doc.examples b/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-doc.examples new file mode 100644 index 000000000..3162f69a8 --- /dev/null +++ b/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-doc.examples @@ -0,0 +1,2 @@ +examples3/* + diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-doc.install b/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-doc.install new file mode 100644 index 000000000..840625c0a --- /dev/null +++ b/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-doc.install @@ -0,0 +1 @@ +doc/PyQt.html usr/share/doc/python-qt3-doc/html diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-gl.install b/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-gl.install new file mode 100644 index 000000000..65781e2d6 --- /dev/null +++ b/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-gl.install @@ -0,0 +1 @@ +usr/lib/python*/*-packages/qtgl.so diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt.install b/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt.install new file mode 100644 index 000000000..b22fce2ea --- /dev/null +++ b/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt.install @@ -0,0 +1,7 @@ +usr/lib/python*/*-packages/qtcanvas.so +usr/lib/python*/*-packages/qtnetwork.so +usr/lib/python*/*-packages/qtsql.so +usr/lib/python*/*-packages/qttable.so +usr/lib/python*/*-packages/qtui.so +usr/lib/python*/*-packages/qtxml.so +usr/lib/python*/*-packages/qt.so diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqtext.install b/ubuntu/maverick/dependencies/python-tqt/debian/python-tqtext.install new file mode 100644 index 000000000..5c80c3369 --- /dev/null +++ b/ubuntu/maverick/dependencies/python-tqt/debian/python-tqtext.install @@ -0,0 +1 @@ +usr/lib/python*/*-packages/qtext.so diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/pytqt-tools.install b/ubuntu/maverick/dependencies/python-tqt/debian/pytqt-tools.install new file mode 100644 index 000000000..1df36c612 --- /dev/null +++ b/ubuntu/maverick/dependencies/python-tqt/debian/pytqt-tools.install @@ -0,0 +1 @@ +usr/bin/* diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/pytqt-tools.manpages b/ubuntu/maverick/dependencies/python-tqt/debian/pytqt-tools.manpages new file mode 100644 index 000000000..7d27d0034 --- /dev/null +++ b/ubuntu/maverick/dependencies/python-tqt/debian/pytqt-tools.manpages @@ -0,0 +1,2 @@ +debian/manpages/pylupdate.1 +debian/manpages/pyuic.1 diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/rules b/ubuntu/maverick/dependencies/python-tqt/debian/rules new file mode 100755 index 000000000..ebb91c6e4 --- /dev/null +++ b/ubuntu/maverick/dependencies/python-tqt/debian/rules @@ -0,0 +1,172 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +export DH_OPTIONS + +-include /usr/share/python/python.mk +ifeq (,$(py_sitename)) +py_sitename = site-packages +py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages +py_sitename_sh = $(py_sitename) +py_libdir_sh = $(py_libdir) +endif + + +DOC=$(CURDIR)/debian/python-tqt-doc/usr/share/doc/python-tqt-doc +INSTDIR=$(CURDIR)/debian + +export QTDIR=/usr/share/tqt3 +export QMAKESPEC=$(QTDIR)/mkspecs/linux-g++ + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CXXFLAGS += -O0 +else + CXXFLAGS += -O1 +endif +CXXFLAGS += "-I/usr/include/tqt" + +PYTHONS := $(shell pyversions -vr debian/control) + + +GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p') +ifneq (,$(filter $(GCCVER),4.2 4.3)) + SPLIT=40 +else + SPLIT=10 +endif + +.PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp + +configure: $(PYTHONS:%=build-%/configure-stamp) $(PYTHONS:%=dbg-build-%/configure-stamp) +build-%/configure-stamp: + dh_testdir + mkdir -p build-$* + cd build-$* && echo yes \ + | python$* ../configure.py \ + -c -n /usr/include/tqscintilla \ + -o /usr/lib -u -j $(SPLIT) \ + -d /usr/lib/python$*/$(call py_sitename,$*) \ + -l /usr/include/python$* \ + -v /usr/share/sip/tqt \ + -m /usr/lib/python$*/config \ + CXXFLAGS_RELEASE="" CXXFLAGS="${CXXFLAGS}" STRIP="" + touch $@ + +dbg-build-%/configure-stamp: + dh_testdir + mkdir -p dbg-build-$* + cd dbg-build-$* && echo yes \ + | python$*-dbg ../configure.py \ + -c -n /usr/include/tqscintilla \ + -o /usr/lib -u -j $(SPLIT) \ + -d /usr/lib/python$*/$(call py_sitename,$*) \ + -l /usr/include/python$*_d \ + -v /usr/share/sip/tqt \ + -m /usr/lib/python$*/config_d \ + CXXFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt" STRIP="" + touch $@ + +build: $(PYTHONS:%=build-%/build-stamp) $(PYTHONS:%=dbg-build-%/build-stamp) + +build-%/build-stamp: build-%/configure-stamp + dh_testdir + $(MAKE) -C build-$* + touch $@ + +dbg-build-%/build-stamp: dbg-build-%/configure-stamp + dh_testdir + $(MAKE) -C dbg-build-$* + touch $@ + +install-indep: configure + dh_testdir + dh_testroot + dh_clean -k -i + dh_installdirs -i + for version in ${PYTHONS}; do\ + pylib=$$(python$$version -c 'from distutils import sysconfig; print sysconfig.get_python_lib()'); \ + mkdir -p debian/python-tqt-dev/$$pylib;\ + install -m 644 -o root -g root build-$$version/pyqtconfig.py debian/python-tqt-dev/$$pylib;\ + done + dh_install -i + +install-arch: build + dh_testdir + dh_testroot + dh_clean -k -a + dh_installdirs -a + for version in ${PYTHONS}; do \ + $(MAKE) -C build-$$version install DESTDIR=$(CURDIR)/debian/tmp;\ + done + for version in ${PYTHONS}; do \ + pylib=$$(python$$version -c 'from distutils import sysconfig; print sysconfig.get_python_lib()'); \ + $(MAKE) -C dbg-build-$$version install DESTDIR=$(CURDIR)/debian/python-tqt-dbg;\ + mkdir -p debian/python-tqt-gl-dbg/$$pylib;\ + mv debian/python-tqt-dbg/$$pylib/qtgl.so \ + debian/python-tqt-gl-dbg/$$pylib/;\ + mkdir -p debian/python-tqtext-dbg/$$pylib;\ + mv debian/python-tqt-dbg/$$pylib/qtext.so \ + debian/python-tqtext-dbg/$$pylib/;\ + done + + dh_install -a --sourcedir=$(CURDIR)/debian/tmp + + for i in $$(find debian/python-*-dbg -name '*.so'); do \ + b=$$(basename $$i .so); \ + mv $$i $$(dirname $$i)/$${b}_d.so; \ + done + find debian/python-*-dbg ! -type d \ + ! \( -name '*.so' -o -name '*config_d.py' \) | xargs rm -f + find debian/python-*-dbg -depth -type d -empty -exec rmdir {} \; + +clean: + dh_testdir + dh_testroot + rm -rf $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%) + rm -f *-stamp + dh_clean + +# Must not depend on anything. This is to be called by +# binary-arch/binary-indep +# in another 'make' thread. +binary-common: + dh_testdir + dh_testroot + dh_installman + dh_installchangelogs ChangeLog + dh_installdocs -A NEWS THANKS + dh_installexamples + dh_link +ifeq (,$(findstring -i, $(DH_OPTIONS))) + DH_OPTIONS= dh_strip -ppytqt-tools + set -e; \ + for p in python-tqt python-tqt-gl python-tqtext; do \ + DH_OPTIONS= dh_strip -p$$p --dbg-package=$$p-dbg; \ + rm -rf debian/$$p-dbg/usr/share/doc/$$p-dbg; \ + ln -s $$p debian/$$p-dbg/usr/share/doc/$$p-dbg; \ + done +endif +# dh_strip + dh_compress -X.py -X.bmp -X.ui -X.sql + dh_fixperms + dh_pysupport + dh_sip + dh_lintian + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture independant packages using the common target. +binary-indep: install-indep + $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common + +# Build architecture dependant packages using the common target. +binary-arch: install-arch + $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common + +binary: binary-arch binary-indep +.PHONY: build clean binary-indep binary-arch binary configure diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/source/format b/ubuntu/maverick/dependencies/python-tqt/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/dependencies/python-tqt/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/source/options b/ubuntu/maverick/dependencies/python-tqt/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/dependencies/python-tqt/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/watch b/ubuntu/maverick/dependencies/python-tqt/debian/watch new file mode 100644 index 000000000..506321d38 --- /dev/null +++ b/ubuntu/maverick/dependencies/python-tqt/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://www.riverbankcomputing.com/software/pyqt/download3 \ + /static/Downloads/PyQt3/PyQt-x11-gpl-([.\d]*)\.tar\.gz diff --git a/ubuntu/maverick/dependencies/qt3/debian/KUBUNTU-DEBIAN-CHANGES b/ubuntu/maverick/dependencies/qt3/debian/KUBUNTU-DEBIAN-CHANGES deleted file mode 100644 index f02b47f99..000000000 --- a/ubuntu/maverick/dependencies/qt3/debian/KUBUNTU-DEBIAN-CHANGES +++ /dev/null @@ -1,4 +0,0 @@ -No firebird/ibase build (remove build-dep, control entry, ibase ./configure option), firebird is not in Ubuntu main -install qtrc (change rules, qtrc file) and qt_plugins_3.3rc -add /etc/ to libqt3-mt - diff --git a/ubuntu/maverick/dependencies/qt3/debian/changelog b/ubuntu/maverick/dependencies/qt3/debian/changelog index 24e9a2fab..018cd497a 100644 --- a/ubuntu/maverick/dependencies/qt3/debian/changelog +++ b/ubuntu/maverick/dependencies/qt3/debian/changelog @@ -499,7 +499,7 @@ qt-x11-free (3:3.3.7-1ubuntu3) feisty; urgency=low qt-x11-free (3:3.3.7-1ubuntu2) feisty; urgency=low * Remove kubuntu_05_gcc_hidden_visibility.dpatch from 00list - of patches, it caused pyqt and pykde to hide init methods which + of patches, it caused pyqt and pytde to hide init methods which are needed to load modules and it broke skim. -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 4 Dec 2006 13:48:56 +0000 diff --git a/ubuntu/maverick/dependencies/qt3/debian/control b/ubuntu/maverick/dependencies/qt3/debian/control index db74d8edf..131e56e52 100644 --- a/ubuntu/maverick/dependencies/qt3/debian/control +++ b/ubuntu/maverick/dependencies/qt3/debian/control @@ -10,7 +10,8 @@ Build-Depends: debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1- libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev, libxft-dev, libiodbc2-dev (>= 3.51.2-4), libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcups2-dev, - libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev + libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev, + firebird2.1-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc] | firebird2-dev [i386 amd64] Section: libs Priority: optional Standards-Version: 3.7.3 @@ -21,8 +22,8 @@ Vcs-Svn: svn://svn.debian.org/pkg-kde/trunk/packages/qt-x11-free Package: libqt3-mt Architecture: any Section: libs -Replaces: libqt3-mt (<< 4:3.5.13) -Breaks: libqt3-mt (<< 4:3.5.13) +Replaces: libqt3-mt (<< 4:14.0.0) +Breaks: libqt3-mt (<< 4:14.0.0) Depends: ${shlibs:Depends}, fontconfig Recommends: libgl1-mesa-glx | libgl1, libglu1-mesa | libglu1, libxmu6 (>= 4.3.0.dfsg.1-4) Conflicts: libqt3c102-mt, libqui1-emb, libqt3c-mt @@ -35,8 +36,8 @@ Description: Qt GUI Library (Threaded runtime version), Version 3 Package: libqt3-mt-mysql Architecture: any Section: libs -Replaces: libqt3-mt-mysql (<< 4:3.5.13) -Breaks: libqt3-mt-mysql (<< 4:3.5.13) +Replaces: libqt3-mt-mysql (<< 4:14.0.0) +Breaks: libqt3-mt-mysql (<< 4:14.0.0) Depends: ${shlibs:Depends} Conflicts: libqt3c102-mt-mysql, libqt3c-mt-mysql Description: MySQL database driver for Qt3 (Threaded) @@ -46,8 +47,8 @@ Description: MySQL database driver for Qt3 (Threaded) Package: libqt3-mt-odbc Architecture: any Section: libs -Replaces: libqt3-mt-odbc (<< 4:3.5.13) -Breaks: libqt3-mt-odbc (<< 4:3.5.13) +Replaces: libqt3-mt-odbc (<< 4:14.0.0) +Breaks: libqt3-mt-odbc (<< 4:14.0.0) Depends: ${shlibs:Depends} Conflicts: libqt3c102-mt-odbc, libqt3c-mt-odbc Description: ODBC database driver for Qt3 (Threaded) @@ -57,8 +58,8 @@ Description: ODBC database driver for Qt3 (Threaded) Package: libqt3-mt-psql Architecture: any Section: libs -Replaces: libqt3-mt-psql (<< 4:3.5.13) -Breaks: libqt3-mt-psql (<< 4:3.5.13) +Replaces: libqt3-mt-psql (<< 4:14.0.0) +Breaks: libqt3-mt-psql (<< 4:14.0.0) Depends: ${shlibs:Depends} Conflicts: libqt3c102-mt-psql, libqt3c-mt-psql Description: PostgreSQL database driver for Qt3 (Threaded) @@ -66,23 +67,22 @@ Description: PostgreSQL database driver for Qt3 (Threaded) Install it if you intend to use or write Qt programs that are to access a PostgreSQL DB. -#Not in Kubuntu -#Package: libqt3-mt-ibase -#Architecture: i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc -#Section: libs -#Depends: ${shlibs:Depends} -#Conflicts: libqt3c102-mt-ibase -#Replaces: libqt3c102-mt-ibase -#Description: InterBase/FireBird database driver for Qt3 (Threaded) -# This package contains the threaded InterBase/FireBird plugin -# for Qt3. Install it if you intend to use or write Qt programs -# that are to access an InterBase/FireBird DB. +Package: libqt3-mt-ibase +Architecture: i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc +Section: libs +Depends: ${shlibs:Depends} +Conflicts: libqt3c102-mt-ibase +Replaces: libqt3c102-mt-ibase +Description: InterBase/FireBird database driver for Qt3 (Threaded) + This package contains the threaded InterBase/FireBird plugin + for Qt3. Install it if you intend to use or write Qt programs + that are to access an InterBase/FireBird DB. Package: libqt3-mt-sqlite Architecture: any Section: libs -Replaces: libqt3-mt-sqlite (<< 4:3.5.13) -Breaks: libqt3-mt-sqlite (<< 4:3.5.13) +Replaces: libqt3-mt-sqlite (<< 4:14.0.0) +Breaks: libqt3-mt-sqlite (<< 4:14.0.0) Depends: ${shlibs:Depends} Conflicts: libqt3c102-mt-sqlite Description: SQLite database driver for Qt3 (Threaded) @@ -93,8 +93,8 @@ Description: SQLite database driver for Qt3 (Threaded) Package: libqt3-mt-dev Architecture: any Section: libdevel -Replaces: libqt3-mt-dev (<< 4:3.5.13) -Breaks: libqt3-mt-dev (<< 4:3.5.13) +Replaces: libqt3-mt-dev (<< 4:14.0.0) +Breaks: libqt3-mt-dev (<< 4:14.0.0) Depends: libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), @@ -124,8 +124,8 @@ Description: Qt development files (Threaded) Package: libqt3-headers Architecture: any Section: devel -Replaces: libqt3-headers (<< 4:3.5.13) -Breaks: libqt3-headers (<< 4:3.5.13) +Replaces: libqt3-headers (<< 4:14.0.0) +Breaks: libqt3-headers (<< 4:14.0.0) Recommends: libqt3-mt-dev Description: Qt3 header files This package contains all header files for libqt and libqt-mt which come @@ -135,8 +135,8 @@ Description: Qt3 header files Package: libqt3-compat-headers Architecture: any Section: devel -Replaces: libqt3-compat-headers (<< 4:3.5.13) -Breaks: libqt3-compat-headers (<< 4:3.5.13) +Replaces: libqt3-compat-headers (<< 4:14.0.0) +Breaks: libqt3-compat-headers (<< 4:14.0.0) Depends: libqt3-headers (= ${binary:Version}) Recommends: libqt3-mt-dev Description: Qt 1.x and 2.x compatibility includes @@ -151,8 +151,8 @@ Description: Qt 1.x and 2.x compatibility includes Package: qt3-dev-tools Architecture: any Section: devel -Replaces: qt3-dev-tools (<< 4:3.5.13) -Breaks: qt3-dev-tools (<< 4:3.5.13) +Replaces: qt3-dev-tools (<< 4:14.0.0) +Breaks: qt3-dev-tools (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: libqt3-mt-dev Conflicts: libqt-dev (<< 3:2.3.2-10), uic (<= 3:2.3.2-9) @@ -164,8 +164,8 @@ Description: Qt3 development tools Package: qt3-designer Architecture: any Section: devel -Replaces: qt3-designer (<< 4:3.5.13) -Breaks: qt3-designer (<< 4:3.5.13) +Replaces: qt3-designer (<< 4:14.0.0) +Breaks: qt3-designer (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: qt3-dev-tools Suggests: qt3-assistant, qt3-doc @@ -183,8 +183,8 @@ Description: Qt3 Designer Package: qt3-apps-dev Architecture: any Section: devel -Replaces: qt3-apps-dev (<< 4:3.5.13) -Breaks: qt3-apps-dev (<< 4:3.5.13) +Replaces: qt3-apps-dev (<< 4:14.0.0) +Breaks: qt3-apps-dev (<< 4:14.0.0) Depends: libqt3-mt-dev Description: Qt3 Developer applications development files This package is intended for developers who want to develop applications @@ -198,8 +198,8 @@ Description: Qt3 Developer applications development files Package: qt3-linguist Architecture: any Section: devel -Replaces: qt3-linguist (<< 4:3.5.13) -Breaks: qt3-linguist (<< 4:3.5.13) +Replaces: qt3-linguist (<< 4:14.0.0) +Breaks: qt3-linguist (<< 4:14.0.0) Suggests: qt3-assistant Depends: ${shlibs:Depends} Description: The Qt3 Linguist @@ -211,8 +211,8 @@ Description: The Qt3 Linguist Package: qt3-assistant Architecture: any Section: x11 -Replaces: qt3-assistant (<< 4:3.5.13) -Breaks: qt3-assistant (<< 4:3.5.13) +Replaces: qt3-assistant (<< 4:14.0.0) +Breaks: qt3-assistant (<< 4:14.0.0) Depends: ${shlibs:Depends}, qt3-doc Description: The Qt3 assistant application This package contains the Qt3 Assistant, an easy to use frontend for @@ -229,8 +229,8 @@ Description: The Qt3 assistant application Package: qt3-qtconfig Architecture: any Section: x11 -Replaces: qt3-qtconfig (<< 4:3.5.13) -Breaks: qt3-qtconfig (<< 4:3.5.13) +Replaces: qt3-qtconfig (<< 4:14.0.0) +Breaks: qt3-qtconfig (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: The Qt3 Configuration Application The Qt Configuration program allows endusers to configure the look @@ -244,8 +244,8 @@ Description: The Qt3 Configuration Application Package: qt3-dev-tools-embedded Architecture: any Section: devel -Replaces: qt3-dev-tools-embedded (<< 4:3.5.13) -Breaks: qt3-dev-tools-embedded (<< 4:3.5.13) +Replaces: qt3-dev-tools-embedded (<< 4:14.0.0) +Breaks: qt3-dev-tools-embedded (<< 4:14.0.0) Recommends: libqt3-mt-dev Depends: ${shlibs:Depends} Description: Tools to develop embedded Qt applications @@ -258,8 +258,8 @@ Description: Tools to develop embedded Qt applications Package: qt3-dev-tools-compat Architecture: any Section: devel -Replaces: qt3-dev-tools-compat (<< 4:3.5.13) -Breaks: qt3-dev-tools-compat (<< 4:3.5.13) +Replaces: qt3-dev-tools-compat (<< 4:14.0.0) +Breaks: qt3-dev-tools-compat (<< 4:14.0.0) Recommends: libqt3-mt-dev Depends: ${shlibs:Depends} Description: Conversion utilities for Qt3 development @@ -274,8 +274,8 @@ Description: Conversion utilities for Qt3 development Package: libqt3-i18n Architecture: all Section: libs -Replaces: libqt3-i18n (<< 4:3.5.13) -Breaks: libqt3-i18n (<< 4:3.5.13) +Replaces: libqt3-i18n (<< 4:14.0.0) +Breaks: libqt3-i18n (<< 4:14.0.0) Recommends: libqt3-mt Description: i18n files for Qt3 library This package contains the internationalization files for the Qt library. @@ -285,8 +285,8 @@ Description: i18n files for Qt3 library Package: qt3-doc Architecture: all Section: doc -Replaces: qt3-doc (<< 4:3.5.13) -Breaks: qt3-doc (<< 4:3.5.13) +Replaces: qt3-doc (<< 4:14.0.0) +Breaks: qt3-doc (<< 4:14.0.0) Priority: extra Suggests: libqt3-headers, qt3-assistant | www-browser Description: Qt3 API documentation @@ -298,8 +298,8 @@ Description: Qt3 API documentation Package: qt3-examples Architecture: all Section: doc -Replaces: qt3-examples (<< 4:3.5.13) -Breaks: qt3-examples (<< 4:3.5.13) +Replaces: qt3-examples (<< 4:14.0.0) +Breaks: qt3-examples (<< 4:14.0.0) Priority: extra Depends: libqt3-mt-dev (>= ${binary:Version}) Suggests: qt3-apps-dev @@ -311,8 +311,8 @@ Description: Examples for Qt3 Package: qt-x11-free-dbg Section: libdevel Architecture: any -Replaces: qt-x11-free-dbg (<< 4:3.5.13) -Breaks: qt-x11-free-dbg (<< 4:3.5.13) +Replaces: qt-x11-free-dbg (<< 4:14.0.0) +Breaks: qt-x11-free-dbg (<< 4:14.0.0) Priority: extra Depends: libqt3-mt (= ${binary:Version}), gdb Conflicts: libqt3-mt-dbg diff --git a/ubuntu/maverick/dependencies/qt3/debian/maintain/man/createcw.1 b/ubuntu/maverick/dependencies/qt3/debian/maintain/man/createcw.1 deleted file mode 100644 index 0959a2df1..000000000 --- a/ubuntu/maverick/dependencies/qt3/debian/maintain/man/createcw.1 +++ /dev/null @@ -1,57 +0,0 @@ -.TH "createcw" "1" "3.0.3" "Troll Tech AS, Norway." "" -.SH "NAME" -.LP -createcw \- custom widget description creater for Qt Designer -.SH "SYNTAX" -.LP -createcw <\fIfilename.cw\fP> -.SH "DESCRIPTION" -.LP -This small application makes it much easier to create -custom widget descriptions for the Qt Designer. Using -them you can use custom widgets in the Qt Designer -including their signals, slots and properties. - -To do that normally you would have to enter all that -information in the custom widget dialog in the Qt -Designer for each widget. But this small tool can create -for you these description files for your custom widgets -which you then can simply import into the Qt Designer. So -you can use your custom widgets without any additional -work in your forms in the Qt Designer then. - -To do that you have to modify the sourcecode (main.cpp) a -bit and recompile it afterwards. - -STEP1: Include header files of the widgets for which a -description should be created here. If you have a widget -which is defined in the file mycustomwidget.h in -/home/joedeveloper/src, write here - -#include "/home/joedeveloper/src/mycustomwidget.h" - -STEP2: Instantiate all widgets for which a description -should be created here and add them to the list wl. If -your custom widget is e.g. called MyCustomWidget you -would write here - - Widget w; - w.w = new MyCustomWidget( 0, 0 ); - w.include = "mycustomwidget.h"; - w.location = "global"; - wl.append( w ); - -After that compile the program, link it with your custom -widget (library or object file) and run it like this: - - (unix): ./createcw mywidgets.cw - (win32): createcw mywidgets.cw - -After that you can import this description file into the -Qt Designer using the Custom\-Widget Dialog (See -Tools\->Custom\->Edit Custom Widgets... in the Qt Designer) -and use these custom widget there in your forms. - -.SH "AUTHORS" -.LP -Troll Tech <http://www.trolltech.com/> diff --git a/ubuntu/maverick/dependencies/qt3/debian/maintain/man/designer.1 b/ubuntu/maverick/dependencies/qt3/debian/maintain/man/designer.1 deleted file mode 100644 index 4151e94a7..000000000 --- a/ubuntu/maverick/dependencies/qt3/debian/maintain/man/designer.1 +++ /dev/null @@ -1,54 +0,0 @@ -.TH "qt-designer" "1" "3.0.3" "Troll Tech AS, Norway." "" -.SH "NAME" -.LP -qt\-designer \- Visual user interface designer for Qt. -.SH "DESCRIPTION" -.LP -Qt Designer simplifies the process of designing and -creating graphical user interfaces (GUI) using the -award\-winning Qt toolkit. Qt Designer is easy to learn. -There are tutorials, walkthrough examples and the -reference documentation accelerating you through the -learning phase. After that, Qt Designer greatly reduces -the time and effort needed to develop even the most -complex dialogs with an easy\-to\-use GUI and an integrated -help system. - - Qt Designer provides a rich set of features aimed at -making the creation of dialogs as easy and smooth as -possible without reducing the power of Qt. It offers all -the strength of the Qt layout system with a well\-designed -user interface. This, combined with the Qt Designer's -undo/redo system makes it simple to try different -arrangements of the widgets until the result satisfies -you. - - Using Qt Designer's convenient property editor along -with the dynamic Qt property system it is easy to set the -initial state of your widgets. Special editors for some -widgets (like listboxes, comboboxes, etc.) allow you to -fill these widgets with content without writing any code. -Using the object hierarchy view, the parent\-child -relationship between the widgets of a dialog can be -understood at a glance. - - Integrating dialogs into a Qt project is straightforward -thanks to the User Interface Compiler (UIC), which -generates C++ code from the XML dialog description on the -fly. The programmer can easily extend the functionality -of the generated classes by subclassing without touching -generated code at all or running the risk of loosing -their changes. -.SH "FILES" -.LP -\fI/usr/share/qt/tools/designer/*\fP -.SH "ENVIRONMENT VARIABLES" -.LP -.TP -\fBQTDIR\fP -Specifies the Qt base directory. On Debian systems this -should be set to /usr/share/qt. The /usr/bin/designer -wrapper script takes care of this. -.SH "AUTHORS" -.LP -TrollTech <http://www.trolltech.com/> diff --git a/ubuntu/maverick/dependencies/qt3/debian/maintain/man/findtr.1 b/ubuntu/maverick/dependencies/qt3/debian/maintain/man/findtr.1 deleted file mode 100644 index f1d3a87d5..000000000 --- a/ubuntu/maverick/dependencies/qt3/debian/maintain/man/findtr.1 +++ /dev/null @@ -1,25 +0,0 @@ -.TH "findtr" "1" "3.0.3" "Troll Tech AS, Norway." "" -.SH "NAME" -.LP -findtr \- Extracts information about text to be translated -.SH "SYNTAX" -.LP -findtr *.cpp *.h >myapp.po -.SH "DESCRIPTION" -.LP - -Extracts information about text to be translated. It -recognizes the tr() constructs described above and -produces a file in ".po" format, a simple text format -that your translation team will copy and edit. For -example, the base .po file might be myapp.po and -translated versions of the file would then be -myapp_de.po, myapp_fr.po, and myapp_ja.po for -translations in German, French and Japanese respectively. - - findtr *.cpp *.h >myapp.po - copy myapp.po myapp_de.po - edit myapp_de.po -.SH "AUTHORS" -.LP -TrollTech <http://www.trolltech.com/> diff --git a/ubuntu/maverick/dependencies/qt3/debian/maintain/man/linguist.1 b/ubuntu/maverick/dependencies/qt3/debian/maintain/man/linguist.1 deleted file mode 100644 index a0f99133b..000000000 --- a/ubuntu/maverick/dependencies/qt3/debian/maintain/man/linguist.1 +++ /dev/null @@ -1,37 +0,0 @@ -.TH LINGUIST 1 "28 August 2004" -.SH "NAME" -linguist \- Translation tool for Qt. - -.SH "SYNPOSIS" -.B linguist -[ -.I TRANSLATION -] - -.SH "DESCRIPTION" -.B Qt Linguist -is a tool for adding translations to Qt applications. It -introduces the concept of a translation "context" which -means a group of phrases that appear together on the -screen e.g. in the same menu or dialog. - -The only parameter accepted on the command line is -.I TRANSLATION -wich is the name of the translation file you wish to open. - -.SH FILES -.I ~/.qt/qt_designerrc -.RS -Per user configuration file. - -.SH SEE ALSO -.B Qt Linguist -is too complex to be described completely in the "man" page -format. If your system is properly configured, you can access -the full documentation within -.B Qt Linguist -under the Help menu. - -.SH AUTHOR -This manual page was written by Jeremy Laine <jeremy.laine@m4x.org>, -for the Debian GNU/Linux system (but may be used by others). diff --git a/ubuntu/maverick/dependencies/qt3/debian/maintain/man/makeqpf.1 b/ubuntu/maverick/dependencies/qt3/debian/maintain/man/makeqpf.1 deleted file mode 100644 index 37ddcfd4f..000000000 --- a/ubuntu/maverick/dependencies/qt3/debian/maintain/man/makeqpf.1 +++ /dev/null @@ -1,26 +0,0 @@ -.TH "makeqpf" "1" "3.0.3" "Troll Tech AS, Norway." "" -.SH "NAME" -.LP -makeqpf \- Create qpf files from TTF and BDF files. -.SH "DESCRIPTION" -.LP -Qt Prerendered Font (QPF) is a light\-weight non\-scalable -font format specific to Qt/Embedded. makeqpf is a tool -that assists producing QPF files from TTF and BDF files. - - -.SH "SYNTAX" -qembed [ \fIgeneral\-files\fP ] <[ \fI\-\-images image\-files \fP]> -.br - -general\-files - These files can be any type of file. -\-\-images image\-files - These files must be in image formats supported by Qt. - -.SH "FILES" -.LP -\fI$(QTDIR)/etc/fonts/fontdir\fP -.SH "AUTHORS" -.LP -TrollTech <http://www.trolltech.com/> diff --git a/ubuntu/maverick/dependencies/qt3/debian/maintain/man/mergetr.1 b/ubuntu/maverick/dependencies/qt3/debian/maintain/man/mergetr.1 deleted file mode 100644 index 9ed2a9f25..000000000 --- a/ubuntu/maverick/dependencies/qt3/debian/maintain/man/mergetr.1 +++ /dev/null @@ -1,27 +0,0 @@ -.TH "mergetr" "1" "3.0.3" "Troll Tech AS, Norway." "" -.SH "NAME" -.LP -mergetr \- Merge changes in translations -.SH "SYNTAX" -.LP -mergetr myapp_de.po myapp.po - -.SH "DESCRIPTION" -.LP -When the texts in your program change as it is developed, -a the base .po file can be regenerated using findtr, -then mergetr can be used to merge the changes into the -other .po files: - - mergetr myapp_de.po myapp.po - mergetr myapp_fr.po myapp.po - mergetr myapp_ja.po myapp.po - - -The translation team then edits the new .po files to -translate the new or changed texts. When texts change, -the old text is included in the .po file as a comment to -guide the new translation (no "fuzzy" matching is done). -.SH "AUTHORS" -.LP -TrollTech <http://www.trolltech.com/> diff --git a/ubuntu/maverick/dependencies/qt3/debian/maintain/man/msg2qm.1 b/ubuntu/maverick/dependencies/qt3/debian/maintain/man/msg2qm.1 deleted file mode 100644 index 7d22bbb96..000000000 --- a/ubuntu/maverick/dependencies/qt3/debian/maintain/man/msg2qm.1 +++ /dev/null @@ -1,26 +0,0 @@ -.TH "msg2qm" "1" "3.0.3" "Troll Tech AS, Norway." "" -.SH "NAME" -.LP -msg2qm \- Converts translated .po files to a Qt\-specific binary format. -.SH "SYNTAX" -.LP -msg2qm myapp_de.po myapp_de.qm -.SH "DESCRIPTION" -.LP - -Converts translated .po files to a Qt\-specific binary -format (".qm" Qt message files). The Qt message files -are platform and locale independent, containing -translations in Unicode and various hash tables to -provide fast look\-up. - - msg2qm myapp_de.po myapp_de.qm - msg2qm myapp_fr.po myapp_fr.qm - msg2qm myapp_ja.po myapp_ja.qm - - -In your application, use QTranslator::load() to load -translation files appropriate for the user's language. -.SH "AUTHORS" -.LP -TrollTech <http://www.trolltech.com/> diff --git a/ubuntu/maverick/dependencies/qt3/debian/maintain/man/qembed.1 b/ubuntu/maverick/dependencies/qt3/debian/maintain/man/qembed.1 deleted file mode 100644 index a9b262f10..000000000 --- a/ubuntu/maverick/dependencies/qt3/debian/maintain/man/qembed.1 +++ /dev/null @@ -1,32 +0,0 @@ -.TH "qembed" "1" "3.0.3" "Troll Tech AS, Norway." "" -.SH "NAME" -.LP -qembed \- Converts arbitrary files into C++ code. -.SH "DESCRIPTION" -.LP -The QEmbed tool, found in qt/tools/qembed, converts -arbitrary files into C++ code. This is useful for -including image files and other resources directly into -your application rather than loading the data from -external files. - -QEmbed can also generate uncompressed versions of images -that can be included directly into your application, -thus avoiding both the external file and the need to -parse the image file format. This is useful for small -images such as icons for which compression is not a -great gain. - - -.SH "SYNTAX" -qembed [ \fIgeneral\-files\fP ] <[ \fI\-\-images image\-files \fP]> -.br - -general\-files - These files can be any type of file. -\-\-images image\-files - These files must be in image formats supported by Qt. - -.SH "AUTHORS" -.LP -TrollTech <http://www.trolltech.com/> diff --git a/ubuntu/maverick/dependencies/qt3/debian/maintain/man/qt20fix.1 b/ubuntu/maverick/dependencies/qt3/debian/maintain/man/qt20fix.1 deleted file mode 100644 index 352921be8..000000000 --- a/ubuntu/maverick/dependencies/qt3/debian/maintain/man/qt20fix.1 +++ /dev/null @@ -1,32 +0,0 @@ -.TH "qt20fix" "1" "3.0.3" "Troll Tech AS, Norway." "" -.SH "NAME" -.LP -qt20fix \- Helps clean namespace when porting an app from Qt1 to Qt2 -.SH "SYNTAX" -.LP -qt20fix myapp.cpp - -.SH "DESCRIPTION" -.LP -Qt 2.x is namespace\-clean, unlike 1.x. Qt now uses very -few global identifiers. Identifiers like red, blue, -LeftButton, AlignRight, Key_Up, Key_Down, NoBrush etc. -are now part of a special class Qt (defined in -qnamespace.h), which is inherited by most Qt classes. -Member functions of classes that inherit from QWidget, -etc. are totally unaffected, but code that is not in -functions of classes inherited from Qt, you must qualify -these identifiers like this: Qt::red, Qt::LeftButton, -Qt::AlignRight, etc. - -The qt/bin/qt20fix script helps to fix the code that -needs adaption, though most code does not need changing. - -Compiling with \-DQT1COMPATIBILITY will help you get going -with Qt 2.x \- it allows all the old "dirty namespace" -identifiers from Qt 1.x to continue working. Without it, -you'll get compile errors that can easily be fixed by -searching this page for the clean identifiers. -.SH "AUTHORS" -.LP -TrollTech <http://www.trolltech.com/> diff --git a/ubuntu/maverick/dependencies/qt3/debian/maintain/man/qtconfig.1 b/ubuntu/maverick/dependencies/qt3/debian/maintain/man/qtconfig.1 deleted file mode 100644 index 7e03bf49b..000000000 --- a/ubuntu/maverick/dependencies/qt3/debian/maintain/man/qtconfig.1 +++ /dev/null @@ -1,17 +0,0 @@ -.TH "qtconfig" "1" "3.0.3" "Troll Tech AS, Norway." "" -.SH "NAME" -.LP -qtconfig \- Configuration tool for Qt -.SH "DESCRIPTION" -.LP -QConfig allows for GUI based configuration of Qt and - other Qt based sources. - -.SH "ENVIRONMENT VARIABLES" -.LP -.TP -\fBQTDIR\fP -Specifies the base Qt dir -.SH "AUTHORS" -.LP -TrollTech <http://www.trolltech.com/> diff --git a/ubuntu/maverick/dependencies/qt3/debian/maintain/man/qvfb.1 b/ubuntu/maverick/dependencies/qt3/debian/maintain/man/qvfb.1 deleted file mode 100644 index 0ae800d32..000000000 --- a/ubuntu/maverick/dependencies/qt3/debian/maintain/man/qvfb.1 +++ /dev/null @@ -1,66 +0,0 @@ -.TH "qvfb" "1" "3.0.3" "Troll Tech AS, Norway." "" -.SH "NAME" -.LP -qvfb \- Virtual framebuffer for Qt -.SH "DESCRIPTION" -.LP -The virtual framebuffer allows Qt/Embedded programs to be -developed on your desktop machine, without switching -between consoles and X11. - -Start a Qt/Embedded master application (i.e., construct -QApplication with QApplication::GuiServer flag or use the -\-qws command line parameter). You will need to specify to -the server that you wish to use the virtual framebuffer -driver, e.g.: - - widgets \-qws \-display QVFb:0 - -You may prefer to set the QWS_DISPLAY environment -variable to be QVFb:0. - -qvfb supports the following command line options: - - \-width width: the width of the virtual framebuffer - (default: 240). - \-height height: the height of the virtual framebuffer - (default: 320). - \-depth depth: the depth of the virtual framebuffer (1, 8 - or 32; default: 8). - \-nocursor: do not display the X11 cursor in the - framebuffer window. - \-qwsdisplay :id the Qt/Embedded display id to provide - (default: 0). - - Virtual Framebuffer Design - -The virtual framebuffer emulates a framebuffer using a -shared memory region (the virtual frame buffer) and a -utility to display the framebuffer in a window (qvfb). -The regions of the display that have changed are updated -periodically, so you will see discrete snapshots of the -framebuffer rather than each individual drawing -operation. For this reason drawing problems such as -flickering may not be apparent until the program is run -using a real framebuffer. - -The target refresh rate can be set via the "View|Refresh -Rate" menu item. This will cause qvfb to check for -updated regions more quickly. The rate is a target only. -If little drawing is being done, the framebuffer will not -show any updates between drawing events. If an -application is displaying an animation the updates will -be frequent, and the application and qvfb will compete -for processor time. - -Mouse and keyboard events are passed to the Qt/Embedded -master process via named pipes. - -The virtual framebuffer is a development tool only. No -security issues have been considered in the virtual -framebuffer design. It should be avoided in a production -environment; QT_NO_QWS_VFB should always be defined in -production libraries. -.SH "AUTHORS" -.LP -TrollTech <http://www.trolltech.com/> diff --git a/ubuntu/maverick/dependencies/qt3/debian/rules b/ubuntu/maverick/dependencies/qt3/debian/rules index 7874557c8..09b237823 100755 --- a/ubuntu/maverick/dependencies/qt3/debian/rules +++ b/ubuntu/maverick/dependencies/qt3/debian/rules @@ -13,6 +13,7 @@ export PATH=$(QTDIR)/bin:$(OLD_PATH) DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) ifeq ($(DEB_HOST_ARCH_OS),hurd) PLATFORM_ARG = hurd-g++ @@ -85,13 +86,13 @@ CONFIGURE_OPTS = \ -plugin-sql-odbc \ -plugin-sql-psql \ -plugin-sql-mysql \ + -plugin-sql-ibase \ -plugin-sql-sqlite \ \ -I/usr/include/mysql \ -I/usr/include/freetype2 \ -I`pg_config --includedir` \ - \ - -L/usr/lib/$(DEB_HOST_MULTIARCH) \ + -L/usr/lib/$(DEB_HOST_MULTIARCH)\ \ -lfontconfig \ -inputmethod \ @@ -413,25 +414,16 @@ binary-arch: build install mv `pwd`/debian/qt3-assistant/usr/bin/assistant `pwd`/debian/qt3-assistant/usr/bin/assistant-qt3 mv `pwd`/debian/qt3-linguist/usr/bin/linguist `pwd`/debian/qt3-linguist/usr/bin/linguist-qt3 - install -D debian/maintain/man/designer.1 `pwd`/debian/qt3-designer/usr/share/man/man1/designer-qt3.1 install -D doc/man/man1/moc.1 `pwd`/debian/qt3-dev-tools/usr/share/man/man1/moc-qt3.1 install -D doc/man/man1/uic.1 `pwd`/debian/qt3-dev-tools/usr/share/man/man1/uic-qt3.1 install -D doc/man/man1/lrelease.1 `pwd`/debian/qt3-dev-tools/usr/share/man/man1/lrelease-qt3.1 install -D doc/man/man1/lupdate.1 `pwd`/debian/qt3-dev-tools/usr/share/man/man1/lupdate-qt3.1 - install -D debian/maintain/man/qtconfig.1 `pwd`/debian/qt3-qtconfig/usr/share/man/man1/qtconfig-qt3.1 - install -D debian/maintain/man/linguist.1 `pwd`/debian/qt3-linguist/usr/share/man/man1/linguist-qt3.1 dh_link -pqt3-designer usr/share/qt3/doc/html usr/share/doc/qt3-designer/html dh_link -pqt3-assistant usr/share/qt3/doc/html usr/share/doc/qt3-assistant/html dh_link -pqt3-linguist usr/share/qt3/doc/html usr/share/doc/qt3-linguist/html dh_link -pqt3-dev-tools usr/share/qt3/doc/html usr/share/doc/qt3-dev-tools/html - # install the manpages we have - dh_installman -pqt3-designer debian/maintain/man/createcw.1 - dh_installman -pqt3-dev-tools-compat debian/maintain/man/qt20fix.1 debian/maintain/man/mergetr.1 debian/maintain/man/findtr.1 debian/maintain/man/msg2qm.1 - dh_installman -pqt3-dev-tools-embedded debian/maintain/man/makeqpf.1 debian/maintain/man/qvfb.1 - dh_installman -pqt3-dev-tools debian/maintain/man/qembed.1 - # copy README.Debian for a in libqt3-mt-dev libqt3-mt qt3-doc; do install -D `pwd`/debian/README.Debian `pwd`/debian/"$$a"/usr/share/doc/"$$a"/README.Debian; done diff --git a/ubuntu/maverick/dependencies/qt3/debian/source/format b/ubuntu/maverick/dependencies/qt3/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/dependencies/qt3/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/dependencies/qt3/debian/source/options b/ubuntu/maverick/dependencies/qt3/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/dependencies/qt3/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/changelog b/ubuntu/maverick/dependencies/sip4-tqt/debian/changelog new file mode 100644 index 000000000..6634575fe --- /dev/null +++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/changelog @@ -0,0 +1,9 @@ +sip4-tqt (4.10.5-0ubuntu1) maverick; urgency=low + + * New upstream release + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Tue, 22 Nov 2011 03:03:00 -0600 + +Local variables: +mode: debian-changelog +End: diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/compat b/ubuntu/maverick/dependencies/sip4-tqt/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/compat @@ -0,0 +1 @@ +5 diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/control b/ubuntu/maverick/dependencies/sip4-tqt/debian/control new file mode 100644 index 000000000..825f458eb --- /dev/null +++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/control @@ -0,0 +1,126 @@ +Source: sip4-tqt +Section: devel +Priority: optional +Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> +Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org> +Build-Depends: debhelper (>= 7), python-all-dev (>= 2.3.5-10), python-all-dbg, python-support (>= 0.7.1), libtqtinterface-dev +Standards-Version: 3.8.4 +XS-Python-Version: all + +Package: python-sip +Architecture: any +Section: python +Replaces: python-sip (<< 4:14.0.0) +Breaks: python-sip (<< 4:14.0.0) +Provides: ${python:Provides}, sip-api-7.0, sip-api-7.1 +Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} +Conflicts: python-sip4 (<< 4.10) +Description: Python/C++ bindings generator runtime library + SIP is a tool for generating bindings for C++ classes with some ideas + borrowed from SWIG, but capable of tighter bindings because of its + specificity towards C++ and Python. + +Package: python-sip-dbg +Priority: extra +Architecture: any +Replaces: python-sip-dbg (<< 4:14.0.0) +Breaks: python-sip-dbg (<< 4:14.0.0) +Section: debug +Provides: ${python:Provides} +Depends: python-sip (= ${binary:Version}), python-dbg, ${shlibs:Depends}, ${misc:Depends} +Conflicts: python-sip4-dbg (<< 4.10) +Description: Python/C++ bindings generator runtime library (debug extension) + SIP is a tool for generating bindings for C++ classes with some ideas + borrowed from SWIG, but capable of tighter bindings because of its + specificity towards C++ and Python. + . + This package contains the extension built for the Python debug interpreter. + +Package: python-sip-dev +Architecture: any +Section: python +Replaces: python-sip-dev (<< 4:14.0.0) +Breaks: python-sip-dev (<< 4:14.0.0) +Depends: ${python:Depends}, python-sip (= ${binary:Version}), python-dev, ${shlibs:Depends}, libjs-jquery, ${misc:Depends} +Recommends: python-sip (>= ${source:Version}) +Provides: python-sip4-dev, sip4 +Conflicts: python-sip4-dev (<< 4.10), sip4 (<< 4.10) +Description: Python/C++ bindings generator development files + SIP is a tool for generating bindings for C++ classes with some ideas + borrowed from SWIG, but capable of tighter bindings because of its + specificity towards C++ and Python. + . + SIP was originally designed to generate Python bindings for KDE and so + has explicit support for the signal slot mechanism used by the Qt/KDE + class libraries. + . + Features: + - connecting Qt signals to Python functions and class methods + - connecting Python signals to Qt slots + - overloading virtual member functions with Python class methods + - protected member functions + - abstract classes + - enumerated types + - global class instances + - static member functions. + . + This package contains the code generator tool and the development headers + needed to develop Python bindings with sip. + +Package: python-sip4 +Architecture: all +Section: python +Replaces: python-sip4 (<< 4:14.0.0) +Breaks: python-sip4 (<< 4:14.0.0) +Depends: python-sip, ${misc:Depends} +Description: Python/C++ bindings generator runtime library (transitional package) + SIP is a tool for generating bindings for C++ classes with some ideas + borrowed from SWIG, but capable of tighter bindings because of its + specificity towards C++ and Python. + . + This is a transitional package that depends on python-sip. + It can be safely removed. + +Package: sip4 +Architecture: all +Section: python +Replaces: sip4 (<< 4:14.0.0) +Breaks: sip4 (<< 4:14.0.0) +Depends: python-sip-dev, ${misc:Depends} +Description: Python/C++ bindings generator (transitional package) + SIP is a tool for generating bindings for C++ classes with some ideas + borrowed from SWIG, but capable of tighter bindings because of its + specificity towards C++ and Python. + . + This is a transitional package that depends on python-sip-dev. + It can be safely removed. + +Package: python-sip4-dev +Architecture: all +Section: python +Replaces: python-sip4-dev (<< 4:14.0.0) +Breaks: python-sip4-dev (<< 4:14.0.0) +Depends: python-sip-dev, ${misc:Depends} +Description: Python/C++ bindings generator development files (transitional package) + SIP is a tool for generating bindings for C++ classes with some ideas + borrowed from SWIG, but capable of tighter bindings because of its + specificity towards C++ and Python. + . + This is a transitional package that depends on python-sip-dev. + It can be safely removed. + +Package: python-sip4-dbg +Architecture: all +Section: debug +Replaces: python-sip4-dbg (<< 4:14.0.0) +Breaks: python-sip4-dbg (<< 4:14.0.0) +Priority: extra +Depends: python-sip-dbg, ${misc:Depends} +Description: Python/C++ bindings generator runtime library (debug, transitional package) + SIP is a tool for generating bindings for C++ classes with some ideas + borrowed from SWIG, but capable of tighter bindings because of its + specificity towards C++ and Python. + . + This is a transitional package that depends on python-sip-dev. + It can be safely removed. diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/copyright b/ubuntu/maverick/dependencies/sip4-tqt/debian/copyright new file mode 100644 index 000000000..b1fc4bd72 --- /dev/null +++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/copyright @@ -0,0 +1,80 @@ +This package was debianized by Ricardo Javier Cardenes Medina <rcardenes@debian.org> on +Tue, 10 Sep 2002 23:12:17 +0100 + +It was downloaded from http://www.riverbankcomputing.co.uk + +Upstream Author: Phil Thompson (phil@riverbankcomputing.co.uk) + +SIP4 is offered under GPLv2, GPLv3, and the SIP 4 license. The text +of the SIP license follows: + +RIVERBANK COMPUTING LIMITED LICENSE AGREEMENT FOR SIP 4.9 + +1. This LICENSE AGREEMENT is between Riverbank Computing Limited +("Riverbank"), and the Individual or Organization ("Licensee") accessing +and otherwise using SIP 4.9 software in source or binary form and its +associated documentation. SIP 4.9 comprises a software tool for +generating Python bindings for software C and C++ libraries, and a Python +extension module used at runtime by those generated bindings. + +2. Subject to the terms and conditions of this License Agreement, Riverbank +hereby grants Licensee a nonexclusive, royalty-free, world-wide license +to reproduce, analyze, test, perform and/or display publicly, prepare +derivative works, distribute, and otherwise use SIP 4.9 alone or in +any derivative version, provided, however, that Riverbank's License +Agreement and Riverbank's notice of copyright, e.g., "Copyright (c) 2009 +Riverbank Computing Limited; All Rights Reserved" are retained in +SIP 4.9 alone or in any derivative version prepared by Licensee. + +3. In the event Licensee prepares a derivative work that is based on +or incorporates SIP 4.9 or any part thereof, and wants to make +the derivative work available to others as provided herein, then +Licensee hereby agrees to include in any such work a brief summary of +the changes made to SIP 4.9. + +4. Licensee may not use SIP 4.9 to generate Python bindings for any +C or C++ library for which bindings are already provided by Riverbank. + +5. Riverbank is making SIP 4.9 available to Licensee on an "AS IS" +basis. RIVERBANK MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR +IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, RIVERBANK MAKES NO AND +DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS +FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF SIP 4.9 WILL NOT +INFRINGE ANY THIRD PARTY RIGHTS. + +6. RIVERBANK SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF +SIP 4.9 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS +AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING SIP 4.9, +OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. + +7. This License Agreement will automatically terminate upon a material +breach of its terms and conditions. + +8. Nothing in this License Agreement shall be deemed to create any +relationship of agency, partnership, or joint venture between Riverbank +and Licensee. This License Agreement does not grant permission to use +Riverbank trademarks or trade name in a trademark sense to endorse or +promote products or services of Licensee, or any third party. + +9. By copying, installing or otherwise using SIP 4.9, Licensee +agrees to be bound by the terms and conditions of this License Agreement. + +**** + +SIP is also licensed under the GPLv2 and GPLv3: + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation version 2 or 3 of the License. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +On Debian systems, the complete text of the GNU General Public License 2 +can be found in `/usr/share/common-licenses/GPL-2'. The complete text of the +GNU General Public License 3 can be found in `/usr/share/common-licenses/GPL-3'. diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/dh_sip b/ubuntu/maverick/dependencies/sip4-tqt/debian/dh_sip new file mode 100755 index 000000000..54d861884 --- /dev/null +++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/dh_sip @@ -0,0 +1,47 @@ +#!/usr/bin/perl -w + +=head1 NAME + +dh_sip - set the correct dependencies for Python packages using sip + +=cut + +use strict; +use Debian::Debhelper::Dh_Lib; + +=head1 SYNOPSIS + +B<dh_sip> + +=head1 DESCRIPTION + +dh_sip creates the ${sip:Depends} substitution variable which must be used by +Python extensions built with sip in order to depend on a version of python-sip +that exports the correct public API. + +=cut + +init(); + +my $sip_provides = `dpkg -s python-sip`; +$sip_provides =~ /^Provides:\s*(.+)$/m; + +my @sip_apis = sort(grep(/sip\-api/, split(/,\s*/, $1))); + +my $sip_api_version=$sip_apis[-1]; + +foreach my $package (@{$dh{DOPACKAGES}}) { + addsubstvar($package, "sip:Depends", $sip_api_version); +} + +=head1 SEE ALSO + +L<debhelper(7)> + +This program is a part of python-sip-dev but is made to work with debhelper. + +=head1 AUTHORS + +Torsten Marek <shlomme@debian.org> + +=cut diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/docs b/ubuntu/maverick/dependencies/sip4-tqt/debian/docs new file mode 100644 index 000000000..50bd824bb --- /dev/null +++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/docs @@ -0,0 +1,2 @@ +NEWS +README diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/manpages/dh_sip.1 b/ubuntu/maverick/dependencies/sip4-tqt/debian/manpages/dh_sip.1 new file mode 100644 index 000000000..989c5fc3c --- /dev/null +++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/manpages/dh_sip.1 @@ -0,0 +1,149 @@ +.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07) +.\" +.\" Standard preamble: +.\" ======================================================================== +.de Sp \" Vertical space (when we can't use .PP) +.if t .sp .5v +.if n .sp +.. +.de Vb \" Begin verbatim text +.ft CW +.nf +.ne \\$1 +.. +.de Ve \" End verbatim text +.ft R +.fi +.. +.\" Set up some character translations and predefined strings. \*(-- will +.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left +.\" double quote, and \*(R" will give a right double quote. \*(C+ will +.\" give a nicer C++. Capital omega is used to do unbreakable dashes and +.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, +.\" nothing in troff, for use with C<>. +.tr \(*W- +.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' +.ie n \{\ +. ds -- \(*W- +. ds PI pi +. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch +. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch +. ds L" "" +. ds R" "" +. ds C` "" +. ds C' "" +'br\} +.el\{\ +. ds -- \|\(em\| +. ds PI \(*p +. ds L" `` +. ds R" '' +'br\} +.\" +.\" Escape single quotes in literal strings from groff's Unicode transform. +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" +.\" If the F register is turned on, we'll generate index entries on stderr for +.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index +.\" entries marked with X<> in POD. Of course, you'll have to process the +.\" output yourself in some meaningful fashion. +.ie \nF \{\ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" +.. +. nr % 0 +. rr F +.\} +.el \{\ +. de IX +.. +.\} +.\" +.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). +.\" Fear. Run. Save yourself. No user-serviceable parts. +. \" fudge factors for nroff and troff +.if n \{\ +. ds #H 0 +. ds #V .8m +. ds #F .3m +. ds #[ \f1 +. ds #] \fP +.\} +.if t \{\ +. ds #H ((1u-(\\\\n(.fu%2u))*.13m) +. ds #V .6m +. ds #F 0 +. ds #[ \& +. ds #] \& +.\} +. \" simple accents for nroff and troff +.if n \{\ +. ds ' \& +. ds ` \& +. ds ^ \& +. ds , \& +. ds ~ ~ +. ds / +.\} +.if t \{\ +. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" +. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' +. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' +. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' +. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' +. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' +.\} +. \" troff and (daisy-wheel) nroff accents +.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' +.ds 8 \h'\*(#H'\(*b\h'-\*(#H' +.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] +.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' +.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' +.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] +.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] +.ds ae a\h'-(\w'a'u*4/10)'e +.ds Ae A\h'-(\w'A'u*4/10)'E +. \" corrections for vroff +.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' +.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' +. \" for low resolution devices (crt and lpr) +.if \n(.H>23 .if \n(.V>19 \ +\{\ +. ds : e +. ds 8 ss +. ds o a +. ds d- d\h'-1'\(ga +. ds D- D\h'-1'\(hy +. ds th \o'bp' +. ds Th \o'LP' +. ds ae ae +. ds Ae AE +.\} +.rm #[ #] #H #V #F C +.\" ======================================================================== +.\" +.IX Title "DH_SIP 1" +.TH DH_SIP 1 "2010-02-02" "perl v5.10.1" "User Contributed Perl Documentation" +.\" For nroff, turn off justification. Always turn off hyphenation; it makes +.\" way too many mistakes in technical documents. +.if n .ad l +.nh +.SH "NAME" +dh_sip \- set the correct dependencies for Python packages using sip +.SH "SYNOPSIS" +.IX Header "SYNOPSIS" +\&\fBdh_sip\fR +.SH "DESCRIPTION" +.IX Header "DESCRIPTION" +dh_sip creates the ${sip:Depends} substitution variable which must be used by +Python extensions built with sip in order to depend on a version of python-sip +that exports the correct public \s-1API\s0. +.SH "SEE ALSO" +.IX Header "SEE ALSO" +\&\fIdebhelper\fR\|(7) +.PP +This program is a part of python-sip-dev but is made to work with debhelper. +.SH "AUTHORS" +.IX Header "AUTHORS" +Torsten Marek <shlomme@debian.org> diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/manpages/sip.1 b/ubuntu/maverick/dependencies/sip4-tqt/debian/manpages/sip.1 new file mode 100644 index 000000000..ce178cc7e --- /dev/null +++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/manpages/sip.1 @@ -0,0 +1,86 @@ +.\" +.\" Created by Ricardo Cárdenes Medina <ricardo@conysis.com> +.\" for the Debian 'sip' package +.\" +.TH SIP 1 "2010/02/02" +.SH NAME +sip \- generates C++/Python bindings +.SH SYNOPSIS +.B sip +[\fI-h\fR] [\fI-V\fR] [\fI-a file\fR] [\fI-c dir\fR] [\fI-d file\fR] [\fI-e\fR] [\fI-g\fR] [\fI-I dir\fR] [\fI-j #\fR] [\fI-k\fR] [\fI-m file\fR] [\fI-o\fR] [\fI-p module\fR] [\fI-P\fR] [\fI-r\fR] [\fI-s suffix\fR] [\fI-t tag\fR] [\fI-w\fR] [\fI-x feature\fR] [\fI-z file\fR] [\fIfile\fR] +.SH DESCRIPTION +.B sip +takes a set of specification files and generates C++ code, documentation and build files. + +The format of the needed specification file is similar to a C++ header. +sip includes run-time support for the generated code. +.SH OPTIONS +.TP +.B \-h +Show summary of options. +.TP +.B \-V +Display the sip version number +.TP +.B \-a file +The name of the QScintilla API file. If not indicated, it will not +be generated. +.TP +.B \-b file +The name of the build file. If not indicated, it will not be generated. +.TP +.B \-c dir +The name of the directory where generated source file will be put. +If not indicated, no code will be generated. +.TP +.B -d file +The name of the documentation file. If not indicated, no documentation will be generated. +.TP +.B -e +Enable support for exceptions. Disabled by default. +.TP +.B -g +Always release and reaquire the GIL. +.TP +.B -I dir +Directory where sip can search for included files. +.TP +.B -j number +Splits the generated code in \fInumber\fR files (1 by default). This +flag was added for parallel compilation on SMP machines. +.TP +.B -m file +The name of the XML export file. If not indicated, the file will not be generated. +.TP +.B -p module +Give the name of the consolidated module this module should be a part of. +.TP +.B -P +Enable the protected/public hack. +.TP +.B -r +Enable tracing on generated code. +.TP +.B -s suffix +The suffix used for generated C or C++ files (".c" or ".cpp" if none specified) +.TP +.B -t tag +The primary version to tag generate code for. You only can specify those +defined with a %Timeline directive. If you don't specify one, sip +will generate the latest available. +.TP +.B -w +Enable warning messages +.TP +.B -x feature +Disable a feature +.TP +.B -z file +The name of a file containing additional command line flags +.TP +.B file +The name of the file containing the specification. If you skip it, +sip will expect to be fed by stdin. +.SH AUTHOR +This manual page was written by Ricardo Javier Cardenes Medina <rcardenes@debian.org> and Torsten Marek <shlomme@debian.org>, +for the Debian GNU/Linux system (but may be used by others). diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/patches/series b/ubuntu/maverick/dependencies/sip4-tqt/debian/patches/series new file mode 100644 index 000000000..c42871d34 --- /dev/null +++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/patches/series @@ -0,0 +1,2 @@ +siputils_debian_changes.diff +siputils_objdir_module_fix.diff diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff b/ubuntu/maverick/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff new file mode 100644 index 000000000..2640f57c2 --- /dev/null +++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff @@ -0,0 +1,32 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_siputils.dpatch by Torsten Marek <shlomme@debian.org> +Index: sip4-qt3-4.10/siputils.py +=================================================================== +--- sip4-qt3-4.10.orig/siputils.py 2010-01-14 15:52:09.000000000 +0100 ++++ sip4-qt3-4.10/siputils.py 2010-01-26 21:09:49.172700039 +0100 +@@ -718,7 +718,8 @@ + + libs.extend(self.optional_list("LIBS_WINDOWS")) + +- lflags.extend(self._platform_rpaths(rpaths.as_list())) ++ # Don't append any rpaths ++ #lflags.extend(self._platform_rpaths(rpaths.as_list())) + + # Save the transformed values. + self.CFLAGS.set(cflags) +@@ -843,6 +844,15 @@ + clib is the library name in cannonical form. + framework is set of the library is implemented as a MacOS framework. + """ ++ ################################################################## ++ # Generally, the linker is intelligent enough not to need this # ++ # additional information! # ++ # And Qt4's pkg-config and prl files are broken # ++ # Changed for Debian packaging, Torsten Marek <shlomme@gmx.net> # ++ ################################################################## ++ ++ return [] ++ + prl_libs = [] + + if self.generator in ("MSVC", "MSVC.NET", "BMAKE"): diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff b/ubuntu/maverick/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff new file mode 100644 index 000000000..a9d580737 --- /dev/null +++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff @@ -0,0 +1,18 @@ +Index: sip4-qt3-4.10/siputils.py +=================================================================== +--- sip4-qt3-4.10.orig/siputils.py 2010-01-26 23:45:34.144734105 +0100 ++++ sip4-qt3-4.10/siputils.py 2010-01-26 23:46:51.605699383 +0100 +@@ -1546,9 +1546,12 @@ + mfile.write("\n$(OFILES): $(HFILES)\n") + + for mf in self._build["tqmoc_headers"].split(): +- root, discard = os.path.splitext(mf) ++ root, _ = os.path.splitext(mf) + cpp = "tqmoc_" + root + ".cpp" + ++ if self._src_dir != self.dir: ++ mf = os.path.join(self._src_dir, mf) ++ + mfile.write("\n%s: %s\n" % (cpp, mf)) + mfile.write("\t$(TQMOC) -o %s %s\n" % (cpp, mf)) + diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip-dev.docs b/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip-dev.docs new file mode 100644 index 000000000..416a453aa --- /dev/null +++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip-dev.docs @@ -0,0 +1,2 @@ +doc/html +NEWS diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip-dev.install b/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip-dev.install new file mode 100644 index 000000000..1df36c612 --- /dev/null +++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip-dev.install @@ -0,0 +1 @@ +usr/bin/* diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip-dev.links b/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip-dev.links new file mode 100755 index 000000000..26a9ded9b --- /dev/null +++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip-dev.links @@ -0,0 +1 @@ +usr/share/javascript/jquery/jquery.js usr/share/doc/python-sip-dev/html/_static/jquery.js diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip-dev.manpages b/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip-dev.manpages new file mode 100644 index 000000000..a4e96a394 --- /dev/null +++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip-dev.manpages @@ -0,0 +1,2 @@ +debian/manpages/sip.1 +debian/manpages/dh_sip.1 diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip.install b/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip.install new file mode 100644 index 000000000..f43a3a265 --- /dev/null +++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip.install @@ -0,0 +1 @@ +usr/lib/python*/*-packages/sip.so diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/pyversions b/ubuntu/maverick/dependencies/sip4-tqt/debian/pyversions new file mode 100644 index 000000000..57a7586e4 --- /dev/null +++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/pyversions @@ -0,0 +1 @@ +2.3- diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/rules b/ubuntu/maverick/dependencies/sip4-tqt/debian/rules new file mode 100755 index 000000000..0dd14099f --- /dev/null +++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/rules @@ -0,0 +1,148 @@ +#!/usr/bin/make -f +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +export DH_OPTIONS + +INSTDIR=$(CURDIR)/debian + +CFLAGS= + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 -g +else + CFLAGS += -O2 -g +endif + +PYTHONS := $(shell pyversions -vr debian/control) + +-include /usr/share/python/python.mk +ifeq (,$(py_sitename)) +py_sitename = site-packages +py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages +py_sitename_sh = $(py_sitename) +py_libdir_sh = $(py_libdir) +endif + + +.PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp + +configure: $(PYTHONS:%=build-%/configure-stamp) $(PYTHONS:%=dbg-build-%/configure-stamp) + +build-%/configure-stamp: + dh_testdir + mkdir -p build-$* + cd build-$* \ + && python$* ../configure.py \ + -d /usr/lib/python$*/$(call py_sitename,$*) \ + -u STRIP="" CFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE="" + touch $@ + +dbg-build-%/configure-stamp: + dh_testdir + mkdir -p dbg-build-$* + cd dbg-build-$* \ + && python$*-dbg ../configure.py \ + -d /usr/lib/python$*/$(call py_sitename,$*) \ + -e /usr/include/python$*_d \ + -u CFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE="" STRIP="" + touch $@ + + +build: $(PYTHONS:%=build-%/build-stamp) $(PYTHONS:%=dbg-build-%/build-stamp) + +build-%/build-stamp: build-%/configure-stamp + dh_testdir + $(MAKE) -C build-$* + touch $@ + +dbg-build-%/build-stamp: dbg-build-%/configure-stamp + dh_testdir + $(MAKE) -C dbg-build-$* + touch $@ + + +clean: + dh_testdir + dh_testroot + rm -rf *-stamp siputils.pyc $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%) + dh_clean + +install-arch: build + dh_testdir + dh_testroot + dh_prep -a + dh_installdirs -a + # This is needed to enforce that the install-arch-% rules are + # not run in parallel. Both rules install into the same directory, + # and therefore might try to access the same files at the same time. + # Therefore, instead of depending on the install-arch-% rules, + # we invoke them explicitly. + for p in $(PYTHONS) ; do \ + $(MAKE) -f debian/rules install-arch-$$p;\ + done + + for i in $$(find debian/python-sip-dbg -name '*.so'); do \ + b=$$(basename $$i .so); \ + mv $$i $$(dirname $$i)/$${b}_d.so; \ + done + find debian/python-sip-dbg ! -type d ! -name '*_d.*' | xargs rm -f + find debian/python-sip-dbg -depth -empty -exec rmdir {} \; + + dh_install -a --sourcedir=$(CURDIR)/debian/tmp + install -m 755 -o root -g root debian/dh_sip debian/python-sip-dev/usr/bin + +install-arch-%: + $(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp + $(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-sip-dbg + mkdir -p debian/python-sip/usr/lib/python$*/$(call py_sitename,$*)/ + install -m 644 -o root -g root debian/sipconfig.py debian/python-sip/usr/lib/python$*/$(call py_sitename,$*)/ + install -m 644 -o root -g root build-$*/sipconfig.py debian/python-sip/usr/lib/python$*/$(call py_sitename,$*)/sipconfig_nd.py + install -m 644 -o root -g root dbg-build-$*/sipconfig.py debian/python-sip-dbg/usr/lib/python$*/$(call py_sitename,$*)/sipconfig_d.py + mkdir -p debian/python-sip-dev/usr/include/python$* + install -m 644 -o root -g root siplib/sip.h debian/python-sip-dev/usr/include/python$*/ + mkdir -p debian/python-sip-dev/usr/include/python$*_d + ln -s ../python$*/sip.h \ + debian/python-sip-dev/usr/include/python$*_d/sip.h + mkdir -p debian/python-sip-dev/usr/lib/python$*/$(call py_sitename,$*) + install -m 644 -o root -g root sipdistutils.py debian/python-sip-dev/usr/lib/python$*/$(call py_sitename,$*) + + +# Must not depend on anything. This is to be called by +# binary-arch/binary-indep +# in another 'make' thread. +binary-common: + dh_testdir + dh_testroot + dh_installman + dh_installchangelogs + dh_installdocs -A + dh_installexamples + dh_link +# don't call strip twice, it's in binary-common +ifneq (,$(findstring -a, $(DH_OPTIONS))) + DH_OPTIONS= dh_strip -ppython-sip-dev + DH_OPTIONS= dh_strip -ppython-sip -Npython-sip-dev --dbg-package=python-sip-dbg + rm -rf debian/python-sip-dbg/usr/share/doc/python-sip-dbg + mkdir -p debian/python-sip-dbg/usr/share/doc + ln -s python-sip debian/python-sip-dbg/usr/share/doc/python-sip-dbg +endif + dh_compress + dh_fixperms + dh_pysupport + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture independant packages using the common target. +binary-indep: + $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common + +# Build architecture dependant packages using the common target. +binary-arch: install-arch + $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common + +binary: binary-arch binary-indep +.PHONY: build clean binary-indep binary-arch binary configure diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/sipconfig.py b/ubuntu/maverick/dependencies/sip4-tqt/debian/sipconfig.py new file mode 100644 index 000000000..f23b5427a --- /dev/null +++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/sipconfig.py @@ -0,0 +1,13 @@ +# import the sipconfig.py for the normal or the debug build + +import sys + +if getattr(sys, "pydebug", False): + try: + from sipconfig_d import * + from sipconfig_d import _pkg_config, _default_macros + except ImportError, msg: + raise ImportError, 'No module named sipconfig; package python-sip4-dbg not installed' +else: + from sipconfig_nd import * + from sipconfig_nd import _pkg_config, _default_macros diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/source/format b/ubuntu/maverick/dependencies/sip4-tqt/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/source/options b/ubuntu/maverick/dependencies/sip4-tqt/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/watch b/ubuntu/maverick/dependencies/sip4-tqt/debian/watch new file mode 100644 index 000000000..1ff1f0839 --- /dev/null +++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://www.riverbankcomputing.co.uk/software/sip/download \ + /static/Downloads/sip4/sip-([\d\.]*)\.tar\.gz debian uupdate diff --git a/ubuntu/maverick/dependencies/tqca-tls/debian/changelog b/ubuntu/maverick/dependencies/tqca-tls/debian/changelog new file mode 100644 index 000000000..7f1c440b0 --- /dev/null +++ b/ubuntu/maverick/dependencies/tqca-tls/debian/changelog @@ -0,0 +1,84 @@ +tqca-tls (1.0-0) maverick; urgency=low + + * TQt upload + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 17 Dec 2011 19:48:00 -0600 + +qca-tls (1.0-5) natty; urgency=low + + * Natty upload + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 15 Aug 2011 13:51:00 -0600 + +qca-tls (1.0-4) unstable; urgency=low + + * Honour DEB_BUILD_OPTIONS=nostrip (Closes: Bug#437850) + * Fixed a intian warning + + -- Jan Niehusmann <jan@debian.org> Tue, 14 Aug 2007 17:13:06 +0200 + +qca-tls (1.0-3) unstable; urgency=low + + * Changed two type conversions to const to make gcc happy + (Closes: Bug#337449) + * Set Standards-Version to 3.6.2.0 + + -- Jan Niehusmann <jan@debian.org> Thu, 15 Dec 2005 22:59:09 +0100 + +qca-tls (1.0-2) unstable; urgency=low + + * Recompiled for C++ ABI transition. + + -- Jan Niehusmann <jan@debian.org> Fri, 26 Aug 2005 18:10:30 +0000 + +qca-tls (1.0-1) unstable; urgency=low + + * Most of the following changes were done by Peter Palfrader + <weasel@debian.org> - many thanks to him! + * New upstream version (closes: #235093). + * qca-tls is a non-native package now (closes: #235084). + * Clean up properly in clean target: + rm -rf .ui .moc .obj Makefile conf.log conf.pri extra.pri + (closes: #235089). + * Do not copy over config.{sub,guess} from /usr/share during + build. They are not needed at all (closes: #235085). + * Remove debian/qca.doc-base.EX example file (closes: #235092). + * Do not ship readme in the binary package: it's just install + instructions (closes: #234939). + * Something changed that makes the configure script make the + Makefile install the .so into usr/lib, as opposed to usr/share + (closes: #233530). At any rate, we will not claim to have + built a working package if it happens again: + * Make the build fail if we don't have a + usr/lib/qt3/plugins/crypto/libqca-tls.so file after install. + * Make stamps in debian/rules actually work. + * Update copyright file to list current download link + * Added QMAKE_PROJECT_DEPTH=0 to .pro file to make qca-tls build in + nested directory structures. + + -- Jan Niehusmann <jan@debian.org> Sat, 28 Feb 2004 13:35:28 +0100 + +qca-tls (0.0-CVS-20031209-1.3) unstable; urgency=low + + * Damn. Added build-depends on libssl-dev... + + -- Jan Niehusmann <jan@debian.org> Fri, 13 Feb 2004 15:06:45 +0100 + +qca-tls (0.0-CVS-20031209-1.2) unstable; urgency=low + + * Added build-depends on libqt3-mt-dev + + -- Jan Niehusmann <jan@debian.org> Fri, 13 Feb 2004 13:27:34 +0100 + +qca-tls (0.0-CVS-20031209-1.1) unstable; urgency=low + + * Upload to unstable + + -- Jan Niehusmann <jan@debian.org> Thu, 12 Feb 2004 20:28:19 +0100 + +qca-tls (0.0-CVS-20031209-1) experimental; urgency=low + + * Initial Release. + * New upstream version + + -- Jan Niehusmann <jan@debian.org> Wed, 10 Dec 2003 12:21:07 +0100 diff --git a/ubuntu/maverick/dependencies/tqca-tls/debian/compat b/ubuntu/maverick/dependencies/tqca-tls/debian/compat new file mode 100644 index 000000000..b8626c4cf --- /dev/null +++ b/ubuntu/maverick/dependencies/tqca-tls/debian/compat @@ -0,0 +1 @@ +4 diff --git a/ubuntu/maverick/dependencies/tqca-tls/debian/control b/ubuntu/maverick/dependencies/tqca-tls/debian/control new file mode 100644 index 000000000..ecb53970a --- /dev/null +++ b/ubuntu/maverick/dependencies/tqca-tls/debian/control @@ -0,0 +1,23 @@ +Source: tqca-tls +Section: libs +Priority: optional +Maintainer: Jan Niehusmann <jan@debian.org> +Build-Depends: debhelper (>= 4.0.0), libtqtinterface-dev, libssl-dev +Standards-Version: 3.8.4 + +Package: tqca-tls +Section: libs +Architecture: any +Replaces: tqca-tls (<< 4:14.0.0) +Breaks: tqca-tls (<< 4:14.0.0) +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: TLS plugin for the TQt Cryptographic Architecture (TQCA) + This is a plugin to provide SSL/TLS capability to programs that + utilize the TQt Cryptographic Architecture (TQCA). + . + TQCA is a library providing an easy API for several cryptographic algorithms + to TQt programs. + . + At the moment only the tqca-tls plugin is packaged for debian, as it's + used by the package 'psi'. The generic library and several other plugins + will be packaged when upstream releases them. diff --git a/ubuntu/maverick/dependencies/tqca-tls/debian/copyright b/ubuntu/maverick/dependencies/tqca-tls/debian/copyright new file mode 100644 index 000000000..e64397c08 --- /dev/null +++ b/ubuntu/maverick/dependencies/tqca-tls/debian/copyright @@ -0,0 +1,20 @@ +This package was debianized by Jan Niehusmann <jan@debian.org> on +Tue, 9 Dec 2003 19:30:45 +0100. + +It was downloaded from http://psi.affinix.com/?page=download + + +Upstream Author: Justin Karneges <justin-psi@affinix.com> + +Copyright: + +Copyright (C) 2003 Justin Karneges + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +On Debian systems, the complete text of the GNU Lesser General Public +License can be found in /usr/share/common-licenses/LGPL file. + diff --git a/ubuntu/maverick/dependencies/tqca-tls/debian/dirs b/ubuntu/maverick/dependencies/tqca-tls/debian/dirs new file mode 100644 index 000000000..ca882bbb7 --- /dev/null +++ b/ubuntu/maverick/dependencies/tqca-tls/debian/dirs @@ -0,0 +1,2 @@ +usr/bin +usr/sbin diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/docs b/ubuntu/maverick/dependencies/tqca-tls/debian/docs index e845566c0..e845566c0 100644 --- a/ubuntu/maverick/libraries/pykdeextensions/debian/docs +++ b/ubuntu/maverick/dependencies/tqca-tls/debian/docs diff --git a/ubuntu/maverick/dependencies/tqca-tls/debian/rules b/ubuntu/maverick/dependencies/tqca-tls/debian/rules new file mode 100755 index 000000000..4ffaf90dc --- /dev/null +++ b/ubuntu/maverick/dependencies/tqca-tls/debian/rules @@ -0,0 +1,110 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +# shared library versions, option 1 +version=2.0.5 +major=2 +# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so +#version=`ls src/.libs/lib*.so.* | \ +# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` +#major=`ls src/.libs/lib*.so.* | \ +# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` + +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + CFLAGS="$(CFLAGS)" ./configure + touch configure-stamp + +build: configure-stamp build-stamp +build-stamp: + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + [ ! -f Makefile ] || $(MAKE) distclean + rm -rf .ui .moc .obj Makefile conf.log conf.pri extra.pri + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/tmp + $(MAKE) install INSTALL_ROOT=$(CURDIR)/debian/tmp/ + [ -e $(CURDIR)/debian/tmp/usr/lib/tqt3/plugins/crypto/libqca-tls.so ] || ( echo "libqca-tls.so not in usr/lib/tqt3/plugins/crypto/libqca-tls.so" && exit 1 ) + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples + dh_install --sourcedir=debian/tmp --list-missing +# dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit +# dh_installcron +# dh_installinfo + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_perl +# dh_python +# dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install diff --git a/ubuntu/maverick/dependencies/tqca-tls/debian/source/format b/ubuntu/maverick/dependencies/tqca-tls/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/dependencies/tqca-tls/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/dependencies/tqca-tls/debian/source/options b/ubuntu/maverick/dependencies/tqca-tls/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/dependencies/tqca-tls/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/dependencies/tqca-tls/debian/tqca-tls.install b/ubuntu/maverick/dependencies/tqca-tls/debian/tqca-tls.install new file mode 100644 index 000000000..d165ec389 --- /dev/null +++ b/ubuntu/maverick/dependencies/tqca-tls/debian/tqca-tls.install @@ -0,0 +1 @@ +usr/lib/tqt3/plugins/crypto/* diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/changelog b/ubuntu/maverick/dependencies/tqscintilla/debian/changelog new file mode 100644 index 000000000..bf84dfd0f --- /dev/null +++ b/ubuntu/maverick/dependencies/tqscintilla/debian/changelog @@ -0,0 +1,5 @@ +tqscintilla (1.7.1-0ubuntu0) lucid; urgency=low + + * Initial TQt builds + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Wed, 30 Nov 2011 11:40:00 -0600 diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/compat b/ubuntu/maverick/dependencies/tqscintilla/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/ubuntu/maverick/dependencies/tqscintilla/debian/compat @@ -0,0 +1 @@ +5 diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/control b/ubuntu/maverick/dependencies/tqscintilla/debian/control new file mode 100644 index 000000000..6f2c1e971 --- /dev/null +++ b/ubuntu/maverick/dependencies/tqscintilla/debian/control @@ -0,0 +1,47 @@ +Source: tqscintilla +Section: libs +Priority: optional +Maintainer: Ricardo Javier Cardenes Medina <rcardenes@debian.org> +Uploaders: Torsten Marek <shlomme@debian.org> +Build-Depends: debhelper (>> 5.0.0), libtqt3-mt-dev, tqt3-dev-tools, libtqtinterface-dev +Standards-Version: 3.8.4 + +Package: libtqscintilla7 +Section: libs +Architecture: any +Replaces: libtqscintilla7 (<< 4:14.0.0) +Breaks: libtqscintilla7 (<< 4:14.0.0) +Depends: ${shlibs:Depends} +Description: TQt source code editing component based on Scintilla + Scintilla is a free source code editing component. It has features found + in standard editing components, as well as features especially useful + when editing and debugging source code. + . + TQScintilla is a port or Scintilla to the TQt GUI toolkit. + +Package: libtqscintilla-dev +Section: libdevel +Architecture: all +Replaces: libtqscintilla-dev (<< 4:14.0.0) +Breaks: libtqscintilla-dev (<< 4:14.0.0) +Depends: libtqscintilla7 (>= ${source:Version}) +Description: TQt source code editing component - development files + Scintilla is a free source code editing component. It has features found + in standard editing components, as well as features especially useful + when editing and debugging source code. + . + TQScintilla is a port of Scintilla to the TQt GUI toolkit. These are the + development files (headers and static libs). + +Package: libtqscintilla-doc +Section: doc +Architecture: all +Replaces: libtqscintilla-doc (<< 4:14.0.0) +Breaks: libtqscintilla-doc (<< 4:14.0.0) +Suggests: libtqscintilla-dev +Description: TQt source code editing component - documentation + Scintilla is a free source code editing component. It has features found + in standard editing components, as well as features especially useful + when editing and debugging source code. + . + This package contain HTML files describing TQScintilla classes. diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/copyright b/ubuntu/maverick/dependencies/tqscintilla/debian/copyright new file mode 100644 index 000000000..445a8ff70 --- /dev/null +++ b/ubuntu/maverick/dependencies/tqscintilla/debian/copyright @@ -0,0 +1,39 @@ +This package was debianized by Ricardo Javier Cardenes Medina <rcardenes@debian.org> on +Sun, 24 Nov 2002 05:09:21 +0000. + +It was downloaded from http://www.riverbankcomputing.co.uk + +Upstream Authors: + + Scintilla: Neil Hodgson <neilh@scintilla.org> + QScintilla: Phil Thompson <phil@riverbankcomputing.co.uk> + +Copyright: + + Copyright 2005 by Riverbank Computing Limited <info@riverbankcomputing.co.uk> + +QScintilla is released under GPL version 2, or (at your option) any later +version. You can read the full version of this license in your system at + + /usr/share/common-licenses/GPL-2 + +Scintilla comes with this license: + + Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org> + + All Rights Reserved + + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, + provided that the above copyright notice appear in all copies and that + both that copyright notice and this permission notice appear in + supporting documentation. + + NEIL HODGSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS + SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS, IN NO EVENT SHALL NEIL HODGSON BE LIABLE FOR ANY + SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, + WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE + OR PERFORMANCE OF THIS SOFTWARE." diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/dirs b/ubuntu/maverick/dependencies/tqscintilla/debian/dirs new file mode 100644 index 000000000..ca882bbb7 --- /dev/null +++ b/ubuntu/maverick/dependencies/tqscintilla/debian/dirs @@ -0,0 +1,2 @@ +usr/bin +usr/sbin diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/docs b/ubuntu/maverick/dependencies/tqscintilla/debian/docs new file mode 100644 index 000000000..edc007104 --- /dev/null +++ b/ubuntu/maverick/dependencies/tqscintilla/debian/docs @@ -0,0 +1 @@ +NEWS diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/libtqscintilla-dev.install b/ubuntu/maverick/dependencies/tqscintilla/debian/libtqscintilla-dev.install new file mode 100644 index 000000000..e183cf963 --- /dev/null +++ b/ubuntu/maverick/dependencies/tqscintilla/debian/libtqscintilla-dev.install @@ -0,0 +1,2 @@ +usr/include +usr/lib/*.so diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/libtqscintilla-doc.install b/ubuntu/maverick/dependencies/tqscintilla/debian/libtqscintilla-doc.install new file mode 100644 index 000000000..005276324 --- /dev/null +++ b/ubuntu/maverick/dependencies/tqscintilla/debian/libtqscintilla-doc.install @@ -0,0 +1 @@ +usr/share/doc/libtqscintilla-doc diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/libtqscintilla7.install b/ubuntu/maverick/dependencies/tqscintilla/debian/libtqscintilla7.install new file mode 100644 index 000000000..2cfef7f8a --- /dev/null +++ b/ubuntu/maverick/dependencies/tqscintilla/debian/libtqscintilla7.install @@ -0,0 +1,3 @@ +usr/lib/*.so.* +usr/lib/tqt3/plugins/designer/*.so +usr/share/tqt3/translations/*.qm diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/rules b/ubuntu/maverick/dependencies/tqscintilla/debian/rules new file mode 100755 index 000000000..36df66cc9 --- /dev/null +++ b/ubuntu/maverick/dependencies/tqscintilla/debian/rules @@ -0,0 +1,106 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This is the debhelper compatibility version to use. +export QTDIR=/usr/share/tqt3 +export QMAKESPEC=$(QTDIR)/mkspecs/linux-g++ +DOCDEST=$(CURDIR)/debian/tmp/usr/share/doc/libtqscintilla-doc/html +HEADERDEST=$(CURDIR)/debian/tmp/usr/include/tqscintilla +LIBSDEST=$(CURDIR)/debian/tmp/usr/lib +TRANSDEST=$(CURDIR)/debian/tmp/$(QTDIR)/translations +PLUGINDEST=$(CURDIR)/debian/tmp/usr/lib/tqt3/plugins/designer + + +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) + CFLAGS += -g +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +configure: configure-stamp +configure-stamp: + dh_testdir + cd qt; qmake "DESTDIR=$(CURDIR)/tmplib" + cd designer; qmake + touch configure-stamp + + +build: build-stamp +build-stamp: configure-stamp + dh_testdir + + install -d $(CURDIR)/tmplib + $(MAKE) -C qt + $(MAKE) -C designer + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + [ ! -f qt/Makefile ] || $(MAKE) -C qt clean + [ ! -f designer/Makefile ] || $(MAKE) -C designer clean + -find -name 'Makefile' -exec rm {} \; + -rm -rf tmplib + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + install -d $(HEADERDEST)/private + install -d $(DOCDEST) + install -d $(TRANSDEST) + install -d $(LIBSDEST) + install -d $(PLUGINDEST) + for i in qt/qextscintilla*.h; do install -m 644 $$i $(HEADERDEST); done + for i in include/*.h; do install -m 644 $$i $(HEADERDEST)/private; done + for i in doc/html/*; do install -m 644 $$i $(DOCDEST); done + for i in qt/*.qm; do install -m 644 $$i $(TRANSDEST); done + mv designer/*.so $(PLUGINDEST) + for i in tmplib/*; do mv $$i $(LIBSDEST); done + + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir -i + dh_testroot -i + dh_install -i --sourcedir=$(CURDIR)/debian/tmp + dh_installdocs -i + dh_installchangelogs -i ChangeLog + dh_link -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir -a + dh_testroot -a + dh_install -a --sourcedir=$(CURDIR)/debian/tmp + dh_installdocs -a + dh_installchangelogs -a ChangeLog + dh_link -a + dh_strip -a + dh_compress -a + dh_fixperms -a + dh_makeshlibs -a -V + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/source/format b/ubuntu/maverick/dependencies/tqscintilla/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/dependencies/tqscintilla/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/source/options b/ubuntu/maverick/dependencies/tqscintilla/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/dependencies/tqscintilla/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/dependencies/tqt3/debian/control b/ubuntu/maverick/dependencies/tqt3/debian/control index 92568ae50..3ba683a76 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/control +++ b/ubuntu/maverick/dependencies/tqt3/debian/control @@ -6,11 +6,12 @@ Build-Depends: debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1- libxrandr-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, - libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg62-dev, + libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev, libxft-dev, libiodbc2-dev (>= 3.51.2-4), libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcups2-dev, - libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev + libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev, + firebird2.1-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc] | firebird2-dev [i386 amd64] Section: libs Priority: optional Standards-Version: 3.8.4 @@ -19,8 +20,8 @@ Homepage: http://www.trinitydesktop.org Package: libtqt3-mt Architecture: any Section: libs -Replaces: libtqt3-mt (<< 4:3.5.13) -Breaks: libtqt3-mt (<< 4:3.5.13) +Replaces: libtqt3-mt (<< 4:14.0.0) +Breaks: libtqt3-mt (<< 4:14.0.0) Depends: ${shlibs:Depends}, fontconfig Recommends: libgl1-mesa-glx | libgl1, libglu1-mesa | libglu1, libxmu6 (>= 4.3.0.dfsg.1-4) Conflicts: libtqt3c102-mt, libtqui1-emb, libtqt3c-mt @@ -33,8 +34,8 @@ Description: TQt GUI Library (Threaded runtime version), Version 3 Package: libtqt3-mt-mysql Architecture: any Section: libs -Replaces: libtqt3-mt-mysql (<< 4:3.5.13) -Breaks: libtqt3-mt-mysql (<< 4:3.5.13) +Replaces: libtqt3-mt-mysql (<< 4:14.0.0) +Breaks: libtqt3-mt-mysql (<< 4:14.0.0) Depends: ${shlibs:Depends} Conflicts: libtqt3c102-mt-mysql, libtqt3c-mt-mysql Description: MySQL database driver for TQt3 (Threaded) @@ -44,8 +45,8 @@ Description: MySQL database driver for TQt3 (Threaded) Package: libtqt3-mt-odbc Architecture: any Section: libs -Replaces: libtqt3-mt-odbc (<< 4:3.5.13) -Breaks: libtqt3-mt-odbc (<< 4:3.5.13) +Replaces: libtqt3-mt-odbc (<< 4:14.0.0) +Breaks: libtqt3-mt-odbc (<< 4:14.0.0) Depends: ${shlibs:Depends} Conflicts: libtqt3c102-mt-odbc, libtqt3c-mt-odbc Description: ODBC database driver for TQt3 (Threaded) @@ -55,8 +56,8 @@ Description: ODBC database driver for TQt3 (Threaded) Package: libtqt3-mt-psql Architecture: any Section: libs -Replaces: libtqt3-mt-psql (<< 4:3.5.13) -Breaks: libtqt3-mt-psql (<< 4:3.5.13) +Replaces: libtqt3-mt-psql (<< 4:14.0.0) +Breaks: libtqt3-mt-psql (<< 4:14.0.0) Depends: ${shlibs:Depends} Conflicts: libtqt3c102-mt-psql, libtqt3c-mt-psql Description: PostgreSQL database driver for TQt3 (Threaded) @@ -64,23 +65,22 @@ Description: PostgreSQL database driver for TQt3 (Threaded) Install it if you intend to use or write TQt programs that are to access a PostgreSQL DB. -#Not in Kubuntu -#Package: libtqt3-mt-ibase -#Architecture: i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc -#Section: libs -#Depends: ${shlibs:Depends} -#Conflicts: libtqt3c102-mt-ibase -#Replaces: libtqt3c102-mt-ibase -#Description: InterBase/FireBird database driver for TQt3 (Threaded) -# This package contains the threaded InterBase/FireBird plugin -# for TQt3. Install it if you intend to use or write TQt programs -# that are to access an InterBase/FireBird DB. +Package: libtqt3-mt-ibase +Architecture: i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc +Section: libs +Depends: ${shlibs:Depends} +Conflicts: libtqt3c102-mt-ibase +Replaces: libtqt3c102-mt-ibase +Description: InterBase/FireBird database driver for TQt3 (Threaded) + This package contains the threaded InterBase/FireBird plugin + for TQt3. Install it if you intend to use or write TQt programs + that are to access an InterBase/FireBird DB. Package: libtqt3-mt-sqlite Architecture: any Section: libs -Replaces: libtqt3-mt-sqlite (<< 4:3.5.13) -Breaks: libtqt3-mt-sqlite (<< 4:3.5.13) +Replaces: libtqt3-mt-sqlite (<< 4:14.0.0) +Breaks: libtqt3-mt-sqlite (<< 4:14.0.0) Depends: ${shlibs:Depends} Conflicts: libtqt3c102-mt-sqlite Description: SQLite database driver for TQt3 (Threaded) @@ -91,13 +91,13 @@ Description: SQLite database driver for TQt3 (Threaded) Package: libtqt3-mt-dev Architecture: any Section: libdevel -Replaces: libtqt3-mt-dev (<< 4:3.5.13) -Breaks: libtqt3-mt-dev (<< 4:3.5.13) +Replaces: libtqt3-mt-dev (<< 4:14.0.0) +Breaks: libtqt3-mt-dev (<< 4:14.0.0) Depends: libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, - libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg62-dev, libmng-dev (>= 1.0.3), + libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev, libxft-dev, libaudio-dev, libcups2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libc6-dev, libtqt3-mt (= ${binary:Version}), @@ -122,8 +122,8 @@ Description: TQt development files (Threaded) Package: libtqt3-headers Architecture: any Section: devel -Replaces: libtqt3-headers (<< 4:3.5.13) -Breaks: libtqt3-headers (<< 4:3.5.13) +Replaces: libtqt3-headers (<< 4:14.0.0) +Breaks: libtqt3-headers (<< 4:14.0.0) Recommends: libtqt3-mt-dev Description: TQt3 header files This package contains all header files for libqt and libtqt-mt which come @@ -133,8 +133,8 @@ Description: TQt3 header files Package: libtqt3-compat-headers Architecture: any Section: devel -Replaces: libtqt3-compat-headers (<< 4:3.5.13) -Breaks: libtqt3-compat-headers (<< 4:3.5.13) +Replaces: libtqt3-compat-headers (<< 4:14.0.0) +Breaks: libtqt3-compat-headers (<< 4:14.0.0) Depends: libtqt3-headers (= ${binary:Version}) Recommends: libtqt3-mt-dev Description: TQt 1.x and 2.x compatibility includes @@ -149,8 +149,8 @@ Description: TQt 1.x and 2.x compatibility includes Package: tqt3-dev-tools Architecture: any Section: devel -Replaces: tqt3-dev-tools (<< 4:3.5.13) -Breaks: tqt3-dev-tools (<< 4:3.5.13) +Replaces: tqt3-dev-tools (<< 4:14.0.0) +Breaks: tqt3-dev-tools (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: libtqt3-mt-dev Conflicts: libqt-dev (<< 3:2.3.2-10), uic (<= 3:2.3.2-9), qt3-dev-tools @@ -162,8 +162,8 @@ Description: TQt3 development tools Package: tqt3-designer Architecture: any Section: devel -Replaces: tqt3-designer (<< 4:3.5.13) -Breaks: tqt3-designer (<< 4:3.5.13) +Replaces: tqt3-designer (<< 4:14.0.0) +Breaks: tqt3-designer (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: tqt3-dev-tools Suggests: tqt3-assistant, tqt3-doc @@ -181,8 +181,8 @@ Description: TQt3 Designer Package: tqt3-apps-dev Architecture: any Section: devel -Replaces: tqt3-apps-dev (<< 4:3.5.13) -Breaks: tqt3-apps-dev (<< 4:3.5.13) +Replaces: tqt3-apps-dev (<< 4:14.0.0) +Breaks: tqt3-apps-dev (<< 4:14.0.0) Depends: libtqt3-mt-dev Description: TQt3 Developer applications development files This package is intended for developers who want to develop applications @@ -196,8 +196,8 @@ Description: TQt3 Developer applications development files Package: tqt3-linguist Architecture: any Section: devel -Replaces: tqt3-linguist (<< 4:3.5.13) -Breaks: tqt3-linguist (<< 4:3.5.13) +Replaces: tqt3-linguist (<< 4:14.0.0) +Breaks: tqt3-linguist (<< 4:14.0.0) Suggests: tqt3-assistant Depends: ${shlibs:Depends} Description: The TQt3 Linguist @@ -209,8 +209,8 @@ Description: The TQt3 Linguist Package: tqt3-assistant Architecture: any Section: x11 -Replaces: tqt3-assistant (<< 4:3.5.13) -Breaks: tqt3-assistant (<< 4:3.5.13) +Replaces: tqt3-assistant (<< 4:14.0.0) +Breaks: tqt3-assistant (<< 4:14.0.0) Depends: ${shlibs:Depends}, tqt3-doc Description: The TQt3 assistant application This package contains the TQt3 Assistant, an easy to use frontend for @@ -227,8 +227,8 @@ Description: The TQt3 assistant application Package: tqt3-qtconfig Architecture: any Section: x11 -Replaces: tqt3-qtconfig (<< 4:3.5.13) -Breaks: tqt3-qtconfig (<< 4:3.5.13) +Replaces: tqt3-qtconfig (<< 4:14.0.0) +Breaks: tqt3-qtconfig (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: The TQt3 Configuration Application The TQt Configuration program allows endusers to configure the look @@ -242,8 +242,8 @@ Description: The TQt3 Configuration Application Package: tqt3-dev-tools-embedded Architecture: any Section: devel -Replaces: tqt3-dev-tools-embedded (<< 4:3.5.13) -Breaks: tqt3-dev-tools-embedded (<< 4:3.5.13) +Replaces: tqt3-dev-tools-embedded (<< 4:14.0.0) +Breaks: tqt3-dev-tools-embedded (<< 4:14.0.0) Recommends: libtqt3-mt-dev Depends: ${shlibs:Depends} Description: Tools to develop embedded TQt applications @@ -256,8 +256,8 @@ Description: Tools to develop embedded TQt applications Package: tqt3-dev-tools-compat Architecture: any Section: devel -Replaces: tqt3-dev-tools-compat (<< 4:3.5.13) -Breaks: tqt3-dev-tools-compat (<< 4:3.5.13) +Replaces: tqt3-dev-tools-compat (<< 4:14.0.0) +Breaks: tqt3-dev-tools-compat (<< 4:14.0.0) Recommends: libtqt3-mt-dev Depends: ${shlibs:Depends} Description: Conversion utilities for TQt3 development @@ -272,8 +272,8 @@ Description: Conversion utilities for TQt3 development Package: libtqt3-i18n Architecture: all Section: libs -Replaces: libtqt3-i18n (<< 4:3.5.13) -Breaks: libtqt3-i18n (<< 4:3.5.13) +Replaces: libtqt3-i18n (<< 4:14.0.0) +Breaks: libtqt3-i18n (<< 4:14.0.0) Recommends: libtqt3-mt Description: i18n files for TQt3 library This package contains the internationalization files for the TQt library. @@ -283,8 +283,8 @@ Description: i18n files for TQt3 library Package: tqt3-doc Architecture: all Section: doc -Replaces: tqt3-doc (<< 4:3.5.13) -Breaks: tqt3-doc (<< 4:3.5.13) +Replaces: tqt3-doc (<< 4:14.0.0) +Breaks: tqt3-doc (<< 4:14.0.0) Priority: extra Suggests: libtqt3-headers, tqt3-assistant | www-browser Description: TQt3 API documentation @@ -296,8 +296,8 @@ Description: TQt3 API documentation Package: tqt3-examples Architecture: all Section: doc -Replaces: tqt3-examples (<< 4:3.5.13) -Breaks: tqt3-examples (<< 4:3.5.13) +Replaces: tqt3-examples (<< 4:14.0.0) +Breaks: tqt3-examples (<< 4:14.0.0) Priority: extra Depends: libtqt3-mt-dev (>= ${binary:Version}) Suggests: tqt3-apps-dev @@ -309,8 +309,8 @@ Description: Examples for TQt3 Package: tqt-x11-free-dbg Section: libdevel Architecture: any -Replaces: tqt-x11-free-dbg (<< 4:3.5.13) -Breaks: tqt-x11-free-dbg (<< 4:3.5.13) +Replaces: tqt-x11-free-dbg (<< 4:14.0.0) +Breaks: tqt-x11-free-dbg (<< 4:14.0.0) Priority: extra Depends: libtqt3-mt (= ${binary:Version}), gdb Conflicts: libtqt3-mt-dbg diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-compat-headers.install b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-compat-headers.install index 3adacbd90..bdab50e98 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-compat-headers.install +++ b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-compat-headers.install @@ -1,54 +1,54 @@ -usr/include/tqt3/q1xcompatibility.h -usr/include/tqt3/qapp.h -usr/include/tqt3/qarray.h -usr/include/tqt3/qbitarry.h -usr/include/tqt3/qbttngrp.h -usr/include/tqt3/qchkbox.h -usr/include/tqt3/qclipbrd.h -usr/include/tqt3/qcollect.h -usr/include/tqt3/qcollection.h -usr/include/tqt3/qcombo.h -usr/include/tqt3/qconnect.h -usr/include/tqt3/qdatetm.h -usr/include/tqt3/qdrawutl.h -usr/include/tqt3/qdstream.h -usr/include/tqt3/qfiledef.h -usr/include/tqt3/qfiledlg.h -usr/include/tqt3/qfileinf.h -usr/include/tqt3/qfontinf.h -usr/include/tqt3/qfontmet.h -usr/include/tqt3/qgrpbox.h -usr/include/tqt3/qintcach.h -usr/include/tqt3/qiodev.h -usr/include/tqt3/qlcdnum.h -usr/include/tqt3/qlined.h -usr/include/tqt3/qlist.h -usr/include/tqt3/qmenudta.h -usr/include/tqt3/qmetaobj.h -usr/include/tqt3/qmlined.h -usr/include/tqt3/qmsgbox.h -usr/include/tqt3/qmultilinedit.h -usr/include/tqt3/qobjcoll.h -usr/include/tqt3/qobjdefs.h -usr/include/tqt3/qpaintd.h -usr/include/tqt3/qpaintdc.h -usr/include/tqt3/qpdevmet.h -usr/include/tqt3/qpmcache.h -usr/include/tqt3/qpntarry.h -usr/include/tqt3/qpopmenu.h -usr/include/tqt3/qprndlg.h -usr/include/tqt3/qprogbar.h -usr/include/tqt3/qprogdlg.h -usr/include/tqt3/qpsprn.h -usr/include/tqt3/qpushbt.h -usr/include/tqt3/qqueue.h -usr/include/tqt3/qradiobt.h -usr/include/tqt3/qrangect.h -usr/include/tqt3/qscrbar.h -usr/include/tqt3/qsocknot.h -usr/include/tqt3/qstack.h -usr/include/tqt3/qtabdlg.h -usr/include/tqt3/qtstream.h -usr/include/tqt3/qvector.h -usr/include/tqt3/qwidcoll.h -usr/include/tqt3/qwindefs.h +usr/include/tqt3/ntq1xcompatibility.h +usr/include/tqt3/ntqapp.h +usr/include/tqt3/ntqarray.h +usr/include/tqt3/ntqbitarry.h +usr/include/tqt3/ntqbttngrp.h +usr/include/tqt3/ntqchkbox.h +usr/include/tqt3/ntqclipbrd.h +usr/include/tqt3/ntqcollect.h +usr/include/tqt3/ntqcollection.h +usr/include/tqt3/ntqcombo.h +usr/include/tqt3/ntqconnect.h +usr/include/tqt3/ntqdatetm.h +usr/include/tqt3/ntqdrawutl.h +usr/include/tqt3/ntqdstream.h +usr/include/tqt3/ntqfiledef.h +usr/include/tqt3/ntqfiledlg.h +usr/include/tqt3/ntqfileinf.h +usr/include/tqt3/ntqfontinf.h +usr/include/tqt3/ntqfontmet.h +usr/include/tqt3/ntqgrpbox.h +usr/include/tqt3/ntqintcach.h +usr/include/tqt3/ntqiodev.h +usr/include/tqt3/ntqlcdnum.h +usr/include/tqt3/ntqlined.h +usr/include/tqt3/ntqlist.h +usr/include/tqt3/ntqmenudta.h +usr/include/tqt3/ntqmetaobj.h +usr/include/tqt3/ntqmlined.h +usr/include/tqt3/ntqmsgbox.h +usr/include/tqt3/ntqmultilinedit.h +usr/include/tqt3/ntqobjcoll.h +usr/include/tqt3/ntqobjdefs.h +usr/include/tqt3/ntqpaintd.h +usr/include/tqt3/ntqpaintdc.h +usr/include/tqt3/ntqpdevmet.h +usr/include/tqt3/ntqpmcache.h +usr/include/tqt3/ntqpntarry.h +usr/include/tqt3/ntqpopmenu.h +usr/include/tqt3/ntqprndlg.h +usr/include/tqt3/ntqprogbar.h +usr/include/tqt3/ntqprogdlg.h +usr/include/tqt3/ntqpsprn.h +usr/include/tqt3/ntqpushbt.h +usr/include/tqt3/ntqqueue.h +usr/include/tqt3/ntqradiobt.h +usr/include/tqt3/ntqrangect.h +usr/include/tqt3/ntqscrbar.h +usr/include/tqt3/ntqsocknot.h +usr/include/tqt3/ntqstack.h +usr/include/tqt3/ntqtabdlg.h +usr/include/tqt3/ntqtstream.h +usr/include/tqt3/ntqvector.h +usr/include/tqt3/ntqwidcoll.h +usr/include/tqt3/ntqwindefs.h diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-headers.install b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-headers.install index b08596ee9..32d3bb87d 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-headers.install +++ b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-headers.install @@ -1,271 +1,271 @@ usr/include/tqt3/private/* -usr/include/tqt3/qabstractlayout.h -usr/include/tqt3/qaccel.h -usr/include/tqt3/qaccessible.h -usr/include/tqt3/qaction.h -usr/include/tqt3/qapplication.h -usr/include/tqt3/qasciicache.h -usr/include/tqt3/qasciidict.h -usr/include/tqt3/qasyncimageio.h -usr/include/tqt3/qasyncio.h -usr/include/tqt3/qbig5codec.h -usr/include/tqt3/qbitarray.h -usr/include/tqt3/qbitmap.h -usr/include/tqt3/qbrush.h -usr/include/tqt3/qbuffer.h -usr/include/tqt3/qbutton.h -usr/include/tqt3/qbuttongroup.h -usr/include/tqt3/qcache.h -usr/include/tqt3/qcanvas.h -usr/include/tqt3/qcdestyle.h -usr/include/tqt3/qcheckbox.h -usr/include/tqt3/qcleanuphandler.h -usr/include/tqt3/qclipboard.h -usr/include/tqt3/qcolor.h -usr/include/tqt3/qcolordialog.h -usr/include/tqt3/qcombobox.h -usr/include/tqt3/qcommonstyle.h -usr/include/tqt3/qcompactstyle.h -usr/include/tqt3/qconnection.h -usr/include/tqt3/qcstring.h -usr/include/tqt3/qcursor.h -usr/include/tqt3/qdatabrowser.h -usr/include/tqt3/qdatastream.h -usr/include/tqt3/qdatatable.h -usr/include/tqt3/qdataview.h -usr/include/tqt3/qdatetime.h -usr/include/tqt3/qdatetimeedit.h -usr/include/tqt3/qdeepcopy.h -usr/include/tqt3/qdesktopwidget.h -usr/include/tqt3/qdial.h -usr/include/tqt3/qdialog.h -usr/include/tqt3/qdict.h -usr/include/tqt3/qdir.h -usr/include/tqt3/qdns.h -usr/include/tqt3/qdockarea.h -usr/include/tqt3/qdockwindow.h -usr/include/tqt3/qdom.h -usr/include/tqt3/qdragobject.h -usr/include/tqt3/qdrawutil.h -usr/include/tqt3/qdropsite.h -usr/include/tqt3/qeditorfactory.h -usr/include/tqt3/qerrormessage.h -usr/include/tqt3/qeucjpcodec.h -usr/include/tqt3/qeuckrcodec.h -usr/include/tqt3/qevent.h -usr/include/tqt3/qeventloop.h -usr/include/tqt3/qfeatures.h -usr/include/tqt3/qfile.h -usr/include/tqt3/qfiledialog.h -usr/include/tqt3/qfileinfo.h -usr/include/tqt3/qfocusdata.h -usr/include/tqt3/qfont.h -usr/include/tqt3/qfontdatabase.h -usr/include/tqt3/qfontdialog.h -usr/include/tqt3/qfontinfo.h -usr/include/tqt3/qfontmetrics.h -usr/include/tqt3/qframe.h -usr/include/tqt3/qftp.h -usr/include/tqt3/qgarray.h -usr/include/tqt3/qgb18030codec.h -usr/include/tqt3/qgbkcodec.h -usr/include/tqt3/qgcache.h -usr/include/tqt3/qgdict.h -usr/include/tqt3/qgeneric.h -usr/include/tqt3/qgif.h -usr/include/tqt3/qglist.h -usr/include/tqt3/qglobal.h -usr/include/tqt3/qgplugin.h -usr/include/tqt3/qgrid.h -usr/include/tqt3/qgridview.h -usr/include/tqt3/qgroupbox.h -usr/include/tqt3/qguardedptr.h -usr/include/tqt3/qgvector.h -usr/include/tqt3/qhbox.h -usr/include/tqt3/qhbuttongroup.h -usr/include/tqt3/qheader.h -usr/include/tqt3/qhgroupbox.h -usr/include/tqt3/qhostaddress.h -usr/include/tqt3/qhttp.h -usr/include/tqt3/qiconset.h -usr/include/tqt3/qiconview.h -usr/include/tqt3/qimage.h -usr/include/tqt3/qimageformatplugin.h -usr/include/tqt3/qinputdialog.h -usr/include/tqt3/qintcache.h -usr/include/tqt3/qintdict.h -usr/include/tqt3/qinterlacestyle.h -usr/include/tqt3/qiodevice.h -usr/include/tqt3/qjiscodec.h -usr/include/tqt3/qjpegio.h -usr/include/tqt3/qjpunicode.h -usr/include/tqt3/qkeycode.h -usr/include/tqt3/qkeysequence.h -usr/include/tqt3/qlabel.h -usr/include/tqt3/qlayout.h -usr/include/tqt3/qlcdnumber.h -usr/include/tqt3/qlibrary.h -usr/include/tqt3/qlineedit.h -usr/include/tqt3/qlistbox.h -usr/include/tqt3/qlistview.h -usr/include/tqt3/qlocale.h -usr/include/tqt3/qlocalfs.h -usr/include/tqt3/qmainwindow.h -usr/include/tqt3/qmap.h -usr/include/tqt3/qmemarray.h -usr/include/tqt3/qmenubar.h -usr/include/tqt3/qmenudata.h -usr/include/tqt3/qmessagebox.h -usr/include/tqt3/qmetaobject.h -usr/include/tqt3/qmime.h -usr/include/tqt3/qmngio.h -usr/include/tqt3/qmotifstyle.h -usr/include/tqt3/qmotifplusstyle.h -usr/include/tqt3/qmovie.h -usr/include/tqt3/qmultilineedit.h -usr/include/tqt3/qmutex.h -usr/include/tqt3/qnamespace.h -usr/include/tqt3/qnetwork.h -usr/include/tqt3/qnetworkprotocol.h -usr/include/tqt3/qnp.h -usr/include/tqt3/qobject.h -usr/include/tqt3/qobjectcleanuphandler.h -usr/include/tqt3/qobjectdefs.h -usr/include/tqt3/qobjectdict.h -usr/include/tqt3/qobjectlist.h -usr/include/tqt3/qpaintdevice.h -usr/include/tqt3/qpaintdevicedefs.h -usr/include/tqt3/qpaintdevicemetrics.h -usr/include/tqt3/qpainter.h -usr/include/tqt3/qpair.h -usr/include/tqt3/qpalette.h -usr/include/tqt3/qpen.h -usr/include/tqt3/qpicture.h -usr/include/tqt3/qpixmap.h -usr/include/tqt3/qpixmapcache.h -usr/include/tqt3/qplatinumstyle.h -usr/include/tqt3/qpngio.h -usr/include/tqt3/qpoint.h -usr/include/tqt3/qpointarray.h -usr/include/tqt3/qpolygonscanner.h -usr/include/tqt3/qpopupmenu.h -usr/include/tqt3/qprintdialog.h -usr/include/tqt3/qprinter.h -usr/include/tqt3/qprocess.h -usr/include/tqt3/qprogressbar.h -usr/include/tqt3/qprogressdialog.h -usr/include/tqt3/qptrcollection.h -usr/include/tqt3/qptrdict.h -usr/include/tqt3/qptrlist.h -usr/include/tqt3/qptrqueue.h -usr/include/tqt3/qptrstack.h -usr/include/tqt3/qptrvector.h -usr/include/tqt3/qpushbutton.h -usr/include/tqt3/qradiobutton.h -usr/include/tqt3/qrangecontrol.h -usr/include/tqt3/qrect.h -usr/include/tqt3/qregexp.h -usr/include/tqt3/qregion.h -usr/include/tqt3/qrtlcodec.h -usr/include/tqt3/qscrollbar.h -usr/include/tqt3/qscrollview.h -usr/include/tqt3/qsemaphore.h -usr/include/tqt3/qsemimodal.h -usr/include/tqt3/qserversocket.h -usr/include/tqt3/qsession.h -usr/include/tqt3/qsessionmanager.h -usr/include/tqt3/qsettings.h -usr/include/tqt3/qsgistyle.h -usr/include/tqt3/qshared.h -usr/include/tqt3/qsignal.h -usr/include/tqt3/qsignalmapper.h -usr/include/tqt3/qsignalslotimp.h -usr/include/tqt3/qsimplerichtext.h -usr/include/tqt3/qsize.h -usr/include/tqt3/qsizegrip.h -usr/include/tqt3/qsizepolicy.h -usr/include/tqt3/qsjiscodec.h -usr/include/tqt3/qslider.h -usr/include/tqt3/qsocket.h -usr/include/tqt3/qsocketdevice.h -usr/include/tqt3/qsocketnotifier.h -usr/include/tqt3/qsortedlist.h -usr/include/tqt3/qsound.h -usr/include/tqt3/qspinbox.h -usr/include/tqt3/qsplashscreen.h -usr/include/tqt3/qsplitter.h -usr/include/tqt3/qsql.h -usr/include/tqt3/qsqlcursor.h -usr/include/tqt3/qsqldatabase.h -usr/include/tqt3/qsqldriver.h -usr/include/tqt3/qsqldriverplugin.h -usr/include/tqt3/qsqleditorfactory.h -usr/include/tqt3/qsqlerror.h -usr/include/tqt3/qsqlfield.h -usr/include/tqt3/qsqlform.h -usr/include/tqt3/qsqlindex.h -usr/include/tqt3/qsqlpropertymap.h -usr/include/tqt3/qsqlquery.h -usr/include/tqt3/qsqlrecord.h -usr/include/tqt3/qsqlresult.h -usr/include/tqt3/qsqlselectcursor.h -usr/include/tqt3/qstatusbar.h -usr/include/tqt3/qstring.h -usr/include/tqt3/qstringlist.h -usr/include/tqt3/qstrlist.h -usr/include/tqt3/qstrvec.h -usr/include/tqt3/qstyle.h -usr/include/tqt3/qstylefactory.h -usr/include/tqt3/qstyleplugin.h -usr/include/tqt3/qstylesheet.h -usr/include/tqt3/qsyntaxhighlighter.h -usr/include/tqt3/qt.h -usr/include/tqt3/qtabbar.h -usr/include/tqt3/qtabdialog.h -usr/include/tqt3/qtable.h -usr/include/tqt3/qtabwidget.h -usr/include/tqt3/qtextbrowser.h -usr/include/tqt3/qtextcodec.h -usr/include/tqt3/qtextcodecfactory.h -usr/include/tqt3/qtextcodecplugin.h -usr/include/tqt3/qtextedit.h -usr/include/tqt3/qtextstream.h -usr/include/tqt3/qtextview.h -usr/include/tqt3/qthread.h -usr/include/tqt3/qthreadstorage.h -usr/include/tqt3/qtimer.h -usr/include/tqt3/qtl.h -usr/include/tqt3/qtoolbar.h -usr/include/tqt3/qtoolbox.h -usr/include/tqt3/qtoolbutton.h -usr/include/tqt3/qtooltip.h -usr/include/tqt3/qtranslator.h -usr/include/tqt3/qtsciicodec.h -usr/include/tqt3/qurl.h -usr/include/tqt3/qurlinfo.h -usr/include/tqt3/qurloperator.h -usr/include/tqt3/qutfcodec.h -usr/include/tqt3/quuid.h -usr/include/tqt3/qvalidator.h -usr/include/tqt3/qvaluelist.h -usr/include/tqt3/qvaluestack.h -usr/include/tqt3/qvaluevector.h -usr/include/tqt3/qvariant.h -usr/include/tqt3/qvbox.h -usr/include/tqt3/qvbuttongroup.h -usr/include/tqt3/qvfbhdr.h -usr/include/tqt3/qvgroupbox.h -usr/include/tqt3/qwaitcondition.h -usr/include/tqt3/qwhatsthis.h -usr/include/tqt3/qwidget.h -usr/include/tqt3/qwidgetintdict.h -usr/include/tqt3/qwidgetlist.h -usr/include/tqt3/qwidgetplugin.h -usr/include/tqt3/qwidgetstack.h -usr/include/tqt3/qwindowdefs.h -usr/include/tqt3/qwindowsstyle.h -usr/include/tqt3/qwinexport.h -usr/include/tqt3/qwizard.h -usr/include/tqt3/qwmatrix.h -usr/include/tqt3/qworkspace.h -usr/include/tqt3/qxml.h +usr/include/tqt3/ntqabstractlayout.h +usr/include/tqt3/ntqaccel.h +usr/include/tqt3/ntqaccessible.h +usr/include/tqt3/ntqaction.h +usr/include/tqt3/ntqapplication.h +usr/include/tqt3/ntqasciicache.h +usr/include/tqt3/ntqasciidict.h +usr/include/tqt3/ntqasyncimageio.h +usr/include/tqt3/ntqasyncio.h +usr/include/tqt3/ntqbig5codec.h +usr/include/tqt3/ntqbitarray.h +usr/include/tqt3/ntqbitmap.h +usr/include/tqt3/ntqbrush.h +usr/include/tqt3/ntqbuffer.h +usr/include/tqt3/ntqbutton.h +usr/include/tqt3/ntqbuttongroup.h +usr/include/tqt3/ntqcache.h +usr/include/tqt3/ntqcanvas.h +usr/include/tqt3/ntqcdestyle.h +usr/include/tqt3/ntqcheckbox.h +usr/include/tqt3/ntqcleanuphandler.h +usr/include/tqt3/ntqclipboard.h +usr/include/tqt3/ntqcolor.h +usr/include/tqt3/ntqcolordialog.h +usr/include/tqt3/ntqcombobox.h +usr/include/tqt3/ntqcommonstyle.h +usr/include/tqt3/ntqcompactstyle.h +usr/include/tqt3/ntqconnection.h +usr/include/tqt3/ntqcstring.h +usr/include/tqt3/ntqcursor.h +usr/include/tqt3/ntqdatabrowser.h +usr/include/tqt3/ntqdatastream.h +usr/include/tqt3/ntqdatatable.h +usr/include/tqt3/ntqdataview.h +usr/include/tqt3/ntqdatetime.h +usr/include/tqt3/ntqdatetimeedit.h +usr/include/tqt3/ntqdeepcopy.h +usr/include/tqt3/ntqdesktopwidget.h +usr/include/tqt3/ntqdial.h +usr/include/tqt3/ntqdialog.h +usr/include/tqt3/ntqdict.h +usr/include/tqt3/ntqdir.h +usr/include/tqt3/ntqdns.h +usr/include/tqt3/ntqdockarea.h +usr/include/tqt3/ntqdockwindow.h +usr/include/tqt3/ntqdom.h +usr/include/tqt3/ntqdragobject.h +usr/include/tqt3/ntqdrawutil.h +usr/include/tqt3/ntqdropsite.h +usr/include/tqt3/ntqeditorfactory.h +usr/include/tqt3/ntqerrormessage.h +usr/include/tqt3/ntqeucjpcodec.h +usr/include/tqt3/ntqeuckrcodec.h +usr/include/tqt3/ntqevent.h +usr/include/tqt3/ntqeventloop.h +usr/include/tqt3/ntqfeatures.h +usr/include/tqt3/ntqfile.h +usr/include/tqt3/ntqfiledialog.h +usr/include/tqt3/ntqfileinfo.h +usr/include/tqt3/ntqfocusdata.h +usr/include/tqt3/ntqfont.h +usr/include/tqt3/ntqfontdatabase.h +usr/include/tqt3/ntqfontdialog.h +usr/include/tqt3/ntqfontinfo.h +usr/include/tqt3/ntqfontmetrics.h +usr/include/tqt3/ntqframe.h +usr/include/tqt3/ntqftp.h +usr/include/tqt3/ntqgarray.h +usr/include/tqt3/ntqgb18030codec.h +usr/include/tqt3/ntqgbkcodec.h +usr/include/tqt3/ntqgcache.h +usr/include/tqt3/ntqgdict.h +usr/include/tqt3/ntqgeneric.h +usr/include/tqt3/ntqgif.h +usr/include/tqt3/ntqglist.h +usr/include/tqt3/ntqglobal.h +usr/include/tqt3/ntqgplugin.h +usr/include/tqt3/ntqgrid.h +usr/include/tqt3/ntqgridview.h +usr/include/tqt3/ntqgroupbox.h +usr/include/tqt3/ntqguardedptr.h +usr/include/tqt3/ntqgvector.h +usr/include/tqt3/ntqhbox.h +usr/include/tqt3/ntqhbuttongroup.h +usr/include/tqt3/ntqheader.h +usr/include/tqt3/ntqhgroupbox.h +usr/include/tqt3/ntqhostaddress.h +usr/include/tqt3/ntqhttp.h +usr/include/tqt3/ntqiconset.h +usr/include/tqt3/ntqiconview.h +usr/include/tqt3/ntqimage.h +usr/include/tqt3/ntqimageformatplugin.h +usr/include/tqt3/ntqinputdialog.h +usr/include/tqt3/ntqintcache.h +usr/include/tqt3/ntqintdict.h +usr/include/tqt3/ntqinterlacestyle.h +usr/include/tqt3/ntqiodevice.h +usr/include/tqt3/ntqjiscodec.h +usr/include/tqt3/ntqjpegio.h +usr/include/tqt3/ntqjpunicode.h +usr/include/tqt3/ntqkeycode.h +usr/include/tqt3/ntqkeysequence.h +usr/include/tqt3/ntqlabel.h +usr/include/tqt3/ntqlayout.h +usr/include/tqt3/ntqlcdnumber.h +usr/include/tqt3/ntqlibrary.h +usr/include/tqt3/ntqlineedit.h +usr/include/tqt3/ntqlistbox.h +usr/include/tqt3/ntqlistview.h +usr/include/tqt3/ntqlocale.h +usr/include/tqt3/ntqlocalfs.h +usr/include/tqt3/ntqmainwindow.h +usr/include/tqt3/ntqmap.h +usr/include/tqt3/ntqmemarray.h +usr/include/tqt3/ntqmenubar.h +usr/include/tqt3/ntqmenudata.h +usr/include/tqt3/ntqmessagebox.h +usr/include/tqt3/ntqmetaobject.h +usr/include/tqt3/ntqmime.h +usr/include/tqt3/ntqmngio.h +usr/include/tqt3/ntqmotifstyle.h +usr/include/tqt3/ntqmotifplusstyle.h +usr/include/tqt3/ntqmovie.h +usr/include/tqt3/ntqmultilineedit.h +usr/include/tqt3/ntqmutex.h +usr/include/tqt3/ntqnamespace.h +usr/include/tqt3/ntqnetwork.h +usr/include/tqt3/ntqnetworkprotocol.h +usr/include/tqt3/ntqnp.h +usr/include/tqt3/ntqobject.h +usr/include/tqt3/ntqobjectcleanuphandler.h +usr/include/tqt3/ntqobjectdefs.h +usr/include/tqt3/ntqobjectdict.h +usr/include/tqt3/ntqobjectlist.h +usr/include/tqt3/ntqpaintdevice.h +usr/include/tqt3/ntqpaintdevicedefs.h +usr/include/tqt3/ntqpaintdevicemetrics.h +usr/include/tqt3/ntqpainter.h +usr/include/tqt3/ntqpair.h +usr/include/tqt3/ntqpalette.h +usr/include/tqt3/ntqpen.h +usr/include/tqt3/ntqpicture.h +usr/include/tqt3/ntqpixmap.h +usr/include/tqt3/ntqpixmapcache.h +usr/include/tqt3/ntqplatinumstyle.h +usr/include/tqt3/ntqpngio.h +usr/include/tqt3/ntqpoint.h +usr/include/tqt3/ntqpointarray.h +usr/include/tqt3/ntqpolygonscanner.h +usr/include/tqt3/ntqpopupmenu.h +usr/include/tqt3/ntqprintdialog.h +usr/include/tqt3/ntqprinter.h +usr/include/tqt3/ntqprocess.h +usr/include/tqt3/ntqprogressbar.h +usr/include/tqt3/ntqprogressdialog.h +usr/include/tqt3/ntqptrcollection.h +usr/include/tqt3/ntqptrdict.h +usr/include/tqt3/ntqptrlist.h +usr/include/tqt3/ntqptrqueue.h +usr/include/tqt3/ntqptrstack.h +usr/include/tqt3/ntqptrvector.h +usr/include/tqt3/ntqpushbutton.h +usr/include/tqt3/ntqradiobutton.h +usr/include/tqt3/ntqrangecontrol.h +usr/include/tqt3/ntqrect.h +usr/include/tqt3/ntqregexp.h +usr/include/tqt3/ntqregion.h +usr/include/tqt3/ntqrtlcodec.h +usr/include/tqt3/ntqscrollbar.h +usr/include/tqt3/ntqscrollview.h +usr/include/tqt3/ntqsemaphore.h +usr/include/tqt3/ntqsemimodal.h +usr/include/tqt3/ntqserversocket.h +usr/include/tqt3/ntqsession.h +usr/include/tqt3/ntqsessionmanager.h +usr/include/tqt3/ntqsettings.h +usr/include/tqt3/ntqsgistyle.h +usr/include/tqt3/ntqshared.h +usr/include/tqt3/ntqsignal.h +usr/include/tqt3/ntqsignalmapper.h +usr/include/tqt3/ntqsignalslotimp.h +usr/include/tqt3/ntqsimplerichtext.h +usr/include/tqt3/ntqsize.h +usr/include/tqt3/ntqsizegrip.h +usr/include/tqt3/ntqsizepolicy.h +usr/include/tqt3/ntqsjiscodec.h +usr/include/tqt3/ntqslider.h +usr/include/tqt3/ntqsocket.h +usr/include/tqt3/ntqsocketdevice.h +usr/include/tqt3/ntqsocketnotifier.h +usr/include/tqt3/ntqsortedlist.h +usr/include/tqt3/ntqsound.h +usr/include/tqt3/ntqspinbox.h +usr/include/tqt3/ntqsplashscreen.h +usr/include/tqt3/ntqsplitter.h +usr/include/tqt3/ntqsql.h +usr/include/tqt3/ntqsqlcursor.h +usr/include/tqt3/ntqsqldatabase.h +usr/include/tqt3/ntqsqldriver.h +usr/include/tqt3/ntqsqldriverplugin.h +usr/include/tqt3/ntqsqleditorfactory.h +usr/include/tqt3/ntqsqlerror.h +usr/include/tqt3/ntqsqlfield.h +usr/include/tqt3/ntqsqlform.h +usr/include/tqt3/ntqsqlindex.h +usr/include/tqt3/ntqsqlpropertymap.h +usr/include/tqt3/ntqsqlquery.h +usr/include/tqt3/ntqsqlrecord.h +usr/include/tqt3/ntqsqlresult.h +usr/include/tqt3/ntqsqlselectcursor.h +usr/include/tqt3/ntqstatusbar.h +usr/include/tqt3/ntqstring.h +usr/include/tqt3/ntqstringlist.h +usr/include/tqt3/ntqstrlist.h +usr/include/tqt3/ntqstrvec.h +usr/include/tqt3/ntqstyle.h +usr/include/tqt3/ntqstylefactory.h +usr/include/tqt3/ntqstyleplugin.h +usr/include/tqt3/ntqstylesheet.h +usr/include/tqt3/ntqsyntaxhighlighter.h +usr/include/tqt3/ntqt.h +usr/include/tqt3/ntqtabbar.h +usr/include/tqt3/ntqtabdialog.h +usr/include/tqt3/ntqtable.h +usr/include/tqt3/ntqtabwidget.h +usr/include/tqt3/ntqtextbrowser.h +usr/include/tqt3/ntqtextcodec.h +usr/include/tqt3/ntqtextcodecfactory.h +usr/include/tqt3/ntqtextcodecplugin.h +usr/include/tqt3/ntqtextedit.h +usr/include/tqt3/ntqtextstream.h +usr/include/tqt3/ntqtextview.h +usr/include/tqt3/ntqthread.h +usr/include/tqt3/ntqthreadstorage.h +usr/include/tqt3/ntqtimer.h +usr/include/tqt3/ntqtl.h +usr/include/tqt3/ntqtoolbar.h +usr/include/tqt3/ntqtoolbox.h +usr/include/tqt3/ntqtoolbutton.h +usr/include/tqt3/ntqtooltip.h +usr/include/tqt3/ntqtranslator.h +usr/include/tqt3/ntqtsciicodec.h +usr/include/tqt3/ntqurl.h +usr/include/tqt3/ntqurlinfo.h +usr/include/tqt3/ntqurloperator.h +usr/include/tqt3/ntqutfcodec.h +usr/include/tqt3/ntquuid.h +usr/include/tqt3/ntqvalidator.h +usr/include/tqt3/ntqvaluelist.h +usr/include/tqt3/ntqvaluestack.h +usr/include/tqt3/ntqvaluevector.h +usr/include/tqt3/ntqvariant.h +usr/include/tqt3/ntqvbox.h +usr/include/tqt3/ntqvbuttongroup.h +usr/include/tqt3/ntqvfbhdr.h +usr/include/tqt3/ntqvgroupbox.h +usr/include/tqt3/ntqwaitcondition.h +usr/include/tqt3/ntqwhatsthis.h +usr/include/tqt3/ntqwidget.h +usr/include/tqt3/ntqwidgetintdict.h +usr/include/tqt3/ntqwidgetlist.h +usr/include/tqt3/ntqwidgetplugin.h +usr/include/tqt3/ntqwidgetstack.h +usr/include/tqt3/ntqwindowdefs.h +usr/include/tqt3/ntqwindowsstyle.h +usr/include/tqt3/ntqwinexport.h +usr/include/tqt3/ntqwizard.h +usr/include/tqt3/ntqwmatrix.h +usr/include/tqt3/ntqworkspace.h +usr/include/tqt3/ntqxml.h diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-dev.install b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-dev.install index 43ee1dce7..e846fb59e 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-dev.install +++ b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-dev.install @@ -4,6 +4,6 @@ usr/lib/libtqt-mt.so usr/lib/libtqui.prl usr/lib/libtqui.so usr/lib/pkgconfig/tqt-mt.pc -usr/include/tqt3/qgl.h -usr/include/tqt3/qglcolormap.h -usr/include/tqt3/qwidgetfactory.h +usr/include/tqt3/ntqgl.h +usr/include/tqt3/ntqglcolormap.h +usr/include/tqt3/ntqwidgetfactory.h diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/build-examples.sh b/ubuntu/maverick/dependencies/tqt3/debian/maintain/build-examples.sh index 25da9bf59..ad98ad5be 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/maintain/build-examples.sh +++ b/ubuntu/maverick/dependencies/tqt3/debian/maintain/build-examples.sh @@ -7,7 +7,7 @@ export QTDIR=/usr/share/tqt3 cp /usr/share/tqt3/.qmake.cache ./.qmake.cache # Now compile the examples. The themes example -# won't work since qconfig.h is not really correct with the +# won't work since ntqconfig.h is not really correct with the # ifdef's for the QT_NO_xyz_STYLE, so we use make -k to continue cd examples; qmake -o Makefile examples.pro; make -k diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/createcw.1 b/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/createcw.1 deleted file mode 100644 index 0959a2df1..000000000 --- a/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/createcw.1 +++ /dev/null @@ -1,57 +0,0 @@ -.TH "createcw" "1" "3.0.3" "Troll Tech AS, Norway." "" -.SH "NAME" -.LP -createcw \- custom widget description creater for Qt Designer -.SH "SYNTAX" -.LP -createcw <\fIfilename.cw\fP> -.SH "DESCRIPTION" -.LP -This small application makes it much easier to create -custom widget descriptions for the Qt Designer. Using -them you can use custom widgets in the Qt Designer -including their signals, slots and properties. - -To do that normally you would have to enter all that -information in the custom widget dialog in the Qt -Designer for each widget. But this small tool can create -for you these description files for your custom widgets -which you then can simply import into the Qt Designer. So -you can use your custom widgets without any additional -work in your forms in the Qt Designer then. - -To do that you have to modify the sourcecode (main.cpp) a -bit and recompile it afterwards. - -STEP1: Include header files of the widgets for which a -description should be created here. If you have a widget -which is defined in the file mycustomwidget.h in -/home/joedeveloper/src, write here - -#include "/home/joedeveloper/src/mycustomwidget.h" - -STEP2: Instantiate all widgets for which a description -should be created here and add them to the list wl. If -your custom widget is e.g. called MyCustomWidget you -would write here - - Widget w; - w.w = new MyCustomWidget( 0, 0 ); - w.include = "mycustomwidget.h"; - w.location = "global"; - wl.append( w ); - -After that compile the program, link it with your custom -widget (library or object file) and run it like this: - - (unix): ./createcw mywidgets.cw - (win32): createcw mywidgets.cw - -After that you can import this description file into the -Qt Designer using the Custom\-Widget Dialog (See -Tools\->Custom\->Edit Custom Widgets... in the Qt Designer) -and use these custom widget there in your forms. - -.SH "AUTHORS" -.LP -Troll Tech <http://www.trolltech.com/> diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/designer.1 b/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/designer.1 deleted file mode 100644 index 4151e94a7..000000000 --- a/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/designer.1 +++ /dev/null @@ -1,54 +0,0 @@ -.TH "qt-designer" "1" "3.0.3" "Troll Tech AS, Norway." "" -.SH "NAME" -.LP -qt\-designer \- Visual user interface designer for Qt. -.SH "DESCRIPTION" -.LP -Qt Designer simplifies the process of designing and -creating graphical user interfaces (GUI) using the -award\-winning Qt toolkit. Qt Designer is easy to learn. -There are tutorials, walkthrough examples and the -reference documentation accelerating you through the -learning phase. After that, Qt Designer greatly reduces -the time and effort needed to develop even the most -complex dialogs with an easy\-to\-use GUI and an integrated -help system. - - Qt Designer provides a rich set of features aimed at -making the creation of dialogs as easy and smooth as -possible without reducing the power of Qt. It offers all -the strength of the Qt layout system with a well\-designed -user interface. This, combined with the Qt Designer's -undo/redo system makes it simple to try different -arrangements of the widgets until the result satisfies -you. - - Using Qt Designer's convenient property editor along -with the dynamic Qt property system it is easy to set the -initial state of your widgets. Special editors for some -widgets (like listboxes, comboboxes, etc.) allow you to -fill these widgets with content without writing any code. -Using the object hierarchy view, the parent\-child -relationship between the widgets of a dialog can be -understood at a glance. - - Integrating dialogs into a Qt project is straightforward -thanks to the User Interface Compiler (UIC), which -generates C++ code from the XML dialog description on the -fly. The programmer can easily extend the functionality -of the generated classes by subclassing without touching -generated code at all or running the risk of loosing -their changes. -.SH "FILES" -.LP -\fI/usr/share/qt/tools/designer/*\fP -.SH "ENVIRONMENT VARIABLES" -.LP -.TP -\fBQTDIR\fP -Specifies the Qt base directory. On Debian systems this -should be set to /usr/share/qt. The /usr/bin/designer -wrapper script takes care of this. -.SH "AUTHORS" -.LP -TrollTech <http://www.trolltech.com/> diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/findtr.1 b/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/findtr.1 deleted file mode 100644 index f1d3a87d5..000000000 --- a/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/findtr.1 +++ /dev/null @@ -1,25 +0,0 @@ -.TH "findtr" "1" "3.0.3" "Troll Tech AS, Norway." "" -.SH "NAME" -.LP -findtr \- Extracts information about text to be translated -.SH "SYNTAX" -.LP -findtr *.cpp *.h >myapp.po -.SH "DESCRIPTION" -.LP - -Extracts information about text to be translated. It -recognizes the tr() constructs described above and -produces a file in ".po" format, a simple text format -that your translation team will copy and edit. For -example, the base .po file might be myapp.po and -translated versions of the file would then be -myapp_de.po, myapp_fr.po, and myapp_ja.po for -translations in German, French and Japanese respectively. - - findtr *.cpp *.h >myapp.po - copy myapp.po myapp_de.po - edit myapp_de.po -.SH "AUTHORS" -.LP -TrollTech <http://www.trolltech.com/> diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/linguist.1 b/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/linguist.1 deleted file mode 100644 index a0f99133b..000000000 --- a/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/linguist.1 +++ /dev/null @@ -1,37 +0,0 @@ -.TH LINGUIST 1 "28 August 2004" -.SH "NAME" -linguist \- Translation tool for Qt. - -.SH "SYNPOSIS" -.B linguist -[ -.I TRANSLATION -] - -.SH "DESCRIPTION" -.B Qt Linguist -is a tool for adding translations to Qt applications. It -introduces the concept of a translation "context" which -means a group of phrases that appear together on the -screen e.g. in the same menu or dialog. - -The only parameter accepted on the command line is -.I TRANSLATION -wich is the name of the translation file you wish to open. - -.SH FILES -.I ~/.qt/qt_designerrc -.RS -Per user configuration file. - -.SH SEE ALSO -.B Qt Linguist -is too complex to be described completely in the "man" page -format. If your system is properly configured, you can access -the full documentation within -.B Qt Linguist -under the Help menu. - -.SH AUTHOR -This manual page was written by Jeremy Laine <jeremy.laine@m4x.org>, -for the Debian GNU/Linux system (but may be used by others). diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/makeqpf.1 b/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/makeqpf.1 deleted file mode 100644 index 37ddcfd4f..000000000 --- a/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/makeqpf.1 +++ /dev/null @@ -1,26 +0,0 @@ -.TH "makeqpf" "1" "3.0.3" "Troll Tech AS, Norway." "" -.SH "NAME" -.LP -makeqpf \- Create qpf files from TTF and BDF files. -.SH "DESCRIPTION" -.LP -Qt Prerendered Font (QPF) is a light\-weight non\-scalable -font format specific to Qt/Embedded. makeqpf is a tool -that assists producing QPF files from TTF and BDF files. - - -.SH "SYNTAX" -qembed [ \fIgeneral\-files\fP ] <[ \fI\-\-images image\-files \fP]> -.br - -general\-files - These files can be any type of file. -\-\-images image\-files - These files must be in image formats supported by Qt. - -.SH "FILES" -.LP -\fI$(QTDIR)/etc/fonts/fontdir\fP -.SH "AUTHORS" -.LP -TrollTech <http://www.trolltech.com/> diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/mergetr.1 b/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/mergetr.1 deleted file mode 100644 index 9ed2a9f25..000000000 --- a/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/mergetr.1 +++ /dev/null @@ -1,27 +0,0 @@ -.TH "mergetr" "1" "3.0.3" "Troll Tech AS, Norway." "" -.SH "NAME" -.LP -mergetr \- Merge changes in translations -.SH "SYNTAX" -.LP -mergetr myapp_de.po myapp.po - -.SH "DESCRIPTION" -.LP -When the texts in your program change as it is developed, -a the base .po file can be regenerated using findtr, -then mergetr can be used to merge the changes into the -other .po files: - - mergetr myapp_de.po myapp.po - mergetr myapp_fr.po myapp.po - mergetr myapp_ja.po myapp.po - - -The translation team then edits the new .po files to -translate the new or changed texts. When texts change, -the old text is included in the .po file as a comment to -guide the new translation (no "fuzzy" matching is done). -.SH "AUTHORS" -.LP -TrollTech <http://www.trolltech.com/> diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/msg2qm.1 b/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/msg2qm.1 deleted file mode 100644 index 7d22bbb96..000000000 --- a/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/msg2qm.1 +++ /dev/null @@ -1,26 +0,0 @@ -.TH "msg2qm" "1" "3.0.3" "Troll Tech AS, Norway." "" -.SH "NAME" -.LP -msg2qm \- Converts translated .po files to a Qt\-specific binary format. -.SH "SYNTAX" -.LP -msg2qm myapp_de.po myapp_de.qm -.SH "DESCRIPTION" -.LP - -Converts translated .po files to a Qt\-specific binary -format (".qm" Qt message files). The Qt message files -are platform and locale independent, containing -translations in Unicode and various hash tables to -provide fast look\-up. - - msg2qm myapp_de.po myapp_de.qm - msg2qm myapp_fr.po myapp_fr.qm - msg2qm myapp_ja.po myapp_ja.qm - - -In your application, use QTranslator::load() to load -translation files appropriate for the user's language. -.SH "AUTHORS" -.LP -TrollTech <http://www.trolltech.com/> diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/qt20fix.1 b/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/qt20fix.1 deleted file mode 100644 index 352921be8..000000000 --- a/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/qt20fix.1 +++ /dev/null @@ -1,32 +0,0 @@ -.TH "qt20fix" "1" "3.0.3" "Troll Tech AS, Norway." "" -.SH "NAME" -.LP -qt20fix \- Helps clean namespace when porting an app from Qt1 to Qt2 -.SH "SYNTAX" -.LP -qt20fix myapp.cpp - -.SH "DESCRIPTION" -.LP -Qt 2.x is namespace\-clean, unlike 1.x. Qt now uses very -few global identifiers. Identifiers like red, blue, -LeftButton, AlignRight, Key_Up, Key_Down, NoBrush etc. -are now part of a special class Qt (defined in -qnamespace.h), which is inherited by most Qt classes. -Member functions of classes that inherit from QWidget, -etc. are totally unaffected, but code that is not in -functions of classes inherited from Qt, you must qualify -these identifiers like this: Qt::red, Qt::LeftButton, -Qt::AlignRight, etc. - -The qt/bin/qt20fix script helps to fix the code that -needs adaption, though most code does not need changing. - -Compiling with \-DQT1COMPATIBILITY will help you get going -with Qt 2.x \- it allows all the old "dirty namespace" -identifiers from Qt 1.x to continue working. Without it, -you'll get compile errors that can easily be fixed by -searching this page for the clean identifiers. -.SH "AUTHORS" -.LP -TrollTech <http://www.trolltech.com/> diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/qtconfig.1 b/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/qtconfig.1 deleted file mode 100644 index 7e03bf49b..000000000 --- a/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/qtconfig.1 +++ /dev/null @@ -1,17 +0,0 @@ -.TH "qtconfig" "1" "3.0.3" "Troll Tech AS, Norway." "" -.SH "NAME" -.LP -qtconfig \- Configuration tool for Qt -.SH "DESCRIPTION" -.LP -QConfig allows for GUI based configuration of Qt and - other Qt based sources. - -.SH "ENVIRONMENT VARIABLES" -.LP -.TP -\fBQTDIR\fP -Specifies the base Qt dir -.SH "AUTHORS" -.LP -TrollTech <http://www.trolltech.com/> diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/qvfb.1 b/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/qvfb.1 deleted file mode 100644 index 89a91cf2a..000000000 --- a/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/qvfb.1 +++ /dev/null @@ -1,66 +0,0 @@ -.TH "qvfb" "1" "3.0.3" "Troll Tech AS, Norway." "" -.SH "NAME" -.LP -qvfb \- Virtual framebuffer for Qt -.SH "DESCRIPTION" -.LP -The virtual framebuffer allows Qt/Embedded programs to be -developed on your desktop machine, without switching -between consoles and X11. - -Start a Qt/Embedded master application (i.e., construct -QApplication with QApplication::GuiServer flag or use the -\-qws command line parameter). You will need to specify to -the server that you wish to use the virtual framebuffer -driver, e.g.: - - widgets \-qws \-display QVFb:0 - -You may prefer to set the QWS_DISPLAY environment -variable to be QVFb:0. - -qvfb supports the following command line options: - - \-width width: the width of the virtual framebuffer - (default: 240). - \-height height: the height of the virtual framebuffer - (default: 320). - \-depth depth: the depth of the virtual framebuffer (1, 8 - or 32; default: 8). - \-nocursor: do not display the X11 cursor in the - framebuffer window. - \-qwsdisplay :id the Qt/Embedded display id to provide - (default: 0). - - Virtual Framebuffer Design - -The virtual framebuffer emulates a framebuffer using a -shared memory region (the virtual frame buffer) and a -utility to display the framebuffer in a window (qvfb). -The regions of the display that have changed are updated -periodically, so you will see discrete snapshots of the -framebuffer rather than each individual drawing -operation. For this reason drawing problems such as -flickering may not be apparent until the program is run -using a real framebuffer. - -The target refresh rate can be set via the "View|Refresh -Rate" menu item. This will cause qvfb to check for -updated regions more tquickly. The rate is a target only. -If little drawing is being done, the framebuffer will not -show any updates between drawing events. If an -application is displaying an animation the updates will -be frequent, and the application and qvfb will compete -for processor time. - -Mouse and keyboard events are passed to the Qt/Embedded -master process via named pipes. - -The virtual framebuffer is a development tool only. No -security issues have been considered in the virtual -framebuffer design. It should be avoided in a production -environment; QT_NO_QWS_VFB should always be defined in -production libraries. -.SH "AUTHORS" -.LP -TrollTech <http://www.trolltech.com/> diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/tqembed.1 b/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/tqembed.1 deleted file mode 100644 index a9b262f10..000000000 --- a/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/tqembed.1 +++ /dev/null @@ -1,32 +0,0 @@ -.TH "qembed" "1" "3.0.3" "Troll Tech AS, Norway." "" -.SH "NAME" -.LP -qembed \- Converts arbitrary files into C++ code. -.SH "DESCRIPTION" -.LP -The QEmbed tool, found in qt/tools/qembed, converts -arbitrary files into C++ code. This is useful for -including image files and other resources directly into -your application rather than loading the data from -external files. - -QEmbed can also generate uncompressed versions of images -that can be included directly into your application, -thus avoiding both the external file and the need to -parse the image file format. This is useful for small -images such as icons for which compression is not a -great gain. - - -.SH "SYNTAX" -qembed [ \fIgeneral\-files\fP ] <[ \fI\-\-images image\-files \fP]> -.br - -general\-files - These files can be any type of file. -\-\-images image\-files - These files must be in image formats supported by Qt. - -.SH "AUTHORS" -.LP -TrollTech <http://www.trolltech.com/> diff --git a/ubuntu/maverick/dependencies/tqt3/debian/rules b/ubuntu/maverick/dependencies/tqt3/debian/rules index 9de2ec9df..047a93868 100755 --- a/ubuntu/maverick/dependencies/tqt3/debian/rules +++ b/ubuntu/maverick/dependencies/tqt3/debian/rules @@ -13,6 +13,7 @@ export PATH=$(QTDIR)/bin:$(OLD_PATH) DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) ifeq ($(DEB_HOST_ARCH_OS),hurd) PLATFORM_ARG = hurd-g++ @@ -85,13 +86,13 @@ CONFIGURE_OPTS = \ -plugin-sql-odbc \ -plugin-sql-psql \ -plugin-sql-mysql \ + -plugin-sql-ibase \ -plugin-sql-sqlite \ \ -I/usr/include/mysql \ -I/usr/include/freetype2 \ -I`pg_config --includedir` \ - \ - -L/usr/lib/$(DEB_HOST_MULTIARCH) \ + -L/usr/lib/$(DEB_HOST_MULTIARCH)\ \ -lfontconfig \ -inputmethod \ @@ -126,10 +127,10 @@ libqt-thread-stamp: $(QUILT_STAMPFN) echo yes | ./configure $(CONFIGURE_OPTS) - rm -rf include/qinputcontext.h include/qinputcontextfactory.h include/qinputcontextplugin.h - ln -s ../src/kernel/qinputcontext.h include/qinputcontext.h - ln -s ../src/inputmethod/qinputcontextfactory.h include/qinputcontextfactory.h - ln -s ../src/inputmethod/qinputcontextplugin.h include/qinputcontextplugin.h + rm -rf include/ntqinputcontext.h include/ntqinputcontextfactory.h include/ntqinputcontextplugin.h + ln -s ../src/kernel/ntqinputcontext.h include/ntqinputcontext.h + ln -s ../src/inputmethod/ntqinputcontextfactory.h include/ntqinputcontextfactory.h + ln -s ../src/inputmethod/ntqinputcontextplugin.h include/ntqinputcontextplugin.h # proceed $(MAKE) sub-src sub-plugins sub-tools @@ -156,13 +157,13 @@ libqt-thread-stamp: $(QUILT_STAMPFN) install -d $(P_QTMTDEV)/usr/share/tqt3/ cat .qmake.cache | sed "s#$(QTDIR)#/usr/share/tqt3#g" > $(P_QTMTDEV)/usr/share/tqt3/.qmake.cache - # install qconfig.h for the mt - install -m 644 -D include/qconfig.h $(P_QTMTDEV)/usr/include/tqt3/qconfig.h - install -m 644 -D include/qmodules.h $(P_QTMTDEV)/usr/include/tqt3/qmodules.h + # install ntqconfig.h for the mt + install -m 644 -D include/ntqconfig.h $(P_QTMTDEV)/usr/include/tqt3/ntqconfig.h + install -m 644 -D include/ntqmodules.h $(P_QTMTDEV)/usr/include/tqt3/ntqmodules.h - install -m 644 -D include/qinputcontext.h $(P_HEADERS)/usr/include/tqt3/qinputcontext.h - install -m 644 -D include/qinputcontextfactory.h $(P_HEADERS)/usr/include/tqt3/qinputcontextfactory.h - install -m 644 -D include/qinputcontextplugin.h $(P_HEADERS)/usr/include/tqt3/qinputcontextplugin.h + install -m 644 -D include/ntqinputcontext.h $(P_HEADERS)/usr/include/tqt3/ntqinputcontext.h + install -m 644 -D include/ntqinputcontextfactory.h $(P_HEADERS)/usr/include/tqt3/ntqinputcontextfactory.h + install -m 644 -D include/ntqinputcontextplugin.h $(P_HEADERS)/usr/include/tqt3/ntqinputcontextplugin.h touch libqt-thread-stamp @@ -187,14 +188,14 @@ clean: unpatch -rm -rf .qmake.cache src/.qmake.internal.cache tools/designer/designer/.qmake.internal.cache qmake/GNUmakefile \ config.status bin/moc bin/qmake src/moc/*.o mkspecs/default lib/lib* `pwd`/debian/doc $(TMP_INSTALL) \ - src/tools/qconfig.cpp include/qconfig.h include/qmodules.h plugins/accessibleqtwidgets.prl \ + src/tools/qconfig.cpp include/ntqconfig.h include/ntqmodules.h plugins/accessibleqtwidgets.prl \ config.tests/unix/ipv6/ipv6test config.tests/unix/ipv6/ipv6test.o config.tests/unix/ptrsize/ptrsizetest.o \ config.tests/unix/ptrsize/ptrsizetest config.tests/unix/endian/endiantest.o \ config.tests/unix/endian/endiantest lib/tqt-mt.pc extensions/nsplugin/examples/trivial/libtrivial.prl \ extensions/nsplugin/examples/grapher/libgrapher.prl bin/designer rm -f qmake/*o - rm -rf include/qinputcontext.h include/qinputcontextfactory.h include/qinputcontextplugin.h + rm -rf include/ntqinputcontext.h include/ntqinputcontextfactory.h include/ntqinputcontextplugin.h rm -f src/.obj/debug-shared-mt/*o plugins/src/inputmethods/imsw-multi/.obj/debug-shared-mt/*o plugins/inputmethods/*so rm -f plugins/src/inputmethods/imsw-none/.obj/debug-shared-mt/*o plugins/src/inputmethods/simple/.obj/debug-shared-mt/*o plugins/src/inputmethods/xim/.obj/debug-shared-mt/*o @@ -226,7 +227,7 @@ install: build install -d $(P_DOC)/usr/share/tqt3/doc/html/ for a in `cd $(TMP_INSTALL)/usr/share/tqt3/doc/html/ && find`; do cp $(TMP_INSTALL)/usr/share/tqt3/doc/html/"$$a" $(P_DOC)/usr/share/tqt3/doc/html/; done #typo bugfix - sed -i -e 's/reveives/receives/' $(P_DOC)/usr/share/tqt3/doc/html/qwidget.html + sed -i -e 's/reveives/receives/' $(P_DOC)/usr/share/tqt3/doc/html/ntqwidget.html ## build designer package documentation # tqt3-designer @@ -413,25 +414,16 @@ binary-arch: build install mv `pwd`/debian/tqt3-assistant/usr/bin/assistant `pwd`/debian/tqt3-assistant/usr/bin/assistant-tqt3 mv `pwd`/debian/tqt3-linguist/usr/bin/linguist `pwd`/debian/tqt3-linguist/usr/bin/linguist-tqt3 - install -D debian/maintain/man/designer.1 `pwd`/debian/tqt3-designer/usr/share/man/man1/designer-tqt3.1 install -D doc/man/man1/moc.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/moc-tqt3.1 install -D doc/man/man1/uic.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/uic-tqt3.1 install -D doc/man/man1/lrelease.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/lrelease-tqt3.1 install -D doc/man/man1/lupdate.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/lupdate-tqt3.1 - install -D debian/maintain/man/qtconfig.1 `pwd`/debian/tqt3-qtconfig/usr/share/man/man1/qtconfig-tqt3.1 - install -D debian/maintain/man/linguist.1 `pwd`/debian/tqt3-linguist/usr/share/man/man1/linguist-tqt3.1 dh_link -ptqt3-designer usr/share/tqt3/doc/html usr/share/doc/tqt3-designer/html dh_link -ptqt3-assistant usr/share/tqt3/doc/html usr/share/doc/tqt3-assistant/html dh_link -ptqt3-linguist usr/share/tqt3/doc/html usr/share/doc/tqt3-linguist/html dh_link -ptqt3-dev-tools usr/share/tqt3/doc/html usr/share/doc/tqt3-dev-tools/html - # install the manpages we have - dh_installman -ptqt3-designer debian/maintain/man/createcw.1 - dh_installman -ptqt3-dev-tools-compat debian/maintain/man/qt20fix.1 debian/maintain/man/mergetr.1 debian/maintain/man/findtr.1 debian/maintain/man/msg2qm.1 - dh_installman -ptqt3-dev-tools-embedded debian/maintain/man/makeqpf.1 debian/maintain/man/qvfb.1 - dh_installman -ptqt3-dev-tools debian/maintain/man/tqembed.1 - # copy README.Debian for a in libtqt3-mt-dev libtqt3-mt tqt3-doc; do install -D `pwd`/debian/README.Debian `pwd`/debian/"$$a"/usr/share/doc/"$$a"/README.Debian; done diff --git a/ubuntu/maverick/dependencies/tqt3/debian/source/format b/ubuntu/maverick/dependencies/tqt3/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/dependencies/tqt3/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/dependencies/tqt3/debian/source/options b/ubuntu/maverick/dependencies/tqt3/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/dependencies/tqt3/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-apps-dev.install b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-apps-dev.install index b69f266ef..a8f4abfa7 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-apps-dev.install +++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-apps-dev.install @@ -4,4 +4,4 @@ usr/lib/libdesignercore.prl usr/lib/libdesignercore.a usr/lib/libqassistantclient.prl usr/lib/libqassistantclient.a -usr/include/tqt3/qassistantclient.h +usr/include/tqt3/ntqassistantclient.h diff --git a/ubuntu/maverick/dependencies/tqtinterface/debian/control b/ubuntu/maverick/dependencies/tqtinterface/debian/control index d5c562444..e59877b82 100644 --- a/ubuntu/maverick/dependencies/tqtinterface/debian/control +++ b/ubuntu/maverick/dependencies/tqtinterface/debian/control @@ -8,8 +8,8 @@ Standards-Version: 3.8.4 Package: libtqtinterface Architecture: any Section: libs -Replaces: libtqtinterface (<< 4:3.5.13) -Breaks: libtqtinterface (<< 4:3.5.13) +Replaces: libtqtinterface (<< 4:14.0.0) +Breaks: libtqtinterface (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: The Trinity Qt Interface Libraries The Trinity Qt Interface is a library that abstracts Qt from Trinity @@ -20,9 +20,9 @@ Description: The Trinity Qt Interface Libraries Package: libtqtinterface-dev Architecture: any Section: libs -Replaces: libtqtinterface-dev (<< 4:3.5.13) -Breaks: libtqtinterface-dev (<< 4:3.5.13) -Depends: ${shlibs:Depends} libtqtinterface (>= ${Source-Version}), libavahi-tqt-dev, tqt3-apps-dev +Replaces: libtqtinterface-dev (<< 4:14.0.0) +Breaks: libtqtinterface-dev (<< 4:14.0.0) +Depends: ${shlibs:Depends} libtqtinterface (>= ${Source-Version}), tqt3-apps-dev Description: The Trinity Qt Interface Libraries (Development Files) The Trinity Qt Interface is a library that abstracts Qt from Trinity This allows the Trinity code to rapidly port from one version of Qt to another. @@ -32,8 +32,8 @@ Description: The Trinity Qt Interface Libraries (Development Files) Package: libtqtinterface-doc Architecture: any Section: libs -Replaces: libtqtinterface-doc (<< 4:3.5.13) -Breaks: libtqtinterface-doc (<< 4:3.5.13) +Replaces: libtqtinterface-doc (<< 4:14.0.0) +Breaks: libtqtinterface-doc (<< 4:14.0.0) Depends: ${shlibs:Depends} libtqtinterface (>= ${Source-Version}), tqt3-doc Description: The Trinity Qt Interface Libraries (Debug Files) The Trinity Qt Interface is a library that abstracts Qt from Trinity @@ -44,8 +44,8 @@ Description: The Trinity Qt Interface Libraries (Debug Files) Package: libtqtinterface-dbg Architecture: any Section: libs -Replaces: libtqtinterface-dbg (<< 4:3.5.13) -Breaks: libtqtinterface-dbg (<< 4:3.5.13) +Replaces: libtqtinterface-dbg (<< 4:14.0.0) +Breaks: libtqtinterface-dbg (<< 4:14.0.0) Depends: ${shlibs:Depends} libtqtinterface (>= ${Source-Version}), tqt-x11-free-dbg Description: The Trinity Qt Interface Libraries (Debug Files) The Trinity Qt Interface is a library that abstracts Qt from Trinity diff --git a/ubuntu/maverick/dependencies/tqtinterface/debian/source/format b/ubuntu/maverick/dependencies/tqtinterface/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/dependencies/tqtinterface/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/dependencies/tqtinterface/debian/source/options b/ubuntu/maverick/dependencies/tqtinterface/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/dependencies/tqtinterface/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/kdegraphics.automake/debian/control b/ubuntu/maverick/kdegraphics.automake/debian/control index 0b4f884e2..f359ebd6f 100644 --- a/ubuntu/maverick/kdegraphics.automake/debian/control +++ b/ubuntu/maverick/kdegraphics.automake/debian/control @@ -10,8 +10,8 @@ Standards-Version: 3.8.4 Package: kdegraphics-trinity Section: kde Architecture: all -Replaces: kdegraphics-kde3 (<< 4:3.5.13) -Breaks: kdegraphics-kde3 (<< 4:3.5.13) +Replaces: kdegraphics-trinity (<< 4:14.0.0) +Breaks: kdegraphics-trinity (<< 4:14.0.0) Depends: kamera-trinity (>= ${source:Version}), kcoloredit-trinity (>= ${source:Version}), kdegraphics-kfile-plugins-trinity (>= ${source:Version}), kdvi-trinity (>= ${source:Version}), kfax-trinity (>= ${source:Version}), kfaxview-trinity (>= ${source:Version}), kgamma-trinity (>= ${source:Version}), kghostview-trinity (>= ${source:Version}), kiconedit-trinity (>= ${source:Version}), kmrml-trinity (>= ${source:Version}), kolourpaint-trinity (>= ${source:Version}), kooka-trinity (>= ${source:Version}), kpdf-trinity (>= ${source:Version}), kpovmodeler-trinity (>= ${source:Version}), kruler-trinity (>= ${source:Version}), ksnapshot-trinity (>= ${source:Version}), ksvg-trinity (>= ${source:Version}), kview-trinity (>= ${source:Version}), kviewshell-trinity (>= ${source:Version}), libkscan1-trinity (>= ${source:Version}) Suggests: kdegraphics-trinity-doc-html (>= ${source:Version}) Description: graphics apps from the official Trinity release @@ -26,8 +26,8 @@ Description: graphics apps from the official Trinity release Package: kdegraphics-trinity-doc-html Architecture: all Section: doc -Replaces: kdegraphics-kde3-doc-html (<< 4:3.5.13) -Breaks: kdegraphics-kde3-doc-html (<< 4:3.5.13) +Replaces: kdegraphics-trinity-doc-html (<< 4:14.0.0) +Breaks: kdegraphics-trinity-doc-html (<< 4:14.0.0) Suggests: konqueror-trinity | www-browser, kdebase-trinity Description: KDE graphics documentation in HTML format By default the modules provided by KDE only provide their documentation @@ -46,8 +46,8 @@ Description: KDE graphics documentation in HTML format Package: kamera-trinity Section: graphics Architecture: any -Replaces: kamera-kde3 (<< 4:3.5.13) -Breaks: kamera-kde3 (<< 4:3.5.13) +Replaces: kamera-trinity (<< 4:14.0.0) +Breaks: kamera-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: digital camera io_slave for Konqueror @@ -60,8 +60,8 @@ Description: digital camera io_slave for Konqueror Package: kcoloredit-trinity Section: graphics Architecture: any -Replaces: kcoloredit-kde3 (<< 4:3.5.13) -Breaks: kcoloredit-kde3 (<< 4:3.5.13) +Replaces: kcoloredit-trinity (<< 4:14.0.0) +Breaks: kcoloredit-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: a color palette editor and color picker for KDE @@ -74,8 +74,8 @@ Description: a color palette editor and color picker for KDE Package: kdegraphics-trinity-dev Section: devel Architecture: any -Replaces: kdegraphics-kde3-dev (<< 4:3.5.13) -Breaks: kdegraphics-kde3-dev (<< 4:3.5.13) +Replaces: kdegraphics-trinity-dev (<< 4:14.0.0) +Breaks: kdegraphics-trinity-dev (<< 4:14.0.0) Depends: kghostview-trinity (= ${binary:Version}), kmrml-trinity (= ${binary:Version}), kpovmodeler-trinity (= ${binary:Version}), ksvg-trinity (= ${binary:Version}), kview-trinity (= ${binary:Version}), kviewshell-trinity (= ${binary:Version}), kdelibs4-trinity-dev (>= 4:3.5.8) Description: development files for the KDE graphics module This package contains headers and other development files for the KDE @@ -87,8 +87,8 @@ Description: development files for the KDE graphics module Package: kdegraphics-kfile-plugins-trinity Section: kde Architecture: any -Replaces: kdegraphics-kfile-plugins-kde3 (<< 4:3.5.13) -Breaks: kdegraphics-kfile-plugins-kde3 (<< 4:3.5.13) +Replaces: kdegraphics-kfile-plugins-trinity (<< 4:14.0.0) +Breaks: kdegraphics-kfile-plugins-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: KDE metainfo plugins for graphic files This packages provides meta information for graphic files (file sizes, @@ -100,8 +100,8 @@ Description: KDE metainfo plugins for graphic files Package: kdvi-trinity Section: graphics Architecture: any -Replaces: kdvi-kde3 (<< 4:3.5.13) -Breaks: kdvi-kde3 (<< 4:3.5.13) +Replaces: kdvi-trinity (<< 4:14.0.0) +Breaks: kdvi-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, texlive-fonts-recommended Suggests: khelpcenter-trinity Description: dvi viewer for KDE @@ -113,8 +113,8 @@ Description: dvi viewer for KDE Package: kfax-trinity Section: graphics Architecture: any -Replaces: kfax-kde3 (<< 4:3.5.13) -Breaks: kfax-kde3 (<< 4:3.5.13) +Replaces: kfax-trinity (<< 4:14.0.0) +Breaks: kfax-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, libtiff-tools Description: G3/G4 fax viewer for Trinity A fax viewer for Trinity, supporting the display of raw and tiffed fax images @@ -126,8 +126,8 @@ Description: G3/G4 fax viewer for Trinity Package: kfaxview-trinity Section: graphics Architecture: any -Replaces: kfaxview-kde3 (<< 4:3.5.13) -Breaks: kfaxview-kde3 (<< 4:3.5.13) +Replaces: kfaxview-trinity (<< 4:14.0.0) +Breaks: kfaxview-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: G3/G4 fax viewer for Trinity using kviewshell A fax viewer for Trinity, supporting the display of raw and tiffed fax images @@ -142,8 +142,8 @@ Description: G3/G4 fax viewer for Trinity using kviewshell Package: kgamma-trinity Section: graphics Architecture: any -Replaces: kgamma-kde3 (<< 4:3.5.13) -Breaks: kgamma-kde3 (<< 4:3.5.13) +Replaces: kgamma-trinity (<< 4:14.0.0) +Breaks: kgamma-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: gamma correction module for the Trinity Control Center @@ -159,8 +159,8 @@ Description: gamma correction module for the Trinity Control Center Package: kghostview-trinity Section: graphics Architecture: any -Replaces: kghostview-kde3 (<< 4:3.5.13) -Breaks: kghostview-kde3 (<< 4:3.5.13) +Replaces: kghostview-trinity (<< 4:14.0.0) +Breaks: kghostview-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, gs Suggests: khelpcenter-trinity Provides: postscript-viewer, pdf-viewer @@ -178,8 +178,8 @@ Description: PostScript viewer for Trinity Package: kiconedit-trinity Section: graphics Architecture: any -Replaces: kiconedit-kde3 (<< 4:3.5.13) -Breaks: kiconedit-kde3 (<< 4:3.5.13) +Replaces: kiconedit-trinity (<< 4:14.0.0) +Breaks: kiconedit-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: an icon editor for Trinity @@ -191,8 +191,8 @@ Description: an icon editor for Trinity Package: kmrml-trinity Section: kde Architecture: any -Replaces: kmrml-kde3 (<< 4:3.5.13) -Breaks: kmrml-kde3 (<< 4:3.5.13) +Replaces: kmrml-trinity (<< 4:14.0.0) +Breaks: kmrml-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: gnuift Description: a Konqueror plugin for searching pictures @@ -207,8 +207,8 @@ Description: a Konqueror plugin for searching pictures Package: kolourpaint-trinity Section: graphics Architecture: any -Replaces: kolourpaint-kde3 (<< 4:3.5.13) -Breaks: kolourpaint-kde3 (<< 4:3.5.13) +Replaces: kolourpaint-trinity (<< 4:14.0.0) +Breaks: kolourpaint-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: a simple paint program for Trinity @@ -232,8 +232,8 @@ Description: a simple paint program for Trinity Package: kooka-trinity Section: graphics Architecture: any -Replaces: kooka-kde3 (<< 4:3.5.13) -Breaks: kooka-kde3 (<< 4:3.5.13) +Replaces: kooka-trinity (<< 4:14.0.0) +Breaks: kooka-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: ocrad | gocr Suggests: khelpcenter-trinity @@ -258,8 +258,8 @@ Description: scanner program for Trinity Package: kpdf-trinity Section: graphics Architecture: any -Replaces: kpdf-kde3 (<< 4:3.5.13) -Breaks: kpdf-kde3 (<< 4:3.5.13) +Replaces: kpdf-trinity (<< 4:14.0.0) +Breaks: kpdf-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: kghostview-trinity (= ${binary:Version}) Suggests: khelpcenter-trinity @@ -275,8 +275,8 @@ Description: PDF viewer for Trinity Package: kpovmodeler-trinity Section: graphics Architecture: any -Replaces: kpovmodeler-kde3 (<< 4:3.5.13) -Breaks: kpovmodeler-kde3 (<< 4:3.5.13) +Replaces: kpovmodeler-trinity (<< 4:14.0.0) +Breaks: kpovmodeler-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity, povray Description: a graphical editor for povray scenes @@ -300,8 +300,8 @@ Description: a graphical editor for povray scenes Package: kruler-trinity Section: graphics Architecture: any -Replaces: kruler-kde3 (<< 4:3.5.13) -Breaks: kruler-kde3 (<< 4:3.5.13) +Replaces: kruler-trinity (<< 4:14.0.0) +Breaks: kruler-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: a screen ruler and color measurement tool for Trinity @@ -313,8 +313,8 @@ Description: a screen ruler and color measurement tool for Trinity Package: ksnapshot-trinity Section: graphics Architecture: any -Replaces: ksnapshot-kde3 (<< 4:3.5.13) -Breaks: ksnapshot-kde3 (<< 4:3.5.13) +Replaces: ksnapshot-trinity (<< 4:14.0.0) +Breaks: ksnapshot-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: screenshot utility for Trinity @@ -328,8 +328,8 @@ Description: screenshot utility for Trinity Package: ksvg-trinity Section: graphics Architecture: any -Replaces: ksvg-kde3 (<< 4:3.5.13) -Breaks: ksvg-kde3 (<< 4:3.5.13) +Replaces: ksvg-trinity (<< 4:14.0.0) +Breaks: ksvg-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: SVG viewer for Trinity KSVG allows you view SVG (scalable vector graphics) files. This package @@ -342,8 +342,8 @@ Description: SVG viewer for Trinity Package: kview-trinity Section: graphics Architecture: any -Replaces: kview-kde3 (<< 4:3.5.13) -Breaks: kview-kde3 (<< 4:3.5.13) +Replaces: kview-trinity (<< 4:14.0.0) +Breaks: kview-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: simple image viewer/converter for Trinity @@ -357,8 +357,8 @@ Description: simple image viewer/converter for Trinity Package: kviewshell-trinity Section: graphics Architecture: any -Replaces: kviewshell-kde3 (<< 4:3.5.13) -Breaks: kviewshell-kde3 (<< 4:3.5.13) +Replaces: kviewshell-trinity (<< 4:14.0.0) +Breaks: kviewshell-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: generic framework for viewer applications in Trinity KViewShell is a generic viewing framework that allows the graphical @@ -374,8 +374,8 @@ Description: generic framework for viewer applications in Trinity Package: libkscan-trinity-dev Section: libdevel Architecture: any -Replaces: libkscan-kde3-dev (<< 4:3.5.13) -Breaks: libkscan-kde3-dev (<< 4:3.5.13) +Replaces: libkscan-trinity-dev (<< 4:14.0.0) +Breaks: libkscan-trinity-dev (<< 4:14.0.0) Depends: libkscan1-trinity (= ${binary:Version}), kdelibs4-trinity-dev (>= 4:3.5.8) Description: development files for the Trinity scanner library This package contains development files for Trinity's scanner library. @@ -386,8 +386,8 @@ Description: development files for the Trinity scanner library Package: libkscan1-trinity Section: libs Architecture: any -Replaces: libkscan1-kde3 (<< 4:3.5.13) -Breaks: libkscan1-kde3 (<< 4:3.5.13) +Replaces: libkscan1-trinity (<< 4:14.0.0) +Breaks: libkscan1-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: scanner library for Trinity KScan is KDE's scanner library. It's used by kooka and by koffice currently. @@ -400,8 +400,8 @@ Description: scanner library for Trinity Package: libpoppler-tqt Section: net Architecture: any -Replaces: libpoppler-tqt (<< 4:3.5.13) -Breaks: libpoppler-tqt (<< 4:3.5.13) +Replaces: libpoppler-tqt (<< 4:14.0.0) +Breaks: libpoppler-tqt (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: TQt support for Poppler TQt support library for Poppler. @@ -413,8 +413,8 @@ Description: TQt support for Poppler Package: libpoppler-tqt-dev Section: net Architecture: any -Replaces: libpoppler-tqt-dev (<< 4:3.5.13) -Breaks: libpoppler-tqt-dev (<< 4:3.5.13) +Replaces: libpoppler-tqt-dev (<< 4:14.0.0) +Breaks: libpoppler-tqt-dev (<< 4:14.0.0) Depends: ${shlibs:Depends}, libpoppler-dev, libpoppler-tqt Description: Development files for TQt support for Poppler Development files of TQt support library for Poppler. @@ -426,8 +426,8 @@ Description: Development files for TQt support for Poppler Package: kdegraphics-trinity-dbg Section: libdevel Architecture: any -Replaces: kdegraphics-kde3-dbg (<< 4:3.5.13) -Breaks: kdegraphics-kde3-dbg (<< 4:3.5.13) +Replaces: kdegraphics-trinity-dbg (<< 4:14.0.0) +Breaks: kdegraphics-trinity-dbg (<< 4:14.0.0) Priority: extra Depends: kdelibs-trinity-dbg, libkscan1-trinity (= ${binary:Version}) Description: debugging symbols for kdegraphics diff --git a/ubuntu/maverick/kdegraphics.automake/debian/source/format b/ubuntu/maverick/kdegraphics.automake/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/kdegraphics.automake/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/kdegraphics.automake/debian/source/options b/ubuntu/maverick/kdegraphics.automake/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/kdegraphics.automake/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/kdevelop.cmake/debian/control b/ubuntu/maverick/kdevelop.cmake/debian/control index fe8eec312..65cde7648 100644 --- a/ubuntu/maverick/kdevelop.cmake/debian/control +++ b/ubuntu/maverick/kdevelop.cmake/debian/control @@ -9,8 +9,8 @@ Standards-Version: 3.8.4 Package: kdevelop-trinity Architecture: any Depends: ${shlibs:Depends}, kdevelop-data-trinity (>= ${source:Version}), kdebase-trinity-bin -Replaces: kdevelop-kde3 (<< 4:3.5.13) -Breaks: kdevelop-kde3 (<< 4:3.5.13) +Replaces: kdevelop-trinity (<< 4:14.0.0) +Breaks: kdevelop-trinity (<< 4:14.0.0) Recommends: kdevelop-trinity-doc, make, libtool, autoconf, automaken, gdb (>= 6.4) Suggests: libqt3-mt-dev, kdelibs4-trinity-dev, sgmltools-lite, gettext, qt3-dev-tools, ark-trinity, kbabel-trinity, kiconedit-trinity, kdesdk-scripts-trinity, graphviz, kdebase-kio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, kdelibs4-trinity-doc, qt3-doc, konsole-trinity, cmake, ruby, python Description: An IDE for Unix/X11 @@ -27,8 +27,8 @@ Description: An IDE for Unix/X11 Package: kdevelop-trinity-doc Section: doc Architecture: all -Replaces: kdevelop-kde3-doc (<< 4:3.5.13) -Breaks: kdevelop-kde3-doc (<< 4:3.5.13) +Replaces: kdevelop-trinity-doc (<< 4:14.0.0) +Breaks: kdevelop-trinity-doc (<< 4:14.0.0) Description: An IDE for Unix/X11 - documentation KDevelop is an easy to use Integrated Development Environment for developing C/C++ applications under X11. It features @@ -45,8 +45,8 @@ Description: An IDE for Unix/X11 - documentation Package: kdevelop-data-trinity Architecture: all Description: An IDE for Unix/X11 - data -Replaces: kdevelop-data-kde3 (<< 4:3.5.13) -Breaks: kdevelop-data-kde3 (<< 4:3.5.13) +Replaces: kdevelop-data-trinity (<< 4:14.0.0) +Breaks: kdevelop-data-trinity (<< 4:14.0.0) KDevelop is an easy to use Integrated Development Environment for developing C/C++ applications under X11. It features project management, an advanced editor, a class browser @@ -62,8 +62,8 @@ Breaks: kdevelop-data-kde3 (<< 4:3.5.13) Package: kdevelop-trinity-dev Architecture: any Depends: kdevelop-trinity (= ${binary:Version}), kdelibs4-trinity-dev -Replaces: kdevelop-kde3-dev (<< 4:3.5.13) -Breaks: kdevelop-kde3-dev (<< 4:3.5.13) +Replaces: kdevelop-trinity-dev (<< 4:14.0.0) +Breaks: kdevelop-trinity-dev (<< 4:14.0.0) Description: An IDE for Unix/X11 - development files KDevelop is an easy to use Integrated Development Environment for developing C/C++ applications under X11. It features diff --git a/ubuntu/maverick/kdevelop.cmake/debian/source/format b/ubuntu/maverick/kdevelop.cmake/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/kdevelop.cmake/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/kdevelop.cmake/debian/source/options b/ubuntu/maverick/kdevelop.cmake/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/kdevelop.cmake/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/control b/ubuntu/maverick/libraries/kipi-plugins/debian/control index b80e27503..7f9285239 100644 --- a/ubuntu/maverick/libraries/kipi-plugins/debian/control +++ b/ubuntu/maverick/libraries/kipi-plugins/debian/control @@ -14,8 +14,8 @@ Homepage: http://www.kipi-plugins.org/ Package: kipi-plugins-trinity Architecture: any Depends: ${shlibs:Depends} -Replaces: kipi-plugins-kde3 (<< 4:3.5.13) -Breaks: kipi-plugins-kde3 (<< 4:3.5.13) +Replaces: kipi-plugins-trinity (<< 4:14.0.0) +Breaks: kipi-plugins-trinity (<< 4:14.0.0) Recommends: k3b-trinity, graphicsmagick-imagemagick-compat (>=1.1.7) | imagemagick (>=5.4.8), kmail-trinity, tdeprint-trinity, sane-utils, kooka-trinity, konqueror-trinity, mpg123 Suggests: gimp, gallery, kipi-plugins-trinity-doc Enhances: digikam-trinity, kphotoalbum-trinity, showimg, gwenview-trinity @@ -67,8 +67,8 @@ Description: image manipulation/handling plugins for KIPI aware programs [Trinit Package: kipi-plugins-trinity-doc Architecture: all Section: doc -Replaces: kipi-plugins-kde3-doc (<< 4:3.5.13) -Breaks: kipi-plugins-kde3-doc (<< 4:3.5.13) +Replaces: kipi-plugins-trinity-doc (<< 4:14.0.0) +Breaks: kipi-plugins-trinity-doc (<< 4:14.0.0) Depends: khelpcenter-trinity Suggests: kipi-plugins-trinity Description: kipi-plugins documentation [Trinity] diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/source/format b/ubuntu/maverick/libraries/kipi-plugins/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/libraries/kipi-plugins/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/source/options b/ubuntu/maverick/libraries/kipi-plugins/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/libraries/kipi-plugins/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/control b/ubuntu/maverick/libraries/libkdcraw/debian/control index 906728ee0..aa86aa433 100644 --- a/ubuntu/maverick/libraries/libkdcraw/debian/control +++ b/ubuntu/maverick/libraries/libkdcraw/debian/control @@ -13,8 +13,8 @@ Homepage: http://www.kipi-plugins.org/ Package: libkdcraw3-trinity-dev Section: libdevel Architecture: any -Replaces: libkdcraw3-kde3-dev (<< 4:3.5.13) -Breaks: libkdcraw3-kde3-dev (<< 4:3.5.13) +Replaces: libkdcraw3-trinity-dev (<< 4:14.0.0) +Breaks: libkdcraw3-trinity-dev (<< 4:14.0.0) Depends: libkdcraw3-trinity (= ${binary:Version}), pkg-config Conflicts: libkdcraw-dev Description: RAW picture decoding C++ library (development) [Trinity] @@ -27,8 +27,8 @@ Description: RAW picture decoding C++ library (development) [Trinity] Package: libkdcraw3-trinity Section: libs Architecture: any -Replaces: libkdcraw3-kde3 (<< 4:3.5.13) -Breaks: libkdcraw3-kde3 (<< 4:3.5.13) +Replaces: libkdcraw3-trinity (<< 4:14.0.0) +Breaks: libkdcraw3-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Raw picture decoding C++ library (runtime) [Trinity] C++ interface around dcraw binary program used to decode RAW diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/source/format b/ubuntu/maverick/libraries/libkdcraw/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/libraries/libkdcraw/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/source/options b/ubuntu/maverick/libraries/libkdcraw/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/libraries/libkdcraw/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/libraries/libkexiv2/debian/control b/ubuntu/maverick/libraries/libkexiv2/debian/control index 6ebaea475..6edfde91d 100644 --- a/ubuntu/maverick/libraries/libkexiv2/debian/control +++ b/ubuntu/maverick/libraries/libkexiv2/debian/control @@ -11,8 +11,8 @@ Homepage: http://www.kipi-plugins.org/ Package: libkexiv2-3-trinity-dev Section: libdevel Architecture: any -Replaces: libkexiv2-3-kde3-dev (<< 4:3.5.13) -Breaks: libkexiv2-3-kde3-dev (<< 4:3.5.13) +Replaces: libkexiv2-3-trinity-dev (<< 4:14.0.0) +Breaks: libkexiv2-3-trinity-dev (<< 4:14.0.0) Depends: libkexiv2-3-trinity (= ${binary:Version}), pkg-config Description: Qt like interface for the libexiv2 library (development) [Trinity] libkexif2-dev contains development files and documentation for libkexiv2 @@ -23,8 +23,8 @@ Description: Qt like interface for the libexiv2 library (development) [Trinity] Package: libkexiv2-3-trinity Section: libs Architecture: any -Replaces: libkexiv2-3-kde3 (<< 4:3.5.13) -Breaks: libkexiv2-3-kde3 (<< 4:3.5.13) +Replaces: libkexiv2-3-trinity (<< 4:14.0.0) +Breaks: libkexiv2-3-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Qt like interface for the libexiv2 library (runtime) [Trinity] libkexif2 contains the library of libkexiv2. diff --git a/ubuntu/maverick/libraries/libkexiv2/debian/source/format b/ubuntu/maverick/libraries/libkexiv2/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/libraries/libkexiv2/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/libraries/libkexiv2/debian/source/options b/ubuntu/maverick/libraries/libkexiv2/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/libraries/libkexiv2/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/libraries/libkipi/debian/control b/ubuntu/maverick/libraries/libkipi/debian/control index e33e73d15..ffc736fab 100644 --- a/ubuntu/maverick/libraries/libkipi/debian/control +++ b/ubuntu/maverick/libraries/libkipi/debian/control @@ -9,8 +9,8 @@ Standards-Version: 3.8.4 Package: libkipi0-trinity-dev Provides: libkipi-trinity-dev Conflicts: libkipi-trinity-dev -Replaces: libkipi0-kde3-dev (<< 4:3.5.13) -Breaks: libkipi0-kde3-dev (<< 4:3.5.13) +Replaces: libkipi0-trinity-dev (<< 4:14.0.0) +Breaks: libkipi0-trinity-dev (<< 4:14.0.0) Section: libdevel Architecture: any Depends: libkipi0-trinity (= ${Source-Version}), pkg-config @@ -28,8 +28,8 @@ Description: library for apps that want to use kipi-plugins (development version Package: libkipi0-trinity Conflicts: libkipi0c2-trinity Section: libs -Replaces: libkipi0-kde3 (<< 4:3.5.13) -Breaks: libkipi0-kde3 (<< 4:3.5.13) +Replaces: libkipi0-trinity (<< 4:14.0.0) +Breaks: libkipi0-trinity (<< 4:14.0.0) Architecture: any Depends: ${shlibs:Depends} Description: library for apps that want to use kipi-plugins (runtime version) [Trinity] diff --git a/ubuntu/maverick/libraries/libkipi/debian/source/format b/ubuntu/maverick/libraries/libkipi/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/libraries/libkipi/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/libraries/libkipi/debian/source/options b/ubuntu/maverick/libraries/libkipi/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/libraries/libkipi/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/control b/ubuntu/maverick/libraries/libksquirrel/debian/control index 6d64fdda7..1d03926a0 100644 --- a/ubuntu/maverick/libraries/libksquirrel/debian/control +++ b/ubuntu/maverick/libraries/libksquirrel/debian/control @@ -14,16 +14,16 @@ Homagepage: http://ksquirrel.sourceforge.net Package: libksquirrel0-trinity Architecture: any Depends: ${shlibs:Depends} -Replaces: libksquirrel0-kde3 (<< 4:3.5.13) -Breaks: libksquirrel0-kde3 (<< 4:3.5.13) +Replaces: libksquirrel0-trinity (<< 4:14.0.0) +Breaks: libksquirrel0-trinity (<< 4:14.0.0) Description: Trinity image viewer Runtime libraries for KSquirrel. Package: libksquirrel-trinity-dev Section: libdevel Architecture: any -Replaces: libksquirrel-kde3-dev (<< 4:3.5.13) -Breaks: libksquirrel-kde3-dev (<< 4:3.5.13) +Replaces: libksquirrel-trinity-dev (<< 4:14.0.0) +Breaks: libksquirrel-trinity-dev (<< 4:14.0.0) Depends: ${shlibs:Depends}, libksquirrel0-trinity (= ${binary:Version}) Description: Trinity image viewer Development libraries for KSquirrel. @@ -31,7 +31,7 @@ Description: Trinity image viewer Package: libksquirrel-tools-trinity Architecture: any Depends: ${shlibs:Depends}, libksquirrel0-trinity (= ${binary:Version}) -Replaces: libksquirrel-tools-kde3 (<< 4:3.5.13) -Breaks: libksquirrel-tools-kde3 (<< 4:3.5.13) +Replaces: libksquirrel-tools-trinity (<< 4:14.0.0) +Breaks: libksquirrel-tools-trinity (<< 4:14.0.0) Description: Trinity image viewer Tools for KSquirrel. diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/source/format b/ubuntu/maverick/libraries/libksquirrel/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/libraries/libksquirrel/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/source/options b/ubuntu/maverick/libraries/libksquirrel/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/libraries/libksquirrel/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/changelog b/ubuntu/maverick/libraries/libtqt-perl/debian/changelog new file mode 100644 index 000000000..c5a93479e --- /dev/null +++ b/ubuntu/maverick/libraries/libtqt-perl/debian/changelog @@ -0,0 +1,142 @@ +libtqt-perl (3.008-0ubuntu0) maverick; urgency=low + + * Absorbed upstream + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sun, 18 Dec 2011 03:09:00 -0600 + +libqt-perl (3.008-4ubuntu7) oneiric; urgency=low + + * Oneiric upload + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 15 Aug 2011 13:47:00 -0600 + +libqt-perl (3.008-4ubuntu1) karmic; urgency=low + + * Fixing FTBFS + + debian/rules: + - Fixed cp command for libtool.m4 from /usr/share/libtool to /usr/share/aclocal + - Fixed cp command for ltmain.sh from /usr/share/libtool to /usr/share/libtool/config + + -- Stephan Hermann <sh@sourcecode.de> Thu, 13 Aug 2009 06:12:48 +0000 + +libqt-perl (3.008-4) unstable; urgency=low + + * Ack NMU. + * Fix build on GNU/k*BSD. Closes: #511429. + - admin/cvs.sh: Added autoconf*2.6* and autoconf*2.6*. + - debian/control: libtool >= 1.5.2. + - debian/rules: Updated the pre-build rule, see #511429. + * debian/copyright: Fixed copyright-without-copyright-notice. + * debian/control: Fixed debhelper-but-no-misc-depends and + out-of-date-standards-version. + + -- Bart Martens <bartm@debian.org> Thu, 12 Feb 2009 19:19:43 +0100 + +libqt-perl (3.008-3.1) unstable; urgency=low + + * Non-maintainer upload. + * Use patch from Steve Cotton <steve0001@s.cotton.clara.co.uk> + to break a ``use'' cycle between Qt and Qt::debug. Closes: #481642 + + -- Marc 'HE' Brockschmidt <he@debian.org> Sat, 06 Sep 2008 22:09:32 +0200 + +libqt-perl (3.008-3) unstable; urgency=low + + * New maintainer. Closes: #379681. + * debian/compat, debian/control, debian/examples, debian/manpages, + debian/rules: Repackaged using dh-make and cdbs. Closes: #463089. + * debian/control, debian/rules: Using chrpath to remove rpath. + * config.h.in, PerlTQt/bin/pqtapi, PerlTQt/bin/pqtsh: Removed previously + automatically added changes. + * debian/watch: Added. + + -- Bart Martens <bartm@debian.org> Sat, 09 Feb 2008 14:45:59 +0100 + +libqt-perl (3.008-2) unstable; urgency=low + + * QA Upload (Ack NMU; Closes: #327326,#327993,#274779,#289658) + * Set Maintainer to QA Group; Orphaned: #379681 + * Higher compat level, depend on at least dh 4.0.0 + * Update debian/copyright + * "Fix" removing of empty directoriese in debian/rules (-exec instead + of |xargs which will produce a warning) + * Conforms to latest Standards Version 3.7.2 + + -- Michael Ablassmeier <abi@debian.org> Tue, 8 Aug 2006 15:29:52 +0200 + +libqt-perl (3.008-1.4) unstable; urgency=low + + * Non-maintainer upload. + + * Rebuild against transitioned Qt libraries. (Closes: #327993) + + * Now that libsmokeqt1 is available everywhere, don't use the internal copy + of the library on mips and mipsel. Changes: + + + debian/control: + - build-depend on libsmokeqt-dev on all arches + - drop build-dependency on chrpath + - remove ${mipsen:Conflicts} from libqt-perl's Conflicts line + + + debian/rules: + - no --enable-smoke for ./configure + - no make -C smoke call + - no chrpath invocation + - no -Vmipsen:Conflicts for dh_gencontrol + + -- Adeodato Simó <asp16@alu.ua.es> Wed, 26 Oct 2005 22:42:24 +0200 + +libqt-perl (3.008-1.3) unstable; urgency=low + + * Non-maintainer upload. + * Use -Wa,-xgot on mipsel when building libsmokeqt, otherwise we + overflow the symbol table and the package fails to build. + Closes: #289658. + + -- Steve Langasek <vorlon@debian.org> Mon, 10 Jan 2005 04:16:37 -0800 + +libqt-perl (3.008-1.2) unstable; urgency=high + + * Non-maintainer upload, with thanks to Adeodato Simó for his help in + preparing it + * High-urgency upload for sarge-targetted RC bugfix + * Revert the changes in the previous upload for mips and mipsel, + required for libqt-perl to be buildable on all arches and eligible + for sarge. (See discussion in Bug#274779). + * Make sure to keep --disable-rpath on all architectures and re-add + LD_RUN_PATH='', as this is still needed. + * Make libqt-perl conflict libsmokeqt1 and libsmokeqt-dev on mipsen. + + -- Steve Langasek <vorlon@debian.org> Fri, 7 Jan 2005 18:13:13 -0800 + +libqt-perl (3.008-1.1) unstable; urgency=low + + * Non maintainer upload. + * Do not build libsmokeqt, as it already exists in the libsmokeqt1 package. + (Closes: #274779) + * List of changes: + - added versioned Build-Dependency on libsmokeqt-dev. + - remove --disable-rpath and --enable-smoke from ./configure invocation. + - do not set LD_RUN_PATH when calling make. + - remove chrpath on no-longer built libsmokeqt.so, remove Build-Dependency + on chrpath too. + + -- Adeodato Simó <asp16@alu.ua.es> Thu, 07 Oct 2004 20:55:04 +0200 + +libqt-perl (3.008-1) unstable; urgency=low + + * New upstream release. + * This updated tarball appears to happily build from source again. I + couldn't reproduce the exact bug described by the submitter, however I did + fix the other FTBFS bug I found by the version update (g++ 3.3 + incompatibilities). I'll assume things are ok now unless proved otherwise. + (closes: #215048) + + -- Peter Hawkins <peterh@debian.org> Sat, 11 Oct 2003 09:47:11 +1000 + +libqt-perl (3.006-1) unstable; urgency=low + + * Initial Release. (closes: #177909) + + -- Peter Hawkins <peterh@debian.org> Fri, 24 Jan 2003 10:02:36 +0800 + diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/compat b/ubuntu/maverick/libraries/libtqt-perl/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/ubuntu/maverick/libraries/libtqt-perl/debian/compat @@ -0,0 +1 @@ +5 diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/control b/ubuntu/maverick/libraries/libtqt-perl/debian/control new file mode 100644 index 000000000..3bef4f1d3 --- /dev/null +++ b/ubuntu/maverick/libraries/libtqt-perl/debian/control @@ -0,0 +1,17 @@ +Source: libtqt-perl +Section: perl +Priority: optional +Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +XSBC-Original-Maintainer: Bart Martens <bartm@debian.org> +Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libtqtinterface-dev, perl (>= 5.8.0), automake, autoconf, tdelibs4-trinity-dev, libsmokeqt-trinity-dev, chrpath, libtool (>= 1.5.2) +Build-Conflicts: libtqt-perl +Standards-Version: 3.8.4 + +Package: libtqt-perl +Architecture: any +Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends} +Replaces: libtqt-perl (<< 4:14.0.0) +Breaks: libtqt-perl (<< 4:14.0.0) +Description: Perl bindings for the TQt library + This module lets you use the TQt library from Perl. + It provides an object-oriented interface and is easy to use. diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/copyright b/ubuntu/maverick/libraries/libtqt-perl/debian/copyright new file mode 100644 index 000000000..ae0fd0e46 --- /dev/null +++ b/ubuntu/maverick/libraries/libtqt-perl/debian/copyright @@ -0,0 +1,38 @@ +This package was debianized by Peter Hawkins <peterh@debian.org> on +Fri, 24 Jan 2003 10:02:36 +0800. + +It was downloaded from http://perlqt.sourceforge.net/ + +Copyright (c) 2002 Ashley Winters +Copyright (c) 2002-2003 Germain Garand +Copyright (C) 1992-2002 Trolltech AS. +Copyright (c) 2001 Phil Thompson <phil@river-bank.demon.co.uk> +Copyright (C) 1999 Sirtaj Singh Kang <taj@kde.org> +Copyright (C) 2000-2002, Lost Highway Ltd +Copyright (C) 1998 Kalle Dalheimer <kalle@kde.org> +Copyright (C) 2002 by the KDE developers +Copyright (C) 1997 Janos Farkas (chexum@shadow.banki.hu) +Copyright (C) 1997-1999, 2001 Stephan Kulow (coolo@kde.org) +Copyright (c) 2002 Riverbank Computing Limited <info@riverbankcomputing.co.uk> +Copyright (C) 1998-1999 Matthew D. Langston <langston@SLAC.Stanford.EDU> +Copyright (C) 1989-2002 Free Software Foundation, Inc. + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/docs b/ubuntu/maverick/libraries/libtqt-perl/debian/docs new file mode 100644 index 000000000..60566c90c --- /dev/null +++ b/ubuntu/maverick/libraries/libtqt-perl/debian/docs @@ -0,0 +1,3 @@ +README +TODO +PerlTQt/tutorials diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/examples b/ubuntu/maverick/libraries/libtqt-perl/debian/examples new file mode 100644 index 000000000..50594b81e --- /dev/null +++ b/ubuntu/maverick/libraries/libtqt-perl/debian/examples @@ -0,0 +1 @@ +PerlTQt/examples/* diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/manpages b/ubuntu/maverick/libraries/libtqt-perl/debian/manpages new file mode 100644 index 000000000..d8b17c191 --- /dev/null +++ b/ubuntu/maverick/libraries/libtqt-perl/debian/manpages @@ -0,0 +1,3 @@ +debian/pqtsh.1 +debian/pqtapi.1 +debian/puic.1 diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/pqtapi.1 b/ubuntu/maverick/libraries/libtqt-perl/debian/pqtapi.1 new file mode 100644 index 000000000..f6005623a --- /dev/null +++ b/ubuntu/maverick/libraries/libtqt-perl/debian/pqtapi.1 @@ -0,0 +1,40 @@ +.TH PERLQT 1 "July 31, 2002" +.SH NAME +pqtapi \- PerlTQt introspection tool +.SH SYNOPSIS +.B pqtapi +.RI " [ " -r " " <re> " ] [ " <class> " ] + +.SH DESCRIPTION +This manual page documents briefly the +.B pqtapi +command. +.PP +\fBpqtapi\fP is a PerlTQt Introspection tool. + +For example: +$ pqtapi -ir 'setpoint.* int' + void QCanvasLine::setPoints(int, int, int, int) + void QPointArray::setPoint(uint, int, int) + +For more information, please see the documentation on the PerlTQt website +http://perlqt.sourceforge.net/ + +.SH OPTIONS +A summary of options is included below. +.TP +.B \-r <re> +Find all functions matching a regular expression/keyword <re>. +.TP +.B \-i +Together with -r, perform a case-insensitive search. +.TP +.B \-v +Display version information. +.TP +.B \-h +Display usage information. + +.SH AUTHOR +This manual page was written by Peter Hawkins <peter@hawkins.emu.id.au>, +for the Debian GNU/Linux system (but may be used by others). diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/pqtsh.1 b/ubuntu/maverick/libraries/libtqt-perl/debian/pqtsh.1 new file mode 100644 index 000000000..19c7a93a0 --- /dev/null +++ b/ubuntu/maverick/libraries/libtqt-perl/debian/pqtsh.1 @@ -0,0 +1,21 @@ +.TH PERLQT 1 "July 31, 2002" +.SH NAME +pqtsh \- PerlTQt Graphical shell +.SH SYNOPSIS +.B pqtsh + +.SH DESCRIPTION +This manual page documents briefly the +.B pqtsh +command. +.PP +\fBpqtsh\fP is a graphical shell that can be used to test and experiment +with the PerlTQt api interactively. It is fairly self-explanatory and includes +an interactive example (Help -> Example). + +For more information, please see the documentation on the PerlTQt website +http://perlqt.sourceforge.net/ + +.SH AUTHOR +This manual page was written by Peter Hawkins <peter@hawkins.emu.id.au>, +for the Debian GNU/Linux system (but may be used by others). diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/puic.1 b/ubuntu/maverick/libraries/libtqt-perl/debian/puic.1 new file mode 100644 index 000000000..671bd97fd --- /dev/null +++ b/ubuntu/maverick/libraries/libtqt-perl/debian/puic.1 @@ -0,0 +1,65 @@ +.TH PERLQT 1 "July 31, 2002" +.SH NAME +puic \- Perl-QT User Interface Compiler +.SH SYNOPSIS +.B puic +.RI " [ " options " ] [ " mode " ] " <uifile.ui> " + + +Generate implementation: + +.B puic +.RI " [ " options " ] " <input.ui> " + + +Generate image collection: + +.B puic +.RI " [ " options " ] " -embed " " <project> " " <image1> " " ... " + + +Generate subclass implementation: + +.B puic +.RI " [ " options " ] " -subclass " " <classname> " " <uifile.ui> " + +.SH DESCRIPTION +This manual page documents briefly the +.B puic +command. +.PP +\fBpuic\fP is a program that generates a Perl package from a User Interface +file created with the Qt Designer package. This will generate the package +defined in the UI file and a basic main package for testing purposes. + +For more information, please see the documentation on the PerlTQt website +http://perlqt.sourceforge.net/ + +.SH OPTIONS +A summary of options is included below. +.TP +.B \-o <output filename> +Specify the name of the output file. If no output file is specified, stdout +will be used. +.TP +.B \-p <indent> +Set the indent in spaces (0 to use a tab) +.TP +.B \-nofwd +Omit imports of custom widgets +.TP +.B \-tr <func> +Use func(...) rather than trUtf8(...) for i18n +.TP +.B \-x +Generate extra code to test the class. +.TP +.B \-version +Display version information. +.TP +.B \-help +Display usage information. + +.SH AUTHOR +This manual page was written by Peter Hawkins <peter@hawkins.emu.id.au>, +for the Debian GNU/Linux system (but may be used by others). diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/rules b/ubuntu/maverick/libraries/libtqt-perl/debian/rules new file mode 100755 index 000000000..7bf57d40b --- /dev/null +++ b/ubuntu/maverick/libraries/libtqt-perl/debian/rules @@ -0,0 +1,56 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk + +SAVERESTORE=\ + acinclude.m4 \ + aclocal.m4 \ + admin/config.guess \ + admin/config.sub \ + admin/libtool.m4.in \ + admin/ltmain.sh \ + config.h.in \ + configure \ + Makefile.in \ + puic/Makefile.in \ + smoke/Makefile.in \ + smoke/qt/Makefile.in \ + PerlTQt/bin \ + +DEB_AUTO_UPDATE_AUTOCONF := 2.61 + +DEB_CONFIGURE_EXTRA_FLAGS += \ + --prefix=/opt/trinity \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + --with-qt-dir=/usr/share/tqt3 \ + --disable-rpath \ + +DEB_MAKE_INSTALL_TARGET := install \ + prefix=$(CURDIR)/debian/libtqt-perl/usr \ + PREFIX=$(CURDIR)/debian/libtqt-perl/usr \ + SITEPREFIX=$(CURDIR)/debian/libtqt-perl/usr \ + +pre-build:: pre-build-stamp + +pre-build-stamp: + for f in $(SAVERESTORE) ; do [ -e $$f.d-r-orig ] || cp -rp $$f $$f.d-r-orig ; done + cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in + cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh + cp -f /usr/share/misc/config.guess admin/config.guess + cp -f /usr/share/misc/config.sub admin/config.sub + make -f admin/Makefile.common + touch pre-build-stamp + +build/libtqt-perl:: + chrpath -d puic/puic + +clean:: + rm -f PerlTQt/bin/.exists + for f in $(SAVERESTORE) ; do [ ! -e $$f.d-r-orig ] || ( rm -rf $$f && mv $$f.d-r-orig $$f ) ; done + rm -f pre-build-stamp + +repair: + for f in $(SAVERESTORE) ; do rm -f $$f ; cp -p ../orig/*/$$f $$f ; done + diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/source/format b/ubuntu/maverick/libraries/libtqt-perl/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/libraries/libtqt-perl/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/source/options b/ubuntu/maverick/libraries/libtqt-perl/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/libraries/libtqt-perl/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/watch b/ubuntu/maverick/libraries/libtqt-perl/debian/watch new file mode 100644 index 000000000..18c470968 --- /dev/null +++ b/ubuntu/maverick/libraries/libtqt-perl/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/perlqt/PerlTQt-([^b]+)\.tar\.gz diff --git a/ubuntu/maverick/libraries/mlt++/debian/control b/ubuntu/maverick/libraries/mlt++/debian/control index fca254cd0..6d9df2be3 100644 --- a/ubuntu/maverick/libraries/mlt++/debian/control +++ b/ubuntu/maverick/libraries/mlt++/debian/control @@ -10,8 +10,8 @@ Build-Depends: debhelper (>= 5), libmlt-trinity-dev (>= 0.2.4.svn20071228), auto Package: libmlt++0.2.5-trinity Architecture: any Depends: ${shlibs:Depends} -Replaces: libmlt++0.2.5-kde3 (<< 4:3.5.13) -Breaks: libmlt++0.2.5-kde3 (<< 4:3.5.13) +Replaces: libmlt++0.2.5-trinity (<< 4:14.0.0) +Breaks: libmlt++0.2.5-trinity (<< 4:14.0.0) Provides: libmlt++-trinity Description: An open source multimedia framework (C++ wrapper) [Trinity] MLT is an open source multimedia framework, designed and developed for @@ -29,8 +29,8 @@ Description: An open source multimedia framework (C++ wrapper) [Trinity] Package: libmlt++-trinity-dev Section: libdevel Architecture: any -Replaces: libmlt++-kde3-dev (<< 4:3.5.13) -Breaks: libmlt++-kde3-dev (<< 4:3.5.13) +Replaces: libmlt++-trinity-dev (<< 4:14.0.0) +Breaks: libmlt++-trinity-dev (<< 4:14.0.0) Depends: libmlt++0.2.5-trinity (= ${binary:Version}), libmlt-trinity-dev (>= 0.2.4.svn20071228) Description: An open source multimedia framework (C++ wrapper) [Trinity] MLT is an open source multimedia framework, designed and developed for diff --git a/ubuntu/maverick/libraries/mlt++/debian/source/format b/ubuntu/maverick/libraries/mlt++/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/libraries/mlt++/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/libraries/mlt++/debian/source/options b/ubuntu/maverick/libraries/mlt++/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/libraries/mlt++/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/libraries/mlt/debian/control b/ubuntu/maverick/libraries/mlt/debian/control index 64fc2a37d..09621eccf 100644 --- a/ubuntu/maverick/libraries/mlt/debian/control +++ b/ubuntu/maverick/libraries/mlt/debian/control @@ -15,8 +15,8 @@ Build-Depends: debhelper (>= 5), libdv4-dev, libquicktime-dev (>= 2:1.0.0), Package: libmlt0.2.5-trinity Architecture: any Depends: ${shlibs:Depends}, libmlt-data -Replaces: libmlt0.2.5-kde3 (<< 4:3.5.13) -Breaks: libmlt0.2.5-kde3 (<< 4:3.5.13) +Replaces: libmlt0.2.5-trinity (<< 4:14.0.0) +Breaks: libmlt0.2.5-trinity (<< 4:14.0.0) Provides: libmlt-trinity Description: An open source multimedia framework - Core files [Trinity] MLT is an open source multimedia framework, designed and developed for @@ -32,8 +32,8 @@ Description: An open source multimedia framework - Core files [Trinity] Package: libmiracle0.2.5-trinity Architecture: any Depends: ${shlibs:Depends}, libmlt0.2.5-trinity (= ${binary:Version}), libvalerie0.2.5-trinity (= ${binary:Version}) -Replaces: libmiracle0.2.5-kde3 (<< 4:3.5.13) -Breaks: libmiracle0.2.5-kde3 (<< 4:3.5.13) +Replaces: libmiracle0.2.5-trinity (<< 4:14.0.0) +Breaks: libmiracle0.2.5-trinity (<< 4:14.0.0) Description: An open source multimedia framework - Core files [Trinity] MLT is an open source multimedia framework, designed and developed for television broadcasting. It provides a toolkit for broadcasters, video @@ -47,8 +47,8 @@ Description: An open source multimedia framework - Core files [Trinity] Package: libvalerie0.2.5-trinity Architecture: any Depends: ${shlibs:Depends}, libmlt0.2.5-trinity (= ${binary:Version}), libmiracle0.2.5-trinity (= ${binary:Version}) -Replaces: libvalerie0.2.5-kde3 (<< 4:3.5.13) -Breaks: libvalerie0.2.5-kde3 (<< 4:3.5.13) +Replaces: libvalerie0.2.5-trinity (<< 4:14.0.0) +Breaks: libvalerie0.2.5-trinity (<< 4:14.0.0) Description: An open source multimedia framework - Core files [Trinity] MLT is an open source multimedia framework, designed and developed for television broadcasting. It provides a toolkit for broadcasters, video @@ -63,8 +63,8 @@ Description: An open source multimedia framework - Core files [Trinity] Package: libmlt-trinity-dev Section: libdevel Architecture: any -Replaces: libmlt-kde3-dev (<< 4:3.5.13) -Breaks: libmlt-kde3-dev (<< 4:3.5.13) +Replaces: libmlt-trinity-dev (<< 4:14.0.0) +Breaks: libmlt-trinity-dev (<< 4:14.0.0) Depends: libmlt0.2.5-trinity (= ${binary:Version}), libmiracle0.2.5-trinity (= ${binary:Version}), libvalerie0.2.5-trinity (= ${binary:Version}) Provides: libmiracle-trinity-dev, libvalerie-trinity-dev Description: An open source multimedia framework - Development files [Trinity] diff --git a/ubuntu/maverick/libraries/mlt/debian/source/format b/ubuntu/maverick/libraries/mlt/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/libraries/mlt/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/libraries/mlt/debian/source/options b/ubuntu/maverick/libraries/mlt/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/libraries/mlt/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/pykdeextensions-trinity.install b/ubuntu/maverick/libraries/pykdeextensions/debian/pykdeextensions-trinity.install deleted file mode 100644 index 694850908..000000000 --- a/ubuntu/maverick/libraries/pykdeextensions/debian/pykdeextensions-trinity.install +++ /dev/null @@ -1,7 +0,0 @@ -usr/lib/python*/dist-packages -opt/trinity/share/apps/pykdeextensions/AUTHORS -opt/trinity/share/apps/pykdeextensions/ChangeLog -opt/trinity/share/apps/pykdeextensions/INSTALL -opt/trinity/share/apps/pykdeextensions/NEWS -opt/trinity/share/apps/pykdeextensions/app_templates -opt/trinity/share/doc/kde/HTML/en/pykdeextensions diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/pykdeextensions-trinity.lintian-overrides b/ubuntu/maverick/libraries/pykdeextensions/debian/pykdeextensions-trinity.lintian-overrides deleted file mode 100644 index 06b60205b..000000000 --- a/ubuntu/maverick/libraries/pykdeextensions/debian/pykdeextensions-trinity.lintian-overrides +++ /dev/null @@ -1,10 +0,0 @@ -pykdeextensions: desktop-entry-contains-unknown-key ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop:4 name[en_GB] -pykdeextensions: desktop-command-not-in-package ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop kcmshell -pykdeextensions: desktop-entry-invalid-category QT ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop -pykdeextensions: desktop-entry-invalid-category X-KDE-settings-system ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop -pykdeextensions: desktop-entry-lacks-main-category ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop -pykdeextensions: desktop-command-not-in-package ./usr/share/apps/pykdeextensions/app_templates/kdeapp/src/kdeapp.desktop $APPNAMELC$ -pykdeextensions: desktop-command-not-in-package ./usr/share/apps/pykdeextensions/app_templates/kdeutility/src/kdeutility.desktop $APPNAMELC$ - -pykdeextensions: executable-not-elf-or-script ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py -pykdeextensions: executable-not-elf-or-script ./usr/share/apps/pykdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/README.Debian b/ubuntu/maverick/libraries/pytdeextensions/debian/README.Debian index b0302c211..b0302c211 100644 --- a/ubuntu/maverick/libraries/pykdeextensions/debian/README.Debian +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/README.Debian diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/changelog b/ubuntu/maverick/libraries/pytdeextensions/debian/changelog index 92b728999..4f1eb90be 100644 --- a/ubuntu/maverick/libraries/pykdeextensions/debian/changelog +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/changelog @@ -1,23 +1,23 @@ -pykdeextensions-trinity (0.4.0-6ubuntu6) karmic; urgency=low +pytdeextensions-trinity (0.4.0-6ubuntu6) karmic; urgency=low * Karmic rebuild -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 02 July 2009 16:08:00 -0600 -pykdeextensions-trinity (0.4.0-5ubuntu5) intrepid; urgency=low +pytdeextensions-trinity (0.4.0-5ubuntu5) intrepid; urgency=low * Added -trinity suffix -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Wed, 03 Dec 2008 21:38:00 -0600 -pykdeextensions (0.4.0-5ubuntu3) hardy; urgency=low +pytdeextensions (0.4.0-5ubuntu3) hardy; urgency=low * Re-add libpythoniz0 dependency on python-dev to work around libpythonize0 dlopening libpython2.5.so and not ...so.1 (LP: #179668) -- Scott Kitterman <scott@kitterman.com> Sat, 01 Mar 2008 11:15:08 -0500 -pykdeextensions (0.4.0-5ubuntu2) hardy; urgency=low +pytdeextensions (0.4.0-5ubuntu2) hardy; urgency=low * debian/control: - remove the python-all-dev dependency in libpythonize0 @@ -26,14 +26,14 @@ pykdeextensions (0.4.0-5ubuntu2) hardy; urgency=low -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 17 Dec 2007 12:38:49 +0100 -pykdeextensions (0.4.0-5ubuntu1) hardy; urgency=low +pytdeextensions (0.4.0-5ubuntu1) hardy; urgency=low * Merge with Debian, remaining changes: - libpythonize0 depends on python2.5-dev, it tries to load .so file -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 29 Nov 2007 17:59:47 +0000 -pykdeextensions (0.4.0-5) unstable; urgency=low +pytdeextensions (0.4.0-5) unstable; urgency=low * Add python-qt-dev build dependency. pyqtconfig moved from python-qt3 to python-qt-dev. (Closes: #439504) @@ -44,17 +44,17 @@ pykdeextensions (0.4.0-5) unstable; urgency=low * Remove *.py[co] files. * lintian cleanup: substvar-source-version-is-deprecated. Use ${binary:Version}. - * Make pykdeextensions package arch all. + * Make pytdeextensions package arch all. -- Fathi Boudra <fboudra@free.fr> Sun, 07 Oct 2007 12:06:15 +0200 -pykdeextensions (0.4.0-4ubuntu4) gutsy; urgency=low +pytdeextensions (0.4.0-4ubuntu4) gutsy; urgency=low * Fix depends to python2.5-dev -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 25 Sep 2007 18:48:45 +0100 -pykdeextensions (0.4.0-4ubuntu3) gutsy; urgency=low +pytdeextensions (0.4.0-4ubuntu3) gutsy; urgency=low * Add libpython2.5-dev as a depends for libpythonize0, it wants to load libpython2.5.so, reverts change from previous upload, LP: #84689, @@ -62,7 +62,7 @@ pykdeextensions (0.4.0-4ubuntu3) gutsy; urgency=low -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 25 Sep 2007 16:32:17 +0100 -pykdeextensions (0.4.0-4ubuntu2) gutsy; urgency=low +pytdeextensions (0.4.0-4ubuntu2) gutsy; urgency=low * Fix build failure, build-depend on python-qt-dev. * Use the unversioned python interpreter for scripts. @@ -71,14 +71,14 @@ pykdeextensions (0.4.0-4ubuntu2) gutsy; urgency=low -- Matthias Klose <doko@ubuntu.com> Wed, 29 Aug 2007 20:48:25 +0000 -pykdeextensions (0.4.0-4ubuntu1) gutsy; urgency=low +pytdeextensions (0.4.0-4ubuntu1) gutsy; urgency=low * Merge with Debian, remaining changes: - build on python 2.5 -- Jonathan Riddell <jriddell@ubuntu.com> Sun, 03 Jun 2007 13:51:42 +0100 -pykdeextensions (0.4.0-4) unstable; urgency=low +pytdeextensions (0.4.0-4) unstable; urgency=low * Update pyversions. Force to build with python2.4 only. (Closes: #424505) * Remove python-all-dev build dependency. Replaced by python-dev. @@ -86,7 +86,7 @@ pykdeextensions (0.4.0-4) unstable; urgency=low -- Fathi Boudra <fboudra@free.fr> Wed, 16 May 2007 11:02:06 +0200 -pykdeextensions (0.4.0-3ubuntu1) feisty; urgency=low +pytdeextensions (0.4.0-3ubuntu1) feisty; urgency=low * Force to build with python2.5. * FIXME: The package is unlikely to work with python2.4; maybe @@ -94,20 +94,20 @@ pykdeextensions (0.4.0-3ubuntu1) feisty; urgency=low -- Matthias Klose <doko@ubuntu.com> Sun, 14 Jan 2007 16:42:27 +0000 -pykdeextensions (0.4.0-3) unstable; urgency=low +pytdeextensions (0.4.0-3) unstable; urgency=low * Converted package to python-support * Added pycompat and pyversions * Force to use python2.4 (Closes: #375618) * Added to Build-Depends: python-support, python-all-dev, tdelibs4c2a (for kde-config) - * Updated libpythonize0-dev, libpythonize0, and pykdextensions install files + * Updated libpythonize0-dev, libpythonize0, and pytdextensions install files * Cleaned up rules * Added 12_force_python2.4_script.diff to force python2.4 in scripts -- Fathi Boudra <fboudra@free.fr> Thu, 29 Jun 2006 15:41:39 +0200 -pykdeextensions (0.4.0-2) unstable; urgency=low +pytdeextensions (0.4.0-2) unstable; urgency=low * Converted package to cdbs * Added 2 patches (thanks to Jonathan Riddell) @@ -118,7 +118,7 @@ pykdeextensions (0.4.0-2) unstable; urgency=low -- Fathi Boudra <fboudra@free.fr> Tue, 6 Jun 2006 08:56:40 +0200 -pykdeextensions (0.4.0-1) unstable; urgency=low +pytdeextensions (0.4.0-1) unstable; urgency=low [ Fathi Boudra ] * Initial Debian release Closes: #340141 diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/compat b/ubuntu/maverick/libraries/pytdeextensions/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/compat @@ -0,0 +1 @@ +5 diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/control b/ubuntu/maverick/libraries/pytdeextensions/debian/control index d82091f2d..ff229461d 100644 --- a/ubuntu/maverick/libraries/pykdeextensions/debian/control +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/control @@ -1,31 +1,31 @@ -Source: pykdeextensions-trinity +Source: pytdeextensions-trinity Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, tdelibs4c2a-trinity, libtool, - libxml2-utils, libxrandr-dev, libxxf86vm-dev, pyqt-tools, python-trinity-trinity, - python-qt-dev, python-sip4-dev, python-support (>= 0.6), python2.6, python2.6-dev + libxml2-utils, libxrandr-dev, libxxf86vm-dev, pytqt-tools, python-trinity-trinity, + python-tqt-dev, python-sip4-dev, python-support (>= 0.6), python2.6, python2.6-dev Standards-Version: 3.8.4 -Package: pykdeextensions-trinity +Package: pytdeextensions-trinity Architecture: all Depends: ${python:Depends} -Replaces: pykdeextensions-kde3 (<< 4:3.5.13) -Breaks: pykdeextensions-kde3 (<< 4:3.5.13) -Conflicts: pykdeextensions +Replaces: pykdeextensions-trinity (<< 4:14.0.0) +Breaks: pykdeextensions-trinity (<< 4:14.0.0) +Conflicts: pytdeextensions Provides: ${python:Provides} Description: Python packages to support KDE applications (scripts) [Trinity] PyKDE Extensions is a collection of software and Python packages to support the creation and installation of KDE applications. . - Homepage: http://www.simonzone.com/software/pykdeextensions + Homepage: http://www.simonzone.com/software/pytdeextensions Package: libpythonize0-trinity-dev Architecture: any Section: libdevel -Replaces: libpythonize0-kde3-dev (<< 4:3.5.13) -Breaks: libpythonize0-kde3-dev (<< 4:3.5.13) +Replaces: libpythonize0-trinity-dev (<< 4:14.0.0) +Breaks: libpythonize0-trinity-dev (<< 4:14.0.0) Depends: libpythonize0-trinity (= ${binary:Version}), python-dev Description: Python packages to support KDE applications (development) [Trinity] PyKDE Extensions is a collection of software and Python packages @@ -33,13 +33,13 @@ Description: Python packages to support KDE applications (development) [Trinity] . This package contains the libpythonize development files. . - Homepage: http://www.simonzone.com/software/pykdeextensions + Homepage: http://www.simonzone.com/software/pytdeextensions Package: libpythonize0-trinity Architecture: any Section: libs -Replaces: libpythonize0-kde3 (<< 4:3.5.13) -Breaks: libpythonize0-kde3 (<< 4:3.5.13) +Replaces: libpythonize0-trinity (<< 4:14.0.0) +Breaks: libpythonize0-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libpythonize0 Description: Python packages to support KDE applications (library) [Trinity] @@ -48,4 +48,4 @@ Description: Python packages to support KDE applications (library) [Trinity] . This package contains the libpythonize library files. . - Homepage: http://www.simonzone.com/software/pykdeextensions + Homepage: http://www.simonzone.com/software/pytdeextensions diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/copyright b/ubuntu/maverick/libraries/pytdeextensions/debian/copyright index a90a21587..9ed7bf6cd 100644 --- a/ubuntu/maverick/libraries/pykdeextensions/debian/copyright +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/copyright @@ -1,9 +1,9 @@ This package was debianized by Fathi Boudra <fboudra@free.fr> on Wed, 27 Jul 2005 20:19:26 +0200. -It was downloaded from <http://www.simonzone.com/software/pykdeextensions> +It was downloaded from <http://www.simonzone.com/software/pytdeextensions> -Application templates and pykde helper modules copyright: +Application templates and pytde helper modules copyright: Simon Edwards <simon@simonzone.com> License: diff --git a/ubuntu/maverick_automake/applications/kdmtheme/debian/docs b/ubuntu/maverick/libraries/pytdeextensions/debian/docs index e845566c0..e845566c0 100644 --- a/ubuntu/maverick_automake/applications/kdmtheme/debian/docs +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/docs diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/libpythonize0-trinity-dev.install b/ubuntu/maverick/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install index f50fc4e15..f50fc4e15 100644 --- a/ubuntu/maverick/libraries/pykdeextensions/debian/libpythonize0-trinity-dev.install +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/libpythonize0-trinity.install b/ubuntu/maverick/libraries/pytdeextensions/debian/libpythonize0-trinity.install index 48601d2d0..48601d2d0 100644 --- a/ubuntu/maverick/libraries/pykdeextensions/debian/libpythonize0-trinity.install +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/libpythonize0-trinity.install diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/patches/.gitignore b/ubuntu/maverick/libraries/pytdeextensions/debian/patches/.gitignore index e69de29bb..e69de29bb 100644 --- a/ubuntu/maverick/libraries/pykdeextensions/debian/patches/.gitignore +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/patches/.gitignore diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/pycompat b/ubuntu/maverick/libraries/pytdeextensions/debian/pycompat index 0cfbf0888..0cfbf0888 100644 --- a/ubuntu/maverick/libraries/pykdeextensions/debian/pycompat +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/pycompat diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/pytdeextensions-trinity.install b/ubuntu/maverick/libraries/pytdeextensions/debian/pytdeextensions-trinity.install new file mode 100644 index 000000000..d8b987d87 --- /dev/null +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/pytdeextensions-trinity.install @@ -0,0 +1,7 @@ +usr/lib/python*/dist-packages +opt/trinity/share/apps/pytdeextensions/AUTHORS +opt/trinity/share/apps/pytdeextensions/ChangeLog +opt/trinity/share/apps/pytdeextensions/INSTALL +opt/trinity/share/apps/pytdeextensions/NEWS +opt/trinity/share/apps/pytdeextensions/app_templates +opt/trinity/share/doc/kde/HTML/en/pytdeextensions diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides b/ubuntu/maverick/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides new file mode 100644 index 000000000..3b34d51a5 --- /dev/null +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides @@ -0,0 +1,10 @@ +pytdeextensions: desktop-entry-contains-unknown-key ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop:4 name[en_GB] +pytdeextensions: desktop-command-not-in-package ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop kcmshell +pytdeextensions: desktop-entry-invalid-category QT ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop +pytdeextensions: desktop-entry-invalid-category X-KDE-settings-system ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop +pytdeextensions: desktop-entry-lacks-main-category ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop +pytdeextensions: desktop-command-not-in-package ./usr/share/apps/pytdeextensions/app_templates/kdeapp/src/kdeapp.desktop $APPNAMELC$ +pytdeextensions: desktop-command-not-in-package ./usr/share/apps/pytdeextensions/app_templates/kdeutility/src/kdeutility.desktop $APPNAMELC$ + +pytdeextensions: executable-not-elf-or-script ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py +pytdeextensions: executable-not-elf-or-script ./usr/share/apps/pytdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/python-distutils-jaunty.mk b/ubuntu/maverick/libraries/pytdeextensions/debian/python-distutils-jaunty.mk index 9c5e5211f..9c5e5211f 100644 --- a/ubuntu/maverick/libraries/pykdeextensions/debian/python-distutils-jaunty.mk +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/python-distutils-jaunty.mk diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/pyversions b/ubuntu/maverick/libraries/pytdeextensions/debian/pyversions index b3dc41ebc..b3dc41ebc 100644 --- a/ubuntu/maverick/libraries/pykdeextensions/debian/pyversions +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/pyversions diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/rules b/ubuntu/maverick/libraries/pytdeextensions/debian/rules index 49c03b6ab..1acb32f7d 100755 --- a/ubuntu/maverick/libraries/pykdeextensions/debian/rules +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/rules @@ -18,14 +18,14 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde -install/pykdeextensions-trinity:: +install/pytdeextensions-trinity:: # We have no idea if the built product is site-packages or dist-packages cd debian/tmp/usr/lib/python*/ && mv site-packages/ dist-packages/ || echo "site-packages --> dist-packages" rm -rf debian/tmp/usr/lib/python*/site-packages/ # install lintian overrides - install -D -p -m0644 debian/pykdeextensions-trinity.lintian-overrides \ - debian/pykdeextensions-trinity/usr/share/lintian/overrides/pykdeextensions-trinity + install -D -p -m0644 debian/pytdeextensions-trinity.lintian-overrides \ + debian/pytdeextensions-trinity/usr/share/lintian/overrides/pytdeextensions-trinity # fix script-not-executable find debian -type f -name '*.py' | xargs chmod 0755 diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/source/format b/ubuntu/maverick/libraries/pytdeextensions/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/source/options b/ubuntu/maverick/libraries/pytdeextensions/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/libraries/python-trinity/debian/changelog b/ubuntu/maverick/libraries/python-trinity/debian/changelog index 688f8d49c..0c28cec76 100644 --- a/ubuntu/maverick/libraries/python-trinity/debian/changelog +++ b/ubuntu/maverick/libraries/python-trinity/debian/changelog @@ -320,7 +320,7 @@ python-trinity (3.11.3+20050829-1) unstable; urgency=low * Added the homepage of PyKDE to the package descriptions * HTML documentations is now installed into /usr/share/doc/python-trinity-doc/html - * pykdeconfig.py now also knows that the sip files + * pytdeconfig.py now also knows that the sip files are in /usr/share/sip/trinity, not in /usr/share/sip/kde (Closes: #312708) diff --git a/ubuntu/maverick/libraries/python-trinity/debian/control b/ubuntu/maverick/libraries/python-trinity/debian/control index 38a85e452..afacf68ee 100644 --- a/ubuntu/maverick/libraries/python-trinity/debian/control +++ b/ubuntu/maverick/libraries/python-trinity/debian/control @@ -4,16 +4,16 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Ricardo Javier Cardenes Medina <rcardenes@debian.org> Uploaders: Torsten Marek <shlomme@debian.org>, Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> -Build-Depends: debhelper (>= 5.0.38), libtqtinterface-dev, python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-qt-dev (>= 3.18), tdelibs4-trinity-dev, python-central (>= 0.6.11), dpatch, python-sip4, python-sip4-dbg, python-sip4-dev +Build-Depends: debhelper (>= 5.0.38), libtqtinterface-dev, python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-tqt-dev, tdelibs4-trinity-dev, python-central (>= 0.6.11), dpatch, python-sip4, python-sip4-dbg, python-sip4-dev Standards-Version: 3.8.4 -Homepage: http://www.riverbankcomputing.co.uk/pykde/index.php +Homepage: http://www.riverbankcomputing.co.uk/pytde/index.php XS-Python-Version: all Package: python-trinity-trinity Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends}, python-qt3 (>= 3.18) -Replaces: python-kde3-kde3 (<< 4:3.5.13) -Breaks: python-kde3-kde3 (<< 4:3.5.13) +Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt +Replaces: python-trinity-trinity (<< 4:14.0.0) +Breaks: python-trinity-trinity (<< 4:14.0.0) XB-Python-Version: ${python:Versions} Provides: ${python:Provides} Conflicts: python-trinity-trinity @@ -25,9 +25,9 @@ Description: Trinity bindings for Python [Trinity] Package: python-trinity-trinity-dbg Priority: extra Architecture: any -Replaces: python-kde3-kde3-dbg (<< 4:3.5.13) -Breaks: python-kde3-kde3-dbg (<< 4:3.5.13) -Depends: python-trinity-trinity (= ${binary:Version}), python-dbg, python-qt3-dbg, ${shlibs:Depends} +Replaces: python-trinity-trinity-dbg (<< 4:14.0.0) +Breaks: python-trinity-trinity-dbg (<< 4:14.0.0) +Depends: python-trinity-trinity (= ${binary:Version}), python-dbg, python-tqt-dbg, ${shlibs:Depends} XB-Python-Version: ${python:Versions} Description: Trinity bindings for Python (debug extensions) [Trinity] Python binding module that provides wide access to the Trinity API, @@ -39,22 +39,22 @@ Description: Trinity bindings for Python (debug extensions) [Trinity] Package: python-trinity-trinity-dev Section: python Architecture: all -Replaces: python-kde3-kde3-dev (<< 4:3.5.13) -Breaks: python-kde3-kde3-dev (<< 4:3.5.13) -Depends: pyqt-tools, ${python:Depends} +Replaces: python-trinity-trinity-dev (<< 4:14.0.0) +Breaks: python-trinity-trinity-dev (<< 4:14.0.0) +Depends: pytqt-tools, ${python:Depends} XB-Python-Version: ${python:Versions} Description: Trinity bindings for Python - Development files and scripts [Trinity] Development .sip files with definitions of PyKDE classes. They are needed to build PyKDE, but also as building blocks of other packages based on them. - The package also contains kdepyuic, a wrapper script around PyQt's + The package also contains kdepyuic, a wrapper script around PyTQt's user interface compiler. Package: python-trinity-trinity-doc Section: doc Architecture: all -Replaces: python-kde3-kde3-doc (<< 4:3.5.13) -Breaks: python-kde3-kde3-doc (<< 4:3.5.13) +Replaces: python-trinity-trinity-doc (<< 4:14.0.0) +Breaks: python-trinity-trinity-doc (<< 4:14.0.0) Description: Documentation and examples for PyKDE [Trinity] General documentation and examples for PyKDE providing programming tips and working code you can use to learn from. diff --git a/ubuntu/maverick/libraries/python-trinity/debian/pykdeconfig.py b/ubuntu/maverick/libraries/python-trinity/debian/pytdeconfig.py index 9e3840afe..eac264752 100644 --- a/ubuntu/maverick/libraries/python-trinity/debian/pykdeconfig.py +++ b/ubuntu/maverick/libraries/python-trinity/debian/pytdeconfig.py @@ -4,8 +4,8 @@ import sys if getattr(sys, "pydebug", False): try: - from pykdeconfig_d import * + from pytdeconfig_d import * except ImportError, msg: - raise ImportError, 'No module named pykdeconfig; package python-trinity-dbg not installed' + raise ImportError, 'No module named pytdeconfig; package python-trinity-dbg not installed' else: - from pykdeconfig_nd import * + from pytdeconfig_nd import * diff --git a/ubuntu/maverick/libraries/python-trinity/debian/rules b/ubuntu/maverick/libraries/python-trinity/debian/rules index 85c43a0fe..ffa56ad63 100755 --- a/ubuntu/maverick/libraries/python-trinity/debian/rules +++ b/ubuntu/maverick/libraries/python-trinity/debian/rules @@ -93,12 +93,12 @@ install-indep: for version in ${PYTHONS};\ do\ mkdir -p debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages;\ - cp debian/pykdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/;\ - cp build-$$version/pykdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/pykdeconfig_nd.py;\ + cp debian/pytdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/;\ + cp build-$$version/pytdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/pytdeconfig_nd.py;\ done for version in ${DBG_PYTHONS};\ do\ - cp dbg-build-$$version/pykdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/pykdeconfig_d.py;\ + cp dbg-build-$$version/pytdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/pytdeconfig_d.py;\ done install-arch: diff --git a/ubuntu/maverick/libraries/python-trinity/debian/source/format b/ubuntu/maverick/libraries/python-trinity/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/libraries/python-trinity/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/libraries/python-trinity/debian/source/options b/ubuntu/maverick/libraries/python-trinity/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/libraries/python-trinity/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/metapackages/sudo-trinity/Makefile b/ubuntu/maverick/metapackages/sudo-trinity/Makefile new file mode 100755 index 000000000..bc4653675 --- /dev/null +++ b/ubuntu/maverick/metapackages/sudo-trinity/Makefile @@ -0,0 +1,12 @@ +FPACKAGE = sudo-trinity
+VERSION = 1.0
+
+build:
+
+clean:
+
+install:
+ mkdir -p /etc
+ cp -Rp etc/* $(DESTDIR)/etc/
+ chmod -R 644 $(DESTDIR)/etc
+ chmod -R 0440 $(DESTDIR)/etc/sudoers.d/tde-secure-path
\ No newline at end of file diff --git a/ubuntu/maverick/metapackages/sudo-trinity/debian/changelog b/ubuntu/maverick/metapackages/sudo-trinity/debian/changelog new file mode 100755 index 000000000..6d79a642a --- /dev/null +++ b/ubuntu/maverick/metapackages/sudo-trinity/debian/changelog @@ -0,0 +1,5 @@ +sudo-trinity (1.0) lucid; urgency=low + + * Initial release + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sun, 11 Dec 2011 07:49:00 -0600 diff --git a/ubuntu/maverick/metapackages/sudo-trinity/debian/compat b/ubuntu/maverick/metapackages/sudo-trinity/debian/compat new file mode 100755 index 000000000..7ed6ff82d --- /dev/null +++ b/ubuntu/maverick/metapackages/sudo-trinity/debian/compat @@ -0,0 +1 @@ +5 diff --git a/ubuntu/maverick/metapackages/sudo-trinity/debian/control b/ubuntu/maverick/metapackages/sudo-trinity/debian/control new file mode 100644 index 000000000..6505a3e51 --- /dev/null +++ b/ubuntu/maverick/metapackages/sudo-trinity/debian/control @@ -0,0 +1,15 @@ +Source: sudo-trinity +Section: kde +Priority: extra +Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Uploaders: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Build-Depends: debhelper (>=5.0), cdbs +Standards-Version: 3.8.4 + +Package: sudo-trinity +Architecture: all +Depends: sudo +Replaces: sudo-trinity (<< 4:14.0.0) +Breaks: sudo-trinity (<< 4:14.0.0) +Description: TDE sudo + TDE configuration files for sudo diff --git a/ubuntu/maverick/metapackages/sudo-trinity/debian/dirs b/ubuntu/maverick/metapackages/sudo-trinity/debian/dirs new file mode 100755 index 000000000..ee19d5d17 --- /dev/null +++ b/ubuntu/maverick/metapackages/sudo-trinity/debian/dirs @@ -0,0 +1 @@ +etc diff --git a/ubuntu/maverick/metapackages/sudo-trinity/debian/rules b/ubuntu/maverick/metapackages/sudo-trinity/debian/rules new file mode 100755 index 000000000..087848532 --- /dev/null +++ b/ubuntu/maverick/metapackages/sudo-trinity/debian/rules @@ -0,0 +1,8 @@ +#!/usr/bin/make -f +include /usr/share/cdbs/1/class/makefile.mk +include /usr/share/cdbs/1/rules/debhelper.mk + +CFLAGS=-g -Wall -fPIC + +DEB_MAKE_INSTALL_TARGET := install DESTDIR="$(DEB_DESTDIR)" +DEB_INSTALL_DOCS_ALL := diff --git a/ubuntu/maverick/metapackages/sudo-trinity/debian/source/format b/ubuntu/maverick/metapackages/sudo-trinity/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/metapackages/sudo-trinity/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/metapackages/sudo-trinity/debian/source/options b/ubuntu/maverick/metapackages/sudo-trinity/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/metapackages/sudo-trinity/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/metapackages/sudo-trinity/etc/sudoers.d/tde-secure-path b/ubuntu/maverick/metapackages/sudo-trinity/etc/sudoers.d/tde-secure-path new file mode 100644 index 000000000..f3c34f20a --- /dev/null +++ b/ubuntu/maverick/metapackages/sudo-trinity/etc/sudoers.d/tde-secure-path @@ -0,0 +1 @@ +Defaults secure_path=/usr/local/sbin:/usr/local/bin:/opt/trinity/sbin:/usr/sbin:/opt/trinity/bin:/usr/bin:/sbin:/bin:/usr/X11R6/bin diff --git a/ubuntu/maverick/tde-i18n/debian/changelog b/ubuntu/maverick/tde-i18n/debian/changelog index a4347a2ca..7862961e0 100644 --- a/ubuntu/maverick/tde-i18n/debian/changelog +++ b/ubuntu/maverick/tde-i18n/debian/changelog @@ -300,7 +300,7 @@ tde-i18n (4:3.2.2-3) unstable; urgency=low tde-i18n (4:3.2.2-2) unstable; urgency=low - * corrected juk and kcachegrind conflict to <<4:3.2.1-1 + * corrected juk and tdecachegrind conflict to <<4:3.2.1-1 * conflicting with tdevelop-data (tdevelop version 2) because tdevelop version 3 translations are included in tde-i18n @@ -410,7 +410,7 @@ tde-i18n (4:3.1-1) unstable; urgency=low (closes: Bug#172383) * default charset is now utf-8 (closes: Bug#172361) - * kdm in localized for pt_BR + * tdm in localized for pt_BR (closes: Bug#116046) -- Noel Koethe <noel@debian.org> Mon, 3 Feb 2003 20:42:00 +0100 diff --git a/ubuntu/maverick/tde-i18n/debian/control b/ubuntu/maverick/tde-i18n/debian/control index 66b972d43..f4bcf47de 100644 --- a/ubuntu/maverick/tde-i18n/debian/control +++ b/ubuntu/maverick/tde-i18n/debian/control @@ -1,5 +1,5 @@ Source: tde-i18n-trinity -Build-Depends: autoconf, debhelper (>= 5), tdelibs4-trinity-dev, gawk, gettext, bzip2, perl +Build-Depends: debhelper (>= 5), tdelibs4-trinity-dev, gawk, gettext, bzip2, perl, automake, autoconf, libtool, libltdl-dev Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> @@ -9,8 +9,8 @@ Standards-Version: 3.8.4 Package: tde-i18n-af-trinity Architecture: all Section: kde -Replaces: tde-i18n-af-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-af-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-af-trinity (<< 4:14.0.0) +Breaks: kde-i18n-af-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -21,8 +21,8 @@ Description: Afrikaans (af) internationalized (i18n) files for KDE Package: tde-i18n-ar-trinity Architecture: all Section: kde -Replaces: tde-i18n-ar-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-ar-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-ar-trinity (<< 4:14.0.0) +Breaks: kde-i18n-ar-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity-trinity @@ -33,8 +33,8 @@ Description: Arabic (ar) internationalized (i18n) files for KDE Package: tde-i18n-az-trinity Architecture: all Section: kde -Replaces: tde-i18n-az-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-az-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-az-trinity (<< 4:14.0.0) +Breaks: kde-i18n-az-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -45,8 +45,8 @@ Description: Azerbaijani (az) internationalized (i18n) files for KDE Package: tde-i18n-be-trinity Architecture: all Section: kde -Replaces: tde-i18n-be-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-be-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-be-trinity (<< 4:14.0.0) +Breaks: kde-i18n-be-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -57,8 +57,8 @@ Description: Belarusian (be) internationalized (i18n) files for KDE Package: tde-i18n-bg-trinity Architecture: all Section: kde -Replaces: tde-i18n-bg-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-bg-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-bg-trinity (<< 4:14.0.0) +Breaks: kde-i18n-bg-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -69,8 +69,8 @@ Description: Bulgarian (bg) internationalized (i18n) files for KDE Package: tde-i18n-bn-trinity Architecture: all Section: kde -Replaces: tde-i18n-bn-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-bn-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-bn-trinity (<< 4:14.0.0) +Breaks: kde-i18n-bn-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -81,8 +81,8 @@ Description: Bengali (bn) internationalized (i18n) files for KDE Package: tde-i18n-br-trinity Architecture: all Section: kde -Replaces: tde-i18n-br-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-br-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-br-trinity (<< 4:14.0.0) +Breaks: kde-i18n-br-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -93,8 +93,8 @@ Description: Breton (br) internationalized (i18n) files for KDE Package: tde-i18n-bs-trinity Architecture: all Section: kde -Replaces: tde-i18n-bs-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-bs-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-bs-trinity (<< 4:14.0.0) +Breaks: kde-i18n-bs-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -105,8 +105,8 @@ Description: Bosnian (bs) internationalized (i18n) files for KDE Package: tde-i18n-ca-trinity Architecture: all Section: kde -Replaces: tde-i18n-ca-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-ca-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-ca-trinity (<< 4:14.0.0) +Breaks: kde-i18n-ca-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -117,8 +117,8 @@ Description: Catalan (ca) internationalized (i18n) files for KDE Package: tde-i18n-cs-trinity Architecture: all Section: kde -Replaces: tde-i18n-cs-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-cs-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-cs-trinity (<< 4:14.0.0) +Breaks: kde-i18n-cs-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -129,8 +129,8 @@ Description: Czech (cs) internationalized (i18n) files for KDE Package: tde-i18n-csb-trinity Architecture: all Section: kde -Replaces: tde-i18n-csb-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-csb-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-csb-trinity (<< 4:14.0.0) +Breaks: kde-i18n-csb-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -141,8 +141,8 @@ Description: Kashubian (csb) internationalized (i18n) files for KDE Package: tde-i18n-cy-trinity Architecture: all Section: kde -Replaces: tde-i18n-cy-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-cy-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-cy-trinity (<< 4:14.0.0) +Breaks: kde-i18n-cy-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -153,8 +153,8 @@ Description: Welsh (cy) internationalized (i18n) files for KDE Package: tde-i18n-da-trinity Architecture: all Section: kde -Replaces: tde-i18n-da-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-da-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-da-trinity (<< 4:14.0.0) +Breaks: kde-i18n-da-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -165,8 +165,8 @@ Description: Danish (da) internationalized (i18n) files for KDE Package: tde-i18n-de-trinity Architecture: all Section: kde -Replaces: tde-i18n-de-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-de-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-de-trinity (<< 4:14.0.0) +Breaks: kde-i18n-de-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -177,8 +177,8 @@ Description: German (de) internationalized (i18n) files for KDE Package: tde-i18n-el-trinity Architecture: all Section: kde -Replaces: tde-i18n-el-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-el-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-el-trinity (<< 4:14.0.0) +Breaks: kde-i18n-el-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -189,8 +189,8 @@ Description: Greek (el) internationalized (i18n) files for KDE Package: tde-i18n-engb-trinity Architecture: all Section: kde -Replaces: tde-i18n-engb-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-engb-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-engb-trinity (<< 4:14.0.0) +Breaks: kde-i18n-engb-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -201,8 +201,8 @@ Description: British English (en_GB) internationalized (i18n) files for KDE Package: tde-i18n-eo-trinity Architecture: all Section: kde -Replaces: tde-i18n-eo-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-eo-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-eo-trinity (<< 4:14.0.0) +Breaks: kde-i18n-eo-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -213,8 +213,8 @@ Description: Esperanto (eo) internationalized (i18n) files for KDE Package: tde-i18n-es-trinity Architecture: all Section: kde -Replaces: tde-i18n-es-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-es-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-es-trinity (<< 4:14.0.0) +Breaks: kde-i18n-es-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -225,8 +225,8 @@ Description: Spanish (es) internationalized (i18n) files for KDE Package: tde-i18n-et-trinity Architecture: all Section: kde -Replaces: tde-i18n-et-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-et-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-et-trinity (<< 4:14.0.0) +Breaks: kde-i18n-et-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -237,8 +237,8 @@ Description: Estonian (et) internationalized (i18n) files for KDE Package: tde-i18n-eu-trinity Architecture: all Section: kde -Replaces: tde-i18n-eu-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-eu-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-eu-trinity (<< 4:14.0.0) +Breaks: kde-i18n-eu-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -249,8 +249,8 @@ Description: Basque (eu) internationalized (i18n) files for KDE Package: tde-i18n-fa-trinity Architecture: all Section: kde -Replaces: tde-i18n-fa-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-fa-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-fa-trinity (<< 4:14.0.0) +Breaks: kde-i18n-fa-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -261,8 +261,8 @@ Description: Farsi (Persian) (fa) internationalized (i18n) files for KDE Package: tde-i18n-fi-trinity Architecture: all Section: kde -Replaces: tde-i18n-fi-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-fi-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-fi-trinity (<< 4:14.0.0) +Breaks: kde-i18n-fi-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -273,8 +273,8 @@ Description: Finnish (fi) internationalized (i18n) files for KDE Package: tde-i18n-fr-trinity Architecture: all Section: kde -Replaces: tde-i18n-fr-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-fr-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-fr-trinity (<< 4:14.0.0) +Breaks: kde-i18n-fr-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -285,8 +285,8 @@ Description: French (fr) internationalized (i18n) files for KDE Package: tde-i18n-fy-trinity Architecture: all Section: kde -Replaces: tde-i18n-fy-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-fy-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-fy-trinity (<< 4:14.0.0) +Breaks: kde-i18n-fy-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -297,8 +297,8 @@ Description: Frisian (fy) internationalized (i18n) files for KDE Package: tde-i18n-ga-trinity Architecture: all Section: kde -Replaces: tde-i18n-ga-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-ga-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-ga-trinity (<< 4:14.0.0) +Breaks: kde-i18n-ga-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -309,8 +309,8 @@ Description: Irish Gaelic (ga) internationalized (i18n) files for KDE Package: tde-i18n-gl-trinity Architecture: all Section: kde -Replaces: tde-i18n-gl-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-gl-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-gl-trinity (<< 4:14.0.0) +Breaks: kde-i18n-gl-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -321,8 +321,8 @@ Description: Galician (gl) internationalized (i18n) files for KDE Package: tde-i18n-he-trinity Architecture: all Section: kde -Replaces: tde-i18n-he-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-he-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-he-trinity (<< 4:14.0.0) +Breaks: kde-i18n-he-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -333,8 +333,8 @@ Description: Hebrew (he) internationalized (i18n) files for KDE Package: tde-i18n-hi-trinity Architecture: all Section: kde -Replaces: tde-i18n-hi-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-hi-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-hi-trinity (<< 4:14.0.0) +Breaks: kde-i18n-hi-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -345,8 +345,8 @@ Description: Hindi (hi) internationalized (i18n) files for KDE Package: tde-i18n-hr-trinity Architecture: all Section: kde -Replaces: tde-i18n-hr-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-hr-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-hr-trinity (<< 4:14.0.0) +Breaks: kde-i18n-hr-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -357,8 +357,8 @@ Description: Croatian (hr) internationalized (i18n) files for KDE Package: tde-i18n-hu-trinity Architecture: all Section: kde -Replaces: tde-i18n-hu-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-hu-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-hu-trinity (<< 4:14.0.0) +Breaks: kde-i18n-hu-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -369,8 +369,8 @@ Description: Hungarian (hu) internationalized (i18n) files for KDE Package: tde-i18n-is-trinity Architecture: all Section: kde -Replaces: tde-i18n-is-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-is-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-is-trinity (<< 4:14.0.0) +Breaks: kde-i18n-is-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -381,8 +381,8 @@ Description: Icelandic (is) internationalized (i18n) files for KDE Package: tde-i18n-it-trinity Architecture: all Section: kde -Replaces: tde-i18n-it-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-it-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-it-trinity (<< 4:14.0.0) +Breaks: kde-i18n-it-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -393,8 +393,8 @@ Description: Italian (it) internationalized (i18n) files for KDE Package: tde-i18n-ja-trinity Architecture: all Section: kde -Replaces: tde-i18n-ja-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-ja-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-ja-trinity (<< 4:14.0.0) +Breaks: kde-i18n-ja-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -405,8 +405,8 @@ Description: Japanese (ja) internationalized (i18n) files for KDE Package: tde-i18n-kk-trinity Architecture: all Section: kde -Replaces: tde-i18n-kk-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-kk-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-kk-trinity (<< 4:14.0.0) +Breaks: kde-i18n-kk-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -417,8 +417,8 @@ Description: Kazakh (kk) internationalized (i18n) files for KDE Package: tde-i18n-km-trinity Architecture: all Section: kde -Replaces: tde-i18n-km-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-km-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-km-trinity (<< 4:14.0.0) +Breaks: kde-i18n-km-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -429,8 +429,8 @@ Description: Khmer (km) internationalized (i18n) files for KDE Package: tde-i18n-ko-trinity Architecture: all Section: kde -Replaces: tde-i18n-ko-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-ko-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-ko-trinity (<< 4:14.0.0) +Breaks: kde-i18n-ko-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -441,8 +441,8 @@ Description: Korean (ko) internationalized (i18n) files for KDE Package: tde-i18n-lt-trinity Architecture: all Section: kde -Replaces: tde-i18n-lt-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-lt-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-lt-trinity (<< 4:14.0.0) +Breaks: kde-i18n-lt-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -453,8 +453,8 @@ Description: Lithuanian (lt) internationalized (i18n) files for KDE Package: tde-i18n-lv-trinity Architecture: all Section: kde -Replaces: tde-i18n-lv-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-lv-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-lv-trinity (<< 4:14.0.0) +Breaks: kde-i18n-lv-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -465,8 +465,8 @@ Description: Latvian (lv) internationalized (i18n) files for KDE Package: tde-i18n-mk-trinity Architecture: all Section: kde -Replaces: tde-i18n-mk-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-mk-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-mk-trinity (<< 4:14.0.0) +Breaks: kde-i18n-mk-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -477,8 +477,8 @@ Description: Macedonian (mk) internationalized (i18n) files for KDE Package: tde-i18n-mn-trinity Architecture: all Section: kde -Replaces: tde-i18n-mn-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-mn-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-mn-trinity (<< 4:14.0.0) +Breaks: kde-i18n-mn-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -489,8 +489,8 @@ Description: Mongolian (mn) internationalized (i18n) files for KDE Package: tde-i18n-ms-trinity Architecture: all Section: kde -Replaces: tde-i18n-ms-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-ms-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-ms-trinity (<< 4:14.0.0) +Breaks: kde-i18n-ms-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -501,8 +501,8 @@ Description: Malay (ms) internationalized (i18n) files for KDE Package: tde-i18n-nb-trinity Architecture: all Section: kde -Replaces: tde-i18n-nb-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-nb-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-nb-trinity (<< 4:14.0.0) +Breaks: kde-i18n-nb-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity, tde-i18n-no @@ -513,8 +513,8 @@ Description: Norwegian Bookmal (nb) internationalized (i18n) files for KDE Package: tde-i18n-nds-trinity Architecture: all Section: kde -Replaces: tde-i18n-nds-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-nds-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-nds-trinity (<< 4:14.0.0) +Breaks: kde-i18n-nds-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -525,8 +525,8 @@ Description: Low Saxon (nds) internationalized (i18n) files for KDE Package: tde-i18n-nl-trinity Architecture: all Section: kde -Replaces: tde-i18n-nl-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-nl-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-nl-trinity (<< 4:14.0.0) +Breaks: kde-i18n-nl-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -537,8 +537,8 @@ Description: Dutch (nl) internationalized (i18n) files for KDE Package: tde-i18n-nn-trinity Architecture: all Section: kde -Replaces: tde-i18n-nn-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-nn-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-nn-trinity (<< 4:14.0.0) +Breaks: kde-i18n-nn-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Description: Norwegian Nynorsk (nn) internationalized (i18n) files for KDE @@ -548,8 +548,8 @@ Description: Norwegian Nynorsk (nn) internationalized (i18n) files for KDE Package: tde-i18n-pa-trinity Architecture: all Section: kde -Replaces: tde-i18n-pa-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-pa-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-pa-trinity (<< 4:14.0.0) +Breaks: kde-i18n-pa-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -560,8 +560,8 @@ Description: Punjabi (pa) internationalized (i18n) files for KDE Package: tde-i18n-pl-trinity Architecture: all Section: kde -Replaces: tde-i18n-pl-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-pl-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-pl-trinity (<< 4:14.0.0) +Breaks: kde-i18n-pl-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -572,8 +572,8 @@ Description: Polish (pl) internationalized (i18n) files for KDE Package: tde-i18n-pt-trinity Architecture: all Section: kde -Replaces: tde-i18n-pt-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-pt-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-pt-trinity (<< 4:14.0.0) +Breaks: kde-i18n-pt-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -584,8 +584,8 @@ Description: Portuguese (pt) internationalized (i18n) files for KDE Package: tde-i18n-ptbr-trinity Architecture: all Section: kde -Replaces: tde-i18n-ptbr-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-ptbr-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-ptbr-trinity (<< 4:14.0.0) +Breaks: kde-i18n-ptbr-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -596,8 +596,8 @@ Description: Brazilian Portuguese (pt_BR) internationalized (i18n) files for KDE Package: tde-i18n-ro-trinity Architecture: all Section: kde -Replaces: tde-i18n-ro-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-ro-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-ro-trinity (<< 4:14.0.0) +Breaks: kde-i18n-ro-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -608,8 +608,8 @@ Description: Romanian (ro) internationalized (i18n) files for KDE Package: tde-i18n-ru-trinity Architecture: all Section: kde -Replaces: tde-i18n-ru-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-ru-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-ru-trinity (<< 4:14.0.0) +Breaks: kde-i18n-ru-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -620,8 +620,8 @@ Description: Russian (ru) internationalized (i18n) files for KDE Package: tde-i18n-rw-trinity Architecture: all Section: kde -Replaces: tde-i18n-rw-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-rw-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-rw-trinity (<< 4:14.0.0) +Breaks: kde-i18n-rw-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -632,8 +632,8 @@ Description: Kinyarwanda (rw) internationalized (i18n) files for KDE Package: tde-i18n-se-trinity Architecture: all Section: kde -Replaces: tde-i18n-se-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-se-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-se-trinity (<< 4:14.0.0) +Breaks: kde-i18n-se-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -644,8 +644,8 @@ Description: Northern Sami (se) internationalized (i18n) files for KDE Package: tde-i18n-sk-trinity Architecture: all Section: kde -Replaces: tde-i18n-sk-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-sk-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-sk-trinity (<< 4:14.0.0) +Breaks: kde-i18n-sk-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -656,8 +656,8 @@ Description: Slovak (sk) internationalized (i18n) files for KDE Package: tde-i18n-sl-trinity Architecture: all Section: kde -Replaces: tde-i18n-sl-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-sl-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-sl-trinity (<< 4:14.0.0) +Breaks: kde-i18n-sl-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -668,8 +668,8 @@ Description: Slovenian (sl) internationalized (i18n) files for KDE Package: tde-i18n-sr-trinity Architecture: all Section: kde -Replaces: tde-i18n-sr-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-sr-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-sr-trinity (<< 4:14.0.0) +Breaks: kde-i18n-sr-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -680,8 +680,8 @@ Description: Serbian (sr) internationalized (i18n) files for KDE Package: tde-i18n-ss-trinity Architecture: all Section: kde -Replaces: tde-i18n-ss-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-ss-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-ss-trinity (<< 4:14.0.0) +Breaks: kde-i18n-ss-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -692,8 +692,8 @@ Description: Swati (ss) internationalized (i18n) files for KDE Package: tde-i18n-srlatin-trinity Architecture: all Section: kde -Replaces: tde-i18n-srlatin-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-srlatin-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-srlatin-trinity (<< 4:14.0.0) +Breaks: kde-i18n-srlatin-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -704,8 +704,8 @@ Description: Latin Serbian (sr@Latn) internationalized (i18n) files for KDE Package: tde-i18n-sv-trinity Architecture: all Section: kde -Replaces: tde-i18n-sv-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-sv-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-sv-trinity (<< 4:14.0.0) +Breaks: kde-i18n-sv-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -716,8 +716,8 @@ Description: Swedish (sv) internationalized (i18n) files for KDE Package: tde-i18n-ta-trinity Architecture: all Section: kde -Replaces: tde-i18n-ta-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-ta-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-ta-trinity (<< 4:14.0.0) +Breaks: kde-i18n-ta-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -728,8 +728,8 @@ Description: Tamil (ta) internationalized (i18n) files for KDE Package: tde-i18n-te-trinity Architecture: all Section: kde -Replaces: tde-i18n-te-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-te-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-te-trinity (<< 4:14.0.0) +Breaks: kde-i18n-te-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -740,8 +740,8 @@ Description: Telugu (te) internationalized (i18n) files for KDE Package: tde-i18n-tg-trinity Architecture: all Section: kde -Replaces: tde-i18n-tg-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-tg-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-tg-trinity (<< 4:14.0.0) +Breaks: kde-i18n-tg-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -752,8 +752,8 @@ Description: Tajik (tg) internationalized (i18n) files for KDE Package: tde-i18n-th-trinity Architecture: all Section: kde -Replaces: tde-i18n-th-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-th-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-th-trinity (<< 4:14.0.0) +Breaks: kde-i18n-th-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -764,8 +764,8 @@ Description: Thai (th) internationalized (i18n) files for KDE Package: tde-i18n-tr-trinity Architecture: all Section: kde -Replaces: tde-i18n-tr-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-tr-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-tr-trinity (<< 4:14.0.0) +Breaks: kde-i18n-tr-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -776,8 +776,8 @@ Description: Turkish (tr) internationalized (i18n) files for KDE Package: tde-i18n-uk-trinity Architecture: all Section: kde -Replaces: tde-i18n-uk-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-uk-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-uk-trinity (<< 4:14.0.0) +Breaks: kde-i18n-uk-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -788,8 +788,8 @@ Description: Ukrainian (uk) internationalized (i18n) files for KDE Package: tde-i18n-uz-trinity Architecture: all Section: kde -Replaces: tde-i18n-uz-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-uz-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-uz-trinity (<< 4:14.0.0) +Breaks: kde-i18n-uz-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -801,8 +801,8 @@ Description: Uzbek (uz) internationalized (i18n) files for KDE Package: tde-i18n-uzcyrillic-trinity Architecture: all Section: kde -Replaces: tde-i18n-uzcyrillic-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-uzcyrillic-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-uzcyrillic-trinity (<< 4:14.0.0) +Breaks: kde-i18n-uzcyrillic-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -813,8 +813,8 @@ Description: Cyrillic Uzbek (uz@cyrillic) internationalized (i18n) files for KDE Package: tde-i18n-vi-trinity Architecture: all Section: kde -Replaces: tde-i18n-vi-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-vi-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-vi-trinity (<< 4:14.0.0) +Breaks: kde-i18n-vi-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -825,8 +825,8 @@ Description: Vietnamese (vi) internationalized (i18n) files for KDE Package: tde-i18n-wa-trinity Architecture: all Section: kde -Replaces: tde-i18n-wa-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-wa-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-wa-trinity (<< 4:14.0.0) +Breaks: kde-i18n-wa-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -837,8 +837,8 @@ Description: Walloon (wa) internationalized (i18n) files for KDE Package: tde-i18n-zhcn-trinity Architecture: all Section: kde -Replaces: tde-i18n-zhcn-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-zhcn-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-zhcn-trinity (<< 4:14.0.0) +Breaks: kde-i18n-zhcn-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity @@ -849,8 +849,8 @@ Description: Chinese Simplified (zh_CN) internationalized (i18n) files for KDE Package: tde-i18n-zhtw-trinity Architecture: all Section: kde -Replaces: tde-i18n-zhtw-kde3 (<< 4:3.5.13) -Breaks: tde-i18n-zhtw-kde3 (<< 4:3.5.13) +Replaces: kde-i18n-zhtw-trinity (<< 4:14.0.0) +Breaks: kde-i18n-zhtw-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde Provides: tde-i18n-trinity diff --git a/ubuntu/maverick/tde-i18n/debian/rules b/ubuntu/maverick/tde-i18n/debian/rules index cdafc3d0f..f49804687 100755 --- a/ubuntu/maverick/tde-i18n/debian/rules +++ b/ubuntu/maverick/tde-i18n/debian/rules @@ -6,13 +6,13 @@ I18N_DIR_PREFIX := tde-i18n #I18N_VERSION := $(shell cat debian/changelog | head -n1 | sed 's/.*(\([[:digit:]]\+:\)\?\(.\+\)-.\+).*/\2/') I18N_VERSION := 3.5.10 -I18N_DIR_PAT := $(I18N_DIR_PREFIX)-%-$(I18N_VERSION) -I18N_DIRS := $(subst .tar.bz2,,$(wildcard $(I18N_DIR_PREFIX)-*-$(I18N_VERSION).tar.bz2)) +I18N_DIR_PAT := $(I18N_DIR_PREFIX)-% +I18N_DIRS := $(wildcard $(I18N_DIR_PREFIX)-*) I18N_PATCHES := $(wildcard debian/patches/*.diff) # Stamps and support variables cur_lang = $(word 2,$(subst __, ,$@)) -cur_lang_dir = $(patsubst %,$(I18N_DIR_PREFIX)-%-$(I18N_VERSION),$(cur_lang)) +cur_lang_dir = $(patsubst %,$(I18N_DIR_PREFIX)-%,$(cur_lang)) cur_lang_patch = $(patsubst %,debian/patches/%.diff,$(cur_lang)) cur_pkg = $(I18N_DIR_PREFIX)-$(cur_lang) @@ -49,12 +49,12 @@ build:: build:: $(STAMP_EXTRACT) patch $(STAMP_BUILD) $(STAMP_EXTRACT): - tar xfj $(cur_lang_dir).tar.bz2 +# tar xfj $(cur_lang_dir).tar.bz2 @touch $@ $(STAMP_BUILD): # Building the '$(cur_lang)' language ... - cd $(cur_lang_dir) && ./configure $(configkde) && $(MAKE) + cd $(cur_lang_dir) && autoreconf && automake -f && $(MAKE) -f ../admin/Makefile.common && ./configure $(configkde) && $(MAKE) touch $@ diff --git a/ubuntu/maverick/tde-i18n/debian/source/format b/ubuntu/maverick/tde-i18n/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/tde-i18n/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/tde-i18n/debian/source/options b/ubuntu/maverick/tde-i18n/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/tde-i18n/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/tdeaccessibility/debian/control b/ubuntu/maverick/tdeaccessibility/debian/control index 9bdfff8d9..0adaaa9f0 100644 --- a/ubuntu/maverick/tdeaccessibility/debian/control +++ b/ubuntu/maverick/tdeaccessibility/debian/control @@ -10,8 +10,8 @@ Standards-Version: 3.8.4 Package: tdeaccessibility-trinity Section: kde Architecture: all -Replaces: tdeaccessibility-kde3 (<< 4:3.5.13) -Breaks: tdeaccessibility-kde3 (<< 4:3.5.13) +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}) Suggests: kttsd-contrib-plugins-trinity (>= ${Source-Version}), tdeaccessibility-trinity-doc-html (>= ${Source-Version}) @@ -29,8 +29,8 @@ Description: accessibility packages from the official Trinity release Package: tdeaccessibility-trinity-doc-html Architecture: all Section: doc -Replaces: tdeaccessibility-kde3-doc-html (<< 4:3.5.13) -Breaks: tdeaccessibility-kde3-doc-html (<< 4:3.5.13) +Replaces: kdeaccessibility-trinity-doc-html (<< 4:14.0.0) +Breaks: kdeaccessibility-trinity-doc-html (<< 4:14.0.0) Suggests: konqueror-trinity | www-browser, tdebase-trinity Description: KDE accessibility documentation in HTML format By default the modules provided by KDE only provide their documentation @@ -49,8 +49,8 @@ Description: KDE accessibility documentation in HTML format Package: kde-icons-mono-trinity Section: kde Architecture: all -Replaces: kde-icons-mono-kde3 (<< 4:3.5.13) -Breaks: kde-icons-mono-kde3 (<< 4:3.5.13) +Replaces: kde-icons-mono-trinity (<< 4:14.0.0) +Breaks: kde-icons-mono-trinity (<< 4:14.0.0) Description: a monochromatic icons theme for KDE A monochromatic icon theme for KDE, designed for accessibility purposes. . @@ -60,8 +60,8 @@ Description: a monochromatic icons theme for KDE Package: kbstate-trinity Section: utils Architecture: any -Replaces: kbstate-kde3 (<< 4:3.5.13) -Breaks: kbstate-kde3 (<< 4:3.5.13) +Replaces: kbstate-trinity (<< 4:14.0.0) +Breaks: kbstate-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: a keyboard status applet for KDE @@ -73,8 +73,8 @@ Description: a keyboard status applet for KDE Package: kmag-trinity Section: utils Architecture: any -Replaces: kmag-kde3 (<< 4:3.5.13) -Breaks: kmag-kde3 (<< 4:3.5.13) +Replaces: kmag-trinity (<< 4:14.0.0) +Breaks: kmag-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: a screen magnifier for KDE @@ -91,8 +91,8 @@ Description: a screen magnifier for KDE Package: kmousetool-trinity Section: utils Architecture: any -Replaces: kmousetool-kde3 (<< 4:3.5.13) -Breaks: kmousetool-kde3 (<< 4:3.5.13) +Replaces: kmousetool-trinity (<< 4:14.0.0) +Breaks: kmousetool-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: KDE mouse manipulation tool for the disabled @@ -106,8 +106,8 @@ Description: KDE mouse manipulation tool for the disabled Package: kmouth-trinity Section: utils Architecture: any -Replaces: kmouth-kde3 (<< 4:3.5.13) -Breaks: kmouth-kde3 (<< 4:3.5.13) +Replaces: kmouth-trinity (<< 4:14.0.0) +Breaks: kmouth-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: a type-and-say KDE frontend for speech synthesizers @@ -122,8 +122,8 @@ Description: a type-and-say KDE frontend for speech synthesizers Package: ksayit-trinity Section: utils Architecture: any -Replaces: ksayit-kde3 (<< 4:3.5.13) -Breaks: ksayit-kde3 (<< 4:3.5.13) +Replaces: ksayit-trinity (<< 4:14.0.0) +Breaks: ksayit-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: a frontend for the KDE Text-to-Speech system @@ -136,8 +136,8 @@ Description: a frontend for the KDE Text-to-Speech system Package: kttsd-trinity Section: utils Architecture: any -Replaces: kttsd-kde3 (<< 4:3.5.13) -Breaks: kttsd-kde3 (<< 4:3.5.13) +Replaces: kttsd-trinity (<< 4:14.0.0) +Breaks: kttsd-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: ksayit-trinity (= ${Source-Version}) | kmouth-trinity (= ${Source-Version}), festival | flite | epos Suggests: kttsd-contrib-plugins-trinity (= ${Source-Version}) @@ -156,8 +156,8 @@ Description: a Text-to-Speech system for KDE Package: kttsd-contrib-plugins-trinity Section: utils Architecture: any -Replaces: kttsd-contrib-plugins-kde3 (<< 4:3.5.13) -Breaks: kttsd-contrib-plugins-kde3 (<< 4:3.5.13) +Replaces: kttsd-contrib-plugins-trinity (<< 4:14.0.0) +Breaks: kttsd-contrib-plugins-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: the KDE Text-to-Speech system kttsd synthetizer plugins that depends on non-free software : @@ -172,8 +172,8 @@ Description: the KDE Text-to-Speech system Package: tdeaccessibility-trinity-dbg Section: libdevel Architecture: any -Replaces: tdeaccessibility-kde3-dbg (<< 4:3.5.13) -Breaks: tdeaccessibility-kde3-dbg (<< 4:3.5.13) +Replaces: kdeaccessibility-trinity-dbg (<< 4:14.0.0) +Breaks: kdeaccessibility-trinity-dbg (<< 4:14.0.0) Depends: tdelibs-trinity-dbg Priority: extra Description: debugging symbols for tdeaccessibility-trinity diff --git a/ubuntu/maverick/tdeaccessibility/debian/source/format b/ubuntu/maverick/tdeaccessibility/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/tdeaccessibility/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/tdeaccessibility/debian/source/options b/ubuntu/maverick/tdeaccessibility/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/tdeaccessibility/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/tdeaddons/debian/control b/ubuntu/maverick/tdeaddons/debian/control index d106c2e74..1cdd28ec6 100644 --- a/ubuntu/maverick/tdeaddons/debian/control +++ b/ubuntu/maverick/tdeaddons/debian/control @@ -10,8 +10,8 @@ Standards-Version: 3.8.4 Package: tdeaddons-trinity Architecture: all Section: kde -Replaces: tdeaddons-kde3 (<< 4:3.5.13) -Breaks: tdeaddons-kde3 (<< 4:3.5.13) +Replaces: kdeaddons-trinity (<< 4:14.0.0) +Breaks: kdeaddons-trinity (<< 4:14.0.0) Depends: atlantikdesigner-trinity (>= ${Source-Version}), kaddressbook-plugins-trinity (>= ${Source-Version}), kate-plugins-trinity (>= ${Source-Version}), tdeaddons-kfile-plugins-trinity (>= ${Source-Version}), kicker-applets-trinity (>= ${Source-Version}), konq-plugins-trinity (>= ${Source-Version}), ksig-trinity (>= ${Source-Version}), noatun-plugins-trinity (>= ${Source-Version}) Suggests: tdeaddons-trinity-doc-html Description: add-on plugins and applets provided with Trinity @@ -26,8 +26,8 @@ Description: add-on plugins and applets provided with Trinity Package: tdeaddons-trinity-doc-html Architecture: all Section: doc -Replaces: tdeaddons-kde3-doc-html (<< 4:3.5.13) -Breaks: tdeaddons-kde3-doc-html (<< 4:3.5.13) +Replaces: kdeaddons-trinity-doc-html (<< 4:14.0.0) +Breaks: kdeaddons-trinity-doc-html (<< 4:14.0.0) Suggests: konqueror-trinity | www-browser, tdeaddons-trinity Description: KDE add-ons documentation in HTML format By default the modules provided by KDE only provide their documentation @@ -46,8 +46,8 @@ Description: KDE add-ons documentation in HTML format Package: atlantikdesigner-trinity Architecture: any Section: games -Replaces: atlantikdesigner-kde3 (<< 4:3.5.13) -Breaks: atlantikdesigner-kde3 (<< 4:3.5.13) +Replaces: atlantikdesigner-trinity (<< 4:14.0.0) +Breaks: atlantikdesigner-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Enhances: atlantik-trinity Description: game board designer for Atlantik @@ -65,8 +65,8 @@ Description: game board designer for Atlantik Package: kaddressbook-plugins-trinity Architecture: any Section: kde -Replaces: kaddressbook-plugins-kde3 (<< 4:3.5.13) -Breaks: kaddressbook-plugins-kde3 (<< 4:3.5.13) +Replaces: kaddressbook-plugins-trinity (<< 4:14.0.0) +Breaks: kaddressbook-plugins-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: kworldclock-trinity, khelpcenter-trinity, tdeaddons-trinity-doc-html Enhances: kaddressbook-trinity @@ -84,8 +84,8 @@ Description: plugins for KAddressBook, the Trinity address book Package: kate-plugins-trinity Architecture: any Section: editors -Replaces: kate-plugins-kde3 (<< 4:3.5.13) -Breaks: kate-plugins-kde3 (<< 4:3.5.13) +Replaces: kate-plugins-trinity (<< 4:14.0.0) +Breaks: kate-plugins-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tidy Suggests: khelpcenter-trinity, tdeaddons-trinity-doc-html, kaddressbook-trinity Enhances: kate-trinity @@ -105,8 +105,8 @@ Description: plugins for Kate, the KDE Advanced Text Editor Package: tdeaddons-kfile-plugins-trinity Architecture: any Section: kde -Replaces: tdeaddons-kfile-plugins-kde3 (<< 4:3.5.13) -Breaks: tdeaddons-kfile-plugins-kde3 (<< 4:3.5.13) +Replaces: kdeaddons-kfile-plugins-trinity (<< 4:14.0.0) +Breaks: kdeaddons-kfile-plugins-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Provides: renamedlg-plugins-trinity Description: Trinity file dialog plugins for text files and folders @@ -126,8 +126,8 @@ Description: Trinity file dialog plugins for text files and folders Package: kicker-applets-trinity Architecture: any Section: kde -Replaces: kicker-applets-kde3 (<< 4:3.5.13) -Breaks: kicker-applets-kde3 (<< 4:3.5.13) +Replaces: kicker-applets-trinity (<< 4:14.0.0) +Breaks: kicker-applets-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, kicker-trinity Suggests: xmms-kde-trinity, khelpcenter-trinity, tdeaddons-trinity-doc-html Provides: ktimemon-trinity @@ -149,8 +149,8 @@ Description: applets for Kicker, the Trinity panel Package: knewsticker-scripts-trinity Architecture: all Section: kde -Replaces: knewsticker-scripts-kde3 (<< 4:3.5.13) -Breaks: knewsticker-scripts-kde3 (<< 4:3.5.13) +Replaces: knewsticker-scripts-trinity (<< 4:14.0.0) +Breaks: knewsticker-scripts-trinity (<< 4:14.0.0) Depends: ${perl:Depends}, python, libfinance-quote-perl, libmime-perl, libnews-nntpclient-perl, libwww-perl Recommends: knewsticker-trinity Enhances: knewsticker-trinity @@ -168,8 +168,8 @@ Description: scripts for KNewsTicker, the Trinity news ticker Package: konq-plugins-trinity Architecture: any Section: kde -Replaces: konq-plugins-kde3 (<< 4:3.5.13) -Breaks: konq-plugins-kde3 (<< 4:3.5.13) +Replaces: konq-plugins-trinity (<< 4:14.0.0) +Breaks: konq-plugins-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, libjpeg-progs, python, rsync, unison Recommends: akregator-trinity, ark-trinity, imagemagick Suggests: khelpcenter-trinity, tdeaddons-trinity-doc-html @@ -197,8 +197,8 @@ Description: plugins for Konqueror, the Trinity file/web/doc browser Package: ksig-trinity Architecture: any Section: kde -Replaces: ksig-kde3 (<< 4:3.5.13) -Breaks: ksig-kde3 (<< 4:3.5.13) +Replaces: ksig-trinity (<< 4:14.0.0) +Breaks: ksig-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: kmail-trinity Enhances: kmail-trinity @@ -218,8 +218,8 @@ Description: graphical tool for managing multiple email signatures Package: noatun-plugins-trinity Architecture: any Section: sound -Replaces: noatun-plugins-kde3 (<< 4:3.5.13) -Breaks: noatun-plugins-kde3 (<< 4:3.5.13) +Replaces: noatun-plugins-trinity (<< 4:14.0.0) +Breaks: noatun-plugins-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Enhances: noatun-trinity Description: plugins for Noatun, the Trinity media player @@ -237,8 +237,8 @@ Description: plugins for Noatun, the Trinity media player Package: tdeaddons-trinity-dbg Section: libdevel Architecture: any -Replaces: tdeaddons-kde3-dbg (<< 4:3.5.13) -Breaks: tdeaddons-kde3-dbg (<< 4:3.5.13) +Replaces: kdeaddons-trinity-dbg (<< 4:14.0.0) +Breaks: kdeaddons-trinity-dbg (<< 4:14.0.0) Depends: tdelibs-trinity-dbg Priority: extra Description: debugging symbols for tdeaddons-trinity diff --git a/ubuntu/maverick/tdeaddons/debian/source/format b/ubuntu/maverick/tdeaddons/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/tdeaddons/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/tdeaddons/debian/source/options b/ubuntu/maverick/tdeaddons/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/tdeaddons/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/tdeadmin/debian/control b/ubuntu/maverick/tdeadmin/debian/control index c12e794f5..76819b941 100644 --- a/ubuntu/maverick/tdeadmin/debian/control +++ b/ubuntu/maverick/tdeadmin/debian/control @@ -10,8 +10,8 @@ Standards-Version: 3.8.4 Package: tdeadmin-trinity Section: kde Architecture: all -Replaces: tdeadmin-kde3 (<< 4:3.5.13) -Breaks: tdeadmin-kde3 (<< 4:3.5.13) +Replaces: kdeadmin-trinity (<< 4:14.0.0) +Breaks: kdeadmin-trinity (<< 4:14.0.0) Depends: kcron-trinity (>= ${Source-Version}), kdat-trinity (>= ${Source-Version}), tdeadmin-kfile-plugins-trinity (>= ${Source-Version}), knetworkconf-trinity (>= ${Source-Version}), kpackage-trinity (>= ${Source-Version}), ksysv-trinity (>= ${Source-Version}), kuser-trinity (>= ${Source-Version}) Recommends: lilo-config-trinity (>= ${Source-Version}) Suggests: tdeadmin-trinity-doc-html (>= ${Source-Version}) @@ -27,8 +27,8 @@ Description: system administration tools from the official Trinity release Package: tdeadmin-trinity-doc-html Architecture: all Section: doc -Replaces: tdeadmin-kde3-doc-html (<< 4:3.5.13) -Breaks: tdeadmin-kde3-doc-html (<< 4:3.5.13) +Replaces: kdeadmin-trinity-doc-html (<< 4:14.0.0) +Breaks: kdeadmin-trinity-doc-html (<< 4:14.0.0) Suggests: konqueror-trinity | www-browser, tdebase-trinity Description: KDE administration documentation in HTML format By default the modules provided by KDE only provide their documentation @@ -47,8 +47,8 @@ Description: KDE administration documentation in HTML format Package: kcron-trinity Section: admin Architecture: any -Replaces: kcron-kde3 (<< 4:3.5.13) -Breaks: kcron-kde3 (<< 4:3.5.13) +Replaces: kcron-trinity (<< 4:14.0.0) +Breaks: kcron-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: the Trinity crontab editor @@ -61,8 +61,8 @@ Description: the Trinity crontab editor Package: kdat-trinity Section: admin Architecture: any -Replaces: kdat-kde3 (<< 4:3.5.13) -Breaks: kdat-kde3 (<< 4:3.5.13) +Replaces: kdat-trinity (<< 4:14.0.0) +Breaks: kdat-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: a Trinity tape backup tool @@ -82,8 +82,8 @@ Description: a Trinity tape backup tool Package: tdeadmin-kfile-plugins-trinity Section: kde Architecture: any -Replaces: tdeadmin-kfile-plugins-kde3 (<< 4:3.5.13) -Breaks: tdeadmin-kfile-plugins-kde3 (<< 4:3.5.13) +Replaces: kdeadmin-kfile-plugins-trinity (<< 4:14.0.0) +Breaks: kdeadmin-kfile-plugins-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Trinity file metainfo plugins for deb and rpm files File metainfo plugins for deb and rpm package files. @@ -94,8 +94,8 @@ Description: Trinity file metainfo plugins for deb and rpm files Package: knetworkconf-trinity Section: kde Architecture: any -Replaces: knetworkconf-kde3 (<< 4:3.5.13) -Breaks: knetworkconf-kde3 (<< 4:3.5.13) +Replaces: knetworkconf-trinity (<< 4:14.0.0) +Breaks: knetworkconf-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Trinity network configuration tool This is a KDE control center module to configure TCP/IP settings. It @@ -107,8 +107,8 @@ Description: Trinity network configuration tool Package: kpackage-trinity Section: admin Architecture: any -Replaces: kpackage-kde3 (<< 4:3.5.13) -Breaks: kpackage-kde3 (<< 4:3.5.13) +Replaces: kpackage-trinity (<< 4:14.0.0) +Breaks: kpackage-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: rpm Suggests: khelpcenter-trinity @@ -123,8 +123,8 @@ Description: Trinity package management tool Package: ksysv-trinity Section: admin Architecture: any -Replaces: ksysv-kde3 (<< 4:3.5.13) -Breaks: ksysv-kde3 (<< 4:3.5.13) +Replaces: ksysv-trinity (<< 4:14.0.0) +Breaks: ksysv-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: Trinity SysV-style init configuration editor @@ -137,8 +137,8 @@ Description: Trinity SysV-style init configuration editor Package: kuser-trinity Section: admin Architecture: any -Replaces: kuser-kde3 (<< 4:3.5.13) -Breaks: kuser-kde3 (<< 4:3.5.13) +Replaces: kuser-trinity (<< 4:14.0.0) +Breaks: kuser-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: Trinity user/group administration tool @@ -150,8 +150,8 @@ Description: Trinity user/group administration tool Package: lilo-config-trinity Section: kde Architecture: none -Replaces: lilo-config-kde3 (<< 4:3.5.13) -Breaks: lilo-config-kde3 (<< 4:3.5.13) +Replaces: lilo-config-trinity (<< 4:14.0.0) +Breaks: lilo-config-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, kcontrol-trinity Recommends: tdebase-trinity-bin Suggests: lilo @@ -168,8 +168,8 @@ Description: Trinity frontend for lilo configuration Package: tdeadmin-trinity-dbg Section: libdevel Architecture: any -Replaces: tdeadmin-kde3-dbg (<< 4:3.5.13) -Breaks: tdeadmin-kde3-dbg (<< 4:3.5.13) +Replaces: kdeadmin-trinity-dbg (<< 4:14.0.0) +Breaks: kdeadmin-trinity-dbg (<< 4:14.0.0) Depends: tdelibs-trinity-dbg Priority: extra Description: debugging symbols for tdeadmin-trinity diff --git a/ubuntu/maverick/tdeadmin/debian/source/format b/ubuntu/maverick/tdeadmin/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/tdeadmin/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/tdeadmin/debian/source/options b/ubuntu/maverick/tdeadmin/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/tdeadmin/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/tdeartwork/debian/changelog b/ubuntu/maverick/tdeartwork/debian/changelog index f0bfe7054..a3043310e 100644 --- a/ubuntu/maverick/tdeartwork/debian/changelog +++ b/ubuntu/maverick/tdeartwork/debian/changelog @@ -486,10 +486,10 @@ tdeartwork (4:3.2.3-1) unstable; urgency=low * Rebuilt against STL-enabled Qt and corresponding tdelibs (closes: #254021). * Patched the autoconf tests for kxsconfig so that xscreensaver configuration works again (closes: #238180, #243150). - * Suggests (kwin | x-window-manager) for kdewallpapers instead of just + * Suggests (twin | x-window-manager) for kdewallpapers instead of just x-window-manager. - * Removed recommends: kwin from tdeartwork-theme-window since this is - already coming in as a depends from the kwin shlibs file. + * Removed recommends: twin from tdeartwork-theme-window since this is + already coming in as a depends from the twin shlibs file. -- Ben Burton <bab@debian.org> Tue, 15 Jun 2004 08:38:18 +1000 diff --git a/ubuntu/maverick/tdeartwork/debian/control b/ubuntu/maverick/tdeartwork/debian/control index 34956beb8..510797e8e 100644 --- a/ubuntu/maverick/tdeartwork/debian/control +++ b/ubuntu/maverick/tdeartwork/debian/control @@ -4,15 +4,15 @@ Priority: optional Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-trinity-dev, gawk, gettext, sharutils, tdebase-trinity-dev, kwin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-trinity-dev, gawk, gettext, sharutils, tdebase-trinity-dev, twin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies, automake, autoconf, libtool, libltdl-dev Build-Conflicts: autoconf2.13, nvidia-glx Standards-Version: 3.8.4 Package: tdeartwork-trinity Architecture: all Section: kde -Replaces: tdeartwork-kde3 (<< 4:3.5.13) -Breaks: tdeartwork-kde3 (<< 4:3.5.13) +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}), kscreensaver-trinity (>= ${Source-Version}) Recommends: kscreensaver-xsavers-trinity Description: themes, styles and more from the official Trinity release @@ -30,8 +30,8 @@ Description: themes, styles and more from the official Trinity release Package: tdeartwork-emoticons-trinity Architecture: all Section: kde -Replaces: tdeartwork-emoticons-kde3 (<< 4:3.5.13) -Breaks: tdeartwork-emoticons-kde3 (<< 4:3.5.13) +Replaces: kdeartwork-emoticons-trinity (<< 4:14.0.0) +Breaks: kdeartwork-emoticons-trinity (<< 4:14.0.0) Enhances: kopete-trinity Description: emoticon collections for KDE chat clients This package contains several collections of emoticons used by official @@ -43,8 +43,8 @@ Description: emoticon collections for KDE chat clients Package: tdeartwork-misc-trinity Architecture: all Section: kde -Replaces: tdeartwork-misc-kde3 (<< 4:3.5.13) -Breaks: tdeartwork-misc-kde3 (<< 4:3.5.13) +Replaces: kdeartwork-misc-trinity (<< 4:14.0.0) +Breaks: kdeartwork-misc-trinity (<< 4:14.0.0) Suggests: kworldclock Description: various multimedia goodies released with KDE This package contains miscellaneous multimedia goodies for KDE. @@ -56,8 +56,8 @@ Description: various multimedia goodies released with KDE Package: tdeartwork-style-trinity Architecture: any Section: kde -Replaces: tdeartwork-style-kde3 (<< 4:3.5.13) -Breaks: tdeartwork-style-kde3 (<< 4:3.5.13) +Replaces: kdeartwork-style-trinity (<< 4:14.0.0) +Breaks: kdeartwork-style-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: widget styles released with Trinity This package contains additional widget styles for Trinity. Widget styles @@ -71,8 +71,8 @@ Description: widget styles released with Trinity Package: tdeartwork-theme-icon-trinity Architecture: all Section: kde -Replaces: tdeartwork-theme-icon-kde3 (<< 4:3.5.13) -Breaks: tdeartwork-theme-icon-kde3 (<< 4:3.5.13) +Replaces: kdeartwork-theme-icon-trinity (<< 4:14.0.0) +Breaks: kdeartwork-theme-icon-trinity (<< 4:14.0.0) Recommends: kdesktop-trinity, kicker-trinity Description: icon themes released with Trinity This package contains additional icon themes for Trinity. Icon themes can be @@ -85,8 +85,8 @@ Description: icon themes released with Trinity Package: tdeartwork-theme-window-trinity Architecture: any Section: kde -Replaces: tdeartwork-theme-window-kde3 (<< 4:3.5.13) -Breaks: tdeartwork-theme-window-kde3 (<< 4:3.5.13) +Replaces: kdeartwork-theme-window-trinity (<< 4:14.0.0) +Breaks: kdeartwork-theme-window-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: window decoration themes released with Trinity This package contains additional window decoration themes for Trinity. Window @@ -100,9 +100,9 @@ Description: window decoration themes released with Trinity Package: kdewallpapers-trinity Architecture: all Section: kde -Replaces: kdewallpapers-kde3 (<< 4:3.5.13) -Breaks: kdewallpapers-kde3 (<< 4:3.5.13) -Suggests: kwin-trinity | x-window-manager +Replaces: kdewallpapers-trinity (<< 4:14.0.0) +Breaks: kdewallpapers-trinity (<< 4:14.0.0) +Suggests: twin-trinity | x-window-manager Description: wallpapers released with Trinity This package contains additional wallpapers for Trinity. Wallpapers can be applied using the background manager in the KDE Control Centre. @@ -113,10 +113,10 @@ Description: wallpapers released with Trinity Package: kscreensaver-trinity Architecture: any Section: kde -Replaces: kscreensaver-kde3 (<< 4:3.5.13) -Breaks: kscreensaver-kde3 (<< 4:3.5.13) +Replaces: kscreensaver-trinity (<< 4:14.0.0) +Breaks: kscreensaver-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdebase-trinity-bin -Recommends: kwin-trinity, kscreensaver-xsavers-trinity (= ${Source-Version}) +Recommends: twin-trinity, kscreensaver-xsavers-trinity (= ${Source-Version}) Description: additional screen savers released with Trinity This package contains the screen savers for Trinity. They can be tested and selected within the Appearance and Themes section of the Trinity Control @@ -132,10 +132,10 @@ Description: additional screen savers released with Trinity Package: kscreensaver-xsavers-trinity Architecture: any Section: kde -Replaces: kscreensaver-xsavers-kde3 (<< 4:3.5.13) -Breaks: kscreensaver-xsavers-kde3 (<< 4:3.5.13) +Replaces: kscreensaver-xsavers-trinity (<< 4:14.0.0) +Breaks: kscreensaver-xsavers-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdebase-trinity-bin, xscreensaver-data -Recommends: kwin-trinity, kscreensaver-trinity (= ${Source-Version}), xscreensaver-gl +Recommends: twin-trinity, kscreensaver-trinity (= ${Source-Version}), xscreensaver-gl Suggests: kscreensaver-xsavers-webcollage-trinity Description: Trinity hooks for standard xscreensavers This package allows a smooth integration of the standard xscreensavers @@ -155,8 +155,8 @@ Description: Trinity hooks for standard xscreensavers Package: kscreensaver-xsavers-webcollage-trinity Architecture: all Section: kde -Replaces: kscreensaver-xsavers-webcollage-kde3 (<< 4:3.5.13) -Breaks: kscreensaver-xsavers-webcollage-kde3 (<< 4:3.5.13) +Replaces: kscreensaver-xsavers-webcollage-trinity (<< 4:14.0.0) +Breaks: kscreensaver-xsavers-webcollage-trinity (<< 4:14.0.0) Depends: kscreensaver-xsavers-extra-trinity, miscfiles | wordlist, netpbm Description: webcollage screensaver Trinity hook This package give access to the webcollage screensaver through the Trinity @@ -180,10 +180,10 @@ Description: webcollage screensaver Trinity hook Package: kscreensaver-xsavers-extra-trinity Architecture: all Section: kde -Replaces: kscreensaver-xsavers-extra-kde3 (<< 4:3.5.13) -Breaks: kscreensaver-xsavers-extra-kde3 (<< 4:3.5.13) +Replaces: kscreensaver-xsavers-extra-trinity (<< 4:14.0.0) +Breaks: kscreensaver-xsavers-extra-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, kscreensaver-xsavers-trinity, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies -Recommends: kwin-trinity, kscreensaver-trinity (= ${Source-Version}) +Recommends: twin-trinity, kscreensaver-trinity (= ${Source-Version}) Description: Trinity hooks for standard xscreensavers This package allows a smooth integration of the universe xscreensavers into Trinity. With this package installed you can select and/or configure @@ -200,8 +200,8 @@ Description: Trinity hooks for standard xscreensavers Package: tdeartwork-trinity-dbg Section: libdevel Architecture: any -Replaces: tdeartwork-kde3-dbg (<< 4:3.5.13) -Breaks: tdeartwork-kde3-dbg (<< 4:3.5.13) +Replaces: kdeartwork-trinity-dbg (<< 4:14.0.0) +Breaks: kdeartwork-trinity-dbg (<< 4:14.0.0) Depends: tdelibs-trinity-dbg Priority: extra Description: debugging symbols for tdeartwork-trinity diff --git a/ubuntu/maverick/tdeartwork/debian/control.in b/ubuntu/maverick/tdeartwork/debian/control.in index e2d1102a3..8979d776d 100644 --- a/ubuntu/maverick/tdeartwork/debian/control.in +++ b/ubuntu/maverick/tdeartwork/debian/control.in @@ -4,7 +4,7 @@ Priority: optional Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com> XSBC-Original-Maintainer: @@@MAINTAINER@@@ Uploaders: @@@UPLOADERS@@@ -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-dev (>= 4:3.5.7), gawk, gettext, sharutils, tdebase-dev (>= 4:3.5.7), kwin, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl +Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-dev (>= 4:3.5.7), gawk, gettext, sharutils, tdebase-dev (>= 4:3.5.7), twin, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl Build-Conflicts: autoconf2.13, nvidia-glx Standards-Version: 3.7.2 @@ -89,7 +89,7 @@ Description: window decoration themes released with KDE Package: kdewallpapers Architecture: all Section: kde -Suggests: kwin | x-window-manager +Suggests: twin | x-window-manager Replaces: tdebase-data (<< 4:3.5) Description: wallpapers released with KDE This package contains additional wallpapers for KDE. Wallpapers can be @@ -102,7 +102,7 @@ Package: kscreensaver Architecture: any Section: kde Depends: ${shlibs:Depends}, tdebase-bin -Recommends: kwin, kscreensaver-xsavers (= ${Source-Version}) +Recommends: twin, kscreensaver-xsavers (= ${Source-Version}) Description: additional screen savers released with KDE This package contains the screen savers for KDE. They can be tested and selected within the Appearance and Themes section of the KDE Control @@ -119,7 +119,7 @@ Package: kscreensaver-xsavers Architecture: any Section: kde Depends: ${shlibs:Depends}, tdebase-bin, xscreensaver -Recommends: kwin, kscreensaver (= ${Source-Version}), xscreensaver-gl +Recommends: twin, kscreensaver (= ${Source-Version}), xscreensaver-gl Suggests: kscreensaver-xsavers-webcollage Description: KDE hooks for standard xscreensavers This package allows a smooth integration of the standard xscreensavers diff --git a/ubuntu/maverick/tdeartwork/debian/copyright b/ubuntu/maverick/tdeartwork/debian/copyright index f98e0b7f5..dbdd37868 100644 --- a/ubuntu/maverick/tdeartwork/debian/copyright +++ b/ubuntu/maverick/tdeartwork/debian/copyright @@ -139,7 +139,7 @@ Copyright: OpenLook window decoration theme: - 'OpenLook' kwin client + 'OpenLook' twin client Porting to trinity.2 API Copyright 2003 Luciano Montanaro <mikelima@cirulla.net> diff --git a/ubuntu/maverick/tdeartwork/debian/source/format b/ubuntu/maverick/tdeartwork/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/tdeartwork/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/tdeartwork/debian/source/options b/ubuntu/maverick/tdeartwork/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/tdeartwork/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/tdeartwork/debian/tdeartwork-theme-window-trinity.install b/ubuntu/maverick/tdeartwork/debian/tdeartwork-theme-window-trinity.install index 7f688e236..b36062a5c 100644 --- a/ubuntu/maverick/tdeartwork/debian/tdeartwork-theme-window-trinity.install +++ b/ubuntu/maverick/tdeartwork/debian/tdeartwork-theme-window-trinity.install @@ -1,2 +1,2 @@ -debian/tmp/opt/trinity/lib/trinity/kwin* -debian/tmp/opt/trinity/share/apps/kwin +debian/tmp/opt/trinity/lib/trinity/twin* +debian/tmp/opt/trinity/share/apps/twin diff --git a/ubuntu/maverick/tdebase/debian/KUBUNTU-DEBIAN-CHANGES b/ubuntu/maverick/tdebase/debian/KUBUNTU-DEBIAN-CHANGES index 5d776fe2d..6abff5d30 100644 --- a/ubuntu/maverick/tdebase/debian/KUBUNTU-DEBIAN-CHANGES +++ b/ubuntu/maverick/tdebase/debian/KUBUNTU-DEBIAN-CHANGES @@ -13,7 +13,7 @@ remove debian/tmp/share/apps/konqsidebartng/entries/system.desktop remove .svgz from tdebase-data.install -replace 10_kdmrc_defaults.diff with 10_kdmrc_defaults_kubuntu.diff +replace 10_tdmrc_defaults.diff with 10_tdmrc_defaults_kubuntu.diff install/klipper:: sed -i '/X-Ubuntu-Gettext-Domain=/d' debian/tmp/etc/trinity/klipperrc @@ -34,7 +34,7 @@ tdebase-data.install: debian/tmp/etc/xdg/menus/applications-merged/kde-essential in konsole.README.Debian s/fontconfig/fontconfig-config -in kdm.postinst install at s/99/13/ +in tdm.postinst install at s/99/13/ from tdebase-kio-plugins.install remove debian/tmp/usr/share/services/kfile_trash.desktop (that's to remove the trash from the "system applet") @@ -42,7 +42,7 @@ add debian/ubuntu.xmodmap debian/80ubuntu-xmodmap and add install rules to bina control: khelpcenter, suggest don't depend on htdig -kdm.init: Launch usplash_down at the end of the stop section +tdm.init: Launch usplash_down at the end of the stop section Added konqueror dependancy for konqueror-nsplugins. (LP: #139893) diff --git a/ubuntu/maverick/tdebase/debian/NEWS b/ubuntu/maverick/tdebase/debian/NEWS index 49b0bb6d4..226d0b1aa 100644 --- a/ubuntu/maverick/tdebase/debian/NEWS +++ b/ubuntu/maverick/tdebase/debian/NEWS @@ -1,44 +1,44 @@ tdebase (4:3.4.2-3) unstable; urgency=low - *** Changes to KDM conffiles: + *** Changes to TDM conffiles: - * Users upgrading KDM from 3.3.x, will find that KDM no longer uses the - /etc/trinity/kdm/Xservers file, if /etc/trinity/kdm/kdmrc was updated to - the version shipped with KDM 3.4.x. The package upgrade scripts - will not remove Xservers even if kdmrc has been upgraded, if they detect + * Users upgrading TDM from 3.3.x, will find that TDM no longer uses the + /etc/trinity/tdm/Xservers file, if /etc/trinity/tdm/tdmrc was updated to + the version shipped with TDM 3.4.x. The package upgrade scripts + will not remove Xservers even if tdmrc has been upgraded, if they detect local modifications. This should allow administrators to merge their - Xservers changes into kdmrc before themselves removing Xservers. The new - ServerArgsLocal key in kdmrc is where most old Xservers customizations + Xservers changes into tdmrc before themselves removing Xservers. The new + ServerArgsLocal key in tdmrc is where most old Xservers customizations should be placed. * Irrespective of the removal of the Xservers file, we highly recommend that - all administrators accept the installation of the updated kdmrc file - during the package upgrade. Many important changes to KDM's defaults have - been made, and KDM is exceedingly bad at handling anything but the latest - kdmrc format, so the nuissance of re-customizing KDM will likely prove - less than the nuissance of dealing with a KDM that isn't working properly. - If you have already upgraded KDM package without accepting the new kdmrc, + all administrators accept the installation of the updated tdmrc file + during the package upgrade. Many important changes to TDM's defaults have + been made, and TDM is exceedingly bad at handling anything but the latest + tdmrc format, so the nuissance of re-customizing TDM will likely prove + less than the nuissance of dealing with a TDM that isn't working properly. + If you have already upgraded TDM package without accepting the new tdmrc, purging and reinstalling the package should achieve the desired result. *** Changes to user login script handling: - * Another important change that users upgrading from KDM 3.3.x may notice - is that KDM's ability to source personal login scripts, long disabled, has + * Another important change that users upgrading from TDM 3.3.x may notice + is that TDM's ability to source personal login scripts, long disabled, has been restored. The exact files sourced on login will depend on the user's - choice of shell. For users of bash, KDM will source /etc/profile, followed - by ~/.bash_profile or, if that is not present, ~/.profile. Note that KDM + choice of shell. For users of bash, TDM will source /etc/profile, followed + by ~/.bash_profile or, if that is not present, ~/.profile. Note that TDM is NOT spawning a login shell, but is merely mimicking the behaviour that popular shells would exhibit if they were login shells, by manually - sourcing the customary login scripts. /etc/trinity/kdm/Xsession controls this + sourcing the customary login scripts. /etc/trinity/tdm/Xsession controls this behaviour. - * The important downside of the above approach is that KDM will utterly fail + * The important downside of the above approach is that TDM will utterly fail to start a user's session if the newly sourced files contain certain types of commands. For instance, many commands will cause the login attempt to fail because they expect an interactive shell, or because you are trying to "exec" something that cannot provide an X session. For instance, "exec ksmserver" will launch KDE, but "exec bash" will fail. Thus if you - are unsure why KDM is refusing to start your session, try commenting out + are unsure why TDM is refusing to start your session, try commenting out elements of the newly sourced login scripts, and you may find the problem resolved. @@ -47,24 +47,24 @@ tdebase (4:3.4.2-3) unstable; urgency=low tdebase (4:3.3.2-1) unstable; urgency=low * Users upgrading from KDE 3.2 might find that their keyboards seem no longer - to work in KDM. This problem is caused by a change in KDE's handling of - virtual terminals. The setting which puts KDM on vt7, which was contained - in /etc/trinity/kdm/Xservers, has changed, and is also now located in - /etc/trinity/kdm/kdmrc. + to work in TDM. This problem is caused by a change in KDE's handling of + virtual terminals. The setting which puts TDM on vt7, which was contained + in /etc/trinity/tdm/Xservers, has changed, and is also now located in + /etc/trinity/tdm/tdmrc. * Users who, when upgrading to KDE 3.3, opted to replace their Xservers file with the version shipped by the package, but chose to retain their - /etc/trinity/kdm/kdmrc file, will thus have a KDM configuration which nowhere - contains a setting which properly places KDM on vt7. This can result in a + /etc/trinity/tdm/tdmrc file, will thus have a TDM configuration which nowhere + contains a setting which properly places TDM on vt7. This can result in a race condition which has the end effect of breaking the keyboard when using - KDM. + TDM. * The solution to the problem is either to replace both of Xservers and - kdmrc, or neither, when upgrading to KDE 3.3 for the first time. + tdmrc, or neither, when upgrading to KDE 3.3 for the first time. - * Users already stuck can, after killing KDE, purge and re-install the kdm + * Users already stuck can, after killing KDE, purge and re-install the tdm package, ensuring that the latest, fresh copies are installed. - Alternatively, they can edit /etc/trinity/kdm/kdmrc and add the following + Alternatively, they can edit /etc/trinity/tdm/tdmrc and add the following line: ServerVTs=-7 diff --git a/ubuntu/maverick/tdebase/debian/changelog b/ubuntu/maverick/tdebase/debian/changelog index b991c3875..fc2c45054 100644 --- a/ubuntu/maverick/tdebase/debian/changelog +++ b/ubuntu/maverick/tdebase/debian/changelog @@ -60,13 +60,13 @@ tdebase-trinity (4:3.5.10-2ubuntu3) karmic; urgency=low tdebase-trinity (4:3.5.10-2ubuntu2) karmic; urgency=low * Added Start menu button icon configuration dialog - * Delayed kdm-trinity startup to allow for graphics device configuration + * Delayed tdm-trinity startup to allow for graphics device configuration -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sun, 18 Oct 2009 16:21:00 -0600 tdebase-trinity (4:3.5.10-1ubuntu5) karmic; urgency=low - * Added new ICC loading functionality to kcontrol and kdm + * Added new ICC loading functionality to kcontrol and tdm * Added new display output switching functionality to krandrtray * Beginnings of customizable K menu icon @@ -81,7 +81,7 @@ tdebase-trinity (4:3.5.10-1ubuntu4) karmic; urgency=low tdebase-trinity (4:3.5.10-1ubuntu3) karmic; urgency=low - * Default KDM theme set to kubuntu-trinity + * Default TDM theme set to kubuntu-trinity -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 10 Oct 2009 12:19:00 -0600 @@ -99,13 +99,13 @@ tdebase-trinity (4:3.5.10-1ubuntu0) karmic; urgency=low tdebase-trinity (4:3.5.10-0ubuntu12) karmic; urgency=low - * Repaired kdm looking at the wrong pam.d files + * Repaired tdm looking at the wrong pam.d files -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 10 Sep 2009 11:20:00 -0600 tdebase-trinity (4:3.5.10-0ubuntu11) karmic; urgency=low - * Repaired startkde script to export DESKTOP_SESSION + * Repaired starttde script to export DESKTOP_SESSION * Depends on libogg-dev-la * Repaired gcc4.4 compilation problems @@ -171,14 +171,14 @@ tdebase-trinity (4:3.5.10-0ubuntu4~intrepid6) intrepid; urgency=low tdebase-trinity (4:3.5.10-0ubuntu4~intrepid4) intrepid; urgency=low - * Repaired KDM DATAPATH problem + * Repaired TDM DATAPATH problem -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Fri, 20 Mar 2009 10:22:00 -0600 tdebase-trinity (4:3.5.10-0ubuntu4~intrepid2) intrepid; urgency=low * Repaired accidental conflict with /etc/sysguarddrc - * Repared KDM PATH (fixes bug #56) + * Repared TDM PATH (fixes bug #56) -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 17 Mar 2009 14:03:00 -0600 @@ -190,13 +190,13 @@ tdebase-trinity (4:3.5.10-0ubuntu4~intrepid0) intrepid; urgency=low tdebase-trinity (4:3.5.10-0ubuntu3~intrepid19) intrepid; urgency=low - * Repaired default kdm icons + * Repaired default tdm icons -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 07 Mar 2009 13:18:00 -0600 tdebase-trinity (4:3.5.10-0ubuntu3~intrepid18) intrepid; urgency=low - * Added XDG_DATA_DIRS and KDEDIRS to startkde, as suggested by zekica on the Debian forums + * Added XDG_DATA_DIRS and TDEDIRS to starttde, as suggested by zekica on the Debian forums -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 07 Mar 2009 13:18:00 -0600 @@ -240,7 +240,7 @@ tdebase-trinity (4:3.5.10-0ubuntu3~intrepid3) intrepid; urgency=low tdebase-trinity (4:3.5.10-0ubuntu3~intrepid1) intrepid; urgency=low - * Removed link /usr/lib/libkonsolepart.so for python-trinity-trinity and altered startkde script to function properly with the new .trinity home directory + * Removed link /usr/lib/libkonsolepart.so for python-trinity-trinity and altered starttde script to function properly with the new .trinity home directory -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Fri, 05 Dec 2008 16:15:00 -0600 @@ -299,7 +299,7 @@ tdebase (4:3.5.10-0ubuntu1~hardy2) hardy-backports; urgency=low tdebase (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low * New upstream bugfix release (LP: #261366) - - 13_kdm_sessions_fixes.diff freshen patch + - 13_tdm_sessions_fixes.diff freshen patch - kubuntu_9908_nodisplay_opengl.diff freshen patch - Bump version of tdelibs-dev to 3.5.10 @@ -353,7 +353,7 @@ tdebase (4:3.5.9-0ubuntu5) hardy; urgency=low tdebase (4:3.5.9-0ubuntu4) hardy; urgency=low - * Remove kubuntu_9920_startkde_dash_stupidness.diff, + * Remove kubuntu_9920_starttde_dash_stupidness.diff, Closes LP: #206187 -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 25 Mar 2008 23:05:42 +0000 @@ -382,14 +382,14 @@ tdebase (4:3.5.9-0ubuntu1) hardy; urgency=low * New upstream release [ Terence Simpson ] - * Fix config script for kdm to detect kdm-kde4 + * Fix config script for tdm to detect tdm-kde4 -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 14 Feb 2008 12:27:06 +0000 tdebase (4:3.5.8-2ubuntu21) hardy; urgency=low - * Add kubuntu_9921_kdm_bulletproof_x.diff, adds bulletproof X - feature to KDM. + * Add kubuntu_9921_tdm_bulletproof_x.diff, adds bulletproof X + feature to TDM. -- Eugene Tretyak <etretyak@gmail.com> Thu, 14 Feb 2008 10:40:12 +0000 @@ -403,15 +403,15 @@ tdebase (4:3.5.8-2ubuntu20) hardy; urgency=low tdebase (4:3.5.8-2ubuntu19) hardy; urgency=low * tdebase-kio-plugins replaces old tdebase-data, closes LP: #189963 - * Remove 70_kdm_consolekit.diff replace with kubuntu_70_kdm_consolekit.diff, + * Remove 70_tdm_consolekit.diff replace with kubuntu_70_tdm_consolekit.diff, updated version from http://bugs.kde.org/show_bug.cgi?id=147790 -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 08 Feb 2008 12:32:50 +0000 tdebase (4:3.5.8-2ubuntu18) hardy; urgency=low - * Edited debian/patches/70_kdm_consolekit.diff to fix a crash - when attempting to connect to local kdm via XDMCP (Closes LP: #178242) + * Edited debian/patches/70_tdm_consolekit.diff to fix a crash + when attempting to connect to local tdm via XDMCP (Closes LP: #178242) Thanks to Paul Brook for debbuging this, and to Zoogie for reporting this -- Maxim Levitsky <maximlevitsky@gmail.com> Tue, 06 Feb 2008 00:39:44 +0000 @@ -428,7 +428,7 @@ tdebase (4:3.5.8-2ubuntu17) hardy; urgency=low tdebase (4:3.5.8-2ubuntu17) hardy; urgency=low - * Added kubuntu_9920_startkde_dash_stupidness.diff: + * Added kubuntu_9920_starttde_dash_stupidness.diff: - For some stupid reasons, env scripts are not parsed correctly due dash. Hard to believe, but this patch fixes the issue... - Closes LP: #189144 @@ -461,14 +461,14 @@ tdebase (4:3.5.8-2ubuntu14) hardy; urgency=low tdebase (4:3.5.8-2ubuntu13) hardy; urgency=low - * Added kubuntu_9919_kdm_preferuser.diff, uses the kubuntu-default- + * Added kubuntu_9919_tdm_preferuser.diff, uses the kubuntu-default- settings's settings for facesource if any -- Anthony Mercatante <tonio@kubuntu> Fri, 04 Jan 2008 15:50:02 +0100 tdebase (4:3.5.8-2ubuntu12) hardy; urgency=low - * Really fix kubuntu_9918_kdm_systemlocale.diff + * Really fix kubuntu_9918_tdm_systemlocale.diff -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 04 Jan 2008 11:11:38 +0000 @@ -481,8 +481,8 @@ tdebase (4:3.5.8-2ubuntu11) hardy; urgency=low tdebase (4:3.5.8-2ubuntu10) hardy; urgency=low - * Added kubuntu_9918_kdm_systemlocale.diff: - - KDM uses the system locale + * Added kubuntu_9918_tdm_systemlocale.diff: + - TDM uses the system locale -- Anthony Mercatante <tonio@kubuntu> Wed, 02 Jan 2008 12:56:51 +0100 @@ -522,8 +522,8 @@ tdebase (4:3.5.8-2ubuntu6) hardy; urgency=low tdebase (4:3.5.8-2ubuntu5) hardy; urgency=low - * Add kubuntu_9914_kdm_user_image_check.diff from upstream - fixes potential KDM local DoS if users set an invalid image + * Add kubuntu_9914_tdm_user_image_check.diff from upstream + fixes potential TDM local DoS if users set an invalid image Closes LP: #176347 -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 14 Dec 2007 12:24:17 +0000 @@ -567,7 +567,7 @@ tdebase (4:3.5.8.dfsg.1-2) unstable; urgency=low +++ Changes by Fathi Boudra: - * Remove /usr/bin/X11 from KDM's default session path. (Closes: 441392) + * Remove /usr/bin/X11 from TDM's default session path. (Closes: 441392) * Add support for ConsoleKit. Thanks to Michael Biebl, William Jon McCann and Kevin Kofler. (Closes: #450603) @@ -614,7 +614,7 @@ tdebase (4:3.5.8.dfsg.1-1) unstable; urgency=low - 24_knotify_arts.diff - 41_nspluginviewer_64bit_fix.diff - 50_several-CVE-konqueror.diff - - 51_CVE-2007-4569-kdm-autologin.diff + - 51_CVE-2007-4569-tdm-autologin.diff - 60_new-debshortcut.diff * Redo buildprep. * Bump build-dependencies and stuff to 3.5.8. @@ -648,7 +648,7 @@ tdebase (4:3.5.7.dfsg.1-1) unstable; urgency=low tdebase (4:3.5.7-4) unstable; urgency=low - * Add patch to fix unauthorized login problem in kdm. + * Add patch to fix unauthorized login problem in tdm. CVE-2007-4569. -- Sune Vuorela <debian@pusling.com> Wed, 19 Sep 2007 20:30:01 +0200 @@ -664,7 +664,7 @@ tdebase (4:3.5.7-3) unstable; urgency=low +++ Changes by Fathi Boudra: - * Add xserver-xorg Recommends to kdm. (Closes: #436573) + * Add xserver-xorg Recommends to tdm. (Closes: #436573) -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 27 Jul 2007 16:29:18 +0200 @@ -677,8 +677,8 @@ tdebase (4:3.5.7-2) unstable; urgency=low * Add support or back references in klipper. Thanks to Sean Finney. (Closes: #427843) * Updated nb debconf translation. (Closes: #417942) - * Fix typo in startkde manpage. Thanks A. Costa. (Closes: #432062) - * Fix typo in kdmrc. Thanks Greg. (Closes: #422142) + * Fix typo in starttde manpage. Thanks A. Costa. (Closes: #432062) + * Fix typo in tdmrc. Thanks Greg. (Closes: #422142) * Updated vi debconf translation. Thanks Clytie Siddall (Closes: #426820) * Updated pt_BR debconf translation. Thanks Eder L. Marques. (Closes: #422285) @@ -735,11 +735,11 @@ tdebase (4:3.5.7-1ubuntu25) gutsy; urgency=low tdebase (4:3.5.7-1ubuntu24) gutsy; urgency=low [ Richard A. Johnson ] - * SECURITY UPDATE: KDM password-less login - * KDM can be tricked into performing a password-less login even for accounts + * SECURITY UPDATE: TDM password-less login + * TDM can be tricked into performing a password-less login even for accounts with a password set under certain circumstances, namely autologin to be configured and "shutdown with password" enabled. - * Add kubuntu_sec_03_kdm_pwless_login.diff for session.c to fix KDM + * Add kubuntu_sec_03_tdm_pwless_login.diff for session.c to fix TDM password-less and autologin configuration. * References: - http://www.kde.org/info/security/advisory-20070919-1.txt @@ -758,8 +758,8 @@ 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 $kdehome=$HOME/.kde so we should use - $kdehome instead of $HOME/$kdehome + kubuntu_53_kwallet_config.diff as $tdehome=$HOME/.kde so we should use + $tdehome instead of $HOME/$tdehome -- Anthony Mercatante <tonio@ubuntu.com> Wed, 19 Sep 2007 12:22:46 +0200 @@ -780,7 +780,7 @@ tdebase (4:3.5.7-1ubuntu21) gutsy; urgency=low tdebase (4:3.5.7-1ubuntu20) gutsy; urgency=low - * Changed (again) $KDEHOME to $kdehome in kubuntu_52_gtk_qt_engine_config.diff and + * Changed (again) $TDEHOME to $tdehome in kubuntu_52_gtk_qt_engine_config.diff and kubuntu_53_kwallet_config.diff . (LP: #136560) -- Jonathan Riddell <jriddell@ubuntu.com> Sat, 15 Sep 2007 23:12:26 +0100 @@ -799,7 +799,7 @@ tdebase (4:3.5.7-1ubuntu18) gutsy; urgency=low [ Ryan Kavanagh ] * Dropping kubuntu_9902_nspluginviewer_hangs_cpu.diff and the libgtk build-dep as they are no longer needed - * Changed $KDEHOME to $kdehome in kubuntu_52_gtk_qt_engine_config.diff and + * Changed $TDEHOME to $tdehome in kubuntu_52_gtk_qt_engine_config.diff and kubuntu_53_kwallet_config.diff . (LP: #136560) -- Ryan Kavanagh <ryanakca@kubuntu.org> Mon, 03 Sep 2007 10:26:36 -0400 @@ -807,7 +807,7 @@ tdebase (4:3.5.7-1ubuntu18) gutsy; urgency=low 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 $KDEHOME instead of .kde + kubuntu_53_kwallet_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 @@ -883,15 +883,15 @@ tdebase (4:3.5.7-1ubuntu9) gutsy; urgency=low tdebase (4:3.5.7-1ubuntu8) gutsy; urgency=low - * Fixed debian/kdm.init - set kdm language to the system default. + * Fixed debian/tdm.init + set tdm language to the system default. * Droped pmount dependancy for tdebase. -- Anthony Mercatante <tonio@ubuntu.com> Thu, 14 Jun 2007 17:15:21 +0200 tdebase (4:3.5.7-1ubuntu7) gutsy; urgency=low - * Fixed debian/kdm.init + * Fixed debian/tdm.init Previous code was bash code while the init script is sh -- Anthony Mercatante <tonio@ubuntu.com> Thu, 14 Jun 2007 13:13:22 +0200 @@ -912,8 +912,8 @@ tdebase (4:3.5.7-1ubuntu5) gutsy; urgency=low tdebase (4:3.5.7-1ubuntu4) gutsy; urgency=low - * Removed kubuntu_55_kdm_usplash_down.diff, usplash is now launched - via the kdm.init script, modified to launch usplash_down + * Removed kubuntu_55_tdm_usplash_down.diff, usplash is now launched + via the tdm.init script, modified to launch usplash_down (Fixes LP: #83727 and LP: #34821) * Added kbuntu_97_khotkeys_alt_print_shortcut.diff, capture a window with khotkeys with alt+print @@ -947,7 +947,7 @@ tdebase (4:3.5.7-1ubuntu1) gutsy; urgency=low * Merge with Debian for new upstream release, remaining changes in KUBUNTU-DEBIAN-CHANGES - * Remove kubuntu_62_genkdmconf_fix.diff, applied upstream + * Remove kubuntu_62_gentdmconf_fix.diff, applied upstream * Update kubuntu_68_xinerama.diff * Remove kubuntu_87_kicker_restore_description_parents.diff, obsoleted by upstream changes * Remove kubuntu_94_konqueror_nsplugins_amd64.diff, now part of Debian @@ -967,7 +967,7 @@ tdebase (4:3.5.7-1) unstable; urgency=low - Remove patch 21 - applied upstream. - Adapt patch 27 - kfreebsd - minor changes. - Adapt patch 41 - amd64 and nspluginviewer - small changes. - - Remove patch 42 - kwin and 64 bit. applied upstream. + - Remove patch 42 - twin and 64 bit. applied upstream. - Remove patch 44 - opengl logo is fixed. - Remove patch 45 - keyboard handler - applied upstream. @@ -1023,9 +1023,9 @@ tdebase (4:3.5.6.dfsg.2-1) unstable; urgency=low +++ Changes by Sune Vuorela: * Support where the frosty furry animals wants their plugins. (Patch 38) - * Better distinguish wether users has modified their kdm theme. (Patch 39) - * Update kdm debconf template, thanks to Christian Perrier. (Closes: #415941) - Also update kdm debconf translations: + * Better distinguish wether users has modified their tdm theme. (Patch 39) + * Update tdm debconf template, thanks to Christian Perrier. (Closes: #415941) + Also update tdm debconf translations: - Norwegian Bokmal - Swedish thanks to Daniel Nylander (Closes: #417875) - Arabic thanks to Ossama Khayat (Closes: #417886) @@ -1061,7 +1061,7 @@ tdebase (4:3.5.6.dfsg.2-1) unstable; urgency=low * Repackage to remove non-free OpenGL logo and update prune-nonfree script. Also, patch 44 to not install the logo. (Closes: #419962) - * Update spanish kdm debconf template translation, thanks to Enrique MatÃas. + * Update spanish tdm debconf template translation, thanks to Enrique MatÃas. * Fix changelog typos ;-) * And, as always, upload. @@ -1073,9 +1073,9 @@ tdebase (4:3.5.6.dfsg.1-2) experimental; urgency=low * Don't install gvim desktop file in kappfinder. gvim does it by itself - and much better. (Closes: #408233) - * Improve documentation about styling kdm (thanks to Jeremy Bygott). - This is a note in kdm.init, in kdm.README.Debian and in the - generated kdmrc. (Closes: #408418, #403776, #403797, #406438) + * Improve documentation about styling tdm (thanks to Jeremy Bygott). + This is a note in tdm.init, in tdm.README.Debian and in the + generated tdmrc. (Closes: #408418, #403776, #403797, #406438) * Add portuguese debconf translation. Thanks to Carlos Lisboa. (Closes: #408021) @@ -1171,7 +1171,7 @@ tdebase (4:3.5.6-0ubuntu10) feisty; urgency=low * Add kubuntu_91_ksplash_fork_too_early_cond.diff, closes Malone #46682. Patch from Mark Jenkins - * Removed kubuntu_05_kdm_theme_config.diff, kdm config will now be + * Removed kubuntu_05_tdm_theme_config.diff, tdm config will now be set via kubuntu-default-settings postinst script. Closes Malone #58639 @@ -1246,7 +1246,7 @@ tdebase (4:3.5.6-0ubuntu1) feisty; urgency=low * New upstream release * Remove patched applied upstream: - - 02_hal_kwin_fixes_branch.diff + - 02_hal_twin_fixes_branch.diff - 29_halbackend_fstab_improvements.diff - 30_mediamanager_followsymlinks.diff - 32_camera_icon_from_mimetype.diff @@ -1297,7 +1297,7 @@ tdebase (4:3.5.5a.dfsg.1-1ubuntu14) feisty; urgency=low tdebase (4:3.5.5a.dfsg.1-1ubuntu13) feisty; urgency=low - * Update kdm init script to stop usplash with "start" + * Update tdm init script to stop usplash with "start" -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 4 Jan 2007 23:05:08 +0000 @@ -1389,7 +1389,7 @@ tdebase (4:3.5.5a.dfsg.1-1ubuntu1) feisty; urgency=low tdebase (4:3.5.6.dfsg.1-1) experimental; urgency=low * New upstream release: - * Fixes "kdm does not obey pam_limits". (Closes: #242641) + * Fixes "tdm does not obey pam_limits". (Closes: #242641) * Resolves ksysguard problem that it was not possible to sensor order. (Closes: #350561) * Fixes kdesktop_lock and pam_krb5. (Closes: #374394, #376803) @@ -1417,7 +1417,7 @@ tdebase (4:3.5.5a.dfsg.1-5) unstable; urgency=high non-linux archs (Closes: 399059) +++ Changes by Modestas Vainius: - * Fix 36_kwin.diff patch. In some cases clients were not properly added to + * Fix 36_twin.diff patch. In some cases clients were not properly added to the group. (Closes: #404226) -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 29 Dec 2006 19:15:23 +0200 @@ -1429,7 +1429,7 @@ tdebase (4:3.5.5a.dfsg.1-4) unstable; urgency=low (Closes: #399823, #384416) +++ Changes by Ana Guerrero: - * Applied patch to avoid kwin crashes when switching desktop + * Applied patch to avoid twin crashes when switching desktop (Closes: #365829). -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 13 Dec 2006 13:09:33 +0100 @@ -1443,18 +1443,18 @@ tdebase (4:3.5.5a.dfsg.1-3) unstable; urgency=high * debian-kde_default.png.desktop * 21_default_background_image.diff.uu * 22_default_backgrounds.diff - * Add kdm customization support and update kdm README.Debian. Main changes - can be found in kdm init script: - * use an alternative kdm master configuration file (/var/run/kdm/kdmrc) - and background configuration file (/var/run/kdm/backgroundrc) - * source override file in kdm override directory (/etc/default/kdm.d) + * Add tdm customization support and update tdm README.Debian. Main changes + can be found in tdm init script: + * use an alternative tdm master configuration file (/var/run/tdm/tdmrc) + and background configuration file (/var/run/tdm/backgroundrc) + * source override file in tdm override directory (/etc/default/tdm.d) (Closes: #385839) +++ Changes by Sune Vuorela: * Add tdelibs-dbg to tdebase-dbg dependencies. +++ Changes by Josh Metzler: - * Restore kdm's default user face icon by adding a symlink to kdm.links. + * Restore tdm's default user face icon by adding a symlink to tdm.links. (Closes: #267722) +++ Changes by Modestas Vainius: @@ -1582,7 +1582,7 @@ tdebase (4:3.5.5-1) unstable; urgency=low depends on tdebase, so the kde-desktop task will now pull in hal/pmount as well. (Closes: #384663) - * Fix typo in /etc/pam.d/kdm-np. (Closes: #381908) + * Fix typo in /etc/pam.d/tdm-np. (Closes: #381908) * Remove /usr/share/apps/kappfinder/apps/Office/lyx.desktop, as lyx-qt provides its own better .desktop file. (Closes: #383412) @@ -1663,7 +1663,7 @@ tdebase (4:3.5.4-1) unstable; urgency=low * Add libjessie-java to konqueror's Java Suggests, since it is needed for JSSE in conjunction with GCJ. - * Add a LSB header to the KDM init script, making KDM usable with a parallel + * Add a LSB header to the TDM init script, making TDM usable with a parallel bootscripts setup. Thanks to Carlos Villegas. (Closes: #376958) * 25_khelp_htdig.diff: With the htdig package, searchable indexes should @@ -1741,7 +1741,7 @@ tdebase (4:3.5.4-0ubuntu27) edgy; urgency=low tdebase (4:3.5.4-0ubuntu26) edgy; urgency=low - * Install kdm at init level 13 + * Install tdm at init level 13 -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 22 Sep 2006 01:58:38 +0100 @@ -1790,22 +1790,22 @@ tdebase (4:3.5.4-0ubuntu20) edgy; urgency=low tdebase (4:3.5.4-0ubuntu19) edgy; urgency=low - * Added kubuntu_80_kdm_grub.diff (closes #57066) + * Added kubuntu_80_tdm_grub.diff (closes #57066) * Added kubuntu_81_search_engines_config.diff (closes #60058) -- Anthony Mercatante <tonio@ubuntu.com> Tue, 12 Sep 2006 08:26:23 +0200 tdebase (4:3.5.4-0ubuntu18) edgy; urgency=low - * Improved patch kubuntu_79_kdm_halt.diff since kcontrol connection - manager module also hardcodes the setting, instead of reading kdm + * Improved patch kubuntu_79_tdm_halt.diff since kcontrol connection + manager module also hardcodes the setting, instead of reading tdm settings (evil) -- Anthony Mercatante <tonio@ubuntu.com> Mon, 11 Sep 2006 13:19:23 +0200 tdebase (4:3.5.4-0ubuntu17) edgy; urgency=low - * Added patch kubuntu_79_kdm_halt.diff to change the shutdown command + * Added patch kubuntu_79_tdm_halt.diff to change the shutdown command (closes #59134) -- Anthony Mercatante <tonio@ubuntu.com> Mon, 11 Sep 2006 11:50:23 +0200 @@ -1819,7 +1819,7 @@ tdebase (4:3.5.4-0ubuntu16) edgy; urgency=low tdebase (4:3.5.4-0ubuntu15) edgy; urgency=low - * Improved kubuntu_05_kdm_theme_config.diff (closes #57428) + * Improved kubuntu_05_tdm_theme_config.diff (closes #57428) -- Anthony Mercatante <tonio@ubuntu.com> Fri, 8 Sep 2006 15:06:20 +0200 @@ -2019,7 +2019,7 @@ tdebase (4:3.5.3-2) unstable; urgency=medium tdebase (4:3.5.3-1) unstable; urgency=low * New upstream release. - + fix kwin alt-tab problems. (Closes: #363357, #361421, #361127) + + fix twin alt-tab problems. (Closes: #363357, #361421, #361127) + fix problems with systram. (Closes: #347320) +++ Changes by Christopher Martin: @@ -2034,7 +2034,7 @@ tdebase (4:3.5.3-1) unstable; urgency=low * Update the kate manpage. (Closes: #347883) - * Manually add /usr/bin/X11 to the KDM's default session path, as otherwise + * Manually add /usr/bin/X11 to the TDM's default session path, as otherwise systems still running X11R6.9 won't be able to find X binaries, which can cause the login process to fail under certain circumstances. This bit of cruft (for X11R7 users) should be harmless, and can be removed post-Etch. @@ -2060,23 +2060,23 @@ tdebase (4:3.5.2-2) unstable; urgency=low +++ Changes by Christopher Martin: * Now that menu-xdg+menu can provide xsession .desktop files for window - managers, add /var/lib/menu-xdg/xsessions to kdmrc's default list of + managers, add /var/lib/menu-xdg/xsessions to tdmrc's default list of places to search. Window managers should continue to provide their own .desktop files, however, since they will be more customized and won't force users to install the menu package. This is merely a fallback. (Closes: #360919) - * Make kdm look for /usr/bin/X by default, now that /usr/X11R6 is on its way - out. Adjust other paths in kdmrc as well. kdm should now work better with + * Make tdm look for /usr/bin/X by default, now that /usr/X11R6 is on its way + out. Adjust other paths in tdmrc as well. tdm should now work better with X.Org 7. (Closes: #362924) - * Patch kdm so that if it can't find the X executable in kdmrc (now + * Patch tdm so that if it can't find the X executable in tdmrc (now /usr/bin/X by default), then try /usr/X11R6/bin/X, then finally - /usr/bin/X. This should keep kdm working for users who have a partial or + /usr/bin/X. This should keep tdm working for users who have a partial or botched dist-upgrade, or neglected to permit the installation of an - up-to-date kdmrc. + up-to-date tdmrc. - * Revamp /etc/pam.d/kdm and the other pam files. They should now find the + * Revamp /etc/pam.d/tdm and the other pam files. They should now find the new /etc/default/locale language settings. (Closes: #361089, #361163) * Remove xlibs-static-pic build-dependency, and replace it with @@ -2111,7 +2111,7 @@ tdebase (4:3.5.2-1) unstable; urgency=low * Add a kpersonalizer manpage from Joe Zonker Brockmeier. Thanks. (Closes: #327395) - * Make the KDM option "Restart X Server" visible by default again. + * Make the TDM option "Restart X Server" visible by default again. * Fix the logitechmouse udev rules. Thanks to Henrique de Moraes Holschuh for spotting the problems. (Closes: #359751, #359773) @@ -2132,7 +2132,7 @@ tdebase (4:3.5.1-1) unstable; urgency=low * Enable zeroconf support in ksysguardd; add libavahi-compat-libdnssd-dev to the build-depends. (Closes: #348583) - * Merge startkde manpage (and maintainer script patch to fully integrate it) + * Merge starttde manpage (and maintainer script patch to fully integrate it) from Philipp Grau. Thanks. (Closes: #348501) * Upload to unstable. @@ -2156,7 +2156,7 @@ tdebase (4:3.5.0-3) unstable; urgency=low +++ Changes by Christopher Martin: - * Install kdm's NEWS file in all tdebase packages. This ensures that + * Install tdm's NEWS file in all tdebase packages. This ensures that apt-listchanges will display the news to all users. (Closes: #344947) +++ Changes by Adeodato Simó: @@ -2189,11 +2189,11 @@ tdebase (4:3.5.0-2) experimental; urgency=low tdebase (4:3.5.2-0ubuntu27) dapper-security; urgency=low - * SECURITY UPDATE: KDM symlink attack vulnerability - * Add kubuntu_65_kdm_symlink_vunerability.diff - * KDM allows the user to select the session type for login. This + * SECURITY UPDATE: TDM symlink attack vulnerability + * Add kubuntu_65_tdm_symlink_vunerability.diff + * TDM allows the user to select the session type for login. This setting is permanently stored in the user home directory. By - using a symlink attack, KDM can be tricked into allowing the + using a symlink attack, TDM can be tricked into allowing the user to read file content that would otherwise be unreadable to this particular user. * References: @@ -2253,13 +2253,13 @@ tdebase (4:3.5.2-0ubuntu20) dapper; urgency=low tdebase (4:3.5.2-0ubuntu19) dapper; urgency=low - * Add kubuntu_62_genkdmconf_fix.diff, closes Malone #39599 + * Add kubuntu_62_gentdmconf_fix.diff, closes Malone #39599 -- Frode M. Doeving <frode@lnix.net> Mon, 1 May 2006 15:25:48 +0100 tdebase (4:3.5.2-0ubuntu18) dapper; urgency=low - * Fix wallpaper in kubuntu_05_kdm_theme_config.diff + * Fix wallpaper in kubuntu_05_tdm_theme_config.diff * Alter kubuntu_52_gtk_qt_engine_config.diff, don't make use of gtk_qt_engine if gnome or xfce are already installed (Malone #36256) @@ -2275,7 +2275,7 @@ tdebase (4:3.5.2-0ubuntu17) dapper; urgency=low tdebase (4:3.5.2-0ubuntu16) dapper; urgency=low - * Update kubuntu_05_kdm_theme_config.diff for dapper wallpaper + * Update kubuntu_05_tdm_theme_config.diff for dapper wallpaper -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 27 Apr 2006 15:45:33 +0100 @@ -2332,7 +2332,7 @@ tdebase (4:3.5.2-0ubuntu9) dapper; urgency=low tdebase (4:3.5.2-0ubuntu8) dapper; urgency=low - * Add kubuntu_58_kwin_branch.diff fixes crash on alt-tab and + * Add kubuntu_58_twin_branch.diff fixes crash on alt-tab and focus policies -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 14 Apr 2006 15:35:56 +0000 @@ -2394,13 +2394,13 @@ tdebase (4:3.5.2-0ubuntu1) dapper; urgency=low tdebase (4:3.5.1-0ubuntu14) dapper; urgency=low - * Add kubuntu_55_kdm_usplash_down.diff run usplash on exit from KDM + * Add kubuntu_55_tdm_usplash_down.diff run usplash on exit from TDM -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 17 Mar 2006 12:26:58 +0000 tdebase (4:3.5.1-0ubuntu13) dapper; urgency=low - * Update kdm background colour in kubuntu_05_kdm_theme_config.diff + * Update tdm background colour in kubuntu_05_tdm_theme_config.diff to match current artwork -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 15 Mar 2006 21:17:36 +0000 @@ -2427,7 +2427,7 @@ tdebase (4:3.5.1-0ubuntu11) dapper; urgency=low tdebase (4:3.5.1-0ubuntu10) dapper; urgency=low * Add kubuntu_50_kate_desktop.diff use existing Kate session - * Add kubuntu_51_kdmrc_options.diff add back restart X option + * Add kubuntu_51_tdmrc_options.diff add back restart X option * Patches by Anthony Mercatante <tonio@ubuntu.com> -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 27 Feb 2006 15:18:06 +0000 @@ -2565,9 +2565,9 @@ tdebase (4:3.5.0-0ubuntu8) dapper; urgency=low tdebase (4:3.5.0-0ubuntu7) dapper; urgency=low - * Update 10_kdmrc_defaults_kubuntu.diff changing Debian to Debian - and rename to kubuntu_10_kdmrc_defaults_kubuntu.diff - * Remove kdm dependency on kubuntu-default-settings, setting KDM + * Update 10_tdmrc_defaults_kubuntu.diff changing Debian to Debian + and rename to kubuntu_10_tdmrc_defaults_kubuntu.diff + * Remove tdm dependency on kubuntu-default-settings, setting TDM theme now scripted in kubuntu-default-settings -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 10 Jan 2006 00:26:23 +0000 @@ -2629,10 +2629,10 @@ tdebase (4:3.5-rc2-0ubuntu1) dapper; urgency=low * New upstream pre-release * Tighten tdelibs-dev build-dep for libstdc++ transition - * kdm depends on xauth not xbase-clients + * tdm depends on xauth not xbase-clients * Update 18_default_fonts.diff * Generate .pot files - * Remove kubuntu_26_startkde.diff, no need to start ivman in 3.5 + * Remove kubuntu_26_starttde.diff, no need to start ivman in 3.5 -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 21 Nov 2005 17:46:39 +0000 @@ -2640,11 +2640,11 @@ tdebase (4:3.5-rc1-1ubuntu1) dapper; urgency=low * New upstream pre-release * Sync with Debian - * Update kubuntu_05_kdm_theme_config.diff + * Update kubuntu_05_tdm_theme_config.diff * Update kubuntu_16_hide_kpager_menu_entry.diff - * Update kubuntu_19_kdm_zsh_emulate.diff + * Update kubuntu_19_tdm_zsh_emulate.diff * Update kubuntu_25_kcontrol_only_in_kde.diff - * Update kubuntu_30_startkde_background_colour.diff + * Update kubuntu_30_starttde_background_colour.diff * Update kubuntu_32_usplash_console_font.diff * konqueror replaces old kcontrol @@ -2691,7 +2691,7 @@ tdebase (4:3.4.3-3) unstable; urgency=low tdelibs4c2. * Add "noextendedglob" to zsh's options when reading the X startup scripts - for kdm. This works around some of its quirks. (Closes: #336305) + for tdm. This works around some of its quirks. (Closes: #336305) * Backport a fix from KDE 3.5 for a bug that caused switching to Administrator mode in KControl to fail on occasion. (Closes: #306951) @@ -2744,8 +2744,8 @@ tdebase (4:3.4.2-3) unstable; urgency=low +++ Changes by Christopher Martin: - * Add a NEWS entry that explains the KDM upgrade process for users moving - from KDM 3.3.x, as well as KDM's new behaviour regarding login scripts. + * Add a NEWS entry that explains the TDM upgrade process for users moving + from TDM 3.3.x, as well as TDM's new behaviour regarding login scripts. (Closes: #326542, #327191) * Add a patch from the "Improving KDE" set that eliminates a superfluous @@ -2762,7 +2762,7 @@ tdebase (4:3.4.2-2) unstable; urgency=low +++ Changes by Christopher Martin: - * For tdebase-data, add conflicts against old versions of kcontrol, kwin, + * For tdebase-data, add conflicts against old versions of kcontrol, twin, and kicker. This should prevent users from unwittingly upgrading tdebase-data to 3.4.x, while the rest of KDE stays at the 3.3.x level. This had resulted in kcontrol breaking and other assorted issues. @@ -2783,11 +2783,11 @@ tdebase (4:3.4.2-1) unstable; urgency=low * Bugs reported in the Debian BTS fixed by this release: - - kdm uses /dev/urandom instead of /dev/random as the default source + - tdm uses /dev/urandom instead of /dev/random as the default source of entropy. This solves myriad issues on low-entropy systems. (Closes: #240027, #294267, #298254, #320838) - - "-nolisten tcp" no longer prevents kdm from connecting to remote + - "-nolisten tcp" no longer prevents tdm from connecting to remote hosts. (Closes: #263449) +++ Changes by Pierre Habouzit: @@ -2800,7 +2800,7 @@ tdebase (4:3.4.2-1) unstable; urgency=low * Add build-dependencies on libxss-dev, libxxf86misc-dev, libxau-dev, libxdmcp-dev, libxcomposite-dev, libxdamage-dev, and prune the 07_xlibs-static-pic.diff accordingly, for the X.Org transition. kompmgr - is also now built and installed with kwin. + is also now built and installed with twin. * Tightened build dependency on dbus-qt-1-dev to force building against a C++ transitioned version. Can be removed once dbus (>= 0.23.4-5) is @@ -2808,7 +2808,7 @@ tdebase (4:3.4.2-1) unstable; urgency=low * Tighten all package relations between packages in tdebase, preventing many instances of potentially harmful partial upgrades. In particular, ensure - that kdm is upgraded along with tdebase-bin. (Closes: #312358) + that tdm is upgraded along with tdebase-bin. (Closes: #312358) * Fix typos in the kappfinder manpage. Thanks to A Costa. (Closes: #312767) @@ -2817,11 +2817,11 @@ tdebase (4:3.4.2-1) unstable; urgency=low did not work with arts, had arts ever once been unavailable. (Closes: #312217) - * No longer set a random ForgingSeed in the kdmrc conffile, for this caused - each tdebase build to generate a different kdmrc, and therefore made + * No longer set a random ForgingSeed in the tdmrc conffile, for this caused + each tdebase build to generate a different tdmrc, and therefore made updates a nuissance. - * Make kdm Suggest kdepasswd, since the later contains icons that can be + * Make tdm Suggest kdepasswd, since the later contains icons that can be used to provide users with 'face' icons. * Fix formatting of the kdepasswd manpage. (Closes: #313472) @@ -2829,10 +2829,10 @@ tdebase (4:3.4.2-1) unstable; urgency=low * Add the Arabic debconf translation by Mohammed Adnene Trojette. (Closes: #320768) - * Fix kdm session files that contain the incorrent binary names. + * Fix tdm session files that contain the incorrent binary names. (Closes: #320628) - * Change kdm's debconf dependency into a dependency on debconf | + * Change tdm's debconf dependency into a dependency on debconf | debconf-2.0, as this allows the installation of cdebconf. * Move all of konsole's README documentation into /opt/trinity/share/doc/konsole. @@ -2863,7 +2863,7 @@ tdebase (4:3.4.3-0ubuntu5) breezy-updates; urgency=low tdebase (4:3.4.3-0ubuntu4) breezy; urgency=low * Fix typo in kubuntu_18_default_fonts.diff to give anti-aliased - fonts in kdm + fonts in tdm -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 11 Oct 2005 22:50:44 +0100 @@ -2895,7 +2895,7 @@ tdebase (4:3.4.2-0ubuntu5) breezy; urgency=low before X is started (ubuntu No 15344 , No 15102) * Ensure kubuntu_27_aboutscreen_searchbar.diff is not applied before upload - * Fix kdm.postinst to move kdm back to S21 + * Fix tdm.postinst to move tdm back to S21 -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 27 Sep 2005 12:50:34 +0100 @@ -2905,7 +2905,7 @@ tdebase (4:3.4.2-0ubuntu4) breezy; urgency=low on desktop icons * Compile with GCC 3.4 on hppa, m68k, arm to prevent internal compiler error - * Add kubuntu_30_startkde_background_colour.diff to make default + * Add kubuntu_30_starttde_background_colour.diff to make default background colour match default wallpaperchange background colour * Do not install SVG icons to save space * Install simple konqueror.rc into /usr/share/apps/konqueror, workaround @@ -2937,7 +2937,7 @@ tdebase (4:3.4.2-0ubuntu2) breezy; urgency=low tdebase (4:3.4.2-0ubuntu1) breezy; urgency=low * New upstream release - * Move 10_kdmrc_defaults.diff to kubuntu_10_kdmrc_defaults.diff + * Move 10_tdmrc_defaults.diff to kubuntu_10_tdmrc_defaults.diff and s/Debian/Debian * Add kubuntu_27_aboutscreen_searchbar.diff @@ -2971,7 +2971,7 @@ tdebase (4:3.4.1-0ubuntu3) breezy; urgency=low * Update kubuntu_23_hal_api.diff * Replace 19_kcontrol_only_in_kde.diff with kubuntu_25_kcontrol_only_in_kde.diff which stops KControl displaying (use System Settings instead) - * Add kubuntu_26_startkde.diff to start ivman + * Add kubuntu_26_starttde.diff to start ivman * Add 25_khelp_htdig.diff from Debian -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 20 Jun 2005 09:15:07 +0000 @@ -2985,7 +2985,7 @@ tdebase (4:3.4.1-0ubuntu2) breezy; urgency=low tdebase (4:3.4.1-0ubuntu1) breezy; urgency=low * Update version number following KDE 3.4.1 release - * Add kde-base conflict with kdm << 3.4.1 + * Add kde-base conflict with tdm << 3.4.1 * Add back ktip to meta package -- Jonathan Riddell <jr@jriddell.org> Wed, 1 Jun 2005 00:15:47 +0000 @@ -2999,7 +2999,7 @@ tdebase (4:3.4.1-0ubuntu0pre3) breezy; urgency=low tdebase (4:3.4.1-0ubuntu0pre2) breezy; urgency=low - * Add build-dep on libxau-dev, libxdmcp-dev to let KDM compile + * Add build-dep on libxau-dev, libxdmcp-dev to let TDM compile -- Jonathan Riddell <jr@jriddell.org> Tue, 24 May 2005 19:23:39 +0000 @@ -3007,8 +3007,8 @@ tdebase (4:3.4.1-0ubuntu0pre1) breezy; urgency=low * New upstream release. * Sync with Debian - * Change /usr/bin/X11 to /usr/X11R6/bin in kdm.README.Debian and - patches/11_genkdmconf.diff renamed to kubuntu_01_genkdmconf.diff + * Change /usr/bin/X11 to /usr/X11R6/bin in tdm.README.Debian and + patches/11_gentdmconf.diff renamed to kubuntu_01_gentdmconf.diff and alter PATH in debian/rules -- Jonathan Riddell <jr@jriddell.org> Tue, 24 May 2005 11:34:02 +0000 @@ -3033,18 +3033,18 @@ tdebase (4:3.4.0-0pre4) alioth; urgency=low +++ Changes by Christopher Martin: * Added a patch to set reasonable default fonts, using the fontconfig - defaults, for kpersonalizer, kcontrol, kdm, and the Plastik theme. We + defaults, for kpersonalizer, kcontrol, tdm, and the Plastik theme. We also use the Debian Blue artwork to provide a standard desktop background. - * KDM no longer shows the Custom session. When it works at all, it simply + * TDM no longer shows the Custom session. When it works at all, it simply duplicates Default's behaviour anyway. (Closes: #251602) - * New KDM patches source /etc/profile and the user's normal shell startup + * New TDM patches source /etc/profile and the user's normal shell startup scripts. (Closes: #173802, #211953, #250645, #250765, #289143) - * KDM once again looks for window manager session definitions in - /usr/share/apps/kdm/sessions by default. (Closes: #293645, #310155) + * TDM once again looks for window manager session definitions in + /usr/share/apps/tdm/sessions by default. (Closes: #293645, #310155) * USB usermap for Logitech mice is now installed, with device permissions set so that members of the plugdev group can make use of the Logitech @@ -3065,7 +3065,7 @@ tdebase (4:3.4.0-0pre4) alioth; urgency=low Debian. (Closes: #246280) * Make ksmserver Recommend kpersonalizer, since it is used when - running KDE for the first time. Also patch startkde so it doesn't + running KDE for the first time. Also patch starttde so it doesn't fail when kpersonalizer is not present. (Closes: #309803) * Add manpages for kdialog (thanks to Bastian Kleineidam for tracking it @@ -3092,7 +3092,7 @@ tdebase (4:3.3.2-1) unstable; urgency=low * Update tdeprint documentation to sync with tdelibs patches. - * Add NEWS.Debian for kdm, explaining the "keyboard doesn't work" + * Add NEWS.Debian for tdm, explaining the "keyboard doesn't work" problem when upgrading to KDE 3.3, and how to deal with it. (Closes: #266106, #267622) @@ -3107,7 +3107,7 @@ tdebase (4:3.3.2-1) unstable; urgency=low +++ Changes by Adeodato Simó: * debian/control: - - make tdebase-dev depend on kwin for the libtdecorations.so -> + - make tdebase-dev depend on twin for the libtdecorations.so -> libtdecorations.so.1.0.0 symlink. (Closes: #289544) * Included Czech po-debconf translation by Miroslav Kure. @@ -3146,7 +3146,7 @@ tdebase (4:3.4.0-0ubuntu18) hoary; urgency=low tdebase (4:3.4.0-0ubuntu17) hoary; urgency=low - * Changed kdm start from S13 to S21 (Ubuntu: 8029) + * Changed tdm start from S13 to S21 (Ubuntu: 8029) * More Linitian cleanup -- Andreas Mueller <amu@ubuntu.com> Tue, 5 Apr 2005 16:00:01 +0200 @@ -3173,8 +3173,8 @@ tdebase (4:3.4.0-0ubuntu14) hoary; urgency=low tdebase (4:3.4.0-0ubuntu13) hoary; urgency=low - * Fix kdm login when shell is zsh. Thanks Antti S. Lankila for the hint. - 19_kdm_zsh_emulate.diff (Hoary #7620) + * Fix tdm login when shell is zsh. Thanks Antti S. Lankila for the hint. + 19_tdm_zsh_emulate.diff (Hoary #7620) * Fix init script output (Hoary #7180) -- Chris Halls <chris.halls@credativ.co.uk> Wed, 30 Mar 2005 01:01:26 +0100 @@ -3207,7 +3207,7 @@ tdebase (4:3.4.0-0ubuntu9) hoary; urgency=low tdebase (4:3.4.0-0ubuntu8) hoary; urgency=low - * Make default background colour of kdm match wallpaper + * Make default background colour of tdm match wallpaper * Add kubuntu_17_hide_desktop_trash.diff to hide desktop wastebin * Remove dependency on ktip from tdebase * Change Hidden to OnlyShowIn in knetattach.desktop so it isn't hidden from remote:/ @@ -3216,7 +3216,7 @@ tdebase (4:3.4.0-0ubuntu8) hoary; urgency=low tdebase (4:3.4.0-0ubuntu7) hoary; urgency=low - * Make kdm depend on kubuntu-default-settings + * Make tdm depend on kubuntu-default-settings -- Jonathan Riddell <jr@jriddell.org> Thu, 17 Mar 2005 07:11:28 +0000 @@ -3240,16 +3240,16 @@ tdebase (4:3.4.0-0ubuntu4) hoary; urgency=low tdebase (4:3.4.0-0ubuntu3) hoary; urgency=low - * Fix kdm.postinst to correctly update existing S99kdm links to S13kdm + * Fix tdm.postinst to correctly update existing S99tdm links to S13tdm -- Jonathan Riddell <jr@jriddell.org> Wed, 16 Mar 2005 23:43:54 +0000 tdebase (4:3.4.0-0ubuntu2) hoary; urgency=low - * Fix kdm.postinst to update existing S99kdm links to S13kdm + * Fix tdm.postinst to update existing S99tdm links to S13tdm * Fix kubuntu_03_ksplash_settings.diff to change all references to icon * Remove depend on tde-style-lipstik while still in universe - * Add kubuntu_05_kdm_theme_config.diff to make kdm use Debian theme + * Add kubuntu_05_tdm_theme_config.diff to make tdm use Debian theme * Add kubuntu_06_hide_home_menu_entry.diff to hide Home from KMenu -- Jonathan Riddell <jr@jriddell.org> Wed, 16 Mar 2005 17:26:25 +0000 @@ -3266,7 +3266,7 @@ tdebase (4:3.4.0-0ubuntu1) hoary; urgency=low tdebase (4:3.4.0-0pre1ubuntu6) hoary; urgency=low - * Make kdm start at at S13 rather than S99 (see Ubuntu Bugzilla No 3143 + * Make tdm start at at S13 rather than S99 (see Ubuntu Bugzilla No 3143 for gdm). * Make tdebase-bin depend on gdb for drkonqi * Add patch kubuntu_02_kcontrol_only_kde_menu.diff making KControl only @@ -3276,7 +3276,7 @@ tdebase (4:3.4.0-0pre1ubuntu6) hoary; urgency=low tdebase (4:3.4.0-0pre1ubuntu5) hoary; urgency=low - * Add kwin conflicts with old tdeartwork-theme-window + * Add twin conflicts with old tdeartwork-theme-window -- Jonathan Riddell <jr@jriddell.org> Tue, 8 Mar 2005 22:48:59 +0000 @@ -3312,12 +3312,12 @@ tdebase (4:3.3.2-0pre1) experimental; urgency=low * KDE_3_3_BRANCH update. Includes the tdebase part of the fix for CAN-2004-1158. * Lower tdeprint's dependency on gv to a Suggests. (Closes: #269590) - * kwin is now registered as an x-window-manager. (Closes: #249162) - * Added /usr/share/xsessions to KDM's default session path, so + * twin is now registered as an x-window-manager. (Closes: #249162) + * Added /usr/share/xsessions to TDM's default session path, so .desktop files installed there are found. (Closes: #243770, #247365, #247747, #250384) - * kdm can now be installed while building tdebase, without affecting - the generated kdmrc and other config files. + * tdm can now be installed while building tdebase, without affecting + the generated tdmrc and other config files. * Adjust documentation to reflect the CUPS document path used by Debian. * Incorporate new manpages, for kdepasswd, kappfinder, kfind, @@ -3385,7 +3385,7 @@ tdebase (4:3.3.1-1) unstable; urgency=low * New upstream release. * KDE_3_3_BRANCH update. * ksmserver: only reset x-session-manager on install. (Closes: #247243) - * kdm: remove log files on purge. (Closes: #273542) + * tdm: remove log files on purge. (Closes: #273542) * Correct Danish po-debconf translations. (Closes: #273832) -- Christopher L Cheney <ccheney@debian.org> Thu, 4 Nov 2004 04:00:00 -0600 @@ -3396,10 +3396,10 @@ tdebase (4:3.3.0a-1) unstable; urgency=low * KDE_3_3_BRANCH update. * Add Turkish po-debconf translations. (Closes: #248326) * Add German po-deconf translations. (Closes: #264608) - * Correct /etc/trinity/kdm/Xsession file. (Closes: #265795) + * Correct /etc/trinity/tdm/Xsession file. (Closes: #265795) * Correct usage of "its" in konsole description. (Closes: #268517) * Correct Danish po-debconf translations. (Closes: #269575) - * Correct kdm name in /etc/init.d/kdm. (Closes: #272062) + * Correct tdm name in /etc/init.d/tdm. (Closes: #272062) -- Christopher L Cheney <ccheney@debian.org> Sat, 25 Sep 2004 20:00:00 -0500 @@ -3422,17 +3422,17 @@ tdebase (4:3.2.2-1) unstable; urgency=low * New upstream release. * Added Build-Depends: libsensors-dev. - * Corrected kdm postinst startup code. (Closes: #195052) + * Corrected tdm postinst startup code. (Closes: #195052) * Removed Debian menu desktop files. (Closes: #198661) * Added a README.linux.console document. (Closes: #218035) - * Remove kdm log files on purge. (Closes: #225157) + * Remove tdm log files on purge. (Closes: #225157) * Corrected kate/konqueror mime nametemplate support. (Closes: #235216) - * Removed "FIXME - observe" lines from kdm scripts. (Closes: #236422) + * Removed "FIXME - observe" lines from tdm scripts. (Closes: #236422) * Added Danish po-debconf translations. (Closes: #236480) * Remove old x-session-manager alternatives. (Closes: #236515, #236795, #237081, #240773) * Removed tdebase and kicker menu-methods. (Closes: #236700) - * Corrected kdm-np PAM service. (Closes: #236750, #238182, #242381) + * Corrected tdm-np PAM service. (Closes: #236750, #238182, #242381) * Added kcontrol Depends: tdebase-data. (Closes: #239297) * Updated GDM session file. (Closes: #240980) * debian/*.menu: remove the obsolete kderemove tag. @@ -3447,8 +3447,8 @@ tdebase (4:3.2.1-1) unstable; urgency=low * Added Japanese po-deconf translations. (Closes: #137940, #210431) * Updated kate Recommends: kregexpeditor. (Closes: #227677) * Added konqueror Depends: tdebase-kio-plugins. (Closes: #230203) - * Added kdm Provides: x-display-manager. (Closes: #231442) - * Added tdebase-bin/kdm Depends libpam-runtime. (Closes: #233562, #236078) + * Added tdm Provides: x-display-manager. (Closes: #231442) + * Added tdebase-bin/tdm Depends libpam-runtime. (Closes: #233562, #236078) * Added kate/konqueror mime nametemplate support. (Closes: #235216) -- Christopher L Cheney <ccheney@debian.org> Fri, 5 Mar 2004 04:00:00 -0600 @@ -3486,8 +3486,8 @@ tdebase (4:3.1.4-2) unstable; urgency=low * Corrected konqueror gs mime tests. (Closes: #160428) * kdesktop Recommends eject. (Closes: #223642) * konqueror Provides info-browser. (Closes: #223913) - * Added '|| true' to db_input lines in kdm debconf support. (Closes: #224548) - * Corrected typo in kdm.config script. (Closes: #224578) + * Added '|| true' to db_input lines in tdm debconf support. (Closes: #224548) + * Corrected typo in tdm.config script. (Closes: #224578) -- Christopher L Cheney <ccheney@debian.org> Mon, 5 Jan 2004 23:00:00 -0600 @@ -3506,7 +3506,7 @@ tdebase (4:3.1.4-1) unstable; urgency=low * Update pam support to use new common module fragments. (Closes: #206958) * Update package descriptions. (Closes: #209532, #209856) * Strip SUID root from kcheckpass since its not needed. (Closes: #212212) - * Update kdm debconf and use po-debconf. (Closes: #218731) + * Update tdm debconf and use po-debconf. (Closes: #218731) * Make kicker depend on tdebase-data. (Closes: #223407) -- Christopher L Cheney <ccheney@debian.org> Thu, 18 Dec 2003 13:30:00 -0600 @@ -3544,8 +3544,8 @@ tdebase (4:3.1.2-1) unstable; urgency=low * Add kfind to konqueror Depends. (Closes: #192859) * Fix KDE GDM Session file. (Closes: #144206, #154519, #188560, #189438, #193274) - * Add log rotation for KDM logfile. (Closes: #145345, #153728) - * Add screen number to KDM Xservers file. (Closes: #182708, #184737, #187257) + * Add log rotation for TDM logfile. (Closes: #145345, #153728) + * Add screen number to TDM Xservers file. (Closes: #182708, #184737, #187257) * Moved xfonts-konsole fonts to /usr/X11R6/lib/X11/fonts/misc/ (Closes: #184548) @@ -3554,13 +3554,13 @@ tdebase (4:3.1.2-1) unstable; urgency=low tdebase (4:3.1.1-1) unstable; urgency=low * New upstream release. (Closes: #180816, #181309) - * Corrected kdm-update-menu.sh kdm.options path. (Closes: #180355) - * Added xbase-clients depend to kdm. (Closes: #180536) + * Corrected tdm-update-menu.sh tdm.options path. (Closes: #180355) + * Added xbase-clients depend to tdm. (Closes: #180536) * Added xutils depend to xfonts-konsole. (Closes: #180695) * Improved xfonts-konsole description. (Closes: #180696) * Remove upgrade from alternatives removal prerm script. (Closes: #180927) * Change Xservers to launch /usr/X11R6/bin/X. (Closes: #182037) - * Add entries for kdm reserve xserver feature. (Closes: #182708) + * Add entries for tdm reserve xserver feature. (Closes: #182708) * Add kcontrol depends to konqueror (Closes: #182724) * Change konqueror menu entry to allow execution. (Closes: #183225) * Make konqueror provide www-browser. (Closes: #183391) @@ -3600,7 +3600,7 @@ tdebase (4:2.2.2-14.5) stable-security; urgency=high * Non-maintainer upload by the Security Team * Apply patch from KDE advisory 20030908 to fix local root vulnerability in - PAM authentication in KDM + PAM authentication in TDM -- Matt Zimmerman <mdz@debian.org> Sun, 31 Aug 2003 04:39:47 -0400 @@ -3653,7 +3653,7 @@ tdebase (4:2.2.2-13) unstable; urgency=low * debian/rules, debian/konsole.dirs: - Make symlinks in the X fonts directory to Konsole fonts in /usr/share/fonts in the install target. (closes: #127871) - * debian/kdmrc: + * debian/tdmrc: - Disallow remote users from shutting down the machine. (Yeah, yeah, I know - dodgy grammar). (closes: #127616) * debian/control: @@ -3739,7 +3739,7 @@ tdebase (4:2.2.2-4) unstable; urgency=low * Build cleanup * Build with xinerama support for i386 * Another update for Nedit.ad to work with newer Nedit - * Cleanup kdmrc for release..default to security + * Cleanup tdmrc for release..default to security * Update documentation for freeze -- Ivan E. Moore II <rkrusty@debian.org> Fri, 30 Nov 2001 02:30:00 -0700 @@ -3747,7 +3747,7 @@ tdebase (4:2.2.2-4) unstable; urgency=low tdebase (4:2.2.2-3) unstable; urgency=low * Update Brazilian Portuguese debconf entries (Closes: #120841) - * Remove kdmrc debconf note + * Remove tdmrc debconf note * Add in replaces to fix those people using testing who don't know how to use --force-overwrite or don't know how to let dpkg fix things on the second go around. What a waste of disk space. @@ -3767,14 +3767,14 @@ tdebase (4:2.2.2-2) unstable; urgency=low tdebase (4:2.2.2-1) unstable; urgency=low * new upstream version - * Add in suggests for libpam-krb/heimdel to kdm so we can get rid of the - kdm-krb package + * Add in suggests for libpam-krb/heimdel to tdm so we can get rid of the + tdm-krb package * Update Nedit.ad (Closes: #117881) - * Apply kdm cleanup patch by Branden (Closes: #118217) + * Apply tdm cleanup patch by Branden (Closes: #118217) * Fix mime checks (Closes: #117747) * Fix kate syntax highlights (Closes: #113773) * Add kate undocumented manpage - * Run lilo query for kdm with -w + * Run lilo query for tdm with -w * Fix konsole crashes (Closes: #119480) -- Ivan E. Moore II <rkrusty@debian.org> Wed, 21 Nov 2001 16:18:00 -0700 @@ -3855,7 +3855,7 @@ tdebase (4:2.2.1-5) unstable; urgency=low tdebase (4:2.2.1-4) unstable; urgency=low * More upstream fixes - * don't set background in startkde script by default. + * don't set background in starttde script by default. -- Ivan E. Moore II <rkrusty@debian.org> Thu, 27 Sep 2001 12:13:00 -0700 @@ -3867,9 +3867,9 @@ tdebase (4:2.2.1-3) unstable; urgency=low tdebase (4:2.2.1-2) unstable; urgency=low - * fix kdm preinst (Closes: #112900) + * fix tdm preinst (Closes: #112900) * fix overwrite (Closes: #112903) - * A couple kdm fixes and on keditbookmarks fix from upstream + * A couple tdm fixes and on keditbookmarks fix from upstream * Use usbutils's usb.ids if it exists (Closes: #112879) * konsole save fixes (Closes: #112982, 112943) @@ -3905,8 +3905,8 @@ tdebase (4:2.2.0.20010822-1) unstable; urgency=low * Remove gvim.desktop and gvim.png files so there is no confliction with new vim package. * sync with upstream - * Fix kdm not allowing typing after the first boot - * kdm now uses new x-display-manager bits + * Fix tdm not allowing typing after the first boot + * tdm now uses new x-display-manager bits * Fix typos and update script bits from Branden -- Ivan E. Moore II <rkrusty@debian.org> Wed, 22 Aug 2001 00:01:00 -0700 @@ -3922,10 +3922,10 @@ tdebase (4:2.2.0-final-3) unstable; urgency=low tdebase (4:2.2.0-final-2) unstable; urgency=low * Re-Add the *proper* Xsession script that will use the one provided - by Debian's X rather than the one provided by kdm which is broken. + by Debian's X rather than the one provided by tdm which is broken. The one provided by Debian works better anyways. (Closes: #108736) * Fix klipperrc (Closes: #108856) - * Add a debconf note to kdm about SessionTypes being auto-generated. This + * Add a debconf note to tdm about SessionTypes being auto-generated. This is now noted in 3 locations. -- Ivan E. Moore II <rkrusty@debian.org> Tue, 14 Aug 2001 16:53:00 -0700 @@ -3964,7 +3964,7 @@ tdebase (4:2.2.0-0.2beta1-1) unstable; urgency=low * Update Build-Depends and Depends * Fix pdf viewing problem (Closes: #88006) * Fix reference to woody's version in userguide (Closes: #105301) - * kdm Brazilian debconf translations (Closes: #105374) + * tdm Brazilian debconf translations (Closes: #105374) * Fix kde-update-menu script so that it can be run as a normal user (Closes: #105786) * sync with upstream @@ -4003,22 +4003,22 @@ tdebase (4:2.2.0-0beta1-3) unstable; urgency=low tdebase (4:2.2.0-0beta1-2) unstable; urgency=low - * Fix kdm preinst + * Fix tdm preinst -- Ivan E. Moore II <rkrusty@debian.org> Fri, 29 Jun 2001 09:51:00 -0700 tdebase (4:2.2.0-0beta1-1) unstable; urgency=low - * Update path info in kdm files...these were in the comments so + * Update path info in tdm files...these were in the comments so it wasn't a big deal - * Add a comment to default kdmrc about SessionType generation - * Re-hash kdm README + * Add a comment to default tdmrc about SessionType generation + * Re-hash tdm README * KDE 2.2 beta1 * Sync with upstream * Fix typo in Xsetup * Fix dup dependencies (Closes: #99690) * Fix other replaces and whatnot (Closes: #101187) - * Add filterproxy,freenet user to kdmrc (Closes: #96707, #98746) + * Add filterproxy,freenet user to tdmrc (Closes: #96707, #98746) * Upstream reports these bugs fixed (Closes: #77151) * Adding in a note about kwrited (Closes: #97245) * Add w3m to klipperrc @@ -4032,7 +4032,7 @@ tdebase (4:2.2.0-0beta1-1) unstable; urgency=low date listed in the version number states when the initial pull was made however updates may and most likely will have taken place since that date. Look at it as a >= cvs{date} - * Generate SessionTypes line in kdmrc during kdm postinst. + * Generate SessionTypes line in tdmrc during tdm postinst. * Change KDE logo's in konq's about:konqueror to Debian powered-by logo with link to debian.org instead of kde.org * Remove old menu debian xpm files and use existing debian png mimetype @@ -4049,14 +4049,14 @@ tdebase (4:2.2.0-0beta1-1) unstable; urgency=low we were using. * Fix description of kate...oops..thanks Oswald. :) * More menu clean...full pathing - * ton of kdm updates...basically syncing conffiles with those from + * ton of tdm updates...basically syncing conffiles with those from the xdm from 4.0.3 * More build-deps: libogg-dev, libvorbis-dev (For auidocd:/ support) - * Provide man link from kdm to chooser + * Provide man link from tdm to chooser * More build cleanup..take more of the automation out to make sure things are constant - * Remove custom startkde + * Remove custom starttde * Revert old overrides so we can start from scratch * Add in new python-base dependency * New packages: kate, tdebase-audiolibs (so that those without sound do @@ -4068,7 +4068,7 @@ tdebase (4:2.2.0-0beta1-1) unstable; urgency=low * And let's list the bugs fixed... ctrl-u problems with location bar fixed (Closes: #81425) image transparency fixed for konsole on startup (Closes: #84062) - fixes kwin's conflicting key accelerators (Closes: #86370) + fixes twin's conflicting key accelerators (Closes: #86370) fixes rendering error for www.bluesnews.com (Closes: #79800) fixes button problems for katalog.ub.uni-heidelberg.de (Closes: #88934) now provides the audiocd ioslave bits which allow for ripping audio @@ -4085,9 +4085,9 @@ tdebase (4:2.2.0-0beta1-1) unstable; urgency=low * New man pages for: konqueror * More debconf cleanup * Adding in suggests for xearth - * Add in Dependency for x-window-manager | x-session-manager to kdm + * Add in Dependency for x-window-manager | x-session-manager to tdm * Add icons to debian sub menus - * kdm auto-generation of session list + * tdm auto-generation of session list * Merging Debian and KDE menus a bit * Add lynx and links to default klipperc * Fixed communicator entry in klipperrc so that it will actually launch @@ -4123,7 +4123,7 @@ tdebase (4:2.1.1-4) unstable; urgency=low tdebase (4:2.1.1-3) unstable; urgency=low - * Fix kdmrc file (Closes: #92415) + * Fix tdmrc file (Closes: #92415) * Update XftConfig example * Fix kfmclient and kicker crashes (Closes: #89146, #88647) * More upstream fixes @@ -4134,7 +4134,7 @@ tdebase (4:2.1.1-3) unstable; urgency=low tdebase (4:2.1.1-2) unstable; urgency=low - * Move startkde script into /etc/kde2 so that it will be a conffile and + * Move starttde script into /etc/kde2 so that it will be a conffile and link it back to /usr/bin/kde2. (Closes: #91787) * Build on older libc * Adding in recommends for klisa @@ -4156,7 +4156,7 @@ tdebase (4:2.1.0.1-5) unstable; urgency=low tdebase (4:2.1.0.1-4) unstable; urgency=low - * pam_env fixes for kdm as well as a ton of other updates to kdm + * pam_env fixes for tdm as well as a ton of other updates to tdm * Fixing a problem with the default AA settings. It looks like I "fixed" the wrong bit when I first fixed this. (Closes: #89741) @@ -4165,14 +4165,14 @@ tdebase (4:2.1.0.1-4) unstable; urgency=low tdebase (4:2.1.0.1-3) unstable; urgency=low * Adding in debconf note for systems that have a /.kde directory - * Adding debconf dependency to kdm + * Adding debconf dependency to tdm * More upstream fixes -- Ivan E. Moore II <rkrusty@debian.org> Tue, 13 Mar 2001 18:20:00 -0700 tdebase (4:2.1.0.1-2) unstable; urgency=low - * Fix kdm init script. actually stop when we tell you to stop (Closes: #89235) + * Fix tdm init script. actually stop when we tell you to stop (Closes: #89235) * More documentation added to the QT AA Font Howto * Fix for K Menu restarts and other funky behaviour * XftConfig example included @@ -4253,19 +4253,19 @@ tdebase (4:2.1.0-1) unstable; urgency=low tdebase (4:2.1-final-1) unstable; urgency=low * New upstream version - * Fix kdm init.d script + * Fix tdm init.d script * Upping standards version - * Fix for "chooser not running from kdm" (Closes: #76586) + * Fix for "chooser not running from tdm" (Closes: #76586) * Fix graphics display (Closes: #85166) * Fix bg clear issue (Closes: #77649) - * Fix kdm and expiring passwords + * Fix tdm and expiring passwords * Fix for konq crash on startup and other crashes (Closes: 84472, #77151, #80102) * Moving task-kde* packages out of tdebase source * Fixes for khelpcenter hangs (Closes: #81683) * konq provides ftp-client as well * Update /usr/bin/kde2 script * Compile ldap kioslave - * Updated kdm init.d script + * Updated tdm init.d script * Fix these rendering issues (Closes: #87183) -- Ivan E. Moore II <rkrusty@debian.org> Mon, 19 Feb 2001 02:31:00 -0700 @@ -4301,7 +4301,7 @@ tdebase (4:2.1-beta2-2) unstable; urgency=low * Updating menu entries (Closes: #83216) * Fixes form content memory in konq (Closes: #77317) * Fixes problem with version numbers not showing - * Adding Build-Depends for xutils as it seems kdm needs imake + * Adding Build-Depends for xutils as it seems tdm needs imake * Applied patch for konq template (Closes: #83355) -- Ivan E. Moore II <rkrusty@debian.org> Tue, 23 Jan 2001 12:36:00 -0700 @@ -4333,8 +4333,8 @@ tdebase (4:2.1-20010115-1) unstable; urgency=low * 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 - * Updating kdmrc to match current features and all - * Add a link in /etc/X11/kdm to kdmrc (Closes: #82643) + * 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 * This version fixes smb problems...you just need to make sure you have smbclient installed. Added that as a Recommend (Closes: #82612) @@ -4384,7 +4384,7 @@ tdebase (4:2.1-20001218-1) unstable; urgency=low * More upstream fixes * Fix for GDM Session (Closes: #79987) - * Update to kdm man page and README + * Update to tdm man page and README * Adding /usr/bin/kde2 as a x-session-manager * Adding new menu hints (Closes: #80022, #80020) * Fixing menu-method to handle new hints @@ -4406,13 +4406,13 @@ tdebase (4:2.1-20001213-1) unstable; urgency=low * New upstream beta * Fixing alternative priority for konsole * Adding in a session for gdm (Closes: #74678) - * new x4 port of xdm -> kdm (Closes: #79196, #79509) + * new x4 port of xdm -> tdm (Closes: #79196, #79509) * Fix whatis typo (Closes: #78178) * Fix segfaults (Closes: #78903) * Adding in a Recommend for kview to konqueror (Closes: #79201) - * Changing x-window-manager alternative from kde2 to kwin - * KDM init.d script cleanup (Closes: #79320) - * Fixed default kdmrc script to show new options + * Changing x-window-manager alternative from kde2 to twin + * TDM init.d script cleanup (Closes: #79320) + * Fixed default tdmrc script to show new options * Adding in a kwm script for non-session launches * Adding new users to NoUsers (Closes: #79617) @@ -4457,21 +4457,21 @@ tdebase (4:2.0-final-4) unstable; urgency=low * more tdebase-libs work now properly handles pop3 and other services correctly now allows for email configuration without tdebase installed - * more dependency work with kdm (Closes: #76565) + * more dependency work with tdm (Closes: #76565) -- Ivan E. Moore II <rkrusty@debian.org> Wed, 08 Nov 2000 17:30:00 -0700 tdebase (4:2.0-final-3.1) unstable; urgency=low * applying i18n patch (Closes: #75831) - * more kdmrc default setting updates + * more tdmrc default setting updates -- Ivan E. Moore II <rkrusty@debian.org> Sun, 05 Nov 2000 23:00:00 -0700 tdebase (4:2.0-final-3) unstable; urgency=low * more upstream fixes - * more kdmrc default setting updates + * more tdmrc default setting updates * build against new xlibs and updating depends -- Ivan E. Moore II <rkrusty@debian.org> Sat, 04 Nov 2000 01:00:00 -0700 @@ -4509,7 +4509,7 @@ tdebase (4:2.0-20001015-0) unstable; urgency=low tdebase (4:2.0-20001013-0) unstable; urgency=low - * kdmdesktop fixes from upstream + * tdmdesktop fixes from upstream * more i18n work * applying i18n patche * more fixes for konqueror @@ -4533,7 +4533,7 @@ tdebase (4:2.0-20001009-0) unstable; urgency=low * KDE 2.0 RC2 * more upstream fixes - * minor kdmdekstop fix + * minor tdmdekstop fix -- Ivan E. Moore II <rkrusty@debian.org> Mon, 09 Oct 2000 08:00:00 -0700 @@ -4546,7 +4546,7 @@ tdebase (4:2.0-20001008-0) unstable; urgency=low tdebase (4:2.0-20001006-1) unstable; urgency=low * More upstream fixes - * Applying tdebase-1.94-kwin-nofreeze-20000924.diff patch (Closes: #74051) + * Applying tdebase-1.94-twin-nofreeze-20000924.diff patch (Closes: #74051) -- Ivan E. Moore II <rkrusty@debian.org> Sun, 08 Oct 2000 03:30:00 -0700 @@ -4561,8 +4561,8 @@ tdebase (4:2.0-20001004-0) unstable; urgency=low * More upstream fixes * No longer depend on versioned tdelibs - * Fixing up kdm's postinst to better handle kdmrc - * More spice for kdm + * Fixing up tdm's postinst to better handle tdmrc + * More spice for tdm * Fixes the following: (Closes: #73057, #73015, #73002, #72921, #72989, #72919, #72638) -- Ivan E. Moore II <rkrusty@debian.org> Mon, 02 Oct 2000 01:00:00 -0700 @@ -4647,14 +4647,14 @@ tdebase (4:2.0-20000912-0) unstable; urgency=low tdebase (4:2.0-20000910-2) unstable; urgency=low * Fixing Debian menu graphic problem - * More cleanup of kdm settings + * More cleanup of tdm settings * More dependency fixes -- Ivan E. Moore II <rkrusty@debian.org> Sun, 10 Sep 2000 23:00:00 -0700 tdebase (4:2.0-20000910-0) unstable; urgency=low - * Changing kdm banner graphic to be the Debian swirl + * Changing tdm banner graphic to be the Debian swirl * Fixing start script so that kde actually starts with the desktop functional. (sorry) @@ -4663,7 +4663,7 @@ tdebase (4:2.0-20000910-0) unstable; urgency=low tdebase (4:2.0-20000909-0) unstable; urgency=low * More upstream updates - * More kdm cleanup (star'd password option added) + * More tdm cleanup (star'd password option added) * Migrating binary-indep build pieces into their own area -- Ivan E. Moore II <rkrusty@debian.org> Sat, 09 Sep 2000 01:00:00 -0700 @@ -4693,9 +4693,9 @@ tdebase (4:2.0-20000901-0) unstable; urgency=low tdebase (4:2.0-20000825-0) unstable; urgency=low * New upstream fixes - * Updating kdm init script to match current xdm one - * Typo fixes in kdmrc - * Turning off xconsole by default for kdm + * Updating tdm init script to match current xdm one + * Typo fixes in tdmrc + * Turning off xconsole by default for tdm * Some work on menus -- Ivan E. Moore II <rkrusty@debian.org> Fri, 25 Aug 2000 21:30:00 -0700 @@ -4703,9 +4703,9 @@ tdebase (4:2.0-20000825-0) unstable; urgency=low tdebase (4:2.0-20000821-1.0) experimental; urgency=low * New upstream fixes - * changed xdm.options to kdm.options to seperate from xdm - * cleaned up pre/post scripts for kdm to handle proper upgrade from - kdm1. Forcing a restart (if possible and without killing the upgrade) + * changed xdm.options to tdm.options to seperate from xdm + * cleaned up pre/post scripts for tdm to handle proper upgrade from + tdm1. Forcing a restart (if possible and without killing the upgrade) during an upgrade. -- Ivan E. Moore II <rkrusty@debian.org> Mon, 21 Aug 2000 22:45:00 -0700 @@ -4727,7 +4727,7 @@ tdebase-cvs (4:2.0-20000521-1.0) experimental; urgency=low * Adding in a conflict for man2html since we provide it * Fixing ln issues with documentation * Fixing file permissions in CVS tree - * Fixing some kdm issues + * Fixing some tdm issues * Changing suggest to depend for tde-i18n since some documentation, etc resides in that package now. (including english) @@ -4755,9 +4755,9 @@ tdebase-cvs (4:2.0-20000306-1.1) experimental; urgency=low tdebase-cvs (4:2.0-20000302-1.0) experimental; urgency=low * New upstream CVS fixes - * Migrating chooser over to kdm-cvs package - * Updating kdm config files to match current versions of xdm - * Fixing kdm init.d scripts to handle now missing parser script + * Migrating chooser over to tdm-cvs package + * Updating tdm config files to match current versions of xdm + * Fixing tdm init.d scripts to handle now missing parser script * Fixing kicker applet issues (required -dev to be installed to work) -- Ivan E. Moore II <rkrusty@debian.org> Thu, 02 Mar 2000 22:00:00 -0700 @@ -4773,7 +4773,7 @@ tdebase-cvs (4:2.0-20000223-1.0) experimental; urgency=low * New upstream CVS fixes * Fixing pathing for kde help files - * Adding in md5 options to pam.d file for kdm + * Adding in md5 options to pam.d file for tdm -- Ivan E. Moore II <rkrusty@debian.org> Wed, 23 Feb 2000 22:00:36 -0700 @@ -4833,7 +4833,7 @@ tdebase-cvs (4:2.0-19990825-1) experimental; urgency=low tdebase-cvs (4:2.0-19990823-1) experimental; urgency=low * New upstream CVS changes - * Fixes bug with init.d script for kdm2 + * Fixes bug with init.d script for tdm2 -- Ivan E. Moore II <rkrusty@debian.org> Mon, 23 Aug 1999 07:00:56 -0400 @@ -4877,12 +4877,12 @@ tdebase-cvs (4:2.0-19990601-1) experimental; urgency=low tdebase-cvs (4:2.0-19990531-1) experimental; urgency=low - * Making kdm not require xdm + * Making tdm not require xdm * Fixing some pam stuff which includes a /etc/pam.d/kde file, making the pam name=kde so that it uses the /etc/pam.d/kde file instead of - xdm, kdm, or whatever. + xdm, tdm, or whatever. * Fixing the linux fonts for konsole. - * Fixing the /var/state/kdm issue + * Fixing the /var/state/tdm issue -- Ivan E. Moore II <rkrusty@debian.org> Mon, 31 May 1999 19:30:29 -0400 @@ -4940,7 +4940,7 @@ tdebase (4:1.1-19990217-1) unstable; urgency=low tdebase (4:1.1-19990214-2) unstable; urgency=low * move the link from /var/ to /usr, since /usr may be read only - * patch Xserver_0 to run kdmgreeter if kdm runs + * patch Xserver_0 to run tdmgreeter if tdm runs -- Stephan Kulow <coolo@kde.org> Tue, 16 Feb 1999 18:52:03 +0100 @@ -4952,7 +4952,7 @@ tdebase (4:1.1-19990214-1) unstable; urgency=low tdebase (4:1.1-19990207-3) unstable; urgency=low - * new kdmrc handling + * new tdmrc handling -- Stephan Kulow <coolo@kde.org> Fri, 12 Feb 1999 11:03:56 +0100 @@ -4990,7 +4990,7 @@ tdebase (2:980312-5) unstable; urgency=low tdebase (2:980312-4) frozen; urgency=low * added undocumented man page - * renamed kdmconfig to switchdm. This name existed twice + * renamed tdmconfig to switchdm. This name existed twice * new compile with latest tdelibs shlibs -- Stephan Kulow <coolo@kde.org> Tue, 31 Mar 1998 20:26:23 +0200 @@ -5001,7 +5001,7 @@ tdebase (2:980312-3) unstable; urgency=low * changed the directory for debian apps to /var/spool/applnk * set the correct UTMP file * test prefix() before removing it. This should avoid a rm -rf /, when possible - * new kdm (with bugfixes and new location for configuration files) + * new tdm (with bugfixes and new location for configuration files) -- Stephan Kulow <coolo@kde.org> Fri, 27 Mar 1998 16:07:37 +0100 @@ -5057,9 +5057,9 @@ tdebase (1:Beta2-2.1) experimental; urgency=low tdebase (1:Beta2-2) unstable; urgency=low - * fixed kde / startkde script. added minimal documentation. + * fixed kde / starttde script. added minimal documentation. * fixed klock permissions. - * removed startkde script. + * removed starttde script. * removed virtual package names. * fixed utmp file location in kvt. diff --git a/ubuntu/maverick/tdebase/debian/control b/ubuntu/maverick/tdebase/debian/control index 13b0f584b..119889e8b 100644 --- a/ubuntu/maverick/tdebase/debian/control +++ b/ubuntu/maverick/tdebase/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com> -Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs4c2a-trinity, libogg-dev, libogg-dev-la, libdbus-tqt-1-dev, libtool, libltdl-dev, cmake +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs4c2a-trinity, libogg-dev, libogg-dev-la, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libtool, libltdl-dev, cmake Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc Build-Conflicts: nvidia-glx (<< 1.0.8774-6) Standards-Version: 3.8.4 @@ -12,10 +12,10 @@ Standards-Version: 3.8.4 Package: tdebase-trinity Section: kde Architecture: all -Replaces: tdebase-kde3 (<< 4:3.5.13) -Breaks: tdebase-kde3 (<< 4:3.5.13) -Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-kio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), tdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), kwin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), hal-trinity | kfreebsd-gnu | hurd, xcalib -Recommends: kdm-trinity (>= ${Source-Version}), tdebase-runtime-data-common-trinity, libtqt3-integration-trinity +Replaces: kdebase-trinity (<< 4:14.0.0) +Breaks: kdebase-trinity (<< 4:14.0.0) +Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-kio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), tdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), twin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), hal-trinity | kfreebsd-gnu | hurd, xcalib +Recommends: tdm-trinity (>= ${Source-Version}), tdebase-runtime-data-common-trinity, libtqt3-integration-trinity Suggests: tdebase-trinity-doc-html (>= ${Source-Version}) Description: base components from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -31,8 +31,8 @@ Description: base components from the official KDE release Package: tdebase-runtime-data-common-trinity Section: kde Architecture: all -Replaces: tdebase-runtime-data-common-kde3 (<< 4:3.5.13) -Breaks: tdebase-runtime-data-common-kde3 (<< 4:3.5.13) +Replaces: kdebase-runtime-data-common-trinity (<< 4:14.0.0) +Breaks: kdebase-runtime-data-common-trinity (<< 4:14.0.0) Depends: tdebase-trinity Description: Shared common files for Trinity and KDE4 . @@ -42,8 +42,8 @@ Description: Shared common files for Trinity and KDE4 Package: kappfinder-trinity Section: kde Architecture: any -Replaces: kappfinder-kde3 (<< 4:3.5.13) -Breaks: kappfinder-kde3 (<< 4:3.5.13) +Replaces: kappfinder-trinity (<< 4:14.0.0) +Breaks: kappfinder-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: non-KDE application finder for KDE kappfinder searches your workstation for many common applications and @@ -55,8 +55,8 @@ Description: non-KDE application finder for KDE Package: kate-trinity Section: editors Architecture: any -Replaces: kate-kde3 (<< 4:3.5.13) -Breaks: kate-kde3 (<< 4:3.5.13) +Replaces: kate-trinity (<< 4:14.0.0) +Breaks: kate-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: kregexpeditor-trinity Suggests: aspell | ispell | hspell, kate-plugins-trinity, khelpcenter-trinity, konsole-trinity @@ -86,8 +86,8 @@ Description: advanced text editor for KDE Package: kcontrol-trinity Section: kde Architecture: any -Replaces: kcontrol-kde3 (<< 4:3.5.13) -Breaks: kcontrol-kde3 (<< 4:3.5.13) +Replaces: kcontrol-trinity (<< 4:14.0.0) +Breaks: kcontrol-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3}), usbutils Recommends: udev Suggests: khelpcenter-trinity, ntpdate | ntp-simple @@ -110,11 +110,11 @@ Description: control center for KDE Package: tdebase-trinity-bin Section: kde Architecture: any -Replaces: tdebase-kde3-bin (<< 4:3.5.13) -Breaks: tdebase-kde3-bin (<< 4:3.5.13) +Replaces: kdebase-trinity-bin (<< 4:14.0.0) +Breaks: kdebase-trinity-bin (<< 4:14.0.0) Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14) Suggests: khelpcenter-trinity, gdb -Conflicts: tdebase-libs-trinity (<< 4:3.0.0), kdm-trinity (<< 4:3.4.1-2), tdebase-workspace-data-trinity (<< 7:3.5.0) +Conflicts: tdebase-libs-trinity (<< 4:3.0.0), tdm-trinity (<< 4:3.4.1-2), tdebase-workspace-data-trinity (<< 7:3.5.0) 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. @@ -125,9 +125,9 @@ Description: core binaries for the KDE base module Package: tdebase-data-trinity Section: kde Architecture: all -Replaces: tdebase-data-kde3 (<< 4:3.5.13) -Breaks: tdebase-data-kde3 (<< 4:3.5.13) -Conflicts: kcontrol-trinity (<< 4:3.4.2-1), kwin-trinity (<< 4:3.4.2-1), kicker-trinity (<< 4:3.4.2-1) +Replaces: kdebase-data-trinity (<< 4:14.0.0) +Breaks: kdebase-data-trinity (<< 4:14.0.0) +Conflicts: kcontrol-trinity (<< 4:3.4.2-1), twin-trinity (<< 4:3.4.2-1), kicker-trinity (<< 4:3.4.2-1) Description: shared data files for the KDE base module This package contains the architecture-independent shared data files needed for a basic KDE desktop installation. @@ -138,9 +138,9 @@ Description: shared data files for the KDE base module Package: tdebase-trinity-dev Section: devel Architecture: any -Replaces: tdebase-kde3-dev (<< 4:3.5.13) -Breaks: tdebase-kde3-dev (<< 4:3.5.13) -Depends: kate-trinity (= ${Source-Version}), kcontrol-trinity (= ${Source-Version}), tdebase-trinity-bin (= ${Source-Version}), tdeprint-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), khelpcenter-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), klipper-trinity (= ${Source-Version}), kmenuedit-trinity (= ${Source-Version}), konqueror-nsplugins-trinity (= ${Source-Version}), konqueror-trinity (= ${Source-Version}), konsole-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version}), ksysguard-trinity (= ${Source-Version}), kwin-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8) +Replaces: kdebase-trinity-dev (<< 4:14.0.0) +Breaks: kdebase-trinity-dev (<< 4:14.0.0) +Depends: kate-trinity (= ${Source-Version}), kcontrol-trinity (= ${Source-Version}), tdebase-trinity-bin (= ${Source-Version}), tdeprint-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), khelpcenter-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), klipper-trinity (= ${Source-Version}), kmenuedit-trinity (= ${Source-Version}), konqueror-nsplugins-trinity (= ${Source-Version}), konqueror-trinity (= ${Source-Version}), konsole-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version}), ksysguard-trinity (= ${Source-Version}), twin-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8) Description: development files for the KDE base module This package contains headers and other development files needed to compile software based on the KDE base module. @@ -151,8 +151,8 @@ Description: development files for the KDE base module Package: tdebase-trinity-doc Section: doc Architecture: all -Replaces: tdebase-kde3-doc (<< 4:3.5.13) -Breaks: tdebase-kde3-doc (<< 4:3.5.13) +Replaces: kdebase-trinity-doc (<< 4:14.0.0) +Breaks: kdebase-trinity-doc (<< 4:14.0.0) Description: developer documentation for the KDE base module This package contains documentation for the KDE base module, of use more for developers creating applications than regular users. @@ -163,8 +163,8 @@ Description: developer documentation for the KDE base module Package: tdebase-trinity-doc-html Architecture: all Section: doc -Replaces: tdebase-kde3-doc-html (<< 4:3.5.13) -Breaks: tdebase-kde3-doc-html (<< 4:3.5.13) +Replaces: kdebase-trinity-doc-html (<< 4:14.0.0) +Breaks: kdebase-trinity-doc-html (<< 4:14.0.0) Suggests: konqueror-trinity | www-browser, tdebase-trinity Description: KDE base documentation in HTML format By default the modules provided by KDE only provide their documentation @@ -183,8 +183,8 @@ Description: KDE base documentation in HTML format Package: tdebase-kio-plugins-trinity Section: kde Architecture: any -Replaces: tdebase-kio-plugins-kde3 (<< 4:3.5.13) -Breaks: tdebase-kio-plugins-kde3 (<< 4:3.5.13) +Replaces: kdebase-kio-plugins-trinity (<< 4:14.0.0) +Breaks: kdebase-kio-plugins-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, kdesktop-trinity, libsasl2-modules, psmisc, cryptsetup, man-db (>= 2.5.1-1) Recommends: hal-trinity, pmount, kamera-trinity, tdemultimedia-kio-plugins-trinity Suggests: khelpcenter-trinity, mtools @@ -205,8 +205,8 @@ Description: core I/O slaves for KDE Package: kdepasswd-trinity Section: utils Architecture: any -Replaces: kdepasswd-kde3 (<< 4:3.5.13) -Breaks: kdepasswd-kde3 (<< 4:3.5.13) +Replaces: kdepasswd-trinity (<< 4:14.0.0) +Breaks: kdepasswd-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: password changer for KDE This is a simple application which allows users to change their @@ -218,8 +218,8 @@ Description: password changer for KDE Package: tdeprint-trinity Section: utils Architecture: any -Replaces: tdeprint-kde3 (<< 4:3.5.13) -Breaks: tdeprint-kde3 (<< 4:3.5.13) +Replaces: kdeprint-trinity (<< 4:14.0.0) +Breaks: kdeprint-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, enscript, poster, psutils Recommends: kghostview-trinity | postscript-viewer Suggests: khelpcenter-trinity, efax | hylafax-client | mgetty-fax, smbclient @@ -238,8 +238,8 @@ Description: print system for KDE Package: kdesktop-trinity Section: kde Architecture: any -Replaces: kdesktop-kde3 (<< 4:3.5.13) -Breaks: kdesktop-kde3 (<< 4:3.5.13) +Replaces: kdesktop-trinity (<< 4:14.0.0) +Breaks: kdesktop-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdebase-trinity-bin (= ${Source-Version}), eject, xdg-user-dirs Description: miscellaneous binaries and files for the KDE desktop This package contains miscellaneous binaries and files integral to @@ -248,20 +248,20 @@ Description: miscellaneous binaries and files for the KDE desktop This package is part of KDE, and a component of the KDE base module. See the 'kde-trinity' and 'tdebase-trinity' packages for more information. -Package: kdm-trinity +Package: tdm-trinity Section: kde Architecture: any -Replaces: kdm-kde3 (<< 4:3.5.13) -Breaks: kdm-kde3 (<< 4:3.5.13) +Replaces: tdm-trinity (<< 4:14.0.0) +Breaks: tdm-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdebase-trinity-bin (= ${Source-Version}), tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3}), debconf (>= 1.2.9) | debconf-2.0, libpam-runtime (>= 0.76-14), xbase-clients Recommends: logrotate, xserver-xorg Suggests: khelpcenter-trinity, ksmserver-trinity (= ${Source-Version}), kdepasswd-trinity (= ${Source-Version}), menu Provides: x-display-manager Description: X display manager for KDE - kdm manages a collection of X servers, which may be on the local host or + tdm manages a collection of X servers, which may be on the local host or remote machines. It provides services similar to those provided by init, getty, and login on character-based terminals: prompting for login name and - password, authenticating the user, and running a session. kdm supports XDMCP + password, authenticating the user, and running a session. tdm supports XDMCP (X Display Manager Control Protocol) and can also be used to run a chooser process which presents the user with a menu of possible hosts that offer XDMCP display management. @@ -269,8 +269,8 @@ Description: X display manager for KDE A collection of icons to associate with individual users is included with KDE, but as part of the kdepasswd package. . - The menu package will help to provide KDM with a list of window managers - that can be launched, if the window manager does not register with KDM + The menu package will help to provide TDM with a list of window managers + that can be launched, if the window manager does not register with TDM already. Most users won't need this. . This package is part of KDE, and a component of the KDE base module. @@ -279,8 +279,8 @@ Description: X display manager for KDE Package: kfind-trinity Section: utils Architecture: any -Replaces: kfind-kde3 (<< 4:3.5.13) -Breaks: kfind-kde3 (<< 4:3.5.13) +Replaces: kfind-trinity (<< 4:14.0.0) +Breaks: kfind-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Conflicts: tdebase-libs-trinity (<< 4:3.0.0) @@ -294,8 +294,8 @@ Description: file-find utility for KDE Package: khelpcenter-trinity Section: kde Architecture: any -Replaces: khelpcenter-kde3 (<< 4:3.5.13) -Breaks: khelpcenter-kde3 (<< 4:3.5.13) +Replaces: khelpcenter-trinity (<< 4:14.0.0) +Breaks: khelpcenter-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: htdig Description: help center for KDE @@ -310,8 +310,8 @@ Description: help center for KDE Package: kicker-trinity Section: kde Architecture: any -Replaces: kicker-kde3 (<< 4:3.5.13) -Breaks: kicker-kde3 (<< 4:3.5.13) +Replaces: kicker-trinity (<< 4:14.0.0) +Breaks: kicker-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3}) Suggests: khelpcenter-trinity, kicker-applets-trinity, menu Conflicts: tdebase-libs-trinity (<< 4:3.0.0) @@ -326,8 +326,8 @@ Description: desktop panel for KDE Package: klipper-trinity Section: kde Architecture: any -Replaces: klipper-kde3 (<< 4:3.5.13) -Breaks: klipper-kde3 (<< 4:3.5.13) +Replaces: klipper-trinity (<< 4:14.0.0) +Breaks: klipper-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: clipboard utility for Trinity @@ -342,8 +342,8 @@ Description: clipboard utility for Trinity Package: kmenuedit-trinity Section: kde Architecture: any -Replaces: kmenuedit-kde3 (<< 4:3.5.13) -Breaks: kmenuedit-kde3 (<< 4:3.5.13) +Replaces: kmenuedit-trinity (<< 4:14.0.0) +Breaks: kmenuedit-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: menu editor for KDE @@ -356,8 +356,8 @@ Description: menu editor for KDE Package: konqueror-trinity Section: web Architecture: any -Replaces: konqueror-kde3 (<< 4:3.5.13) -Breaks: konqueror-kde3 (<< 4:3.5.13) +Replaces: konqueror-trinity (<< 4:14.0.0) +Breaks: konqueror-trinity (<< 4:14.0.0) Provides: info-browser, man-browser, www-browser, konqueror Depends: ${shlibs:Depends}, kcontrol-trinity (= ${Source-Version}), tdebase-kio-plugins-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), kfind-trinity (= ${Source-Version}), konqueror-nsplugins-trinity Suggests: khelpcenter-trinity, konq-plugins-trinity, ksvg-trinity, gij-4.1, libgcj7-awt, libjessie-java @@ -389,8 +389,8 @@ Description: KDE's advanced file manager, web browser and document viewer Package: konqueror-nsplugins-trinity Section: utils Architecture: any -Replaces: konqueror-nsplugins-kde3 (<< 4:3.5.13) -Breaks: konqueror-nsplugins-kde3 (<< 4:3.5.13) +Replaces: konqueror-nsplugins-trinity (<< 4:14.0.0) +Breaks: konqueror-nsplugins-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, konqueror-trinity Description: Netscape plugin support for Konqueror This package includes support for Netscape plugins in Konqueror. @@ -401,8 +401,8 @@ Description: Netscape plugin support for Konqueror Package: konsole-trinity Section: kde Architecture: any -Replaces: konsole-kde3 (<< 4:3.5.13) -Breaks: konsole-kde3 (<< 4:3.5.13) +Replaces: konsole-trinity (<< 4:14.0.0) +Breaks: konsole-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Provides: x-terminal-emulator @@ -428,8 +428,8 @@ Description: X terminal emulator for KDE Package: kpager-trinity Section: kde Architecture: any -Replaces: kpager-kde3 (<< 4:3.5.13) -Breaks: kpager-kde3 (<< 4:3.5.13) +Replaces: kpager-trinity (<< 4:14.0.0) +Breaks: kpager-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: desktop pager for KDE @@ -443,8 +443,8 @@ Description: desktop pager for KDE Package: kpersonalizer-trinity Section: kde Architecture: any -Replaces: kpersonalizer-kde3 (<< 4:3.5.13) -Breaks: kpersonalizer-kde3 (<< 4:3.5.13) +Replaces: kpersonalizer-trinity (<< 4:14.0.0) +Breaks: kpersonalizer-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3}) Description: installation personalizer for KDE KDE Personalizer is the application that configures the KDE desktop for you. @@ -458,16 +458,16 @@ Description: installation personalizer for KDE Package: ksmserver-trinity Section: kde Architecture: any -Replaces: ksmserver-kde3 (<< 4:3.5.13) -Breaks: ksmserver-kde3 (<< 4:3.5.13) +Replaces: ksmserver-trinity (<< 4:14.0.0) +Breaks: ksmserver-trinity (<< 4:14.0.0) Provides: x-session-manager -Depends: ${shlibs:Depends}, tdebase-runtime-data-common-trinity, kwin-trinity (= ${Source-Version}) | x-window-manager +Depends: ${shlibs:Depends}, tdebase-runtime-data-common-trinity, twin-trinity (= ${Source-Version}) | x-window-manager Recommends: kpersonalizer-trinity (= ${Source-Version}), tde-ubuntu-integration Description: session manager for KDE This package contains the KDE session manager. It is responsible for restoring your KDE session on login. It is also needed to properly start a KDE session. It registers KDE with X display managers, and - provides the 'startkde' command, for starting an X session with KDE + provides the 'starttde' command, for starting an X session with KDE from the console. . If you are running KDE for the first time for a certain user, @@ -480,8 +480,8 @@ Description: session manager for KDE Package: ksplash-trinity Section: kde Architecture: any -Replaces: ksplash-kde3 (<< 4:3.5.13) -Breaks: ksplash-kde3 (<< 4:3.5.13) +Replaces: ksplash-trinity (<< 4:14.0.0) +Breaks: ksplash-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3}) Suggests: khelpcenter-trinity Description: the KDE splash screen @@ -494,8 +494,8 @@ Description: the KDE splash screen Package: ksysguard-trinity Section: utils Architecture: any -Replaces: ksysguard-kde3 (<< 4:3.5.13) -Breaks: ksysguard-kde3 (<< 4:3.5.13) +Replaces: ksysguard-trinity (<< 4:14.0.0) +Breaks: ksysguard-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, ksysguardd-trinity (= ${Source-Version}) Suggests: khelpcenter-trinity Conflicts: kpm-trinity (<< 4:3.0.0) @@ -509,8 +509,8 @@ Description: system guard for KDE Package: ksysguardd-trinity Section: utils Architecture: any -Replaces: ksysguardd-kde3 (<< 4:3.5.13) -Breaks: ksysguardd-kde3 (<< 4:3.5.13) +Replaces: ksysguardd-trinity (<< 4:14.0.0) +Breaks: ksysguardd-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: system guard daemon for KDE KDE System Guard Daemon is the daemon part of ksysguard. The daemon can @@ -523,8 +523,8 @@ Description: system guard daemon for KDE Package: ktip-trinity Section: kde Architecture: any -Replaces: ktip-kde3 (<< 4:3.5.13) -Breaks: ktip-kde3 (<< 4:3.5.13) +Replaces: ktip-trinity (<< 4:14.0.0) +Breaks: ktip-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: useful tips for KDE ktip provides many useful tips on using KDE when you log in. @@ -532,11 +532,11 @@ Description: useful tips for KDE This package is part of KDE, and a component of the KDE base module. See the 'kde-trinity' and 'tdebase-trinity' packages for more information. -Package: kwin-trinity +Package: twin-trinity Section: kde Architecture: any -Replaces: kwin-kde3 (<< 4:3.5.13) -Breaks: kwin-kde3 (<< 4:3.5.13) +Replaces: kwin-trinity (<< 4:14.0.0) +Breaks: kwin-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Provides: x-window-manager Suggests: tdebase-trinity-bin (= ${Source-Version}), tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3}), kdesktop-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), kpager-trinity (= ${Source-Version}), kpersonalizer-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version}) @@ -550,8 +550,8 @@ Description: the KDE window manager Package: libkonq4-trinity Section: libs Architecture: any -Replaces: libkonq4-kde3 (<< 4:3.5.13) -Breaks: libkonq4-kde3 (<< 4:3.5.13) +Replaces: libkonq4-trinity (<< 4:14.0.0) +Breaks: libkonq4-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Conflicts: tdebase-libs-trinity (<< 4:3.0.0) Description: core libraries for Konqueror @@ -564,6 +564,8 @@ Description: core libraries for Konqueror Package: libtqt3-integration-trinity Section: libs Architecture: any +Replaces: libtqt3-integration-trinity (<< 4:14.0.0) +Breaks: libtqt3-integration-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Integration library between TQt3 and TDE These libraries allow you to use TDE dialogs in native TQt3 applications. @@ -574,8 +576,8 @@ Description: Integration library between TQt3 and TDE Package: libkonq4-trinity-dev Section: libdevel Architecture: any -Replaces: libkonq4-kde3-dev (<< 4:3.5.13) -Breaks: libkonq4-kde3-dev (<< 4:3.5.13) +Replaces: libkonq4-trinity-dev (<< 4:14.0.0) +Breaks: libkonq4-trinity-dev (<< 4:14.0.0) Depends: libkonq4-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8) Conflicts: libkonq-trinity-dev (<< 4:3.0.0), libkonq3-trinity (<< 4:3.0.0) Description: development files for Konqueror's core libraries @@ -588,8 +590,8 @@ Description: development files for Konqueror's core libraries Package: tdebase-trinity-dbg Section: libdevel Architecture: any -Replaces: tdebase-kde3-dbg (<< 4:3.5.13) -Breaks: tdebase-kde3-dbg (<< 4:3.5.13) +Replaces: kdebase-trinity-dbg (<< 4:14.0.0) +Breaks: kdebase-trinity-dbg (<< 4:14.0.0) Priority: extra Depends: libkonq4-trinity (= ${Source-Version}), tdelibs-trinity-dbg Description: debugging symbols for tdebase diff --git a/ubuntu/maverick/tdebase/debian/control.in b/ubuntu/maverick/tdebase/debian/control.in index 107c75b66..64def508c 100644 --- a/ubuntu/maverick/tdebase/debian/control.in +++ b/ubuntu/maverick/tdebase/debian/control.in @@ -13,8 +13,8 @@ XS-Vcs-Bzr: http://bazaar.launchpad.net/~kubuntu-members/tdebase/debian Package: tdebase Section: kde Architecture: all -Depends: kappfinder (>= ${Source-Version}), kate (>= ${Source-Version}), kcontrol (>= ${Source-Version}), tdebase-bin (>= ${Source-Version}), tdebase-data (>= ${Source-Version}), tdebase-kio-plugins (>= ${Source-Version}), kdepasswd (>= ${Source-Version}), tdeprint (>= ${Source-Version}), kdesktop (>= ${Source-Version}), kfind (>= ${Source-Version}), khelpcenter (>= ${Source-Version}), kicker (>= ${Source-Version}), klipper (>= ${Source-Version}), kmenuedit (>= ${Source-Version}), konqueror-nsplugins (>= ${Source-Version}), konqueror (>= ${Source-Version}), konsole (>= ${Source-Version}), kpager (>= ${Source-Version}), kpersonalizer (>= ${Source-Version}), ksmserver (>= ${Source-Version}), ksplash (>= ${Source-Version}), ksysguard (>= ${Source-Version}), ktip (>= ${Source-Version}), kwin (>= ${Source-Version}), libkonq4 (>= ${Source-Version}), hal | kfreebsd-gnu | hurd, pmount | kfreebsd-gnu | hurd -Recommends: kdm (>= ${Source-Version}) +Depends: kappfinder (>= ${Source-Version}), kate (>= ${Source-Version}), kcontrol (>= ${Source-Version}), tdebase-bin (>= ${Source-Version}), tdebase-data (>= ${Source-Version}), tdebase-kio-plugins (>= ${Source-Version}), kdepasswd (>= ${Source-Version}), tdeprint (>= ${Source-Version}), kdesktop (>= ${Source-Version}), kfind (>= ${Source-Version}), khelpcenter (>= ${Source-Version}), kicker (>= ${Source-Version}), klipper (>= ${Source-Version}), kmenuedit (>= ${Source-Version}), konqueror-nsplugins (>= ${Source-Version}), konqueror (>= ${Source-Version}), konsole (>= ${Source-Version}), kpager (>= ${Source-Version}), kpersonalizer (>= ${Source-Version}), ksmserver (>= ${Source-Version}), ksplash (>= ${Source-Version}), ksysguard (>= ${Source-Version}), ktip (>= ${Source-Version}), twin (>= ${Source-Version}), libkonq4 (>= ${Source-Version}), hal | kfreebsd-gnu | hurd, pmount | kfreebsd-gnu | hurd +Recommends: tdm (>= ${Source-Version}) Suggests: tdebase-doc-html (>= ${Source-Version}) Description: base components from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -97,8 +97,8 @@ Section: kde Architecture: any Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14) Suggests: khelpcenter, gdb -Conflicts: tdebase-libs (<< 4:3.0.0), kdm (<< 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), kdm (= 4:3.3.2-1b) +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) 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. @@ -109,7 +109,7 @@ Description: core binaries for the KDE base module Package: tdebase-data Section: kde Architecture: all -Conflicts: kcontrol (<< 4:3.4.2-1), kwin (<< 4:3.4.2-1), kicker (<< 4:3.4.2-1) +Conflicts: kcontrol (<< 4:3.4.2-1), twin (<< 4:3.4.2-1), kicker (<< 4:3.4.2-1) Replaces: tdebase (<< 4:3.0.0), tdeedu-data (<< 4:3.4.0), tdelibs-data (<< 4:3.3.0), kdewallpapers (<< 4:3.0.0), kcontrol (<< 4:3.5.5a.dfsg.1-1ubuntu18) Description: shared data files for the KDE base module This package contains the architecture-independent shared data files @@ -121,7 +121,7 @@ Description: shared data files for the KDE base module Package: tdebase-dev Section: devel Architecture: any -Depends: kate (= ${Source-Version}), kcontrol (= ${Source-Version}), tdebase-bin (= ${Source-Version}), tdeprint (= ${Source-Version}), kdesktop (= ${Source-Version}), khelpcenter (= ${Source-Version}), kicker (= ${Source-Version}), klipper (= ${Source-Version}), kmenuedit (= ${Source-Version}), konqueror-nsplugins (= ${Source-Version}), konqueror (= ${Source-Version}), konsole (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version}), ksysguard (= ${Source-Version}), kwin (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8) +Depends: kate (= ${Source-Version}), kcontrol (= ${Source-Version}), tdebase-bin (= ${Source-Version}), tdeprint (= ${Source-Version}), kdesktop (= ${Source-Version}), khelpcenter (= ${Source-Version}), kicker (= ${Source-Version}), klipper (= ${Source-Version}), kmenuedit (= ${Source-Version}), konqueror-nsplugins (= ${Source-Version}), konqueror (= ${Source-Version}), konsole (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version}), ksysguard (= ${Source-Version}), twin (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8) Replaces: kate (<< 4:3.0.0), tdebase (<< 4:3.0.0), konqueror (<< 4:3.0.0) Description: development files for the KDE base module This package contains headers and other development files needed to @@ -222,7 +222,7 @@ Description: miscellaneous binaries and files for the KDE desktop This package is part of KDE, and a component of the KDE base module. See the 'kde' and 'tdebase' packages for more information. -Package: kdm +Package: tdm Section: kde Architecture: any Depends: ${shlibs:Depends}, tdebase-bin (= ${Source-Version}), tdebase-data (>> ${KDE-Version3}), tdebase-data (<< ${KDE-Next-Version3}), debconf (>= 1.2.9) | debconf-2.0, libpam-runtime (>= 0.76-14), xbase-clients @@ -230,10 +230,10 @@ Recommends: logrotate, xserver-xorg Suggests: khelpcenter, ksmserver (= ${Source-Version}), kdepasswd (= ${Source-Version}), menu Provides: x-display-manager Description: X display manager for KDE - kdm manages a collection of X servers, which may be on the local host or + tdm manages a collection of X servers, which may be on the local host or remote machines. It provides services similar to those provided by init, getty, and login on character-based terminals: prompting for login name and - password, authenticating the user, and running a session. kdm supports XDMCP + password, authenticating the user, and running a session. tdm supports XDMCP (X Display Manager Control Protocol) and can also be used to run a chooser process which presents the user with a menu of possible hosts that offer XDMCP display management. @@ -241,8 +241,8 @@ Description: X display manager for KDE A collection of icons to associate with individual users is included with KDE, but as part of the kdepasswd package. . - The menu package will help to provide KDM with a list of window managers - that can be launched, if the window manager does not register with KDM + The menu package will help to provide TDM with a list of window managers + that can be launched, if the window manager does not register with TDM already. Most users won't need this. . This package is part of KDE, and a component of the KDE base module. @@ -421,14 +421,14 @@ Package: ksmserver Section: kde Architecture: any Provides: x-session-manager -Depends: ${shlibs:Depends}, kwin (= ${Source-Version}) | x-window-manager +Depends: ${shlibs:Depends}, twin (= ${Source-Version}) | x-window-manager Recommends: kpersonalizer (= ${Source-Version}) Replaces: tdebase (<< 4:3.0.0) Description: session manager for KDE This package contains the KDE session manager. It is responsible for restoring your KDE session on login. It is also needed to properly start a KDE session. It registers KDE with X display managers, and - provides the 'startkde' command, for starting an X session with KDE + provides the 'starttde' command, for starting an X session with KDE from the console. . If you are running KDE for the first time for a certain user, @@ -489,7 +489,7 @@ Description: useful tips for KDE This package is part of KDE, and a component of the KDE base module. See the 'kde' and 'tdebase' packages for more information. -Package: kwin +Package: twin Section: kde Architecture: any Depends: ${shlibs:Depends} diff --git a/ubuntu/maverick/tdebase/debian/copyright b/ubuntu/maverick/tdebase/debian/copyright index a17edd5c2..6455b1216 100644 --- a/ubuntu/maverick/tdebase/debian/copyright +++ b/ubuntu/maverick/tdebase/debian/copyright @@ -20,11 +20,11 @@ kdcop, tdesu, klipper BSD --- -drkonqi, kaddressbook, kicker, ksmserver, ksplash, kwin, legacyimport +drkonqi, kaddressbook, kicker, ksmserver, ksplash, twin, legacyimport GPL --- -kappfinder, kate, kcheckpass, tdeprint, kdm, kfind, khelpcenter, kmenuedit, +kappfinder, kate, kcheckpass, tdeprint, tdm, kfind, khelpcenter, kmenuedit, konqueror, konsole, kpager, kpersonalizer, kreadconfig, kstart, ksysguard, ktip LGPL diff --git a/ubuntu/maverick/tdebase/debian/img/medialuks/cr128-device-compact_flash_unmount_encrypt.png.uu b/ubuntu/maverick/tdebase/debian/img/medialuks/cr128-device-compact_flash_unmount_encrypt.png.uu index 1bcc196b8..99b1e61f2 100644 --- a/ubuntu/maverick/tdebase/debian/img/medialuks/cr128-device-compact_flash_unmount_encrypt.png.uu +++ b/ubuntu/maverick/tdebase/debian/img/medialuks/cr128-device-compact_flash_unmount_encrypt.png.uu @@ -205,7 +205,7 @@ MU?^>>^ZYYYY[9$)56T>^W(PM6[9LV;(E<.+$B1,G3LCK]_3ITZ=/GY8C!BGK M%/CHHX\^^N@CV4BIM`EX5Q8:/YY^Q5=I,78/LG>@Z>!/"8!T^>CHCAT[=NS8 M<?%B>L`E2W@:>(*(L^;FT@X?&DJ$[]EMS7NB?>GR:A]&[7ALK,%@-@/WWY^2 MLG\_,&A0>'A^/A$<[92-V]D;J^LK2V#Q3B\GN]2=]FH_K=D?N`TH'(W]2:\# -MKDM#2M+6`=%2RATM$X#8RUM<$Y\"1$1$1(2$R"*U9^U`LYEVT(H*(._@Z:0S +MTDM#2M+6`=%2RATM$X#8RUM<$Y\"1$1$1(2$R"*U9^U`LYEVT(H*(._@Z:0S M1X'\_J?&9+\*N(<777?T32!FG37@]R>!V,>EBLSG`'-^2.?T9P%L&/W@BSN` MSN^.N/W&54#4%5%=HHWRCFB\W'BY\7*@RE9EJ[(!$"#@*\#O<K_+C>,!;8HV M17LUX+C/<9_3#W!&."/<^P"WP^T0!P+N%NX68K!<HHL9&1OKF`#,9K/9:@4L diff --git a/ubuntu/maverick/tdebase/debian/img/medialuks/cr128-device-sd_mmc_unmount_encrypt.png.uu b/ubuntu/maverick/tdebase/debian/img/medialuks/cr128-device-sd_mmc_unmount_encrypt.png.uu index 53ba3286d..edc1cc809 100644 --- a/ubuntu/maverick/tdebase/debian/img/medialuks/cr128-device-sd_mmc_unmount_encrypt.png.uu +++ b/ubuntu/maverick/tdebase/debian/img/medialuks/cr128-device-sd_mmc_unmount_encrypt.png.uu @@ -226,7 +226,7 @@ M9`ANV!`;F<4P#*/7&PP\7UY.0H>!Y.2DI-@TV5,UUX\')5B;P2S@%:#SM,XW MI"9KA"%)FI&/&,_J;VM3!8V05!60_R'_`P#D#<H8;`#4>_`]`T`=ITYA[@68 ME<Q*YDD`*[&2>2JF;2&:96@_*@HV`-($>9BBT^Y+5>G:?%HD'BWB6;\E*C=M ME1_5*>K3`%:B`V,$]/.%BYBW@58_'6BM1("L^ZKN4G8!NGNY=.9SH"'!UR?H -MA@1?GS'$,HC8XS3(IU4KDMY-02,S#0:3R6QNJ.%8K293UZXC1@!DF39R5E86 +MA@1?GS'$,HC8XS3(IU4TDMY-02,S#0:3R6QNJ.%8K293UZXC1@!DF39R5E86 M:6-C64\OG+8,@(+4?*NO"=!BD`QS_ODLRW$,$XFDI!`_>DMQLC0#:O4VWFNZ M5S<-8/R,GXEJ12EC";^^U5\C?,H(ZA6S'*9V4#L`>%A]&`#41:K*C`70%FV8 MV0!N0[TY/VV/%\.3OY&^EGV`^J.Z#NLUB5C?I*DMEJK=?_WG^T-OZ*W\QLP% diff --git a/ubuntu/maverick/tdebase/debian/img/medialuks/cr128-device-usbpendrive_unmount_encrypt.png.uu b/ubuntu/maverick/tdebase/debian/img/medialuks/cr128-device-usbpendrive_unmount_encrypt.png.uu index 95cd850b0..b989c74df 100644 --- a/ubuntu/maverick/tdebase/debian/img/medialuks/cr128-device-usbpendrive_unmount_encrypt.png.uu +++ b/ubuntu/maverick/tdebase/debian/img/medialuks/cr128-device-usbpendrive_unmount_encrypt.png.uu @@ -301,7 +301,7 @@ MZ`\>/'"@ID8I:LH:G]QQQQUW7'ZYDCQ%])>_D&T@+^_LW7G7I#KY2Q!16N6. M'?2@[[Q#$V+.G)T[=^TZ?)AJNA45`11;U[F99R3O;J^O'.MY"]!=[4)&1J/! M0`+7NQJ'L050V-58]N'6K=NV554!%17EY7EYM$)$QN;+T^2IF`9P5:)+/%^Y M3FSY;V;E9X(?VW69V3)"5\A3Y#%`:)[\,1\",%$8J&X'PL.$%,U'@-2FOD-S -M!<`]J59IC@+B<,&BK@?\YW$K>"<@NR@KDM5B8(5;`P%ZLF"0M5/_+K;>(EOY +M!<`]J59IC@+B<,&BK@?\YW$K>"<@NR@TDM5B8(5;`P%ZLF"0M5/_+K;>(EOY M?$#:P6TP)`*N]P2]IAH(5$O[<#^@&A0.AP<H]\L$WN?S^7P^Q3VHT5!1U=C< M!?%IZ6GI:4!Z4GR:TP#2'"E#\@!2H50J^0%YC;Q!?@O`Y9B*A-,G$"83N0'3 MTM+367-<:O22D9&:"J2F4E?DV/MGE)9&G]]VVVVW77()\/CCCS_^VFL&`P'Z diff --git a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install index 71527a0c5..66058e33b 100644 --- a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install +++ b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install @@ -54,8 +54,8 @@ debian/tmp/opt/trinity/lib/trinity/kcm_joystick.la debian/tmp/opt/trinity/lib/trinity/kcm_joystick.so 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_kdm.la -debian/tmp/opt/trinity/lib/trinity/kcm_kdm.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_keys.la @@ -168,7 +168,7 @@ debian/tmp/opt/trinity/share/applications/kde/kcmtaskbar.desktop debian/tmp/opt/trinity/share/applications/kde/kcmusb.desktop debian/tmp/opt/trinity/share/applications/kde/kcmview1394.desktop debian/tmp/opt/trinity/share/applications/kde/KControl.desktop -debian/tmp/opt/trinity/share/applications/kde/kdm.desktop +debian/tmp/opt/trinity/share/applications/kde/tdm.desktop debian/tmp/opt/trinity/share/applications/kde/keys.desktop debian/tmp/opt/trinity/share/applications/kde/kfontview.desktop debian/tmp/opt/trinity/share/applications/kde/khtml_behavior.desktop diff --git a/ubuntu/maverick/tdebase/debian/kdepasswd-trinity.install b/ubuntu/maverick/tdebase/debian/kdepasswd-trinity.install index cbf6a5ed1..1850960ec 100644 --- a/ubuntu/maverick/tdebase/debian/kdepasswd-trinity.install +++ b/ubuntu/maverick/tdebase/debian/kdepasswd-trinity.install @@ -3,33 +3,33 @@ debian/tmp/opt/trinity/lib/trinity/kcm_useraccount.la debian/tmp/opt/trinity/lib/trinity/kcm_useraccount.so debian/tmp/opt/trinity/share/applications/kde/kcm_useraccount.desktop debian/tmp/opt/trinity/share/applications/kde/kdepasswd.desktop -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Apple.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/BeachBall.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Blowfish.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Bug.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Butterfly.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Car.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Cow.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Daemon.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Dog.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Elephant.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Flower.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Frog.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Ghost.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Guitar.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Heart.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Konqui.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Lion.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Monkey.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Penguin.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Pig.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Rabbit.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Ring.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Scream.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Shark.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Splash.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Star.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Teddybear.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Turtle.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Apple.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/BeachBall.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Blowfish.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Bug.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Butterfly.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Car.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Cow.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Daemon.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Dog.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Elephant.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Flower.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Frog.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Ghost.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Guitar.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Heart.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Konqui.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Lion.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Monkey.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Penguin.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Pig.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Rabbit.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Ring.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Scream.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Shark.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Splash.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Star.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Teddybear.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Turtle.png debian/tmp/opt/trinity/share/config.kcfg/kcm_useraccount.kcfg debian/tmp/opt/trinity/share/config.kcfg/kcm_useraccount_pass.kcfg diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.dirs b/ubuntu/maverick/tdebase/debian/kdm-trinity.dirs deleted file mode 100644 index 5a4196df0..000000000 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.dirs +++ /dev/null @@ -1,2 +0,0 @@ -etc/default/kdm-trinity.d -var/lib/kdm-trinity diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.install b/ubuntu/maverick/tdebase/debian/kdm-trinity.install deleted file mode 100644 index e6c7325eb..000000000 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.install +++ /dev/null @@ -1,51 +0,0 @@ -debian/local/kdm.options etc/trinity/kdm/ -debian/tmp/etc/trinity/kdm/kdmrc -debian/tmp/etc/trinity/kdm/Xaccess -debian/tmp/etc/trinity/kdm/Xreset -debian/tmp/etc/trinity/kdm/Xsession -debian/tmp/etc/trinity/kdm/Xsetup -debian/tmp/etc/trinity/kdm/Xstartup -debian/tmp/etc/trinity/kdm/Xwilling -debian/tmp/opt/trinity/bin/genkdmconf -debian/tmp/opt/trinity/bin/kdm -debian/tmp/opt/trinity/bin/kdm_config -debian/tmp/opt/trinity/bin/kdmctl -debian/tmp/opt/trinity/bin/kdm_greet -debian/tmp/opt/trinity/bin/krootimage -debian/tmp/opt/trinity/share/apps/kdm/pics/kdelogo-crystal.png -debian/tmp/opt/trinity/share/apps/kdm/pics/kdelogo.png -debian/tmp/opt/trinity/share/apps/kdm/pics/shutdown.jpg -debian/tmp/opt/trinity/share/apps/kdm/pics/users/default1.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/default2.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/default3.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/root1.png -debian/tmp/opt/trinity/share/apps/kdm/sessions/9wm.desktop -debian/tmp/opt/trinity/share/apps/kdm/sessions/aewm.desktop -debian/tmp/opt/trinity/share/apps/kdm/sessions/amaterus.desktop -debian/tmp/opt/trinity/share/apps/kdm/sessions/asclassic.desktop -debian/tmp/opt/trinity/share/apps/kdm/sessions/ctwm.desktop -debian/tmp/opt/trinity/share/apps/kdm/sessions/evilwm.desktop -debian/tmp/opt/trinity/share/apps/kdm/sessions/flwm.desktop -debian/tmp/opt/trinity/share/apps/kdm/sessions/lwm.desktop -debian/tmp/opt/trinity/share/apps/kdm/sessions/matchbox.desktop -debian/tmp/opt/trinity/share/apps/kdm/sessions/mwm.desktop -debian/tmp/opt/trinity/share/apps/kdm/sessions/olvwm.desktop -debian/tmp/opt/trinity/share/apps/kdm/sessions/olwm.desktop -debian/tmp/opt/trinity/share/apps/kdm/sessions/oroborus.desktop -debian/tmp/opt/trinity/share/apps/kdm/sessions/pwm.desktop -debian/tmp/opt/trinity/share/apps/kdm/sessions/twm.desktop -debian/tmp/opt/trinity/share/apps/kdm/sessions/ude.desktop -debian/tmp/opt/trinity/share/apps/kdm/sessions/vtwm.desktop -debian/tmp/opt/trinity/share/apps/kdm/sessions/wm2.desktop -debian/tmp/opt/trinity/share/apps/kdm/themes/circles/background.svg -debian/tmp/opt/trinity/share/apps/kdm/themes/circles/circles.xml -debian/tmp/opt/trinity/share/apps/kdm/themes/circles/flower.png -debian/tmp/opt/trinity/share/apps/kdm/themes/circles/GdmGreeterTheme.desktop -debian/tmp/opt/trinity/share/apps/kdm/themes/circles/help.png -debian/tmp/opt/trinity/share/apps/kdm/themes/circles/options.png -debian/tmp/opt/trinity/share/apps/kdm/themes/circles/screenshot.png -debian/tmp/opt/trinity/share/apps/kdm/themes/o2_enterprise -debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdm/common -debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdm/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdm/index.docbook -debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdm/kdmrc-ref.docbook diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.links b/ubuntu/maverick/tdebase/debian/kdm-trinity.links deleted file mode 100644 index 6c0a7dd8b..000000000 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.links +++ /dev/null @@ -1 +0,0 @@ -opt/trinity/share/apps/kdm/pics/users/default1.png opt/trinity/share/apps/kdm/faces/.default.face diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.manpages b/ubuntu/maverick/tdebase/debian/kdm-trinity.manpages deleted file mode 100644 index fcbc540f0..000000000 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.manpages +++ /dev/null @@ -1,6 +0,0 @@ -debian/man/genkdmconf-trinity.1 -debian/man/kdm-trinity.1 -debian/man/kdm_config-trinity.1 -debian/man/kdmctl-trinity.1 -debian/man/kdm_greet-trinity.1 -debian/man/krootimage-trinity.1 diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.preinst b/ubuntu/maverick/tdebase/debian/kdm-trinity.preinst deleted file mode 100644 index 0e6a2f68b..000000000 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.preinst +++ /dev/null @@ -1,29 +0,0 @@ -#! /bin/sh -e - -case "$1" in - - upgrade) - rm -f /etc/trinity/debian/kdm-update-menu.sh - rm -f /etc/trinity/debian/kdm.options - rm -f /etc/trinity/kdm/pixmaps/XFree86bw.xpm - rm -f /etc/trinity/kdm/pixmaps/XFree86.xpm - rm -f /etc/trinity/kdm/Xresources - rm -f /etc/menu-methods/kdm - ;; - - install) - ;; - - abort-upgrade) - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; - -esac - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.install b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.install index 0946d8a57..f8c0aa867 100644 --- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.install +++ b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.install @@ -1,5 +1,5 @@ debian/tmp/opt/trinity/bin/ksmserver -debian/tmp/opt/trinity/bin/startkde +debian/tmp/opt/trinity/bin/starttde debian/tmp/opt/trinity/lib/trinity/ksmserver.la debian/tmp/opt/trinity/lib/trinity/ksmserver.so debian/tmp/opt/trinity/lib/libtdeinit_ksmserver.so diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.manpages b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.manpages index 05b93960e..354e23800 100644 --- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.manpages +++ b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.manpages @@ -1 +1 @@ -debian/man/startkde-trinity.1 +debian/man/starttde-trinity.1 diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.postinst b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.postinst index 6492cbb59..f5d73b934 100644 --- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.postinst +++ b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.postinst @@ -20,9 +20,9 @@ set -e case "$1" in configure) update-alternatives --install /usr/bin/x-session-manager \ - x-session-manager /opt/trinity/bin/startkde 40 \ + x-session-manager /opt/trinity/bin/starttde 40 \ --slave /opt/trinity/share/man/man1/x-session-manager.1.gz \ - x-session-manager.1.gz "/opt/trinity/share/man/man1/startkde-trinity.1.gz" + x-session-manager.1.gz "/opt/trinity/share/man/man1/starttde-trinity.1.gz" ;; diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst index 73ee5043a..884257d03 100644 --- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst +++ b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst @@ -4,7 +4,7 @@ case "$1" in upgrade) rm -f /etc/gdm/Sessions/KDE - rm -f /etc/trinity/debian/startkde + rm -f /etc/trinity/debian/starttde /usr/sbin/update-alternatives --remove x-session-manager /usr/bin/kde2 /usr/sbin/update-alternatives --remove x-session-manager /usr/bin/trinity mkdir -p /usr/share/autostart diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.prerm b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.prerm index 11b4bc08a..e9be94522 100644 --- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.prerm +++ b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.prerm @@ -19,7 +19,7 @@ set -e case "$1" in remove) - /usr/sbin/update-alternatives --remove x-session-manager /usr/trinity/bin/startkde + /usr/sbin/update-alternatives --remove x-session-manager /usr/trinity/bin/starttde dpkg-divert --rename --remove /usr/share/autostart/plasma.desktop ;; diff --git a/ubuntu/maverick/tdebase/debian/kwin-trinity.install b/ubuntu/maverick/tdebase/debian/kwin-trinity.install deleted file mode 100644 index a6fde0638..000000000 --- a/ubuntu/maverick/tdebase/debian/kwin-trinity.install +++ /dev/null @@ -1,101 +0,0 @@ -debian/tmp/opt/trinity/bin/kompmgr -debian/tmp/opt/trinity/bin/kwin -debian/tmp/opt/trinity/bin/kwin_killer_helper -debian/tmp/opt/trinity/bin/kwin_rules_dialog -debian/tmp/opt/trinity/lib/kconf_update_bin/kwin_update_default_rules -debian/tmp/opt/trinity/lib/kconf_update_bin/kwin_update_window_settings -debian/tmp/opt/trinity/lib/trinity/kcm_kwindecoration.la -debian/tmp/opt/trinity/lib/trinity/kcm_kwindecoration.so -debian/tmp/opt/trinity/lib/trinity/kcm_kwinoptions.la -debian/tmp/opt/trinity/lib/trinity/kcm_kwinoptions.so -debian/tmp/opt/trinity/lib/trinity/kcm_kwinrules.la -debian/tmp/opt/trinity/lib/trinity/kcm_kwinrules.so -debian/tmp/opt/trinity/lib/trinity/kwin3_b2.la -debian/tmp/opt/trinity/lib/trinity/kwin3_b2.so -debian/tmp/opt/trinity/lib/trinity/kwin3_default.la -debian/tmp/opt/trinity/lib/trinity/kwin3_default.so -debian/tmp/opt/trinity/lib/trinity/kwin3_keramik.la -debian/tmp/opt/trinity/lib/trinity/kwin3_keramik.so -debian/tmp/opt/trinity/lib/trinity/kwin3_laptop.la -debian/tmp/opt/trinity/lib/trinity/kwin3_laptop.so -debian/tmp/opt/trinity/lib/trinity/kwin3_modernsys.la -debian/tmp/opt/trinity/lib/trinity/kwin3_modernsys.so -debian/tmp/opt/trinity/lib/trinity/kwin3_plastik.la -debian/tmp/opt/trinity/lib/trinity/kwin3_plastik.so -debian/tmp/opt/trinity/lib/trinity/kwin3_quartz.la -debian/tmp/opt/trinity/lib/trinity/kwin3_quartz.so -debian/tmp/opt/trinity/lib/trinity/kwin3_redmond.la -debian/tmp/opt/trinity/lib/trinity/kwin3_redmond.so -debian/tmp/opt/trinity/lib/trinity/kwin3_web.la -debian/tmp/opt/trinity/lib/trinity/kwin3_web.so -debian/tmp/opt/trinity/lib/trinity/kwin_b2_config.la -debian/tmp/opt/trinity/lib/trinity/kwin_b2_config.so -debian/tmp/opt/trinity/lib/trinity/kwin_default_config.la -debian/tmp/opt/trinity/lib/trinity/kwin_default_config.so -debian/tmp/opt/trinity/lib/trinity/kwin_keramik_config.la -debian/tmp/opt/trinity/lib/trinity/kwin_keramik_config.so -debian/tmp/opt/trinity/lib/trinity/kwin.la -debian/tmp/opt/trinity/lib/trinity/kwin_modernsys_config.la -debian/tmp/opt/trinity/lib/trinity/kwin_modernsys_config.so -debian/tmp/opt/trinity/lib/trinity/kwin_plastik_config.la -debian/tmp/opt/trinity/lib/trinity/kwin_plastik_config.so -debian/tmp/opt/trinity/lib/trinity/kwin_quartz_config.la -debian/tmp/opt/trinity/lib/trinity/kwin_quartz_config.so -debian/tmp/opt/trinity/lib/trinity/kwin_rules_dialog.la -debian/tmp/opt/trinity/lib/trinity/kwin_rules_dialog.so -debian/tmp/opt/trinity/lib/trinity/kwin.so -debian/tmp/opt/trinity/lib/libtdecorations.so.1 -debian/tmp/opt/trinity/lib/libtdecorations.so.1.0.0 -debian/tmp/opt/trinity/lib/libtdeinit_kwin_rules_dialog.so -debian/tmp/opt/trinity/lib/libtdeinit_kwin.so -debian/tmp/opt/trinity/share/applications/kde/showdesktop.desktop -debian/tmp/opt/trinity/share/applications/kde/kwindecoration.desktop -debian/tmp/opt/trinity/share/applications/kde/kwinoptions.desktop -debian/tmp/opt/trinity/share/applications/kde/kwinrules.desktop -debian/tmp/opt/trinity/share/applnk/.hidden/kwinactions.desktop -debian/tmp/opt/trinity/share/applnk/.hidden/kwinadvanced.desktop -debian/tmp/opt/trinity/share/applnk/.hidden/kwinfocus.desktop -debian/tmp/opt/trinity/share/applnk/.hidden/kwinmoving.desktop -debian/tmp/opt/trinity/share/applnk/.hidden/kwintranslucency.desktop -debian/tmp/opt/trinity/share/apps/kconf_update/kwin3_plugin.pl -debian/tmp/opt/trinity/share/apps/kconf_update/kwin3_plugin.upd -debian/tmp/opt/trinity/share/apps/kconf_update/kwin_focus1.sh -debian/tmp/opt/trinity/share/apps/kconf_update/kwin_focus1.upd -debian/tmp/opt/trinity/share/apps/kconf_update/kwin_focus2.sh -debian/tmp/opt/trinity/share/apps/kconf_update/kwin_focus2.upd -debian/tmp/opt/trinity/share/apps/kconf_update/kwin_fsp_workarounds_1.upd -debian/tmp/opt/trinity/share/apps/kconf_update/kwiniconify.upd -debian/tmp/opt/trinity/share/apps/kconf_update/kwinsticky.upd -debian/tmp/opt/trinity/share/apps/kconf_update/kwin.upd -debian/tmp/opt/trinity/share/apps/kconf_update/kwinupdatewindowsettings.upd -debian/tmp/opt/trinity/share/apps/kconf_update/pluginlibFix.pl -debian/tmp/opt/trinity/share/apps/kwin/b2.desktop -debian/tmp/opt/trinity/share/apps/kwin/eventsrc -debian/tmp/opt/trinity/share/apps/kwin/keramik.desktop -debian/tmp/opt/trinity/share/apps/kwin/laptop.desktop -debian/tmp/opt/trinity/share/apps/kwin/modernsystem.desktop -debian/tmp/opt/trinity/share/apps/kwin/pics/bluesun.png -debian/tmp/opt/trinity/share/apps/kwin/pics/close.png -debian/tmp/opt/trinity/share/apps/kwin/pics/fog-grey.png -debian/tmp/opt/trinity/share/apps/kwin/pics/fog.png -debian/tmp/opt/trinity/share/apps/kwin/pics/greenie.dim.png -debian/tmp/opt/trinity/share/apps/kwin/pics/greenie.light.png -debian/tmp/opt/trinity/share/apps/kwin/pics/iconify.png -debian/tmp/opt/trinity/share/apps/kwin/pics/maximizedown.png -debian/tmp/opt/trinity/share/apps/kwin/pics/maximize.png -debian/tmp/opt/trinity/share/apps/kwin/pics/menu.png -debian/tmp/opt/trinity/share/apps/kwin/pics/pindown.png -debian/tmp/opt/trinity/share/apps/kwin/pics/pinup.png -debian/tmp/opt/trinity/share/apps/kwin/pics/unknown.png -debian/tmp/opt/trinity/share/apps/kwin/plastik.desktop -debian/tmp/opt/trinity/share/apps/kwin/quartz.desktop -debian/tmp/opt/trinity/share/apps/kwin/redmond.desktop -debian/tmp/opt/trinity/share/apps/kwin/web.desktop -debian/tmp/opt/trinity/share/config.kcfg/kwin.kcfg -debian/tmp/opt/trinity/share/doc/kde/HTML/en/kompmgr/common -debian/tmp/opt/trinity/share/doc/kde/HTML/en/kompmgr/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/kde/HTML/en/kompmgr/index.docbook -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kwin.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kwin.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kwin.png -debian/tmp/opt/trinity/share/apps/kwin/default_rules/* diff --git a/ubuntu/maverick/tdebase/debian/kwin-trinity.lintian b/ubuntu/maverick/tdebase/debian/kwin-trinity.lintian deleted file mode 100644 index ab81fccc0..000000000 --- a/ubuntu/maverick/tdebase/debian/kwin-trinity.lintian +++ /dev/null @@ -1,2 +0,0 @@ -kwin: shlib-missing-in-control-file libtdeinit_kwin.so usr/lib/libtdeinit_kwin.so -kwin: shlib-missing-in-control-file libtdeinit_kwin_rules_dialog.so usr/lib/libtdeinit_kwin_rules_dialog.so diff --git a/ubuntu/maverick/tdebase/debian/local/kdm.options b/ubuntu/maverick/tdebase/debian/local/kdm.options deleted file mode 100644 index 61e4c04a0..000000000 --- a/ubuntu/maverick/tdebase/debian/local/kdm.options +++ /dev/null @@ -1,8 +0,0 @@ -# /etc/trinity/kdm/kdm.options -# -# configuration options for kdm -# See kdm.options(5) for an explanation of the available options. - -no-ignore-nologin -no-restart-on-upgrade -use-sessreg diff --git a/ubuntu/maverick/tdebase/debian/local/tdm.options b/ubuntu/maverick/tdebase/debian/local/tdm.options new file mode 100644 index 000000000..05725ae34 --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/local/tdm.options @@ -0,0 +1,8 @@ +# /etc/trinity/tdm/tdm.options +# +# configuration options for tdm +# See tdm.options(5) for an explanation of the available options. + +no-ignore-nologin +no-restart-on-upgrade +use-sessreg diff --git a/ubuntu/maverick/tdebase/debian/local/kdm.options.5 b/ubuntu/maverick/tdebase/debian/local/tdm.options.5 index e1ccaef2f..446271273 100644 --- a/ubuntu/maverick/tdebase/debian/local/kdm.options.5 +++ b/ubuntu/maverick/tdebase/debian/local/tdm.options.5 @@ -1,4 +1,4 @@ -.\" $Id: kdm.options.5,v 1.2 2004/02/27 22:45:20 ccheney Exp $ +.\" $Id: tdm.options.5,v 1.2 2004/02/27 22:45:20 ccheney Exp $ .\" .\" Copyright 1998, 2002, 2003 Branden Robinson <branden@debian.org>. .\" @@ -15,16 +15,16 @@ .\" the Debian operating system, in /usr/share/common-licenses/GPL; if .\" not, write to the Free Software Foundation, Inc., 59 Temple Place, .\" Suite 330, Boston, MA 02111-1307 USA -.TH kdm.options 5 "2003\-09\-18" "Debian Project" +.TH tdm.options 5 "2003\-09\-18" "Debian Project" .SH NAME -kdm.options \- configuration options for X display manager +tdm.options \- configuration options for X display manager .SH DESCRIPTION -.I /etc/trinity/kdm/kdm.options +.I /etc/trinity/tdm/tdm.options contains a set of flags that determine some of the behavior of the X display manager -.BR kdm (1). +.BR tdm (1). .PP -.I /etc/trinity/kdm/kdm.options +.I /etc/trinity/tdm/tdm.options may contain comments, which begin with a hash mark and end at the next newline, just like comments in shell scripts. The rest of the file consists of options which are expressed as words separated by hyphens, with @@ -38,50 +38,50 @@ Normally, the contents of the /etc/nologin file will be displayed using .BR xmessage (1x) (if .B xmessage -is available), and the user will be returned to the kdm login screen after -the xmessage is dismissed. If this option is enabled, kdm starts a session +is available), and the user will be returned to the tdm login screen after +the xmessage is dismissed. If this option is enabled, tdm starts a session as usual (after the xmessage is dismissed, if xmessage is available). .TP .B restart\-on\-upgrade Enable this option with caution on \(oqproduction\(cq machines; it causes -the kdm daemon to be stopped and restarted on upgrade, even if the process +the tdm daemon to be stopped and restarted on upgrade, even if the process has children (which means it is managing X sessions). Typically when a package that contains a daemon is being installed or upgraded, its maintainer scripts stop a running daemon process before installing the new -binary, and restart it after the new binary is installed. Stopping kdm +binary, and restart it after the new binary is installed. Stopping tdm causes immediate termination of any sessions it manages; in some situations -this could be an unwelcome surprise (for instance, for remote kdm users who +this could be an unwelcome surprise (for instance, for remote tdm users who had no idea the administrator was performing system maintenance). On the other hand, for machines that stay up for long periods of time, leaving the old daemon running can be a bad idea if the new version has, for instance, -a fix for a security vulnerability (overwriting kdm's executable on the -file system has no effect on the copy of kdm in memory). The kdm -pre\-removal script checks to see if the kdm process has any children; if +a fix for a security vulnerability (overwriting tdm's executable on the +file system has no effect on the copy of tdm in memory). The tdm +pre\-removal script checks to see if the tdm process has any children; if it does, it is possible that someone's session would be killed by stopping -kdm, so a warning is issued and an opportunity to abort the upgrade of kdm -is provided. If this option is disabled (the Debian default), kdm will be +tdm, so a warning is issued and an opportunity to abort the upgrade of tdm +is provided. If this option is disabled (the Debian default), tdm will be not be stopped or started during an install or upgrade; the administrator -will have to do so by hand (with \(oq/etc/init.d/kdm restart\(cq, or by -rebooting the system) before the newly installed kdm binary is used. +will have to do so by hand (with \(oq/etc/init.d/tdm restart\(cq, or by +rebooting the system) before the newly installed tdm binary is used. .TP .B use\-sessreg If this option is enabled (the Debian default), the sessreg program will be -invoked to register X sessions managed by kdm in the utmp and wtmp files. +invoked to register X sessions managed by tdm in the utmp and wtmp files. Otherwise, it is not, and the utmp and wtmp files will have no record of -kdm sessions. +tdm sessions. .PP Users of older versions of the Debian system should note that the \(oqrun\-xconsole\(cq option has been removed. Shell scripts named -.I /etc/trinity/kdm/Xsetup +.I /etc/trinity/tdm/Xsetup and -.I /etc/trinity/kdm/Xreset -can be edited to disable or modify the running of xconsole on the kdm +.I /etc/trinity/tdm/Xreset +can be edited to disable or modify the running of xconsole on the tdm greeter screen; see the -.B kdm +.B tdm manual page for more information. .SH AUTHOR This manpage was written by Branden Robinson for the Debian Project. .SH SEE ALSO .BR sessreg (1x), .BR xmessage (1x), -.BR kdm (1x) +.BR tdm (1x) diff --git a/ubuntu/maverick/tdebase/debian/man/genkdmconf-trinity.1 b/ubuntu/maverick/tdebase/debian/man/gentdmconf-trinity.1 index e23122b89..ce3c46d8b 100644 --- a/ubuntu/maverick/tdebase/debian/man/genkdmconf-trinity.1 +++ b/ubuntu/maverick/tdebase/debian/man/gentdmconf-trinity.1 @@ -1,12 +1,12 @@ .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH GENKDMCONF 1 "June 2006" "K Desktop Environment" "generate configuration files for kdm" +.TH GENTDMCONF 1 "June 2006" "K Desktop Environment" "generate configuration files for tdm" .SH NAME -genkdmconf -\- generate configuration files for kdm +gentdmconf +\- generate configuration files for tdm .SH SYNOPSIS -\fBgenkdmconf\fP +\fBgentdmconf\fP .RB [ \-\-in -.IR /path/to/new/kdm\-config\-dir ] +.IR /path/to/new/tdm\-config\-dir ] .RS 11 .RB [ \-\-old\-xdm .IR /path/to/old/xdm\-dir ] @@ -27,49 +27,49 @@ genkdmconf .RE .SH DESCRIPTION -\fBgenkdmconf\fP is used to generate configuration files for \fBkdm\fP. +\fBgentdmconf\fP is used to generate configuration files for \fBtdm\fP. .br -If an older xdm/kdm configuration is found, its config files are "absorbed"; +If an older xdm/tdm configuration is found, its config files are "absorbed"; if it lives in the new target directory, its scripts are reused (and possibly modified) as well, otherwise the scripts are ignored and default scripts are installed. .SH OPTIONS .TP -.BI \-\-in \ /path/to/new/kdm\-config\-dir +.BI \-\-in \ /path/to/new/tdm\-config\-dir In which directory to put the new configuration. You can use this to support a $(DESTDIR), but not to change the final location of the installation \- the paths inside the files are not affected. .br -Default is \fI/etc/trinity/kdm\fP. +Default is \fI/etc/trinity/tdm\fP. .TP .BI \-\-old\-xdm \ /path/to/old/xdm\-dir -Where to look for the config files of an \fBxdm\fP / older \fBkdm\fP. Default is to scan -.IR /etc/X11/kdm , \ $XLIBDIR/kdm , \ /etc/X11/xdm , \ $XLIBDIR/xdm ; -there in turn look for \fIkdm\-config\fP and \fIxdm\-config\fP. +Where to look for the config files of an \fBxdm\fP / older \fBtdm\fP. Default is to scan +.IR /etc/X11/tdm , \ $XLIBDIR/tdm , \ /etc/X11/xdm , \ $XLIBDIR/xdm ; +there in turn look for \fItdm\-config\fP and \fIxdm\-config\fP. .br Note that you possibly need to use \fB\-\-no\-old\-kde\fP to make this take effect. .TP .BI \-\-old\-kde \ /path/to/old/kde\-config\-dir -Where to look for the \fIkdmrc\fP of an older \fBkdm\fP. +Where to look for the \fItdmrc\fP of an older \fBtdm\fP. .br .RI Default\ is\ to\ scan\ /etc/trinity \ and\ { /usr,/usr/local , .RI { /opt,/usr/local }{ trinity,kde,kde2,kde1 }} /share/config . .TP .B \-\-no\-old -Don't look at older xdm/kdm configurations, just create default config. +Don't look at older xdm/tdm configurations, just create default config. .TP .B \-\-no\-old\-xdm Don't look at older xdm configurations. .TP .B \-\-no\-old\-kde -Don't look at older kdm configurations. +Don't look at older tdm configurations. .TP .B \-\-old\-scripts -Directly use all scripts from the older xdm/kdm configuration. +Directly use all scripts from the older xdm/tdm configuration. .TP .B \-\-no\-old\-scripts -Don't use scripts from the older xdm/kdm configuration even if it lives in the new target directory. +Don't use scripts from the older xdm/tdm configuration even if it lives in the new target directory. .TP .B \-\-old\-confs -Directly use all ancillary config files from the older xdm/kdm configuration. This is usually a bad idea. +Directly use all ancillary config files from the older xdm/tdm configuration. This is usually a bad idea. .TP .B \-\-no\-backup Overwrite/delete old config files instead of backing them up. @@ -77,7 +77,7 @@ Overwrite/delete old config files instead of backing them up. .B \-\-no\-in\-notice Don't put the notice about \fB\-\-in\fP being used into the generated README. .SH SEE ALSO -.BR kdm (1) +.BR tdm (1) .SH AUTHORS .nf Oswald Buddenhagen <ossi@kde.org> diff --git a/ubuntu/maverick/tdebase/debian/man/krootimage-trinity.1 b/ubuntu/maverick/tdebase/debian/man/krootimage-trinity.1 index 2b683c19e..66464cf62 100644 --- a/ubuntu/maverick/tdebase/debian/man/krootimage-trinity.1 +++ b/ubuntu/maverick/tdebase/debian/man/krootimage-trinity.1 @@ -2,11 +2,11 @@ .TH KROOTIMAGE 1 "June 2006" "K Desktop Environment" "helper program" .SH NAME krootimage -\- set desktop background for kdm +\- set desktop background for tdm .SH SYNOPSIS \fBkrootimage\fP [Qt\-options] [KDE\-options] config .SH DESCRIPTION -\fBkrootimage\fP is a helper program for \fBkdm\fP to set the desktop background. +\fBkrootimage\fP is a helper program for \fBtdm\fP to set the desktop background. .SH OPTIONS .SS .SS Arguments: @@ -135,7 +135,7 @@ sets the application GUI style sets the client geometry of the main widget \- see man X for the argument format .SS .SH SEE ALSO -.BR kdm (1) +.BR tdm (1) .SH AUTHORS .nf Matthias Hoelzer\-Kluepfel <hoelzer@kde.org> diff --git a/ubuntu/maverick/tdebase/debian/man/startkde-trinity.1 b/ubuntu/maverick/tdebase/debian/man/starttde-trinity.1 index f26b7f128..5ce70f453 100644 --- a/ubuntu/maverick/tdebase/debian/man/startkde-trinity.1 +++ b/ubuntu/maverick/tdebase/debian/man/starttde-trinity.1 @@ -1,26 +1,26 @@ -.TH startkde 1 "Jan 17, 2005" +.TH starttde 1 "Jan 17, 2005" .SH NAME -startkde \- Starts up the KDE Desktop Environment +starttde \- Starts up the KDE Desktop Environment .SH SYNOPSIS -.B startkde +.B starttde .br .SH DESCRIPTION This manual page documents briefly the -.B startkde +.B starttde command. This manual page was written for the Debian distribution because the original program does not have a manual page. .PP -The \fBstartkde\fP script starts up the K Desktop Environment and -is typically executed by your login manager (e.g. xdm, gdm, kdm, wdm or from -your X startup scripts). \fBstartkde\fP in turn launches ksmserver, which +The \fBstarttde\fP script starts up the K Desktop Environment and +is typically executed by your login manager (e.g. xdm, gdm, tdm, wdm or from +your X startup scripts). \fBstarttde\fP in turn launches ksmserver, which will load your last session, or a default session that includes the standard KDE programs if no saved session is available. -\fBstartkde\fP, with ksmserver, is a standard X11R6 session manager that can manage +\fBstarttde\fP, with ksmserver, is a standard X11R6 session manager that can manage any X11R6 SM compliant program. -\fBstartkde\fP and ksmserver use the contents of the ~/.kde directory +\fBstarttde\fP and ksmserver use the contents of the ~/.kde directory for starting previously saved sessions. Source scripts found in ~/.kde/env/*.sh can be used to define environment variables that will be available to all KDE programs. @@ -32,15 +32,15 @@ At the end of a session, the scripts found in ~/.kde/shutdown will be executed. .SH OPTIONS -\fBstartkde\fP takes no command line options. +\fBstarttde\fP takes no command line options. .SH AUTHOR -\fBstartkde\fP is written by the KDE Project. +\fBstarttde\fP is written by the KDE Project. This manual page was written by Philipp Grau. .SH "REPORTING BUGS" -Report bugs of this modified Debian version of startkde to the Bug +Report bugs of this modified Debian version of starttde to the Bug Tracking System at: http://bugs.debian.org .SH COPYRIGHT Copyright \(co 2005 Philipp Grau. diff --git a/ubuntu/maverick/tdebase/debian/man/kdm-trinity.1 b/ubuntu/maverick/tdebase/debian/man/tdm-trinity.1 index e6c7a0b19..4add90a82 100644 --- a/ubuntu/maverick/tdebase/debian/man/kdm-trinity.1 +++ b/ubuntu/maverick/tdebase/debian/man/tdm-trinity.1 @@ -1,16 +1,16 @@ .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH KDM 1 "June 2006" "K Desktop Environment" "KDE Display Manager" +.TH TDM 1 "June 2006" "K Desktop Environment" "KDE Display Manager" .SH NAME -kdm +tdm \- KDE Display Manager .SH SYNOPSIS -\fBkdm\fP [options] [tty] +\fBtdm\fP [options] [tty] .SH DESCRIPTION -\fBkdm\fP is the KDE display manager also known as login manager. It shows a graphical login screen for username and password. After authenticating the user it starts a session. +\fBtdm\fP is the KDE display manager also known as login manager. It shows a graphical login screen for username and password. After authenticating the user it starts a session. .br -\fBkdm\fP can be configured for remote login via XDMCP. XDMCP is the "X Display Manager Control Protocol" which is used to set up connections between remote systems over the network. +\fBtdm\fP can be configured for remote login via XDMCP. XDMCP is the "X Display Manager Control Protocol" which is used to set up connections between remote systems over the network. .sp 1 -\fBkdm\fP is a derivative of \fBxdm\fP. \fBman 1 xdm\fP may provide useful information (requires installed \fBxdm\fP). For X-related problems try \fBman 7x X\fP and \fBman 1 startx\fP. +\fBtdm\fP is a derivative of \fBxdm\fP. \fBman 1 xdm\fP may provide useful information (requires installed \fBxdm\fP). For X-related problems try \fBman 7x X\fP and \fBman 1 startx\fP. .SH OPTIONS .TP .B \-daemon @@ -55,48 +55,48 @@ Debug option bitfield: .RE .SH FILES .TP -.I /etc/trinity/kdm/backgroundrc +.I /etc/trinity/tdm/backgroundrc configuration file with background settings .TP -.I /etc/trinity/kdm/kdm.options -options for X display manager kdm +.I /etc/trinity/tdm/tdm.options +options for X display manager tdm .TP -.I /etc/trinity/kdm/kdmrc -the kdm configuration file +.I /etc/trinity/tdm/tdmrc +the tdm configuration file .TP -.I /etc/trinity/kdm/Xaccess +.I /etc/trinity/tdm/Xaccess access control file for XDMCP connections .TP -.I /etc/trinity/kdm/Xservers +.I /etc/trinity/tdm/Xservers list of local X-servers .TP -.I /etc/trinity/kdm/Xreset +.I /etc/trinity/tdm/Xreset script to run as root after session exits .TP -.I /etc/trinity/kdm/Xsession +.I /etc/trinity/tdm/Xsession script to run as user after login of user .TP -.I /etc/trinity/kdm/Xsetup +.I /etc/trinity/tdm/Xsetup script to run as root before the login dialog appears .sp 1 -this script can be edited to disable or modify the running of \fBxconsole\fP on the kdm greeter screen +this script can be edited to disable or modify the running of \fBxconsole\fP on the tdm greeter screen .TP -.I /etc/trinity/kdm/Xstartup +.I /etc/trinity/tdm/Xstartup script to run as root before session starts .TP -.I /etc/trinity/kdm/Xwilling +.I /etc/trinity/tdm/Xwilling output of this script is displayed in the chooser window .SH SEE ALSO -.BR kdm.options (5),\ kdmctl (1),\ kdm_config (1),\ kdm_greet (1),\ startx (1),\ X (7x),\ xconsole (1),\ xdm (1) +.BR tdm.options (5),\ tdmctl (1),\ tdm_config (1),\ tdm_greet (1),\ startx (1),\ X (7x),\ xconsole (1),\ xdm (1) .TP -.I /opt/trinity/share/doc/kdm/README.gz -Information about \fBkdm\fP and its options +.I /opt/trinity/share/doc/tdm/README.gz +Information about \fBtdm\fP and its options .sp 1 .RE Full user documentation is available through the KDE Help Center. You can also enter the URL -.BR help:/kdm/ +.BR help:/tdm/ directly into konqueror or you can run -.BR "khelpcenter help:/kdm/" +.BR "khelpcenter help:/tdm/" from the command\-line. .br .SH AUTHORS diff --git a/ubuntu/maverick/tdebase/debian/man/kdm_config-trinity.1 b/ubuntu/maverick/tdebase/debian/man/tdm_config-trinity.1 index d1cbfea1d..d9325214a 100644 --- a/ubuntu/maverick/tdebase/debian/man/kdm_config-trinity.1 +++ b/ubuntu/maverick/tdebase/debian/man/tdm_config-trinity.1 @@ -1,14 +1,14 @@ .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH KDM_CONFIG 1 "June 2006" "K Desktop Environment" "helper program" +.TH TDM_CONFIG 1 "June 2006" "K Desktop Environment" "helper program" .SH NAME -kdm_config -\- helper programm for kdm to read configuration files +tdm_config +\- helper programm for tdm to read configuration files .SH SYNOPSIS -\fBkdm_config\fP +\fBtdm_config\fP .SH DESCRIPTION -\fBkdm_config\fP is a helper program for \fBkdm\fP to read configuration files. +\fBtdm_config\fP is a helper program for \fBtdm\fP to read configuration files. .SH SEE ALSO -\fBkdm\fP(1) +\fBtdm\fP(1) .SH AUTHORS .nf Oswald Buddenhagen <ossi@kde.org> diff --git a/ubuntu/maverick/tdebase/debian/man/kdm_greet-trinity.1 b/ubuntu/maverick/tdebase/debian/man/tdm_greet-trinity.1 index f1607e2b1..c33f57d5f 100644 --- a/ubuntu/maverick/tdebase/debian/man/kdm_greet-trinity.1 +++ b/ubuntu/maverick/tdebase/debian/man/tdm_greet-trinity.1 @@ -1,14 +1,14 @@ .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH KDM_GREET 1 "June 2006" "K Desktop Environment" "KDE greeter module" +.TH TDM_GREET 1 "June 2006" "K Desktop Environment" "KDE greeter module" .SH NAME -kdm_greet -\- KDE greeter module for kdm +tdm_greet +\- KDE greeter module for tdm .SH SYNOPSIS -\fBkdm_greet\fP +\fBtdm_greet\fP .SH DESCRIPTION -\fBkdm_greet\fP is a KDE greeter module for \fBkdm\fP. It shows the login dialog. +\fBtdm_greet\fP is a KDE greeter module for \fBtdm\fP. It shows the login dialog. .SH SEE ALSO -.BR kdm (1) +.BR tdm (1) .SH AUTHORS .nf Oswald Buddenhagen <ossi@kde.org> diff --git a/ubuntu/maverick/tdebase/debian/man/kdmctl-trinity.1 b/ubuntu/maverick/tdebase/debian/man/tdmctl-trinity.1 index b05f09407..a1a0bb622 100644 --- a/ubuntu/maverick/tdebase/debian/man/kdmctl-trinity.1 +++ b/ubuntu/maverick/tdebase/debian/man/tdmctl-trinity.1 @@ -1,12 +1,12 @@ .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH KDMCTL 1 "June 2006" "K Desktop Environment" "KDM remote control application" +.TH TDMCTL 1 "June 2006" "K Desktop Environment" "TDM remote control application" .SH NAME -kdmctl -\- kdm remote control application +tdmctl +\- tdm remote control application .SH SYNOPSIS -\fBkdmctl\fP [options] [command [command arguments]] +\fBtdmctl\fP [options] [command [command arguments]] .SH DESCRIPTION -\fBkdmctl\fP is an application to remote\-control \fBkdm\fP. It makes use of UNIX domain sockets. +\fBtdmctl\fP is an application to remote\-control \fBtdm\fP. It makes use of UNIX domain sockets. .sp 1 There are two types of sockets: the global one (dmctl) and the per\-display ones (dmctl\-<display>). The global one's subdir is owned by root, the subdirs of the per\-display ones' are owned by the user currently owning the session (root or the logged in user). .sp 1 @@ -16,7 +16,7 @@ The directory in which the sockets are located is determined this way: .br \- the $DM_CONTROL variable is examined .br -\- the kdm config file is searched for the FifoDir key +\- the tdm config file is searched for the FifoDir key .br .RI \- /var/run/xdmctl \ and\ /var/run \ are\ tried .RE @@ -28,7 +28,7 @@ Tokens in the command and the reply are tab\-separated. Command arguments can be specified as separate command line parameters, in which case they are simply concatenated with tabs in between. .sp 1 -If the command is '\-', \fBkdmctl\fP reads commands from stdin. +If the command is '\-', \fBtdmctl\fP reads commands from stdin. The default command is 'caps'. .SH OPTIONS .SS @@ -47,7 +47,7 @@ Override $DISPLAY Override $DM_CONTROL .TP .B \-c \-config -Use alternative kdm config file +Use alternative tdm config file .SS Commands: .br .SS Global commands: @@ -72,8 +72,8 @@ The currently running session is forcibly terminated. No auto\-relogin is attemp .TP .B caps Returns a list of this socket's capabilities: -.IP " \- kdm" -identifies kdm, in case some other DM implements this protocol, too. +.IP " \- tdm" +identifies tdm, in case some other DM implements this protocol, too. .IP " \- list, activate, lock, suicide, login" the respective command is supported. .IP " \- bootoptions" @@ -155,7 +155,7 @@ Shutdowns requested from per\-display sockets are executed when the current sess .sp 1 start is the time for which the shutdown is scheduled. If it starts with a plus\-sign, the current time is added. Zero means immediately. .sp 1 -end is the latest time at which the shutdown should be performed if active sessions are still running. If it starts with a plus\-sign, the start time is added. Minus one means wait infinitely. If end is through and active sessions are still running, \fBKDM\fP can do one of the following: +end is the latest time at which the shutdown should be performed if active sessions are still running. If it starts with a plus\-sign, the start time is added. Minus one means wait infinitely. If end is through and active sessions are still running, \fBTDM\fP can do one of the following: .RS 3 - "cancel" \- give up the shutdown. .br @@ -203,10 +203,10 @@ The entries are comma\-separated tuples of: \- New fields might be added later. .RE .SH SEE ALSO -.BR kdm (1) +.BR tdm (1) .TP -.I /opt/trinity/share/doc/kdm/README.gz -Information about the command sockets (and \fBkdm\fP) +.I /opt/trinity/share/doc/tdm/README.gz +Information about the command sockets (and \fBtdm\fP) .SH AUTHORS .nf Oswald Buddenhagen <ossi@kde.org> diff --git a/ubuntu/maverick/tdebase/debian/not-installed.list b/ubuntu/maverick/tdebase/debian/not-installed.list index dad970345..bbc3e466f 100644 --- a/ubuntu/maverick/tdebase/debian/not-installed.list +++ b/ubuntu/maverick/tdebase/debian/not-installed.list @@ -1,12 +1,12 @@ The following files are not installed in any binary package. This is deliberate. -/usr/share/apps/kdm/sessions/*.desktop +/usr/share/apps/tdm/sessions/*.desktop - many .desktop files are not included since they either do not have Debian packages, or their Debian packages include their own .desktop session - files for gdm/kdm, or they're not intended to be stand-alone window + files for gdm/tdm, or they're not intended to be stand-alone window managers. Eventually, these should ALL be dropped, since they aren't - really maintained upstream, and kdm isn't the correct place to ship these + really maintained upstream, and tdm isn't the correct place to ship these anyway. Here's the current list of those dropped: aewm++ @@ -38,7 +38,7 @@ This is deliberate. xfce4 xfce -/etc/trinity/kdm/README +/etc/trinity/tdm/README - useless comments, not intended for the end user. /usr/share/fonts/override/fonts.dir diff --git a/ubuntu/maverick/tdebase/debian/patches/disable_default_kdm_theme.diff b/ubuntu/maverick/tdebase/debian/patches/disable_default_tdm_theme.diff index 9f439d657..20cb49429 100644 --- a/ubuntu/maverick/tdebase/debian/patches/disable_default_kdm_theme.diff +++ b/ubuntu/maverick/tdebase/debian/patches/disable_default_tdm_theme.diff @@ -1,5 +1,5 @@ ---- kdm/config.def -+++ kdm/config.def +--- tdm/config.def ++++ tdm/config.def @@ -2614,8 +2614,8 @@ Key: UseTheme diff --git a/ubuntu/maverick/tdebase/debian/patches/disable_startkde_wallpaper.diff b/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff index 838bbec11..21011fbd5 100644 --- a/ubuntu/maverick/tdebase/debian/patches/disable_startkde_wallpaper.diff +++ b/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff @@ -1,14 +1,14 @@ ---- startkde -+++ startkde +--- starttde ++++ starttde @@ -184,17 +184,17 @@ - . $kdehome/share/config/startupconfig + . $tdehome/share/config/startupconfig fi -# Make sure a default wallpaper is set. --if [ ! -e $kdehome/share/config/kdesktoprc ]; then +-if [ ! -e $tdehome/share/config/kdesktoprc ]; then - # With Trinity KDE this file should exist, but test first. - if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then --cat >$kdehome/share/config/kdesktoprc <<EOF +-cat >$tdehome/share/config/kdesktoprc <<EOF -[Desktop0] -Wallpaper=isadora.png -WallpaperMode=Scaled @@ -16,10 +16,10 @@ - fi -fi +## Make sure a default wallpaper is set. -+#if [ ! -e $kdehome/share/config/kdesktoprc ]; then ++#if [ ! -e $tdehome/share/config/kdesktoprc ]; then +# # With Trinity KDE this file should exist, but test first. +# if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then -+#cat >$kdehome/share/config/kdesktoprc <<EOF ++#cat >$tdehome/share/config/kdesktoprc <<EOF +#[Desktop0] +#Wallpaper=isadora.png +#WallpaperMode=Scaled diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff index 52fa6a4d5..2c106549e 100644 --- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff +++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff @@ -1,5 +1,5 @@ ---- kdm/kfrontend/kdmshutdown.cpp -+++ kdm/kfrontend/kdmshutdown.cpp +--- tdm/kfrontend/tdmshutdown.cpp ++++ tdm/kfrontend/tdmshutdown.cpp @@ -467,7 +467,7 @@ , targetList( 0 ) { diff --git a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_9921_kdm_bulletproof_x.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff index 4aad9f8e3..c312b6fb7 100644 --- a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_9921_kdm_bulletproof_x.diff +++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff @@ -1,5 +1,5 @@ ---- kdebase-3.5.8/kdm/backend/dm.c 2008-02-13 23:59:17.000000000 +0200 -+++ kdebase-3.5.8/kdm/backend/dm.c 2008-02-14 11:22:41.000000000 +0200 +--- tdebase-3.5.8/tdm/backend/dm.c 2008-02-13 23:59:17.000000000 +0200 ++++ tdebase-3.5.8/tdm/backend/dm.c 2008-02-14 11:22:41.000000000 +0200 @@ -996,9 +996,14 @@ ReapChildren( void ) /* don't kill again */ break; @@ -18,8 +18,8 @@ StartServerFailed(); break; } ---- kdebase-3.5.8/kdm/backend/server.c 2008-02-13 23:59:17.000000000 +0200 -+++ kdebase-3.5.8/kdm/backend/server.c 2008-02-14 11:41:20.000000000 +0200 +--- tdebase-3.5.8/tdm/backend/server.c 2008-02-13 23:59:17.000000000 +0200 ++++ tdebase-3.5.8/tdm/backend/server.c 2008-02-14 11:41:20.000000000 +0200 @@ -48,6 +48,10 @@ from the copyright holder. struct display *startingServer; time_t serverTimeout = TO_INF; diff --git a/ubuntu/maverick/tdebase/debian/po/POTFILES.in b/ubuntu/maverick/tdebase/debian/po/POTFILES.in index 416e5f394..1f7bb4d7d 100644 --- a/ubuntu/maverick/tdebase/debian/po/POTFILES.in +++ b/ubuntu/maverick/tdebase/debian/po/POTFILES.in @@ -1 +1 @@ -[type: gettext/rfc822deb] kdm.templates +[type: gettext/rfc822deb] tdm.templates diff --git a/ubuntu/maverick/tdebase/debian/po/ar.po b/ubuntu/maverick/tdebase/debian/po/ar.po index 6153b4301..357d6e241 100644 --- a/ubuntu/maverick/tdebase/debian/po/ar.po +++ b/ubuntu/maverick/tdebase/debian/po/ar.po @@ -28,13 +28,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "مدير العرض الاÙتراضي:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -44,7 +44,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -56,7 +56,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -70,29 +70,29 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "هل تود إيقا٠تشغيل عÙريت kdmØŸ" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "هل تود إيقا٠تشغيل عÙريت tdmØŸ" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"يكون عÙريت مدير Ø³Ø·Ø Ù…ÙƒØªØ¨ كي (kdm) عادة موقÙاً عند ترقية الØزمة " +"يكون عÙريت مدير Ø³Ø·Ø Ù…ÙƒØªØ¨ كي (tdm) عادة موقÙاً عند ترقية الØزمة " "وإزالتها، ولكن يبدو أنه يدير على الأقل جلسة X واØدة تعمل Øالياً." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"إن تم إيقا٠kdm الآن، Ùستنهى أي جلسات X يقوم بإدارتها. " +"إن تم إيقا٠tdm الآن، Ùستنهى أي جلسات X يقوم بإدارتها. " "عدى ذلك، سيسري Ù…Ùعول النسخة الجديدة ÙÙŠ المرة التالية التي " "يتم Ùيها إعادة تشغيل العÙريت." diff --git a/ubuntu/maverick/tdebase/debian/po/ca.po b/ubuntu/maverick/tdebase/debian/po/ca.po index 8115f5910..79fbf80a5 100644 --- a/ubuntu/maverick/tdebase/debian/po/ca.po +++ b/ubuntu/maverick/tdebase/debian/po/ca.po @@ -39,13 +39,13 @@ msgstr "" #. Type: select
#. Description
-#: ../kdm.templates:1001
+#: ../tdm.templates:1001
msgid "Default display manager:"
msgstr "Escolliu el gestor de pantalla:"
#. Type: select
#. Description
-#: ../kdm.templates:1001
+#: ../tdm.templates:1001
msgid ""
"A display manager is a program that provides graphical login capabilities "
"for the X Window System."
@@ -55,7 +55,7 @@ msgstr "" #. Type: select
#. Description
-#: ../kdm.templates:1001
+#: ../tdm.templates:1001
msgid ""
"Only one display manager can manage a given X server, but multiple display "
"manager packages are installed. Please select which display manager should "
@@ -67,7 +67,7 @@ msgstr "" #. Type: select
#. Description
-#: ../kdm.templates:1001
+#: ../tdm.templates:1001
msgid ""
"Multiple display managers can run simultaneously if they are configured to "
"manage different servers; to achieve this, configure the display managers "
@@ -82,39 +82,39 @@ msgstr "" #. Type: boolean
#. Description
-#: ../kdm.templates:3001
-msgid "Stop the kdm daemon?"
-msgstr "Voleu detenir el dimoni «kdm»?"
+#: ../tdm.templates:3001
+msgid "Stop the tdm daemon?"
+msgstr "Voleu detenir el dimoni «tdm»?"
#. Type: boolean
#. Description
-#: ../kdm.templates:3001
+#: ../tdm.templates:3001
msgid ""
-"The K Desktop manager (kdm) daemon is typically stopped on package upgrade "
+"The K Desktop manager (tdm) daemon is typically stopped on package upgrade "
"and removal, but it appears to be managing at least one running X session."
msgstr ""
-"El dimoni gestor de pantalla de KDE, (kdm), sol ser detingut en actualitzar-ne "
+"El dimoni gestor de pantalla de KDE, (tdm), sol ser detingut en actualitzar-ne "
"i eliminar-ne el paquet, però sembla que ara està gestionant almenys una "
"sessió X activa."
#. Type: boolean
#. Description
-#: ../kdm.templates:3001
+#: ../tdm.templates:3001
msgid ""
-"If kdm is stopped now, any X sessions it manages will be terminated. "
+"If tdm is stopped now, any X sessions it manages will be terminated. "
"Otherwise, the new version will take effect the next time the daemon is "
"restarted."
msgstr ""
-"Si es deté «kdm» ara, terminaran totes les sessions X que està gestionant. "
-"Altrament, podeu deixar corrent «kdm», i la nova versió surtirà efecte a la "
+"Si es deté «tdm» ara, terminaran totes les sessions X que està gestionant. "
+"Altrament, podeu deixar corrent «tdm», i la nova versió surtirà efecte a la "
"següent volta que el dimoni es reinicie."
msgid ""
-"The X display manager (kdm) daemon is typically stopped on package "
+"The X display manager (tdm) daemon is typically stopped on package "
"upgrade and removal, but it appears to be managing at least one running X "
"session."
msgstr ""
-"El dimoni gestor de pantalla d’X, «kdm», sol ser detingut en actualitzarâ€ne"
+"El dimoni gestor de pantalla d’X, «tdm», sol ser detingut en actualitzarâ€ne"
"i eliminarâ€ne el paquet, però sembla que ara està gestionant almenys "
"una sessió X activa."
diff --git a/ubuntu/maverick/tdebase/debian/po/cs.po b/ubuntu/maverick/tdebase/debian/po/cs.po index cf3406f97..942d5d31d 100644 --- a/ubuntu/maverick/tdebase/debian/po/cs.po +++ b/ubuntu/maverick/tdebase/debian/po/cs.po @@ -1,4 +1,4 @@ -# debconf templates for kdm package +# debconf templates for tdm package # Czech translation # # $Id: cs.po 1042 2006-01-09 07:55:08Z ender $ @@ -24,7 +24,7 @@ # msgid "" msgstr "" -"Project-Id-Version: kdm\n" +"Project-Id-Version: tdm\n" "Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n" "POT-Creation-Date: 2007-03-23 07:15+0100\n" "PO-Revision-Date: 2007-04-10 18:15+0200\n" @@ -36,13 +36,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Výchozà správce obrazovky:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -52,7 +52,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -63,7 +63,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -77,38 +77,38 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Zastavit démona kdm?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Zastavit démona tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Démon kdm (K Desktop manager) je obvykle pÅ™i aktualizaci nebo odstranÄ›nà " +"Démon tdm (K Desktop manager) je obvykle pÅ™i aktualizaci nebo odstranÄ›nà " "balÃku zastaven, ale zdá se, že spravuje minimálnÄ› jedno X sezenÃ." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Pokud by byl kdm zastaven nynÃ, vÅ¡echna jÃm spravovaná X sezenà by se " -"ukonÄila. V opaÄném pÅ™ÃpadÄ› zůstane kdm běžet a nová verze se spustà s " +"Pokud by byl tdm zastaven nynÃ, vÅ¡echna jÃm spravovaná X sezenà by se " +"ukonÄila. V opaÄném pÅ™ÃpadÄ› zůstane tdm běžet a nová verze se spustà s " "pÅ™ÃÅ¡tÃm restartem démona." #~ msgid "" -#~ "The X display manager (kdm) daemon is typically stopped on package " +#~ "The X display manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " #~ "session." #~ msgstr "" -#~ "Démon kdm (X display manager) je obvykle pÅ™i aktualizaci nebo odstranÄ›nà " +#~ "Démon tdm (X display manager) je obvykle pÅ™i aktualizaci nebo odstranÄ›nà " #~ "balÃku zastaven, ale zdá se, že spravuje minimálnÄ› jedno X sezenÃ." #~ msgid "Select the desired default display manager." @@ -134,18 +134,18 @@ msgstr "" #~ "nakonfigurovat, upravit jejich spouÅ¡tÄ›cà skripty v /etc/init.d a zakázat " #~ "kontrolu standardnÃho správce obrazovky.)" -#~ msgid "Do you wish to stop the kdm daemon?" -#~ msgstr "Chcete zastavit daemona kdm?" +#~ msgid "Do you wish to stop the tdm daemon?" +#~ msgstr "Chcete zastavit daemona tdm?" #~ msgid "" -#~ "The K Desktop manager (kdm) daemon is typically stopped on package " +#~ "The K Desktop manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " -#~ "session. If kdm is stopped now, any X sessions it manages will be " -#~ "terminated. Otherwise you may leave kdm running, and the new version will " +#~ "session. If tdm is stopped now, any X sessions it manages will be " +#~ "terminated. Otherwise you may leave tdm running, and the new version will " #~ "take effect the next time the daemon is restarted." #~ msgstr "" -#~ "Daemon kdm (K Desktop manager) je obvykle pÅ™i aktualizaci nebo odstranÄ›nà " +#~ "Daemon tdm (K Desktop manager) je obvykle pÅ™i aktualizaci nebo odstranÄ›nà " #~ "balÃku zastaven, ale zdá se, že právÄ› spravuje minimálnÄ› jedno X sezenÃ. " -#~ "Pokud by byl kdm zastaven nynÃ, vÅ¡echna jÃm spravovaná X sezenà by byla " -#~ "ukonÄena. V opaÄném pÅ™ÃpadÄ› můžene nechat kdm běžet a nová verze se " +#~ "Pokud by byl tdm zastaven nynÃ, vÅ¡echna jÃm spravovaná X sezenà by byla " +#~ "ukonÄena. V opaÄném pÅ™ÃpadÄ› můžene nechat tdm běžet a nová verze se " #~ "spustà s pÅ™ÃÅ¡tÃm restartem daemona." diff --git a/ubuntu/maverick/tdebase/debian/po/da.po b/ubuntu/maverick/tdebase/debian/po/da.po index 3cf989ee0..d4b081f65 100644 --- a/ubuntu/maverick/tdebase/debian/po/da.po +++ b/ubuntu/maverick/tdebase/debian/po/da.po @@ -29,13 +29,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Standard logind-håndtering:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -45,7 +45,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -57,7 +57,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -71,30 +71,30 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Stop kdm-dæmonen?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Stop tdm-dæmonen?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Skrivebordshåndterings-dæmonen kdm stoppes typisk ved opgradering og " +"Skrivebordshåndterings-dæmonen tdm stoppes typisk ved opgradering og " "fjernelse af pakken, men den lader til at være beskæftiget med mindst én " "kørende X-session." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Hvis kdm stoppes nu, vil de X-sessioner, den håndterer, " -"blive afsluttet. Ellers kan du lade kdm køre. Så vil den nye version først " +"Hvis tdm stoppes nu, vil de X-sessioner, den håndterer, " +"blive afsluttet. Ellers kan du lade tdm køre. Så vil den nye version først " "tage over når dæmonen genstartes." diff --git a/ubuntu/maverick/tdebase/debian/po/de.po b/ubuntu/maverick/tdebase/debian/po/de.po index aecfcd91c..eb1ff7a00 100644 --- a/ubuntu/maverick/tdebase/debian/po/de.po +++ b/ubuntu/maverick/tdebase/debian/po/de.po @@ -45,13 +45,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Standardmäßiger Display-Manager:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -61,7 +61,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -73,7 +73,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -88,30 +88,30 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Soll der kdm-Dienst gestoppt werden?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Soll der tdm-Dienst gestoppt werden?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Der K Display Manager (kdm) Dienst wird meist beim Aktualisieren oder " +"Der K Display Manager (tdm) Dienst wird meist beim Aktualisieren oder " "Entfernen eines Pakets gestoppt, aber er scheint mindestens eine laufende X-" "Sitzung zu verwalten." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Wenn kdm jetzt gestoppt wird, werden alle Sitzungen beendet, die er gerade " -"verwaltet. Alternativ können Sie kdm weiter laufen lassen, die neue Version " +"Wenn tdm jetzt gestoppt wird, werden alle Sitzungen beendet, die er gerade " +"verwaltet. Alternativ können Sie tdm weiter laufen lassen, die neue Version " "wird dann aktiv, sobald der Dienst das nächste Mal gestartet wird." diff --git a/ubuntu/maverick/tdebase/debian/po/el.po b/ubuntu/maverick/tdebase/debian/po/el.po index c4a73a75a..e34782d24 100644 --- a/ubuntu/maverick/tdebase/debian/po/el.po +++ b/ubuntu/maverick/tdebase/debian/po/el.po @@ -36,14 +36,14 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "Default display manager:" msgstr "ΕπιλÎξτε τον επιθυμητό διαχειÏιστή οθόνης." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -53,7 +53,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "" "Only one display manager can manage a given X server, but multiple display " @@ -66,7 +66,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "" "Multiple display managers can run simultaneously if they are configured to " @@ -82,54 +82,54 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy -msgid "Stop the kdm daemon?" -msgstr "ΘÎλετε να σταματήσετε να χÏησιμοποιείτε τον δαίμονα kdm;" +msgid "Stop the tdm daemon?" +msgstr "ΘÎλετε να σταματήσετε να χÏησιμοποιείτε τον δαίμονα tdm;" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Κανονικά, η λειτουÏγία του δαίμονα του διαχειÏιστή οθόνης των X (kdm) " +"Κανονικά, η λειτουÏγία του δαίμονα του διαχειÏιστή οθόνης των X (tdm) " "διακόπτεται με κάθε αναβάθμιση και διαγÏαφή του πακÎτου, αλλά στη " "συγκεκÏιμÎνη πεÏίπτωση φαίνεται ότι διαχειÏίζεται ήδη τουλάχιστον μια " -"συνεδÏία των X (X session). Αν ο kdm τεÏματιστεί Ï„ÏŽÏα, οποιεσδήποτε " +"συνεδÏία των X (X session). Αν ο tdm τεÏματιστεί Ï„ÏŽÏα, οποιεσδήποτε " "συνεδÏίες των X χειÏίζεται θα τεÏματιστοÏν επίσης. ΔιαφοÏετικά, μποÏείτε να " -"αφήσετε τον kdm να συνεχίσει τη λειτουÏγία του και η νÎα Îκδοση να " +"αφήσετε τον tdm να συνεχίσει τη λειτουÏγία του και η νÎα Îκδοση να " "χÏησιμοποιηθεί την επόμενη φοÏά που θα Ï„ÏÎξει ο δαίμονας." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Κανονικά, η λειτουÏγία του δαίμονα του διαχειÏιστή οθόνης των X (kdm) " +"Κανονικά, η λειτουÏγία του δαίμονα του διαχειÏιστή οθόνης των X (tdm) " "διακόπτεται με κάθε αναβάθμιση και διαγÏαφή του πακÎτου, αλλά στη " "συγκεκÏιμÎνη πεÏίπτωση φαίνεται ότι διαχειÏίζεται ήδη τουλάχιστον μια " -"συνεδÏία των X (X session). Αν ο kdm τεÏματιστεί Ï„ÏŽÏα, οποιεσδήποτε " +"συνεδÏία των X (X session). Αν ο tdm τεÏματιστεί Ï„ÏŽÏα, οποιεσδήποτε " "συνεδÏίες των X χειÏίζεται θα τεÏματιστοÏν επίσης. ΔιαφοÏετικά, μποÏείτε να " -"αφήσετε τον kdm να συνεχίσει τη λειτουÏγία του και η νÎα Îκδοση να " +"αφήσετε τον tdm να συνεχίσει τη λειτουÏγία του και η νÎα Îκδοση να " "χÏησιμοποιηθεί την επόμενη φοÏά που θα Ï„ÏÎξει ο δαίμονας." #, fuzzy #~ msgid "" -#~ "The X display manager (kdm) daemon is typically stopped on package " +#~ "The X display manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " #~ "session." #~ msgstr "" -#~ "Κανονικά, η λειτουÏγία του δαίμονα του διαχειÏιστή οθόνης των X (kdm) " +#~ "Κανονικά, η λειτουÏγία του δαίμονα του διαχειÏιστή οθόνης των X (tdm) " #~ "διακόπτεται με κάθε αναβάθμιση και διαγÏαφή του πακÎτου, αλλά στη " #~ "συγκεκÏιμÎνη πεÏίπτωση φαίνεται ότι διαχειÏίζεται ήδη τουλάχιστον μια " -#~ "συνεδÏία των X (X session). Αν ο kdm τεÏματιστεί Ï„ÏŽÏα, οποιεσδήποτε " +#~ "συνεδÏία των X (X session). Αν ο tdm τεÏματιστεί Ï„ÏŽÏα, οποιεσδήποτε " #~ "συνεδÏίες των X χειÏίζεται θα τεÏματιστοÏν επίσης. ΔιαφοÏετικά, μποÏείτε " -#~ "να αφήσετε τον kdm να συνεχίσει τη λειτουÏγία του και η νÎα Îκδοση να " +#~ "να αφήσετε τον tdm να συνεχίσει τη λειτουÏγία του και η νÎα Îκδοση να " #~ "χÏησιμοποιηθεί την επόμενη φοÏά που θα Ï„ÏÎξει ο δαίμονας." diff --git a/ubuntu/maverick/tdebase/debian/po/es.po b/ubuntu/maverick/tdebase/debian/po/es.po index 5956f734f..b5f64326b 100644 --- a/ubuntu/maverick/tdebase/debian/po/es.po +++ b/ubuntu/maverick/tdebase/debian/po/es.po @@ -40,13 +40,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Gestor de sesiones predefinido:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -56,7 +56,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -65,7 +65,7 @@ msgstr "Cada servidor X s�lo puede ser gestionado por un �nico gestor de ses #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -77,24 +77,24 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "�Desea detener el daemon kdm?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "�Desea detener el daemon tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." -msgstr "Normalmente se detiene el daemon del gestor de sesiones de KDE (kdm) al actualizar o borrar el paquete, pero parece que est� gestionando al menos una sesi�n X activa." +msgstr "Normalmente se detiene el daemon del gestor de sesiones de KDE (tdm) al actualizar o borrar el paquete, pero parece que est� gestionando al menos una sesi�n X activa." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." -msgstr "Si detiene kdm ahora, se finalizar�n todas las sesiones X que est� gestionando. La otra posibilidad es mantener kdm en ejecuci�n, con lo que la nueva versi�n no se activar� hasta la pr�xima vez que se reinicie el daemon." +msgstr "Si detiene tdm ahora, se finalizar�n todas las sesiones X que est� gestionando. La otra posibilidad es mantener tdm en ejecuci�n, con lo que la nueva versi�n no se activar� hasta la pr�xima vez que se reinicie el daemon." diff --git a/ubuntu/maverick/tdebase/debian/po/eu.po b/ubuntu/maverick/tdebase/debian/po/eu.po index eec7f49fb..52a0de5ab 100644 --- a/ubuntu/maverick/tdebase/debian/po/eu.po +++ b/ubuntu/maverick/tdebase/debian/po/eu.po @@ -39,13 +39,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Lehenetsiriko pantaila kudeatzailea:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -55,7 +55,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -67,7 +67,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -81,30 +81,30 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" msgstr "Kdm deabrua gelditu?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"K Pantaila Kudeatzaile (kdm) deabrua arruntean gelditu egiten da pakete " +"K Pantaila Kudeatzaile (tdm) deabrua arruntean gelditu egiten da pakete " "bertsio berritze edo ezabaketa egiterakoan, baina dirudienez martxan dagoen " "X saio bat behintzat kudeatzen ari da." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"kdm orain gelditu ezkero, kudeatzen ari den edozein X saio itxi egingo da. " -"Bestela kdm martxan utz dezakezu eta bertsio berria deabrua abiarazten den " +"tdm orain gelditu ezkero, kudeatzen ari den edozein X saio itxi egingo da. " +"Bestela tdm martxan utz dezakezu eta bertsio berria deabrua abiarazten den " "hurrengo aldian erabiliko da." diff --git a/ubuntu/maverick/tdebase/debian/po/fi.po b/ubuntu/maverick/tdebase/debian/po/fi.po index 9c318dc35..d5a51c9d7 100644 --- a/ubuntu/maverick/tdebase/debian/po/fi.po +++ b/ubuntu/maverick/tdebase/debian/po/fi.po @@ -14,43 +14,43 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Oletusnäytönhallintaohjelma:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "A display manager is a program that provides graphical login capabilities for the X Window System." msgstr "Näytönhallintaohjelma on ohjelma, joka tarjoaa graafisen sisäänkirjautumisruudun X-ikkunointijärjestelmään." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Only one display manager can manage a given X server, but multiple display manager packages are installed. Please select which display manager should run by default." msgstr "Kutakin X-palvelinta voi hoitaa vain yksi näytönhallintaohjelma, mutta useampia näytönhallintaohjelmapaketteja on asennettuna. Valitse mikä näytönhallintaohjelma tulisi ajaa oletuksena." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Multiple display managers can run simultaneously if they are configured to manage different servers; to achieve this, configure the display managers accordingly, edit each of their init scripts in /etc/init.d, and disable the check for a default display manager." msgstr "Useampi näytönhallintaohjelma voi olla ajossa yhtäaikaisesti, jos ne on asetettu hoitamaan eri palvelimia. Saadaksesi tämän aikaan, aseta näytönhallintaohjelmat tämän mukaisesti, muokkaa kunkin niistä alustustiedostoja hakemistossa /etc/init.d ja poista oletusnäytönhallintaohjelman tarkistus käytöstä." #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Pysäytetäänkö kdm-taustaohjelma?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Pysäytetäänkö tdm-taustaohjelma?" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "The K Desktop manager (kdm) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session." -msgstr "K Desktop manager (kdm) -taustaohjelma pysäytetään yleensä päivitettäessä tai poistettaessa pakettia, mutta se näyttää hoitavan ainakin yhtä ajossa olevaa X-istuntoa." +#: ../tdm.templates:3001 +msgid "The K Desktop manager (tdm) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session." +msgstr "K Desktop manager (tdm) -taustaohjelma pysäytetään yleensä päivitettäessä tai poistettaessa pakettia, mutta se näyttää hoitavan ainakin yhtä ajossa olevaa X-istuntoa." #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "If kdm is stopped now, any X sessions it manages will be terminated. Otherwise, the new version will take effect the next time the daemon is restarted." -msgstr "Jos kdm pysäytetään nyt, kaikki sen hoitamat X-istunnot lopetetaan. Muussa tapauksessa uusi versio otetaan käyttöön ensi kerralla, kun taustaohjelma käynnistetään uudelleen." +#: ../tdm.templates:3001 +msgid "If tdm is stopped now, any X sessions it manages will be terminated. Otherwise, the new version will take effect the next time the daemon is restarted." +msgstr "Jos tdm pysäytetään nyt, kaikki sen hoitamat X-istunnot lopetetaan. Muussa tapauksessa uusi versio otetaan käyttöön ensi kerralla, kun taustaohjelma käynnistetään uudelleen." diff --git a/ubuntu/maverick/tdebase/debian/po/fr.po b/ubuntu/maverick/tdebase/debian/po/fr.po index 764b3dd7d..15eabf815 100644 --- a/ubuntu/maverick/tdebase/debian/po/fr.po +++ b/ubuntu/maverick/tdebase/debian/po/fr.po @@ -44,13 +44,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Gestionnaire graphique de session par défaut :" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -60,7 +60,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -72,7 +72,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -86,30 +86,30 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Faut-il arrêter le démon kdm ?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Faut-il arrêter le démon tdm ?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Le gestionnaire de sessions KDE (kdm) est généralement arrêté lors de la mise " +"Le gestionnaire de sessions KDE (tdm) est généralement arrêté lors de la mise " "à jour ou de la suppression du paquet. Cependant, il semble qu'il gère " "actuellement encore au moins une session X." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Si kdm est arrêté maintenant, toutes les sessions X qu'il gère seront " -"terminées. L'autre possibilité est de laisser fonctionner kdm, la nouvelle " +"Si tdm est arrêté maintenant, toutes les sessions X qu'il gère seront " +"terminées. L'autre possibilité est de laisser fonctionner tdm, la nouvelle " "version ne devenant active qu'au prochain redémarrage du démon." diff --git a/ubuntu/maverick/tdebase/debian/po/gl.po b/ubuntu/maverick/tdebase/debian/po/gl.po index 3fa731c4b..d40bb853c 100644 --- a/ubuntu/maverick/tdebase/debian/po/gl.po +++ b/ubuntu/maverick/tdebase/debian/po/gl.po @@ -18,13 +18,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Xestor de pantalla por defecto:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -34,7 +34,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -46,7 +46,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -60,38 +60,38 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "¿Deter o servizo de kdm?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "¿Deter o servizo de tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Adoita se deter o servizo do xestor de pantalla de KDE (kdm) ao actualizar " +"Adoita se deter o servizo do xestor de pantalla de KDE (tdm) ao actualizar " "ou eliminar o paquete, pero semella que está a xestionar alomenos unha " "sesión X en execución." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Se se detén kdm agora, hase cortar calquera sesión X que xestione. Se non, a " +"Se se detén tdm agora, hase cortar calquera sesión X que xestione. Se non, a " "nova versión ha tomar efecto a próxima vez que reinicie o servizo." #~ msgid "" -#~ "The X display manager (kdm) daemon is typically stopped on package " +#~ "The X display manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " #~ "session." #~ msgstr "" -#~ "Adoita se deter o servizo do xestor de pantalla de X (kdm) ao actualizar " +#~ "Adoita se deter o servizo do xestor de pantalla de X (tdm) ao actualizar " #~ "ou eliminar o paquete, pero semella que está a xestionar alomenos unha " #~ "sesión X en execución." @@ -118,18 +118,18 @@ msgstr "" #~ "xestores de pantalla, edite os seus scripts de inicio de /etc/init.d e " #~ "desactive a comprobación do xestor de pantalla por defecto)." -#~ msgid "Do you wish to stop the kdm daemon?" -#~ msgstr "¿Quere deter o daemon de kdm?" +#~ msgid "Do you wish to stop the tdm daemon?" +#~ msgstr "¿Quere deter o daemon de tdm?" #~ msgid "" -#~ "The K Desktop manager (kdm) daemon is typically stopped on package " +#~ "The K Desktop manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " -#~ "session. If kdm is stopped now, any X sessions it manages will be " -#~ "terminated. Otherwise you may leave kdm running, and the new version will " +#~ "session. If tdm is stopped now, any X sessions it manages will be " +#~ "terminated. Otherwise you may leave tdm running, and the new version will " #~ "take effect the next time the daemon is restarted." #~ msgstr "" -#~ "Normalmente adóitase deter o daemon do xestor de pantalla de KDE (kdm) ao " +#~ "Normalmente adóitase deter o daemon do xestor de pantalla de KDE (tdm) ao " #~ "actualizar ou eliminar o paquete, pero semella que está a xestionar " -#~ "alomenos unha sesión X en execución. Se se detén kdm agora, hase cortar " -#~ "calquera sesión X que xestione. Se non, pode deixar kdm a se executar, e " +#~ "alomenos unha sesión X en execución. Se se detén tdm agora, hase cortar " +#~ "calquera sesión X que xestione. Se non, pode deixar tdm a se executar, e " #~ "a nova versión ha tomar efecto a próxima vez que reinicie o daemon." diff --git a/ubuntu/maverick/tdebase/debian/po/it.po b/ubuntu/maverick/tdebase/debian/po/it.po index 420476257..531d420ce 100644 --- a/ubuntu/maverick/tdebase/debian/po/it.po +++ b/ubuntu/maverick/tdebase/debian/po/it.po @@ -39,13 +39,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Display manager predefinito." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -55,7 +55,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -67,7 +67,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -82,29 +82,29 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Arrestare il demone kdm?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Arrestare il demone tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Il demone del display manager KDE (kdm) viene tipicamente fermato in fase " +"Il demone del display manager KDE (tdm) viene tipicamente fermato in fase " "di aggiornamento o rimozione del pacchetto, ma pare che al momento stia " "gestendo almeno una sessione attiva di X." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Se kdm viene arrestato ora, anche tutte le sessioni di X che gestisce " +"Se tdm viene arrestato ora, anche tutte le sessioni di X che gestisce " "verranno terminate. In alternativa, la nuova versione sarà usata a partire " "dal prossimo avvio del demone." diff --git a/ubuntu/maverick/tdebase/debian/po/ja.po b/ubuntu/maverick/tdebase/debian/po/ja.po index 10cfb98c4..e749468fc 100644 --- a/ubuntu/maverick/tdebase/debian/po/ja.po +++ b/ubuntu/maverick/tdebase/debian/po/ja.po @@ -39,13 +39,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "デフォルトã®ãƒ‡ã‚£ã‚¹ãƒ—レイマãƒãƒ¼ã‚¸ãƒ£:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -55,7 +55,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -67,7 +67,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -81,37 +81,37 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "kdm デーモンをåœæ¢ã—ã¾ã™ã‹?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "tdm デーモンをåœæ¢ã—ã¾ã™ã‹?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." -msgstr "K デスクトップマãƒãƒ¼ã‚¸ãƒ£ (kdm) デーモンã¯ã€æ™®é€šã€ãƒ‘ッケージã®æ›´æ–°ã‚„削除ã®éš›ã«åœæ¢ã•ã›ã‚‰ã‚Œã¾ã™ã€‚ã—ã‹ã— kdm ã¯ç¾åœ¨å‹•ä½œä¸ã® X セッションを最低ã²ã¨ã¤ã¯ç®¡ç†ã—ã¦ã„るよã†ã§ã™ã€‚" +msgstr "K デスクトップマãƒãƒ¼ã‚¸ãƒ£ (tdm) デーモンã¯ã€æ™®é€šã€ãƒ‘ッケージã®æ›´æ–°ã‚„削除ã®éš›ã«åœæ¢ã•ã›ã‚‰ã‚Œã¾ã™ã€‚ã—ã‹ã— tdm ã¯ç¾åœ¨å‹•ä½œä¸ã® X セッションを最低ã²ã¨ã¤ã¯ç®¡ç†ã—ã¦ã„るよã†ã§ã™ã€‚" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"ã„ã¾ kdm ã‚’åœæ¢ã™ã‚‹ã¨ã€ã“ã® kdm ãŒç®¡ç†ã—ã¦ã„ã‚‹ X セッションã¯åœæ¢ã—ã¾ã™ã€‚ã‚ã‚‹" -"ã„ã¯æ¬¡ã«ãƒ‡ãƒ¼ãƒ¢ãƒ³ã‚’リスタートã—ãŸã¨ãã«æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã® kdm を有効ã«ã™ã‚‹ã“ã¨" +"ã„ã¾ tdm ã‚’åœæ¢ã™ã‚‹ã¨ã€ã“ã® tdm ãŒç®¡ç†ã—ã¦ã„ã‚‹ X セッションã¯åœæ¢ã—ã¾ã™ã€‚ã‚ã‚‹" +"ã„ã¯æ¬¡ã«ãƒ‡ãƒ¼ãƒ¢ãƒ³ã‚’リスタートã—ãŸã¨ãã«æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã® tdm を有効ã«ã™ã‚‹ã“ã¨" "ã‚‚ã§ãã¾ã™ã€‚" #~ msgid "" -#~ "The X display manager (kdm) daemon is typically stopped on package " +#~ "The X display manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " #~ "session." #~ msgstr "" -#~ "X ディスプレイマãƒãƒ¼ã‚¸ãƒ£ (kdm) デーモンã¯ã€æ™®é€šã€ãƒ‘ッケージã®æ›´æ–°ã‚„削除ã®" -#~ "éš›ã«åœæ¢ã•ã›ã‚‰ã‚Œã¾ã™ã€‚ã—ã‹ã— kdm ã¯ç¾åœ¨å‹•ä½œä¸ã® X セッションを最低ã²ã¨ã¤ã¯" +#~ "X ディスプレイマãƒãƒ¼ã‚¸ãƒ£ (tdm) デーモンã¯ã€æ™®é€šã€ãƒ‘ッケージã®æ›´æ–°ã‚„削除ã®" +#~ "éš›ã«åœæ¢ã•ã›ã‚‰ã‚Œã¾ã™ã€‚ã—ã‹ã— tdm ã¯ç¾åœ¨å‹•ä½œä¸ã® X セッションを最低ã²ã¨ã¤ã¯" #~ "管ç†ã—ã¦ã„るよã†ã§ã™ã€‚" #~ msgid "Select the desired default display manager." @@ -139,18 +139,18 @@ msgstr "" #~ "切ã«è¨å®šã—ã¦ã€/etc/init.d ã«ã‚ã‚‹å„ init スクリプトを編集ã—ã€ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®" #~ "ディスプレイマãƒãƒ¼ã‚¸ãƒ£ã®ç¢ºèªã‚’無効ã«ã—ã¦ãã ã•ã„。)" -#~ msgid "Do you wish to stop the kdm daemon?" -#~ msgstr "kdm デーモンをåœæ¢ã—ãŸã„ã§ã™ã‹?" +#~ msgid "Do you wish to stop the tdm daemon?" +#~ msgstr "tdm デーモンをåœæ¢ã—ãŸã„ã§ã™ã‹?" #~ msgid "" -#~ "The K Desktop manager (kdm) daemon is typically stopped on package " +#~ "The K Desktop manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " -#~ "session. If kdm is stopped now, any X sessions it manages will be " -#~ "terminated. Otherwise you may leave kdm running, and the new version will " +#~ "session. If tdm is stopped now, any X sessions it manages will be " +#~ "terminated. Otherwise you may leave tdm running, and the new version will " #~ "take effect the next time the daemon is restarted." #~ msgstr "" -#~ "K Desktop manager (kdm) デーモンã¯é€šå¸¸ã€ãƒ‘ッケージã®æ›´æ–°ãŠã‚ˆã³å‰Šé™¤æ™‚ã«åœæ¢" +#~ "K Desktop manager (tdm) デーモンã¯é€šå¸¸ã€ãƒ‘ッケージã®æ›´æ–°ãŠã‚ˆã³å‰Šé™¤æ™‚ã«åœæ¢" #~ "ã—ã¾ã™ãŒã€å°‘ãªãã¨ã‚‚ 1 ã¤ã®å‹•ä½œä¸ã® X セッションを管ç†ã—ã¦ã„るよã†ã§ã™ã€‚" -#~ "kdm を今åœæ¢ã™ã‚‹ã¨ã€ã“ã‚ŒãŒç®¡ç†ã™ã‚‹ X セッションã¯æ®ºã•ã‚Œã¾ã™ã€‚ãã®ä»£ã‚ã‚Š" -#~ "ã«ã€kdm を動作ã—ã¦ã„ã‚‹ã¾ã¾ã«ã—ã¦ãŠãã€æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯æ¬¡å›žã®ãƒ‡ãƒ¼ãƒ¢ãƒ³ã®å†" +#~ "tdm を今åœæ¢ã™ã‚‹ã¨ã€ã“ã‚ŒãŒç®¡ç†ã™ã‚‹ X セッションã¯æ®ºã•ã‚Œã¾ã™ã€‚ãã®ä»£ã‚ã‚Š" +#~ "ã«ã€tdm を動作ã—ã¦ã„ã‚‹ã¾ã¾ã«ã—ã¦ãŠãã€æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯æ¬¡å›žã®ãƒ‡ãƒ¼ãƒ¢ãƒ³ã®å†" #~ "起動時ã«åŠ¹æžœã‚’表ã™ã‚ˆã†ã«ã§ãã¾ã™ã€‚" diff --git a/ubuntu/maverick/tdebase/debian/po/ko.po b/ubuntu/maverick/tdebase/debian/po/ko.po index 6200caa12..6bde61a03 100644 --- a/ubuntu/maverick/tdebase/debian/po/ko.po +++ b/ubuntu/maverick/tdebase/debian/po/ko.po @@ -19,13 +19,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "기본 화면관리ìž:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -35,7 +35,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -46,7 +46,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -59,27 +59,27 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "kdm ë°ëª¬ì„ 중지시킬까요?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "tdm ë°ëª¬ì„ 중지시킬까요?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"K ë°ìŠ¤í¬íƒ‘ 관리ìž(kdm) ë°ëª¬ì€ ì¼ë°˜ì 으로 꾸러미를 ì„¤ì¹˜í•˜ê³ ì—…ê·¸ë ˆì´ë“œí• ë•Œ " +"K ë°ìŠ¤í¬íƒ‘ 관리ìž(tdm) ë°ëª¬ì€ ì¼ë°˜ì 으로 꾸러미를 ì„¤ì¹˜í•˜ê³ ì—…ê·¸ë ˆì´ë“œí• ë•Œ " "중지ë˜ì§€ë§Œ 현재 하나 ì´ìƒì˜ X ì„¸ì…˜ì„ ê´€ë¦¬í•˜ëŠ” ì¤‘ì¸ ê²ƒ 같습니다." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"kdmì„ ì§€ê¸ˆ 중지시키면 kdmì´ ê´€ë¦¬í•˜ê³ ìžˆëŠ” X ì„¸ì…˜ì€ ëª¨ë‘ ì¤‘ë‹¨ë©ë‹ˆë‹¤. 지금 중지" +"tdmì„ ì§€ê¸ˆ 중지시키면 tdmì´ ê´€ë¦¬í•˜ê³ ìžˆëŠ” X ì„¸ì…˜ì€ ëª¨ë‘ ì¤‘ë‹¨ë©ë‹ˆë‹¤. 지금 중지" "시키지 않으면 새로 설치한 ë²„ì „ì€ ë°ëª¬ì„ 다시 ì‹œìž‘í• ë•Œë¶€í„° 사용ë©ë‹ˆë‹¤." diff --git a/ubuntu/maverick/tdebase/debian/po/ml.po b/ubuntu/maverick/tdebase/debian/po/ml.po index b4b07f9b2..9e28db764 100644 --- a/ubuntu/maverick/tdebase/debian/po/ml.po +++ b/ubuntu/maverick/tdebase/debian/po/ml.po @@ -1,11 +1,11 @@ -# Malayalam translation of kdm debconf template. +# Malayalam translation of tdm debconf template. # Copyright (C) 2007 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the kdm package. +# This file is distributed under the same license as the tdm package. # Praveen|à´ªàµà´°à´µàµ€à´£àµâ€ A|à´Ž <pravi.a@gmail.com>, Anivar|അനിവരàµâ€ Aravind|അരവിനàµà´¦àµ <anivar@movingrepublic.org> 2007. # msgid "" msgstr "" -"Project-Id-Version: kdm 1.0\n" +"Project-Id-Version: tdm 1.0\n" "Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n" "POT-Creation-Date: 2007-03-23 07:15+0100\n" "PO-Revision-Date: 2007-03-23 09:46+0530\n" @@ -18,13 +18,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "ഡിഫാളàµâ€à´Ÿàµà´Ÿà´¾à´¯à´¿ വേണàµà´Ÿ à´ªàµà´°à´¦à´°àµâ€à´¶à´¨ മാനേജരàµâ€:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -33,7 +33,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -45,7 +45,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -59,29 +59,29 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "kdm ഡീമണെ നിരàµâ€à´¤àµà´¤à´¿à´•àµà´•àµ‡à´¾à´Ÿàµà´Ÿàµ†?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "tdm ഡീമണെ നിരàµâ€à´¤àµà´¤à´¿à´•àµà´•àµ‡à´¾à´Ÿàµà´Ÿàµ†?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"കെ à´ªàµà´°à´¦à´°àµâ€à´¶à´¨ മാനേജരàµâ€ (kdm) ഡീമണàµâ€ സാധാരണയായി പാകàµà´•àµ‡à´œàµ à´ªàµà´¤àµà´•àµà´•à´²à´¿à´¨àµà´±àµ‡à´¯àµà´‚ നീകàµà´•à´‚ " +"കെ à´ªàµà´°à´¦à´°àµâ€à´¶à´¨ മാനേജരàµâ€ (tdm) ഡീമണàµâ€ സാധാരണയായി പാകàµà´•àµ‡à´œàµ à´ªàµà´¤àµà´•àµà´•à´²à´¿à´¨àµà´±àµ‡à´¯àµà´‚ നീകàµà´•à´‚ " "ചെയàµà´¯à´²à´¿à´¨àµà´±àµ‡à´¯àµà´‚ സമയതàµà´¤à´¾à´£àµ നിരàµâ€à´¤àµà´¤à´¾à´±àµà´³àµà´³à´¤àµ, പകàµà´·àµ‡ à´ªàµà´°à´µà´°àµâ€à´¤àµà´¤à´¿à´šàµà´šàµà´•àµŠà´£àµà´Ÿà´¿à´°à´¿à´•àµà´•àµà´¨àµà´¨ ഒരൠഎകàµà´¸àµ " "സെഷനെയെങàµà´•à´¿à´²àµà´‚ ഇപàµà´ªàµ‹à´³àµâ€ ഇതൠനിയനàµà´¤àµà´°à´¿à´šàµà´šàµà´•àµŠà´£àµà´Ÿà´¿à´°à´¿à´•àµà´•àµà´¨àµà´¨à´¤àµ പോലെ തോനàµà´¨àµà´¨àµà´¨àµ." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"kdm ഇപàµà´ªàµ‹à´³àµâ€ നിരàµâ€à´¤àµà´¤àµà´•à´¯à´¾à´£àµ†à´™àµà´•à´¿à´²àµâ€, ഇതൠനിയനàµà´¤àµà´°à´¿à´šàµà´šàµà´•àµŠà´£àµà´Ÿà´¿à´°à´¿à´•àµà´•àµà´¨àµà´¨ à´Žà´•àµà´¸àµ സെഷനàµà´•à´³àµà´‚ " +"tdm ഇപàµà´ªàµ‹à´³àµâ€ നിരàµâ€à´¤àµà´¤àµà´•à´¯à´¾à´£àµ†à´™àµà´•à´¿à´²àµâ€, ഇതൠനിയനàµà´¤àµà´°à´¿à´šàµà´šàµà´•àµŠà´£àµà´Ÿà´¿à´°à´¿à´•àµà´•àµà´¨àµà´¨ à´Žà´•àµà´¸àµ സെഷനàµà´•à´³àµà´‚ " "അവസാനിപàµà´ªà´¿à´•àµà´•àµà´¨àµà´¨à´¤à´¾à´¯à´¿à´°à´¿à´•àµà´•àµà´‚. à´…à´²àµà´²àµ†à´™àµà´•à´¿à´²àµâ€, à´…à´Ÿàµà´¤àµà´¤ തവണ ഡീമണàµâ€ വീണàµà´Ÿàµà´‚ à´¤àµà´Ÿà´™àµà´™àµà´®àµà´ªàµ‹à´³àµâ€ à´ªàµà´¤à´¿à´¯ ലകàµà´•à´‚ " "നിലവിലàµâ€ വരàµà´‚." diff --git a/ubuntu/maverick/tdebase/debian/po/nb.po b/ubuntu/maverick/tdebase/debian/po/nb.po index c0b33f89c..b61dde1bb 100644 --- a/ubuntu/maverick/tdebase/debian/po/nb.po +++ b/ubuntu/maverick/tdebase/debian/po/nb.po @@ -18,13 +18,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Standard skjermstyrer:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -34,7 +34,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -45,7 +45,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -59,26 +59,26 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Stoppe kdm-nissen?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Stoppe tdm-nissen?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Nissen K Desktop Manager (kdm) stoppes normalt nÃ¥r dens pakke fjernes eller " +"Nissen K Desktop Manager (tdm) stoppes normalt nÃ¥r dens pakke fjernes eller " "oppgraderes, men det ser ut til at den styrer minst en pÃ¥gÃ¥ende X-økt." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." -msgstr "Hvis kdm stoppes nÃ¥ blir alle X-økter den styrer avbrutt. Ellers vil den nye versjonen blir tatt i bruk neste gang nissen startes." +msgstr "Hvis tdm stoppes nÃ¥ blir alle X-økter den styrer avbrutt. Ellers vil den nye versjonen blir tatt i bruk neste gang nissen startes." diff --git a/ubuntu/maverick/tdebase/debian/po/nl.po b/ubuntu/maverick/tdebase/debian/po/nl.po index 9d693cc23..cd8cbc401 100644 --- a/ubuntu/maverick/tdebase/debian/po/nl.po +++ b/ubuntu/maverick/tdebase/debian/po/nl.po @@ -25,7 +25,7 @@ # msgid "" msgstr "" -"Project-Id-Version: kdm\n" +"Project-Id-Version: tdm\n" "Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n" "POT-Creation-Date: 2007-03-23 07:15+0100\n" "PO-Revision-Date: 2007-04-05 17:35+0100\n" @@ -38,52 +38,52 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Standaard beeldschermbeheerder:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "A display manager is a program that provides graphical login capabilities for the X Window System." msgstr "Een beeldschermbeheerder is een programma waarmee u zich grafisch op het systeem kunt aanmelden, waarna u in de grafische omgeving (het X Window System) terecht komt." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Only one display manager can manage a given X server, but multiple display manager packages are installed. Please select which display manager should run by default." msgstr "Elke X-server kan door slechts één beeldschermbeheerder beheerd worden, hoewel er meerdere beeldschermbeheerders geïnstalleerd kunnen zijn. Welke beeldschermbeheerder dient standaard gebruikt te worden?" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Multiple display managers can run simultaneously if they are configured to manage different servers; to achieve this, configure the display managers accordingly, edit each of their init scripts in /etc/init.d, and disable the check for a default display manager." msgstr "Het is mogelijk om meerdere beeldschermbeheerders tegelijk te draaien zolang deze verschillende servers beheren. Om dat te bereiken dient u de beeldschermbeheerders overeenkomstig in te stellen door in hun init-scripts (in /etc/init.d) de controle of ze de standaard beeldschermbeheerder zijn uit te schakelen." #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Wilt u de kdm-achtergronddienst stoppen?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Wilt u de tdm-achtergronddienst stoppen?" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "The K Desktop manager (kdm) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session." -msgstr "Normaal wordt de kdm-achtergronddienst gestopt bij opwaardering en verwijdering van het pakket kdm; momenteel blijkt deze echter minstens 1 X-sessie te beheren." +#: ../tdm.templates:3001 +msgid "The K Desktop manager (tdm) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session." +msgstr "Normaal wordt de tdm-achtergronddienst gestopt bij opwaardering en verwijdering van het pakket tdm; momenteel blijkt deze echter minstens 1 X-sessie te beheren." #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "If kdm is stopped now, any X sessions it manages will be terminated. Otherwise, the new version will take effect the next time the daemon is restarted." -msgstr "Als kdm nu gestopt wordt, worden alle door kdm beheerde X-sessies afgesloten. Als u kdm nu laat draaien wordt de nieuwe versie pas actief de eerstvolgende keer dat de achtergronddienst herstart wordt. " +#: ../tdm.templates:3001 +msgid "If tdm is stopped now, any X sessions it manages will be terminated. Otherwise, the new version will take effect the next time the daemon is restarted." +msgstr "Als tdm nu gestopt wordt, worden alle door tdm beheerde X-sessies afgesloten. Als u tdm nu laat draaien wordt de nieuwe versie pas actief de eerstvolgende keer dat de achtergronddienst herstart wordt. " #~ msgid "" -#~ "The X display manager (kdm) daemon is typically stopped on package " +#~ "The X display manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " #~ "session." #~ msgstr "" -#~ "Normaal wordt de beeldschermbeheerder (kdm) gestopt bij opwaardering en " +#~ "Normaal wordt de beeldschermbeheerder (tdm) gestopt bij opwaardering en " #~ "verwijdering van dit pakket; momenteel is er echter minstens één lopende " #~ "X-sessie actief." #~ msgid "Select the desired default display manager." @@ -107,19 +107,19 @@ msgstr "Als kdm nu gestopt wordt, worden alle door kdm beheerde X-sessies afgesl #~ "bereiken, configureert u de weergavebeheerders op de gepaste wijze, " #~ "bewerkt u hun startscripts in /etc/init.d en schakelt u de controle voor " #~ "een standaard weergavebeheerder uit.)" -#~ msgid "Do you wish to stop the kdm daemon?" -#~ msgstr "Wilt u de kdm-achtergronddienst stoppen?" +#~ msgid "Do you wish to stop the tdm daemon?" +#~ msgstr "Wilt u de tdm-achtergronddienst stoppen?" #~ msgid "" -#~ "The K Desktop manager (kdm) daemon is typically stopped on package " +#~ "The K Desktop manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " -#~ "session. If kdm is stopped now, any X sessions it manages will be " -#~ "terminated. Otherwise you may leave kdm running, and the new version will " +#~ "session. If tdm is stopped now, any X sessions it manages will be " +#~ "terminated. Otherwise you may leave tdm running, and the new version will " #~ "take effect the next time the daemon is restarted." #~ msgstr "" -#~ "De K Desktop manager (kdm) achtergronddienst wordt typisch gestopt bij " +#~ "De K Desktop manager (tdm) achtergronddienst wordt typisch gestopt bij " #~ "pakketopwaarderingen en -verwijderingen, maar het blijkt minstens één " -#~ "actieve X-sessie te beheren. Als kdm nu wordt gestopt, dan zullen alle X-" -#~ "sessies die het beheert worden beëindigd. Anders kunt u kdm laten draaien " +#~ "actieve X-sessie te beheren. Als tdm nu wordt gestopt, dan zullen alle X-" +#~ "sessies die het beheert worden beëindigd. Anders kunt u tdm laten draaien " #~ "en zal de nieuwe versie gebruikt worden wanneer de achtergronddienst de " #~ "volgende keer wordt gestart." diff --git a/ubuntu/maverick/tdebase/debian/po/pl.po b/ubuntu/maverick/tdebase/debian/po/pl.po index e2f253da7..991400113 100644 --- a/ubuntu/maverick/tdebase/debian/po/pl.po +++ b/ubuntu/maverick/tdebase/debian/po/pl.po @@ -26,14 +26,14 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "Default display manager:" msgstr "Wybierz domy¶lny display manager." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -43,7 +43,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "" "Only one display manager can manage a given X server, but multiple display " @@ -56,7 +56,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "" "Multiple display managers can run simultaneously if they are configured to " @@ -71,21 +71,21 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy -msgid "Stop the kdm daemon?" -msgstr "Czy chcesz zatrzymaæ daemona kdm?" +msgid "Stop the tdm daemon?" +msgstr "Czy chcesz zatrzymaæ daemona tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" "Daemon K Desktop manager jest zazwyczaj zatrzymywany w czasie aktualizacji i " -"usuwania pakietu kdm, ale wygl±da na to, ¿e w tej chwili zarz±dza on " +"usuwania pakietu tdm, ale wygl±da na to, ¿e w tej chwili zarz±dza on " "conajmniej jedn± sesj± X Window. Je¶li zostanie on teraz zatrzymany, " "wszystkie zarz±dzane przez niego sesje zostan± przerwane. Mo¿na jednak nie " "zatrzymywaæ teraz tego daemona -- nowa wersja zacznie dzia³aæ przy jego " @@ -93,15 +93,15 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" "Daemon K Desktop manager jest zazwyczaj zatrzymywany w czasie aktualizacji i " -"usuwania pakietu kdm, ale wygl±da na to, ¿e w tej chwili zarz±dza on " +"usuwania pakietu tdm, ale wygl±da na to, ¿e w tej chwili zarz±dza on " "conajmniej jedn± sesj± X Window. Je¶li zostanie on teraz zatrzymany, " "wszystkie zarz±dzane przez niego sesje zostan± przerwane. Mo¿na jednak nie " "zatrzymywaæ teraz tego daemona -- nowa wersja zacznie dzia³aæ przy jego " diff --git a/ubuntu/maverick/tdebase/debian/po/pt.po b/ubuntu/maverick/tdebase/debian/po/pt.po index 9720aa0f0..7526913c8 100644 --- a/ubuntu/maverick/tdebase/debian/po/pt.po +++ b/ubuntu/maverick/tdebase/debian/po/pt.po @@ -20,13 +20,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Gestor de ecrã por omissão:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -36,7 +36,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -48,7 +48,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -63,39 +63,39 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Deseja parar o daemon kdm?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Deseja parar o daemon tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"O daemon do gestor de ecrã X (kdm) é tipicamente parado na actualização ou " +"O daemon do gestor de ecrã X (tdm) é tipicamente parado na actualização ou " "remoção de pacotes, mas parece que este está a gerir pelo menos uma sessão X " "activa." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Se o kdm for parado agora, todas as sessões X que este estiver a gerir serão " +"Se o tdm for parado agora, todas as sessões X que este estiver a gerir serão " "terminadas. Caso contrário, a nova versão terá efeito da próxima vez que o " "daemon for reiniciado." #~ msgid "" -#~ "The X display manager (kdm) daemon is typically stopped on package " +#~ "The X display manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " #~ "session." #~ msgstr "" -#~ "O daemon do gestor de ecrã X (kdm) é tipicamente parado na actualização " +#~ "O daemon do gestor de ecrã X (tdm) é tipicamente parado na actualização " #~ "ou remoção de pacotes, mas parece que este está a gerir pelo menos uma " #~ "sessão X activa." @@ -122,18 +122,18 @@ msgstr "" #~ "e edite um dos seus 'init scripts' em /etc/init.d, e desligue a " #~ "verificação do gestor de ecrã por omissão.)" -#~ msgid "Do you wish to stop the kdm daemon?" -#~ msgstr "Deseja desligar o daemon kdm?" +#~ msgid "Do you wish to stop the tdm daemon?" +#~ msgstr "Deseja desligar o daemon tdm?" #~ msgid "" -#~ "The K Desktop manager (kdm) daemon is typically stopped on package " +#~ "The K Desktop manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " -#~ "session. If kdm is stopped now, any X sessions it manages will be " -#~ "terminated. Otherwise you may leave kdm running, and the new version will " +#~ "session. If tdm is stopped now, any X sessions it manages will be " +#~ "terminated. Otherwise you may leave tdm running, and the new version will " #~ "take effect the next time the daemon is restarted." #~ msgstr "" -#~ "O daemon K Destop manager (kdm) é normalmente parado quando ocorre um " +#~ "O daemon K Destop manager (tdm) é normalmente parado quando ocorre um " #~ "upgrade ou remoção do pacote, no entanto parece que se encontra pelo " -#~ "menos uma sessão X em andamento. Se o kdm for parado agora, todas as " -#~ "sessões X serão terminadas. Por outro lado, pode deixar o kdm a correr e " +#~ "menos uma sessão X em andamento. Se o tdm for parado agora, todas as " +#~ "sessões X serão terminadas. Por outro lado, pode deixar o tdm a correr e " #~ "a nova versão irá ser usada na próxima vez que o daemon for reiniciado." diff --git a/ubuntu/maverick/tdebase/debian/po/pt_BR.po b/ubuntu/maverick/tdebase/debian/po/pt_BR.po index b8ce278ee..ddb8d98fa 100644 --- a/ubuntu/maverick/tdebase/debian/po/pt_BR.po +++ b/ubuntu/maverick/tdebase/debian/po/pt_BR.po @@ -22,13 +22,13 @@ msgstr "pt_BR utf-8\n" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Gerenciador de sessão padrão:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -38,7 +38,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -50,7 +50,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -65,28 +65,28 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Deseja parar o daemon kdm?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Deseja parar o daemon tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." -msgstr "O K Desktop manager (kdm) é tipicamente parado em atualizações e " +msgstr "O K Desktop manager (tdm) é tipicamente parado em atualizações e " "remoções de pacotes, mas parece que ele está gerenciando pelo menos uma " "seção X em execução." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Caso o kdm seja parado agora, quaisquer sessões X que ele esteja gerenciando " +"Caso o tdm seja parado agora, quaisquer sessões X que ele esteja gerenciando " "serão encerradas. Caso contrário a nova versão terá efeito na próxima vez " "que o daemon for reiniciado." diff --git a/ubuntu/maverick/tdebase/debian/po/ro.po b/ubuntu/maverick/tdebase/debian/po/ro.po index 2f619d326..c438c8661 100644 --- a/ubuntu/maverick/tdebase/debian/po/ro.po +++ b/ubuntu/maverick/tdebase/debian/po/ro.po @@ -20,14 +20,14 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "Default display manager:" msgstr "AlegeÅ£i administratorul de ecran implicit, pe care îl doriÅ£i." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -37,7 +37,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "" "Only one display manager can manage a given X server, but multiple display " @@ -50,7 +50,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "" "Multiple display managers can run simultaneously if they are configured to " @@ -66,36 +66,36 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy -msgid "Stop the kdm daemon?" -msgstr "DoriÅ£i să opriÅ£i demonul kdm?" +msgid "Stop the tdm daemon?" +msgstr "DoriÅ£i să opriÅ£i demonul tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Demonul K Desktop manager (kdm) este oprit de obicei la actualizarea " +"Demonul K Desktop manager (tdm) este oprit de obicei la actualizarea " "pachetuluiÅŸi la eliminarea sa, dar se pare că acum administrează o sesiune X " -"de lucru.Dacă demonul kdm este oprit acum, orice sesiune X pe care o " -"administrează va fi oprită. O alternativă ar fi să lăsaÅ£i kdm să ruleze, iar " +"de lucru.Dacă demonul tdm este oprit acum, orice sesiune X pe care o " +"administrează va fi oprită. O alternativă ar fi să lăsaÅ£i tdm să ruleze, iar " "noua versiune va ruladata viitoare când demonul va fi repornit." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Demonul K Desktop manager (kdm) este oprit de obicei la actualizarea " +"Demonul K Desktop manager (tdm) este oprit de obicei la actualizarea " "pachetuluiÅŸi la eliminarea sa, dar se pare că acum administrează o sesiune X " -"de lucru.Dacă demonul kdm este oprit acum, orice sesiune X pe care o " -"administrează va fi oprită. O alternativă ar fi să lăsaÅ£i kdm să ruleze, iar " +"de lucru.Dacă demonul tdm este oprit acum, orice sesiune X pe care o " +"administrează va fi oprită. O alternativă ar fi să lăsaÅ£i tdm să ruleze, iar " "noua versiune va ruladata viitoare când demonul va fi repornit." diff --git a/ubuntu/maverick/tdebase/debian/po/ru.po b/ubuntu/maverick/tdebase/debian/po/ru.po index af8d3fb9d..1bf9445de 100644 --- a/ubuntu/maverick/tdebase/debian/po/ru.po +++ b/ubuntu/maverick/tdebase/debian/po/ru.po @@ -42,13 +42,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Менеджер диÑплеев по умолчанию:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -58,7 +58,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -70,7 +70,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -84,30 +84,30 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "ОÑтановить Ñервер-демон kdm?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "ОÑтановить Ñервер-демон tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Сервер-демон менеджера K Desktop (kdm) обычно оÑтанавливают при обновлении " -"или удалении пакета, но, кажетÑÑ, что kdm ÑÐµÐ¹Ñ‡Ð°Ñ ÑƒÐ¿Ñ€Ð°Ð²Ð»Ñет по крайней мере " +"Сервер-демон менеджера K Desktop (tdm) обычно оÑтанавливают при обновлении " +"или удалении пакета, но, кажетÑÑ, что tdm ÑÐµÐ¹Ñ‡Ð°Ñ ÑƒÐ¿Ñ€Ð°Ð²Ð»Ñет по крайней мере " "одним X-ÑеанÑом." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"ЕÑли ÑÐµÐ¹Ñ‡Ð°Ñ Ð¾Ñтановить kdm, то вÑе управлÑемые им X-ÑеанÑÑ‹ будут прерваны. " -"Или вы можете не оÑтанавливать kdm, и тогда Ð½Ð¾Ð²Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ð±ÑƒÐ´ÐµÑ‚ загружена " -"тогда, когда kdm Ñнова перезапуÑÑ‚ÑÑ‚." +"ЕÑли ÑÐµÐ¹Ñ‡Ð°Ñ Ð¾Ñтановить tdm, то вÑе управлÑемые им X-ÑеанÑÑ‹ будут прерваны. " +"Или вы можете не оÑтанавливать tdm, и тогда Ð½Ð¾Ð²Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ð±ÑƒÐ´ÐµÑ‚ загружена " +"тогда, когда tdm Ñнова перезапуÑÑ‚ÑÑ‚." diff --git a/ubuntu/maverick/tdebase/debian/po/sk.po b/ubuntu/maverick/tdebase/debian/po/sk.po index e7b350961..4c6241e4a 100644 --- a/ubuntu/maverick/tdebase/debian/po/sk.po +++ b/ubuntu/maverick/tdebase/debian/po/sk.po @@ -21,13 +21,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Zvoľte predvoleného správcu obrazovky:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -37,7 +37,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -48,7 +48,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -62,30 +62,30 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "ZastaviÅ¥ správcu obrazovky kdm?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "ZastaviÅ¥ správcu obrazovky tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Správca obrazovky K desktop manager (kdm) sa zvykne zastaviÅ¥ pri " +"Správca obrazovky K desktop manager (tdm) sa zvykne zastaviÅ¥ pri " "aktualizácii alebo odstraňovanà balÃka, lenže teraz to vyzerá tak, že má na " "starosti aspoň jedno ÄalÅ¡ie spustené X sedenie." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Ak by sa teraz kdm zastavil, vÅ¡etky nÃm ovládané X sedenia by sa ukonÄili. V " -"opaÄnom prÃpade môžete nechaÅ¥ kdm spustený, priÄom nová verzia sa spustà pri " -"ÄalÅ¡om reÅ¡tarte kdm." +"Ak by sa teraz tdm zastavil, vÅ¡etky nÃm ovládané X sedenia by sa ukonÄili. V " +"opaÄnom prÃpade môžete nechaÅ¥ tdm spustený, priÄom nová verzia sa spustà pri " +"ÄalÅ¡om reÅ¡tarte tdm." diff --git a/ubuntu/maverick/tdebase/debian/po/sv.po b/ubuntu/maverick/tdebase/debian/po/sv.po index 07d0cc914..e83a6926a 100644 --- a/ubuntu/maverick/tdebase/debian/po/sv.po +++ b/ubuntu/maverick/tdebase/debian/po/sv.po @@ -41,52 +41,52 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Standarddisplayhanterare:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "A display manager is a program that provides graphical login capabilities for the X Window System." msgstr "En displayhanterare är ett program som tillhandahÃ¥ller grafiska inloggningsmöjligheter för X Window System." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Only one display manager can manage a given X server, but multiple display manager packages are installed. Please select which display manager should run by default." msgstr "Endast en displayhanterare kan hantera en angiven X-server men flera displayhanterarpaket är installerade. Välj vilken displayhanterare som skall köras som standard." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Multiple display managers can run simultaneously if they are configured to manage different servers; to achieve this, configure the display managers accordingly, edit each of their init scripts in /etc/init.d, and disable the check for a default display manager." msgstr "Flera displayhanterare kan köras samtidigt om de är konfigurerade att hantera olika servrar. För att uppnÃ¥ detta ska du konfigurera displayhanterarnas pÃ¥ lämpligt sätt, redigera dess init-skript under /etc/init.d och inaktivera kontrollen efter en standarddisplayhanterare." #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Stoppa kdm-demonen?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Stoppa tdm-demonen?" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "The K Desktop manager (kdm) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session." -msgstr "K Desktop manager-demonen (kdm) stoppas vanligtvis vid paketuppgradering och borttagning men det verkar som om den hanterar Ã¥tminstone en körande X-session." +#: ../tdm.templates:3001 +msgid "The K Desktop manager (tdm) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session." +msgstr "K Desktop manager-demonen (tdm) stoppas vanligtvis vid paketuppgradering och borttagning men det verkar som om den hanterar Ã¥tminstone en körande X-session." #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "If kdm is stopped now, any X sessions it manages will be terminated. Otherwise, the new version will take effect the next time the daemon is restarted." -msgstr "Om kdm stoppas nu kommer de X-sessioner som den hanterar att avslutas. Om inte kommer den nya versionen att bli aktiverad nästa gÃ¥ng som demonen startas om." +#: ../tdm.templates:3001 +msgid "If tdm is stopped now, any X sessions it manages will be terminated. Otherwise, the new version will take effect the next time the daemon is restarted." +msgstr "Om tdm stoppas nu kommer de X-sessioner som den hanterar att avslutas. Om inte kommer den nya versionen att bli aktiverad nästa gÃ¥ng som demonen startas om." #~ msgid "" -#~ "The X display manager (kdm) daemon is typically stopped on package " +#~ "The X display manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " #~ "session." #~ msgstr "" -#~ "X-displayhanterardemonen (kdm) stoppas vanligtvis vid paketuppgradering " +#~ "X-displayhanterardemonen (tdm) stoppas vanligtvis vid paketuppgradering " #~ "och borttagning men det verkar som om den hanterar Ã¥tminstone en körande " #~ "X-session." #~ msgid "Select the desired default display manager." @@ -109,18 +109,18 @@ msgstr "Om kdm stoppas nu kommer de X-sessioner som den hanterar att avslutas. O #~ "hantera olika servrar, för att göra detta, konfigurera fönsterhanterarna " #~ "genom att ändra respektives init-skript i /etc/init.d och stäng av " #~ "kontrollen för standard fönsterhanterare.)" -#~ msgid "Do you wish to stop the kdm daemon?" -#~ msgstr "Vill du stoppa kdm-daemonen?" +#~ msgid "Do you wish to stop the tdm daemon?" +#~ msgstr "Vill du stoppa tdm-daemonen?" #~ msgid "" -#~ "The K Desktop manager (kdm) daemon is typically stopped on package " +#~ "The K Desktop manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " -#~ "session. If kdm is stopped now, any X sessions it manages will be " -#~ "terminated. Otherwise you may leave kdm running, and the new version will " +#~ "session. If tdm is stopped now, any X sessions it manages will be " +#~ "terminated. Otherwise you may leave tdm running, and the new version will " #~ "take effect the next time the daemon is restarted." #~ msgstr "" -#~ "Daemonen (kdm) för skrivbordsmiljön KDE stoppas normalt vid uppgradering " +#~ "Daemonen (tdm) för skrivbordsmiljön KDE stoppas normalt vid uppgradering " #~ "och avinstallation av paketet men det verkar som om den hanterar " -#~ "Ã¥tminstone en körande X-session. Om kdm stoppas nu kommer de X-sessioner " -#~ "den hanterar att avslutas. Annars kan du lämna kdm körande och den nya " +#~ "Ã¥tminstone en körande X-session. Om tdm stoppas nu kommer de X-sessioner " +#~ "den hanterar att avslutas. Annars kan du lämna tdm körande och den nya " #~ "versioner blir aktiverad nästa gÃ¥ng daemonen startas om." diff --git a/ubuntu/maverick/tdebase/debian/po/ta.po b/ubuntu/maverick/tdebase/debian/po/ta.po index 993ae3933..eb68492d6 100644 --- a/ubuntu/maverick/tdebase/debian/po/ta.po +++ b/ubuntu/maverick/tdebase/debian/po/ta.po @@ -18,13 +18,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "à®®à¯à®©à¯à®©à®¿à®°à¯à®ªà¯à®ªà¯ காடà¯à®šà®¿ மேலாளரà¯:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -34,7 +34,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -45,7 +45,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -59,15 +59,15 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "கேடிஎம௠கிஙà¯à®•à®°à®©à¯ˆ (kdm daemon) நிறà¯à®¤à¯à®¤à®µà®¾?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "கேடிஎம௠கிஙà¯à®•à®°à®©à¯ˆ (tdm daemon) நிறà¯à®¤à¯à®¤à®µà®¾?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" "கே மேலà¯à®®à¯‡à®šà¯ˆ மேலாளர௠(கேடிஎமà¯) கிஙà¯à®•à®°à®©à¯ வழகà¯à®•à®®à®¾à®• பொதி மேலாகà¯à®•à®®à¯ அலà¯à®²à®¤à¯ நீகà¯à®•à®®à¯ நிகழà¯à®®à¯ போத௠நிறà¯à®¤à¯à®¤à®ªà¯ படà¯à®®à¯. " @@ -75,9 +75,9 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" diff --git a/ubuntu/maverick/tdebase/debian/po/templates.pot b/ubuntu/maverick/tdebase/debian/po/templates.pot index f8b19923e..42689d3b2 100644 --- a/ubuntu/maverick/tdebase/debian/po/templates.pot +++ b/ubuntu/maverick/tdebase/debian/po/templates.pot @@ -18,13 +18,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -32,7 +32,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -41,7 +41,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -51,23 +51,23 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" diff --git a/ubuntu/maverick/tdebase/debian/po/tr.po b/ubuntu/maverick/tdebase/debian/po/tr.po index c59be129c..189791bc4 100644 --- a/ubuntu/maverick/tdebase/debian/po/tr.po +++ b/ubuntu/maverick/tdebase/debian/po/tr.po @@ -16,14 +16,14 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "Default display manager:" msgstr "Kullanmak istediÄŸiniz öntanımlı ekran yöneticisini seçin." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -32,7 +32,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "" "Only one display manager can manage a given X server, but multiple display " @@ -45,7 +45,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "" "Multiple display managers can run simultaneously if they are configured to " @@ -60,38 +60,38 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy -msgid "Stop the kdm daemon?" -msgstr "kdm servisini durdurmak istiyor musunuz?" +msgid "Stop the tdm daemon?" +msgstr "tdm servisini durdurmak istiyor musunuz?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"K Masaüstü yöneticisi (kdm) servisi, paket güncelleme ve kaldırma sırasında " -"genellikle durdurulur. Fakat öyle görünüyor ki kdm, çalışan (en az) bir X " -"oturumunu yönetiyor. EÄŸer kdm ÅŸimdi durdurulursa, yönetilen X oturumları da " -"sonlandırılacaktır. Böyle yapmak yerine kdm'i çalışır vaziyette " -"bırakabilirsiniz. Yeni sürüm, kdm servisinin bir sonraki çalıştırılışında " +"K Masaüstü yöneticisi (tdm) servisi, paket güncelleme ve kaldırma sırasında " +"genellikle durdurulur. Fakat öyle görünüyor ki tdm, çalışan (en az) bir X " +"oturumunu yönetiyor. EÄŸer tdm ÅŸimdi durdurulursa, yönetilen X oturumları da " +"sonlandırılacaktır. Böyle yapmak yerine tdm'i çalışır vaziyette " +"bırakabilirsiniz. Yeni sürüm, tdm servisinin bir sonraki çalıştırılışında " "etkin olacaktır." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"K Masaüstü yöneticisi (kdm) servisi, paket güncelleme ve kaldırma sırasında " -"genellikle durdurulur. Fakat öyle görünüyor ki kdm, çalışan (en az) bir X " -"oturumunu yönetiyor. EÄŸer kdm ÅŸimdi durdurulursa, yönetilen X oturumları da " -"sonlandırılacaktır. Böyle yapmak yerine kdm'i çalışır vaziyette " -"bırakabilirsiniz. Yeni sürüm, kdm servisinin bir sonraki çalıştırılışında " +"K Masaüstü yöneticisi (tdm) servisi, paket güncelleme ve kaldırma sırasında " +"genellikle durdurulur. Fakat öyle görünüyor ki tdm, çalışan (en az) bir X " +"oturumunu yönetiyor. EÄŸer tdm ÅŸimdi durdurulursa, yönetilen X oturumları da " +"sonlandırılacaktır. Böyle yapmak yerine tdm'i çalışır vaziyette " +"bırakabilirsiniz. Yeni sürüm, tdm servisinin bir sonraki çalıştırılışında " "etkin olacaktır." diff --git a/ubuntu/maverick/tdebase/debian/po/vi.po b/ubuntu/maverick/tdebase/debian/po/vi.po index db44f6290..778d8ca82 100644 --- a/ubuntu/maverick/tdebase/debian/po/vi.po +++ b/ubuntu/maverick/tdebase/debian/po/vi.po @@ -18,13 +18,13 @@ msgstr "Project-Id-Version: tdebase_4-3.5.7-1\n" #.Type: select #.Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Bá»™ quản lý trình bà y mặc định:" #.Type: select #.Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -32,7 +32,7 @@ msgstr "Bá»™ quản lý trình bà y là chÆ°Æ¡ng trình cung cấp khả năng Ä #.Type: select #.Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -41,7 +41,7 @@ msgstr "Chỉ má»™t bá»™ quản lý trình bà y có quyá»n quản lý trình ph #.Type: select #.Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -51,23 +51,23 @@ msgstr "Nhiá»u bá»™ quản lý trình bà y vẫn có thể chạy đồng thá» #.Type: boolean #.Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Thôi trình ná»n kdm không?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Thôi trình ná»n tdm không?" #.Type: boolean #.Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." -msgstr "Trình ná»n quản lý mà n hình ná»n K (kdm) thÆ°á»ng bị thôi khi nâng cấp/gỡ bá» gói, nhÆ°ng hiện thá»i có vẻ là nó quản lý Ãt nhất má»™t phiên chạy X Ä‘ang hoạt Ä‘á»™ng." +msgstr "Trình ná»n quản lý mà n hình ná»n K (tdm) thÆ°á»ng bị thôi khi nâng cấp/gỡ bá» gói, nhÆ°ng hiện thá»i có vẻ là nó quản lý Ãt nhất má»™t phiên chạy X Ä‘ang hoạt Ä‘á»™ng." #.Type: boolean #.Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." -msgstr "Thôi chạy kdm ngay bây giá» thì phiên chạy X nà o được quản lý bởi nó sẽ bị chấm dứt. Không thì phiên bản má»›i sẽ có tác Ä‘á»™ng lần tá»›i khởi chạy lại trình ná»n." +msgstr "Thôi chạy tdm ngay bây giá» thì phiên chạy X nà o được quản lý bởi nó sẽ bị chấm dứt. Không thì phiên bản má»›i sẽ có tác Ä‘á»™ng lần tá»›i khởi chạy lại trình ná»n." diff --git a/ubuntu/maverick/tdebase/debian/po/zh_CN.po b/ubuntu/maverick/tdebase/debian/po/zh_CN.po index 86f2299b5..89c59509d 100644 --- a/ubuntu/maverick/tdebase/debian/po/zh_CN.po +++ b/ubuntu/maverick/tdebase/debian/po/zh_CN.po @@ -6,7 +6,7 @@ # Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2005 # Ming Hua <minghua@rice.edu>, 2005,2007 # -# This file is distributed under the same license as the kdm package. +# This file is distributed under the same license as the tdm package. # Please see debian/copyright. # # Translators, if you are not familiar with the PO format, gettext @@ -36,13 +36,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "默认显示管ç†å™¨ï¼š" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -50,7 +50,7 @@ msgstr "显示管ç†å™¨æ˜¯ä¸º X 窗å£ç³»ç»Ÿæ供图形界é¢ç™»å½•æ¨¡å¼çš„程 #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -61,7 +61,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -74,27 +74,27 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "åœæ¢ kdm 守护进程å—？" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "åœæ¢ tdm 守护进程å—？" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"K æ¡Œé¢ç®¡ç†å™¨ (kdm) 守护进程通常会在软件包å‡çº§å’Œå¸è½½æ—¶è¢«åœæ¢ï¼Œä½†çœ‹èµ·æ¥å®ƒç›®å‰åœ¨" +"K æ¡Œé¢ç®¡ç†å™¨ (tdm) 守护进程通常会在软件包å‡çº§å’Œå¸è½½æ—¶è¢«åœæ¢ï¼Œä½†çœ‹èµ·æ¥å®ƒç›®å‰åœ¨" "管ç†ä¸€ä¸ªæˆ–多个æ£åœ¨è¿è¡Œçš„ X 会è¯ã€‚" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"如果 kdm 现在就被åœæ¢ï¼Œå®ƒæ‰€ç®¡ç†çš„全部 X 会è¯éƒ½ä¼šè¢«ä¸æ¢ã€‚如果ä¸åœæ¢ kdm，新安" +"如果 tdm 现在就被åœæ¢ï¼Œå®ƒæ‰€ç®¡ç†çš„全部 X 会è¯éƒ½ä¼šè¢«ä¸æ¢ã€‚如果ä¸åœæ¢ tdm，新安" "装的版本将会在守护进程下次é‡æ–°å¯åŠ¨æ—¶ç”Ÿæ•ˆã€‚" diff --git a/ubuntu/maverick/tdebase/debian/rules b/ubuntu/maverick/tdebase/debian/rules index da70cfb66..282910347 100755 --- a/ubuntu/maverick/tdebase/debian/rules +++ b/ubuntu/maverick/tdebase/debian/rules @@ -19,9 +19,9 @@ 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" \ --DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DKDM_PAM_SERVICE="kdm-trinity" -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \ --DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="ON" -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="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON" +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" \ +-DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="ON" -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="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON" -DWITH_XTEST="ON" # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. @@ -29,14 +29,14 @@ DEB_BUILD_PARALLEL = true DEB_FIXPERMS_EXCLUDE := \ opt/trinity/bin/tdesud \ - opt/trinity/bin/kdmtsak + opt/trinity/bin/tdmtsak DEB_DH_STRIP_ARGS := --dbg-package=tdebase-trinity-dbg DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter tdesu knetattach kioslave kxkb kdebugdialog kdcop PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \ - ksysguard-trinity kwin-trinity libkonq4-trinity + ksysguard-trinity twin-trinity libkonq4-trinity DEB_DH_MAKESHLIBS_ARGS_kate-trinity := -V'kate-trinity (>= 4:3.5.8-1)' DEB_DH_MAKESHLIBS_ARGS_kcontrol-trinity := -V'kcontrol-trinity (>= 4:3.5.8-1)' @@ -45,7 +45,7 @@ DEB_DH_MAKESHLIBS_ARGS_kicker-trinity := -V'kicker-trinity (>= 4:3.5.8-1)' DEB_DH_MAKESHLIBS_ARGS_konqueror-trinity := -V'konqueror-trinity (>= 4:3.5.8-1)' DEB_DH_MAKESHLIBS_ARGS_ksplash-trinity := -V'ksplash-trinity (>= 4:3.5.8-1)' DEB_DH_MAKESHLIBS_ARGS_ksysguard-trinity := -V'ksysguard-trinity (>= 4:3.5.8-1)' -DEB_DH_MAKESHLIBS_ARGS_kwin-trinity := -V'kwin-trinity (>= 4:3.5.8-1)' +DEB_DH_MAKESHLIBS_ARGS_twin-trinity := -V'twin-trinity (>= 4:3.5.8-1)' DEB_DH_MAKESHLIBS_ARGS_libkonq4-trinity := -V'libkonq4-trinity (>= 4:3.5.8-1)' #shlibs_ver = 4:3.5.0-1 @@ -233,15 +233,15 @@ binary-install/tdebase-data-trinity:: rm -rf debian/tmp/etc/xdg/* rm -rf debian/tdebase-data-trinity/etc/xdg/* -install/kdm-trinity:: - sed -i 's/#UseTheme=true/UseTheme=true/g' debian/tmp/etc/trinity/kdm/kdmrc - sed -i 's/Theme=@@@ToBeReplacedByDesktopBase@@@/Theme=\/opt\/trinity\/share\/apps\/kdm\/themes\/kubuntu-trinity/g' debian/tmp/etc/trinity/kdm/kdmrc +install/tdm-trinity:: + sed -i 's/#UseTheme=true/UseTheme=true/g' debian/tmp/etc/trinity/tdm/tdmrc + sed -i 's/Theme=@@@ToBeReplacedByDesktopBase@@@/Theme=\/opt\/trinity\/share\/apps\/tdm\/themes\/kubuntu-trinity/g' debian/tmp/etc/trinity/tdm/tdmrc -binary-install/kdm-trinity:: - mkdir -p debian/kdm-trinity/etc/init - install -p -D -m644 debian/kdm-trinity.conf debian/kdm-trinity/etc/init/kdm-trinity.conf - install -p -D -m644 debian/kdm-trinity.pam debian/kdm-trinity/etc/pam.d/kdm-trinity - install -p -D -m644 debian/kdm-trinity-np.pam debian/kdm-trinity/etc/pam.d/kdm-trinity-np +binary-install/tdm-trinity:: + mkdir -p debian/tdm-trinity/etc/init + install -p -D -m644 debian/tdm-trinity.conf debian/tdm-trinity/etc/init/tdm-trinity.conf + install -p -D -m644 debian/tdm-trinity.pam debian/tdm-trinity/etc/pam.d/tdm-trinity + install -p -D -m644 debian/tdm-trinity-np.pam debian/tdm-trinity/etc/pam.d/tdm-trinity-np binary-install/kcontrol-trinity:: mkdir -p debian/kcontrol/etc/udev/rules.d @@ -270,6 +270,6 @@ binary-install/tdebase-trinity-bin:: chmod +s debian/tdebase-trinity-bin/opt/trinity/bin/kcheckpass binary-install/ksmserver-trinity:: - install -p -D -m644 debian/tmp/opt/trinity/share/apps/kdm/sessions/tde.desktop debian/ksmserver-trinity/usr/share/xsessions/trinity.desktop + install -p -D -m644 debian/tmp/opt/trinity/share/apps/tdm/sessions/tde.desktop debian/ksmserver-trinity/usr/share/xsessions/trinity.desktop install -p -D -m755 debian/plasma.autodetect debian/ksmserver-trinity/usr/bin/plasma.autodetect install -p -D -m755 debian/plasma-desktop.autodetect debian/ksmserver-trinity/usr/bin/plasma-desktop.autodetect diff --git a/ubuntu/maverick/tdebase/debian/source.lintian-overrides b/ubuntu/maverick/tdebase/debian/source.lintian-overrides index 3aa3a0f59..06e452243 100644 --- a/ubuntu/maverick/tdebase/debian/source.lintian-overrides +++ b/ubuntu/maverick/tdebase/debian/source.lintian-overrides @@ -1,2 +1,2 @@ -tdebase source: maintainer-script-lacks-debhelper-token debian/kdm-trinity.postinst -tdebase source: maintainer-script-lacks-debhelper-token debian/kdm-trinity.prerm +tdebase source: maintainer-script-lacks-debhelper-token debian/tdm-trinity.postinst +tdebase source: maintainer-script-lacks-debhelper-token debian/tdm-trinity.prerm diff --git a/ubuntu/maverick/tdebase/debian/source/format b/ubuntu/maverick/tdebase/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/tdebase/debian/source/options b/ubuntu/maverick/tdebase/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install index 843b55228..540e8059a 100644 --- a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install +++ b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install @@ -214,9 +214,9 @@ debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmstyle/index.docbook debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmtaskbar/common debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmtaskbar/index.cache.bz2 debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmtaskbar/index.docbook -debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kdm/common -debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kdm/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kdm/index.docbook +debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/tdm/common +debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/tdm/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/tdm/index.docbook debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/keyboard/common debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/keyboard/index.cache.bz2 debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/keyboard/index.docbook @@ -227,9 +227,9 @@ debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/khtml/common debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/khtml/index.cache.bz2 debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/khtml/index.docbook debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/khtml/nsplugin.docbook -debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kwindecoration/common -debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kwindecoration/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kwindecoration/index.docbook +debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/twindecoration/common +debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/twindecoration/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/twindecoration/index.docbook debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/language/common debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/language/index.cache.bz2 debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/language/index.docbook @@ -354,7 +354,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kcmmemory.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kcmpartitions.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kcmpci.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kcontrol.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kdmconfig.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 @@ -455,7 +455,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmsound.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmsystem.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmx.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcontrol.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kdmconfig.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/tdmconfig.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/key_bindings.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/keyboard_layout.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/keyboard.png @@ -560,7 +560,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kcmdevices.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kcmkicker.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kcmkwm.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kcmx.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kdmconfig.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 @@ -642,7 +642,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmsound.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmsystem.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmx.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcontrol.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kdmconfig.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/tdmconfig.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/key_bindings.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/keyboard_layout.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/keyboard.png @@ -786,7 +786,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcmscsi.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcmsystem.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcmx.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcontrol.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kdmconfig.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/tdmconfig.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/key_bindings.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/keyboard_layout.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/keyboard.png @@ -884,7 +884,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kcmpartitions.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kcmpci.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kcmx.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kcontrol.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kdmconfig.png +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 diff --git a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kdm b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kdm deleted file mode 100644 index 8012c2f85..000000000 --- a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kdm +++ /dev/null @@ -1,10 +0,0 @@ -Document: tdebase-doc-html-kdm -Title: KDM Handbook -Author: Oswald Buddenhagen -Abstract: This document describes KDM, the KDE Display Manager, an X session manager. -Section: System - -Format: HTML -Index: /opt/trinity/share/doc/kde/HTML/en/kdm/index.html -Files: /opt/trinity/share/doc/kde/HTML/en/kdm/*.html - diff --git a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.tdm b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.tdm new file mode 100644 index 000000000..4be02569c --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.tdm @@ -0,0 +1,10 @@ +Document: tdebase-doc-html-tdm +Title: TDM Handbook +Author: Oswald Buddenhagen +Abstract: This document describes TDM, the KDE Display Manager, an X session manager. +Section: System + +Format: HTML +Index: /opt/trinity/share/doc/kde/HTML/en/tdm/index.html +Files: /opt/trinity/share/doc/kde/HTML/en/tdm/*.html + diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install index fd0d3ac41..8549b03b9 100644 --- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install +++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install @@ -1,5 +1,5 @@ debian/tmp/opt/trinity/bin/krootbacking -debian/tmp/opt/trinity/bin/kdmtsak +debian/tmp/opt/trinity/bin/tdmtsak debian/tmp/opt/trinity/bin/tsak debian/tmp/opt/trinity/bin/kdebugdialog debian/tmp/opt/trinity/bin/kreadconfig diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-dev.install b/ubuntu/maverick/tdebase/debian/tdebase-trinity-dev.install index 4328f203e..80fe5d689 100644 --- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-dev.install +++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-dev.install @@ -32,11 +32,11 @@ debian/tmp/opt/trinity/include//ksgrd/StyleSettings.h debian/tmp/opt/trinity/include//ksgrd/TimerSettings.h debian/tmp/opt/trinity/include//ksplash/objkstheme.h debian/tmp/opt/trinity/include//ksplash/themeengine.h -debian/tmp/opt/trinity/include//kwin/client.h +debian/tmp/opt/trinity/include//twin/client.h debian/tmp/opt/trinity/include//KWinInterface.h -debian/tmp/opt/trinity/include//kwin/kwinbutton.h -debian/tmp/opt/trinity/include//kwin/options.h -debian/tmp/opt/trinity/include//kwin/workspace.h +debian/tmp/opt/trinity/include//twin/twinbutton.h +debian/tmp/opt/trinity/include//twin/options.h +debian/tmp/opt/trinity/include//twin/workspace.h debian/tmp/opt/trinity/lib/libkasbar.la debian/tmp/opt/trinity/lib/libkasbar.so debian/tmp/opt/trinity/lib/libkateinterfaces.la @@ -65,8 +65,8 @@ debian/tmp/opt/trinity/lib/libtdeinit_konqueror.la debian/tmp/opt/trinity/lib/libtdeinit_konsole.la debian/tmp/opt/trinity/lib/libtdeinit_kprinter.la debian/tmp/opt/trinity/lib/libtdeinit_ksmserver.la -debian/tmp/opt/trinity/lib/libtdeinit_kwin.la -debian/tmp/opt/trinity/lib/libtdeinit_kwin_rules_dialog.la +debian/tmp/opt/trinity/lib/libtdeinit_twin.la +debian/tmp/opt/trinity/lib/libtdeinit_twin_rules_dialog.la debian/tmp/opt/trinity/lib/libtdeinit_kwrite.la debian/tmp/opt/trinity/lib/libtdeinit_kxkb.la debian/tmp/opt/trinity/lib/libkfontinst.la diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity.README.Debian b/ubuntu/maverick/tdebase/debian/tdebase-trinity.README.Debian index a275a318f..f3189b2c5 100644 --- a/ubuntu/maverick/tdebase/debian/tdebase-trinity.README.Debian +++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity.README.Debian @@ -1,7 +1,7 @@ Kdm === -For notes on kdm, read: /opt/trinity/share/doc/kdm/README.Debian +For notes on tdm, read: /opt/trinity/share/doc/tdm/README.Debian KDE and media kioslave support diff --git a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3-np.pam b/ubuntu/maverick/tdebase/debian/tdm-trinity-np.pam index a13232b98..4cada235b 100644 --- a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3-np.pam +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity-np.pam @@ -1,5 +1,5 @@ # -# /etc/pam.d/kdm-np - specify the PAM behaviour of kdm for passwordless logins +# /etc/pam.d/tdm-np - specify the PAM behaviour of tdm for passwordless logins # auth required pam_nologin.so auth required pam_env.so readenv=1 diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.README.Debian b/ubuntu/maverick/tdebase/debian/tdm-trinity.README.Debian index ce2e68020..60a81e267 100644 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.README.Debian +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.README.Debian @@ -1,23 +1,23 @@ -KDM in Debian +TDM in Debian ============= -This package comes with a copy of the KDM handbook in docbook format. -To read it, run "khelpcenter help:/kdm" from a command-line or go to the -URL "help:/kdm" in konqueror. +This package comes with a copy of the TDM handbook in docbook format. +To read it, run "khelpcenter help:/tdm" from a command-line or go to the +URL "help:/tdm" in konqueror. -By default, the use of special graphical themes with KDM is disabled. -If you wish to use the 'Circles' theme that comes with the kdm package, or +By default, the use of special graphical themes with TDM is disabled. +If you wish to use the 'Circles' theme that comes with the tdm package, or any other theme that you have installed, you should research the -'UseTheme' and 'Theme' fields in /etc/trinity/kdm/kdmrc. This can be done +'UseTheme' and 'Theme' fields in /etc/trinity/tdm/tdmrc. This can be done by browsing this URL in Konqueror: -help:/kdm/kdm-files.html#kdmrc-greeter +help:/tdm/tdm-files.html#tdmrc-greeter -KDM Customization +TDM Customization ================= We provide a way to override theme-related values normally set in the -master configuration file (kdmrc): +master configuration file (tdmrc): * USEBACKGROUND * BACKGROUNDCFG * USETHEME @@ -31,7 +31,7 @@ and background configuration file (backgroundrc): * WALLPAPER You just need to create a file with overridden value(s) and put it in -kdm override directory (default is /etc/default/kdm.d). +tdm override directory (default is /etc/default/tdm.d). ================================================ Below this is direct from the xdm package README diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.conf b/ubuntu/maverick/tdebase/debian/tdm-trinity.conf index 554e5a38e..7ea5ac479 100755 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.conf +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.conf @@ -1,4 +1,4 @@ -# kdm-trinity - K Display Manager +# tdm-trinity - K Display Manager # # The display manager service manages the X servers running on the # system, providing login and auto-login services @@ -18,7 +18,7 @@ emits starting-dm respawn script - [ ! -f /etc/X11/default-display-manager -o "$(cat /etc/X11/default-display-manager 2>/dev/null)" = "/opt/trinity/bin/kdm" ] + [ ! -f /etc/X11/default-display-manager -o "$(cat /etc/X11/default-display-manager 2>/dev/null)" = "/opt/trinity/bin/tdm" ] # Check kernel command-line for inhibitors for ARG in $(cat /proc/cmdline) @@ -38,11 +38,11 @@ script export LANG LANGUAGE fi - KDEDIRS=/opt/trinity/ + TDEDIRS=/opt/trinity/ PATH=/opt/trinity/bin:/bin:/usr/bin:/sbin:/usr/sbin - initctl emit starting-dm DM=kdm-trinity + initctl emit starting-dm DM=tdm-trinity - exec /opt/trinity/bin/kdm + exec /opt/trinity/bin/tdm end script diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.config b/ubuntu/maverick/tdebase/debian/tdm-trinity.config index 3525d7740..1d73249f7 100644 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.config +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.config @@ -1,5 +1,5 @@ #!/bin/sh -# Debian kdm package configuration script +# Debian tdm package configuration script # stolen from the xdm scripts # Copyright 2000--2003 Branden Robinson. # Licensed under the GNU General Public License, version 2. See the file @@ -10,7 +10,7 @@ set -e # source debconf library . /usr/share/debconf/confmodule -THIS_PACKAGE=kdm-trinity +THIS_PACKAGE=tdm-trinity # set default display manager DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager @@ -38,9 +38,9 @@ if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then CURRENT_DEFAULT=$(grep -v '^[[:space:]]*#' \ "$DEFAULT_DISPLAY_MANAGER_FILE" | head -n 1) - # both the binaries for kdm and kdm-kde4 share the same basename - # so we need to check if it's kdm-kde4 or another display manager - if [ "$CURRENT_DEFAULT" = "/usr/lib/kde4/bin/kdm" ]; then + # both the binaries for tdm and tdm-kde4 share the same basename + # so we need to check if it's tdm-kde4 or another display manager + if [ "$CURRENT_DEFAULT" = "/usr/lib/kde4/bin/tdm" ]; then CURRENT_DEFAULT=${THIS_PACKAGE}-kde4 else CURRENT_DEFAULT=$(basename $CURRENT_DEFAULT) diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.dirs b/ubuntu/maverick/tdebase/debian/tdm-trinity.dirs new file mode 100644 index 000000000..2060b348d --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.dirs @@ -0,0 +1,2 @@ +etc/default/tdm-trinity.d +var/lib/tdm-trinity diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.install b/ubuntu/maverick/tdebase/debian/tdm-trinity.install new file mode 100644 index 000000000..289fa03af --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.install @@ -0,0 +1,51 @@ +debian/local/tdm.options etc/trinity/tdm/ +debian/tmp/etc/trinity/tdm/tdmrc +debian/tmp/etc/trinity/tdm/Xaccess +debian/tmp/etc/trinity/tdm/Xreset +debian/tmp/etc/trinity/tdm/Xsession +debian/tmp/etc/trinity/tdm/Xsetup +debian/tmp/etc/trinity/tdm/Xstartup +debian/tmp/etc/trinity/tdm/Xwilling +debian/tmp/opt/trinity/bin/gentdmconf +debian/tmp/opt/trinity/bin/tdm +debian/tmp/opt/trinity/bin/tdm_config +debian/tmp/opt/trinity/bin/tdmctl +debian/tmp/opt/trinity/bin/tdm_greet +debian/tmp/opt/trinity/bin/krootimage +debian/tmp/opt/trinity/share/apps/tdm/pics/kdelogo-crystal.png +debian/tmp/opt/trinity/share/apps/tdm/pics/kdelogo.png +debian/tmp/opt/trinity/share/apps/tdm/pics/shutdown.jpg +debian/tmp/opt/trinity/share/apps/tdm/pics/users/default1.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/default2.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/default3.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/root1.png +debian/tmp/opt/trinity/share/apps/tdm/sessions/9wm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/aewm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/amaterus.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/asclassic.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/ctwm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/evilwm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/flwm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/lwm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/matchbox.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/mwm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/olvwm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/olwm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/oroborus.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/pwm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/twm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/ude.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/vtwm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/wm2.desktop +debian/tmp/opt/trinity/share/apps/tdm/themes/circles/background.svg +debian/tmp/opt/trinity/share/apps/tdm/themes/circles/circles.xml +debian/tmp/opt/trinity/share/apps/tdm/themes/circles/flower.png +debian/tmp/opt/trinity/share/apps/tdm/themes/circles/GdmGreeterTheme.desktop +debian/tmp/opt/trinity/share/apps/tdm/themes/circles/help.png +debian/tmp/opt/trinity/share/apps/tdm/themes/circles/options.png +debian/tmp/opt/trinity/share/apps/tdm/themes/circles/screenshot.png +debian/tmp/opt/trinity/share/apps/tdm/themes/o2_enterprise +debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdm/common +debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdm/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdm/index.docbook +debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdm/tdmrc-ref.docbook diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.links b/ubuntu/maverick/tdebase/debian/tdm-trinity.links new file mode 100644 index 000000000..d39f29e96 --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.links @@ -0,0 +1 @@ +opt/trinity/share/apps/tdm/pics/users/default1.png opt/trinity/share/apps/tdm/faces/.default.face diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.logrotate b/ubuntu/maverick/tdebase/debian/tdm-trinity.logrotate index 0c7bd75ef..990e7c479 100644 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.logrotate +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.logrotate @@ -1,4 +1,4 @@ -/var/log/kdm-trinity.log { +/var/log/tdm-trinity.log { rotate 7 daily compress diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.manpages b/ubuntu/maverick/tdebase/debian/tdm-trinity.manpages new file mode 100644 index 000000000..690a0f462 --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.manpages @@ -0,0 +1,6 @@ +debian/man/gentdmconf-trinity.1 +debian/man/tdm-trinity.1 +debian/man/tdm_config-trinity.1 +debian/man/tdmctl-trinity.1 +debian/man/tdm_greet-trinity.1 +debian/man/krootimage-trinity.1 diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.pam b/ubuntu/maverick/tdebase/debian/tdm-trinity.pam index 444884767..d40a52277 100644 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.pam +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.pam @@ -1,5 +1,5 @@ # -# /etc/pam.d/kdm-trinity - specify the PAM behaviour of kdm +# /etc/pam.d/tdm-trinity - specify the PAM behaviour of tdm # auth required pam_nologin.so auth required pam_env.so readenv=1 diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.postinst b/ubuntu/maverick/tdebase/debian/tdm-trinity.postinst index 0c9b05b4a..5f1aab168 100644 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.postinst +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.postinst @@ -47,9 +47,9 @@ fi # restarting the daemon may cause output to stdout db_stop -# don't start kdm if we are upgrading without stopping it +# don't start tdm if we are upgrading without stopping it NOSTART= -if [ -e /var/run/kdm-trinity.upgrade ]; then +if [ -e /var/run/tdm-trinity.upgrade ]; then NOSTART=yes fi # or if we're currently in X on the display it attempts to manage by default @@ -63,11 +63,11 @@ for HOST in "" \ fi done # or if it's already running -if start-stop-daemon --stop --quiet --signal 0 --pid /var/run/kdm.pid --name kdm-trinity; then +if start-stop-daemon --stop --quiet --signal 0 --pid /var/run/tdm.pid --name tdm-trinity; then NOSTART=yes fi # or if the options file says not to -if ! grep -qs ^restart-on-upgrade /etc/trinity/kdm/kdm.options; then +if ! grep -qs ^restart-on-upgrade /etc/trinity/tdm/tdm.options; then NOSTART=yes fi @@ -75,40 +75,40 @@ fi # md5sum of the stock Xservers shipped with KDE 3.3.2, which shipped with Sarge SARGEXSERVERS=d3ab063f564492e0e31830f56ccd350e -CONFIGLEVEL=`grep -s ^ConfigVersion= /etc/trinity/kdm/kdmrc | sed s/^ConfigVersion=//` +CONFIGLEVEL=`grep -s ^ConfigVersion= /etc/trinity/tdm/tdmrc | sed s/^ConfigVersion=//` -if [ -e /etc/trinity/kdm/kdmrc ]; then +if [ -e /etc/trinity/tdm/tdmrc ]; then if dpkg --compare-versions "$CONFIGLEVEL" ge "2.3"; then - KDMRCUPDATED=yes + TDMRCUPDATED=yes fi fi -if [ -e /etc/trinity/kdm/Xservers ]; then - if [ `md5sum /etc/trinity/kdm/Xservers | sed s/\ .*$//` = $SARGEXSERVERS ]; then +if [ -e /etc/trinity/tdm/Xservers ]; then + if [ `md5sum /etc/trinity/tdm/Xservers | sed s/\ .*$//` = $SARGEXSERVERS ]; then XSERVERSUNCHANGED=yes fi fi -# With KDE 3.4, /etc/trinity/kdm/Xservers is no longer required, so we remove it, if -# the user has updated their kdmrc (if they haven't, kdm notices and keeps using +# With KDE 3.4, /etc/trinity/tdm/Xservers is no longer required, so we remove it, if +# the user has updated their tdmrc (if they haven't, tdm notices and keeps using # Xservers), and if it wasn't touched, i.e. there are no local changes the user -# will want to merge into kdmrc. +# will want to merge into tdmrc. case "$1" in configure) - if [ ! -z $KDMRCUPDATED ] && [ ! -z $XSERVERSUNCHANGED ]; then - echo "Removing obsolete /etc/trinity/kdm/Xservers (detected no user changes)." - rm -f /etc/trinity/kdm/Xservers - elif [ ! -z $KDMRCUPDATED ] && [ -e /etc/trinity/kdm/Xservers ]; then - echo "Note that /etc/trinity/kdm/Xservers is no longer used by KDM." - echo "You must merge your changes (if any) into /etc/trinity/kdm/kdmrc manually." - echo "Otherwise, /etc/trinity/kdm/Xservers is safe to remove." + if [ ! -z $TDMRCUPDATED ] && [ ! -z $XSERVERSUNCHANGED ]; then + echo "Removing obsolete /etc/trinity/tdm/Xservers (detected no user changes)." + rm -f /etc/trinity/tdm/Xservers + elif [ ! -z $TDMRCUPDATED ] && [ -e /etc/trinity/tdm/Xservers ]; then + echo "Note that /etc/trinity/tdm/Xservers is no longer used by TDM." + echo "You must merge your changes (if any) into /etc/trinity/tdm/tdmrc manually." + echo "Otherwise, /etc/trinity/tdm/Xservers is safe to remove." fi - rm -f /etc/init.d/kdm-trinity - ln -s /lib/init/upstart-job /etc/init.d/kdm-trinity + rm -f /etc/init.d/tdm-trinity + ln -s /lib/init/upstart-job /etc/init.d/tdm-trinity ;; diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.postrm b/ubuntu/maverick/tdebase/debian/tdm-trinity.postrm index b5719fadd..3dfb32123 100644 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.postrm +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.postrm @@ -2,7 +2,7 @@ case "$1" in purge) - rm -rf /var/log/kdm-trinity.log* + rm -rf /var/log/tdm-trinity.log* ;; remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) @@ -25,12 +25,12 @@ if [ "$1" = "abort-install" -o "$1" = "abort-upgrade" ]; then fi if [ "$1" = "purge" ]; then - for DIR in /var/lib/kdm-trinity; do + for DIR in /var/lib/tdm-trinity; do if [ -d "$DIR" ]; then rm -rf "$DIR" fi done - rm -f /var/log/kdm-trinity.log* + rm -f /var/log/tdm-trinity.log* fi #DEBHELPER# diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.preinst b/ubuntu/maverick/tdebase/debian/tdm-trinity.preinst new file mode 100644 index 000000000..09163c460 --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.preinst @@ -0,0 +1,29 @@ +#! /bin/sh -e + +case "$1" in + + upgrade) + rm -f /etc/trinity/debian/tdm-update-menu.sh + rm -f /etc/trinity/debian/tdm.options + rm -f /etc/trinity/tdm/pixmaps/XFree86bw.xpm + rm -f /etc/trinity/tdm/pixmaps/XFree86.xpm + rm -f /etc/trinity/tdm/Xresources + rm -f /etc/menu-methods/tdm + ;; + + install) + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; + +esac + +#DEBHELPER# + +exit 0 diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.prerm b/ubuntu/maverick/tdebase/debian/tdm-trinity.prerm index 640da5602..1ca8de60e 100644 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.prerm +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.prerm @@ -1,5 +1,5 @@ #! /bin/sh -# prerm script for kdm-trinity +# prerm script for tdm-trinity # # see: dh_installdeb(1) @@ -24,14 +24,14 @@ if [ -e /usr/share/debconf/confmodule ]; then fi case "$1" in - # we NEVER want to unconditionally stop kdm; see below + # we NEVER want to unconditionally stop tdm; see below upgrade|failed-upgrade) REMOVING= ;; remove|deconfigure) REMOVING=yes - rm -f /etc/init.d/kdm-trinity + rm -f /etc/init.d/tdm-trinity ;; *) @@ -41,14 +41,14 @@ case "$1" in esac STOP= -# are we supposed to restart on upgrade? if REMOVING kdm, we don't care what +# are we supposed to restart on upgrade? if REMOVING tdm, we don't care what # the user says, we have to stop the daemon -if grep -qs ^restart-on-upgrade /etc/trinity/kdm/kdm.options || +if grep -qs ^restart-on-upgrade /etc/trinity/tdm/tdm.options || [ -n "$REMOVING" ]; then - # is there an kdm process running? - if start-stop-daemon --stop --quiet --signal 0 --name kdm-trinity; then + # is there an tdm process running? + if start-stop-daemon --stop --quiet --signal 0 --name tdm-trinity; then # any children? - PARENTS=$(pidof /usr/bin/kdm-trinity || true) + PARENTS=$(pidof /usr/bin/tdm-trinity || true) CHILDREN= if [ -n "$PARENTS" ]; then for PROCESS in $PARENTS; do @@ -65,11 +65,11 @@ if grep -qs ^restart-on-upgrade /etc/trinity/kdm/kdm.options || if [ -n "$CHILDREN" ]; then if [ -n "$HAVE_DEBCONF" ]; then # ask the question - db_input high kdm/stop_running_server_with_children || true + db_input high tdm/stop_running_server_with_children || true db_go # what did the user say? ANSWER= - if db_get kdm/stop_running_server_with_children; then + if db_get tdm/stop_running_server_with_children; then ANSWER="$RET" fi if [ "$ANSWER" = "true" ]; then @@ -77,7 +77,7 @@ if grep -qs ^restart-on-upgrade /etc/trinity/kdm/kdm.options || fi # forget that we have seen the question; this is the sort of # non-configuration question that should be asked every time - db_fset kdm/stop_running_server_with_children seen false + db_fset tdm/stop_running_server_with_children seen false fi else STOP=yes @@ -88,13 +88,13 @@ fi if [ -n "$STOP" ]; then if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then - invoke-rc.d kdm-trinity stop || true + invoke-rc.d tdm-trinity stop || true else - /etc/init.d/kdm-trinity stop || true + /etc/init.d/tdm-trinity stop || true fi else if [ "$1" = "upgrade" -o "$1" = "failed-upgrade" ]; then - touch /var/run/kdm-trinity.upgrade + touch /var/run/tdm-trinity.upgrade fi fi @@ -117,7 +117,7 @@ if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then fi # are we removing the currently selected display manager? if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then - if [ "kdm-trinity" = "$DEFAULT_DISPLAY_MANAGER" ]; then + if [ "tdm-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 diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.templates b/ubuntu/maverick/tdebase/debian/tdm-trinity.templates index 8c8e3866e..564181f78 100644 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.templates +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.templates @@ -14,19 +14,19 @@ _Description: Default display manager: accordingly, edit each of their init scripts in /etc/init.d, and disable the check for a default display manager. -Template: kdm-trinity/daemon_name +Template: tdm-trinity/daemon_name Type: string -Default: /opt/trinity/bin/kdm +Default: /opt/trinity/bin/tdm Description: internal use only This template is never shown to the user and does not require translation. -Template: kdm-trinity/stop_running_server_with_children +Template: tdm-trinity/stop_running_server_with_children Type: boolean Default: false -_Description: Stop the kdm-trinity daemon? - The K Desktop manager (kdm-trinity) daemon is typically stopped on package upgrade +_Description: Stop the tdm-trinity daemon? + The K Desktop manager (tdm-trinity) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session. . - If kdm is stopped now, any X sessions it manages will be terminated. + If tdm is stopped now, any X sessions it manages will be terminated. Otherwise, the new version will take effect the next time the daemon is restarted. diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.txt b/ubuntu/maverick/tdebase/debian/tdm-trinity.txt index effad2fd6..c51d4aa73 100644 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.txt +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.txt @@ -1,6 +1,6 @@ #!/bin/sh ### BEGIN INIT INFO -# Provides: x-display-manager kdm-trinity +# Provides: x-display-manager tdm-trinity # Required-Start: $local_fs $remote_fs # Required-Stop: $local_fs $remote_fs # Should-Start: console-screen @@ -8,40 +8,40 @@ # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: X display manager for Trinity -# Description: KDM manages a collection of X servers, which may be on the local host or remote machines. +# Description: TDM manages a collection of X servers, which may be on the local host or remote machines. ### END INIT INFO -# /etc/init.d/kdm-trinity: start or stop the X display manager +# /etc/init.d/tdm-trinity: start or stop the X display manager # Script originally stolen from the xdm package # # description: K Display Manager # set -e -# To start kdm-trinity even if it is not the default display manager, change +# To start tdm-trinity even if it is not the default display manager, change # HEED_DEFAULT_DISPLAY_MANAGER to "false." HEED_DEFAULT_DISPLAY_MANAGER=true DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager -KDEDIRS=/opt/trinity/ +TDEDIRS=/opt/trinity/ PATH=/opt/trinity/bin:/bin:/usr/bin:/sbin:/usr/sbin -DAEMON=/opt/trinity/bin/kdm -PIDFILE=/var/run/kdm.pid -UPGRADEFILE=/var/run/kdm.upgrade +DAEMON=/opt/trinity/bin/tdm +PIDFILE=/var/run/tdm.pid +UPGRADEFILE=/var/run/tdm.upgrade -# parameters to support kdm customization -KDMRC=/etc/trinity/kdm/kdmrc -BACKGROUNDRC=/etc/trinity/kdm/backgroundrc +# parameters to support tdm customization +TDMRC=/etc/trinity/tdm/tdmrc +BACKGROUNDRC=/etc/trinity/tdm/backgroundrc -#if configuration is changed by kdmtheme or other tools, don't do magick -if grep -q "Theme=@@@ToBeReplacedByDesktopBase@@@" ${KDMRC} && grep -q "Wallpaper=default_blue.jpg" ${BACKGROUNDRC} +#if configuration is changed by tdmtheme or other tools, don't do magick +if grep -q "Theme=@@@ToBeReplacedByDesktopBase@@@" ${TDMRC} && grep -q "Wallpaper=default_blue.jpg" ${BACKGROUNDRC} then -KDMOVERRIDEDIR=/etc/default/kdm-trinity.d -KDMCFGDIR=/var/run/kdm-trinity -KDMCFG=$KDMCFGDIR/kdmrc -BACKGROUNDCFG=$KDMCFGDIR/backgroundrc +TDMOVERRIDEDIR=/etc/default/tdm-trinity.d +TDMCFGDIR=/var/run/tdm-trinity +TDMCFG=$TDMCFGDIR/tdmrc +BACKGROUNDCFG=$TDMCFGDIR/backgroundrc test -x $DAEMON || exit 0 @@ -52,36 +52,36 @@ test -x $DAEMON || exit 0 # uncomment, if you want tons of debug info in your syslog #ARG="$ARG -debug 255" -# we use an alternative kdm master configuration file -ARG="$ARG -config $KDMCFG" +# we use an alternative tdm master configuration file +ARG="$ARG -config $TDMCFG" # we source overrides. run-parts sorts the list in a predictable order -if [ -d "$KDMOVERRIDEDIR" ]; then - for part in $(run-parts --list "$KDMOVERRIDEDIR" 2>/dev/null || true); do +if [ -d "$TDMOVERRIDEDIR" ]; then + for part in $(run-parts --list "$TDMOVERRIDEDIR" 2>/dev/null || true); do . "$part" done fi -# we generate kdm configuration files -genkdmconf --in $KDMCFGDIR 1> /dev/null +# we generate tdm configuration files +gentdmconf --in $TDMCFGDIR 1> /dev/null -# we update kdm configuration files (only overridden values) -[ -n "$USEBACKGROUND" ] && sed -i "s|^#\?UseBackground=.*|UseBackground=$USEBACKGROUND|" $KDMCFG -[ -n "$BACKGROUNDCFG" ] && sed -i "s|^#\?BackgroundCfg=.*|BackgroundCfg=$BACKGROUNDCFG|" $KDMCFG -[ -n "$USETHEME" ] && sed -i "s|^#\?UseTheme=.*|UseTheme=$USETHEME|" $KDMCFG -[ -n "$THEME" ] && sed -i "s|^#\?Theme=.*|Theme=$THEME|" $KDMCFG +# we update tdm configuration files (only overridden values) +[ -n "$USEBACKGROUND" ] && sed -i "s|^#\?UseBackground=.*|UseBackground=$USEBACKGROUND|" $TDMCFG +[ -n "$BACKGROUNDCFG" ] && sed -i "s|^#\?BackgroundCfg=.*|BackgroundCfg=$BACKGROUNDCFG|" $TDMCFG +[ -n "$USETHEME" ] && sed -i "s|^#\?UseTheme=.*|UseTheme=$USETHEME|" $TDMCFG +[ -n "$THEME" ] && sed -i "s|^#\?Theme=.*|Theme=$THEME|" $TDMCFG [ -n "$WALLPAPER" ] && sed -i "s|^#\?Wallpaper=.*|Wallpaper=`readlink -f $WALLPAPER`|" $BACKGROUNDCFG fi # autologin overrides are useful for live debian environment if [ -n "$AUTOLOGINUSER" ]; then - sed -i "s|^#\?AutoLoginEnable=.*|AutoLoginEnable=true|" $KDMCFG - sed -i "s|^#\?AutoLoginUser=.*|AutoLoginUser=$AUTOLOGINUSER|" $KDMCFG + sed -i "s|^#\?AutoLoginEnable=.*|AutoLoginEnable=true|" $TDMCFG + sed -i "s|^#\?AutoLoginUser=.*|AutoLoginUser=$AUTOLOGINUSER|" $TDMCFG fi -[ -n "$AUTOLOGINDELAY" ] && sed -i "s|^#\?AutoLoginDelay=.*|AutoLoginDelay=$AUTOLOGINDELAY|" $KDMCFG -[ -n "$AUTOLOGINAGAIN" ] && sed -i "s|^#\?AutoLoginAgain=.*|AutoLoginAgain=$AUTOLOGINAGAIN|" $KDMCFG -[ -n "$AUTOLOGINLOCKED" ] && sed -i "s|^#\?AutoLoginLocked=.*|AutoLoginLocked=$AUTOLOGINLOCKED|" $KDMCFG +[ -n "$AUTOLOGINDELAY" ] && sed -i "s|^#\?AutoLoginDelay=.*|AutoLoginDelay=$AUTOLOGINDELAY|" $TDMCFG +[ -n "$AUTOLOGINAGAIN" ] && sed -i "s|^#\?AutoLoginAgain=.*|AutoLoginAgain=$AUTOLOGINAGAIN|" $TDMCFG +[ -n "$AUTOLOGINLOCKED" ] && sed -i "s|^#\?AutoLoginLocked=.*|AutoLoginLocked=$AUTOLOGINLOCKED|" $TDMCFG # If we upgraded the daemon, we can't use the --exec argument to # start-stop-daemon since the inode will have changed. The risk here is that @@ -110,22 +110,22 @@ case "$1" in if [ -e $DEFAULT_DISPLAY_MANAGER_FILE ] && [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] && [ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" != "$DAEMON" ]; then - echo "Not starting K Display Manager (kdm-trinity); it is not the default display manager." + echo "Not starting K Display Manager (tdm-trinity); it is not the default display manager." else - echo -n "Starting K Display Manager: kdm-trinity" + echo -n "Starting K Display Manager: tdm-trinity" start-stop-daemon --start --quiet $SSD_ARGS -- $ARG || echo -n " already running" echo "." fi ;; restart) - /etc/init.d/kdm-trinity stop + /etc/init.d/tdm-trinity stop if [ -f $PIDFILE ]; then if stillrunning; then exit 1 fi fi - /etc/init.d/kdm-trinity start + /etc/init.d/tdm-trinity start ;; reload) @@ -133,16 +133,16 @@ case "$1" in if start-stop-daemon --stop --signal 1 --quiet $SSD_ARGS; then echo "done." else - echo "kdm-trinity not running." + echo "tdm-trinity not running." fi ;; force-reload) - /etc/init.d/kdm-trinity reload + /etc/init.d/tdm-trinity reload ;; stop) - echo -n "Stopping K Display Manager: kdm-trinity" + echo -n "Stopping K Display Manager: tdm-trinity" if [ ! -f $PIDFILE ]; then echo " not running ($PIDFILE not found)." exit 0 @@ -151,7 +151,7 @@ case "$1" in KILLCOUNT=1 if [ ! -e $UPGRADEFILE ]; then if start-stop-daemon --stop --quiet $SSD_ARGS; then - # give kdm's signal handler a second to catch its breath + # give tdm's signal handler a second to catch its breath sleep 1 else echo -n " not running" @@ -181,7 +181,7 @@ case "$1" in ;; *) - echo "Usage: /etc/init.d/kdm-trinity {start|stop|restart|reload|force-reload}" + echo "Usage: /etc/init.d/tdm-trinity {start|stop|restart|reload|force-reload}" exit 1 ;; esac diff --git a/ubuntu/maverick/tdebase/debian/twin-trinity.install b/ubuntu/maverick/tdebase/debian/twin-trinity.install new file mode 100644 index 000000000..62d42f166 --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/twin-trinity.install @@ -0,0 +1,101 @@ +debian/tmp/opt/trinity/bin/kompmgr +debian/tmp/opt/trinity/bin/twin +debian/tmp/opt/trinity/bin/twin_killer_helper +debian/tmp/opt/trinity/bin/twin_rules_dialog +debian/tmp/opt/trinity/lib/kconf_update_bin/twin_update_default_rules +debian/tmp/opt/trinity/lib/kconf_update_bin/twin_update_window_settings +debian/tmp/opt/trinity/lib/trinity/kcm_twindecoration.la +debian/tmp/opt/trinity/lib/trinity/kcm_twindecoration.so +debian/tmp/opt/trinity/lib/trinity/kcm_twinoptions.la +debian/tmp/opt/trinity/lib/trinity/kcm_twinoptions.so +debian/tmp/opt/trinity/lib/trinity/kcm_twinrules.la +debian/tmp/opt/trinity/lib/trinity/kcm_twinrules.so +debian/tmp/opt/trinity/lib/trinity/twin3_b2.la +debian/tmp/opt/trinity/lib/trinity/twin3_b2.so +debian/tmp/opt/trinity/lib/trinity/twin3_default.la +debian/tmp/opt/trinity/lib/trinity/twin3_default.so +debian/tmp/opt/trinity/lib/trinity/twin3_keramik.la +debian/tmp/opt/trinity/lib/trinity/twin3_keramik.so +debian/tmp/opt/trinity/lib/trinity/twin3_laptop.la +debian/tmp/opt/trinity/lib/trinity/twin3_laptop.so +debian/tmp/opt/trinity/lib/trinity/twin3_modernsys.la +debian/tmp/opt/trinity/lib/trinity/twin3_modernsys.so +debian/tmp/opt/trinity/lib/trinity/twin3_plastik.la +debian/tmp/opt/trinity/lib/trinity/twin3_plastik.so +debian/tmp/opt/trinity/lib/trinity/twin3_quartz.la +debian/tmp/opt/trinity/lib/trinity/twin3_quartz.so +debian/tmp/opt/trinity/lib/trinity/twin3_redmond.la +debian/tmp/opt/trinity/lib/trinity/twin3_redmond.so +debian/tmp/opt/trinity/lib/trinity/twin3_web.la +debian/tmp/opt/trinity/lib/trinity/twin3_web.so +debian/tmp/opt/trinity/lib/trinity/twin_b2_config.la +debian/tmp/opt/trinity/lib/trinity/twin_b2_config.so +debian/tmp/opt/trinity/lib/trinity/twin_default_config.la +debian/tmp/opt/trinity/lib/trinity/twin_default_config.so +debian/tmp/opt/trinity/lib/trinity/twin_keramik_config.la +debian/tmp/opt/trinity/lib/trinity/twin_keramik_config.so +debian/tmp/opt/trinity/lib/trinity/twin.la +debian/tmp/opt/trinity/lib/trinity/twin_modernsys_config.la +debian/tmp/opt/trinity/lib/trinity/twin_modernsys_config.so +debian/tmp/opt/trinity/lib/trinity/twin_plastik_config.la +debian/tmp/opt/trinity/lib/trinity/twin_plastik_config.so +debian/tmp/opt/trinity/lib/trinity/twin_quartz_config.la +debian/tmp/opt/trinity/lib/trinity/twin_quartz_config.so +debian/tmp/opt/trinity/lib/trinity/twin_rules_dialog.la +debian/tmp/opt/trinity/lib/trinity/twin_rules_dialog.so +debian/tmp/opt/trinity/lib/trinity/twin.so +debian/tmp/opt/trinity/lib/libtdecorations.so.1 +debian/tmp/opt/trinity/lib/libtdecorations.so.1.0.0 +debian/tmp/opt/trinity/lib/libtdeinit_twin_rules_dialog.so +debian/tmp/opt/trinity/lib/libtdeinit_twin.so +debian/tmp/opt/trinity/share/applications/kde/showdesktop.desktop +debian/tmp/opt/trinity/share/applications/kde/twindecoration.desktop +debian/tmp/opt/trinity/share/applications/kde/twinoptions.desktop +debian/tmp/opt/trinity/share/applications/kde/twinrules.desktop +debian/tmp/opt/trinity/share/applnk/.hidden/twinactions.desktop +debian/tmp/opt/trinity/share/applnk/.hidden/twinadvanced.desktop +debian/tmp/opt/trinity/share/applnk/.hidden/twinfocus.desktop +debian/tmp/opt/trinity/share/applnk/.hidden/twinmoving.desktop +debian/tmp/opt/trinity/share/applnk/.hidden/twintranslucency.desktop +debian/tmp/opt/trinity/share/apps/kconf_update/twin3_plugin.pl +debian/tmp/opt/trinity/share/apps/kconf_update/twin3_plugin.upd +debian/tmp/opt/trinity/share/apps/kconf_update/twin_focus1.sh +debian/tmp/opt/trinity/share/apps/kconf_update/twin_focus1.upd +debian/tmp/opt/trinity/share/apps/kconf_update/twin_focus2.sh +debian/tmp/opt/trinity/share/apps/kconf_update/twin_focus2.upd +debian/tmp/opt/trinity/share/apps/kconf_update/twin_fsp_workarounds_1.upd +debian/tmp/opt/trinity/share/apps/kconf_update/twiniconify.upd +debian/tmp/opt/trinity/share/apps/kconf_update/twinsticky.upd +debian/tmp/opt/trinity/share/apps/kconf_update/twin.upd +debian/tmp/opt/trinity/share/apps/kconf_update/twinupdatewindowsettings.upd +debian/tmp/opt/trinity/share/apps/kconf_update/pluginlibFix.pl +debian/tmp/opt/trinity/share/apps/twin/b2.desktop +debian/tmp/opt/trinity/share/apps/twin/eventsrc +debian/tmp/opt/trinity/share/apps/twin/keramik.desktop +debian/tmp/opt/trinity/share/apps/twin/laptop.desktop +debian/tmp/opt/trinity/share/apps/twin/modernsystem.desktop +debian/tmp/opt/trinity/share/apps/twin/pics/bluesun.png +debian/tmp/opt/trinity/share/apps/twin/pics/close.png +debian/tmp/opt/trinity/share/apps/twin/pics/fog-grey.png +debian/tmp/opt/trinity/share/apps/twin/pics/fog.png +debian/tmp/opt/trinity/share/apps/twin/pics/greenie.dim.png +debian/tmp/opt/trinity/share/apps/twin/pics/greenie.light.png +debian/tmp/opt/trinity/share/apps/twin/pics/iconify.png +debian/tmp/opt/trinity/share/apps/twin/pics/maximizedown.png +debian/tmp/opt/trinity/share/apps/twin/pics/maximize.png +debian/tmp/opt/trinity/share/apps/twin/pics/menu.png +debian/tmp/opt/trinity/share/apps/twin/pics/pindown.png +debian/tmp/opt/trinity/share/apps/twin/pics/pinup.png +debian/tmp/opt/trinity/share/apps/twin/pics/unknown.png +debian/tmp/opt/trinity/share/apps/twin/plastik.desktop +debian/tmp/opt/trinity/share/apps/twin/quartz.desktop +debian/tmp/opt/trinity/share/apps/twin/redmond.desktop +debian/tmp/opt/trinity/share/apps/twin/web.desktop +debian/tmp/opt/trinity/share/config.kcfg/twin.kcfg +debian/tmp/opt/trinity/share/doc/kde/HTML/en/kompmgr/common +debian/tmp/opt/trinity/share/doc/kde/HTML/en/kompmgr/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/kde/HTML/en/kompmgr/index.docbook +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/twin.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/twin.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/twin.png +debian/tmp/opt/trinity/share/apps/twin/default_rules/* diff --git a/ubuntu/maverick/tdebase/debian/twin-trinity.lintian b/ubuntu/maverick/tdebase/debian/twin-trinity.lintian new file mode 100644 index 000000000..b6272e484 --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/twin-trinity.lintian @@ -0,0 +1,2 @@ +twin: shlib-missing-in-control-file libtdeinit_twin.so usr/lib/libtdeinit_twin.so +twin: shlib-missing-in-control-file libtdeinit_twin_rules_dialog.so usr/lib/libtdeinit_twin_rules_dialog.so diff --git a/ubuntu/maverick/tdebase/debian/kwin-trinity.postinst b/ubuntu/maverick/tdebase/debian/twin-trinity.postinst index 4c2228326..b8273333f 100644 --- a/ubuntu/maverick/tdebase/debian/kwin-trinity.postinst +++ b/ubuntu/maverick/tdebase/debian/twin-trinity.postinst @@ -19,7 +19,7 @@ set -e case "$1" in configure) - update-alternatives --install /usr/bin/x-window-manager x-window-manager /opt/trinity/bin/kwin 50 + update-alternatives --install /usr/bin/x-window-manager x-window-manager /opt/trinity/bin/twin 50 ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/ubuntu/maverick/tdebase/debian/kwin-trinity.prerm b/ubuntu/maverick/tdebase/debian/twin-trinity.prerm index fef049114..67c4b2507 100644 --- a/ubuntu/maverick/tdebase/debian/kwin-trinity.prerm +++ b/ubuntu/maverick/tdebase/debian/twin-trinity.prerm @@ -19,7 +19,7 @@ set -e case "$1" in remove) - /usr/sbin/update-alternatives --remove x-window-manager /usr/trinity/bin/kwin + /usr/sbin/update-alternatives --remove x-window-manager /usr/trinity/bin/twin ;; upgrade|deconfigure) diff --git a/ubuntu/maverick/tdebindings/debian/changelog b/ubuntu/maverick/tdebindings/debian/changelog index 6d5413584..64d2d34ae 100644 --- a/ubuntu/maverick/tdebindings/debian/changelog +++ b/ubuntu/maverick/tdebindings/debian/changelog @@ -483,7 +483,7 @@ tdebindings (4:3.2.92-1) unstable; urgency=low was accepted upstream. * debian/libkjsembed1.install: install the qprocess kjsembed plugin. * debian/rules: disable the python directory, as sip, pyqt and - pykde are all packaged in Debian already. + pytde are all packaged in Debian already. * debian/control: added the libsmokekde1, libsmokekde-dev, libkorundum-ruby1.8 and libqtruby-ruby1.8 packages because of upstream additions. diff --git a/ubuntu/maverick/tdebindings/debian/control b/ubuntu/maverick/tdebindings/debian/control index aae3c4feb..55d1ec903 100644 --- a/ubuntu/maverick/tdebindings/debian/control +++ b/ubuntu/maverick/tdebindings/debian/control @@ -2,7 +2,7 @@ Source: tdebindings-trinity Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5), python-dev (>= 2.3.5-11), python-support (>= 0.5), quilt, gawk, gettext, default-jdk [amd64 i386 ia64 lpia powerpc s390 sparc], - tdelibs4-trinity-dev (>= 4:3.5.9), libqt3-compat-headers (>= 3:3.3.5), + tdelibs4-trinity-dev (>= 4:3.5.9), libtqt3-compat-headers (>= 3:3.3.5), ruby, ruby1.8-dev, flex, bison, automake, autoconf, libtool, libltdl-dev Section: devel @@ -15,8 +15,8 @@ Standards-Version: 3.8.4 Package: tdebindings-java-trinity Section: libs Architecture: all -Replaces: tdebindings-java-kde3 (<< 4:3.5.13) -Breaks: tdebindings-java-kde3 (<< 4:3.5.13) +Replaces: kdebindings-java-trinity (<< 4:14.0.0) +Breaks: kdebindings-java-trinity (<< 4:14.0.0) Depends: libdcop3-java-trinity (= ${source:Version}), libqt3-java-trinity (= ${source:Version}), libtrinity-java-trinity (= ${source:Version}) Description: TDE Java bindings metapackage [Trinity] A metapackage depending on all TDE, Qt and DCOP bindings libraries @@ -27,8 +27,8 @@ Description: TDE Java bindings metapackage [Trinity] Package: libdcop3-java-trinity Architecture: all Section: libs -Replaces: libdcop3-java-kde3 (<< 4:3.5.13) -Breaks: libdcop3-java-kde3 (<< 4:3.5.13) +Replaces: libdcop3-java-trinity (<< 4:14.0.0) +Breaks: libdcop3-java-trinity (<< 4:14.0.0) Depends: libdcop3-jni-trinity (>> ${KDE-Version3}), libdcop3-jni-trinity (<< ${KDE-Next-Version3}), gij | java1-runtime | java2-runtime Description: DCOP bindings for Java [Trinity] This package contains the Java classes necessary to run Java programs @@ -40,8 +40,8 @@ Description: DCOP bindings for Java [Trinity] Package: libdcop3-jni-trinity Architecture: amd64 i386 ia64 powerpc s390 sparc Section: libs -Replaces: libdcop3-jni-kde3 (<< 4:3.5.13) -Breaks: libdcop3-jni-kde3 (<< 4:3.5.13) +Replaces: libdcop3-jni-trinity (<< 4:14.0.0) +Breaks: libdcop3-jni-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: DCOP bindings for Java ( Native libraries ) [Trinity] This package contains the shared libraries and scripts necessary to @@ -54,8 +54,8 @@ Description: DCOP bindings for Java ( Native libraries ) [Trinity] Package: libdcop3-java-trinity-dev Architecture: amd64 i386 ia64 powerpc s390 sparc Section: libdevel -Replaces: libdcop3-java-kde3-dev (<< 4:3.5.13) -Breaks: libdcop3-java-kde3-dev (<< 4:3.5.13) +Replaces: libdcop3-java-trinity-dev (<< 4:14.0.0) +Breaks: libdcop3-java-trinity-dev (<< 4:14.0.0) Depends: libdcop3-java-trinity (>> ${KDE-Version3}), libdcop3-java-trinity (<< ${KDE-Next-Version3}) Description: DCOP bindings for Java (dcopidl2java program) [Trinity] This package contains the dcopidl2java program which generates Java @@ -68,8 +68,8 @@ Description: DCOP bindings for Java (dcopidl2java program) [Trinity] Package: libqt3-java-trinity Architecture: all Section: libs -Replaces: libqt3-java-kde3 (<< 4:3.5.13) -Breaks: libqt3-java-kde3 (<< 4:3.5.13) +Replaces: libqt3-java-trinity (<< 4:14.0.0) +Breaks: libqt3-java-trinity (<< 4:14.0.0) Depends: libqt3-jni-trinity (>> ${KDE-Version3}), libqt3-jni-trinity (<< ${KDE-Next-Version3}), gij | java1-runtime | java2-runtime Suggests: juic-trinity Description: Java bindings for Qt [Trinity] @@ -85,8 +85,8 @@ Description: Java bindings for Qt [Trinity] Package: libqt3-jni-trinity Architecture: amd64 i386 ia64 powerpc s390 sparc Section: libs -Replaces: libqt3-jni-kde3 (<< 4:3.5.13) -Breaks: libqt3-jni-kde3 (<< 4:3.5.13) +Replaces: libqt3-jni-trinity (<< 4:14.0.0) +Breaks: libqt3-jni-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Java bindings for Qt ( Native libraries ) [Trinity] This package contains the shared libraries necessary to run Java @@ -98,8 +98,8 @@ Description: Java bindings for Qt ( Native libraries ) [Trinity] Package: libtrinity-java-trinity Architecture: all Section: libs -Replaces: libtrinity-java-kde3 (<< 4:3.5.13) -Breaks: libtrinity-java-kde3 (<< 4:3.5.13) +Replaces: libtrinity-java-trinity (<< 4:14.0.0) +Breaks: libtrinity-java-trinity (<< 4:14.0.0) Depends: libtrinity-jni-trinity (>> ${KDE-Version3}), libtrinity-jni-trinity (<< ${KDE-Next-Version3}), gij | java1-runtime | java2-runtime Description: tdelibs bindings for Java [Trinity] This package contains the Java classes necessary to run Java programs @@ -114,8 +114,8 @@ Description: tdelibs bindings for Java [Trinity] Package: libtrinity-jni-trinity Architecture: amd64 i386 ia64 powerpc s390 sparc Section: libs -Replaces: libtrinity-jni-kde3 (<< 4:3.5.13) -Breaks: libtrinity-jni-kde3 (<< 4:3.5.13) +Replaces: libtrinity-jni-trinity (<< 4:14.0.0) +Breaks: libtrinity-jni-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: tdelibs bindings for java ( Native libraries ) [Trinity] This package contains the shared libraries necessary to run Java @@ -127,10 +127,9 @@ Description: tdelibs bindings for java ( Native libraries ) [Trinity] Package: libsmokeqt1-trinity Architecture: any Section: libs -Replaces: libsmokeqt1-kde3 (<< 4:3.5.13) -Breaks: libsmokeqt1-kde3 (<< 4:3.5.13) +Replaces: libsmokeqt1-trinity (<< 4:14.0.0) +Breaks: libsmokeqt1-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} -Conflicts: libqt-perl (<= 3.008-1) Description: SMOKE Binding Library to Qt The "Scripting Meta Object Kompiler Engine" library is used by various TDE language bindings packages to provide interfaces to the @@ -141,10 +140,9 @@ Description: SMOKE Binding Library to Qt Package: libsmokeqt-trinity-dev Architecture: any Section: libdevel -Replaces: libsmokeqt-kde3-dev (<< 4:3.5.13) -Breaks: libsmokeqt-kde3-dev (<< 4:3.5.13) +Replaces: libsmokeqt-trinity-dev (<< 4:14.0.0) +Breaks: libsmokeqt-trinity-dev (<< 4:14.0.0) Depends: libsmokeqt1-trinity (= ${binary:Version}) -Conflicts: libqt-perl (<= 3.008-1) Description: SMOKE Binding Library to Qt - Development Files The "Scripting Meta Object Kompiler Engine" library is used by various TDE language bindings packages to provide interfaces to the @@ -159,8 +157,8 @@ Description: SMOKE Binding Library to Qt - Development Files Package: libsmokekde1-trinity Architecture: any Section: libs -Replaces: libsmokekde1-kde3 (<< 4:3.5.13) -Breaks: libsmokekde1-kde3 (<< 4:3.5.13) +Replaces: libsmokekde1-trinity (<< 4:14.0.0) +Breaks: libsmokekde1-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: SMOKE Binding Library to TDE The "Scripting Meta Object Kompiler Engine" library is used by @@ -172,8 +170,8 @@ Description: SMOKE Binding Library to TDE Package: libsmokekde-trinity-dev Architecture: any Section: libdevel -Replaces: libsmokekde-kde3-dev (<< 4:3.5.13) -Breaks: libsmokekde-kde3-dev (<< 4:3.5.13) +Replaces: libsmokekde-trinity-dev (<< 4:14.0.0) +Breaks: libsmokekde-trinity-dev (<< 4:14.0.0) Depends: libsmokekde1-trinity (= ${binary:Version}) Description: SMOKE Binding Library to TDE - Development Files The "Scripting Meta Object Kompiler Engine" library is used by @@ -189,8 +187,8 @@ Description: SMOKE Binding Library to TDE - Development Files Package: python-dcop-trinity Architecture: any Section: python -Replaces: python-dcop-kde3 (<< 4:3.5.13) -Breaks: python-dcop-kde3 (<< 4:3.5.13) +Replaces: python-dcop-trinity (<< 4:14.0.0) +Breaks: python-dcop-trinity (<< 4:14.0.0) Depends: ${python:Depends}, ${shlibs:Depends} Provides: ${python:Provides} Description: DCOP bindings for Python @@ -204,8 +202,8 @@ Description: DCOP bindings for Python Package: libkjsembed1-trinity Architecture: any Section: libs -Replaces: libkjsembed1-kde3 (<< 4:3.5.13) -Breaks: libkjsembed1-kde3 (<< 4:3.5.13) +Replaces: libkjsembed1-trinity (<< 4:14.0.0) +Breaks: libkjsembed1-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Embedded JavaScript library This package contains the shared libraries necessary to run programs @@ -217,8 +215,8 @@ Description: Embedded JavaScript library Package: libkjsembed-trinity-dev Architecture: any Section: libdevel -Replaces: libkjsembed-kde3-dev (<< 4:3.5.13) -Breaks: libkjsembed-kde3-dev (<< 4:3.5.13) +Replaces: libkjsembed-trinity-dev (<< 4:14.0.0) +Breaks: libkjsembed-trinity-dev (<< 4:14.0.0) Depends: libkjsembed1-trinity (= ${binary:Version}) Description: Embedded JavaScript library (Development files) This package contains the header files and symbolic links necessary @@ -234,8 +232,8 @@ Description: Embedded JavaScript library (Development files) Package: kjscmd-trinity Architecture: any Section: interpreters -Replaces: kjscmd-kde3 (<< 4:3.5.13) -Breaks: kjscmd-kde3 (<< 4:3.5.13) +Replaces: kjscmd-trinity (<< 4:14.0.0) +Breaks: kjscmd-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: A script interpreter using the TDE JavaScript library This package contains the kjscmd program, which is a standalone @@ -246,8 +244,8 @@ Description: A script interpreter using the TDE JavaScript library Package: juic-trinity Architecture: all Section: libdevel -Replaces: juic-kde3 (<< 4:3.5.13) -Breaks: juic-kde3 (<< 4:3.5.13) +Replaces: juic-trinity (<< 4:14.0.0) +Breaks: juic-trinity (<< 4:14.0.0) Depends: xsltproc Recommends: libqt3-java-trinity Suggests: qt3-designer @@ -263,8 +261,8 @@ Description: The Qt Java UI Compiler Package: libkorundum0-ruby1.8-trinity Architecture: any Section: interpreters -Replaces: libkorundum0-ruby1.8-kde3 (<< 4:3.5.13) -Breaks: libkorundum0-ruby1.8-kde3 (<< 4:3.5.13) +Replaces: libkorundum0-ruby1.8-trinity (<< 4:14.0.0) +Breaks: libkorundum0-ruby1.8-trinity (<< 4:14.0.0) Depends: libqt0-ruby1.8-trinity (= ${binary:Version}), ${shlibs:Depends} Description: TDE bindings for Ruby [Trinity] This package contains the files necessary for running and developing @@ -278,8 +276,8 @@ Description: TDE bindings for Ruby [Trinity] Package: libqt0-ruby1.8-trinity Architecture: any Section: interpreters -Replaces: libqt0-ruby1.8-kde3 (<< 4:3.5.13) -Breaks: libqt0-ruby1.8-kde3 (<< 4:3.5.13) +Replaces: libqt0-ruby1.8-trinity (<< 4:14.0.0) +Breaks: libqt0-ruby1.8-trinity (<< 4:14.0.0) Depends: ruby1.8, ${shlibs:Depends} Description: Qt bindings for Ruby [Trinity] This package contains the files necessary for running and developing @@ -293,6 +291,8 @@ Description: Qt bindings for Ruby [Trinity] Package: tde-xparts-extras-trinity Architecture: any Depends: ${shlibs:Depends} +Replaces: kde-xparts-extras-trinity (<< 4:14.0.0) +Breaks: kde-xparts-extras-trinity (<< 4:14.0.0) Description: Extra xparts for TDE [Trinity] This package contains extra xparts-based modules for Trinity This includes the mozilla-konqueror plugin diff --git a/ubuntu/maverick/tdebindings/debian/control.in b/ubuntu/maverick/tdebindings/debian/control.in index b9f3e717a..998cde21d 100644 --- a/ubuntu/maverick/tdebindings/debian/control.in +++ b/ubuntu/maverick/tdebindings/debian/control.in @@ -112,7 +112,6 @@ Package: libsmokeqt1 Architecture: any Section: libs Depends: ${shlibs:Depends} -Conflicts: libqt-perl (<= 3.008-1) Description: SMOKE Binding Library to Qt The "Scripting Meta Object Kompiler Engine" library is used by various KDE language bindings packages to provide interfaces to the @@ -124,7 +123,6 @@ Package: libsmokeqt-dev Architecture: any Section: libdevel Depends: libsmokeqt1 (= ${binary:Version}) -Conflicts: libqt-perl (<= 3.008-1) Description: SMOKE Binding Library to Qt - Development Files The "Scripting Meta Object Kompiler Engine" library is used by various KDE language bindings packages to provide interfaces to the diff --git a/ubuntu/maverick/tdebindings/debian/libqt0-ruby1.8-trinity.install b/ubuntu/maverick/tdebindings/debian/libqt0-ruby1.8-trinity.install index a1b654969..60f10d40e 100644 --- a/ubuntu/maverick/tdebindings/debian/libqt0-ruby1.8-trinity.install +++ b/ubuntu/maverick/tdebindings/debian/libqt0-ruby1.8-trinity.install @@ -9,7 +9,7 @@ debian/tmp/opt/trinity/lib/ruby/1.8/Qt.rb debian/tmp/opt/trinity/lib/ruby/1.8/*/qtruby.so* debian/tmp/opt/trinity/lib/ruby/1.8/*/qtruby.la -debian/tmp/opt/trinity/lib/ruby/1.8/*/qui.so* -debian/tmp/opt/trinity/lib/ruby/1.8/*/qui.la +debian/tmp/opt/trinity/lib/ruby/1.8/*/tqui.so* +debian/tmp/opt/trinity/lib/ruby/1.8/*/tqui.la qtruby/ChangeLog /opt/trinity/share/doc/libqt0-ruby1.8 diff --git a/ubuntu/maverick/tdebindings/debian/source/format b/ubuntu/maverick/tdebindings/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/tdebindings/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/tdebindings/debian/source/options b/ubuntu/maverick/tdebindings/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/tdebindings/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/tdeedu/debian/control b/ubuntu/maverick/tdeedu/debian/control index 78e9659f4..a8afe7c5a 100644 --- a/ubuntu/maverick/tdeedu/debian/control +++ b/ubuntu/maverick/tdeedu/debian/control @@ -10,8 +10,8 @@ Standards-Version: 3.8.4 Package: tdeedu-trinity Architecture: all Section: kde -Replaces: tdeedu-kde3 (<< 4:3.5.13) -Breaks: tdeedu-kde3 (<< 4:3.5.13) +Replaces: kdeedu-trinity (<< 4:14.0.0) +Breaks: kdeedu-trinity (<< 4:14.0.0) Depends: blinken-trinity (>= ${Source-Version}), kalzium-trinity (>= ${Source-Version}), kanagram-trinity (>= ${Source-Version}), kbruch-trinity (>= ${Source-Version}), tdeedu-data-trinity (>= ${Source-Version}), keduca-trinity (>= ${Source-Version}), kgeography-trinity (>= ${Source-Version}), khangman-trinity (>= ${Source-Version}), kig-trinity (>= ${Source-Version}), kiten-trinity (>= ${Source-Version}), klatin-trinity (>= ${Source-Version}), klettres-trinity (>= ${Source-Version}), kmplot-trinity (>= ${Source-Version}), kpercentage-trinity (>= ${Source-Version}), kstars-trinity (>= ${Source-Version}), ktouch-trinity (>= ${Source-Version}), kturtle-trinity (>= ${Source-Version}), kverbos-trinity (>= ${Source-Version}), kvoctrain-trinity (>= ${Source-Version}), kwordquiz-trinity (>= ${Source-Version}), indi-trinity (>= ${Source-Version}) Suggests: tdeedu-trinity-doc-html Description: educational apps from the official Trinity release @@ -26,8 +26,8 @@ Description: educational apps from the official Trinity release Package: tdeedu-data-trinity Architecture: all Section: kde -Replaces: tdeedu-data-kde3 (<< 4:3.5.13) -Breaks: tdeedu-data-kde3 (<< 4:3.5.13) +Replaces: kdeedu-data-trinity (<< 4:14.0.0) +Breaks: kdeedu-data-trinity (<< 4:14.0.0) Description: shared data for Trinity educational applications This package contains shared data necessary for running the educational applications provided with KDE (the K Desktop @@ -39,8 +39,8 @@ Description: shared data for Trinity educational applications Package: tdeedu-trinity-dbg Architecture: any Priority: extra -Replaces: tdeedu-kde3-dbg (<< 4:3.5.13) -Breaks: tdeedu-kde3-dbg (<< 4:3.5.13) +Replaces: kdeedu-trinity-dbg (<< 4:14.0.0) +Breaks: kdeedu-trinity-dbg (<< 4:14.0.0) Depends: tdelibs-trinity-dbg Section: libdevel Description: debugging symbols for tdeedu-trinity @@ -51,8 +51,8 @@ Description: debugging symbols for tdeedu-trinity Package: tdeedu-trinity-doc-html Architecture: all Section: doc -Replaces: tdeedu-kde3-doc-html (<< 4:3.5.13) -Breaks: tdeedu-kde3-doc-html (<< 4:3.5.13) +Replaces: kdeedu-trinity-doc-html (<< 4:14.0.0) +Breaks: kdeedu-trinity-doc-html (<< 4:14.0.0) Suggests: konqueror-trinity | www-browser, tdeedu-trinity Description: Trinity edutainment documentation in HTML format By default the educational applications provided with KDE (the K @@ -72,8 +72,8 @@ Description: Trinity edutainment documentation in HTML format Package: blinken-trinity Architecture: any Section: games -Replaces: blinken-kde3 (<< 4:3.5.13) -Breaks: blinken-kde3 (<< 4:3.5.13) +Replaces: blinken-trinity (<< 4:14.0.0) +Breaks: blinken-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, ttf-sjfonts, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3}) Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html Description: Trinity version of the Simon Says electronic memory game @@ -92,8 +92,8 @@ Description: Trinity version of the Simon Says electronic memory game Package: kalzium-trinity Architecture: any Section: science -Replaces: kalzium-kde3 (<< 4:3.5.13) -Breaks: kalzium-kde3 (<< 4:3.5.13) +Replaces: kalzium-trinity (<< 4:14.0.0) +Breaks: kalzium-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, kalzium-data-trinity (>> ${KDE-Version3}), kalzium-data-trinity (<< ${KDE-Next-Version3}), tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3}) Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html Description: chemistry teaching tool for Trinity @@ -119,8 +119,8 @@ Description: chemistry teaching tool for Trinity Package: kalzium-data-trinity Architecture: all Section: science -Replaces: kalzium-data-kde3 (<< 4:3.5.13) -Breaks: kalzium-data-kde3 (<< 4:3.5.13) +Replaces: kalzium-data-trinity (<< 4:14.0.0) +Breaks: kalzium-data-trinity (<< 4:14.0.0) Description: data files for Kalzium This package contains architecture-independent data files for Kalzium, the KDE periodic table application. This includes pictures @@ -135,8 +135,8 @@ Description: data files for Kalzium Package: kanagram-trinity Architecture: any Section: games -Replaces: kanagram-kde3 (<< 4:3.5.13) -Breaks: kanagram-kde3 (<< 4:3.5.13) +Replaces: kanagram-trinity (<< 4:14.0.0) +Breaks: kanagram-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3}) Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html Description: letter order game for Trinity @@ -158,8 +158,8 @@ Description: letter order game for Trinity Package: kbruch-trinity Architecture: any Section: math -Replaces: kbruch-kde3 (<< 4:3.5.13) -Breaks: kbruch-kde3 (<< 4:3.5.13) +Replaces: kbruch-trinity (<< 4:14.0.0) +Breaks: kbruch-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3}) Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html Description: fraction calculation teaching tool for Trinity @@ -173,8 +173,8 @@ Description: fraction calculation teaching tool for Trinity Package: keduca-trinity Architecture: any Section: kde -Replaces: keduca-kde3 (<< 4:3.5.13) -Breaks: keduca-kde3 (<< 4:3.5.13) +Replaces: keduca-trinity (<< 4:14.0.0) +Breaks: keduca-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3}) Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html Description: interactive form-based tests for Trinity @@ -187,8 +187,8 @@ Description: interactive form-based tests for Trinity Package: kgeography-trinity Architecture: any Section: kde -Replaces: kgeography-kde3 (<< 4:3.5.13) -Breaks: kgeography-kde3 (<< 4:3.5.13) +Replaces: kgeography-trinity (<< 4:14.0.0) +Breaks: kgeography-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, kgeography-data-trinity (>> ${KDE-Version3}), kgeography-data-trinity (<< ${KDE-Next-Version3}), tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3}) Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html Description: Geography learning tool for Trinity @@ -203,8 +203,8 @@ Description: Geography learning tool for Trinity Package: kgeography-data-trinity Architecture: all Section: kde -Replaces: kgeography-data-kde3 (<< 4:3.5.13) -Breaks: kgeography-data-kde3 (<< 4:3.5.13) +Replaces: kgeography-data-trinity (<< 4:14.0.0) +Breaks: kgeography-data-trinity (<< 4:14.0.0) Description: data files for KGeography This package contains architecture-independent data files for KGeography, the geography learning tool for KDE. This includes map @@ -218,8 +218,8 @@ Description: data files for KGeography Package: khangman-trinity Architecture: any Section: games -Replaces: khangman-kde3 (<< 4:3.5.13) -Breaks: khangman-kde3 (<< 4:3.5.13) +Replaces: khangman-trinity (<< 4:14.0.0) +Breaks: khangman-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, ttf-dustin, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3}) Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html Description: the classical hangman game for Trinity @@ -238,8 +238,8 @@ Description: the classical hangman game for Trinity Package: kig-trinity Architecture: any Section: math -Replaces: kig-kde3 (<< 4:3.5.13) -Breaks: kig-kde3 (<< 4:3.5.13) +Replaces: kig-trinity (<< 4:14.0.0) +Breaks: kig-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3}) Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html Description: interactive geometry program for KDE @@ -266,8 +266,8 @@ Description: interactive geometry program for KDE Package: kiten-trinity Architecture: any Section: kde -Replaces: kiten-kde3 (<< 4:3.5.13) -Breaks: kiten-kde3 (<< 4:3.5.13) +Replaces: kiten-trinity (<< 4:14.0.0) +Breaks: kiten-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3}), ttf-kochi-gothic | ttf-kochi-mincho Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html Description: Japanese reference/study tool for Trinity @@ -283,8 +283,8 @@ Description: Japanese reference/study tool for Trinity Package: klatin-trinity Architecture: any Section: kde -Replaces: klatin-kde3 (<< 4:3.5.13) -Breaks: klatin-kde3 (<< 4:3.5.13) +Replaces: klatin-trinity (<< 4:14.0.0) +Breaks: klatin-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3}) Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html Description: application to help revise/teach Latin @@ -308,8 +308,8 @@ Description: application to help revise/teach Latin Package: klettres-trinity Architecture: any Section: kde -Replaces: klettres-kde3 (<< 4:3.5.13) -Breaks: klettres-kde3 (<< 4:3.5.13) +Replaces: klettres-trinity (<< 4:14.0.0) +Breaks: klettres-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, klettres-data-trinity (>> ${KDE-Version3}), klettres-data-trinity (<< ${KDE-Next-Version3}), tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3}) Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html Description: foreign alphabet tutor for Trinity @@ -327,8 +327,8 @@ Description: foreign alphabet tutor for Trinity Package: klettres-data-trinity Architecture: all Section: kde -Replaces: klettres-data-kde3 (<< 4:3.5.13) -Breaks: klettres-data-kde3 (<< 4:3.5.13) +Replaces: klettres-data-trinity (<< 4:14.0.0) +Breaks: klettres-data-trinity (<< 4:14.0.0) Description: data files for KLettres foreign alphabet tutor This package contains architecture-independent data files for KLettres, the foreign alphabet tutor for KDE. This includes sound @@ -342,8 +342,8 @@ Description: data files for KLettres foreign alphabet tutor Package: kmplot-trinity Architecture: any Section: math -Replaces: kmplot-kde3 (<< 4:3.5.13) -Breaks: kmplot-kde3 (<< 4:3.5.13) +Replaces: kmplot-trinity (<< 4:14.0.0) +Breaks: kmplot-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3}) Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html Description: mathematical function plotter for Trinity @@ -366,8 +366,8 @@ Description: mathematical function plotter for Trinity Package: kpercentage-trinity Architecture: any Section: math -Replaces: kpercentage-kde3 (<< 4:3.5.13) -Breaks: kpercentage-kde3 (<< 4:3.5.13) +Replaces: kpercentage-trinity (<< 4:14.0.0) +Breaks: kpercentage-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3}) Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html Description: percentage calculation teaching tool for Trinity @@ -384,8 +384,8 @@ Description: percentage calculation teaching tool for Trinity Package: kstars-trinity Architecture: any Section: science -Replaces: kstars-kde3 (<< 4:3.5.13) -Breaks: kstars-kde3 (<< 4:3.5.13) +Replaces: kstars-trinity (<< 4:14.0.0) +Breaks: kstars-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, kstars-data-trinity (>> ${KDE-Version3}), kstars-data-trinity (<< ${KDE-Next-Version3}), tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3}), indi-trinity (= ${Source-Version}) Suggests: konqueror-trinity, khelpcenter-trinity, tdeedu-trinity-doc-html Description: desktop planetarium for Trinity @@ -407,8 +407,8 @@ Description: desktop planetarium for Trinity Package: kstars-data-trinity Architecture: all Section: science -Replaces: kstars-data-kde3 (<< 4:3.5.13) -Breaks: kstars-data-kde3 (<< 4:3.5.13) +Replaces: kstars-data-trinity (<< 4:14.0.0) +Breaks: kstars-data-trinity (<< 4:14.0.0) Description: data files for KStars desktop planetarium This package contains architecture-independent data files for KStars, the graphical desktop planetarium for KDE. This includes star @@ -422,8 +422,8 @@ Description: data files for KStars desktop planetarium Package: ktouch-trinity Architecture: any Section: kde -Replaces: ktouch-kde3 (<< 4:3.5.13) -Breaks: ktouch-kde3 (<< 4:3.5.13) +Replaces: ktouch-trinity (<< 4:14.0.0) +Breaks: ktouch-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3}) Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html Description: touch typing tutor for Trinity @@ -442,8 +442,8 @@ Description: touch typing tutor for Trinity Package: kturtle-trinity Architecture: any Section: devel -Replaces: kturtle-kde3 (<< 4:3.5.13) -Breaks: kturtle-kde3 (<< 4:3.5.13) +Replaces: kturtle-trinity (<< 4:14.0.0) +Breaks: kturtle-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3}) Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html Description: educational Logo programming environment @@ -470,8 +470,8 @@ Description: educational Logo programming environment Package: kverbos-trinity Architecture: any Section: kde -Replaces: kverbos-kde3 (<< 4:3.5.13) -Breaks: kverbos-kde3 (<< 4:3.5.13) +Replaces: kverbos-trinity (<< 4:14.0.0) +Breaks: kverbos-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3}) Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html Description: Spanish verb form study application for Trinity @@ -489,8 +489,8 @@ Description: Spanish verb form study application for Trinity Package: kvoctrain-trinity Architecture: any Section: kde -Replaces: kvoctrain-kde3 (<< 4:3.5.13) -Breaks: kvoctrain-kde3 (<< 4:3.5.13) +Replaces: kvoctrain-trinity (<< 4:14.0.0) +Breaks: kvoctrain-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, ${perl:Depends}, libwww-perl, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3}) Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html Description: vocabulary trainer for Trinity @@ -515,8 +515,8 @@ Description: vocabulary trainer for Trinity Package: kwordquiz-trinity Architecture: any Section: kde -Replaces: kwordquiz-kde3 (<< 4:3.5.13) -Breaks: kwordquiz-kde3 (<< 4:3.5.13) +Replaces: kwordquiz-trinity (<< 4:14.0.0) +Breaks: kwordquiz-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3}) Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html Description: flashcard and vocabulary learning program for Trinity @@ -534,8 +534,8 @@ Description: flashcard and vocabulary learning program for Trinity Package: libtdeedu3-trinity Architecture: any Section: libs -Replaces: libtdeedu3-kde3 (<< 4:3.5.13) -Breaks: libtdeedu3-kde3 (<< 4:3.5.13) +Replaces: libkdeedu3-trinity (<< 4:14.0.0) +Breaks: libkdeedu3-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: library for use with Trinity educational apps The KDE-based library libtdeedu is used with educational @@ -548,8 +548,8 @@ Description: library for use with Trinity educational apps Package: libtdeedu-trinity-dev Architecture: any Section: libdevel -Replaces: libtdeedu-kde3-dev (<< 4:3.5.13) -Breaks: libtdeedu-kde3-dev (<< 4:3.5.13) +Replaces: libkdeedu-trinity-dev (<< 4:14.0.0) +Breaks: libkdeedu-trinity-dev (<< 4:14.0.0) Depends: libtdeedu3-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8) Description: development files for Trinity educational library The KDE-based library libtdeedu is used with educational @@ -564,8 +564,8 @@ Description: development files for Trinity educational library Package: libkiten1-trinity Architecture: any Section: libs -Replaces: libkiten1-kde3 (<< 4:3.5.13) -Breaks: libkiten1-kde3 (<< 4:3.5.13) +Replaces: libkiten1-trinity (<< 4:14.0.0) +Breaks: libkiten1-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, edict, kanjidic Recommends: ttf-kochi-gothic | ttf-kochi-mincho Description: library for Kiten Japanese reference/study tool @@ -584,8 +584,8 @@ Description: library for Kiten Japanese reference/study tool Package: libkiten-trinity-dev Architecture: any Section: libdevel -Replaces: libkiten-kde3-dev (<< 4:3.5.13) -Breaks: libkiten-kde3-dev (<< 4:3.5.13) +Replaces: libkiten-trinity-dev (<< 4:14.0.0) +Breaks: libkiten-trinity-dev (<< 4:14.0.0) Depends: libkiten1-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8) Description: development files for Kiten library Kiten is a Japanese reference/study tool for KDE. The library @@ -602,8 +602,8 @@ Description: development files for Kiten library Package: indi-trinity Architecture: any Section: science -Replaces: indi-kde3 (<< 4:3.5.13) -Breaks: indi-kde3 (<< 4:3.5.13) +Replaces: indi-trinity (<< 4:14.0.0) +Breaks: indi-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Instrument Neutral Distributed Interface for astronomical devices INDI is an Instrument Neutral Distributed Interface control protocol for diff --git a/ubuntu/maverick/tdeedu/debian/copyright b/ubuntu/maverick/tdeedu/debian/copyright index 7d67a2bfe..a7ca45956 100644 --- a/ubuntu/maverick/tdeedu/debian/copyright +++ b/ubuntu/maverick/tdeedu/debian/copyright @@ -30,7 +30,7 @@ Upstream Authors: KLettres: Anne-Marie Mahfouf <annma@kde.org> and many others KMathTool: Birgit Schulz <B.Schulz@Superlehrer.de>, Marco Wegner <mail@marcowegner.de> - KmPlot: Klaus-Dieter Möller <kdmoeller@foni.net>, + KmPlot: Klaus-Dieter Möller <tdmoeller@foni.net>, Matthias Messmer <bmlmessmer@web.de>, Fredrik Edemar <f_edemar@linux.se> KPercentage: Matthias Messmer <bmlmessmer@web.de>, diff --git a/ubuntu/maverick/tdeedu/debian/man/kmplot-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/kmplot-trinity.1 index 427e97137..257190530 100644 --- a/ubuntu/maverick/tdeedu/debian/man/kmplot-trinity.1 +++ b/ubuntu/maverick/tdeedu/debian/man/kmplot-trinity.1 @@ -51,7 +51,7 @@ If the KDE Help Centre is not installed then you can install the package \fItdeedu-doc-html\fP and read this documentation in HTML format from \fI/opt/trinity/share/doc/kde/HTML/en/kmplot/\fP. .SH AUTHOR -KmPlot was written by Klaus-Dieter Moeller <kdmoeller@foni.net>, +KmPlot was written by Klaus-Dieter Moeller <tdmoeller@foni.net>, Matthias Messmer <bmlmessmer@web.de> and Fredrik Edemar <f_edemar@linux.se>. .br This manual page was prepared by Ben Burton <bab@debian.org> diff --git a/ubuntu/maverick/tdeedu/debian/source/format b/ubuntu/maverick/tdeedu/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/tdeedu/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/tdeedu/debian/source/options b/ubuntu/maverick/tdeedu/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/tdeedu/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/tdegames/debian/changelog b/ubuntu/maverick/tdegames/debian/changelog index 4a2687c2a..17e0e836e 100644 --- a/ubuntu/maverick/tdegames/debian/changelog +++ b/ubuntu/maverick/tdegames/debian/changelog @@ -610,7 +610,7 @@ tdegames (4:3.1.0-1) unstable; urgency=low * Remove cruft no longer necessary when upgrading from Woody or later, as well as obsolete Depends and Enhances on tdebase. * Downgrade gnubg to suggests of kbackgammon. - * Wrote short manual pages for kwin4proc and lskatproc, simply + * Wrote short manual pages for twin4proc and lskatproc, simply telling users not to run them directly. * Change policy to 3.5.8 (no changes needed). diff --git a/ubuntu/maverick/tdegames/debian/control b/ubuntu/maverick/tdegames/debian/control index 8a0e3a68b..9f634b9b7 100644 --- a/ubuntu/maverick/tdegames/debian/control +++ b/ubuntu/maverick/tdegames/debian/control @@ -5,15 +5,15 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Daniel Schepler <schepler@debian.org>, Sune Vuorela <debian@pusling.com> Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libtool, groff-base, sharutils, bzip2, sharutils, libogg-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev -Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, qt3-doc, tdelibs4-trinity-doc +Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, libtqtinterface-doc, tdelibs4-trinity-doc Standards-Version: 3.8.4 Package: tdegames-trinity Architecture: all Section: kde -Replaces: tdegames-kde3 (<< 4:3.5.13) -Breaks: tdegames-kde3 (<< 4:3.5.13) -Depends: atlantik-trinity (>= ${Source-Version}), kasteroids-trinity (>= ${Source-Version}), katomic-trinity (>= ${Source-Version}), kbackgammon-trinity (>= ${Source-Version}), kbattleship-trinity (>= ${Source-Version}), kblackbox-trinity (>= ${Source-Version}), kbounce-trinity (>= ${Source-Version}), kenolaba-trinity (>= ${Source-Version}), kfouleggs-trinity (>= ${Source-Version}), kgoldrunner-trinity (>= ${Source-Version}), kjumpingcube-trinity (>= ${Source-Version}), klickety-trinity (>= ${Source-Version}), klines-trinity (>= ${Source-Version}), kmahjongg-trinity (>= ${Source-Version}), kmines-trinity (>= ${Source-Version}), knetwalk-trinity (>= ${Source-Version}), kolf-trinity (>= ${Source-Version}), konquest-trinity (>= ${Source-Version}), kpat-trinity (>= ${Source-Version}), kpoker-trinity (>= ${Source-Version}), kreversi-trinity (>= ${Source-Version}), ksame-trinity (>= ${Source-Version}), kshisen-trinity (>= ${Source-Version}), ksirtet-trinity (>= ${Source-Version}), ksmiletris-trinity (>= ${Source-Version}), ksnake-trinity (>= ${Source-Version}), ksokoban-trinity (>= ${Source-Version}), kspaceduel-trinity (>= ${Source-Version}), ktron-trinity (>= ${Source-Version}), ktuberling-trinity (>= ${Source-Version}), kwin4-trinity (>= ${Source-Version}), lskat-trinity (>= ${Source-Version}) +Replaces: kdegames-trinity (<< 4:14.0.0) +Breaks: kdegames-trinity (<< 4:14.0.0) +Depends: atlantik-trinity (>= ${Source-Version}), kasteroids-trinity (>= ${Source-Version}), katomic-trinity (>= ${Source-Version}), kbackgammon-trinity (>= ${Source-Version}), kbattleship-trinity (>= ${Source-Version}), kblackbox-trinity (>= ${Source-Version}), kbounce-trinity (>= ${Source-Version}), kenolaba-trinity (>= ${Source-Version}), kfouleggs-trinity (>= ${Source-Version}), kgoldrunner-trinity (>= ${Source-Version}), kjumpingcube-trinity (>= ${Source-Version}), klickety-trinity (>= ${Source-Version}), klines-trinity (>= ${Source-Version}), kmahjongg-trinity (>= ${Source-Version}), kmines-trinity (>= ${Source-Version}), knetwalk-trinity (>= ${Source-Version}), kolf-trinity (>= ${Source-Version}), konquest-trinity (>= ${Source-Version}), kpat-trinity (>= ${Source-Version}), kpoker-trinity (>= ${Source-Version}), kreversi-trinity (>= ${Source-Version}), ksame-trinity (>= ${Source-Version}), kshisen-trinity (>= ${Source-Version}), ksirtet-trinity (>= ${Source-Version}), ksmiletris-trinity (>= ${Source-Version}), ksnake-trinity (>= ${Source-Version}), ksokoban-trinity (>= ${Source-Version}), kspaceduel-trinity (>= ${Source-Version}), ktron-trinity (>= ${Source-Version}), ktuberling-trinity (>= ${Source-Version}), twin4-trinity (>= ${Source-Version}), lskat-trinity (>= ${Source-Version}) Suggests: tdegames-trinity-doc-html (>= ${Source-Version}), khelpcenter-trinity Description: games from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -27,8 +27,8 @@ Description: games from the official Trinity release Package: tdegames-trinity-doc-html Architecture: all Section: doc -Replaces: tdegames-kde3-doc-html (<< 4:3.5.13) -Breaks: tdegames-kde3-doc-html (<< 4:3.5.13) +Replaces: kdegames-trinity-doc-html (<< 4:14.0.0) +Breaks: kdegames-trinity-doc-html (<< 4:14.0.0) Suggests: konqueror-trinity | www-browser, tdegames-trinity Description: KDE games documentation in HTML format By default the games provided with KDE (the K Desktop Environment) @@ -47,8 +47,8 @@ Description: KDE games documentation in HTML format Package: libtdegames1-trinity Architecture: any Section: games -Replaces: libtdegames1-kde3 (<< 4:3.5.13) -Breaks: libtdegames1-kde3 (<< 4:3.5.13) +Replaces: libkdegames1-trinity (<< 4:14.0.0) +Breaks: libkdegames1-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Trinity games library and common files This library provides a common infrastructure for several of the @@ -62,8 +62,8 @@ Description: Trinity games library and common files Package: tdegames-trinity-dbg Architecture: any Depends: tdelibs-trinity-dbg -Replaces: tdegames-kde3-dbg (<< 4:3.5.13) -Breaks: tdegames-kde3-dbg (<< 4:3.5.13) +Replaces: kdegames-trinity-dbg (<< 4:14.0.0) +Breaks: kdegames-trinity-dbg (<< 4:14.0.0) Priority: extra Section: kde Description: debugging symbols for tdegames @@ -74,8 +74,8 @@ Description: debugging symbols for tdegames Package: libtdegames-trinity-dev Architecture: any Section: libdevel -Replaces: libtdegames-kde3-dev (<< 4:3.5.13) -Breaks: libtdegames-kde3-dev (<< 4:3.5.13) +Replaces: libkdegames-trinity-dev (<< 4:14.0.0) +Breaks: libkdegames-trinity-dev (<< 4:14.0.0) Depends: tdelibs4-trinity-dev (>= 4:3.5.1), libtdegames1-trinity (= ${Source-Version}) Description: Trinity games library headers This package is necessary if you want to develop your own games using @@ -87,9 +87,9 @@ Description: Trinity games library headers Package: libtdegames-trinity-doc Architecture: all Section: doc -Replaces: libtdegames-kde3-doc (<< 4:3.5.13) -Breaks: libtdegames-kde3-doc (<< 4:3.5.13) -Recommends: tdelibs4-trinity-doc, qt3-doc +Replaces: libkdegames-trinity-doc (<< 4:14.0.0) +Breaks: libkdegames-trinity-doc (<< 4:14.0.0) +Recommends: tdelibs4-trinity-doc, libtqtinterface-doc Suggests: konqueror-trinity | www-browser, libtdegames-trinity-dev Description: API documentation for the Trinity games library This package contains the developers' documentation for libtdegames. @@ -101,8 +101,8 @@ Description: API documentation for the Trinity games library Package: tdegames-card-data-trinity Architecture: all Section: games -Replaces: tdegames-card-data-kde3 (<< 4:3.5.13) -Breaks: tdegames-card-data-kde3 (<< 4:3.5.13) +Replaces: kdegames-card-data-trinity (<< 4:14.0.0) +Breaks: kdegames-card-data-trinity (<< 4:14.0.0) Description: Card decks for Trinity games Several different collections of card images for use by KDE games. . @@ -112,8 +112,8 @@ Description: Card decks for Trinity games Package: atlantik-trinity Architecture: any Section: games -Replaces: atlantik-kde3 (<< 4:3.5.13) -Breaks: atlantik-kde3 (<< 4:3.5.13) +Replaces: atlantik-trinity (<< 4:14.0.0) +Breaks: atlantik-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: atlantikdesigner-trinity, monopd Description: KDE client for Monopoly-like network games @@ -129,8 +129,8 @@ Description: KDE client for Monopoly-like network games Package: atlantik-trinity-dev Architecture: any Section: devel -Replaces: atlantik-kde3-dev (<< 4:3.5.13) -Breaks: atlantik-kde3-dev (<< 4:3.5.13) +Replaces: atlantik-trinity-dev (<< 4:14.0.0) +Breaks: atlantik-trinity-dev (<< 4:14.0.0) Priority: extra Depends: ${shlibs:Depends}, atlantik-trinity (= ${Source-Version}), libtdegames-trinity-dev (= ${Source-Version}) Description: Development files for Atlantik @@ -143,8 +143,8 @@ Description: Development files for Atlantik Package: kasteroids-trinity Architecture: any Section: games -Replaces: kasteroids-kde3 (<< 4:3.5.13) -Breaks: kasteroids-kde3 (<< 4:3.5.13) +Replaces: kasteroids-trinity (<< 4:14.0.0) +Breaks: kasteroids-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Asteroids for Trinity You know this game. It is based on Warwick Allison's QwSpriteField @@ -160,8 +160,8 @@ Description: Asteroids for Trinity Package: katomic-trinity Architecture: any Section: games -Replaces: katomic-kde3 (<< 4:3.5.13) -Breaks: katomic-kde3 (<< 4:3.5.13) +Replaces: katomic-trinity (<< 4:14.0.0) +Breaks: katomic-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Atomic Entertainment game for Trinity This is a puzzle game, in which the object is to assemble a molecule @@ -175,8 +175,8 @@ Description: Atomic Entertainment game for Trinity Package: kbackgammon-trinity Architecture: any Section: games -Replaces: kbackgammon-kde3 (<< 4:3.5.13) -Breaks: kbackgammon-kde3 (<< 4:3.5.13) +Replaces: kbackgammon-trinity (<< 4:14.0.0) +Breaks: kbackgammon-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: gnubg Description: A Backgammon game for Trinity @@ -192,8 +192,8 @@ Description: A Backgammon game for Trinity Package: kbattleship-trinity Architecture: any Section: games -Replaces: kbattleship-kde3 (<< 4:3.5.13) -Breaks: kbattleship-kde3 (<< 4:3.5.13) +Replaces: kbattleship-trinity (<< 4:14.0.0) +Breaks: kbattleship-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Battleship game for Trinity This is an implementation of the Battleship game. Each player tries @@ -207,8 +207,8 @@ Description: Battleship game for Trinity Package: kblackbox-trinity Architecture: any Section: games -Replaces: kblackbox-kde3 (<< 4:3.5.13) -Breaks: kblackbox-kde3 (<< 4:3.5.13) +Replaces: kblackbox-trinity (<< 4:14.0.0) +Breaks: kblackbox-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: A simple logical game for the Trinity project KBlackBox is a game of hide and seek played on an grid of boxes. Your @@ -224,8 +224,8 @@ Description: A simple logical game for the Trinity project Package: kbounce-trinity Architecture: any Section: games -Replaces: kbounce-kde3 (<< 4:3.5.13) -Breaks: kbounce-kde3 (<< 4:3.5.13) +Replaces: kbounce-trinity (<< 4:14.0.0) +Breaks: kbounce-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Jezzball clone for the K Desktop Environment This is a clone of the popular Jezzball game originally created by @@ -251,8 +251,8 @@ Description: Jezzball clone for the K Desktop Environment Package: kenolaba-trinity Architecture: any Section: games -Replaces: kenolaba-kde3 (<< 4:3.5.13) -Breaks: kenolaba-kde3 (<< 4:3.5.13) +Replaces: kenolaba-trinity (<< 4:14.0.0) +Breaks: kenolaba-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Enolaba board game for Trinity kenolaba is a simple board strategy game that is played by two @@ -270,8 +270,8 @@ Description: Enolaba board game for Trinity Package: kfouleggs-trinity Architecture: any Section: games -Replaces: kfouleggs-kde3 (<< 4:3.5.13) -Breaks: kfouleggs-kde3 (<< 4:3.5.13) +Replaces: kfouleggs-trinity (<< 4:14.0.0) +Breaks: kfouleggs-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: A KDE clone of the Japanese PuyoPuyo game KFouleggs is a clone of the Japanese PuyoPuyo game, with advanced @@ -285,8 +285,8 @@ Description: A KDE clone of the Japanese PuyoPuyo game Package: kgoldrunner-trinity Architecture: any Section: games -Replaces: kgoldrunner-kde3 (<< 4:3.5.13) -Breaks: kgoldrunner-kde3 (<< 4:3.5.13) +Replaces: kgoldrunner-trinity (<< 4:14.0.0) +Breaks: kgoldrunner-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: A Trinity clone of the Loderunner arcade game KGoldrunner, a game of action and puzzle solving. Run through the @@ -310,8 +310,8 @@ Description: A Trinity clone of the Loderunner arcade game Package: kjumpingcube-trinity Architecture: any Section: games -Replaces: kjumpingcube-kde3 (<< 4:3.5.13) -Breaks: kjumpingcube-kde3 (<< 4:3.5.13) +Replaces: kjumpingcube-trinity (<< 4:14.0.0) +Breaks: kjumpingcube-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Tactical one or two player game KJumpingCube is a simple tactical game. You can play it against the @@ -327,8 +327,8 @@ Description: Tactical one or two player game Package: klickety-trinity Architecture: any Section: games -Replaces: klickety-kde3 (<< 4:3.5.13) -Breaks: klickety-kde3 (<< 4:3.5.13) +Replaces: klickety-trinity (<< 4:14.0.0) +Breaks: klickety-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: A Clickomania-like game for Trinity Klickety is an adaptation of the (perhaps) well-known Clickomania @@ -340,8 +340,8 @@ Description: A Clickomania-like game for Trinity Package: klines-trinity Architecture: any Section: games -Replaces: klines-kde3 (<< 4:3.5.13) -Breaks: klines-kde3 (<< 4:3.5.13) +Replaces: klines-trinity (<< 4:14.0.0) +Breaks: klines-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Color lines for Trinity KLines is a simple game. It is played by one player, so there is only @@ -362,8 +362,8 @@ Description: Color lines for Trinity Package: kmahjongg-trinity Architecture: any Section: games -Replaces: kmahjongg-kde3 (<< 4:3.5.13) -Breaks: kmahjongg-kde3 (<< 4:3.5.13) +Replaces: kmahjongg-trinity (<< 4:14.0.0) +Breaks: kmahjongg-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: the classic mahjongg game for Trinity project Your mission in this game is to remove all tiles from the game board. A @@ -376,8 +376,8 @@ Description: the classic mahjongg game for Trinity project Package: kmines-trinity Architecture: any Section: games -Replaces: kmines-kde3 (<< 4:3.5.13) -Breaks: kmines-kde3 (<< 4:3.5.13) +Replaces: kmines-trinity (<< 4:14.0.0) +Breaks: kmines-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Minesweeper for Trinity KMines is the classic Minesweeper game. You must uncover all the @@ -395,8 +395,8 @@ Description: Minesweeper for Trinity Package: knetwalk-trinity Architecture: any Section: games -Replaces: knetwalk-kde3 (<< 4:3.5.13) -Breaks: knetwalk-kde3 (<< 4:3.5.13) +Replaces: knetwalk-trinity (<< 4:14.0.0) +Breaks: knetwalk-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: A game for system administrators This game presents the player with a rectangular field consisting of @@ -410,8 +410,8 @@ Description: A game for system administrators Package: kolf-trinity Architecture: any Section: games -Replaces: kolf-kde3 (<< 4:3.5.13) -Breaks: kolf-kde3 (<< 4:3.5.13) +Replaces: kolf-trinity (<< 4:14.0.0) +Breaks: kolf-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Minigolf game for KDE This is a minigolf game for KDE that allows you to go through different @@ -423,8 +423,8 @@ Description: Minigolf game for KDE Package: kolf-trinity-dev Architecture: any Section: devel -Replaces: kolf-kde3-dev (<< 4:3.5.13) -Breaks: kolf-kde3-dev (<< 4:3.5.13) +Replaces: kolf-trinity-dev (<< 4:14.0.0) +Breaks: kolf-trinity-dev (<< 4:14.0.0) Priority: extra Depends: ${shlibs:Depends}, kolf-trinity (= ${Source-Version}), libtdegames-trinity-dev (= ${Source-Version}) Description: Development files for Kolf @@ -437,8 +437,8 @@ Description: Development files for Kolf Package: konquest-trinity Architecture: any Section: games -Replaces: konquest-kde3 (<< 4:3.5.13) -Breaks: konquest-kde3 (<< 4:3.5.13) +Replaces: konquest-trinity (<< 4:14.0.0) +Breaks: konquest-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: KDE based GNU-Lactic Konquest game This the KDE version of Gnu-Lactic Konquest, a multi-player strategy @@ -451,8 +451,8 @@ Description: KDE based GNU-Lactic Konquest game Package: kpat-trinity Architecture: any Section: games -Replaces: kpat-kde3 (<< 4:3.5.13) -Breaks: kpat-kde3 (<< 4:3.5.13) +Replaces: kpat-trinity (<< 4:14.0.0) +Breaks: kpat-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdebase-data-trinity, tdegames-card-data-trinity Description: Trinity solitaire patience game KPatience is a collection of 14 card games. All the games are single @@ -464,8 +464,8 @@ Description: Trinity solitaire patience game Package: kpoker-trinity Architecture: any Section: games -Replaces: kpoker-kde3 (<< 4:3.5.13) -Breaks: kpoker-kde3 (<< 4:3.5.13) +Replaces: kpoker-trinity (<< 4:14.0.0) +Breaks: kpoker-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdegames-card-data-trinity Description: Trinity based Poker clone KPoker is a KDE compliant clone of those highly addictive pocket @@ -477,8 +477,8 @@ Description: Trinity based Poker clone Package: kreversi-trinity Architecture: any Section: games -Replaces: kreversi-kde3 (<< 4:3.5.13) -Breaks: kreversi-kde3 (<< 4:3.5.13) +Replaces: kreversi-trinity (<< 4:14.0.0) +Breaks: kreversi-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Reversi for Trinity Reversi is a simple strategy game that is played by two @@ -494,8 +494,8 @@ Description: Reversi for Trinity Package: ksame-trinity Architecture: any Section: games -Replaces: ksame-kde3 (<< 4:3.5.13) -Breaks: ksame-kde3 (<< 4:3.5.13) +Replaces: ksame-trinity (<< 4:14.0.0) +Breaks: ksame-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: SameGame for Trinity KSame is a simple game. It's played by one player, so there is only @@ -509,8 +509,8 @@ Description: SameGame for Trinity Package: kshisen-trinity Architecture: any Section: games -Replaces: kshisen-kde3 (<< 4:3.5.13) -Breaks: kshisen-kde3 (<< 4:3.5.13) +Replaces: kshisen-trinity (<< 4:14.0.0) +Breaks: kshisen-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Shisen-Sho for Trinity KShisen-Sho is a single-player-game similar to Mahjongg and uses the @@ -524,8 +524,8 @@ Description: Shisen-Sho for Trinity Package: ksirtet-trinity Architecture: any Section: games -Replaces: ksirtet-kde3 (<< 4:3.5.13) -Breaks: ksirtet-kde3 (<< 4:3.5.13) +Replaces: ksirtet-trinity (<< 4:14.0.0) +Breaks: ksirtet-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Tetris and Puyo-Puyo games for Trinity This program is a clone of the well known game Tetris. You must fit @@ -543,8 +543,8 @@ Description: Tetris and Puyo-Puyo games for Trinity Package: ksmiletris-trinity Architecture: any Section: games -Replaces: ksmiletris-kde3 (<< 4:3.5.13) -Breaks: ksmiletris-kde3 (<< 4:3.5.13) +Replaces: ksmiletris-trinity (<< 4:14.0.0) +Breaks: ksmiletris-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Tetris like game for Trinity This is a game with falling blocks composed of different types of @@ -557,8 +557,8 @@ Description: Tetris like game for Trinity Package: ksnake-trinity Architecture: any Section: games -Replaces: ksnake-kde3 (<< 4:3.5.13) -Breaks: ksnake-kde3 (<< 4:3.5.13) +Replaces: ksnake-trinity (<< 4:14.0.0) +Breaks: ksnake-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Snake Race for Trinity Snake Race is a game of speed and agility. You are a hungry snake and @@ -570,8 +570,8 @@ Description: Snake Race for Trinity Package: ksokoban-trinity Architecture: any Section: games -Replaces: ksokoban-kde3 (<< 4:3.5.13) -Breaks: ksokoban-kde3 (<< 4:3.5.13) +Replaces: ksokoban-trinity (<< 4:14.0.0) +Breaks: ksokoban-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Sokoban game for Trinity The first sokoban game was created in 1982 by Hiroyuki Imabayashi at @@ -599,8 +599,8 @@ Description: Sokoban game for Trinity Package: kspaceduel-trinity Architecture: any Section: games -Replaces: kspaceduel-kde3 (<< 4:3.5.13) -Breaks: kspaceduel-kde3 (<< 4:3.5.13) +Replaces: kspaceduel-trinity (<< 4:14.0.0) +Breaks: kspaceduel-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Arcade two-player space game for Trinity KSpaceduel is an space arcade game for two players. @@ -616,8 +616,8 @@ Description: Arcade two-player space game for Trinity Package: ktron-trinity Architecture: any Section: games -Replaces: ktron-kde3 (<< 4:3.5.13) -Breaks: ktron-kde3 (<< 4:3.5.13) +Replaces: ktron-trinity (<< 4:14.0.0) +Breaks: ktron-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Tron clone for the K Desktop Environment The object of the game is to avoid running into walls, your own tail, @@ -629,8 +629,8 @@ Description: Tron clone for the K Desktop Environment Package: ktuberling-trinity Architecture: any Section: games -Replaces: ktuberling-kde3 (<< 4:3.5.13) -Breaks: ktuberling-kde3 (<< 4:3.5.13) +Replaces: ktuberling-trinity (<< 4:14.0.0) +Breaks: ktuberling-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Potato Guy for Trinity KTuberling is a game intended for small children. Of course, it may @@ -652,11 +652,11 @@ Description: Potato Guy for Trinity This package is part of Trinity, and a component of the KDE games module. See the 'kde-trinity' and 'tdegames-trinity' packages for more information. -Package: kwin4-trinity +Package: twin4-trinity Architecture: any Section: games -Replaces: kwin4-kde3 (<< 4:3.5.13) -Breaks: kwin4-kde3 (<< 4:3.5.13) +Replaces: kwin4-trinity (<< 4:14.0.0) +Breaks: kwin4-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Connect Four clone for Trinity Four wins is a game for two players. Each player is represented by a @@ -676,8 +676,8 @@ Description: Connect Four clone for Trinity Package: lskat-trinity Architecture: any Section: games -Replaces: lskat-kde3 (<< 4:3.5.13) -Breaks: lskat-kde3 (<< 4:3.5.13) +Replaces: lskat-trinity (<< 4:14.0.0) +Breaks: lskat-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdegames-card-data-trinity Description: Lieutnant Skat card game for Trinity Lieutnant Skat (from German Offiziersskat) is a card game for two diff --git a/ubuntu/maverick/tdegames/debian/control.in b/ubuntu/maverick/tdegames/debian/control.in index be2a79ba7..38f0737b9 100644 --- a/ubuntu/maverick/tdegames/debian/control.in +++ b/ubuntu/maverick/tdegames/debian/control.in @@ -11,7 +11,7 @@ Standards-Version: 3.7.2 Package: tdegames Architecture: all Section: kde -Depends: atlantik (>= ${Source-Version}), kasteroids (>= ${Source-Version}), katomic (>= ${Source-Version}), kbackgammon (>= ${Source-Version}), kbattleship (>= ${Source-Version}), kblackbox (>= ${Source-Version}), kbounce (>= ${Source-Version}), kenolaba (>= ${Source-Version}), kfouleggs (>= ${Source-Version}), kgoldrunner (>= ${Source-Version}), kjumpingcube (>= ${Source-Version}), klickety (>= ${Source-Version}), klines (>= ${Source-Version}), kmahjongg (>= ${Source-Version}), kmines (>= ${Source-Version}), knetwalk (>= ${Source-Version}), kolf (>= ${Source-Version}), konquest (>= ${Source-Version}), kpat (>= ${Source-Version}), kpoker (>= ${Source-Version}), kreversi (>= ${Source-Version}), ksame (>= ${Source-Version}), kshisen (>= ${Source-Version}), ksirtet (>= ${Source-Version}), ksmiletris (>= ${Source-Version}), ksnake (>= ${Source-Version}), ksokoban (>= ${Source-Version}), kspaceduel (>= ${Source-Version}), ktron (>= ${Source-Version}), ktuberling (>= ${Source-Version}), kwin4 (>= ${Source-Version}), lskat (>= ${Source-Version}) +Depends: atlantik (>= ${Source-Version}), kasteroids (>= ${Source-Version}), katomic (>= ${Source-Version}), kbackgammon (>= ${Source-Version}), kbattleship (>= ${Source-Version}), kblackbox (>= ${Source-Version}), kbounce (>= ${Source-Version}), kenolaba (>= ${Source-Version}), kfouleggs (>= ${Source-Version}), kgoldrunner (>= ${Source-Version}), kjumpingcube (>= ${Source-Version}), klickety (>= ${Source-Version}), klines (>= ${Source-Version}), kmahjongg (>= ${Source-Version}), kmines (>= ${Source-Version}), knetwalk (>= ${Source-Version}), kolf (>= ${Source-Version}), konquest (>= ${Source-Version}), kpat (>= ${Source-Version}), kpoker (>= ${Source-Version}), kreversi (>= ${Source-Version}), ksame (>= ${Source-Version}), kshisen (>= ${Source-Version}), ksirtet (>= ${Source-Version}), ksmiletris (>= ${Source-Version}), ksnake (>= ${Source-Version}), ksokoban (>= ${Source-Version}), kspaceduel (>= ${Source-Version}), ktron (>= ${Source-Version}), ktuberling (>= ${Source-Version}), twin4 (>= ${Source-Version}), lskat (>= ${Source-Version}) Suggests: tdegames-doc-html (>= ${Source-Version}) Description: games from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -574,7 +574,7 @@ Description: Potato Guy for KDE This package is part of KDE, and a component of the KDE games module. See the 'kde' and 'tdegames' packages for more information. -Package: kwin4 +Package: twin4 Architecture: any Section: games Depends: ${shlibs:Depends} diff --git a/ubuntu/maverick/tdegames/debian/icons/kwin4-16.xpm b/ubuntu/maverick/tdegames/debian/icons/kwin4-16.xpm index 2bad59cf8..fa15f0b8a 100644 --- a/ubuntu/maverick/tdegames/debian/icons/kwin4-16.xpm +++ b/ubuntu/maverick/tdegames/debian/icons/kwin4-16.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char *kwin4-16[] = { +static char *twin4-16[] = { /* columns rows colors chars-per-pixel */ "16 16 213 2", " c black", diff --git a/ubuntu/maverick/tdegames/debian/icons/kwin4.xpm b/ubuntu/maverick/tdegames/debian/icons/kwin4.xpm index 43b466224..9d752d62e 100644 --- a/ubuntu/maverick/tdegames/debian/icons/kwin4.xpm +++ b/ubuntu/maverick/tdegames/debian/icons/kwin4.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char *kwin4[] = { +static char *twin4[] = { /* columns rows colors chars-per-pixel */ "32 32 256 2", " c black", diff --git a/ubuntu/maverick/tdegames/debian/kwin4-trinity.install b/ubuntu/maverick/tdegames/debian/kwin4-trinity.install index f07634b26..143beeac9 100644 --- a/ubuntu/maverick/tdegames/debian/kwin4-trinity.install +++ b/ubuntu/maverick/tdegames/debian/kwin4-trinity.install @@ -1,14 +1,14 @@ -/opt/trinity/games/kwin4 -/opt/trinity/games/kwin4proc -/opt/trinity/share/apps/kwin4/* -/opt/trinity/share/config.kcfg/kwin4.kcfg -/opt/trinity/share/icons/hicolor/128x128/apps/kwin4.png -/opt/trinity/share/icons/hicolor/64x64/apps/kwin4.png -/opt/trinity/share/icons/hicolor/48x48/apps/kwin4.png -/opt/trinity/share/icons/hicolor/32x32/apps/kwin4.png -/opt/trinity/share/icons/hicolor/22x22/apps/kwin4.png -/opt/trinity/share/icons/hicolor/16x16/apps/kwin4.png -/opt/trinity/share/applications/kde/kwin4.desktop -/opt/trinity/share/doc/kde/HTML/en/kwin4/* -../icons/kwin4.xpm /opt/trinity/share/pixmaps -../icons/kwin4-16.xpm /opt/trinity/share/pixmaps +/opt/trinity/games/twin4 +/opt/trinity/games/twin4proc +/opt/trinity/share/apps/twin4/* +/opt/trinity/share/config.kcfg/twin4.kcfg +/opt/trinity/share/icons/hicolor/128x128/apps/twin4.png +/opt/trinity/share/icons/hicolor/64x64/apps/twin4.png +/opt/trinity/share/icons/hicolor/48x48/apps/twin4.png +/opt/trinity/share/icons/hicolor/32x32/apps/twin4.png +/opt/trinity/share/icons/hicolor/22x22/apps/twin4.png +/opt/trinity/share/icons/hicolor/16x16/apps/twin4.png +/opt/trinity/share/applications/kde/twin4.desktop +/opt/trinity/share/doc/kde/HTML/en/twin4/* +../icons/twin4.xpm /opt/trinity/share/pixmaps +../icons/twin4-16.xpm /opt/trinity/share/pixmaps diff --git a/ubuntu/maverick/tdegames/debian/kwin4-trinity.links b/ubuntu/maverick/tdegames/debian/kwin4-trinity.links index 37623f7af..1620ac717 100644 --- a/ubuntu/maverick/tdegames/debian/kwin4-trinity.links +++ b/ubuntu/maverick/tdegames/debian/kwin4-trinity.links @@ -1 +1 @@ -/opt/trinity/share/doc/kde/HTML/en/kwin4 /opt/trinity/share/doc/kwin4/html +/opt/trinity/share/doc/kde/HTML/en/twin4 /opt/trinity/share/doc/twin4/html diff --git a/ubuntu/maverick/tdegames/debian/kwin4-trinity.manpages b/ubuntu/maverick/tdegames/debian/kwin4-trinity.manpages index 610e1c8e9..5486638b1 100644 --- a/ubuntu/maverick/tdegames/debian/kwin4-trinity.manpages +++ b/ubuntu/maverick/tdegames/debian/kwin4-trinity.manpages @@ -1,2 +1,2 @@ -debian/man/out/kwin4-trinity.6 -debian/man/out/kwin4proc-trinity.6 +debian/man/out/twin4-trinity.6 +debian/man/out/twin4proc-trinity.6 diff --git a/ubuntu/maverick/tdegames/debian/kwin4-trinity.menu b/ubuntu/maverick/tdegames/debian/kwin4-trinity.menu index 0dc4d281f..cce23cd01 100644 --- a/ubuntu/maverick/tdegames/debian/kwin4-trinity.menu +++ b/ubuntu/maverick/tdegames/debian/kwin4-trinity.menu @@ -1,9 +1,9 @@ -?package(kwin4):\ +?package(twin4):\ needs="x11"\ section="Games/Board"\ hints="KDE"\ title="KWin4"\ - icon32x32="/usr/share/pixmaps/kwin4.xpm"\ - icon16x16="/usr/share/pixmaps/kwin4-16.xpm"\ - command="/opt/trinity/games/kwin4" + icon32x32="/usr/share/pixmaps/twin4.xpm"\ + icon16x16="/usr/share/pixmaps/twin4-16.xpm"\ + command="/opt/trinity/games/twin4" diff --git a/ubuntu/maverick/tdegames/debian/man/kwin4-trinity.man b/ubuntu/maverick/tdegames/debian/man/kwin4-trinity.man index f1e3a0def..2125170be 100644 --- a/ubuntu/maverick/tdegames/debian/man/kwin4-trinity.man +++ b/ubuntu/maverick/tdegames/debian/man/kwin4-trinity.man @@ -1,8 +1,8 @@ .TH KWIN4 6 .SH NAME -kwin4 \- Connect Four clone for KDE +twin4 \- Connect Four clone for KDE .SH SYNOPSIS -.B kwin4 +.B twin4 .I [Qt-options] [KDE-options] .SH DESCRIPTION Four wins is a game for two players. Each player is represented by a @@ -17,6 +17,6 @@ or diagonal or no more moves are possible because the board is filled. .so kdeopt.part .SH SEE ALSO More detailed user documentation is available from -.BR help:/kwin4 +.BR help:/twin4 (either enter this URL into \fBkonqueror\fP, or run `khelpcenter -help:/kwin4'). +help:/twin4'). diff --git a/ubuntu/maverick/tdegames/debian/man/kwin4proc-trinity.man b/ubuntu/maverick/tdegames/debian/man/kwin4proc-trinity.man index 3a8d08949..5b1856418 100644 --- a/ubuntu/maverick/tdegames/debian/man/kwin4proc-trinity.man +++ b/ubuntu/maverick/tdegames/debian/man/kwin4proc-trinity.man @@ -1,8 +1,8 @@ .TH KWIN4PROC 6 .SH NAME -kwin4proc \- AI backend for kwin4 +twin4proc \- AI backend for twin4 .SH DESCRIPTION -This program is used internally by kwin4. Users should not run it +This program is used internally by twin4. Users should not run it directly. .SH SEE ALSO -.BR kwin4 (6). +.BR twin4 (6). diff --git a/ubuntu/maverick/tdegames/debian/source/format b/ubuntu/maverick/tdegames/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/tdegames/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/tdegames/debian/source/options b/ubuntu/maverick/tdegames/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/tdegames/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kwin4 b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kwin4 index 8e9d8c8f2..09f2f43f3 100644 --- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kwin4 +++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kwin4 @@ -1,9 +1,9 @@ -Document: tdegames-doc-html-kwin4 +Document: tdegames-doc-html-twin4 Title: KWin4 Manual Author: Martin Heni Abstract: This documentation describes KWin4 version 1.0.0. Section: Games/Board Format: HTML -Index: /usr/share/doc/kde/HTML/en/kwin4/index.html -Files: /usr/share/doc/kde/HTML/en/kwin4/*.html +Index: /usr/share/doc/kde/HTML/en/twin4/index.html +Files: /usr/share/doc/kde/HTML/en/twin4/*.html diff --git a/ubuntu/maverick/tdegraphics/debian/control b/ubuntu/maverick/tdegraphics/debian/control index ce78e81ef..1194864e4 100644 --- a/ubuntu/maverick/tdegraphics/debian/control +++ b/ubuntu/maverick/tdegraphics/debian/control @@ -10,8 +10,8 @@ Standards-Version: 3.8.4 Package: tdegraphics-trinity Section: kde Architecture: all -Replaces: tdegraphics-kde3 (<< 4:3.5.13) -Breaks: tdegraphics-kde3 (<< 4:3.5.13) +Replaces: kdegraphics-trinity (<< 4:14.0.0) +Breaks: kdegraphics-trinity (<< 4:14.0.0) Depends: kamera-trinity (>= ${source:Version}), kcoloredit-trinity (>= ${source:Version}), tdegraphics-kfile-plugins-trinity (>= ${source:Version}), kdvi-trinity (>= ${source:Version}), kfax-trinity (>= ${source:Version}), kfaxview-trinity (>= ${source:Version}), kgamma-trinity (>= ${source:Version}), kghostview-trinity (>= ${source:Version}), kiconedit-trinity (>= ${source:Version}), kmrml-trinity (>= ${source:Version}), kolourpaint-trinity (>= ${source:Version}), kooka-trinity (>= ${source:Version}), kpdf-trinity (>= ${source:Version}), kpovmodeler-trinity (>= ${source:Version}), kruler-trinity (>= ${source:Version}), ksnapshot-trinity (>= ${source:Version}), ksvg-trinity (>= ${source:Version}), kview-trinity (>= ${source:Version}), kviewshell-trinity (>= ${source:Version}), libkscan1-trinity (>= ${source:Version}) Suggests: tdegraphics-trinity-doc-html (>= ${source:Version}) Description: graphics apps from the official Trinity release @@ -26,8 +26,8 @@ Description: graphics apps from the official Trinity release Package: tdegraphics-trinity-doc-html Architecture: all Section: doc -Replaces: tdegraphics-kde3-doc-html (<< 4:3.5.13) -Breaks: tdegraphics-kde3-doc-html (<< 4:3.5.13) +Replaces: kdegraphics-trinity-doc-html (<< 4:14.0.0) +Breaks: kdegraphics-trinity-doc-html (<< 4:14.0.0) Suggests: konqueror-trinity | www-browser, tdebase-trinity Description: KDE graphics documentation in HTML format By default the modules provided by KDE only provide their documentation @@ -46,8 +46,8 @@ Description: KDE graphics documentation in HTML format Package: kamera-trinity Section: graphics Architecture: any -Replaces: kamera-kde3 (<< 4:3.5.13) -Breaks: kamera-kde3 (<< 4:3.5.13) +Replaces: kamera-trinity (<< 4:14.0.0) +Breaks: kamera-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: digital camera io_slave for Konqueror @@ -60,8 +60,8 @@ Description: digital camera io_slave for Konqueror Package: kcoloredit-trinity Section: graphics Architecture: any -Replaces: kcoloredit-kde3 (<< 4:3.5.13) -Breaks: kcoloredit-kde3 (<< 4:3.5.13) +Replaces: kcoloredit-trinity (<< 4:14.0.0) +Breaks: kcoloredit-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: a color palette editor and color picker for KDE @@ -74,8 +74,8 @@ Description: a color palette editor and color picker for KDE Package: tdegraphics-trinity-dev Section: devel Architecture: any -Replaces: tdegraphics-kde3-dev (<< 4:3.5.13) -Breaks: tdegraphics-kde3-dev (<< 4:3.5.13) +Replaces: kdegraphics-trinity-dev (<< 4:14.0.0) +Breaks: kdegraphics-trinity-dev (<< 4:14.0.0) Depends: kghostview-trinity (= ${binary:Version}), kmrml-trinity (= ${binary:Version}), kpovmodeler-trinity (= ${binary:Version}), ksvg-trinity (= ${binary:Version}), kview-trinity (= ${binary:Version}), kviewshell-trinity (= ${binary:Version}), tdelibs4-trinity-dev (>= 4:3.5.8) Description: development files for the KDE graphics module This package contains headers and other development files for the KDE @@ -87,8 +87,8 @@ Description: development files for the KDE graphics module Package: tdegraphics-kfile-plugins-trinity Section: kde Architecture: any -Replaces: tdegraphics-kfile-plugins-kde3 (<< 4:3.5.13) -Breaks: tdegraphics-kfile-plugins-kde3 (<< 4:3.5.13) +Replaces: kdegraphics-kfile-plugins-trinity (<< 4:14.0.0) +Breaks: kdegraphics-kfile-plugins-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: KDE metainfo plugins for graphic files This packages provides meta information for graphic files (file sizes, @@ -100,8 +100,8 @@ Description: KDE metainfo plugins for graphic files Package: kdvi-trinity Section: graphics Architecture: any -Replaces: kdvi-kde3 (<< 4:3.5.13) -Breaks: kdvi-kde3 (<< 4:3.5.13) +Replaces: kdvi-trinity (<< 4:14.0.0) +Breaks: kdvi-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, texlive-fonts-recommended Suggests: khelpcenter-trinity Description: dvi viewer for KDE @@ -113,8 +113,8 @@ Description: dvi viewer for KDE Package: kfax-trinity Section: graphics Architecture: any -Replaces: kfax-kde3 (<< 4:3.5.13) -Breaks: kfax-kde3 (<< 4:3.5.13) +Replaces: kfax-trinity (<< 4:14.0.0) +Breaks: kfax-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, libtiff-tools Description: G3/G4 fax viewer for Trinity A fax viewer for Trinity, supporting the display of raw and tiffed fax images @@ -126,8 +126,8 @@ Description: G3/G4 fax viewer for Trinity Package: kfaxview-trinity Section: graphics Architecture: any -Replaces: kfaxview-kde3 (<< 4:3.5.13) -Breaks: kfaxview-kde3 (<< 4:3.5.13) +Replaces: kfaxview-trinity (<< 4:14.0.0) +Breaks: kfaxview-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: G3/G4 fax viewer for Trinity using kviewshell A fax viewer for Trinity, supporting the display of raw and tiffed fax images @@ -142,8 +142,8 @@ Description: G3/G4 fax viewer for Trinity using kviewshell Package: kgamma-trinity Section: graphics Architecture: any -Replaces: kgamma-kde3 (<< 4:3.5.13) -Breaks: kgamma-kde3 (<< 4:3.5.13) +Replaces: kgamma-trinity (<< 4:14.0.0) +Breaks: kgamma-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: gamma correction module for the Trinity Control Center @@ -159,9 +159,9 @@ Description: gamma correction module for the Trinity Control Center Package: kghostview-trinity Section: graphics Architecture: any -Replaces: kghostview-kde3 (<< 4:3.5.13) -Breaks: kghostview-kde3 (<< 4:3.5.13) -Depends: ${shlibs:Depends}, gs +Replaces: kghostview-trinity (<< 4:14.0.0) +Breaks: kghostview-trinity (<< 4:14.0.0) +Depends: ${shlibs:Depends}, ghostscript-x Suggests: khelpcenter-trinity Provides: postscript-viewer, pdf-viewer Description: PostScript viewer for Trinity @@ -178,8 +178,8 @@ Description: PostScript viewer for Trinity Package: kiconedit-trinity Section: graphics Architecture: any -Replaces: kiconedit-kde3 (<< 4:3.5.13) -Breaks: kiconedit-kde3 (<< 4:3.5.13) +Replaces: kiconedit-trinity (<< 4:14.0.0) +Breaks: kiconedit-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: an icon editor for Trinity @@ -191,8 +191,8 @@ Description: an icon editor for Trinity Package: kmrml-trinity Section: kde Architecture: any -Replaces: kmrml-kde3 (<< 4:3.5.13) -Breaks: kmrml-kde3 (<< 4:3.5.13) +Replaces: kmrml-trinity (<< 4:14.0.0) +Breaks: kmrml-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: gnuift Description: a Konqueror plugin for searching pictures @@ -207,8 +207,8 @@ Description: a Konqueror plugin for searching pictures Package: kolourpaint-trinity Section: graphics Architecture: any -Replaces: kolourpaint-kde3 (<< 4:3.5.13) -Breaks: kolourpaint-kde3 (<< 4:3.5.13) +Replaces: kolourpaint-trinity (<< 4:14.0.0) +Breaks: kolourpaint-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: a simple paint program for Trinity @@ -232,8 +232,8 @@ Description: a simple paint program for Trinity Package: kooka-trinity Section: graphics Architecture: any -Replaces: kooka-kde3 (<< 4:3.5.13) -Breaks: kooka-kde3 (<< 4:3.5.13) +Replaces: kooka-trinity (<< 4:14.0.0) +Breaks: kooka-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: ocrad | gocr Suggests: khelpcenter-trinity @@ -258,8 +258,8 @@ Description: scanner program for Trinity Package: kpdf-trinity Section: graphics Architecture: any -Replaces: kpdf-kde3 (<< 4:3.5.13) -Breaks: kpdf-kde3 (<< 4:3.5.13) +Replaces: kpdf-trinity (<< 4:14.0.0) +Breaks: kpdf-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: kghostview-trinity (= ${binary:Version}) Suggests: khelpcenter-trinity @@ -275,8 +275,8 @@ Description: PDF viewer for Trinity Package: kpovmodeler-trinity Section: graphics Architecture: any -Replaces: kpovmodeler-kde3 (<< 4:3.5.13) -Breaks: kpovmodeler-kde3 (<< 4:3.5.13) +Replaces: kpovmodeler-trinity (<< 4:14.0.0) +Breaks: kpovmodeler-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity, povray Description: a graphical editor for povray scenes @@ -300,8 +300,8 @@ Description: a graphical editor for povray scenes Package: kruler-trinity Section: graphics Architecture: any -Replaces: kruler-kde3 (<< 4:3.5.13) -Breaks: kruler-kde3 (<< 4:3.5.13) +Replaces: kruler-trinity (<< 4:14.0.0) +Breaks: kruler-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: a screen ruler and color measurement tool for Trinity @@ -313,8 +313,8 @@ Description: a screen ruler and color measurement tool for Trinity Package: ksnapshot-trinity Section: graphics Architecture: any -Replaces: ksnapshot-kde3 (<< 4:3.5.13) -Breaks: ksnapshot-kde3 (<< 4:3.5.13) +Replaces: ksnapshot-trinity (<< 4:14.0.0) +Breaks: ksnapshot-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: screenshot utility for Trinity @@ -328,8 +328,8 @@ Description: screenshot utility for Trinity Package: ksvg-trinity Section: graphics Architecture: any -Replaces: ksvg-kde3 (<< 4:3.5.13) -Breaks: ksvg-kde3 (<< 4:3.5.13) +Replaces: ksvg-trinity (<< 4:14.0.0) +Breaks: ksvg-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: SVG viewer for Trinity KSVG allows you view SVG (scalable vector graphics) files. This package @@ -342,8 +342,8 @@ Description: SVG viewer for Trinity Package: kview-trinity Section: graphics Architecture: any -Replaces: kview-kde3 (<< 4:3.5.13) -Breaks: kview-kde3 (<< 4:3.5.13) +Replaces: kview-trinity (<< 4:14.0.0) +Breaks: kview-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: simple image viewer/converter for Trinity @@ -357,8 +357,8 @@ Description: simple image viewer/converter for Trinity Package: kviewshell-trinity Section: graphics Architecture: any -Replaces: kviewshell-kde3 (<< 4:3.5.13) -Breaks: kviewshell-kde3 (<< 4:3.5.13) +Replaces: kviewshell-trinity (<< 4:14.0.0) +Breaks: kviewshell-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: generic framework for viewer applications in Trinity KViewShell is a generic viewing framework that allows the graphical @@ -374,8 +374,8 @@ Description: generic framework for viewer applications in Trinity Package: libkscan-trinity-dev Section: libdevel Architecture: any -Replaces: libkscan-kde3-dev (<< 4:3.5.13) -Breaks: libkscan-kde3-dev (<< 4:3.5.13) +Replaces: libkscan-trinity-dev (<< 4:14.0.0) +Breaks: libkscan-trinity-dev (<< 4:14.0.0) Depends: libkscan1-trinity (= ${binary:Version}), tdelibs4-trinity-dev (>= 4:3.5.8) Description: development files for the Trinity scanner library This package contains development files for Trinity's scanner library. @@ -386,8 +386,8 @@ Description: development files for the Trinity scanner library Package: libkscan1-trinity Section: libs Architecture: any -Replaces: libkscan1-kde3 (<< 4:3.5.13) -Breaks: libkscan1-kde3 (<< 4:3.5.13) +Replaces: libkscan1-trinity (<< 4:14.0.0) +Breaks: libkscan1-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: scanner library for Trinity KScan is KDE's scanner library. It's used by kooka and by koffice currently. @@ -400,8 +400,8 @@ Description: scanner library for Trinity Package: libpoppler-tqt Section: net Architecture: any -Replaces: libpoppler-tqt (<< 4:3.5.13) -Breaks: libpoppler-tqt (<< 4:3.5.13) +Replaces: libpoppler-tqt (<< 4:14.0.0) +Breaks: libpoppler-tqt (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: TQt support for Poppler TQt support library for Poppler. @@ -413,8 +413,8 @@ Description: TQt support for Poppler Package: libpoppler-tqt-dev Section: net Architecture: any -Replaces: libpoppler-tqt-dev (<< 4:3.5.13) -Breaks: libpoppler-tqt-dev (<< 4:3.5.13) +Replaces: libpoppler-tqt-dev (<< 4:14.0.0) +Breaks: libpoppler-tqt-dev (<< 4:14.0.0) Depends: ${shlibs:Depends}, libpoppler-dev, libpoppler-tqt Description: Development files for TQt support for Poppler Development files of TQt support library for Poppler. @@ -426,8 +426,8 @@ Description: Development files for TQt support for Poppler Package: tdegraphics-trinity-dbg Section: libdevel Architecture: any -Replaces: tdegraphics-kde3-dbg (<< 4:3.5.13) -Breaks: tdegraphics-kde3-dbg (<< 4:3.5.13) +Replaces: kdegraphics-trinity-dbg (<< 4:14.0.0) +Breaks: kdegraphics-trinity-dbg (<< 4:14.0.0) Priority: extra Depends: tdelibs-trinity-dbg, libkscan1-trinity (= ${binary:Version}) Description: debugging symbols for tdegraphics diff --git a/ubuntu/maverick/tdegraphics/debian/source/format b/ubuntu/maverick/tdegraphics/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/tdegraphics/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/tdegraphics/debian/source/options b/ubuntu/maverick/tdegraphics/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/tdegraphics/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/tdelibs/debian/changelog b/ubuntu/maverick/tdelibs/debian/changelog index 936097e90..dd416c496 100644 --- a/ubuntu/maverick/tdelibs/debian/changelog +++ b/ubuntu/maverick/tdelibs/debian/changelog @@ -520,7 +520,7 @@ tdelibs (4:3.5.7-1ubuntu9) gutsy; urgency=low [ Sarah Hobbs ] * Added kubuntu_93_tdelibs-tdesudo-support-wflags-and-kab-fix.diff. Thankyou to Stefan Skotte for this patch - * Removed kubuntu_28_fix_sudo.diff to fix KDM memory corruption + * Removed kubuntu_28_fix_sudo.diff to fix TDM memory corruption (LP: #47455, KDE bug #147454) -- Sarah Hobbs <hobbsee@ubuntu.com> Sat, 14 Jul 2007 01:51:38 +1000 @@ -2087,7 +2087,7 @@ tdelibs (4:3.4.0-0pre5) alioth; urgency=low output them expanded even when --expandvars is not used. (Closes: #287822) * Fixed the ability of the build system to find kde.pot, even when it is not - located at KDEDIR/include/kde.pot. This allows the use of targets such as + located at TDEDIR/include/kde.pot. This allows the use of targets such as "package-messages" without specifying includedir. (Closes: #283858) * Now that graphviz is in main, add it to Build-Depends-Indep together with diff --git a/ubuntu/maverick/tdelibs/debian/control b/ubuntu/maverick/tdelibs/debian/control index d17521614..232016009 100644 --- a/ubuntu/maverick/tdelibs/debian/control +++ b/ubuntu/maverick/tdelibs/debian/control @@ -13,9 +13,9 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev, liblualib50-dev, libopenexr-dev (>= 1.2.2-4.1), libpcre3-dev, libsasl2-dev, libssl-dev, libxcomposite-dev, libtiff4-dev (>= 3.7.3-1), libavahi-client-dev (>= 0.4), - libxml2-dev, libxml2-utils, libxslt1-dev, + libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-tqt-dev, sharutils, texinfo, libogg-dev, libtqtinterface-dev, - gettext-kde, lsb-release, base-files, sudo, + gettext-kde, lsb-release, base-files, sudo, libr-dev, cmake, libltdl-dev Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11 Standards-Version: 3.8.3 @@ -23,8 +23,8 @@ Standards-Version: 3.8.3 Package: tdelibs-trinity Section: libs Architecture: all -Replaces: tdelibs-kde3 (<< 4:3.5.13) -Breaks: tdelibs-kde3 (<< 4:3.5.13) +Replaces: kdelibs-trinity (<< 4:14.0.0) +Breaks: kdelibs-trinity (<< 4:14.0.0) Provides: tdelibs Conflicts: tdelibs Depends: tdelibs4c2a-trinity (>= ${Source-Version}), @@ -42,8 +42,8 @@ Description: core libraries from the official Trinity release Package: tdelibs-data-trinity Section: libs Architecture: all -Replaces: tdelibs-data-kde3 (<< 4:3.5.13) -Breaks: tdelibs-data-kde3 (<< 4:3.5.13) +Replaces: kdelibs-data-trinity (<< 4:14.0.0) +Breaks: kdelibs-data-trinity (<< 4:14.0.0) Depends: hicolor-icon-theme Provides: tdelibs-data Conflicts: tdelibs-data @@ -58,8 +58,8 @@ Description: core shared data for all TDE applications Package: tdelibs4c2a-trinity Section: libs Architecture: any -Replaces: tdelibs4c2a-kde3 (<< 4:3.5.13) -Breaks: tdelibs4c2a-kde3 (<< 4:3.5.13) +Replaces: kdelibs4c2a-trinity (<< 4:14.0.0) +Breaks: kdelibs4c2a-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdelibs-data-trinity, tdelibs-data-trinity, perl, xbase-clients, launchpad-integration, sudo @@ -79,8 +79,8 @@ Description: core libraries and binaries for all TDE applications Package: tdelibs4-trinity-dev Section: libdevel Architecture: any -Replaces: tdelibs4-kde3-dev (<< 4:3.5.13) -Breaks: tdelibs4-kde3-dev (<< 4:3.5.13) +Replaces: kdelibs4-trinity-dev (<< 4:14.0.0) +Breaks: kdelibs4-trinity-dev (<< 4:14.0.0) Depends: tdelibs4c2a-trinity (= ${Source-Version}), libart-2.0-dev (>= 2.3.17), libarts1-trinity-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev, libaspell-dev, hspell, libbz2-dev, libcupsys2-dev, @@ -89,7 +89,7 @@ Depends: tdelibs4c2a-trinity (= ${Source-Version}), libart-2.0-dev (>= 2.3.17), libsasl2-dev, libssl-dev, libxcomposite-dev, libtiff4-dev (>= 3.7.3-1), libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-client-dev (>= 0.4), libtqtinterface-dev, - gettext-kde + gettext-kde, libr-dev Provides: tdelibs-trinity-dev Description: development files for the TDE core libraries This package contains all the headers and other related files needed @@ -102,8 +102,8 @@ Description: development files for the TDE core libraries Package: tdelibs4-trinity-doc Section: doc Architecture: all -Replaces: tdelibs4-kde3-doc (<< 4:3.5.13) -Breaks: tdelibs4-kde3-doc (<< 4:3.5.13) +Replaces: kdelibs4-trinity-doc (<< 4:14.0.0) +Breaks: kdelibs4-trinity-doc (<< 4:14.0.0) Provides: tdelibs-trinity-doc Description: developer documentation for the TDE core libraries This package contains documentation for the core TDE libraries, of @@ -116,8 +116,8 @@ Description: developer documentation for the TDE core libraries Package: tdelibs-trinity-dbg Section: libdevel Architecture: any -Replaces: tdelibs-kde3-dbg (<< 4:3.5.13) -Breaks: tdelibs-kde3-dbg (<< 4:3.5.13) +Replaces: kdelibs-trinity-dbg (<< 4:14.0.0) +Breaks: kdelibs-trinity-dbg (<< 4:14.0.0) Priority: extra Conflicts: tdelibs4-trinity-dbg, tdelibs4c2-trinity-dbg, tdelibs4c2a-trinity-dbg Depends: tdelibs4c2a-trinity (= ${Source-Version}), libtqtinterface-dbg, libc6-dbg [amd64] diff --git a/ubuntu/maverick/tdelibs/debian/kcmshell b/ubuntu/maverick/tdelibs/debian/kcmshell index e8b3d2a84..f5b01f8f1 100755 --- a/ubuntu/maverick/tdelibs/debian/kcmshell +++ b/ubuntu/maverick/tdelibs/debian/kcmshell @@ -1,4 +1,4 @@ #!/bin/sh -export KDEDIRS=/usr/:/opt/trinity/ +export TDEDIRS=/usr/:/opt/trinity/ /opt/trinity/bin/kcmshell.real $1 $2 $3 $4 $5 $6 $7 $8 diff --git a/ubuntu/maverick/tdelibs/debian/man/dcop-trinity.sgml b/ubuntu/maverick/tdelibs/debian/man/dcop-trinity.sgml index 0c80c88a1..7c4342c05 100644 --- a/ubuntu/maverick/tdelibs/debian/man/dcop-trinity.sgml +++ b/ubuntu/maverick/tdelibs/debian/man/dcop-trinity.sgml @@ -141,14 +141,14 @@ manpage.1: manpage.sgml <para><example> <title>Return number of the current desktop, e.g. 2</title> <blockquote><literallayout> -dcop kwin KWinInterface currentDesktop +dcop twin KWinInterface currentDesktop </literallayout></blockquote> </example></para> <para><example> <title>Jump to the next dektop</title> <blockquote><literallayout> -dcop kwin KWinInterface nextDesktop +dcop twin KWinInterface nextDesktop </literallayout></blockquote> </example></para> diff --git a/ubuntu/maverick/tdelibs/debian/man/kstartupconfig-trinity.1 b/ubuntu/maverick/tdelibs/debian/man/kstartupconfig-trinity.1 index dca82fb5e..897dae97d 100644 --- a/ubuntu/maverick/tdelibs/debian/man/kstartupconfig-trinity.1 +++ b/ubuntu/maverick/tdelibs/debian/man/kstartupconfig-trinity.1 @@ -4,11 +4,11 @@ kstartupconfig, kdostartupconfig \- KDE configuration options loader .SH SYNOPSIS -\fBkstartupconfig\fP [$KDEHOME] +\fBkstartupconfig\fP [$TDEHOME] .sp 1 \fBkdostartupconfig\fP .SH DESCRIPTION -\fBkstartupconfig\fP loads configuration options for use in \fBstartkde\fP. It saves loading time as there is no need to launch programs linked to KDE libraries. \fBstartupconfig\fP uses a cache of some Kconfig options that are updated by \fBkdostartupconfig\fP. The cache is implemented as script file that is sourced and provides the options as shell variables. +\fBkstartupconfig\fP loads configuration options for use in \fBstarttde\fP. It saves loading time as there is no need to launch programs linked to KDE libraries. \fBstartupconfig\fP uses a cache of some Kconfig options that are updated by \fBkdostartupconfig\fP. The cache is implemented as script file that is sourced and provides the options as shell variables. .sp 1 The configuration options to load are stored in \fIstartupconfigkeys\fP as one option per line. They follow the format <file> <group> <key> <default>. A complete group is addressed as <file> [<group>]. The configuration options are processed in the specified order so the missing default values for groups can be specified as single options after the group option. .sp 1 @@ -27,22 +27,22 @@ do not use frequently changed config files since the checking is timestamp\-base if \fBkconf_update\fP is used to update an option also touch the matching global config file to allow \fBkstartupconfig\fP to see changes .SH OPTIONS .TP -.B $KDEHOME +.B $TDEHOME KDE home directory, if different to ~/.kde .SS .SH FILES -In case $KDEHOME is not set ~/.kde is assumed. +In case $TDEHOME is not set ~/.kde is assumed. .TP -.I $KDEHOME/share/config/startupconfig +.I $TDEHOME/share/config/startupconfig script, sourced to set shell variables with configuration options .TP -.I $KDEHOME/share/config/startupconfigfiles +.I $TDEHOME/share/config/startupconfigfiles configuration options and files they belong to .TP -.I $KDEHOME/share/config/startupconfigkeys +.I $TDEHOME/share/config/startupconfigkeys configuration options to load .SH SEE ALSO -.BR kconf_update (1),\ startkde (1) +.BR kconf_update (1),\ starttde (1) .SH AUTHORS .nf Lubos Lunak <l.lunak@kde.org> diff --git a/ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml b/ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml index c40c64520..1ab3ff715 100644 --- a/ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml +++ b/ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml @@ -72,7 +72,7 @@ manpage.1: manpage.sgml <para><command>&dhpackage;</command> is used to create KDE resources in temporary directories and symlinks to them in - <envar>KDEHOME</envar>. The resource that needs to be created is + <envar>TDEHOME</envar>. The resource that needs to be created is given as an argument and can be anyone of:</para> <itemizedlist> @@ -105,7 +105,7 @@ manpage.1: manpage.sgml attacks. </para> <para><command>&dhpackage;</command> is usually called by the - <command>startkde</command> script.</para> + <command>starttde</command> script.</para> </refsect1> <refsect1> diff --git a/ubuntu/maverick/tdelibs/debian/man/make_driver_db_cups-trinity.1 b/ubuntu/maverick/tdelibs/debian/man/make_driver_db_cups-trinity.1 index 0201523ce..8ca091265 100644 --- a/ubuntu/maverick/tdelibs/debian/man/make_driver_db_cups-trinity.1 +++ b/ubuntu/maverick/tdelibs/debian/man/make_driver_db_cups-trinity.1 @@ -25,10 +25,10 @@ directory with ppd files write printer database into this file .SH FILES .TP -.I $KDEHOME/share/apps/tdeprint/printerdb_cups.txt +.I $TDEHOME/share/apps/tdeprint/printerdb_cups.txt KDE printer database .br -(if $KDEHOME is not set ~/.kde is used) +(if $TDEHOME is not set ~/.kde is used) .SH SEE ALSO .BR make_driver_db_lpr (1) .TP diff --git a/ubuntu/maverick/tdelibs/debian/man/tdeinit-trinity.1 b/ubuntu/maverick/tdelibs/debian/man/tdeinit-trinity.1 index 1c3861783..63c5935b6 100644 --- a/ubuntu/maverick/tdelibs/debian/man/tdeinit-trinity.1 +++ b/ubuntu/maverick/tdelibs/debian/man/tdeinit-trinity.1 @@ -10,7 +10,7 @@ tdeinit .sp 1 \fBtdeinit\fP is used to start all other KDE programs. It can start binary program files as well as tdeinit loadable modules (KLMs). .sp 1 -When \fBtdeinit\fP starts for the first time it launches \fBdcopserver\fP, \fBklauncher\fP, \fBkded\fP and some additional programs specified on its command line in the \fBstartkde\fP script (normally \fBkcminit\fP and \fBknotify\fP). +When \fBtdeinit\fP starts for the first time it launches \fBdcopserver\fP, \fBklauncher\fP, \fBkded\fP and some additional programs specified on its command line in the \fBstarttde\fP script (normally \fBkcminit\fP and \fBknotify\fP). .sp 1 The \fBtdeinit\fP master process can be used to start additional KDE programs via \fBtdeinit_wrapper\fP, \fBkshell\fP and \fBkwrapper\fP. .sp 1 @@ -29,7 +29,7 @@ Terminate when no KDE applications are left running .I /usr/lib/trinity directory with KLMs (tdeinit loadable modules) .SH SEE ALSO -.BR dcopserver (1),\ kded (1),\ kcminit (1),\ tdeinit_wrapper (1),\ klauncher (1),\ kshell (1),\ kwrapper (1),\ startkde (1) +.BR dcopserver (1),\ kded (1),\ kcminit (1),\ tdeinit_wrapper (1),\ klauncher (1),\ kshell (1),\ kwrapper (1),\ starttde (1) .SH AUTHORS .nf Waldo Bastian <bastian@kde.org> diff --git a/ubuntu/maverick/tdelibs/debian/patches/kubuntu_38_no_generate_kdepot.diff b/ubuntu/maverick/tdelibs/debian/patches/kubuntu_38_no_generate_kdepot.diff deleted file mode 100644 index 06bd685ca..000000000 --- a/ubuntu/maverick/tdelibs/debian/patches/kubuntu_38_no_generate_kdepot.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- tdelibs/Makefile.am.in 2006-06-26 16:14:54.000000000 +0000 -+++ tdelibs/Makefile.am.in 2006-06-26 16:16:33.000000000 +0000 -@@ -54,10 +54,8 @@ - find $$dirs -maxdepth 1 -name "*.cc" -print >> files ;\ - find $$dirs -maxdepth 1 -name "*.h" -print >> files ;\ - echo ./tdecore/kde-config.cpp.in >> files ;\ -- $(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp; \ -- : > kde.pot ;\ -+ $(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp; - $(XGETTEXT) -ktranslate -x qt-messages.pot rc.cpp `cat files` && cat messages.po qt-messages.pot > $(podir)/tdelibs.pot -- $(XGETTEXT) common_texts.cpp -o kde.pot - rm -f dirs - - EXTRA_DIST = admin kde.pot \ diff --git a/ubuntu/maverick/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff b/ubuntu/maverick/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff index a0db3e5c7..b224a4d11 100644 --- a/ubuntu/maverick/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff +++ b/ubuntu/maverick/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff @@ -5,7 +5,7 @@ "<p>For more information on KDE internationalization " "visit <a href=\"http://l10n.kde.org\">http://l10n.kde.org</a></p>" - ); -+ ) + i18n("<p>Debian includes additions and alterations to the KDE translation from <a href=\"https://translations.launchpad.net/\">Launchpad</a>.</p>"); ++ ) + i18n("<p>Debian includes additions and alterations to the TDE translation from <a href=\"https://translations.launchpad.net/\">Launchpad</a>.</p>"); } TQString diff --git a/ubuntu/maverick/tdelibs/debian/rules b/ubuntu/maverick/tdelibs/debian/rules index 119f2a4fe..24b56bf2a 100755 --- a/ubuntu/maverick/tdelibs/debian/rules +++ b/ubuntu/maverick/tdelibs/debian/rules @@ -20,8 +20,8 @@ DEB_KDE_APIDOX := yes version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) -DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ --DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" +DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" \ +-DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" -DWITH_ELFICON="ON" # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. diff --git a/ubuntu/maverick/tdelibs/debian/source/format b/ubuntu/maverick/tdelibs/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/tdelibs/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/tdelibs/debian/source/options b/ubuntu/maverick/tdelibs/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/tdelibs/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install index 8f84589d6..3d2e8e43b 100644 --- a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install +++ b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install @@ -232,7 +232,7 @@ debian/tmp/opt/trinity/include/tdesu/ssh.h debian/tmp/opt/trinity/include/tdesu/stub.h debian/tmp/opt/trinity/include/tdesu/su.h debian/tmp/opt/trinity/include/kde_terminal_interface.h -debian/tmp/opt/trinity/include/kdeversion.h +debian/tmp/opt/trinity/include/tdeversion.h debian/tmp/opt/trinity/include/kdialogbase.h debian/tmp/opt/trinity/include/kdialog.h debian/tmp/opt/trinity/include/kdirlister.h @@ -532,9 +532,9 @@ debian/tmp/opt/trinity/include/kshred.h debian/tmp/opt/trinity/include/ksimpleconfig.h debian/tmp/opt/trinity/include/ksmimecrypto.h debian/tmp/opt/trinity/include/ksockaddr.h -debian/tmp/opt/trinity/include/ksocketaddress.h -debian/tmp/opt/trinity/include/ksocketbase.h -debian/tmp/opt/trinity/include/ksocketdevice.h +debian/tmp/opt/trinity/include/tdesocketaddress.h +debian/tmp/opt/trinity/include/tdesocketbase.h +debian/tmp/opt/trinity/include/tdesocketdevice.h debian/tmp/opt/trinity/include/ksock.h debian/tmp/opt/trinity/include/ksocks.h debian/tmp/opt/trinity/include/ksockssocketdevice.h @@ -668,10 +668,10 @@ debian/tmp/opt/trinity/include/kuserprofile.h debian/tmp/opt/trinity/include/kvmallocator.h debian/tmp/opt/trinity/include/kwallet.h debian/tmp/opt/trinity/include/kwallettypes.h -debian/tmp/opt/trinity/include/kwindowinfo.h -debian/tmp/opt/trinity/include/kwindowlistmenu.h -debian/tmp/opt/trinity/include/kwin.h -debian/tmp/opt/trinity/include/kwinmodule.h +debian/tmp/opt/trinity/include/twindowinfo.h +debian/tmp/opt/trinity/include/twindowlistmenu.h +debian/tmp/opt/trinity/include/twin.h +debian/tmp/opt/trinity/include/twinmodule.h debian/tmp/opt/trinity/include/kwizard.h debian/tmp/opt/trinity/include/kwordwrap.h debian/tmp/opt/trinity/include/kxerrorhandler.h diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install index 91c12cb5b..3887f606d 100644 --- a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install +++ b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install @@ -50,6 +50,7 @@ debian/tmp/opt/trinity/bin/lnusertemp debian/tmp/opt/trinity/bin/make_driver_db_cups debian/tmp/opt/trinity/bin/make_driver_db_lpr debian/tmp/opt/trinity/bin/meinproc +debian/tmp/opt/trinity/bin/tdelfeditor debian/tmp/opt/trinity/bin/start_tdeinit debian/tmp/opt/trinity/bin/start_tdeinit_wrapper debian/tmp/opt/trinity/lib/trinity/cupsdconf.la @@ -314,3 +315,6 @@ debian/tmp/opt/trinity/lib/libkwalletclient.so.1 debian/tmp/opt/trinity/lib/libkwalletclient.so.1.0.1 debian/tmp/opt/trinity/lib/libvcard.so.0 debian/tmp/opt/trinity/lib/libvcard.so.0.0.0 +debian/tmp/opt/trinity/share/services/kfile_elf.desktop +debian/tmp/opt/trinity/lib/trinity/kfile_elf.so +debian/tmp/opt/trinity/lib/trinity/kfile_elf.la diff --git a/ubuntu/maverick/tdemultimedia/debian/control b/ubuntu/maverick/tdemultimedia/debian/control index 4086f0b95..6cdd95e02 100644 --- a/ubuntu/maverick/tdemultimedia/debian/control +++ b/ubuntu/maverick/tdemultimedia/debian/control @@ -10,8 +10,8 @@ Standards-Version: 3.8.4 Package: tdemultimedia-trinity Section: kde Architecture: all -Replaces: tdemultimedia-kde3 (<< 4:3.5.13) -Breaks: tdemultimedia-kde3 (<< 4:3.5.13) +Replaces: kdemultimedia-trinity (<< 4:14.0.0) +Breaks: kdemultimedia-trinity (<< 4:14.0.0) Depends: artsbuilder-trinity (>= ${Source-Version}), juk-trinity (>= ${Source-Version}), kaboodle-trinity (>= ${Source-Version}), kaudiocreator-trinity (>= ${Source-Version}), tdemultimedia-kappfinder-data-trinity (>= ${Source-Version}), tdemultimedia-kfile-plugins-trinity (>= ${Source-Version}), tdemultimedia-kio-plugins-trinity (>= ${Source-Version}), kmid-trinity (>= ${Source-Version}), kmix-trinity (>= ${Source-Version}), krec-trinity (>= ${Source-Version}), kscd-trinity (>= ${Source-Version}), libarts1-akode-trinity (>= ${Source-Version}), libarts1-audiofile-trinity (>= ${Source-Version}), libarts1-mpeglib-trinity (>= ${Source-Version}), libarts1-xine-trinity (>= ${Source-Version}), mpeglib-trinity (>= ${Source-Version}), noatun-trinity (>= ${Source-Version}) Suggests: tdemultimedia-trinity-doc-html (>= ${Source-Version}) Description: multimedia apps from the official Trinity release @@ -29,8 +29,8 @@ Description: multimedia apps from the official Trinity release Package: tdemultimedia-trinity-dev Section: devel Architecture: any -Replaces: tdemultimedia-kde3-dev (<< 4:3.5.13) -Breaks: tdemultimedia-kde3-dev (<< 4:3.5.13) +Replaces: kdemultimedia-trinity-dev (<< 4:14.0.0) +Breaks: kdemultimedia-trinity-dev (<< 4:14.0.0) Depends: tdelibs4-trinity-dev (>= 4:3.5.7), artsbuilder-trinity (= ${Source-Version}), tdemultimedia-kio-plugins-trinity (= ${Source-Version}), kmid-trinity (= ${Source-Version}), kmix-trinity (= ${Source-Version}), krec-trinity (= ${Source-Version}), kscd-trinity (= ${Source-Version}), libarts1-akode-trinity (= ${Source-Version}), libarts1-mpeglib-trinity (= ${Source-Version}), libkcddb1-trinity (= ${Source-Version}), mpeglib-trinity (= ${Source-Version}), noatun-trinity (= ${Source-Version}) Conflicts: libmpeg-trinity-dev Description: development files for the Trinity multimedia module @@ -42,8 +42,8 @@ Description: development files for the Trinity multimedia module Package: tdemultimedia-trinity-doc-html Architecture: all Section: doc -Replaces: tdemultimedia-kde3-doc-html (<< 4:3.5.13) -Breaks: tdemultimedia-kde3-doc-html (<< 4:3.5.13) +Replaces: kdemultimedia-trinity-doc-html (<< 4:14.0.0) +Breaks: kdemultimedia-trinity-doc-html (<< 4:14.0.0) Suggests: konqueror-trinity | www-browser, tdebase-trinity Description: Trinity multimedia documentation in HTML format By default the modules provided by KDE only provide their documentation @@ -62,8 +62,8 @@ Description: Trinity multimedia documentation in HTML format Package: artsbuilder-trinity Section: sound Architecture: any -Replaces: artsbuilder-kde3 (<< 4:3.5.13) -Breaks: artsbuilder-kde3 (<< 4:3.5.13) +Replaces: artsbuilder-trinity (<< 4:14.0.0) +Breaks: artsbuilder-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: synthesizer designer for aRts @@ -75,8 +75,8 @@ Description: synthesizer designer for aRts Package: juk-trinity Section: kde Architecture: any -Replaces: juk-kde3 (<< 4:3.5.13) -Breaks: juk-kde3 (<< 4:3.5.13) +Replaces: juk-trinity (<< 4:14.0.0) +Breaks: juk-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: music organizer and player for Trinity @@ -103,8 +103,8 @@ Description: music organizer and player for Trinity Package: kaboodle-trinity Section: sound Architecture: any -Replaces: kaboodle-kde3 (<< 4:3.5.13) -Breaks: kaboodle-kde3 (<< 4:3.5.13) +Replaces: kaboodle-trinity (<< 4:14.0.0) +Breaks: kaboodle-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: libarts1-xine-trinity Suggests: khelpcenter-trinity @@ -118,8 +118,8 @@ Description: light, embedded media player for Trinity Package: kaudiocreator-trinity Section: sound Architecture: any -Replaces: kaudiocreator-kde3 (<< 4:3.5.13) -Breaks: kaudiocreator-kde3 (<< 4:3.5.13) +Replaces: kaudiocreator-trinity (<< 4:14.0.0) +Breaks: kaudiocreator-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdemultimedia-kio-plugins-trinity (= ${Source-Version}) Recommends: vorbis-tools, flac Suggests: lame @@ -134,8 +134,8 @@ Description: CD ripper and audio encoder frontend for Trinity Package: tdemultimedia-kfile-plugins-trinity Section: kde Architecture: any -Replaces: tdemultimedia-kfile-plugins-kde3 (<< 4:3.5.13) -Breaks: tdemultimedia-kfile-plugins-kde3 (<< 4:3.5.13) +Replaces: kdemultimedia-kfile-plugins-trinity (<< 4:14.0.0) +Breaks: kdemultimedia-kfile-plugins-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: au/avi/m3u/mp3/ogg/wav plugins for kfile au/avi/m3u/mp3/ogg/wav file metainformation plugins for Trinity. @@ -146,8 +146,8 @@ Description: au/avi/m3u/mp3/ogg/wav plugins for kfile Package: tdemultimedia-kappfinder-data-trinity Section: kde Architecture: any -Replaces: tdemultimedia-kappfinder-data-kde3 (<< 4:3.5.13) -Breaks: tdemultimedia-kappfinder-data-kde3 (<< 4:3.5.13) +Replaces: kdemultimedia-kappfinder-data-trinity (<< 4:14.0.0) +Breaks: kdemultimedia-kappfinder-data-trinity (<< 4:14.0.0) Depends: kappfinder-trinity Description: multimedia data for kappfinder-trinity This package provides data on multimedia applications for kappfinder-trinity. @@ -158,8 +158,8 @@ Description: multimedia data for kappfinder-trinity Package: tdemultimedia-kio-plugins-trinity Section: kde Architecture: any -Replaces: tdemultimedia-kio-plugins-kde3 (<< 4:3.5.13) -Breaks: tdemultimedia-kio-plugins-kde3 (<< 4:3.5.13) +Replaces: kdemultimedia-kio-plugins-trinity (<< 4:14.0.0) +Breaks: kdemultimedia-kio-plugins-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: lame Description: enables the browsing of audio CDs under Konqueror @@ -172,8 +172,8 @@ Description: enables the browsing of audio CDs under Konqueror Package: kmid-trinity Section: sound Architecture: any -Replaces: kmid-kde3 (<< 4:3.5.13) -Breaks: kmid-kde3 (<< 4:3.5.13) +Replaces: kmid-trinity (<< 4:14.0.0) +Breaks: kmid-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: MIDI/karaoke player for Trinity @@ -185,8 +185,8 @@ Description: MIDI/karaoke player for Trinity Package: kmix-trinity Section: sound Architecture: any -Replaces: kmix-kde3 (<< 4:3.5.13) -Breaks: kmix-kde3 (<< 4:3.5.13) +Replaces: kmix-trinity (<< 4:14.0.0) +Breaks: kmix-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Provides: x-audio-mixer @@ -199,8 +199,8 @@ Description: sound mixer applet for Trinity Package: krec-trinity Section: sound Architecture: any -Replaces: krec-kde3 (<< 4:3.5.13) -Breaks: krec-kde3 (<< 4:3.5.13) +Replaces: krec-trinity (<< 4:14.0.0) +Breaks: krec-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: sound recorder utility for Trinity @@ -212,8 +212,8 @@ Description: sound recorder utility for Trinity Package: kscd-trinity Section: sound Architecture: any -Replaces: kscd-kde3 (<< 4:3.5.13) -Breaks: kscd-kde3 (<< 4:3.5.13) +Replaces: kscd-trinity (<< 4:14.0.0) +Breaks: kscd-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter Description: audio CD player for Trinity @@ -225,8 +225,8 @@ Description: audio CD player for Trinity Package: libarts1-akode-trinity Section: libs Architecture: any -Replaces: libarts1-akode-kde3 (<< 4:3.5.13) -Breaks: libarts1-akode-kde3 (<< 4:3.5.13) +Replaces: libarts1-akode-trinity (<< 4:14.0.0) +Breaks: libarts1-akode-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: akode plugin for aRts This package contains akode plugins for aRts. @@ -237,8 +237,8 @@ Description: akode plugin for aRts Package: libarts1-audiofile-trinity Section: libs Architecture: any -Replaces: libarts1-audiofile-kde3 (<< 4:3.5.13) -Breaks: libarts1-audiofile-kde3 (<< 4:3.5.13) +Replaces: libarts1-audiofile-trinity (<< 4:14.0.0) +Breaks: libarts1-audiofile-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: audiofile plugin for aRts This package contains audiofile plugins for aRts. @@ -249,8 +249,8 @@ Description: audiofile plugin for aRts Package: libarts1-mpeglib-trinity Section: libs Architecture: any -Replaces: libarts1-mpeglib-kde3 (<< 4:3.5.13) -Breaks: libarts1-mpeglib-kde3 (<< 4:3.5.13) +Replaces: libarts1-mpeglib-trinity (<< 4:14.0.0) +Breaks: libarts1-mpeglib-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: mpeglib plugin for aRts, supporting mp3 and mpeg audio/video This package contains the mpeglib aRts plugin, supporting mp3 and mpeg @@ -264,8 +264,8 @@ Description: mpeglib plugin for aRts, supporting mp3 and mpeg audio/video Package: libarts1-xine-trinity Section: libs Architecture: any -Replaces: libarts1-xine-kde3 (<< 4:3.5.13) -Breaks: libarts1-xine-kde3 (<< 4:3.5.13) +Replaces: libarts1-xine-trinity (<< 4:14.0.0) +Breaks: libarts1-xine-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: aRts plugin enabling xine support This package contains aRts' xine plugin, allowing the use of the xine @@ -277,8 +277,8 @@ Description: aRts plugin enabling xine support Package: libkcddb1-trinity Section: libs Architecture: any -Replaces: libkcddb1-kde3 (<< 4:3.5.13) -Breaks: libkcddb1-kde3 (<< 4:3.5.13) +Replaces: libkcddb1-trinity (<< 4:14.0.0) +Breaks: libkcddb1-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: CDDB library for Trinity The Trinity native CDDB (CD Data Base) library, providing easy access to Audio @@ -291,8 +291,8 @@ Description: CDDB library for Trinity Package: mpeglib-trinity Section: libs Architecture: any -Replaces: mpeglib-kde3 (<< 4:3.5.13) -Breaks: mpeglib-kde3 (<< 4:3.5.13) +Replaces: mpeglib-trinity (<< 4:14.0.0) +Breaks: mpeglib-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: libarts1-mpeglib-trinity (= ${Source-Version}) Description: MP3 and MPEG-1 audio and video library @@ -306,8 +306,8 @@ Description: MP3 and MPEG-1 audio and video library Package: noatun-trinity Section: sound Architecture: any -Replaces: noatun-kde3 (<< 4:3.5.13) -Breaks: noatun-kde3 (<< 4:3.5.13) +Replaces: noatun-trinity (<< 4:14.0.0) +Breaks: noatun-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity, noatun-plugins-trinity Description: media player for Trinity @@ -320,8 +320,8 @@ Description: media player for Trinity Package: tdemultimedia-trinity-dbg Section: libdevel Architecture: any -Replaces: tdemultimedia-kde3-dbg (<< 4:3.5.13) -Breaks: tdemultimedia-kde3-dbg (<< 4:3.5.13) +Replaces: kdemultimedia-trinity-dbg (<< 4:14.0.0) +Breaks: kdemultimedia-trinity-dbg (<< 4:14.0.0) Priority: extra Depends: tdelibs-trinity-dbg, libkcddb1-trinity (= ${Source-Version}) Description: debugging symbols for tdemultimedia diff --git a/ubuntu/maverick/tdemultimedia/debian/man/kaboodle-trinity.1 b/ubuntu/maverick/tdemultimedia/debian/man/kaboodle-trinity.1 index 4475e273c..76f29a181 100644 --- a/ubuntu/maverick/tdemultimedia/debian/man/kaboodle-trinity.1 +++ b/ubuntu/maverick/tdemultimedia/debian/man/kaboodle-trinity.1 @@ -70,7 +70,7 @@ Use an alternative configuration file, instead of the default, which is normally located in .I /usr/share/config or in -.RB $ KDEHOME\fI/share/config +.RB $ TDEHOME\fI/share/config .TP .BI \-\-dcopserver \ server Set the address of the DCOP server to attach to. @@ -196,7 +196,7 @@ LANG. Assume that all filenames are in UTF-8 format regardless of the current language setting. Otherwise the filename format is defined by the language. -.IP KDE_MULTIHEAD +.IP TDE_MULTIHEAD If this variable has the value .B true multihead multiple display mode is enabled. The KDE display will be @@ -218,7 +218,7 @@ The session manager to use. This option is set automatically by KDE and is a network path to the session manager socket. .IP HOME Path to the home directory for the current user. -.IP KDEHOME +.IP TDEHOME The KDE per-user setting directory. Default if not specified is .I $HOME/.kde .lf 55 info/tdemultimedia.kaboodle.1 diff --git a/ubuntu/maverick/tdemultimedia/debian/source/format b/ubuntu/maverick/tdemultimedia/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/tdemultimedia/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/tdemultimedia/debian/source/options b/ubuntu/maverick/tdemultimedia/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/tdemultimedia/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/tdenetwork/debian/control b/ubuntu/maverick/tdenetwork/debian/control index 2ede2a525..c4715735c 100644 --- a/ubuntu/maverick/tdenetwork/debian/control +++ b/ubuntu/maverick/tdenetwork/debian/control @@ -10,8 +10,8 @@ Standards-Version: 3.8.4 Package: tdenetwork-trinity Section: kde Architecture: all -Replaces: tdenetwork-kde3 (<< 4:3.5.13) -Breaks: tdenetwork-kde3 (<< 4:3.5.13) +Replaces: kdenetwork-trinity (<< 4:14.0.0) +Breaks: kdenetwork-trinity (<< 4:14.0.0) Depends: dcoprss-trinity (>= ${Source-Version}), tdenetwork-kfile-plugins-trinity (>= ${Source-Version}), kdict-trinity (>= ${Source-Version}), kdnssd-trinity (>= ${Source-Version}), kget-trinity (>= ${Source-Version}), knewsticker-trinity (>= ${Source-Version}), kopete-trinity (>= ${Source-Version}), kpf-trinity (>= ${Source-Version}), kppp-trinity (>= ${Source-Version}), krdc-trinity (>= ${Source-Version}), krfb-trinity (>= ${Source-Version}), ksirc-trinity (>= ${Source-Version}), kwifimanager-trinity (>= ${Source-Version}), librss1-trinity (>= ${Source-Version}) Recommends: tdenetwork-filesharing-trinity (>= ${Source-Version}), ktalkd-trinity (>= ${Source-Version}), lisa-trinity (>= ${Source-Version}) Suggests: tdenetwork-trinity-doc-html (>= ${Source-Version}) @@ -27,8 +27,8 @@ Description: network-related apps from the official Trinity release Package: dcoprss-trinity Section: net Architecture: any -Replaces: dcoprss-kde3 (<< 4:3.5.13) -Breaks: dcoprss-kde3 (<< 4:3.5.13) +Replaces: dcoprss-trinity (<< 4:14.0.0) +Breaks: dcoprss-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: RSS utilities for Trinity tdenetwork-dcoprss is a RSS to DCOP bridge, allowing all @@ -44,8 +44,8 @@ Description: RSS utilities for Trinity Package: tdenetwork-trinity-doc-html Architecture: all Section: doc -Replaces: tdenetwork-kde3-doc-html (<< 4:3.5.13) -Breaks: tdenetwork-kde3-doc-html (<< 4:3.5.13) +Replaces: kdenetwork-trinity-doc-html (<< 4:14.0.0) +Breaks: kdenetwork-trinity-doc-html (<< 4:14.0.0) Suggests: konqueror-trinity | www-browser, tdebase-trinity Description: Trinity network documentation in HTML format By default the modules provided by KDE only provide their documentation @@ -64,8 +64,8 @@ Description: Trinity network documentation in HTML format Package: tdenetwork-kfile-plugins-trinity Section: kde Architecture: any -Replaces: tdenetwork-kfile-plugins-kde3 (<< 4:3.5.13) -Breaks: tdenetwork-kfile-plugins-kde3 (<< 4:3.5.13) +Replaces: kdenetwork-kfile-plugins-trinity (<< 4:14.0.0) +Breaks: kdenetwork-kfile-plugins-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Enhances: konqueror-trinity Description: torrent metainfo plugin for Trinity @@ -80,8 +80,8 @@ Description: torrent metainfo plugin for Trinity Package: tdenetwork-filesharing-trinity Section: net Architecture: any -Replaces: tdenetwork-filesharing-kde3 (<< 4:3.5.13) -Breaks: tdenetwork-filesharing-kde3 (<< 4:3.5.13) +Replaces: kdenetwork-filesharing-trinity (<< 4:14.0.0) +Breaks: kdenetwork-filesharing-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: perl-suid Description: network filesharing configuration module for Trinity @@ -94,8 +94,8 @@ Description: network filesharing configuration module for Trinity Package: kdict-trinity Section: net Architecture: any -Replaces: kdict-kde3 (<< 4:3.5.13) -Breaks: kdict-kde3 (<< 4:3.5.13) +Replaces: kdict-trinity (<< 4:14.0.0) +Breaks: kdict-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Provides: dict-client-trinity @@ -111,8 +111,8 @@ Description: dictionary client for Trinity Package: kget-trinity Section: net Architecture: any -Replaces: kget-kde3 (<< 4:3.5.13) -Breaks: kget-kde3 (<< 4:3.5.13) +Replaces: kget-trinity (<< 4:14.0.0) +Breaks: kget-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: download manager for Trinity @@ -129,8 +129,8 @@ Description: download manager for Trinity Package: knewsticker-trinity Section: kde Architecture: any -Replaces: knewsticker-kde3 (<< 4:3.5.13) -Breaks: knewsticker-kde3 (<< 4:3.5.13) +Replaces: knewsticker-trinity (<< 4:14.0.0) +Breaks: knewsticker-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, kicker-trinity Suggests: khelpcenter-trinity, knewsticker-scripts-trinity Description: news ticker applet for Trinity @@ -146,8 +146,8 @@ Description: news ticker applet for Trinity Package: kopete-trinity Section: kde Architecture: any -Replaces: kopete-kde3 (<< 4:3.5.13) -Breaks: kopete-kde3 (<< 4:3.5.13) +Replaces: kopete-trinity (<< 4:14.0.0) +Breaks: kopete-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: qca-tls Suggests: tdeartwork-emoticons-trinity, khelpcenter-trinity, imagemagick, gnupg, gnomemeeting @@ -169,8 +169,8 @@ Description: instant messenger for Trinity Package: kpf-trinity Section: net Architecture: any -Replaces: kpf-kde3 (<< 4:3.5.13) -Breaks: kpf-kde3 (<< 4:3.5.13) +Replaces: kpf-trinity (<< 4:14.0.0) +Breaks: kpf-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: public fileserver for Trinity @@ -185,8 +185,8 @@ Description: public fileserver for Trinity Package: kppp-trinity Section: net Architecture: any -Replaces: kppp-kde3 (<< 4:3.5.13) -Breaks: kppp-kde3 (<< 4:3.5.13) +Replaces: kppp-trinity (<< 4:14.0.0) +Breaks: kppp-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, ppp Suggests: khelpcenter-trinity Description: modem dialer and ppp frontend for Trinity @@ -204,11 +204,11 @@ Description: modem dialer and ppp frontend for Trinity Package: krdc-trinity Section: net Architecture: any -Replaces: krdc-kde3 (<< 4:3.5.13) -Breaks: krdc-kde3 (<< 4:3.5.13) +Replaces: krdc-trinity (<< 4:14.0.0) +Breaks: krdc-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity -Recommends: rdesktop +Recommends: rdesktop, libjpeg-turbo62 Description: Remote Desktop Connection for Trinity krdc is an KDE graphical client for the rfb protocol, used by VNC, and if rdesktop is installed, krdc can connect to Windows Terminal @@ -220,10 +220,11 @@ Description: Remote Desktop Connection for Trinity Package: krfb-trinity Section: net Architecture: any -Replaces: krfb-kde3 (<< 4:3.5.13) -Breaks: krfb-kde3 (<< 4:3.5.13) +Replaces: krfb-trinity (<< 4:14.0.0) +Breaks: krfb-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity +Recommends: libjpeg-turbo62 Description: Desktop Sharing for Trinity Desktop Sharing (krfb) is a server application that allows you to share your current session with a user on another machine, who can use a @@ -238,8 +239,8 @@ Description: Desktop Sharing for Trinity Package: ksirc-trinity Section: net Architecture: any -Replaces: ksirc-kde3 (<< 4:3.5.13) -Breaks: ksirc-kde3 (<< 4:3.5.13) +Replaces: ksirc-trinity (<< 4:14.0.0) +Breaks: ksirc-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, ${perl:Depends} Recommends: libio-socket-ssl-perl Suggests: khelpcenter-trinity @@ -256,8 +257,8 @@ Description: IRC client for Trinity Package: ktalkd-trinity Section: net Priority: extra -Replaces: ktalkd-kde3 (<< 4:3.5.13) -Breaks: ktalkd-kde3 (<< 4:3.5.13) +Replaces: ktalkd-trinity (<< 4:14.0.0) +Breaks: ktalkd-trinity (<< 4:14.0.0) Architecture: any Depends: ${shlibs:Depends}, netbase, update-inetd Recommends: talk, ytalk @@ -275,8 +276,8 @@ Description: talk daemon for Trinity Package: kwifimanager-trinity Section: net Architecture: any -Replaces: kwifimanager-kde3 (<< 4:3.5.13) -Breaks: kwifimanager-kde3 (<< 4:3.5.13) +Replaces: kwifimanager-trinity (<< 4:14.0.0) +Breaks: kwifimanager-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, wireless-tools Suggests: khelpcenter-trinity Description: wireless lan manager for Trinity @@ -291,8 +292,8 @@ Description: wireless lan manager for Trinity Package: librss1-trinity Section: libs Architecture: any -Replaces: librss1-kde3 (<< 4:3.5.13) -Breaks: librss1-kde3 (<< 4:3.5.13) +Replaces: librss1-trinity (<< 4:14.0.0) +Breaks: librss1-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: RSS library for Trinity This is the runtime package for programs that use the KDE RSS library. @@ -305,8 +306,8 @@ Description: RSS library for Trinity Package: tdenetwork-trinity-dev Section: devel Architecture: any -Replaces: tdenetwork-kde3-dev (<< 4:3.5.13) -Breaks: tdenetwork-kde3-dev (<< 4:3.5.13) +Replaces: kdenetwork-trinity-dev (<< 4:14.0.0) +Breaks: kdenetwork-trinity-dev (<< 4:14.0.0) Depends: kdict-trinity (= ${Source-Version}), kopete-trinity (= ${Source-Version}), ksirc-trinity (= ${Source-Version}), librss1-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8) Description: development files for the Trinity network module This is the development package which contains the headers for the KDE RSS @@ -319,8 +320,8 @@ Description: development files for the Trinity network module Package: lisa-trinity Section: net Architecture: any -Replaces: lisa-kde3 (<< 4:3.5.13) -Breaks: lisa-kde3 (<< 4:3.5.13) +Replaces: lisa-trinity (<< 4:14.0.0) +Breaks: lisa-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity, samba-common Description: LAN information server for Trinity @@ -333,8 +334,8 @@ Description: LAN information server for Trinity Package: kdnssd-trinity Section: net Architecture: any -Replaces: kdnssd-kde3 (<< 4:3.5.13) -Breaks: kdnssd-kde3 (<< 4:3.5.13) +Replaces: kdnssd-trinity (<< 4:14.0.0) +Breaks: kdnssd-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: avahi-daemon Suggests: avahi-autoipd | zeroconf @@ -348,8 +349,8 @@ Description: Zeroconf support for KDE Package: tdenetwork-trinity-dbg Section: libdevel Architecture: any -Replaces: tdenetwork-kde3-dbg (<< 4:3.5.13) -Breaks: tdenetwork-kde3-dbg (<< 4:3.5.13) +Replaces: kdenetwork-trinity-dbg (<< 4:14.0.0) +Breaks: kdenetwork-trinity-dbg (<< 4:14.0.0) Priority: extra Depends: librss1-trinity (= ${Source-Version}), tdelibs-trinity-dbg Description: debugging symbols for tdenetwork-trinity diff --git a/ubuntu/maverick/tdenetwork/debian/source/format b/ubuntu/maverick/tdenetwork/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/tdenetwork/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/tdenetwork/debian/source/options b/ubuntu/maverick/tdenetwork/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/tdenetwork/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/tdepim/debian/control b/ubuntu/maverick/tdepim/debian/control index 30d7281d5..848ece787 100644 --- a/ubuntu/maverick/tdepim/debian/control +++ b/ubuntu/maverick/tdepim/debian/control @@ -20,8 +20,8 @@ Standards-Version: 3.8.4 Package: tdepim-trinity Section: kde Architecture: all -Replaces: tdepim-kde3 (<< 4:3.5.13) -Breaks: tdepim-kde3 (<< 4:3.5.13) +Replaces: kdepim-trinity (<< 4:14.0.0) +Breaks: kdepim-trinity (<< 4:14.0.0) Depends: akregator-trinity (>= ${Source-Version}), kaddressbook-trinity (>= ${Source-Version}), kalarm-trinity (>= ${Source-Version}), kandy-trinity (>= ${Source-Version}), karm-trinity (>= ${Source-Version}), tdepim-kfile-plugins-trinity (>= ${Source-Version}), tdepim-kio-plugins-trinity (>= ${Source-Version}), tdepim-kresources-trinity (>= ${Source-Version}), tdepim-wizards-trinity (>= ${Source-Version}), kitchensync-trinity (>= ${Source-Version}), kleopatra-trinity (>= ${Source-Version}), kmail-trinity (>= ${Source-Version}), kmailcvt-trinity (>= ${Source-Version}), knode-trinity (>= ${Source-Version}), knotes-trinity (>= ${Source-Version}), konsolekalendar-trinity (>= ${Source-Version}), kontact-trinity (>= ${Source-Version}), korganizer-trinity (>= ${Source-Version}), korn-trinity (>= ${Source-Version}), ktnef-trinity (>= ${Source-Version}), libindex0-trinity (>= ${Source-Version}), libkcal2b-trinity (>= ${Source-Version}), libtdepim1a-trinity (>= ${Source-Version}), libkgantt0-trinity (>= ${Source-Version}), libkleopatra1-trinity (>= ${Source-Version}), libkpimexchange1-trinity (>= ${Source-Version}), libkpimidentities1-trinity (>= ${Source-Version}), libksieve0-trinity (>= ${Source-Version}), libktnef1-trinity (>= ${Source-Version}), libmimelib1c2a-trinity (>= ${Source-Version}) Suggests: tdepim-trinity-doc-html Description: Personal Information Management apps from the official Trinity release @@ -38,8 +38,8 @@ Description: Personal Information Management apps from the official Trinity rele Package: tdepim-trinity-dbg Priority: extra Section: libdevel -Replaces: tdepim-kde3-dbg (<< 4:3.5.13) -Breaks: tdepim-kde3-dbg (<< 4:3.5.13) +Replaces: kdepim-trinity-dbg (<< 4:14.0.0) +Breaks: kdepim-trinity-dbg (<< 4:14.0.0) Depends: tdelibs-trinity-dbg Architecture: any Description: debugging symbols for tdepim-trinity @@ -50,8 +50,8 @@ Description: debugging symbols for tdepim-trinity Package: tdepim-trinity-dev Section: devel Architecture: any -Replaces: tdepim-kde3-dev (<< 4:3.5.13) -Breaks: tdepim-kde3-dev (<< 4:3.5.13) +Replaces: kdepim-trinity-dev (<< 4:14.0.0) +Breaks: kdepim-trinity-dev (<< 4:14.0.0) Depends: kaddressbook-trinity (= ${Source-Version}), kalarm-trinity (= ${Source-Version}), tdepim-kresources-trinity (= ${Source-Version}), kmail-trinity (= ${Source-Version}), knotes-trinity (= ${Source-Version}), kontact-trinity (= ${Source-Version}), korganizer-trinity (= ${Source-Version}), libkpimidentities1-trinity (= ${Source-Version}), libkcal2-trinity-dev (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}), libkgantt0-trinity-dev (= ${Source-Version}), libkleopatra1-trinity-dev (= ${Source-Version}), libkpimexchange1-trinity-dev (= ${Source-Version}), libksieve0-trinity-dev (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version}), libmimelib1-trinity-dev (= ${Source-Version}) Description: KDE Personal Information Management [development] This package contains development files needed to compile tdepim applications. @@ -64,8 +64,8 @@ Description: KDE Personal Information Management [development] Package: tdepim-trinity-doc Section: doc Architecture: all -Replaces: tdepim-kde3-doc (<< 4:3.5.13) -Breaks: tdepim-kde3-doc (<< 4:3.5.13) +Replaces: kdepim-trinity-doc (<< 4:14.0.0) +Breaks: kdepim-trinity-doc (<< 4:14.0.0) Suggests: konqueror-trinity | www-browser, doc-base Description: KDE Personal Information Management library documentation KDE core library documentation. You need this documentation to develop KDE PIM @@ -79,8 +79,8 @@ Description: KDE Personal Information Management library documentation Package: tdepim-trinity-doc-html Section: doc Architecture: all -Replaces: tdepim-kde3-doc-html (<< 4:3.5.13) -Breaks: tdepim-kde3-doc-html (<< 4:3.5.13) +Replaces: kdepim-trinity-doc-html (<< 4:14.0.0) +Breaks: kdepim-trinity-doc-html (<< 4:14.0.0) Suggests: konqueror-trinity | www-browser, tdepim-trinity Description: KDE PIM documentation in HTML format By default the Personal Information Management applications provided with @@ -97,8 +97,8 @@ Description: KDE PIM documentation in HTML format Package: akregator-trinity Section: web Architecture: any -Replaces: akregator-kde3 (<< 4:3.5.13) -Breaks: akregator-kde3 (<< 4:3.5.13) +Replaces: akregator-trinity (<< 4:14.0.0) +Breaks: akregator-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: RSS feed aggregator for KDE aKregator is a fast, lightweight, and intuitive feed reader program @@ -113,8 +113,8 @@ Description: RSS feed aggregator for KDE Package: kaddressbook-trinity Section: utils Architecture: any -Replaces: kaddressbook-kde3 (<< 4:3.5.13) -Breaks: kaddressbook-kde3 (<< 4:3.5.13) +Replaces: kaddressbook-trinity (<< 4:14.0.0) +Breaks: kaddressbook-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5) Suggests: tdepim-kresources-trinity, tdebase-kio-plugins-trinity @@ -130,8 +130,8 @@ Description: KDE NG addressbook application Package: kalarm-trinity Section: kde Architecture: any -Replaces: kalarm-kde3 (<< 4:3.5.13) -Breaks: kalarm-kde3 (<< 4:3.5.13) +Replaces: kalarm-trinity (<< 4:14.0.0) +Breaks: kalarm-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: kmix-trinity, kttsd-trinity Description: Trinity alarm message, command and email scheduler @@ -155,8 +155,8 @@ Description: Trinity alarm message, command and email scheduler Package: kandy-trinity Section: utils Architecture: any -Replaces: kandy-kde3 (<< 4:3.5.13) -Breaks: kandy-kde3 (<< 4:3.5.13) +Replaces: kandy-trinity (<< 4:14.0.0) +Breaks: kandy-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Trinity mobile phone utility At the moment Kandy is more or less a terminal program with some special @@ -172,8 +172,8 @@ Description: Trinity mobile phone utility Package: karm-trinity Section: utils Architecture: any -Replaces: karm-kde3 (<< 4:3.5.13) -Breaks: karm-kde3 (<< 4:3.5.13) +Replaces: karm-trinity (<< 4:14.0.0) +Breaks: karm-trinity (<< 4:14.0.0) Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5) Depends: ${shlibs:Depends} Description: Trinity time tracker tool @@ -186,8 +186,8 @@ Description: Trinity time tracker tool Package: tdepim-kfile-plugins-trinity Section: kde Architecture: any -Replaces: tdepim-kfile-plugins-kde3 (<< 4:3.5.13) -Breaks: tdepim-kfile-plugins-kde3 (<< 4:3.5.13) +Replaces: kdepim-kfile-plugins-trinity (<< 4:14.0.0) +Breaks: kdepim-kfile-plugins-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: KDE File dialog plugins for palm and vcf files File dialog plugins for palm and vcf files. @@ -198,8 +198,8 @@ Description: KDE File dialog plugins for palm and vcf files Package: tdepim-kio-plugins-trinity Section: kde Architecture: any -Replaces: tdepim-kio-plugins-kde3 (<< 4:3.5.13) -Breaks: tdepim-kio-plugins-kde3 (<< 4:3.5.13) +Replaces: kdepim-kio-plugins-trinity (<< 4:14.0.0) +Breaks: kdepim-kio-plugins-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Trinity pim I/O Slaves This package includes the pim kioslaves. This includes imap4, sieve, @@ -211,8 +211,8 @@ Description: Trinity pim I/O Slaves Package: tdepim-kresources-trinity Section: kde Architecture: any -Replaces: tdepim-kresources-kde3 (<< 4:3.5.13) -Breaks: tdepim-kresources-kde3 (<< 4:3.5.13) +Replaces: kdepim-kresources-trinity (<< 4:14.0.0) +Breaks: kdepim-kresources-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: ${shlibs:Recommends}, korganizer-trinity Suggests: knotes-trinity @@ -227,8 +227,8 @@ Description: Trinity pim resource plugins Package: tdepim-wizards-trinity Section: kde Architecture: any -Replaces: tdepim-wizards-kde3 (<< 4:3.5.13) -Breaks: tdepim-wizards-kde3 (<< 4:3.5.13) +Replaces: kdepim-wizards-trinity (<< 4:14.0.0) +Breaks: kdepim-wizards-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: egroupware Description: Trinity server configuration wizards @@ -241,8 +241,8 @@ Description: Trinity server configuration wizards Package: kitchensync-trinity Section: kde Architecture: any -Replaces: kitchensync-kde3 (<< 4:3.5.13) -Breaks: kitchensync-kde3 (<< 4:3.5.13) +Replaces: kitchensync-trinity (<< 4:14.0.0) +Breaks: kitchensync-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: konqueror-trinity Conflicts: kdebluetooth-irmcsync-trinity (<< 0.99+1.0beta2-4.1), ksync-trinity @@ -256,8 +256,8 @@ Description: Synchronization framework Package: kleopatra-trinity Section: net Architecture: any -Replaces: kleopatra-kde3 (<< 4:3.5.13) -Breaks: kleopatra-kde3 (<< 4:3.5.13) +Replaces: kleopatra-trinity (<< 4:14.0.0) +Breaks: kleopatra-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, gnupg-agent, gnupg2, gpgsm, dirmngr, pinentry-qt | pinentry-x11 Description: Trinity Certificate Manager Kleopatra is the KDE tool for managing X.509 certificates in the gpgsm @@ -269,8 +269,8 @@ Description: Trinity Certificate Manager Package: kmail-trinity Section: mail Architecture: any -Replaces: kmail-kde3 (<< 4:3.5.13) -Breaks: kmail-kde3 (<< 4:3.5.13) +Replaces: kmail-trinity (<< 4:14.0.0) +Breaks: kmail-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, ${perl:Depends}, tdepim-kio-plugins-trinity, tdebase-kio-plugins-trinity, gpgsm, gnupg-agent, pinentry-qt | pinentry-x11 Recommends: procmail Suggests: gnupg, gnupg-agent, pinentry-qt | pinentry-x11, kaddressbook-trinity, kleopatra-trinity, spamassassin | bogofilter | annoyance-filter | spambayes | bsfilter | crm114, clamav | f-prot-installer @@ -292,8 +292,8 @@ Description: Trinity Email client Package: kmailcvt-trinity Section: mail Architecture: any -Replaces: kmailcvt-kde3 (<< 4:3.5.13) -Breaks: kmailcvt-kde3 (<< 4:3.5.13) +Replaces: kmailcvt-trinity (<< 4:14.0.0) +Breaks: kmailcvt-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, kmail-trinity Description: Trinity KMail mail folder converter Converts mail folders to KMail format. Formats supported for import @@ -305,8 +305,8 @@ Description: Trinity KMail mail folder converter Package: knode-trinity Section: news Architecture: any -Replaces: knode-kde3 (<< 4:3.5.13) -Breaks: knode-kde3 (<< 4:3.5.13) +Replaces: knode-trinity (<< 4:14.0.0) +Breaks: knode-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Provides: news-reader Description: Trinity news reader @@ -321,8 +321,8 @@ Description: Trinity news reader Package: knotes-trinity Section: kde Architecture: any -Replaces: knotes-kde3 (<< 4:3.5.13) -Breaks: knotes-kde3 (<< 4:3.5.13) +Replaces: knotes-trinity (<< 4:14.0.0) +Breaks: knotes-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: tdepim-kresources-trinity Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5) @@ -337,8 +337,8 @@ Description: Trinity sticky notes Package: kode-trinity Section: devel Architecture: any -Replaces: kode-kde3 (<< 4:3.5.13) -Breaks: kode-kde3 (<< 4:3.5.13) +Replaces: kode-trinity (<< 4:14.0.0) +Breaks: kode-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Helper library for programmatic generation of C++ code This package includes a program kode for generation of C++ template files @@ -351,8 +351,8 @@ Description: Helper library for programmatic generation of C++ code Package: konsolekalendar-trinity Section: kde Architecture: any -Replaces: konsolekalendar-kde3 (<< 4:3.5.13) -Breaks: konsolekalendar-kde3 (<< 4:3.5.13) +Replaces: konsolekalendar-trinity (<< 4:14.0.0) +Breaks: konsolekalendar-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Trinity konsole personal organizer KonsoleKalendar is a command-line interface to KDE calendars. @@ -365,8 +365,8 @@ Description: Trinity konsole personal organizer Package: kontact-trinity Section: kde Architecture: any -Replaces: kontact-kde3 (<< 4:3.5.13) -Breaks: kontact-kde3 (<< 4:3.5.13) +Replaces: kontact-trinity (<< 4:14.0.0) +Breaks: kontact-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, kmail-trinity, korganizer-trinity, kaddressbook-trinity Recommends: ${shlibs:Recommends}, kmail-trinity, knode-trinity, knotes-trinity Suggests: ${shlibs:Suggests}, akregator-trinity, knewsticker-trinity, kweather-trinity, gnokii @@ -385,8 +385,8 @@ Description: Trinity pim application Package: korganizer-trinity Section: kde Architecture: any -Replaces: korganizer-kde3 (<< 4:3.5.13) -Breaks: korganizer-kde3 (<< 4:3.5.13) +Replaces: korganizer-trinity (<< 4:14.0.0) +Breaks: korganizer-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, ${perl:Depends} Recommends: kghostview-trinity Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5) @@ -408,8 +408,8 @@ Description: Trinity personal organizer Package: korn-trinity Section: kde Architecture: any -Replaces: korn-kde3 (<< 4:3.5.13) -Breaks: korn-kde3 (<< 4:3.5.13) +Replaces: korn-trinity (<< 4:14.0.0) +Breaks: korn-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdepim-kio-plugins-trinity, tdebase-kio-plugins-trinity Description: Trinity mail checker Korn is a KDE mail checker that can display a small summary in the Kicker @@ -425,8 +425,8 @@ Description: Trinity mail checker Package: ktnef-trinity Section: kde Architecture: any -Replaces: ktnef-kde3 (<< 4:3.5.13) -Breaks: ktnef-kde3 (<< 4:3.5.13) +Replaces: ktnef-trinity (<< 4:14.0.0) +Breaks: ktnef-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Trinity TNEF viewer The TNEF File Viewer allows you to handle mail attachments using the TNEF @@ -439,8 +439,8 @@ Description: Trinity TNEF viewer Package: libindex0-trinity Section: libs Architecture: any -Replaces: libindex0-kde3 (<< 4:3.5.13) -Breaks: libindex0-kde3 (<< 4:3.5.13) +Replaces: libindex0-trinity (<< 4:14.0.0) +Breaks: libindex0-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Trinity indexing library This library provides text indexing and is currently used by KMail @@ -454,8 +454,8 @@ Description: Trinity indexing library Package: libindex0-trinity-dev Section: libdevel Architecture: any -Replaces: libindex0-kde3-dev (<< 4:3.5.13) -Breaks: libindex0-kde3-dev (<< 4:3.5.13) +Replaces: libindex0-trinity-dev (<< 4:14.0.0) +Breaks: libindex0-trinity-dev (<< 4:14.0.0) Depends: libindex0-trinity (= ${Source-Version}) Description: Trinity indexing library [development] This library provides text indexing and is currently used by KMail @@ -470,8 +470,8 @@ Description: Trinity indexing library [development] Package: libkcal2b-trinity Section: libs Architecture: any -Replaces: libkcal2b-kde3 (<< 4:3.5.13) -Breaks: libkcal2b-kde3 (<< 4:3.5.13) +Replaces: libkcal2b-trinity (<< 4:14.0.0) +Breaks: libkcal2b-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: ${shlibs:Recommends} Conflicts: libkcal2-trinity, libkcal2a-trinity @@ -488,8 +488,8 @@ Description: Trinity calendaring library Package: libkcal2-trinity-dev Section: libdevel Architecture: any -Replaces: libkcal2-kde3-dev (<< 4:3.5.13) -Breaks: libkcal2-kde3-dev (<< 4:3.5.13) +Replaces: libkcal2-trinity-dev (<< 4:14.0.0) +Breaks: libkcal2-trinity-dev (<< 4:14.0.0) Depends: libkcal2b-trinity (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version}) Description: Trinity calendaring library [development] This library provides a C++ API for handling the vCalendar and iCalendar @@ -504,8 +504,8 @@ Description: Trinity calendaring library [development] Package: libtdepim1a-trinity Section: libs Architecture: any -Replaces: libtdepim1a-kde3 (<< 4:3.5.13) -Breaks: libtdepim1a-kde3 (<< 4:3.5.13) +Replaces: libkdepim1a-trinity (<< 4:14.0.0) +Breaks: libkdepim1a-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Trinity PIM library This is the runtime package for programs that use the libtdepim-trinity library. @@ -516,8 +516,8 @@ Description: Trinity PIM library Package: libtdepim1-trinity-dev Section: libdevel Architecture: any -Replaces: libtdepim1-kde3-dev (<< 4:3.5.13) -Breaks: libtdepim1-kde3-dev (<< 4:3.5.13) +Replaces: libkdepim1-trinity-dev (<< 4:14.0.0) +Breaks: libkdepim1-trinity-dev (<< 4:14.0.0) Depends: libtdepim1a-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.7) Description: Trinity PIM library [development] This is the development package which contains the headers for the libtdepim-trinity @@ -529,8 +529,8 @@ Description: Trinity PIM library [development] Package: libkgantt0-trinity Section: libs Architecture: any -Replaces: libkgantt0-kde3 (<< 4:3.5.13) -Breaks: libkgantt0-kde3 (<< 4:3.5.13) +Replaces: libkgantt0-trinity (<< 4:14.0.0) +Breaks: libkgantt0-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Trinity gantt charting library This is the runtime package for programs that use the libkgantt-trinity library. @@ -541,8 +541,8 @@ Description: Trinity gantt charting library Package: libkgantt0-trinity-dev Section: libdevel Architecture: any -Replaces: libkgantt0-kde3-dev (<< 4:3.5.13) -Breaks: libkgantt0-kde3-dev (<< 4:3.5.13) +Replaces: libkgantt0-trinity-dev (<< 4:14.0.0) +Breaks: libkgantt0-trinity-dev (<< 4:14.0.0) Depends: libkgantt0-trinity (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}) Description: Trinity gantt charting library [development] This is the development package which contains the headers for the libkgantt-trinity @@ -554,8 +554,8 @@ Description: Trinity gantt charting library [development] Package: libkleopatra1-trinity Section: libs Architecture: any -Replaces: libkleopatra1-kde3 (<< 4:3.5.13) -Breaks: libkleopatra1-kde3 (<< 4:3.5.13) +Replaces: libkleopatra1-trinity (<< 4:14.0.0) +Breaks: libkleopatra1-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, ${perl:Depends}, gnupg Conflicts: libkleopatra0-trinity Description: KDE GnuPG interface libraries @@ -570,8 +570,8 @@ Description: KDE GnuPG interface libraries Package: libkleopatra1-trinity-dev Section: libdevel Architecture: any -Replaces: libkleopatra1-kde3-dev (<< 4:3.5.13) -Breaks: libkleopatra1-kde3-dev (<< 4:3.5.13) +Replaces: libkleopatra1-trinity-dev (<< 4:14.0.0) +Breaks: libkleopatra1-trinity-dev (<< 4:14.0.0) Depends: libkleopatra1-trinity (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}) Conflicts: libkleopatra0-trinity-dev Description: Trinity GnuPG interface libraries [development] @@ -587,8 +587,8 @@ Description: Trinity GnuPG interface libraries [development] Package: libkmime2-trinity Section: libs Architecture: any -Replaces: libkmime2-kde3 (<< 4:3.5.13) -Breaks: libkmime2-kde3 (<< 4:3.5.13) +Replaces: libkmime2-trinity (<< 4:14.0.0) +Breaks: libkmime2-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Conflicts: libmimelib1a-trinity Description: Trinity MIME interface library @@ -601,8 +601,8 @@ Description: Trinity MIME interface library Package: libkpimexchange1-trinity Section: libs Architecture: any -Replaces: libkpimexchange1-kde3 (<< 4:3.5.13) -Breaks: libkpimexchange1-kde3 (<< 4:3.5.13) +Replaces: libkpimexchange1-trinity (<< 4:14.0.0) +Breaks: libkpimexchange1-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Trinity PIM Exchange library This is the runtime package for programs that use the libkpimexchange-trinity @@ -614,8 +614,8 @@ Description: Trinity PIM Exchange library Package: libkpimexchange1-trinity-dev Section: libdevel Architecture: any -Replaces: libkpimexchange1-kde3-dev (<< 4:3.5.13) -Breaks: libkpimexchange1-kde3-dev (<< 4:3.5.13) +Replaces: libkpimexchange1-trinity-dev (<< 4:14.0.0) +Breaks: libkpimexchange1-trinity-dev (<< 4:14.0.0) Depends: libkpimexchange1-trinity (= ${Source-Version}), libkcal2-trinity-dev (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}) Description: Trinity PIM Exchange library [development] This is the development package which contains the headers for the @@ -627,8 +627,8 @@ Description: Trinity PIM Exchange library [development] Package: libkpimidentities1-trinity Section: libs Architecture: any -Replaces: libkpimidentities1-kde3 (<< 4:3.5.13) -Breaks: libkpimidentities1-kde3 (<< 4:3.5.13) +Replaces: libkpimidentities1-trinity (<< 4:14.0.0) +Breaks: libkpimidentities1-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Trinity PIM user identity information library This library provides information to KDE programs about user identity, @@ -643,8 +643,8 @@ Description: Trinity PIM user identity information library Package: libksieve0-trinity Section: libs Architecture: any -Replaces: libksieve0-kde3 (<< 4:3.5.13) -Breaks: libksieve0-kde3 (<< 4:3.5.13) +Replaces: libksieve0-trinity (<< 4:14.0.0) +Breaks: libksieve0-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Trinity mail/news message filtering library This is the runtime package for programs that use the libksieve-trinity library. @@ -655,8 +655,8 @@ Description: Trinity mail/news message filtering library Package: libksieve0-trinity-dev Section: libdevel Architecture: any -Replaces: libksieve0-kde3-dev (<< 4:3.5.13) -Breaks: libksieve0-kde3-dev (<< 4:3.5.13) +Replaces: libksieve0-trinity-dev (<< 4:14.0.0) +Breaks: libksieve0-trinity-dev (<< 4:14.0.0) Depends: libksieve0-trinity (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}) Description: Trinity mail/news message filtering library [development] This is the development package which contains the headers for the libksieve-trinity @@ -668,8 +668,8 @@ Description: Trinity mail/news message filtering library [development] Package: libktnef1-trinity Section: libs Architecture: any -Replaces: libktnef1-kde3 (<< 4:3.5.13) -Breaks: libktnef1-kde3 (<< 4:3.5.13) +Replaces: libktnef1-trinity (<< 4:14.0.0) +Breaks: libktnef1-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Library for handling KTNEF email attachments This library handles mail attachments using the TNEF format. These @@ -685,8 +685,8 @@ Description: Library for handling KTNEF email attachments Package: libktnef1-trinity-dev Section: libdevel Architecture: any -Replaces: libktnef1-kde3-dev (<< 4:3.5.13) -Breaks: libktnef1-kde3-dev (<< 4:3.5.13) +Replaces: libktnef1-trinity-dev (<< 4:14.0.0) +Breaks: libktnef1-trinity-dev (<< 4:14.0.0) Depends: libktnef1-trinity (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}) Description: KTNEF handler library [development] This library handles mail attachments using the TNEF format. These @@ -703,8 +703,8 @@ Description: KTNEF handler library [development] Package: libmimelib1c2a-trinity Section: libs Architecture: any -Replaces: libmimelib1c2a-kde3 (<< 4:3.5.13) -Breaks: libmimelib1c2a-kde3 (<< 4:3.5.13) +Replaces: libmimelib1c2a-trinity (<< 4:14.0.0) +Breaks: libmimelib1c2a-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Conflicts: libmimelib1a-trinity Description: Trinity mime library @@ -718,8 +718,8 @@ Description: Trinity mime library Package: libmimelib1-trinity-dev Section: libdevel Architecture: any -Replaces: libmimelib1-kde3-dev (<< 4:3.5.13) -Breaks: libmimelib1-kde3-dev (<< 4:3.5.13) +Replaces: libmimelib1-trinity-dev (<< 4:14.0.0) +Breaks: libmimelib1-trinity-dev (<< 4:14.0.0) Depends: libmimelib1c2a-trinity (= ${Source-Version}) Description: Trinity mime library [development] This library is used by several KDE applications to handle mime types. diff --git a/ubuntu/maverick/tdepim/debian/source/format b/ubuntu/maverick/tdepim/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/tdepim/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/tdepim/debian/source/options b/ubuntu/maverick/tdepim/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/tdepim/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/tdesdk/debian/changelog b/ubuntu/maverick/tdesdk/debian/changelog index 288f761e6..276fb1d78 100644 --- a/ubuntu/maverick/tdesdk/debian/changelog +++ b/ubuntu/maverick/tdesdk/debian/changelog @@ -153,7 +153,7 @@ tdesdk (4:3.5.6-2) unstable; urgency=low +++ Changes by Sune Vuorela: - * Promote graphviz from kcachegrind Suggests to Recommends. (Closes: #407043) + * Promote graphviz from tdecachegrind Suggests to Recommends. (Closes: #407043) * Don't install the licensecheck script in tdesdk. The devscripts package has taken it and is working actively on it. Let tdesdk-scripts suggest devscripts instead. (Closes: #420154) @@ -617,7 +617,7 @@ tdesdk (4:3.3.2-3) unstable; urgency=high under the LGPL. * Fix kdemangen.pl output to use minus instead of hyphen where appropriate, thanks to Achim Bohnet (closes: #295454). - * Fixed amd64/gcc-4.0 build by using longs for node IDs in kcachegrind, + * Fixed amd64/gcc-4.0 build by using longs for node IDs in tdecachegrind, thanks to Andreas Jochens (closes: #287032). -- Ben Burton <bab@debian.org> Thu, 31 Mar 2005 19:59:13 +1000 @@ -672,8 +672,8 @@ tdesdk (4:3.3.1-1) unstable; urgency=medium tdesdk (4:3.3.0-1) unstable; urgency=low * New upstream release. - * New package kcachegrind-converters. These foreign format converters - are packaged separately so that kcachegrind need not depend on php. + * New package tdecachegrind-converters. These foreign format converters + are packaged separately so that tdecachegrind need not depend on php. * Binary package kmtrace has returned. Note that the kmtrace libraries for debian are now installed in /usr/lib/kmtrace, not in /usr/lib as is done upstream. @@ -712,7 +712,7 @@ tdesdk (4:3.2.2-1) unstable; urgency=low * New upstream bugfix release. * Add Conflicts/Replaces for umbrello-manual (closes: #237173). * Don't use Conflicts/Replaces elsewhere where we should just use Replaces. - * Have kcachegrind suggest graphviz (closes: #243883). + * Have tdecachegrind suggest graphviz (closes: #243883). -- Ben Burton <bab@debian.org> Tue, 16 Mar 2004 09:15:01 +1100 @@ -735,8 +735,8 @@ tdesdk (4:3.2.0-1) unstable; urgency=low * New upstream release. * Many thanks to Ralf Nolden for all his help with packaging KDE 3.2. * Thanks to Robert Lemmen for previous packaging work on umbrello and - to Philipp Frauenfelder for previous packaging work on kcachegrind. - * New binary packages kcachegrind, kuiviewer and umbrello. + to Philipp Frauenfelder for previous packaging work on tdecachegrind. + * New binary packages tdecachegrind, kuiviewer and umbrello. * Created a new package tdesdk-doc-html for HTML documentation. -- Ben Burton <bab@debian.org> Sat, 31 Jan 2004 12:08:48 +1100 diff --git a/ubuntu/maverick/tdesdk/debian/control b/ubuntu/maverick/tdesdk/debian/control index 308320f7c..76302c587 100644 --- a/ubuntu/maverick/tdesdk/debian/control +++ b/ubuntu/maverick/tdesdk/debian/control @@ -14,10 +14,10 @@ Standards-Version: 3.8.4 Package: tdesdk-trinity Architecture: all Section: kde -Replaces: tdesdk-kde3 (<< 4:3.5.13) -Breaks: tdesdk-kde3 (<< 4:3.5.13) -Depends: cervisia-trinity (>= ${Source-Version}), kapptemplate-trinity (>= ${Source-Version}), kbabel-trinity (>= ${Source-Version}), kbugbuster-trinity (>= ${Source-Version}), kcachegrind-trinity (>= ${Source-Version}), tdesdk-kfile-plugins-trinity (>= ${Source-Version}), tdesdk-kio-plugins-trinity (>= ${Source-Version}) | tdesvn-kio-plugins-trinity, tdesdk-misc-trinity (>= ${Source-Version}), tdesdk-scripts-trinity, kmtrace-trinity (>= ${Source-Version}), kompare-trinity (>= ${Source-Version}), kspy-trinity (>= ${Source-Version}), kuiviewer-trinity (>= ${Source-Version}), kunittest-trinity (>= ${Source-Version}), poxml-trinity (>= ${Source-Version}), umbrello-trinity (>= ${Source-Version}) -Suggests: kcachegrind-converters-trinity, kbabel-trinity-dev, tdesdk-trinity-doc-html +Replaces: kdesdk-trinity (<< 4:14.0.0) +Breaks: kdesdk-trinity (<< 4:14.0.0) +Depends: cervisia-trinity (>= ${Source-Version}), kapptemplate-trinity (>= ${Source-Version}), kbabel-trinity (>= ${Source-Version}), kbugbuster-trinity (>= ${Source-Version}), tdecachegrind-trinity (>= ${Source-Version}), tdesdk-kfile-plugins-trinity (>= ${Source-Version}), tdesdk-kio-plugins-trinity (>= ${Source-Version}) | tdesvn-kio-plugins-trinity, tdesdk-misc-trinity (>= ${Source-Version}), tdesdk-scripts-trinity, kmtrace-trinity (>= ${Source-Version}), kompare-trinity (>= ${Source-Version}), kspy-trinity (>= ${Source-Version}), kuiviewer-trinity (>= ${Source-Version}), kunittest-trinity (>= ${Source-Version}), poxml-trinity (>= ${Source-Version}), umbrello-trinity (>= ${Source-Version}) +Suggests: tdecachegrind-converters-trinity, kbabel-trinity-dev, tdesdk-trinity-doc-html Description: software development kit from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical desktop environment for Unix workstations. It combines ease of use, @@ -30,8 +30,8 @@ Description: software development kit from the official Trinity release Package: tdesdk-trinity-doc-html Architecture: all Section: doc -Replaces: tdesdk-kde3-doc-html (<< 4:3.5.13) -Breaks: tdesdk-kde3-doc-html (<< 4:3.5.13) +Replaces: kdesdk-trinity-doc-html (<< 4:14.0.0) +Breaks: kdesdk-trinity-doc-html (<< 4:14.0.0) Suggests: konqueror-trinity | www-browser, tdesdk-trinity Description: Trinity Software Development Kit documentation in HTML format By default the modules provided by KDE only provide their documentation @@ -50,8 +50,8 @@ Description: Trinity Software Development Kit documentation in HTML format Package: cervisia-trinity Architecture: any Section: devel -Replaces: cervisia-kde3 (<< 4:3.5.13) -Breaks: cervisia-kde3 (<< 4:3.5.13) +Replaces: cervisia-trinity (<< 4:14.0.0) +Breaks: cervisia-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html Conflicts: cervisia @@ -70,8 +70,8 @@ Description: a graphical CVS front end for Trinity Package: kapptemplate-trinity Architecture: all Section: devel -Replaces: kapptemplate-kde3 (<< 4:3.5.13) -Breaks: kapptemplate-kde3 (<< 4:3.5.13) +Replaces: kapptemplate-trinity (<< 4:14.0.0) +Breaks: kapptemplate-trinity (<< 4:14.0.0) Conflicts: kapptemplate Recommends: automake1.9 | automaken, tdelibs4-trinity-dev (>= 4:3.5.8) Description: creates a framework to develop a Trinity application @@ -86,8 +86,8 @@ Description: creates a framework to develop a Trinity application Package: kbabel-trinity Architecture: any Section: devel -Replaces: kbabel-kde3 (<< 4:3.5.13) -Breaks: kbabel-kde3 (<< 4:3.5.13) +Replaces: kbabel-trinity (<< 4:14.0.0) +Breaks: kbabel-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Conflicts: kbabel Recommends: gettext @@ -109,8 +109,8 @@ Description: PO-file editing suite for Trinity Package: kbabel-trinity-dev Architecture: any Section: libdevel -Replaces: kbabel-kde3-dev (<< 4:3.5.13) -Breaks: kbabel-kde3-dev (<< 4:3.5.13) +Replaces: kbabel-trinity-dev (<< 4:14.0.0) +Breaks: kbabel-trinity-dev (<< 4:14.0.0) Depends: kbabel-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8) Conflicts: kbabel Description: PO-file editing suite for Trinity (development files) @@ -132,8 +132,8 @@ Description: PO-file editing suite for Trinity (development files) Package: kbugbuster-trinity Architecture: any Section: devel -Replaces: kbugbuster-kde3 (<< 4:3.5.13) -Breaks: kbugbuster-kde3 (<< 4:3.5.13) +Replaces: kbugbuster-trinity (<< 4:14.0.0) +Breaks: kbugbuster-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Conflicts: kbugbuster Suggests: khelpcenter-trinity @@ -145,15 +145,15 @@ Description: a front end for the Trinity bug tracking system This package is part of Trinity, and a component of the KDE SDK module. See the 'kde-trinity' and 'tdesdk-trinity' packages for more information. -Package: kcachegrind-trinity +Package: tdecachegrind-trinity Architecture: any Section: devel -Replaces: kcachegrind-kde3 (<< 4:3.5.13) -Breaks: kcachegrind-kde3 (<< 4:3.5.13) +Replaces: tdecachegrind-trinity (<< 4:14.0.0) +Breaks: tdecachegrind-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} -Conflicts: kcachegrind +Conflicts: tdecachegrind Recommends: valgrind-callgrind-trinity | valgrind-calltree-trinity, graphviz -Suggests: kcachegrind-converters-trinity, khelpcenter-trinity, tdesdk-trinity-doc-html +Suggests: tdecachegrind-converters-trinity, khelpcenter-trinity, tdesdk-trinity-doc-html Description: visualisation tool for valgrind profiling output KCachegrind is a visualisation tool for the profiling data generated by calltree, a profiling skin for valgrind. Applications can be @@ -161,19 +161,19 @@ Description: visualisation tool for valgrind profiling output and plugin architectures are supported. . For visualising the output from other profiling tools, several converters - can be found in the kcachegrind-converters package. + can be found in the tdecachegrind-converters package. . This package is part of Trinity, and a component of the KDE SDK module. See the 'kde-trinity' and 'tdesdk-trinity' packages for more information. -Package: kcachegrind-converters-trinity +Package: tdecachegrind-converters-trinity Architecture: all Section: devel -Replaces: kcachegrind-converters-kde3 (<< 4:3.5.13) -Breaks: kcachegrind-converters-kde3 (<< 4:3.5.13) +Replaces: tdecachegrind-converters-trinity (<< 4:14.0.0) +Breaks: tdecachegrind-converters-trinity (<< 4:14.0.0) Depends: ${perl:Depends}, php5-cli, python -Conflicts: kcachegrind-converters -Recommends: kcachegrind-trinity +Conflicts: tdecachegrind-converters +Recommends: tdecachegrind-trinity Description: format converters for KCachegrind profiling visualisation tool This is a collection of scripts for converting the output from different profiling tools into a format that KCachegrind can use. @@ -189,8 +189,8 @@ Description: format converters for KCachegrind profiling visualisation tool Package: tdesdk-kfile-plugins-trinity Architecture: any Section: kde -Replaces: tdesdk-kfile-plugins-kde3 (<< 4:3.5.13) -Breaks: tdesdk-kfile-plugins-kde3 (<< 4:3.5.13) +Replaces: kdesdk-kfile-plugins-trinity (<< 4:14.0.0) +Breaks: kdesdk-kfile-plugins-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Conflicts: tdesdk-kfile-plugins Description: Trinity file dialog plugins for software development files @@ -204,8 +204,8 @@ Description: Trinity file dialog plugins for software development files Package: tdesdk-misc-trinity Architecture: any Section: devel -Replaces: tdesdk-misc-kde3 (<< 4:3.5.13) -Breaks: tdesdk-misc-kde3 (<< 4:3.5.13) +Replaces: kdesdk-misc-trinity (<< 4:14.0.0) +Breaks: kdesdk-misc-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: libqt3-mt-dev | libqt3-dev Suggests: gimp | xpaint @@ -226,8 +226,8 @@ Description: various goodies from the Trinity Software Development Kit Package: tdesdk-scripts-trinity Architecture: all Section: devel -Replaces: tdesdk-scripts-kde3 (<< 4:3.5.13) -Breaks: tdesdk-scripts-kde3 (<< 4:3.5.13) +Replaces: kdesdk-scripts-trinity (<< 4:14.0.0) +Breaks: kdesdk-scripts-trinity (<< 4:14.0.0) Depends: ${perl:Depends}, python Recommends: automake1.9 | automaken, cvs, gawk Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html, dmalloc, gdb, tdelibs4-trinity-doc, qt3-doc, valgrind, devscripts @@ -250,8 +250,8 @@ Description: a set of useful development scripts for Trinity Package: kmtrace-trinity Architecture: any Section: devel -Replaces: kmtrace-kde3 (<< 4:3.5.13) -Breaks: kmtrace-kde3 (<< 4:3.5.13) +Replaces: kmtrace-trinity (<< 4:14.0.0) +Breaks: kmtrace-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, less Conflicts: kmtrace Description: a Trinity memory leak tracer @@ -264,8 +264,8 @@ Description: a Trinity memory leak tracer Package: kompare-trinity Architecture: any Section: devel -Replaces: kompare-kde3 (<< 4:3.5.13) -Breaks: kompare-kde3 (<< 4:3.5.13) +Replaces: kompare-trinity (<< 4:14.0.0) +Breaks: kompare-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Conflicts: kompare Suggests: khelpcenter-trinity @@ -280,8 +280,8 @@ Description: a Trinity GUI for viewing differences between files Package: kspy-trinity Architecture: any Section: devel -Replaces: kspy-kde3 (<< 4:3.5.13) -Breaks: kspy-kde3 (<< 4:3.5.13) +Replaces: kspy-trinity (<< 4:14.0.0) +Breaks: kspy-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdelibs4-trinity-dev (>= 4:3.5.8) Conflicts: kspy Description: examines the internal state of a Qt/KDE app @@ -302,8 +302,8 @@ Description: examines the internal state of a Qt/KDE app Package: kuiviewer-trinity Architecture: any Section: devel -Replaces: kuiviewer-kde3 (<< 4:3.5.13) -Breaks: kuiviewer-kde3 (<< 4:3.5.13) +Replaces: kuiviewer-trinity (<< 4:14.0.0) +Breaks: kuiviewer-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Conflicts: kuiviewer Suggests: qt3-designer @@ -320,8 +320,8 @@ Description: viewer for Qt Designer user interface files Package: libcvsservice0-trinity Architecture: any Section: libs -Replaces: libcvsservice0-kde3 (<< 4:3.5.13) -Breaks: libcvsservice0-kde3 (<< 4:3.5.13) +Replaces: libcvsservice0-trinity (<< 4:14.0.0) +Breaks: libcvsservice0-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, cvs Conflicts: libcvsservice0 Description: DCOP service for accessing CVS repositories @@ -338,8 +338,8 @@ Description: DCOP service for accessing CVS repositories Package: libcvsservice-trinity-dev Architecture: any Section: libdevel -Replaces: libcvsservice-kde3-dev (<< 4:3.5.13) -Breaks: libcvsservice-kde3-dev (<< 4:3.5.13) +Replaces: libcvsservice-trinity-dev (<< 4:14.0.0) +Breaks: libcvsservice-trinity-dev (<< 4:14.0.0) Depends: libcvsservice0-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8) Conflicts: libcvsservice-dev Description: development files for CVS DCOP service @@ -357,8 +357,8 @@ Description: development files for CVS DCOP service Package: poxml-trinity Architecture: any Section: devel -Replaces: poxml-kde3 (<< 4:3.5.13) -Breaks: poxml-kde3 (<< 4:3.5.13) +Replaces: poxml-trinity (<< 4:14.0.0) +Breaks: poxml-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Conflicts: poxml Description: tools for using PO-files to translate DocBook XML files @@ -374,8 +374,8 @@ Description: tools for using PO-files to translate DocBook XML files Package: umbrello-trinity Architecture: any Section: devel -Replaces: umbrello-kde3 (<< 4:3.5.13) -Breaks: umbrello-kde3 (<< 4:3.5.13) +Replaces: umbrello-trinity (<< 4:14.0.0) +Breaks: umbrello-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html Conflicts: umbrello-manual-trinity (<< 20040311), umbrello @@ -395,8 +395,8 @@ Description: UML modelling tool and code generator Package: tdesdk-kio-plugins-trinity Architecture: any Section: devel -Replaces: tdesdk-kio-plugins-kde3 (<< 4:3.5.13) -Breaks: tdesdk-kio-plugins-kde3 (<< 4:3.5.13) +Replaces: kdesdk-kio-plugins-trinity (<< 4:14.0.0) +Breaks: kdesdk-kio-plugins-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, subversion Conflicts: tdesdk-kio-plugins Description: subversion ioslave for Trinity @@ -410,8 +410,8 @@ Description: subversion ioslave for Trinity Package: kunittest-trinity Architecture: any Section: devel -Replaces: kunittest-kde3 (<< 4:3.5.13) -Breaks: kunittest-kde3 (<< 4:3.5.13) +Replaces: kunittest-trinity (<< 4:14.0.0) +Breaks: kunittest-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Conflicts: kunittest Suggests: tdelibs4-trinity-doc @@ -428,8 +428,8 @@ Description: unit testing library for Trinity Package: tdesdk-trinity-dbg Section: libdevel Architecture: any -Replaces: tdesdk-kde3-dbg (<< 4:3.5.13) -Breaks: tdesdk-kde3-dbg (<< 4:3.5.13) +Replaces: kdesdk-trinity-dbg (<< 4:14.0.0) +Breaks: kdesdk-trinity-dbg (<< 4:14.0.0) Priority: extra Depends: tdelibs-trinity-dbg, libcvsservice-trinity-dev (= ${Source-Version}), kbabel-trinity-dev (= ${Source-Version}) Conflicts: tdesdk-dbg diff --git a/ubuntu/maverick/tdesdk/debian/control.in b/ubuntu/maverick/tdesdk/debian/control.in index c70b772a1..2e5b5c1ad 100644 --- a/ubuntu/maverick/tdesdk/debian/control.in +++ b/ubuntu/maverick/tdesdk/debian/control.in @@ -13,8 +13,8 @@ Standards-Version: 3.7.2 Package: tdesdk Architecture: all Section: kde -Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), kcachegrind (>= ${Source-Version}), tdesdk-kfile-plugins (>= ${Source-Version}), tdesdk-kio-plugins (>= ${Source-Version}) | tdesvn-kio-plugins, tdesdk-misc (>= ${Source-Version}), tdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), kunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version}) -Suggests: kcachegrind-converters, kbabel-dev, tdesdk-doc-html +Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), tdecachegrind (>= ${Source-Version}), tdesdk-kfile-plugins (>= ${Source-Version}), tdesdk-kio-plugins (>= ${Source-Version}) | tdesvn-kio-plugins, tdesdk-misc (>= ${Source-Version}), tdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), kunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version}) +Suggests: tdecachegrind-converters, kbabel-dev, tdesdk-doc-html Description: software development kit from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical desktop environment for Unix workstations. It combines ease of use, @@ -127,12 +127,12 @@ Description: a front end for the KDE bug tracking system This package is part of KDE, and a component of the KDE SDK module. See the 'kde' and 'tdesdk' packages for more information. -Package: kcachegrind +Package: tdecachegrind Architecture: any Section: devel Depends: ${shlibs:Depends} Recommends: valgrind-callgrind | valgrind-calltree, graphviz -Suggests: kcachegrind-converters, khelpcenter, tdesdk-doc-html +Suggests: tdecachegrind-converters, khelpcenter, tdesdk-doc-html Description: visualisation tool for valgrind profiling output KCachegrind is a visualisation tool for the profiling data generated by calltree, a profiling skin for valgrind. Applications can be @@ -140,16 +140,16 @@ Description: visualisation tool for valgrind profiling output and plugin architectures are supported. . For visualising the output from other profiling tools, several converters - can be found in the kcachegrind-converters package. + can be found in the tdecachegrind-converters package. . This package is part of KDE, and a component of the KDE SDK module. See the 'kde' and 'tdesdk' packages for more information. -Package: kcachegrind-converters +Package: tdecachegrind-converters Architecture: all Section: devel Depends: ${perl:Depends}, php5-cli, python -Recommends: kcachegrind +Recommends: tdecachegrind Description: format converters for KCachegrind profiling visualisation tool This is a collection of scripts for converting the output from different profiling tools into a format that KCachegrind can use. diff --git a/ubuntu/maverick/tdesdk/debian/copyright b/ubuntu/maverick/tdesdk/debian/copyright index ca64fadb8..8574b5937 100644 --- a/ubuntu/maverick/tdesdk/debian/copyright +++ b/ubuntu/maverick/tdesdk/debian/copyright @@ -3,7 +3,7 @@ Fri, 26 Jan 2001 18:00:00 -0700. It was brought up to date by Ben Burton <bab@debian.org> on Mon, 26 Mar 2001 09:10:56 -0600. Thanks to Robert Lemmen and Philipp Frauenfelder for originally packaging -umbrello and kcachegrind respectively. +umbrello and tdecachegrind respectively. It was downloaded from: http://www.kde.org/download diff --git a/ubuntu/maverick/tdesdk/debian/icons/kcachegrind.xpm b/ubuntu/maverick/tdesdk/debian/icons/tdecachegrind.xpm index 843263759..bfcdfc6e2 100644 --- a/ubuntu/maverick/tdesdk/debian/icons/kcachegrind.xpm +++ b/ubuntu/maverick/tdesdk/debian/icons/tdecachegrind.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * kcachegrind_xpm[] = { +static char * tdecachegrind_xpm[] = { "32 30 256 2", " c None", ". c #0036CA", diff --git a/ubuntu/maverick/tdesdk/debian/kcachegrind-converters-trinity.docs b/ubuntu/maverick/tdesdk/debian/kcachegrind-converters-trinity.docs deleted file mode 100644 index b19a948df..000000000 --- a/ubuntu/maverick/tdesdk/debian/kcachegrind-converters-trinity.docs +++ /dev/null @@ -1 +0,0 @@ -kcachegrind/converters/README diff --git a/ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.docs b/ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.docs deleted file mode 100644 index aef510285..000000000 --- a/ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.docs +++ /dev/null @@ -1,3 +0,0 @@ -kcachegrind/AUTHORS -kcachegrind/README -kcachegrind/TODO diff --git a/ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.install b/ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.install deleted file mode 100644 index eb19d1715..000000000 --- a/ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.install +++ /dev/null @@ -1,19 +0,0 @@ -debian/tmp/opt/trinity/bin/kcachegrind -debian/tmp/opt/trinity/share/applications/kde/kcachegrind.desktop -debian/tmp/opt/trinity/share/apps/kcachegrind/icons/hicolor/16x16/actions/fromrec.png -debian/tmp/opt/trinity/share/apps/kcachegrind/icons/hicolor/16x16/actions/percent.png -debian/tmp/opt/trinity/share/apps/kcachegrind/icons/hicolor/16x16/actions/recrec.png -debian/tmp/opt/trinity/share/apps/kcachegrind/icons/hicolor/16x16/actions/torec.png -debian/tmp/opt/trinity/share/apps/kcachegrind/icons/hicolor/22x22/actions/percent.png -debian/tmp/opt/trinity/share/apps/kcachegrind/icons/hicolor/32x32/actions/percent.png -debian/tmp/opt/trinity/share/apps/kcachegrind/kcachegrindui.rc -debian/tmp/opt/trinity/share/apps/kcachegrind/tips -debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcachegrind/*.bz2 -debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcachegrind/common -debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcachegrind/*.docbook -debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kcachegrind.png -debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kcachegrind.png -debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kcachegrind.png -debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kcachegrind.png -debian/tmp/opt/trinity/share/mimelnk/application/x-kcachegrind.desktop -debian/icons/kcachegrind.xpm /opt/trinity/share/pixmaps diff --git a/ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.manpages b/ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.manpages deleted file mode 100644 index f994baff0..000000000 --- a/ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/man/kcachegrind.1 diff --git a/ubuntu/maverick/tdesdk/debian/man/dprof2calltree.1 b/ubuntu/maverick/tdesdk/debian/man/dprof2calltree.1 index f1e7691a4..ce66a6b30 100644 --- a/ubuntu/maverick/tdesdk/debian/man/dprof2calltree.1 +++ b/ubuntu/maverick/tdesdk/debian/man/dprof2calltree.1 @@ -49,10 +49,10 @@ work with this data in KCachegrind as follows: .RS dprof2calltree -f tmin.out -o cachegrind.out.foo .br -kcachegrind cachegrind.out.foo +tdecachegrind cachegrind.out.foo .RE .SH SEE ALSO -.BR kcachegrind (1). +.BR tdecachegrind (1). .SH AUTHOR This converter was written by George Schlossnagle <george@omniti.com>. .br diff --git a/ubuntu/maverick/tdesdk/debian/man/hotshot2calltree.1 b/ubuntu/maverick/tdesdk/debian/man/hotshot2calltree.1 index 3b31794aa..a07ce76b4 100644 --- a/ubuntu/maverick/tdesdk/debian/man/hotshot2calltree.1 +++ b/ubuntu/maverick/tdesdk/debian/man/hotshot2calltree.1 @@ -46,10 +46,10 @@ data in KCachegrind as follows. .RS hotshot2cachegrind \-o cachegrind.out.0 pythongrind.prof .br -kcachegrind cachegrind.out.0 +tdecachegrind cachegrind.out.0 .RE .SH SEE ALSO -.BR kcachegrind (1). +.BR tdecachegrind (1). .SH AUTHOR This converter was written by Jorg Beyer <job@webde-ag.de>. .br diff --git a/ubuntu/maverick/tdesdk/debian/man/memprof2calltree.1 b/ubuntu/maverick/tdesdk/debian/man/memprof2calltree.1 index 0bd0582a3..c4042c126 100644 --- a/ubuntu/maverick/tdesdk/debian/man/memprof2calltree.1 +++ b/ubuntu/maverick/tdesdk/debian/man/memprof2calltree.1 @@ -28,7 +28,7 @@ corresponding calltree data will be written to standard output. .PP This utility is part of the KDE Software Development Kit. .SH SEE ALSO -.BR kcachegrind (1). +.BR tdecachegrind (1). .SH AUTHOR This converter was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>. .br diff --git a/ubuntu/maverick/tdesdk/debian/man/op2calltree.1 b/ubuntu/maverick/tdesdk/debian/man/op2calltree.1 index c81836a46..d18231d3e 100644 --- a/ubuntu/maverick/tdesdk/debian/man/op2calltree.1 +++ b/ubuntu/maverick/tdesdk/debian/man/op2calltree.1 @@ -35,7 +35,7 @@ application, to a file of the form \fIoprof.out.<app>\fP. .PP This utility is part of the KDE Software Development Kit. .SH SEE ALSO -.BR kcachegrind (1). +.BR tdecachegrind (1). .SH AUTHOR This converter was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>. .br diff --git a/ubuntu/maverick/tdesdk/debian/man/pprof2calltree.1 b/ubuntu/maverick/tdesdk/debian/man/pprof2calltree.1 index dc80f91ad..b98a06aec 100644 --- a/ubuntu/maverick/tdesdk/debian/man/pprof2calltree.1 +++ b/ubuntu/maverick/tdesdk/debian/man/pprof2calltree.1 @@ -40,11 +40,11 @@ follows. .RS pprof2calltree -f pprof.12345.1 .br -kcachegrind cachegrind.out.12345.1 +tdecachegrind cachegrind.out.12345.1 .RE .PP .SH SEE ALSO -.BR kcachegrind (1). +.BR tdecachegrind (1). .SH AUTHOR This converter was written by George Schlossnagle <george@omniti.com>. .br diff --git a/ubuntu/maverick/tdesdk/debian/man/kcachegrind.1 b/ubuntu/maverick/tdesdk/debian/man/tdecachegrind.1 index ce3296b8c..6e4d92a15 100644 --- a/ubuntu/maverick/tdesdk/debian/man/kcachegrind.1 +++ b/ubuntu/maverick/tdesdk/debian/man/tdecachegrind.1 @@ -2,7 +2,7 @@ .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) -.TH KCACHEGRIND 1 "March 25, 2005" +.TH TDECACHEGRIND 1 "March 25, 2005" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -16,9 +16,9 @@ .\" .sp <n> insert n+1 empty lines .\" for manpage-specific macros, see man(7) .SH NAME -kcachegrind \- a visualisation tool for valgrind profiling output +tdecachegrind \- a visualisation tool for valgrind profiling output .SH SYNOPSIS -.B kcachegrind +.B tdecachegrind .RI "[ " generic-options " ]" [ \fB\-r\fP \fIexec\fP ] [ \fItrace-file\fP ] .SH DESCRIPTION @@ -29,12 +29,12 @@ and plugin architectures are supported. .PP For visualising the output from other profiling tools, several converters are available. On Debian systems these can be found in the -\fIkcachegrind-converters\fP package. +\fItdecachegrind-converters\fP package. .PP This application is part of the KDE Software Development Kit. .SH OPTIONS -Below are the kcachegrind-specific options. -For a full summary of options, run \fIkcachegrind \-\-help\fP. +Below are the tdecachegrind-specific options. +For a full summary of options, run \fItdecachegrind \-\-help\fP. .TP \fB\-r\fP \fIexec\fP Run the program \fIexec\fP under cachegrind. @@ -52,14 +52,14 @@ Visualise data from the given trace. .PP Full user documentation is available through the KDE Help Centre. You can also enter the URL -\fIhelp:/kcachegrind/\fP +\fIhelp:/tdecachegrind/\fP directly into konqueror or you can run -`\fIkhelpcenter help:/kcachegrind/\fP' +`\fIkhelpcenter help:/tdecachegrind/\fP' from the command-line. .PP If the KDE Help Centre is not installed then you can install the package \fItdesdk-doc-html\fP and read this documentation in HTML format from -\fI/usr/share/doc/kde/HTML/en/kcachegrind/\fP. +\fI/usr/share/doc/kde/HTML/en/tdecachegrind/\fP. .SH AUTHOR KCachegrind was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>. .br diff --git a/ubuntu/maverick/tdesdk/debian/rules b/ubuntu/maverick/tdesdk/debian/rules index fc163e6d7..e7b228f2b 100755 --- a/ubuntu/maverick/tdesdk/debian/rules +++ b/ubuntu/maverick/tdesdk/debian/rules @@ -31,7 +31,7 @@ DEB_DH_MAKESHLIBS_ARGS_umbrello-trinity := -V'umbrello-trinity (>= 4:3.5.8-1)' DEB_INSTALL_CHANGELOGS_cervisia-trinity := cervisia/ChangeLog DEB_INSTALL_CHANGELOGS_kapptemplate-trinity := kapptemplate/ChangeLog DEB_INSTALL_CHANGELOGS_kbabel-trinity := kbabel/ChangeLog -DEB_INSTALL_CHANGELOGS_kcachegrind-trinity := kcachegrind/ChangeLog +DEB_INSTALL_CHANGELOGS_tdecachegrind-trinity := tdecachegrind/ChangeLog DEB_INSTALL_CHANGELOGS_kompare-trinity := kompare/ChangeLog DEB_INSTALL_CHANGELOGS_umbrello-trinity := umbrello/ChangeLog diff --git a/ubuntu/maverick/tdesdk/debian/source/format b/ubuntu/maverick/tdesdk/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/tdesdk/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/tdesdk/debian/source/options b/ubuntu/maverick/tdesdk/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/tdesdk/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/tdesdk/debian/tdecachegrind-converters-trinity.docs b/ubuntu/maverick/tdesdk/debian/tdecachegrind-converters-trinity.docs new file mode 100644 index 000000000..613037510 --- /dev/null +++ b/ubuntu/maverick/tdesdk/debian/tdecachegrind-converters-trinity.docs @@ -0,0 +1 @@ +tdecachegrind/converters/README diff --git a/ubuntu/maverick/tdesdk/debian/kcachegrind-converters-trinity.install b/ubuntu/maverick/tdesdk/debian/tdecachegrind-converters-trinity.install index 742cfc523..742cfc523 100644 --- a/ubuntu/maverick/tdesdk/debian/kcachegrind-converters-trinity.install +++ b/ubuntu/maverick/tdesdk/debian/tdecachegrind-converters-trinity.install diff --git a/ubuntu/maverick/tdesdk/debian/kcachegrind-converters-trinity.manpages b/ubuntu/maverick/tdesdk/debian/tdecachegrind-converters-trinity.manpages index 977c48e2d..977c48e2d 100644 --- a/ubuntu/maverick/tdesdk/debian/kcachegrind-converters-trinity.manpages +++ b/ubuntu/maverick/tdesdk/debian/tdecachegrind-converters-trinity.manpages diff --git a/ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.README.Debian b/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.README.Debian index 25ddc2247..25ddc2247 100644 --- a/ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.README.Debian +++ b/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.README.Debian diff --git a/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.docs b/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.docs new file mode 100644 index 000000000..dd7f4d534 --- /dev/null +++ b/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.docs @@ -0,0 +1,3 @@ +tdecachegrind/AUTHORS +tdecachegrind/README +tdecachegrind/TODO diff --git a/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.install b/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.install new file mode 100644 index 000000000..4bad0216b --- /dev/null +++ b/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.install @@ -0,0 +1,19 @@ +debian/tmp/opt/trinity/bin/tdecachegrind +debian/tmp/opt/trinity/share/applications/kde/tdecachegrind.desktop +debian/tmp/opt/trinity/share/apps/tdecachegrind/icons/hicolor/16x16/actions/fromrec.png +debian/tmp/opt/trinity/share/apps/tdecachegrind/icons/hicolor/16x16/actions/percent.png +debian/tmp/opt/trinity/share/apps/tdecachegrind/icons/hicolor/16x16/actions/recrec.png +debian/tmp/opt/trinity/share/apps/tdecachegrind/icons/hicolor/16x16/actions/torec.png +debian/tmp/opt/trinity/share/apps/tdecachegrind/icons/hicolor/22x22/actions/percent.png +debian/tmp/opt/trinity/share/apps/tdecachegrind/icons/hicolor/32x32/actions/percent.png +debian/tmp/opt/trinity/share/apps/tdecachegrind/tdecachegrindui.rc +debian/tmp/opt/trinity/share/apps/tdecachegrind/tips +debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdecachegrind/*.bz2 +debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdecachegrind/common +debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdecachegrind/*.docbook +debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/tdecachegrind.png +debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/tdecachegrind.png +debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdecachegrind.png +debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdecachegrind.png +debian/tmp/opt/trinity/share/mimelnk/application/x-tdecachegrind.desktop +debian/icons/tdecachegrind.xpm /opt/trinity/share/pixmaps diff --git a/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.manpages b/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.manpages new file mode 100644 index 000000000..367c3db5d --- /dev/null +++ b/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.manpages @@ -0,0 +1 @@ +debian/man/tdecachegrind.1 diff --git a/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-kde3.menu b/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.menu index fb693d3ec..bde1e7a53 100644 --- a/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-kde3.menu +++ b/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.menu @@ -1,9 +1,9 @@ -?package(kcachegrind):\ +?package(tdecachegrind):\ needs="x11"\ section="Applications/Programming"\ hints="KDE"\ title="KCachegrind"\ longtitle="KCachegrind (Profiler Frontend)"\ - icon="/usr/share/pixmaps/kcachegrind.xpm"\ - command="/opt/kde3/bin/kcachegrind" + icon="/usr/share/pixmaps/tdecachegrind.xpm"\ + command="/opt/trinity/bin/tdecachegrind" diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.kcachegrind b/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.tdecachegrind index 1ce09cab0..fca2157d6 100644 --- a/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.kcachegrind +++ b/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.tdecachegrind @@ -1,4 +1,4 @@ -Document: tdesdk-doc-html-kcachegrind +Document: tdesdk-doc-html-tdecachegrind Title: KCachegrind Handbook Author: Josef Weidendorfer <Josef.Weidendorfer@gmx.de> Abstract: KCachegrind is a profile data visualization tool, written @@ -6,6 +6,6 @@ Abstract: KCachegrind is a profile data visualization tool, written Section: Apps/Programming Format: HTML -Index: /usr/share/doc/kde/HTML/en/kcachegrind/index.html -Files: /usr/share/doc/kde/HTML/en/kcachegrind/*.html +Index: /usr/share/doc/kde/HTML/en/tdecachegrind/index.html +Files: /usr/share/doc/kde/HTML/en/tdecachegrind/*.html diff --git a/ubuntu/maverick/tdetoys/debian/changelog b/ubuntu/maverick/tdetoys/debian/changelog index 8db640fcb..5406c86c9 100644 --- a/ubuntu/maverick/tdetoys/debian/changelog +++ b/ubuntu/maverick/tdetoys/debian/changelog @@ -511,7 +511,7 @@ tdetoys (4:3.1.4-3) unstable; urgency=low tdetoys (4:3.1.4-2) unstable; urgency=low * Updated amor description and man page to note that it works with window - managers other than kwin (closes: #213488). + managers other than twin (closes: #213488). -- Ben Burton <bab@debian.org> Mon, 13 Oct 2003 00:55:42 +1000 diff --git a/ubuntu/maverick/tdetoys/debian/control b/ubuntu/maverick/tdetoys/debian/control index 7255a132c..7388f1dbd 100644 --- a/ubuntu/maverick/tdetoys/debian/control +++ b/ubuntu/maverick/tdetoys/debian/control @@ -10,8 +10,8 @@ Standards-Version: 3.8.4 Package: tdetoys-trinity Architecture: all Section: kde -Replaces: tdetoys-kde3 (<< 4:3.5.13) -Breaks: tdetoys-kde3 (<< 4:3.5.13) +Replaces: kdetoys-trinity (<< 4:14.0.0) +Breaks: kdetoys-trinity (<< 4:14.0.0) Depends: amor-trinity (>= ${Source-Version}), eyesapplet-trinity (>= ${Source-Version}), fifteenapplet-trinity (>= ${Source-Version}), kmoon-trinity (>= ${Source-Version}), kodo-trinity (>= ${Source-Version}), kteatime-trinity (>= ${Source-Version}), ktux-trinity (>= ${Source-Version}), kweather-trinity (>= ${Source-Version}), kworldclock-trinity (>= ${Source-Version}) Suggests: tdetoys-trinity-doc-html (>= ${Source-Version}) Description: toys from the official Trinity release @@ -26,8 +26,8 @@ Description: toys from the official Trinity release Package: tdetoys-trinity-doc-html Architecture: all Section: doc -Replaces: tdetoys-kde3-doc-html (<< 4:3.5.13) -Breaks: tdetoys-kde3-doc-html (<< 4:3.5.13) +Replaces: kdetoys-trinity-doc-html (<< 4:14.0.0) +Breaks: kdetoys-trinity-doc-html (<< 4:14.0.0) Suggests: konqueror-trinity | www-browser, tdetoys-trinity Description: Trinity toys documentation in HTML format By default the modules provided by KDE only provide their documentation @@ -46,10 +46,10 @@ Description: Trinity toys documentation in HTML format Package: amor-trinity Architecture: any Section: games -Replaces: amor-kde3 (<< 4:3.5.13) -Breaks: amor-kde3 (<< 4:3.5.13) +Replaces: amor-trinity (<< 4:14.0.0) +Breaks: amor-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} -Recommends: kwin-trinity +Recommends: twin-trinity Suggests: khelpcenter-trinity Conflicts: task-tdetoys-trinity Description: a Trinity creature for your desktop @@ -65,8 +65,8 @@ Description: a Trinity creature for your desktop Package: eyesapplet-trinity Architecture: any Section: kde -Replaces: eyesapplet-kde3 (<< 4:3.5.13) -Breaks: eyesapplet-kde3 (<< 4:3.5.13) +Replaces: eyesapplet-trinity (<< 4:14.0.0) +Breaks: eyesapplet-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: kicker-trinity Conflicts: task-tdetoys-trinity @@ -80,8 +80,8 @@ Description: eyes applet for Trinity Package: fifteenapplet-trinity Architecture: any Section: kde -Replaces: fifteenapplet-kde3 (<< 4:3.5.13) -Breaks: fifteenapplet-kde3 (<< 4:3.5.13) +Replaces: fifteenapplet-trinity (<< 4:14.0.0) +Breaks: fifteenapplet-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: kicker-trinity Description: fifteen pieces puzzle for Trinity @@ -95,8 +95,8 @@ Description: fifteen pieces puzzle for Trinity Package: kmoon-trinity Architecture: any Section: kde -Replaces: kmoon-kde3 (<< 4:3.5.13) -Breaks: kmoon-kde3 (<< 4:3.5.13) +Replaces: kmoon-trinity (<< 4:14.0.0) +Breaks: kmoon-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: kicker-trinity Suggests: khelpcenter-trinity @@ -110,8 +110,8 @@ Description: moon phase indicator for Trinity Package: kodo-trinity Architecture: any Section: games -Replaces: kodo-kde3 (<< 4:3.5.13) -Breaks: kodo-kde3 (<< 4:3.5.13) +Replaces: kodo-trinity (<< 4:14.0.0) +Breaks: kodo-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Conflicts: task-tdetoys-trinity @@ -126,8 +126,8 @@ Description: mouse odometer for Trinity Package: kteatime-trinity Architecture: any Section: kde -Replaces: kteatime-kde3 (<< 4:3.5.13) -Breaks: kteatime-kde3 (<< 4:3.5.13) +Replaces: kteatime-trinity (<< 4:14.0.0) +Breaks: kteatime-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, kicker-trinity Suggests: khelpcenter-trinity Conflicts: task-tdetoys-trinity @@ -149,10 +149,10 @@ Description: Trinity utility for making a fine cup of tea Package: ktux-trinity Architecture: any Section: kde -Replaces: ktux-kde3 (<< 4:3.5.13) -Breaks: ktux-kde3 (<< 4:3.5.13) +Replaces: ktux-trinity (<< 4:14.0.0) +Breaks: ktux-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} -Suggests: kwin-trinity +Suggests: twin-trinity Conflicts: task-tdetoys-trinity Description: Tux screensaver for Trinity A neat Tux-in-a-spaceship screensaver for the K Desktop Environment (KDE). @@ -163,8 +163,8 @@ Description: Tux screensaver for Trinity Package: kweather-trinity Architecture: any Section: kde -Replaces: kweather-kde3 (<< 4:3.5.13) -Breaks: kweather-kde3 (<< 4:3.5.13) +Replaces: kweather-trinity (<< 4:14.0.0) +Breaks: kweather-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: kicker-trinity Suggests: khelpcenter-trinity @@ -183,8 +183,8 @@ Description: weather display applet for Trinity Package: kworldclock-trinity Architecture: any Section: games -Replaces: kworldclock-kde3 (<< 4:3.5.13) -Breaks: kworldclock-kde3 (<< 4:3.5.13) +Replaces: kworldclock-trinity (<< 4:14.0.0) +Breaks: kworldclock-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: tdeartwork-misc-trinity, kicker-trinity, kdesktop-trinity, khelpcenter-trinity Conflicts: task-tdetoys-trinity, kworldwatch-trinity (<= 4:2.2-beta1-1) @@ -203,8 +203,8 @@ Description: earth watcher for Trinity Package: tdetoys-trinity-dbg Section: libdevel Architecture: any -Replaces: tdetoys-kde3-dbg (<< 4:3.5.13) -Breaks: tdetoys-kde3-dbg (<< 4:3.5.13) +Replaces: kdetoys-trinity-dbg (<< 4:14.0.0) +Breaks: kdetoys-trinity-dbg (<< 4:14.0.0) Depends: tdelibs-trinity-dbg Priority: extra Description: debugging symbols for tdetoys-trinity diff --git a/ubuntu/maverick/tdetoys/debian/control.in b/ubuntu/maverick/tdetoys/debian/control.in index 0540c794a..df8f74d5d 100644 --- a/ubuntu/maverick/tdetoys/debian/control.in +++ b/ubuntu/maverick/tdetoys/debian/control.in @@ -44,7 +44,7 @@ Package: amor Architecture: any Section: games Depends: ${shlibs:Depends} -Recommends: kwin +Recommends: twin Suggests: khelpcenter Conflicts: task-tdetoys Replaces: tdetoys (<< 4:3.0.1-0), task-tdetoys @@ -140,7 +140,7 @@ Package: ktux Architecture: any Section: kde Depends: ${shlibs:Depends} -Suggests: kwin +Suggests: twin Conflicts: task-tdetoys Replaces: tdetoys (<< 4:3.0.1-0), task-tdetoys Description: Tux screensaver for KDE diff --git a/ubuntu/maverick/tdetoys/debian/source/format b/ubuntu/maverick/tdetoys/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/tdetoys/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/tdetoys/debian/source/options b/ubuntu/maverick/tdetoys/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/tdetoys/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/tdeutils/debian/control b/ubuntu/maverick/tdeutils/debian/control index c33bf1354..2c965d3c9 100644 --- a/ubuntu/maverick/tdeutils/debian/control +++ b/ubuntu/maverick/tdeutils/debian/control @@ -5,14 +5,14 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com> Build-Depends: libasound2-dev, ia32-libs [amd64], cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), tdebase-trinity-dev (>= 4:3.5.10), libkonq4-trinity-dev (>= 4:3.5.10), libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev -Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc +Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc Standards-Version: 3.8.4 Package: tdeutils-trinity Section: kde Architecture: all -Replaces: tdeutils-kde3 (<< 4:3.5.13) -Breaks: tdeutils-kde3 (<< 4:3.5.13) +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}), kdessh-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}), kwalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version}) Suggests: tdeutils-trinity-doc-html (>= ${Source-Version}) Description: general purpose utilities from the official Trinity release @@ -27,8 +27,8 @@ Description: general purpose utilities from the official Trinity release Package: tdeutils-trinity-doc Section: doc Architecture: all -Replaces: tdeutils-kde3-doc (<< 4:3.5.13) -Breaks: tdeutils-kde3-doc (<< 4:3.5.13) +Replaces: kdeutils-trinity-doc (<< 4:14.0.0) +Breaks: kdeutils-trinity-doc (<< 4:14.0.0) Description: developer documentation for the KDE utilities module This package contains documentation for the KDE utilities module, of use more for developers creating applications than regular users. @@ -39,8 +39,8 @@ Description: developer documentation for the KDE utilities module Package: tdeutils-trinity-doc-html Architecture: all Section: doc -Replaces: tdeutils-kde3-doc-html (<< 4:3.5.13) -Breaks: tdeutils-kde3-doc-html (<< 4:3.5.13) +Replaces: kdeutils-trinity-doc-html (<< 4:14.0.0) +Breaks: kdeutils-trinity-doc-html (<< 4:14.0.0) Suggests: konqueror-trinity | www-browser, tdebase-trinity Description: Trinity utilities documentation in HTML format By default the modules provided by KDE only provide their documentation @@ -59,8 +59,8 @@ Description: Trinity utilities documentation in HTML format Package: tdeutils-trinity-dev Section: utils Architecture: any -Replaces: tdeutils-kde3-dev (<< 4:3.5.13) -Breaks: tdeutils-kde3-dev (<< 4:3.5.13) +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 (>= 4:3.5.8) Description: development files for the Trinity utilities module This package contains development files needed to compile tdeutils @@ -72,8 +72,8 @@ Description: development files for the Trinity utilities module Package: ark-trinity Section: utils Architecture: any -Replaces: ark-kde3 (<< 4:3.5.13) -Breaks: ark-kde3 (<< 4:3.5.13) +Replaces: ark-trinity (<< 4:14.0.0) +Breaks: ark-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: ncompress, unzip, zip, zoo, bzip2, p7zip-full, xz-utils, lzma Suggests: khelpcenter-trinity, rar, unrar | unrar-free @@ -95,8 +95,8 @@ Description: graphical archiving tool for Trinity Package: kcalc-trinity Section: utils Architecture: any -Replaces: kcalc-kde3 (<< 4:3.5.13) -Breaks: kcalc-kde3 (<< 4:3.5.13) +Replaces: kcalc-trinity (<< 4:14.0.0) +Breaks: kcalc-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: calculator for Trinity @@ -114,8 +114,8 @@ Description: calculator for Trinity Package: kcharselect-trinity Section: utils Architecture: any -Replaces: kcharselect-kde3 (<< 4:3.5.13) -Breaks: kcharselect-kde3 (<< 4:3.5.13) +Replaces: kcharselect-trinity (<< 4:14.0.0) +Breaks: kcharselect-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: character selector for Trinity @@ -127,8 +127,8 @@ Description: character selector for Trinity Package: kdelirc-trinity Section: utils Architecture: any -Replaces: kdelirc-kde3 (<< 4:3.5.13) -Breaks: kdelirc-kde3 (<< 4:3.5.13) +Replaces: kdelirc-trinity (<< 4:14.0.0) +Breaks: kdelirc-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: infrared control for Trinity @@ -140,8 +140,8 @@ Description: infrared control for Trinity Package: kdessh-trinity Section: kde Architecture: any -Replaces: kdessh-kde3 (<< 4:3.5.13) -Breaks: kdessh-kde3 (<< 4:3.5.13) +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. @@ -152,8 +152,8 @@ Description: ssh frontend for Trinity Package: kdf-trinity Section: utils Architecture: any -Replaces: kdf-kde3 (<< 4:3.5.13) -Breaks: kdf-kde3 (<< 4:3.5.13) +Replaces: kdf-trinity (<< 4:14.0.0) +Breaks: kdf-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: disk space utility for Trinity @@ -168,8 +168,8 @@ Description: disk space utility for Trinity Package: kedit-trinity Section: editors Architecture: any -Replaces: kedit-kde3 (<< 4:3.5.13) -Breaks: kedit-kde3 (<< 4:3.5.13) +Replaces: kedit-trinity (<< 4:14.0.0) +Breaks: kedit-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: basic text editor for Trinity @@ -186,8 +186,8 @@ Description: basic text editor for Trinity Package: kfloppy-trinity Section: utils Architecture: any -Replaces: kfloppy-kde3 (<< 4:3.5.13) -Breaks: kfloppy-kde3 (<< 4:3.5.13) +Replaces: kfloppy-trinity (<< 4:14.0.0) +Breaks: kfloppy-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, dosfstools Suggests: khelpcenter-trinity Description: floppy formatter for KDE @@ -200,8 +200,8 @@ Description: floppy formatter for KDE Package: kgpg-trinity Section: kde Architecture: any -Replaces: kgpg-kde3 (<< 4:3.5.13) -Breaks: kgpg-kde3 (<< 4:3.5.13) +Replaces: kgpg-trinity (<< 4:14.0.0) +Breaks: kgpg-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, konsole-trinity (>= 4:3.5.8), gnupg Suggests: khelpcenter-trinity Description: GnuPG frontend for Trinity @@ -225,8 +225,8 @@ Description: GnuPG frontend for Trinity Package: khexedit-trinity Section: utils Architecture: any -Replaces: khexedit-kde3 (<< 4:3.5.13) -Breaks: khexedit-kde3 (<< 4:3.5.13) +Replaces: khexedit-trinity (<< 4:14.0.0) +Breaks: khexedit-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: Trinity hex editor @@ -240,8 +240,8 @@ Description: Trinity hex editor Package: kjots-trinity Section: utils Architecture: any -Replaces: kjots-kde3 (<< 4:3.5.13) -Breaks: kjots-kde3 (<< 4:3.5.13) +Replaces: kjots-trinity (<< 4:14.0.0) +Breaks: kjots-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: note taking utility for Trinity @@ -254,8 +254,8 @@ Description: note taking utility for Trinity Package: klaptopdaemon-trinity Section: kde Architecture: any -Replaces: klaptopdaemon-kde3 (<< 4:3.5.13) -Breaks: klaptopdaemon-kde3 (<< 4:3.5.13) +Replaces: klaptopdaemon-trinity (<< 4:14.0.0) +Breaks: klaptopdaemon-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: battery monitoring and management for laptops using KDE @@ -268,8 +268,8 @@ Description: battery monitoring and management for laptops using KDE Package: kmilo-trinity Section: utils Architecture: any -Replaces: kmilo-kde3 (<< 4:3.5.13) -Breaks: kmilo-kde3 (<< 4:3.5.13) +Replaces: kmilo-trinity (<< 4:14.0.0) +Breaks: kmilo-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: laptop special keys support for Trinity KMilo lets you use the special keys on some keyboards and laptops. @@ -284,8 +284,8 @@ Description: laptop special keys support for Trinity Package: kmilo-legacy-trinity Section: utils Architecture: any -Replaces: kmilo-legacy-kde3 (<< 4:3.5.13) -Breaks: kmilo-legacy-kde3 (<< 4:3.5.13) +Replaces: kmilo-legacy-trinity (<< 4:14.0.0) +Breaks: kmilo-legacy-trinity (<< 4:14.0.0) Depends: kmilo-trinity, ${shlibs:Depends} Description: non-standard plugins for KMilo KMilo lets you use the special keys on some keyboards and laptops. @@ -302,8 +302,8 @@ Description: non-standard plugins for KMilo Package: kregexpeditor-trinity Section: kde Architecture: any -Replaces: kregexpeditor-kde3 (<< 4:3.5.13) -Breaks: kregexpeditor-kde3 (<< 4:3.5.13) +Replaces: kregexpeditor-trinity (<< 4:14.0.0) +Breaks: kregexpeditor-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: graphical regular expression editor plugin for Trinity @@ -316,8 +316,8 @@ Description: graphical regular expression editor plugin for Trinity Package: ksim-trinity Section: utils Architecture: any -Replaces: ksim-kde3 (<< 4:3.5.13) -Breaks: ksim-kde3 (<< 4:3.5.13) +Replaces: ksim-trinity (<< 4:14.0.0) +Breaks: ksim-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: system information monitor for Trinity @@ -331,8 +331,8 @@ Description: system information monitor for Trinity Package: ktimer-trinity Section: utils Architecture: any -Replaces: ktimer-kde3 (<< 4:3.5.13) -Breaks: ktimer-kde3 (<< 4:3.5.13) +Replaces: ktimer-trinity (<< 4:14.0.0) +Breaks: ktimer-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: timer utility for Trinity @@ -346,8 +346,8 @@ Description: timer utility for Trinity Package: kwalletmanager-trinity Section: utils Architecture: any -Replaces: kwalletmanager-kde3 (<< 4:3.5.13) -Breaks: kwalletmanager-kde3 (<< 4:3.5.13) +Replaces: kwalletmanager-trinity (<< 4:14.0.0) +Breaks: kwalletmanager-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: wallet manager for Trinity @@ -361,8 +361,8 @@ Description: wallet manager for Trinity Package: superkaramba-trinity Section: kde Architecture: any -Replaces: superkaramba-kde3 (<< 4:3.5.13) -Breaks: superkaramba-kde3 (<< 4:3.5.13) +Replaces: superkaramba-trinity (<< 4:14.0.0) +Breaks: superkaramba-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Conflicts: karamba-trinity @@ -385,8 +385,8 @@ Description: a program based on karamba improving the eyecandy of KDE Package: tdeutils-trinity-dbg Section: libdevel Architecture: any -Replaces: tdeutils-kde3-dbg (<< 4:3.5.13) -Breaks: tdeutils-kde3-dbg (<< 4:3.5.13) +Replaces: kdeutils-trinity-dbg (<< 4:14.0.0) +Breaks: kdeutils-trinity-dbg (<< 4:14.0.0) Depends: tdelibs-trinity-dbg Priority: extra Description: debugging symbols for tdeutils-trinity diff --git a/ubuntu/maverick/tdeutils/debian/man/kcharselect-trinity.1 b/ubuntu/maverick/tdeutils/debian/man/kcharselect-trinity.1 index af601f877..15d1c35d9 100644 --- a/ubuntu/maverick/tdeutils/debian/man/kcharselect-trinity.1 +++ b/ubuntu/maverick/tdeutils/debian/man/kcharselect-trinity.1 @@ -69,7 +69,7 @@ Use an alternative configuration file, instead of the default, which is normally located in .I /usr/share/config or in -.RB $ KDEHOME\fI/share/config +.RB $ TDEHOME\fI/share/config .TP .BI \-\-dcopserver \ server Set the address of the DCOP server to attach to. @@ -195,7 +195,7 @@ LANG. Assume that all filenames are in UTF-8 format regardless of the current language setting. Otherwise the filename format is defined by the language. -.IP KDE_MULTIHEAD +.IP TDE_MULTIHEAD If this variable has the value .B true multihead multiple display mode is enabled. The KDE display will be @@ -217,7 +217,7 @@ The session manager to use. This option is set automatically by KDE and is a network path to the session manager socket. .IP HOME Path to the home directory for the current user. -.IP KDEHOME +.IP TDEHOME The KDE per-user setting directory. Default if not specified is .I $HOME/.kde .lf 50 info/tdeutils.kcharselect.1 diff --git a/ubuntu/maverick/tdeutils/debian/source/format b/ubuntu/maverick/tdeutils/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/tdeutils/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/tdeutils/debian/source/options b/ubuntu/maverick/tdeutils/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/tdeutils/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/tdevelop/debian/control b/ubuntu/maverick/tdevelop/debian/control index d7597762b..fce6ef3c6 100644 --- a/ubuntu/maverick/tdevelop/debian/control +++ b/ubuntu/maverick/tdevelop/debian/control @@ -9,8 +9,8 @@ Standards-Version: 3.8.4 Package: tdevelop-trinity Architecture: any Depends: ${shlibs:Depends}, tdevelop-data-trinity (>= ${source:Version}), tdebase-trinity-bin -Replaces: tdevelop-kde3 (<< 4:3.5.13) -Breaks: tdevelop-kde3 (<< 4:3.5.13) +Replaces: kdevelop-trinity (<< 4:14.0.0) +Breaks: kdevelop-trinity (<< 4:14.0.0) Recommends: tdevelop-trinity-doc, make, libtool, autoconf, automaken, gdb (>= 6.4) Suggests: libtqtinterface-dev, tdelibs4-trinity-dev, sgmltools-lite, gettext, ark-trinity, kbabel-trinity, kiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-kio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs4-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python Description: An IDE for Unix/X11 @@ -27,8 +27,8 @@ Description: An IDE for Unix/X11 Package: tdevelop-trinity-doc Section: doc Architecture: all -Replaces: tdevelop-kde3-doc (<< 4:3.5.13) -Breaks: tdevelop-kde3-doc (<< 4:3.5.13) +Replaces: kdevelop-trinity-doc (<< 4:14.0.0) +Breaks: kdevelop-trinity-doc (<< 4:14.0.0) Description: An IDE for Unix/X11 - documentation KDevelop is an easy to use Integrated Development Environment for developing C/C++ applications under X11. It features @@ -44,8 +44,8 @@ Description: An IDE for Unix/X11 - documentation Package: tdevelop-data-trinity Architecture: all -Replaces: tdevelop-data-kde3 (<< 4:3.5.13) -Breaks: tdevelop-data-kde3 (<< 4:3.5.13) +Replaces: kdevelop-data-trinity (<< 4:14.0.0) +Breaks: kdevelop-data-trinity (<< 4:14.0.0) Description: An IDE for Unix/X11 - data KDevelop is an easy to use Integrated Development Environment for developing C/C++ applications under X11. It features @@ -62,8 +62,8 @@ Description: An IDE for Unix/X11 - data Package: tdevelop-trinity-dev Architecture: any Depends: tdevelop-trinity (= ${binary:Version}), tdelibs4-trinity-dev -Replaces: tdevelop-kde3-dev (<< 4:3.5.13) -Breaks: tdevelop-kde3-dev (<< 4:3.5.13) +Replaces: kdevelop-trinity-dev (<< 4:14.0.0) +Breaks: kdevelop-trinity-dev (<< 4:14.0.0) Description: An IDE for Unix/X11 - development files KDevelop is an easy to use Integrated Development Environment for developing C/C++ applications under X11. It features diff --git a/ubuntu/maverick/tdevelop/debian/source/format b/ubuntu/maverick/tdevelop/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/tdevelop/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/tdevelop/debian/source/options b/ubuntu/maverick/tdevelop/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/tdevelop/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/tdewebdev/debian/control b/ubuntu/maverick/tdewebdev/debian/control index 5dd974e56..d98b6a46f 100644 --- a/ubuntu/maverick/tdewebdev/debian/control +++ b/ubuntu/maverick/tdewebdev/debian/control @@ -11,8 +11,8 @@ Homepage: http://trinity.pearsoncomputing.net Package: tdewebdev-trinity Architecture: all Section: kde -Replaces: tdewebdev-kde3 (<< 4:3.5.13) -Breaks: tdewebdev-kde3 (<< 4:3.5.13) +Replaces: kdewebdev-trinity (<< 4:14.0.0) +Breaks: kdewebdev-trinity (<< 4:14.0.0) Depends: quanta-trinity (>= ${source:Version}), kfilereplace-trinity (>= ${source:Version}), kimagemapeditor-trinity (>= ${source:Version}), klinkstatus-trinity (>= ${source:Version}), kommander-trinity (>= ${source:Version}), kxsldbg-trinity (>= ${source:Version}) Suggests: kommander-trinity-dev (>= ${source:Version}), tdewebdev-trinity-doc-html (>= ${source:Version}) Description: web development apps from the official KDE release [Trinity] @@ -27,8 +27,8 @@ Description: web development apps from the official KDE release [Trinity] Package: tdewebdev-trinity-doc-html Architecture: all Section: doc -Replaces: tdewebdev-kde3-doc-html (<< 4:3.5.13) -Breaks: tdewebdev-kde3-doc-html (<< 4:3.5.13) +Replaces: kdewebdev-trinity-doc-html (<< 4:14.0.0) +Breaks: kdewebdev-trinity-doc-html (<< 4:14.0.0) Suggests: konqueror-trinity | www-browser, tdewebdev-trinity Description: KDE web development documentation in HTML format [Trinity] By default the modules provided by KDE only provide their documentation @@ -47,8 +47,8 @@ Description: KDE web development documentation in HTML format [Trinity] Package: quanta-trinity Architecture: any Section: web -Replaces: quanta-kde3 (<< 4:3.5.13) -Breaks: quanta-kde3 (<< 4:3.5.13) +Replaces: quanta-trinity (<< 4:14.0.0) +Breaks: quanta-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, kfilereplace-trinity, klinkstatus-trinity, kommander-trinity, quanta-data-trinity, tidy Recommends: cervisia, gnupg, kompare-trinity, kxsldbg-trinity, docbook-defguide Suggests: gubed, kimagemapeditor-trinity, wget, khelpcenter-trinity, php-doc @@ -72,8 +72,8 @@ Description: web development environment for KDE [Trinity] Package: quanta-data-trinity Architecture: all Section: web -Replaces: quanta-data-kde3 (<< 4:3.5.13) -Breaks: quanta-data-kde3 (<< 4:3.5.13) +Replaces: quanta-data-trinity (<< 4:14.0.0) +Breaks: quanta-data-trinity (<< 4:14.0.0) Recommends: quanta-trinity (= ${source:Version}) Description: data files for Quanta Plus web development environment [Trinity] This package contains architecture-independent data files for Quanta @@ -88,8 +88,8 @@ Description: data files for Quanta Plus web development environment [Trinity] Package: kfilereplace-trinity Architecture: any Section: kde -Replaces: kfilereplace-kde3 (<< 4:3.5.13) -Breaks: kfilereplace-kde3 (<< 4:3.5.13) +Replaces: kfilereplace-trinity (<< 4:14.0.0) +Breaks: kfilereplace-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: quanta-trinity Description: batch search-and-replace component for KDE [Trinity] @@ -107,8 +107,8 @@ Description: batch search-and-replace component for KDE [Trinity] Package: kimagemapeditor-trinity Architecture: any Section: editors -Replaces: kimagemapeditor-kde3 (<< 4:3.5.13) -Breaks: kimagemapeditor-kde3 (<< 4:3.5.13) +Replaces: kimagemapeditor-trinity (<< 4:14.0.0) +Breaks: kimagemapeditor-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: quanta-trinity Description: HTML image map editor for KDE [Trinity] @@ -122,8 +122,8 @@ Description: HTML image map editor for KDE [Trinity] Package: klinkstatus-trinity Architecture: any Section: web -Replaces: klinkstatus-kde3 (<< 4:3.5.13) -Breaks: klinkstatus-kde3 (<< 4:3.5.13) +Replaces: klinkstatus-trinity (<< 4:14.0.0) +Breaks: klinkstatus-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: quanta-trinity, khelpcenter-trinity Description: web link validity checker for KDE [Trinity] @@ -140,8 +140,8 @@ Description: web link validity checker for KDE [Trinity] Package: kommander-trinity Architecture: any Section: kde -Replaces: kommander-kde3 (<< 4:3.5.13) -Breaks: kommander-kde3 (<< 4:3.5.13) +Replaces: kommander-trinity (<< 4:14.0.0) +Breaks: kommander-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, gettext Suggests: kommander-trinity-dev, quanta-trinity, khelpcenter-trinity Description: visual dialog builder and executor tool [Trinity] @@ -169,8 +169,8 @@ Description: visual dialog builder and executor tool [Trinity] Package: kommander-trinity-dev Architecture: any Section: libdevel -Replaces: kommander-kde3-dev (<< 4:3.5.13) -Breaks: kommander-kde3-dev (<< 4:3.5.13) +Replaces: kommander-trinity-dev (<< 4:14.0.0) +Breaks: kommander-trinity-dev (<< 4:14.0.0) Depends: kommander-trinity (= ${binary:Version}), tdelibs4-dev (>= 4:3.5.8) Description: development files for Kommander [Trinity] This package contains the headers and other development files for @@ -188,8 +188,8 @@ Description: development files for Kommander [Trinity] Package: kxsldbg-trinity Architecture: any Section: text -Replaces: kxsldbg-kde3 (<< 4:3.5.13) -Breaks: kxsldbg-kde3 (<< 4:3.5.13) +Replaces: kxsldbg-trinity (<< 4:14.0.0) +Breaks: kxsldbg-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: quanta-trinity, khelpcenter-trinity Description: graphical XSLT debugger for KDE [Trinity] @@ -207,8 +207,8 @@ Description: graphical XSLT debugger for KDE [Trinity] Package: tdewebdev-trinity-dbg Section: libdevel Architecture: any -Replaces: tdewebdev-kde3-dbg (<< 4:3.5.13) -Breaks: tdewebdev-kde3-dbg (<< 4:3.5.13) +Replaces: kdewebdev-trinity-dbg (<< 4:14.0.0) +Breaks: kdewebdev-trinity-dbg (<< 4:14.0.0) Depends: tdelibs-trinity-dbg Priority: extra Description: debugging symbols for tdewebdev [Trinity] diff --git a/ubuntu/maverick/tdewebdev/debian/source/format b/ubuntu/maverick/tdewebdev/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/tdewebdev/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/tdewebdev/debian/source/options b/ubuntu/maverick/tdewebdev/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/tdewebdev/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick_automake/applications/kde-guidance/debian/changelog b/ubuntu/maverick_automake/applications/kde-guidance/debian/changelog index 06a005706..45e9980fb 100644 --- a/ubuntu/maverick_automake/applications/kde-guidance/debian/changelog +++ b/ubuntu/maverick_automake/applications/kde-guidance/debian/changelog @@ -229,7 +229,7 @@ kde-guidance (0.8.0svn20080103-0ubuntu4) hardy; urgency=low kde-guidance (0.8.0svn20080103-0ubuntu3) hardy; urgency=low * Add Add kubuntu_09_mountconfig_no_extensions.patch to remove uneeded call - to pykdeextensions in mountconfig so that pyqt3 no longer needs to be + to pytdeextensions in mountconfig so that pyqt3 no longer needs to be patched to provide -dev files in the regular package (LP: #197867) * Add kubuntu_10_displayconfig_tryagain.patch so that if displayconfig thinks a proprietary driver is installed, but it can't find it, it @@ -618,7 +618,7 @@ kde-guidance (0.7.1~svn20061215-0ubuntu1) feisty; urgency=low kde-guidance (0.7.1~svn20061124-0ubuntu2) feisty; urgency=low - * Rebuilt against new pykde. + * Rebuilt against new pytde. -- Anthony Mercatante <tonio@ubuntu.com> Wed, 06 Dec 2006 23:40:32 +0100 @@ -913,7 +913,7 @@ kde-guidance (0.6.4-0ubuntu1) dapper; urgency=low * The screen images in the dualhead widget make better use of available widget space. * Displayconfig: The 40guidance-displayconfig_restore script which is used by - the Xsession script during login via KDM/xdm, has now been fixed to not stop + the Xsession script during login via TDM/xdm, has now been fixed to not stop the login in case of failure. * BUG: Displayconfig was getting confused by unknown graphics cards and crashing. (Malone bug #32915) @@ -1029,7 +1029,7 @@ kde-guidance (0.6.2-0ubuntu1) dapper; urgency=low kde-guidance (0.6.1-0ubuntu0) dapper; urgency=low * New release, sets a fixed DPI for Xft - * Add run time dependency on pykdeextensions + * Add run time dependency on pytdeextensions * Add kubuntu_03_userconfig_shebang.diff fix extra space * Change init script to run at S35, Malone No. 32268 diff --git a/ubuntu/maverick_automake/applications/kde-guidance/debian/control b/ubuntu/maverick_automake/applications/kde-guidance/debian/control index 042153e4c..b10286ffe 100644 --- a/ubuntu/maverick_automake/applications/kde-guidance/debian/control +++ b/ubuntu/maverick_automake/applications/kde-guidance/debian/control @@ -6,13 +6,13 @@ XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.de Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> Build-Depends: cdbs, debhelper (>= 5), chrpath, kdelibs4-kde3-dev, libpythonize0-kde3-dev, libtool, libxml2-utils, libxss-dev, libxxf86vm-dev, - pykdeextensions-kde3, pyqt-tools, python-qt3 (>= 3.17.2-1ubuntu2), python-kde3-kde3, python-kde3-kde3-dev, python-sip4-dev, + pytdeextensions-kde3, pyqt-tools, python-qt3 (>= 3.17.2-1ubuntu2), python-kde3-kde3, python-kde3-kde3-dev, python-sip4-dev, python-support (>= 0.6), python (>= 2.5), python-dev (>= 2.5), x11proto-scrnsaver-dev, python-qt-dev, hwdata Standards-Version: 3.8.3 Package: kde-guidance-kde3 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pykdeextensions-kde3, python-kde3-kde3, sysv-rc, guidance-backends-kde3, hwdata, python (>= 2.5), python-dev (>= 2.5) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pytdeextensions-kde3, python-kde3-kde3, sysv-rc, guidance-backends-kde3, hwdata, python (>= 2.5), python-dev (>= 2.5) Conflicts: guidance-power-manager, kde-guidance-powermanager Provides: ${python:Provides} Description: collection of KDE system administration tools for GNU/Linux [KDE3] diff --git a/ubuntu/maverick_automake/applications/kde-guidance/debian/rules b/ubuntu/maverick_automake/applications/kde-guidance/debian/rules index e43bf0768..6de018978 100755 --- a/ubuntu/maverick_automake/applications/kde-guidance/debian/rules +++ b/ubuntu/maverick_automake/applications/kde-guidance/debian/rules @@ -175,7 +175,7 @@ clean:: fi common-install-prehook-impl:: - # generate form implementation using pykde user interface compiler + # generate form implementation using pytde user interface compiler (cd powermanager; /opt/kde3/bin/kdepyuic --usekdei18n guidance_power_manager_ui.ui) (cd powermanager; /opt/kde3/bin/kdepyuic --usekdei18n tooltip.ui) (cd powermanager; /opt/kde3/bin/kdepyuic --usekdei18n notify.ui) diff --git a/ubuntu/maverick_automake/applications/kdmtheme/debian/README.Debian b/ubuntu/maverick_automake/applications/kdmtheme/debian/README.Debian deleted file mode 100644 index 1291b6a32..000000000 --- a/ubuntu/maverick_automake/applications/kdmtheme/debian/README.Debian +++ /dev/null @@ -1,7 +0,0 @@ -kdmtheme for Debian -------------------- - -kdmtheme is a KDE Control Module (KCM). To run it, open KDE Control Center and -go to System Administration to find KDM Theme Manager. - - -- Fathi Boudra <fabo@debian.org>, Mon, 31 Jul 2006 18:33:26 +0200 diff --git a/ubuntu/maverick_automake/applications/kdmtheme/debian/kdmtheme.lintian-overrides b/ubuntu/maverick_automake/applications/kdmtheme/debian/kdmtheme.lintian-overrides deleted file mode 100644 index d033183c7..000000000 --- a/ubuntu/maverick_automake/applications/kdmtheme/debian/kdmtheme.lintian-overrides +++ /dev/null @@ -1,6 +0,0 @@ -# provided by kdelibs -kdmtheme: desktop-command-not-in-package ./usr/share/applications/kde/kdmtheme.desktop kcmshell -# kcontrol module -kdmtheme: desktop-entry-invalid-category X-KDE-settings-system ./usr/share/applications/kde/kdmtheme.desktop -kdmtheme: desktop-entry-lacks-main-category ./usr/share/applications/kde/kdmtheme.desktop - diff --git a/ubuntu/maverick_automake/applications/kdmtheme/debian/watch b/ubuntu/maverick_automake/applications/kdmtheme/debian/watch deleted file mode 100644 index 5cf8d8c80..000000000 --- a/ubuntu/maverick_automake/applications/kdmtheme/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://beta.smileaf.org/files/kdmtheme/kdmtheme-(.*)\.tar\.bz2 debian svn-upgrade diff --git a/ubuntu/maverick_automake/applications/tdmtheme/debian/README.Debian b/ubuntu/maverick_automake/applications/tdmtheme/debian/README.Debian new file mode 100644 index 000000000..066828faf --- /dev/null +++ b/ubuntu/maverick_automake/applications/tdmtheme/debian/README.Debian @@ -0,0 +1,7 @@ +tdmtheme for Debian +------------------- + +tdmtheme is a KDE Control Module (KCM). To run it, open KDE Control Center and +go to System Administration to find TDM Theme Manager. + + -- Fathi Boudra <fabo@debian.org>, Mon, 31 Jul 2006 18:33:26 +0200 diff --git a/ubuntu/maverick_automake/applications/tdmtheme/debian/cdbs/buildvars.mk b/ubuntu/maverick_automake/applications/tdmtheme/debian/cdbs/buildvars.mk new file mode 100644 index 000000000..23d4709dc --- /dev/null +++ b/ubuntu/maverick_automake/applications/tdmtheme/debian/cdbs/buildvars.mk @@ -0,0 +1,86 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2002,2003 Colin Walters <walters@debian.org> +# Description: Defines some useful variables, but no rules +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class + +ifndef _cdbs_rules_buildvars +_cdbs_rules_buildvars = 1 + +CDBS_VERSION = something + +# Common useful variables +DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':')) +DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') +DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-) +DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//') +DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;') + +# Split into arch/indep packages +ifneq ($(DEB_INDEP_PACKAGES),cdbs) +DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep))) +DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same)))) +endif +# Split into normal and udeb packages +ifeq ($(DEB_UDEB_PACKAGES),) +DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) +DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) +else +DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) +endif +# Too much bother for now. If someone complains we'll fix it. +#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES)) +#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES)) +# A handy list of every package, udeb or not +DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES)) +DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES))) +DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES))) + +DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) + +# Some support for srcdir != builddir builds. +# These are relative to the root of the package +DEB_SRCDIR ?= . +DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR)) + +# Miscellaneous bits +DEB_ARCH = $(shell dpkg --print-architecture) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM) +DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM) +DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU) +DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) +DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU) +DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) + +ifeq ($(words $(DEB_ALL_PACKAGES)),1) + DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/ +else + DEB_DESTDIR = $(CURDIR)/debian/tmp/ +endif + +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1) + +endif diff --git a/ubuntu/maverick_automake/applications/kdmtheme/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick_automake/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk index 2be8f97f1..2be8f97f1 100644 --- a/ubuntu/maverick_automake/applications/kdmtheme/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/maverick_automake/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk diff --git a/ubuntu/maverick_automake/applications/kdmtheme/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/tdmtheme/debian/cdbs/kde.mk index 9e4117558..9e4117558 100644 --- a/ubuntu/maverick_automake/applications/kdmtheme/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/applications/tdmtheme/debian/cdbs/kde.mk diff --git a/ubuntu/maverick_automake/applications/tdmtheme/debian/cdbs/team-members b/ubuntu/maverick_automake/applications/tdmtheme/debian/cdbs/team-members new file mode 100644 index 000000000..05761af6e --- /dev/null +++ b/ubuntu/maverick_automake/applications/tdmtheme/debian/cdbs/team-members @@ -0,0 +1,16 @@ +Sune Vuorela <debian@pusling.com> +Ana Beatriz Guerrero Lopez <ana@debian.org> +Fathi Boudra <fboudra@free.fr> +Modestas Vainius <geromanas@mailas.com> +Josh Metzler <joshdeb@metzlers.org> +Isaac Clerencia <isaac@debian.org> +Adeodato Simó <dato@net.com.org.es> +Adeodato Simo <dato@net.com.org.es> +Christopher Martin <chrsmrtn@debian.org> +Daniel Schepler <schepler@debian.org> +Sarah Hobbs <hobbsee@ubuntu.com> +Nacho Barrientos Arias <nacho@debian.org> +Ricardo Javier Cardenes Medina <rcardenes@debian.org> +Ricardo Cardenes <rcardenes@debian.org> +Armin Berres <trigger+debian@space-based.de> +Francesco Pedrini <francesco.pedrini@gmail.com> diff --git a/ubuntu/maverick_automake/applications/tdmtheme/debian/cdbs/uploaders.mk b/ubuntu/maverick_automake/applications/tdmtheme/debian/cdbs/uploaders.mk new file mode 100644 index 000000000..31adfe31e --- /dev/null +++ b/ubuntu/maverick_automake/applications/tdmtheme/debian/cdbs/uploaders.mk @@ -0,0 +1,29 @@ + +MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> +UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//') + + +debian/control.tmp: + @if [ ! -e debian/control.in ] ; then \ + echo "this package is not yet prepared for using automatic update of uploaders"; \ + echo "Please do so."; \ + exit 1; \ + fi + @sed 's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in > debian/control.tmp + +check-uploaders: debian/control.tmp + @if ! diff -q debian/control debian/control.tmp ; then \ + echo "WARNING:: Control file differs from manually generated one" ; \ + echo "WARNING:: Please update it manually and check it afterwards" ; \ + echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\ + echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\ + fi + + +clean:: + rm -f debian/control.tmp + +update-uploaders: debian/control.tmp + @mv -f debian/control.tmp debian/control + +makebuilddir:: check-uploaders diff --git a/ubuntu/maverick_automake/applications/tdmtheme/debian/cdbs/versions.pl b/ubuntu/maverick_automake/applications/tdmtheme/debian/cdbs/versions.pl new file mode 100644 index 000000000..9ce11d8a3 --- /dev/null +++ b/ubuntu/maverick_automake/applications/tdmtheme/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/-[^-]+$//; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "KDE-Version3=$version3\n"; +print "KDE-Version2=$version2\n"; +print "KDE-Next-Version3=$version3_next\n"; +print "KDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/maverick_automake/applications/kdmtheme/debian/changelog b/ubuntu/maverick_automake/applications/tdmtheme/debian/changelog index 6616a464e..c6ee15979 100644 --- a/ubuntu/maverick_automake/applications/kdmtheme/debian/changelog +++ b/ubuntu/maverick_automake/applications/tdmtheme/debian/changelog @@ -1,17 +1,17 @@ -kdmtheme-kde3 (1.2.2-1ubuntu5) karmic; urgency=low +tdmtheme-kde3 (1.2.2-1ubuntu5) karmic; urgency=low * Karmic rebuild * Fixed theme switching problem -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 02 July 2009 16:08:00 -0600 -kdmtheme-kde3 (1.2.2-1ubuntu1) intrepid; urgency=low +tdmtheme-kde3 (1.2.2-1ubuntu1) intrepid; urgency=low * Added -kde3 suffix -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 27 Apr 2009 19:00:00 -0600 -kdmtheme (1.2.2-1ubuntu1) intrepid; urgency=low +tdmtheme (1.2.2-1ubuntu1) intrepid; urgency=low [ Sergey Rudchenko ] * Merge from debian unstable, remaining changes: @@ -23,7 +23,7 @@ kdmtheme (1.2.2-1ubuntu1) intrepid; urgency=low -- Harald Sitter <apachelogger@ubuntu.com> Fri, 06 Jun 2008 00:46:45 +0200 -kdmtheme (1.2.2-1) unstable; urgency=low +tdmtheme (1.2.2-1) unstable; urgency=low * New upstream release: * actually saves theme changes (Closes: #447683) @@ -33,7 +33,7 @@ kdmtheme (1.2.2-1) unstable; urgency=low * Use Homepage field. [ Kel Modderman ] - * Refresh debian/patches/10_kdmtheme-override-warning.diff to apply against + * Refresh debian/patches/10_tdmtheme-override-warning.diff to apply against new upstream release. [ Fathi Boudra ] @@ -41,22 +41,22 @@ kdmtheme (1.2.2-1) unstable; urgency=low -- Fathi Boudra <fabo@debian.org> Sat, 22 Dec 2007 15:36:15 +0100 -kdmtheme (1.2.2-0ubuntu2) hardy; urgency=low +tdmtheme (1.2.2-0ubuntu2) hardy; urgency=low * Re-adds kubuntu_02_confchanges.diff. Patch from Stefan Skotte -- Anthony Mercatante <tonio@ubuntu.com> Fri, 15 Feb 2008 10:25:44 +0100 -kdmtheme (1.2.2-0ubuntu1) hardy; urgency=low +tdmtheme (1.2.2-0ubuntu1) hardy; urgency=low * New upstream release. - * Removed 10_kdmtheme-override-warning.diff. + * Removed 10_tdmtheme-override-warning.diff. * Removed kubuntu_02_confchanges.diff. * Updated Standards-Version to 3.7.3 -- Jonathan Patrick Davies <jpatrick@kubuntu.org> Mon, 22 Dec 2007 11:48:18 +0100 -kdmtheme (1.2.1-0ubuntu1) hardy; urgency=low +tdmtheme (1.2.1-0ubuntu1) hardy; urgency=low * New upstream release. * Merged new Debian changelog and changes to Ubuntu package. @@ -67,10 +67,10 @@ kdmtheme (1.2.1-0ubuntu1) hardy; urgency=low -- Jonathan Patrick Davies <jpatrick@kubuntu.org> Mon, 22 Oct 2007 21:18:56 +0200 -kdmtheme (1.2-1) unstable; urgency=low +tdmtheme (1.2-1) unstable; urgency=low * New upstream release. - * Update kdmtheme override warning patch. + * Update tdmtheme override warning patch. * Add patch to replace deprecated qlist.h include. * Add Build-Depends: quilt, automake1.7. * Update copyright file. @@ -78,11 +78,11 @@ kdmtheme (1.2-1) unstable; urgency=low -- Fathi Boudra <fboudra@free.fr> Wed, 03 Oct 2007 12:17:40 +0200 -kdmtheme (1.2-0ubuntu2) gutsy; urgency=low +tdmtheme (1.2-0ubuntu2) gutsy; urgency=low [ Stefan Skotte ] - * added support for kdm.d with override files. - * various bugfixes for normal kdmrc usage, including save and apply + * added support for tdm.d with override files. + * various bugfixes for normal tdmrc usage, including save and apply not working, themeDir not set correctly etc. [ Sarah Hobbs ] @@ -91,31 +91,31 @@ kdmtheme (1.2-0ubuntu2) gutsy; urgency=low -- Sarah Hobbs <hobbsee@ubuntu.com> Fri, 05 Oct 2007 19:09:00 +1000 -kdmtheme (1.2-0ubuntu1) gutsy; urgency=low +tdmtheme (1.2-0ubuntu1) gutsy; urgency=low * New upstream release -- Anthony Mercatante <tonio@ubuntu.com> Sat, 29 Sep 2007 11:17:55 +0200 -kdmtheme (1.1.2-2ubuntu1) feisty; urgency=low +tdmtheme (1.1.2-2ubuntu1) feisty; urgency=low * Added kubuntu_01_kcm_systemsettings.diff for kde-systemsettings inclusion in the Appearance section -- Anthony Mercatante <tonio@ubuntu.com> Tue, 13 Feb 2007 06:18:32 +0100 -kdmtheme (1.1.2-2) unstable; urgency=low +tdmtheme (1.1.2-2) unstable; urgency=low [ Mark Purcell ] * Add debian/rules get-orig-source target for http://buildserver.net. [ Fathi Boudra ] - * Add a patch to warn users about kdm override files introduced with + * Add a patch to warn users about tdm override files introduced with desktop-base. Thanks to Sune Vuorela. -- Fathi Boudra <fboudra@free.fr> Wed, 31 Jan 2007 21:11:45 +0100 -kdmtheme (1.1.2-1) unstable; urgency=low +tdmtheme (1.1.2-1) unstable; urgency=low * Initial release (Closes: #380661) diff --git a/ubuntu/maverick_automake/applications/tdmtheme/debian/compat b/ubuntu/maverick_automake/applications/tdmtheme/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/ubuntu/maverick_automake/applications/tdmtheme/debian/compat @@ -0,0 +1 @@ +5 diff --git a/ubuntu/lucid_automake/applications/kdmtheme/debian/control b/ubuntu/maverick_automake/applications/tdmtheme/debian/control index 01d108f2d..6bbeb4779 100644 --- a/ubuntu/lucid_automake/applications/kdmtheme/debian/control +++ b/ubuntu/maverick_automake/applications/tdmtheme/debian/control @@ -1,4 +1,4 @@ -Source: kdmtheme-kde3 +Source: tdmtheme-kde3 Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> @@ -9,9 +9,9 @@ Build-Depends: cdbs, debhelper (>= 5), quilt, kdelibs4-kde3-dev, automake1.11-kd Standards-Version: 3.8.3 Homepage: http://beta.smileaf.org/projects -Package: kdmtheme-kde3 +Package: tdmtheme-kde3 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, kdm-kde3 -Description: theme manager for KDM [KDE3] - kdmtheme is a theme manager for KDM. It provides a KDE Control Module (KCM) - that allows you to easily install, remove and change your KDM themes. +Depends: ${shlibs:Depends}, ${misc:Depends}, tdm-kde3 +Description: theme manager for TDM [KDE3] + tdmtheme is a theme manager for TDM. It provides a KDE Control Module (KCM) + that allows you to easily install, remove and change your TDM themes. diff --git a/ubuntu/maverick_automake/applications/kdmtheme/debian/copyright b/ubuntu/maverick_automake/applications/tdmtheme/debian/copyright index 23265e2b6..c8d6d972f 100644 --- a/ubuntu/maverick_automake/applications/kdmtheme/debian/copyright +++ b/ubuntu/maverick_automake/applications/tdmtheme/debian/copyright @@ -36,7 +36,7 @@ Public License can be found in `/usr/share/common-licenses/GPL'. The Debian packaging is (C) 2007, Kel Modderman <kel@otaku42.de> and is licensed under the GPL, see above. -The documentations provided with kdmtheme is distributed under +The documentations provided with tdmtheme is distributed under the GNU Free Documentation License (FDL). They are considered free with regards to the Debian Free Software Guidelines (DFSG) because they don't contain any unmodifiable parts (invariant sections). diff --git a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/docs b/ubuntu/maverick_automake/applications/tdmtheme/debian/docs index e845566c0..e845566c0 100644 --- a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/docs +++ b/ubuntu/maverick_automake/applications/tdmtheme/debian/docs diff --git a/ubuntu/maverick_automake/applications/kdmtheme/debian/patches/.gitignore b/ubuntu/maverick_automake/applications/tdmtheme/debian/patches/.gitignore index e69de29bb..e69de29bb 100644 --- a/ubuntu/maverick_automake/applications/kdmtheme/debian/patches/.gitignore +++ b/ubuntu/maverick_automake/applications/tdmtheme/debian/patches/.gitignore diff --git a/ubuntu/lucid_automake/applications/kdmtheme/debian/rules b/ubuntu/maverick_automake/applications/tdmtheme/debian/rules index c6fa4d063..bcd40a219 100755 --- a/ubuntu/lucid_automake/applications/kdmtheme/debian/rules +++ b/ubuntu/maverick_automake/applications/tdmtheme/debian/rules @@ -27,9 +27,9 @@ debian/stamp-bootstrap: make -f admin/Makefile.common cvs touch debian/stamp-bootstrap -install/kdmtheme-kde3:: - install -D -p -m644 debian/kdmtheme.lintian-overrides \ - debian/kdmtheme-kde3/usr/share/lintian/overrides/kdmtheme-kde3 +install/tdmtheme-kde3:: + install -D -p -m644 debian/tdmtheme.lintian-overrides \ + debian/tdmtheme-kde3/usr/share/lintian/overrides/tdmtheme-kde3 get-orig-source: @@dh_testdir diff --git a/ubuntu/maverick_automake/applications/tdmtheme/debian/tdmtheme.lintian-overrides b/ubuntu/maverick_automake/applications/tdmtheme/debian/tdmtheme.lintian-overrides new file mode 100644 index 000000000..d27349d54 --- /dev/null +++ b/ubuntu/maverick_automake/applications/tdmtheme/debian/tdmtheme.lintian-overrides @@ -0,0 +1,6 @@ +# provided by kdelibs +tdmtheme: desktop-command-not-in-package ./usr/share/applications/kde/tdmtheme.desktop kcmshell +# kcontrol module +tdmtheme: desktop-entry-invalid-category X-KDE-settings-system ./usr/share/applications/kde/tdmtheme.desktop +tdmtheme: desktop-entry-lacks-main-category ./usr/share/applications/kde/tdmtheme.desktop + diff --git a/ubuntu/maverick_automake/applications/tdmtheme/debian/watch b/ubuntu/maverick_automake/applications/tdmtheme/debian/watch new file mode 100644 index 000000000..82cebbd47 --- /dev/null +++ b/ubuntu/maverick_automake/applications/tdmtheme/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://beta.smileaf.org/files/tdmtheme/tdmtheme-(.*)\.tar\.bz2 debian svn-upgrade diff --git a/ubuntu/maverick_automake/dependencies/arts/debian/patches/11_path_max_hurd.diff b/ubuntu/maverick_automake/dependencies/arts/debian/patches/11_path_max_hurd.diff index e2deeda88..b35d4a2e0 100644 --- a/ubuntu/maverick_automake/dependencies/arts/debian/patches/11_path_max_hurd.diff +++ b/ubuntu/maverick_automake/dependencies/arts/debian/patches/11_path_max_hurd.diff @@ -38,7 +38,7 @@ + string user_tmp_dir; int uid = getuid(); const char *home_dir = getenv("HOME"); - const char *kde_home = uid ? getenv("KDEHOME") : getenv("KDEROOTHOME"); + const char *kde_home = uid ? getenv("TDEHOME") : getenv("KDEROOTHOME"); @@ -88,7 +88,7 @@ if (!tmp || !tmp[0]) tmp = "/tmp"; @@ -54,11 +54,11 @@ - strncpy(user_tmp_dir, tmp, PATH_MAX ); - user_tmp_dir[ PATH_MAX ] = '\0'; -- strncat(user_tmp_dir, "/ksocket-", PATH_MAX - strlen(user_tmp_dir) ); +- strncat(user_tmp_dir, "/tdesocket-", PATH_MAX - strlen(user_tmp_dir) ); - user_tmp_dir[ PATH_MAX ] = '\0'; - strncat(user_tmp_dir, pw_ent->pw_name, PATH_MAX - strlen(user_tmp_dir)); - user_tmp_dir[ PATH_MAX ] = '\0'; -+ user_tmp_dir = string(tmp) + "/ksocket-" + string(pw_ent->pw_name); ++ user_tmp_dir = string(tmp) + "/tdesocket-" + string(pw_ent->pw_name); if (!kde_home || !kde_home[0]) { @@ -110,7 +110,7 @@ + result = lstat(kde_tmp_dir.c_str(), &stat_buf); if ((result == 0) && (S_ISDIR(stat_buf.st_mode))) { - /* $KDEHOME/socket-$HOSTNAME is a normal directory. Do nothing. */ + /* $TDEHOME/socket-$HOSTNAME is a normal directory. Do nothing. */ - tmp_buf = (char *) malloc(PATH_MAX+1); - if (!tmp_buf) - return 0; @@ -184,7 +184,7 @@ + char *tmp_buf; int uid = getuid(); const char *home_dir = getenv("HOME"); - const char *kde_home = uid ? getenv("KDEHOME") : getenv("KDEROOTHOME"); + const char *kde_home = uid ? getenv("TDEHOME") : getenv("KDEROOTHOME"); int result; struct stat stat_buf; @@ -259,7 +259,7 @@ + result = lstat(kde_tmp_dir.c_str(), &stat_buf); if ((result == 0) && (S_ISDIR(stat_buf.st_mode))) { - /* $KDEHOME/tmp is a normal directory. Do nothing. */ + /* $TDEHOME/tmp is a normal directory. Do nothing. */ - printf("Directory \"%s\" already exists.\n", kde_tmp_dir); + printf("Directory \"%s\" already exists.\n", kde_tmp_dir.c_str()); return 0; @@ -363,10 +363,10 @@ - char tmp_prefix[PATH_MAX+1]; - strcpy(tmp_prefix, tmp); -- strcat(tmp_prefix, "/ksocket-"); +- strcat(tmp_prefix, "/tdesocket-"); - - build_link(tmp_prefix, "/socket-"); -+ build_link(string(tmp) + "/ksocket-", "/socket-"); ++ build_link(string(tmp) + "/tdesocket-", "/socket-"); mcop_dir = locate_mcop_dir(); } if (!mcop_dir) diff --git a/ubuntu/maverick_automake/kde-i18n/debian/changelog b/ubuntu/maverick_automake/kde-i18n/debian/changelog index bb07a09c6..b4a427061 100644 --- a/ubuntu/maverick_automake/kde-i18n/debian/changelog +++ b/ubuntu/maverick_automake/kde-i18n/debian/changelog @@ -300,7 +300,7 @@ kde-i18n (4:3.2.2-3) unstable; urgency=low kde-i18n (4:3.2.2-2) unstable; urgency=low - * corrected juk and kcachegrind conflict to <<4:3.2.1-1 + * corrected juk and tdecachegrind conflict to <<4:3.2.1-1 * conflicting with kdevelop-data (kdevelop version 2) because kdevelop version 3 translations are included in kde-i18n @@ -410,7 +410,7 @@ kde-i18n (4:3.1-1) unstable; urgency=low (closes: Bug#172383) * default charset is now utf-8 (closes: Bug#172361) - * kdm in localized for pt_BR + * tdm in localized for pt_BR (closes: Bug#116046) -- Noel Koethe <noel@debian.org> Mon, 3 Feb 2003 20:42:00 +0100 diff --git a/ubuntu/maverick_automake/kdebase/debian/KUBUNTU-DEBIAN-CHANGES b/ubuntu/maverick_automake/kdebase/debian/KUBUNTU-DEBIAN-CHANGES index 830d36711..ab3d75478 100644 --- a/ubuntu/maverick_automake/kdebase/debian/KUBUNTU-DEBIAN-CHANGES +++ b/ubuntu/maverick_automake/kdebase/debian/KUBUNTU-DEBIAN-CHANGES @@ -13,7 +13,7 @@ remove debian/tmp/share/apps/konqsidebartng/entries/system.desktop remove .svgz from kdebase-data.install -replace 10_kdmrc_defaults.diff with 10_kdmrc_defaults_kubuntu.diff +replace 10_tdmrc_defaults.diff with 10_tdmrc_defaults_kubuntu.diff install/klipper:: sed -i '/X-Ubuntu-Gettext-Domain=/d' debian/tmp/etc/kde3/klipperrc @@ -34,7 +34,7 @@ kdebase-data.install: debian/tmp/etc/xdg/menus/applications-merged/kde-essential in konsole.README.Debian s/fontconfig/fontconfig-config -in kdm.postinst install at s/99/13/ +in tdm.postinst install at s/99/13/ from kdebase-kio-plugins.install remove debian/tmp/usr/share/services/kfile_trash.desktop (that's to remove the trash from the "system applet") @@ -42,7 +42,7 @@ add debian/ubuntu.xmodmap debian/80ubuntu-xmodmap and add install rules to bina control: khelpcenter, suggest don't depend on htdig -kdm.init: Launch usplash_down at the end of the stop section +tdm.init: Launch usplash_down at the end of the stop section Added konqueror dependancy for konqueror-nsplugins. (LP: #139893) diff --git a/ubuntu/maverick_automake/kdebase/debian/NEWS b/ubuntu/maverick_automake/kdebase/debian/NEWS index f82a204b7..0424fa2fc 100644 --- a/ubuntu/maverick_automake/kdebase/debian/NEWS +++ b/ubuntu/maverick_automake/kdebase/debian/NEWS @@ -1,44 +1,44 @@ kdebase (4:3.4.2-3) unstable; urgency=low - *** Changes to KDM conffiles: + *** Changes to TDM conffiles: - * Users upgrading KDM from 3.3.x, will find that KDM no longer uses the - /etc/kde3/kdm/Xservers file, if /etc/kde3/kdm/kdmrc was updated to - the version shipped with KDM 3.4.x. The package upgrade scripts - will not remove Xservers even if kdmrc has been upgraded, if they detect + * Users upgrading TDM from 3.3.x, will find that TDM no longer uses the + /etc/kde3/tdm/Xservers file, if /etc/kde3/tdm/tdmrc was updated to + the version shipped with TDM 3.4.x. The package upgrade scripts + will not remove Xservers even if tdmrc has been upgraded, if they detect local modifications. This should allow administrators to merge their - Xservers changes into kdmrc before themselves removing Xservers. The new - ServerArgsLocal key in kdmrc is where most old Xservers customizations + Xservers changes into tdmrc before themselves removing Xservers. The new + ServerArgsLocal key in tdmrc is where most old Xservers customizations should be placed. * Irrespective of the removal of the Xservers file, we highly recommend that - all administrators accept the installation of the updated kdmrc file - during the package upgrade. Many important changes to KDM's defaults have - been made, and KDM is exceedingly bad at handling anything but the latest - kdmrc format, so the nuissance of re-customizing KDM will likely prove - less than the nuissance of dealing with a KDM that isn't working properly. - If you have already upgraded KDM package without accepting the new kdmrc, + all administrators accept the installation of the updated tdmrc file + during the package upgrade. Many important changes to TDM's defaults have + been made, and TDM is exceedingly bad at handling anything but the latest + tdmrc format, so the nuissance of re-customizing TDM will likely prove + less than the nuissance of dealing with a TDM that isn't working properly. + If you have already upgraded TDM package without accepting the new tdmrc, purging and reinstalling the package should achieve the desired result. *** Changes to user login script handling: - * Another important change that users upgrading from KDM 3.3.x may notice - is that KDM's ability to source personal login scripts, long disabled, has + * Another important change that users upgrading from TDM 3.3.x may notice + is that TDM's ability to source personal login scripts, long disabled, has been restored. The exact files sourced on login will depend on the user's - choice of shell. For users of bash, KDM will source /etc/profile, followed - by ~/.bash_profile or, if that is not present, ~/.profile. Note that KDM + choice of shell. For users of bash, TDM will source /etc/profile, followed + by ~/.bash_profile or, if that is not present, ~/.profile. Note that TDM is NOT spawning a login shell, but is merely mimicking the behaviour that popular shells would exhibit if they were login shells, by manually - sourcing the customary login scripts. /etc/kde3/kdm/Xsession controls this + sourcing the customary login scripts. /etc/kde3/tdm/Xsession controls this behaviour. - * The important downside of the above approach is that KDM will utterly fail + * The important downside of the above approach is that TDM will utterly fail to start a user's session if the newly sourced files contain certain types of commands. For instance, many commands will cause the login attempt to fail because they expect an interactive shell, or because you are trying to "exec" something that cannot provide an X session. For instance, "exec ksmserver" will launch KDE, but "exec bash" will fail. Thus if you - are unsure why KDM is refusing to start your session, try commenting out + are unsure why TDM is refusing to start your session, try commenting out elements of the newly sourced login scripts, and you may find the problem resolved. @@ -47,24 +47,24 @@ kdebase (4:3.4.2-3) unstable; urgency=low kdebase (4:3.3.2-1) unstable; urgency=low * Users upgrading from KDE 3.2 might find that their keyboards seem no longer - to work in KDM. This problem is caused by a change in KDE's handling of - virtual terminals. The setting which puts KDM on vt7, which was contained - in /etc/kde3/kdm/Xservers, has changed, and is also now located in - /etc/kde3/kdm/kdmrc. + to work in TDM. This problem is caused by a change in KDE's handling of + virtual terminals. The setting which puts TDM on vt7, which was contained + in /etc/kde3/tdm/Xservers, has changed, and is also now located in + /etc/kde3/tdm/tdmrc. * Users who, when upgrading to KDE 3.3, opted to replace their Xservers file with the version shipped by the package, but chose to retain their - /etc/kde3/kdm/kdmrc file, will thus have a KDM configuration which nowhere - contains a setting which properly places KDM on vt7. This can result in a + /etc/kde3/tdm/tdmrc file, will thus have a TDM configuration which nowhere + contains a setting which properly places TDM on vt7. This can result in a race condition which has the end effect of breaking the keyboard when using - KDM. + TDM. * The solution to the problem is either to replace both of Xservers and - kdmrc, or neither, when upgrading to KDE 3.3 for the first time. + tdmrc, or neither, when upgrading to KDE 3.3 for the first time. - * Users already stuck can, after killing KDE, purge and re-install the kdm + * Users already stuck can, after killing KDE, purge and re-install the tdm package, ensuring that the latest, fresh copies are installed. - Alternatively, they can edit /etc/kde3/kdm/kdmrc and add the following + Alternatively, they can edit /etc/kde3/tdm/tdmrc and add the following line: ServerVTs=-7 diff --git a/ubuntu/maverick_automake/kdebase/debian/changelog b/ubuntu/maverick_automake/kdebase/debian/changelog index 994546f0b..48d83199c 100644 --- a/ubuntu/maverick_automake/kdebase/debian/changelog +++ b/ubuntu/maverick_automake/kdebase/debian/changelog @@ -60,13 +60,13 @@ kdebase-kde3 (4:3.5.10-2ubuntu3) karmic; urgency=low kdebase-kde3 (4:3.5.10-2ubuntu2) karmic; urgency=low * Added Start menu button icon configuration dialog - * Delayed kdm-kde3 startup to allow for graphics device configuration + * Delayed tdm-kde3 startup to allow for graphics device configuration -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sun, 18 Oct 2009 16:21:00 -0600 kdebase-kde3 (4:3.5.10-1ubuntu5) karmic; urgency=low - * Added new ICC loading functionality to kcontrol and kdm + * Added new ICC loading functionality to kcontrol and tdm * Added new display output switching functionality to krandrtray * Beginnings of customizable K menu icon @@ -81,7 +81,7 @@ kdebase-kde3 (4:3.5.10-1ubuntu4) karmic; urgency=low kdebase-kde3 (4:3.5.10-1ubuntu3) karmic; urgency=low - * Default KDM theme set to kubuntu-kde3 + * Default TDM theme set to kubuntu-kde3 -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 10 Oct 2009 12:19:00 -0600 @@ -99,7 +99,7 @@ kdebase-kde3 (4:3.5.10-1ubuntu0) karmic; urgency=low kdebase-kde3 (4:3.5.10-0ubuntu12) karmic; urgency=low - * Repaired kdm looking at the wrong pam.d files + * Repaired tdm looking at the wrong pam.d files -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 10 Sep 2009 11:20:00 -0600 @@ -171,14 +171,14 @@ kdebase-kde3 (4:3.5.10-0ubuntu4~intrepid6) intrepid; urgency=low kdebase-kde3 (4:3.5.10-0ubuntu4~intrepid4) intrepid; urgency=low - * Repaired KDM DATAPATH problem + * Repaired TDM DATAPATH problem -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Fri, 20 Mar 2009 10:22:00 -0600 kdebase-kde3 (4:3.5.10-0ubuntu4~intrepid2) intrepid; urgency=low * Repaired accidental conflict with /etc/sysguarddrc - * Repared KDM PATH (fixes bug #56) + * Repared TDM PATH (fixes bug #56) -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 17 Mar 2009 14:03:00 -0600 @@ -190,13 +190,13 @@ kdebase-kde3 (4:3.5.10-0ubuntu4~intrepid0) intrepid; urgency=low kdebase-kde3 (4:3.5.10-0ubuntu3~intrepid19) intrepid; urgency=low - * Repaired default kdm icons + * Repaired default tdm icons -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 07 Mar 2009 13:18:00 -0600 kdebase-kde3 (4:3.5.10-0ubuntu3~intrepid18) intrepid; urgency=low - * Added XDG_DATA_DIRS and KDEDIRS to startkde, as suggested by zekica on the Kubuntu forums + * Added XDG_DATA_DIRS and TDEDIRS to startkde, as suggested by zekica on the Kubuntu forums -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 07 Mar 2009 13:18:00 -0600 @@ -299,7 +299,7 @@ kdebase (4:3.5.10-0ubuntu1~hardy2) hardy-backports; urgency=low kdebase (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low * New upstream bugfix release (LP: #261366) - - 13_kdm_sessions_fixes.diff freshen patch + - 13_tdm_sessions_fixes.diff freshen patch - kubuntu_9908_nodisplay_opengl.diff freshen patch - Bump version of kdelibs-dev to 3.5.10 @@ -382,14 +382,14 @@ kdebase (4:3.5.9-0ubuntu1) hardy; urgency=low * New upstream release [ Terence Simpson ] - * Fix config script for kdm to detect kdm-kde4 + * Fix config script for tdm to detect tdm-kde4 -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 14 Feb 2008 12:27:06 +0000 kdebase (4:3.5.8-2ubuntu21) hardy; urgency=low - * Add kubuntu_9921_kdm_bulletproof_x.diff, adds bulletproof X - feature to KDM. + * Add kubuntu_9921_tdm_bulletproof_x.diff, adds bulletproof X + feature to TDM. -- Eugene Tretyak <etretyak@gmail.com> Thu, 14 Feb 2008 10:40:12 +0000 @@ -403,15 +403,15 @@ kdebase (4:3.5.8-2ubuntu20) hardy; urgency=low kdebase (4:3.5.8-2ubuntu19) hardy; urgency=low * kdebase-kio-plugins replaces old kdebase-data, closes LP: #189963 - * Remove 70_kdm_consolekit.diff replace with kubuntu_70_kdm_consolekit.diff, + * Remove 70_tdm_consolekit.diff replace with kubuntu_70_tdm_consolekit.diff, updated version from http://bugs.kde.org/show_bug.cgi?id=147790 -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 08 Feb 2008 12:32:50 +0000 kdebase (4:3.5.8-2ubuntu18) hardy; urgency=low - * Edited debian/patches/70_kdm_consolekit.diff to fix a crash - when attempting to connect to local kdm via XDMCP (Closes LP: #178242) + * Edited debian/patches/70_tdm_consolekit.diff to fix a crash + when attempting to connect to local tdm via XDMCP (Closes LP: #178242) Thanks to Paul Brook for debbuging this, and to Zoogie for reporting this -- Maxim Levitsky <maximlevitsky@gmail.com> Tue, 06 Feb 2008 00:39:44 +0000 @@ -461,14 +461,14 @@ kdebase (4:3.5.8-2ubuntu14) hardy; urgency=low kdebase (4:3.5.8-2ubuntu13) hardy; urgency=low - * Added kubuntu_9919_kdm_preferuser.diff, uses the kubuntu-default- + * Added kubuntu_9919_tdm_preferuser.diff, uses the kubuntu-default- settings's settings for facesource if any -- Anthony Mercatante <tonio@kubuntu> Fri, 04 Jan 2008 15:50:02 +0100 kdebase (4:3.5.8-2ubuntu12) hardy; urgency=low - * Really fix kubuntu_9918_kdm_systemlocale.diff + * Really fix kubuntu_9918_tdm_systemlocale.diff -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 04 Jan 2008 11:11:38 +0000 @@ -481,8 +481,8 @@ kdebase (4:3.5.8-2ubuntu11) hardy; urgency=low kdebase (4:3.5.8-2ubuntu10) hardy; urgency=low - * Added kubuntu_9918_kdm_systemlocale.diff: - - KDM uses the system locale + * Added kubuntu_9918_tdm_systemlocale.diff: + - TDM uses the system locale -- Anthony Mercatante <tonio@kubuntu> Wed, 02 Jan 2008 12:56:51 +0100 @@ -522,8 +522,8 @@ kdebase (4:3.5.8-2ubuntu6) hardy; urgency=low kdebase (4:3.5.8-2ubuntu5) hardy; urgency=low - * Add kubuntu_9914_kdm_user_image_check.diff from upstream - fixes potential KDM local DoS if users set an invalid image + * Add kubuntu_9914_tdm_user_image_check.diff from upstream + fixes potential TDM local DoS if users set an invalid image Closes LP: #176347 -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 14 Dec 2007 12:24:17 +0000 @@ -567,7 +567,7 @@ kdebase (4:3.5.8.dfsg.1-2) unstable; urgency=low +++ Changes by Fathi Boudra: - * Remove /usr/bin/X11 from KDM's default session path. (Closes: 441392) + * Remove /usr/bin/X11 from TDM's default session path. (Closes: 441392) * Add support for ConsoleKit. Thanks to Michael Biebl, William Jon McCann and Kevin Kofler. (Closes: #450603) @@ -614,7 +614,7 @@ kdebase (4:3.5.8.dfsg.1-1) unstable; urgency=low - 24_knotify_arts.diff - 41_nspluginviewer_64bit_fix.diff - 50_several-CVE-konqueror.diff - - 51_CVE-2007-4569-kdm-autologin.diff + - 51_CVE-2007-4569-tdm-autologin.diff - 60_new-debshortcut.diff * Redo buildprep. * Bump build-dependencies and stuff to 3.5.8. @@ -648,7 +648,7 @@ kdebase (4:3.5.7.dfsg.1-1) unstable; urgency=low kdebase (4:3.5.7-4) unstable; urgency=low - * Add patch to fix unauthorized login problem in kdm. + * Add patch to fix unauthorized login problem in tdm. CVE-2007-4569. -- Sune Vuorela <debian@pusling.com> Wed, 19 Sep 2007 20:30:01 +0200 @@ -664,7 +664,7 @@ kdebase (4:3.5.7-3) unstable; urgency=low +++ Changes by Fathi Boudra: - * Add xserver-xorg Recommends to kdm. (Closes: #436573) + * Add xserver-xorg Recommends to tdm. (Closes: #436573) -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 27 Jul 2007 16:29:18 +0200 @@ -678,7 +678,7 @@ kdebase (4:3.5.7-2) unstable; urgency=low (Closes: #427843) * Updated nb debconf translation. (Closes: #417942) * Fix typo in startkde manpage. Thanks A. Costa. (Closes: #432062) - * Fix typo in kdmrc. Thanks Greg. (Closes: #422142) + * Fix typo in tdmrc. Thanks Greg. (Closes: #422142) * Updated vi debconf translation. Thanks Clytie Siddall (Closes: #426820) * Updated pt_BR debconf translation. Thanks Eder L. Marques. (Closes: #422285) @@ -735,11 +735,11 @@ kdebase (4:3.5.7-1ubuntu25) gutsy; urgency=low kdebase (4:3.5.7-1ubuntu24) gutsy; urgency=low [ Richard A. Johnson ] - * SECURITY UPDATE: KDM password-less login - * KDM can be tricked into performing a password-less login even for accounts + * SECURITY UPDATE: TDM password-less login + * TDM can be tricked into performing a password-less login even for accounts with a password set under certain circumstances, namely autologin to be configured and "shutdown with password" enabled. - * Add kubuntu_sec_03_kdm_pwless_login.diff for session.c to fix KDM + * Add kubuntu_sec_03_tdm_pwless_login.diff for session.c to fix TDM password-less and autologin configuration. * References: - http://www.kde.org/info/security/advisory-20070919-1.txt @@ -780,7 +780,7 @@ kdebase (4:3.5.7-1ubuntu21) gutsy; urgency=low kdebase (4:3.5.7-1ubuntu20) gutsy; urgency=low - * Changed (again) $KDEHOME to $kdehome in kubuntu_52_gtk_qt_engine_config.diff and + * Changed (again) $TDEHOME to $kdehome in kubuntu_52_gtk_qt_engine_config.diff and kubuntu_53_kwallet_config.diff . (LP: #136560) -- Jonathan Riddell <jriddell@ubuntu.com> Sat, 15 Sep 2007 23:12:26 +0100 @@ -799,7 +799,7 @@ kdebase (4:3.5.7-1ubuntu18) gutsy; urgency=low [ Ryan Kavanagh ] * Dropping kubuntu_9902_nspluginviewer_hangs_cpu.diff and the libgtk build-dep as they are no longer needed - * Changed $KDEHOME to $kdehome in kubuntu_52_gtk_qt_engine_config.diff and + * Changed $TDEHOME to $kdehome in kubuntu_52_gtk_qt_engine_config.diff and kubuntu_53_kwallet_config.diff . (LP: #136560) -- Ryan Kavanagh <ryanakca@kubuntu.org> Mon, 03 Sep 2007 10:26:36 -0400 @@ -807,7 +807,7 @@ kdebase (4:3.5.7-1ubuntu18) gutsy; urgency=low kdebase (4:3.5.7-1ubuntu17) gutsy; urgency=low * Edit kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff to use $KDEHOME instead of .kde + kubuntu_53_kwallet_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 @@ -883,15 +883,15 @@ kdebase (4:3.5.7-1ubuntu9) gutsy; urgency=low kdebase (4:3.5.7-1ubuntu8) gutsy; urgency=low - * Fixed debian/kdm.init - set kdm language to the system default. + * Fixed debian/tdm.init + set tdm language to the system default. * Droped pmount dependancy for kdebase. -- Anthony Mercatante <tonio@ubuntu.com> Thu, 14 Jun 2007 17:15:21 +0200 kdebase (4:3.5.7-1ubuntu7) gutsy; urgency=low - * Fixed debian/kdm.init + * Fixed debian/tdm.init Previous code was bash code while the init script is sh -- Anthony Mercatante <tonio@ubuntu.com> Thu, 14 Jun 2007 13:13:22 +0200 @@ -912,8 +912,8 @@ kdebase (4:3.5.7-1ubuntu5) gutsy; urgency=low kdebase (4:3.5.7-1ubuntu4) gutsy; urgency=low - * Removed kubuntu_55_kdm_usplash_down.diff, usplash is now launched - via the kdm.init script, modified to launch usplash_down + * Removed kubuntu_55_tdm_usplash_down.diff, usplash is now launched + via the tdm.init script, modified to launch usplash_down (Fixes LP: #83727 and LP: #34821) * Added kbuntu_97_khotkeys_alt_print_shortcut.diff, capture a window with khotkeys with alt+print @@ -947,7 +947,7 @@ kdebase (4:3.5.7-1ubuntu1) gutsy; urgency=low * Merge with Debian for new upstream release, remaining changes in KUBUNTU-DEBIAN-CHANGES - * Remove kubuntu_62_genkdmconf_fix.diff, applied upstream + * Remove kubuntu_62_gentdmconf_fix.diff, applied upstream * Update kubuntu_68_xinerama.diff * Remove kubuntu_87_kicker_restore_description_parents.diff, obsoleted by upstream changes * Remove kubuntu_94_konqueror_nsplugins_amd64.diff, now part of Debian @@ -1023,9 +1023,9 @@ kdebase (4:3.5.6.dfsg.2-1) unstable; urgency=low +++ Changes by Sune Vuorela: * Support where the frosty furry animals wants their plugins. (Patch 38) - * Better distinguish wether users has modified their kdm theme. (Patch 39) - * Update kdm debconf template, thanks to Christian Perrier. (Closes: #415941) - Also update kdm debconf translations: + * Better distinguish wether users has modified their tdm theme. (Patch 39) + * Update tdm debconf template, thanks to Christian Perrier. (Closes: #415941) + Also update tdm debconf translations: - Norwegian Bokmal - Swedish thanks to Daniel Nylander (Closes: #417875) - Arabic thanks to Ossama Khayat (Closes: #417886) @@ -1061,7 +1061,7 @@ kdebase (4:3.5.6.dfsg.2-1) unstable; urgency=low * Repackage to remove non-free OpenGL logo and update prune-nonfree script. Also, patch 44 to not install the logo. (Closes: #419962) - * Update spanish kdm debconf template translation, thanks to Enrique MatÃas. + * Update spanish tdm debconf template translation, thanks to Enrique MatÃas. * Fix changelog typos ;-) * And, as always, upload. @@ -1073,9 +1073,9 @@ kdebase (4:3.5.6.dfsg.1-2) experimental; urgency=low * Don't install gvim desktop file in kappfinder. gvim does it by itself - and much better. (Closes: #408233) - * Improve documentation about styling kdm (thanks to Jeremy Bygott). - This is a note in kdm.init, in kdm.README.Debian and in the - generated kdmrc. (Closes: #408418, #403776, #403797, #406438) + * Improve documentation about styling tdm (thanks to Jeremy Bygott). + This is a note in tdm.init, in tdm.README.Debian and in the + generated tdmrc. (Closes: #408418, #403776, #403797, #406438) * Add portuguese debconf translation. Thanks to Carlos Lisboa. (Closes: #408021) @@ -1171,7 +1171,7 @@ kdebase (4:3.5.6-0ubuntu10) feisty; urgency=low * Add kubuntu_91_ksplash_fork_too_early_cond.diff, closes Malone #46682. Patch from Mark Jenkins - * Removed kubuntu_05_kdm_theme_config.diff, kdm config will now be + * Removed kubuntu_05_tdm_theme_config.diff, tdm config will now be set via kubuntu-default-settings postinst script. Closes Malone #58639 @@ -1297,7 +1297,7 @@ kdebase (4:3.5.5a.dfsg.1-1ubuntu14) feisty; urgency=low kdebase (4:3.5.5a.dfsg.1-1ubuntu13) feisty; urgency=low - * Update kdm init script to stop usplash with "start" + * Update tdm init script to stop usplash with "start" -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 4 Jan 2007 23:05:08 +0000 @@ -1389,7 +1389,7 @@ kdebase (4:3.5.5a.dfsg.1-1ubuntu1) feisty; urgency=low kdebase (4:3.5.6.dfsg.1-1) experimental; urgency=low * New upstream release: - * Fixes "kdm does not obey pam_limits". (Closes: #242641) + * Fixes "tdm does not obey pam_limits". (Closes: #242641) * Resolves ksysguard problem that it was not possible to sensor order. (Closes: #350561) * Fixes kdesktop_lock and pam_krb5. (Closes: #374394, #376803) @@ -1443,18 +1443,18 @@ kdebase (4:3.5.5a.dfsg.1-3) unstable; urgency=high * debian-kde_default.png.desktop * 21_default_background_image.diff.uu * 22_default_backgrounds.diff - * Add kdm customization support and update kdm README.Debian. Main changes - can be found in kdm init script: - * use an alternative kdm master configuration file (/var/run/kdm/kdmrc) - and background configuration file (/var/run/kdm/backgroundrc) - * source override file in kdm override directory (/etc/default/kdm.d) + * Add tdm customization support and update tdm README.Debian. Main changes + can be found in tdm init script: + * use an alternative tdm master configuration file (/var/run/tdm/tdmrc) + and background configuration file (/var/run/tdm/backgroundrc) + * source override file in tdm override directory (/etc/default/tdm.d) (Closes: #385839) +++ Changes by Sune Vuorela: * Add kdelibs-dbg to kdebase-dbg dependencies. +++ Changes by Josh Metzler: - * Restore kdm's default user face icon by adding a symlink to kdm.links. + * Restore tdm's default user face icon by adding a symlink to tdm.links. (Closes: #267722) +++ Changes by Modestas Vainius: @@ -1582,7 +1582,7 @@ kdebase (4:3.5.5-1) unstable; urgency=low depends on kdebase, so the kde-desktop task will now pull in hal/pmount as well. (Closes: #384663) - * Fix typo in /etc/pam.d/kdm-np. (Closes: #381908) + * Fix typo in /etc/pam.d/tdm-np. (Closes: #381908) * Remove /usr/share/apps/kappfinder/apps/Office/lyx.desktop, as lyx-qt provides its own better .desktop file. (Closes: #383412) @@ -1663,7 +1663,7 @@ kdebase (4:3.5.4-1) unstable; urgency=low * Add libjessie-java to konqueror's Java Suggests, since it is needed for JSSE in conjunction with GCJ. - * Add a LSB header to the KDM init script, making KDM usable with a parallel + * Add a LSB header to the TDM init script, making TDM usable with a parallel bootscripts setup. Thanks to Carlos Villegas. (Closes: #376958) * 25_khelp_htdig.diff: With the htdig package, searchable indexes should @@ -1741,7 +1741,7 @@ kdebase (4:3.5.4-0ubuntu27) edgy; urgency=low kdebase (4:3.5.4-0ubuntu26) edgy; urgency=low - * Install kdm at init level 13 + * Install tdm at init level 13 -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 22 Sep 2006 01:58:38 +0100 @@ -1790,22 +1790,22 @@ kdebase (4:3.5.4-0ubuntu20) edgy; urgency=low kdebase (4:3.5.4-0ubuntu19) edgy; urgency=low - * Added kubuntu_80_kdm_grub.diff (closes #57066) + * Added kubuntu_80_tdm_grub.diff (closes #57066) * Added kubuntu_81_search_engines_config.diff (closes #60058) -- Anthony Mercatante <tonio@ubuntu.com> Tue, 12 Sep 2006 08:26:23 +0200 kdebase (4:3.5.4-0ubuntu18) edgy; urgency=low - * Improved patch kubuntu_79_kdm_halt.diff since kcontrol connection - manager module also hardcodes the setting, instead of reading kdm + * Improved patch kubuntu_79_tdm_halt.diff since kcontrol connection + manager module also hardcodes the setting, instead of reading tdm settings (evil) -- Anthony Mercatante <tonio@ubuntu.com> Mon, 11 Sep 2006 13:19:23 +0200 kdebase (4:3.5.4-0ubuntu17) edgy; urgency=low - * Added patch kubuntu_79_kdm_halt.diff to change the shutdown command + * Added patch kubuntu_79_tdm_halt.diff to change the shutdown command (closes #59134) -- Anthony Mercatante <tonio@ubuntu.com> Mon, 11 Sep 2006 11:50:23 +0200 @@ -1819,7 +1819,7 @@ kdebase (4:3.5.4-0ubuntu16) edgy; urgency=low kdebase (4:3.5.4-0ubuntu15) edgy; urgency=low - * Improved kubuntu_05_kdm_theme_config.diff (closes #57428) + * Improved kubuntu_05_tdm_theme_config.diff (closes #57428) -- Anthony Mercatante <tonio@ubuntu.com> Fri, 8 Sep 2006 15:06:20 +0200 @@ -2034,7 +2034,7 @@ kdebase (4:3.5.3-1) unstable; urgency=low * Update the kate manpage. (Closes: #347883) - * Manually add /usr/bin/X11 to the KDM's default session path, as otherwise + * Manually add /usr/bin/X11 to the TDM's default session path, as otherwise systems still running X11R6.9 won't be able to find X binaries, which can cause the login process to fail under certain circumstances. This bit of cruft (for X11R7 users) should be harmless, and can be removed post-Etch. @@ -2060,23 +2060,23 @@ kdebase (4:3.5.2-2) unstable; urgency=low +++ Changes by Christopher Martin: * Now that menu-xdg+menu can provide xsession .desktop files for window - managers, add /var/lib/menu-xdg/xsessions to kdmrc's default list of + managers, add /var/lib/menu-xdg/xsessions to tdmrc's default list of places to search. Window managers should continue to provide their own .desktop files, however, since they will be more customized and won't force users to install the menu package. This is merely a fallback. (Closes: #360919) - * Make kdm look for /usr/bin/X by default, now that /usr/X11R6 is on its way - out. Adjust other paths in kdmrc as well. kdm should now work better with + * Make tdm look for /usr/bin/X by default, now that /usr/X11R6 is on its way + out. Adjust other paths in tdmrc as well. tdm should now work better with X.Org 7. (Closes: #362924) - * Patch kdm so that if it can't find the X executable in kdmrc (now + * Patch tdm so that if it can't find the X executable in tdmrc (now /usr/bin/X by default), then try /usr/X11R6/bin/X, then finally - /usr/bin/X. This should keep kdm working for users who have a partial or + /usr/bin/X. This should keep tdm working for users who have a partial or botched dist-upgrade, or neglected to permit the installation of an - up-to-date kdmrc. + up-to-date tdmrc. - * Revamp /etc/pam.d/kdm and the other pam files. They should now find the + * Revamp /etc/pam.d/tdm and the other pam files. They should now find the new /etc/default/locale language settings. (Closes: #361089, #361163) * Remove xlibs-static-pic build-dependency, and replace it with @@ -2111,7 +2111,7 @@ kdebase (4:3.5.2-1) unstable; urgency=low * Add a kpersonalizer manpage from Joe Zonker Brockmeier. Thanks. (Closes: #327395) - * Make the KDM option "Restart X Server" visible by default again. + * Make the TDM option "Restart X Server" visible by default again. * Fix the logitechmouse udev rules. Thanks to Henrique de Moraes Holschuh for spotting the problems. (Closes: #359751, #359773) @@ -2156,7 +2156,7 @@ kdebase (4:3.5.0-3) unstable; urgency=low +++ Changes by Christopher Martin: - * Install kdm's NEWS file in all kdebase packages. This ensures that + * Install tdm's NEWS file in all kdebase packages. This ensures that apt-listchanges will display the news to all users. (Closes: #344947) +++ Changes by Adeodato Simó: @@ -2189,11 +2189,11 @@ kdebase (4:3.5.0-2) experimental; urgency=low kdebase (4:3.5.2-0ubuntu27) dapper-security; urgency=low - * SECURITY UPDATE: KDM symlink attack vulnerability - * Add kubuntu_65_kdm_symlink_vunerability.diff - * KDM allows the user to select the session type for login. This + * SECURITY UPDATE: TDM symlink attack vulnerability + * Add kubuntu_65_tdm_symlink_vunerability.diff + * TDM allows the user to select the session type for login. This setting is permanently stored in the user home directory. By - using a symlink attack, KDM can be tricked into allowing the + using a symlink attack, TDM can be tricked into allowing the user to read file content that would otherwise be unreadable to this particular user. * References: @@ -2253,13 +2253,13 @@ kdebase (4:3.5.2-0ubuntu20) dapper; urgency=low kdebase (4:3.5.2-0ubuntu19) dapper; urgency=low - * Add kubuntu_62_genkdmconf_fix.diff, closes Malone #39599 + * Add kubuntu_62_gentdmconf_fix.diff, closes Malone #39599 -- Frode M. Doeving <frode@lnix.net> Mon, 1 May 2006 15:25:48 +0100 kdebase (4:3.5.2-0ubuntu18) dapper; urgency=low - * Fix wallpaper in kubuntu_05_kdm_theme_config.diff + * Fix wallpaper in kubuntu_05_tdm_theme_config.diff * Alter kubuntu_52_gtk_qt_engine_config.diff, don't make use of gtk_qt_engine if gnome or xfce are already installed (Malone #36256) @@ -2275,7 +2275,7 @@ kdebase (4:3.5.2-0ubuntu17) dapper; urgency=low kdebase (4:3.5.2-0ubuntu16) dapper; urgency=low - * Update kubuntu_05_kdm_theme_config.diff for dapper wallpaper + * Update kubuntu_05_tdm_theme_config.diff for dapper wallpaper -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 27 Apr 2006 15:45:33 +0100 @@ -2394,13 +2394,13 @@ kdebase (4:3.5.2-0ubuntu1) dapper; urgency=low kdebase (4:3.5.1-0ubuntu14) dapper; urgency=low - * Add kubuntu_55_kdm_usplash_down.diff run usplash on exit from KDM + * Add kubuntu_55_tdm_usplash_down.diff run usplash on exit from TDM -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 17 Mar 2006 12:26:58 +0000 kdebase (4:3.5.1-0ubuntu13) dapper; urgency=low - * Update kdm background colour in kubuntu_05_kdm_theme_config.diff + * Update tdm background colour in kubuntu_05_tdm_theme_config.diff to match current artwork -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 15 Mar 2006 21:17:36 +0000 @@ -2427,7 +2427,7 @@ kdebase (4:3.5.1-0ubuntu11) dapper; urgency=low kdebase (4:3.5.1-0ubuntu10) dapper; urgency=low * Add kubuntu_50_kate_desktop.diff use existing Kate session - * Add kubuntu_51_kdmrc_options.diff add back restart X option + * Add kubuntu_51_tdmrc_options.diff add back restart X option * Patches by Anthony Mercatante <tonio@ubuntu.com> -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 27 Feb 2006 15:18:06 +0000 @@ -2565,9 +2565,9 @@ kdebase (4:3.5.0-0ubuntu8) dapper; urgency=low kdebase (4:3.5.0-0ubuntu7) dapper; urgency=low - * Update 10_kdmrc_defaults_kubuntu.diff changing Debian to Kubuntu - and rename to kubuntu_10_kdmrc_defaults_kubuntu.diff - * Remove kdm dependency on kubuntu-default-settings, setting KDM + * Update 10_tdmrc_defaults_kubuntu.diff changing Debian to Kubuntu + and rename to kubuntu_10_tdmrc_defaults_kubuntu.diff + * Remove tdm dependency on kubuntu-default-settings, setting TDM theme now scripted in kubuntu-default-settings -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 10 Jan 2006 00:26:23 +0000 @@ -2629,7 +2629,7 @@ kdebase (4:3.5-rc2-0ubuntu1) dapper; urgency=low * New upstream pre-release * Tighten kdelibs-dev build-dep for libstdc++ transition - * kdm depends on xauth not xbase-clients + * tdm depends on xauth not xbase-clients * Update 18_default_fonts.diff * Generate .pot files * Remove kubuntu_26_startkde.diff, no need to start ivman in 3.5 @@ -2640,9 +2640,9 @@ kdebase (4:3.5-rc1-1ubuntu1) dapper; urgency=low * New upstream pre-release * Sync with Debian - * Update kubuntu_05_kdm_theme_config.diff + * Update kubuntu_05_tdm_theme_config.diff * Update kubuntu_16_hide_kpager_menu_entry.diff - * Update kubuntu_19_kdm_zsh_emulate.diff + * Update kubuntu_19_tdm_zsh_emulate.diff * Update kubuntu_25_kcontrol_only_in_kde.diff * Update kubuntu_30_startkde_background_colour.diff * Update kubuntu_32_usplash_console_font.diff @@ -2691,7 +2691,7 @@ kdebase (4:3.4.3-3) unstable; urgency=low kdelibs4c2. * Add "noextendedglob" to zsh's options when reading the X startup scripts - for kdm. This works around some of its quirks. (Closes: #336305) + for tdm. This works around some of its quirks. (Closes: #336305) * Backport a fix from KDE 3.5 for a bug that caused switching to Administrator mode in KControl to fail on occasion. (Closes: #306951) @@ -2744,8 +2744,8 @@ kdebase (4:3.4.2-3) unstable; urgency=low +++ Changes by Christopher Martin: - * Add a NEWS entry that explains the KDM upgrade process for users moving - from KDM 3.3.x, as well as KDM's new behaviour regarding login scripts. + * Add a NEWS entry that explains the TDM upgrade process for users moving + from TDM 3.3.x, as well as TDM's new behaviour regarding login scripts. (Closes: #326542, #327191) * Add a patch from the "Improving KDE" set that eliminates a superfluous @@ -2783,11 +2783,11 @@ kdebase (4:3.4.2-1) unstable; urgency=low * Bugs reported in the Debian BTS fixed by this release: - - kdm uses /dev/urandom instead of /dev/random as the default source + - tdm uses /dev/urandom instead of /dev/random as the default source of entropy. This solves myriad issues on low-entropy systems. (Closes: #240027, #294267, #298254, #320838) - - "-nolisten tcp" no longer prevents kdm from connecting to remote + - "-nolisten tcp" no longer prevents tdm from connecting to remote hosts. (Closes: #263449) +++ Changes by Pierre Habouzit: @@ -2808,7 +2808,7 @@ kdebase (4:3.4.2-1) unstable; urgency=low * Tighten all package relations between packages in kdebase, preventing many instances of potentially harmful partial upgrades. In particular, ensure - that kdm is upgraded along with kdebase-bin. (Closes: #312358) + that tdm is upgraded along with kdebase-bin. (Closes: #312358) * Fix typos in the kappfinder manpage. Thanks to A Costa. (Closes: #312767) @@ -2817,11 +2817,11 @@ kdebase (4:3.4.2-1) unstable; urgency=low did not work with arts, had arts ever once been unavailable. (Closes: #312217) - * No longer set a random ForgingSeed in the kdmrc conffile, for this caused - each kdebase build to generate a different kdmrc, and therefore made + * No longer set a random ForgingSeed in the tdmrc conffile, for this caused + each kdebase build to generate a different tdmrc, and therefore made updates a nuissance. - * Make kdm Suggest kdepasswd, since the later contains icons that can be + * Make tdm Suggest kdepasswd, since the later contains icons that can be used to provide users with 'face' icons. * Fix formatting of the kdepasswd manpage. (Closes: #313472) @@ -2829,10 +2829,10 @@ kdebase (4:3.4.2-1) unstable; urgency=low * Add the Arabic debconf translation by Mohammed Adnene Trojette. (Closes: #320768) - * Fix kdm session files that contain the incorrent binary names. + * Fix tdm session files that contain the incorrent binary names. (Closes: #320628) - * Change kdm's debconf dependency into a dependency on debconf | + * Change tdm's debconf dependency into a dependency on debconf | debconf-2.0, as this allows the installation of cdebconf. * Move all of konsole's README documentation into /opt/kde3/share/doc/konsole. @@ -2863,7 +2863,7 @@ kdebase (4:3.4.3-0ubuntu5) breezy-updates; urgency=low kdebase (4:3.4.3-0ubuntu4) breezy; urgency=low * Fix typo in kubuntu_18_default_fonts.diff to give anti-aliased - fonts in kdm + fonts in tdm -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 11 Oct 2005 22:50:44 +0100 @@ -2895,7 +2895,7 @@ kdebase (4:3.4.2-0ubuntu5) breezy; urgency=low before X is started (ubuntu No 15344 , No 15102) * Ensure kubuntu_27_aboutscreen_searchbar.diff is not applied before upload - * Fix kdm.postinst to move kdm back to S21 + * Fix tdm.postinst to move tdm back to S21 -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 27 Sep 2005 12:50:34 +0100 @@ -2937,7 +2937,7 @@ kdebase (4:3.4.2-0ubuntu2) breezy; urgency=low kdebase (4:3.4.2-0ubuntu1) breezy; urgency=low * New upstream release - * Move 10_kdmrc_defaults.diff to kubuntu_10_kdmrc_defaults.diff + * Move 10_tdmrc_defaults.diff to kubuntu_10_tdmrc_defaults.diff and s/Debian/Kubuntu * Add kubuntu_27_aboutscreen_searchbar.diff @@ -2985,7 +2985,7 @@ kdebase (4:3.4.1-0ubuntu2) breezy; urgency=low kdebase (4:3.4.1-0ubuntu1) breezy; urgency=low * Update version number following KDE 3.4.1 release - * Add kde-base conflict with kdm << 3.4.1 + * Add kde-base conflict with tdm << 3.4.1 * Add back ktip to meta package -- Jonathan Riddell <jr@jriddell.org> Wed, 1 Jun 2005 00:15:47 +0000 @@ -2999,7 +2999,7 @@ kdebase (4:3.4.1-0ubuntu0pre3) breezy; urgency=low kdebase (4:3.4.1-0ubuntu0pre2) breezy; urgency=low - * Add build-dep on libxau-dev, libxdmcp-dev to let KDM compile + * Add build-dep on libxau-dev, libxdmcp-dev to let TDM compile -- Jonathan Riddell <jr@jriddell.org> Tue, 24 May 2005 19:23:39 +0000 @@ -3007,8 +3007,8 @@ kdebase (4:3.4.1-0ubuntu0pre1) breezy; urgency=low * New upstream release. * Sync with Debian - * Change /usr/bin/X11 to /usr/X11R6/bin in kdm.README.Debian and - patches/11_genkdmconf.diff renamed to kubuntu_01_genkdmconf.diff + * Change /usr/bin/X11 to /usr/X11R6/bin in tdm.README.Debian and + patches/11_gentdmconf.diff renamed to kubuntu_01_gentdmconf.diff and alter PATH in debian/rules -- Jonathan Riddell <jr@jriddell.org> Tue, 24 May 2005 11:34:02 +0000 @@ -3033,18 +3033,18 @@ kdebase (4:3.4.0-0pre4) alioth; urgency=low +++ Changes by Christopher Martin: * Added a patch to set reasonable default fonts, using the fontconfig - defaults, for kpersonalizer, kcontrol, kdm, and the Plastik theme. We + defaults, for kpersonalizer, kcontrol, tdm, and the Plastik theme. We also use the Debian Blue artwork to provide a standard desktop background. - * KDM no longer shows the Custom session. When it works at all, it simply + * TDM no longer shows the Custom session. When it works at all, it simply duplicates Default's behaviour anyway. (Closes: #251602) - * New KDM patches source /etc/profile and the user's normal shell startup + * New TDM patches source /etc/profile and the user's normal shell startup scripts. (Closes: #173802, #211953, #250645, #250765, #289143) - * KDM once again looks for window manager session definitions in - /usr/share/apps/kdm/sessions by default. (Closes: #293645, #310155) + * TDM once again looks for window manager session definitions in + /usr/share/apps/tdm/sessions by default. (Closes: #293645, #310155) * USB usermap for Logitech mice is now installed, with device permissions set so that members of the plugdev group can make use of the Logitech @@ -3092,7 +3092,7 @@ kdebase (4:3.3.2-1) unstable; urgency=low * Update kdeprint documentation to sync with kdelibs patches. - * Add NEWS.Debian for kdm, explaining the "keyboard doesn't work" + * Add NEWS.Debian for tdm, explaining the "keyboard doesn't work" problem when upgrading to KDE 3.3, and how to deal with it. (Closes: #266106, #267622) @@ -3146,7 +3146,7 @@ kdebase (4:3.4.0-0ubuntu18) hoary; urgency=low kdebase (4:3.4.0-0ubuntu17) hoary; urgency=low - * Changed kdm start from S13 to S21 (Ubuntu: 8029) + * Changed tdm start from S13 to S21 (Ubuntu: 8029) * More Linitian cleanup -- Andreas Mueller <amu@ubuntu.com> Tue, 5 Apr 2005 16:00:01 +0200 @@ -3173,8 +3173,8 @@ kdebase (4:3.4.0-0ubuntu14) hoary; urgency=low kdebase (4:3.4.0-0ubuntu13) hoary; urgency=low - * Fix kdm login when shell is zsh. Thanks Antti S. Lankila for the hint. - 19_kdm_zsh_emulate.diff (Hoary #7620) + * Fix tdm login when shell is zsh. Thanks Antti S. Lankila for the hint. + 19_tdm_zsh_emulate.diff (Hoary #7620) * Fix init script output (Hoary #7180) -- Chris Halls <chris.halls@credativ.co.uk> Wed, 30 Mar 2005 01:01:26 +0100 @@ -3207,7 +3207,7 @@ kdebase (4:3.4.0-0ubuntu9) hoary; urgency=low kdebase (4:3.4.0-0ubuntu8) hoary; urgency=low - * Make default background colour of kdm match wallpaper + * Make default background colour of tdm match wallpaper * Add kubuntu_17_hide_desktop_trash.diff to hide desktop wastebin * Remove dependency on ktip from kdebase * Change Hidden to OnlyShowIn in knetattach.desktop so it isn't hidden from remote:/ @@ -3216,7 +3216,7 @@ kdebase (4:3.4.0-0ubuntu8) hoary; urgency=low kdebase (4:3.4.0-0ubuntu7) hoary; urgency=low - * Make kdm depend on kubuntu-default-settings + * Make tdm depend on kubuntu-default-settings -- Jonathan Riddell <jr@jriddell.org> Thu, 17 Mar 2005 07:11:28 +0000 @@ -3240,16 +3240,16 @@ kdebase (4:3.4.0-0ubuntu4) hoary; urgency=low kdebase (4:3.4.0-0ubuntu3) hoary; urgency=low - * Fix kdm.postinst to correctly update existing S99kdm links to S13kdm + * Fix tdm.postinst to correctly update existing S99tdm links to S13tdm -- Jonathan Riddell <jr@jriddell.org> Wed, 16 Mar 2005 23:43:54 +0000 kdebase (4:3.4.0-0ubuntu2) hoary; urgency=low - * Fix kdm.postinst to update existing S99kdm links to S13kdm + * Fix tdm.postinst to update existing S99tdm links to S13tdm * Fix kubuntu_03_ksplash_settings.diff to change all references to icon * Remove depend on kde-style-lipstik while still in universe - * Add kubuntu_05_kdm_theme_config.diff to make kdm use Kubuntu theme + * Add kubuntu_05_tdm_theme_config.diff to make tdm use Kubuntu theme * Add kubuntu_06_hide_home_menu_entry.diff to hide Home from KMenu -- Jonathan Riddell <jr@jriddell.org> Wed, 16 Mar 2005 17:26:25 +0000 @@ -3266,7 +3266,7 @@ kdebase (4:3.4.0-0ubuntu1) hoary; urgency=low kdebase (4:3.4.0-0pre1ubuntu6) hoary; urgency=low - * Make kdm start at at S13 rather than S99 (see Ubuntu Bugzilla No 3143 + * Make tdm start at at S13 rather than S99 (see Ubuntu Bugzilla No 3143 for gdm). * Make kdebase-bin depend on gdb for drkonqi * Add patch kubuntu_02_kcontrol_only_kde_menu.diff making KControl only @@ -3313,11 +3313,11 @@ kdebase (4:3.3.2-0pre1) experimental; urgency=low for CAN-2004-1158. * Lower kdeprint's dependency on gv to a Suggests. (Closes: #269590) * kwin is now registered as an x-window-manager. (Closes: #249162) - * Added /usr/share/xsessions to KDM's default session path, so + * Added /usr/share/xsessions to TDM's default session path, so .desktop files installed there are found. (Closes: #243770, #247365, #247747, #250384) - * kdm can now be installed while building kdebase, without affecting - the generated kdmrc and other config files. + * tdm can now be installed while building kdebase, without affecting + the generated tdmrc and other config files. * Adjust documentation to reflect the CUPS document path used by Debian. * Incorporate new manpages, for kdepasswd, kappfinder, kfind, @@ -3385,7 +3385,7 @@ kdebase (4:3.3.1-1) unstable; urgency=low * New upstream release. * KDE_3_3_BRANCH update. * ksmserver: only reset x-session-manager on install. (Closes: #247243) - * kdm: remove log files on purge. (Closes: #273542) + * tdm: remove log files on purge. (Closes: #273542) * Correct Danish po-debconf translations. (Closes: #273832) -- Christopher L Cheney <ccheney@debian.org> Thu, 4 Nov 2004 04:00:00 -0600 @@ -3396,10 +3396,10 @@ kdebase (4:3.3.0a-1) unstable; urgency=low * KDE_3_3_BRANCH update. * Add Turkish po-debconf translations. (Closes: #248326) * Add German po-deconf translations. (Closes: #264608) - * Correct /etc/kde3/kdm/Xsession file. (Closes: #265795) + * Correct /etc/kde3/tdm/Xsession file. (Closes: #265795) * Correct usage of "its" in konsole description. (Closes: #268517) * Correct Danish po-debconf translations. (Closes: #269575) - * Correct kdm name in /etc/init.d/kdm. (Closes: #272062) + * Correct tdm name in /etc/init.d/tdm. (Closes: #272062) -- Christopher L Cheney <ccheney@debian.org> Sat, 25 Sep 2004 20:00:00 -0500 @@ -3422,17 +3422,17 @@ kdebase (4:3.2.2-1) unstable; urgency=low * New upstream release. * Added Build-Depends: libsensors-dev. - * Corrected kdm postinst startup code. (Closes: #195052) + * Corrected tdm postinst startup code. (Closes: #195052) * Removed Debian menu desktop files. (Closes: #198661) * Added a README.linux.console document. (Closes: #218035) - * Remove kdm log files on purge. (Closes: #225157) + * Remove tdm log files on purge. (Closes: #225157) * Corrected kate/konqueror mime nametemplate support. (Closes: #235216) - * Removed "FIXME - observe" lines from kdm scripts. (Closes: #236422) + * Removed "FIXME - observe" lines from tdm scripts. (Closes: #236422) * Added Danish po-debconf translations. (Closes: #236480) * Remove old x-session-manager alternatives. (Closes: #236515, #236795, #237081, #240773) * Removed kdebase and kicker menu-methods. (Closes: #236700) - * Corrected kdm-np PAM service. (Closes: #236750, #238182, #242381) + * Corrected tdm-np PAM service. (Closes: #236750, #238182, #242381) * Added kcontrol Depends: kdebase-data. (Closes: #239297) * Updated GDM session file. (Closes: #240980) * debian/*.menu: remove the obsolete kderemove tag. @@ -3447,8 +3447,8 @@ kdebase (4:3.2.1-1) unstable; urgency=low * Added Japanese po-deconf translations. (Closes: #137940, #210431) * Updated kate Recommends: kregexpeditor. (Closes: #227677) * Added konqueror Depends: kdebase-kio-plugins. (Closes: #230203) - * Added kdm Provides: x-display-manager. (Closes: #231442) - * Added kdebase-bin/kdm Depends libpam-runtime. (Closes: #233562, #236078) + * Added tdm Provides: x-display-manager. (Closes: #231442) + * Added kdebase-bin/tdm Depends libpam-runtime. (Closes: #233562, #236078) * Added kate/konqueror mime nametemplate support. (Closes: #235216) -- Christopher L Cheney <ccheney@debian.org> Fri, 5 Mar 2004 04:00:00 -0600 @@ -3486,8 +3486,8 @@ kdebase (4:3.1.4-2) unstable; urgency=low * Corrected konqueror gs mime tests. (Closes: #160428) * kdesktop Recommends eject. (Closes: #223642) * konqueror Provides info-browser. (Closes: #223913) - * Added '|| true' to db_input lines in kdm debconf support. (Closes: #224548) - * Corrected typo in kdm.config script. (Closes: #224578) + * Added '|| true' to db_input lines in tdm debconf support. (Closes: #224548) + * Corrected typo in tdm.config script. (Closes: #224578) -- Christopher L Cheney <ccheney@debian.org> Mon, 5 Jan 2004 23:00:00 -0600 @@ -3506,7 +3506,7 @@ kdebase (4:3.1.4-1) unstable; urgency=low * Update pam support to use new common module fragments. (Closes: #206958) * Update package descriptions. (Closes: #209532, #209856) * Strip SUID root from kcheckpass since its not needed. (Closes: #212212) - * Update kdm debconf and use po-debconf. (Closes: #218731) + * Update tdm debconf and use po-debconf. (Closes: #218731) * Make kicker depend on kdebase-data. (Closes: #223407) -- Christopher L Cheney <ccheney@debian.org> Thu, 18 Dec 2003 13:30:00 -0600 @@ -3544,8 +3544,8 @@ kdebase (4:3.1.2-1) unstable; urgency=low * Add kfind to konqueror Depends. (Closes: #192859) * Fix KDE GDM Session file. (Closes: #144206, #154519, #188560, #189438, #193274) - * Add log rotation for KDM logfile. (Closes: #145345, #153728) - * Add screen number to KDM Xservers file. (Closes: #182708, #184737, #187257) + * Add log rotation for TDM logfile. (Closes: #145345, #153728) + * Add screen number to TDM Xservers file. (Closes: #182708, #184737, #187257) * Moved xfonts-konsole fonts to /usr/X11R6/lib/X11/fonts/misc/ (Closes: #184548) @@ -3554,13 +3554,13 @@ kdebase (4:3.1.2-1) unstable; urgency=low kdebase (4:3.1.1-1) unstable; urgency=low * New upstream release. (Closes: #180816, #181309) - * Corrected kdm-update-menu.sh kdm.options path. (Closes: #180355) - * Added xbase-clients depend to kdm. (Closes: #180536) + * Corrected tdm-update-menu.sh tdm.options path. (Closes: #180355) + * Added xbase-clients depend to tdm. (Closes: #180536) * Added xutils depend to xfonts-konsole. (Closes: #180695) * Improved xfonts-konsole description. (Closes: #180696) * Remove upgrade from alternatives removal prerm script. (Closes: #180927) * Change Xservers to launch /usr/X11R6/bin/X. (Closes: #182037) - * Add entries for kdm reserve xserver feature. (Closes: #182708) + * Add entries for tdm reserve xserver feature. (Closes: #182708) * Add kcontrol depends to konqueror (Closes: #182724) * Change konqueror menu entry to allow execution. (Closes: #183225) * Make konqueror provide www-browser. (Closes: #183391) @@ -3600,7 +3600,7 @@ kdebase (4:2.2.2-14.5) stable-security; urgency=high * Non-maintainer upload by the Security Team * Apply patch from KDE advisory 20030908 to fix local root vulnerability in - PAM authentication in KDM + PAM authentication in TDM -- Matt Zimmerman <mdz@debian.org> Sun, 31 Aug 2003 04:39:47 -0400 @@ -3653,7 +3653,7 @@ kdebase (4:2.2.2-13) unstable; urgency=low * debian/rules, debian/konsole.dirs: - Make symlinks in the X fonts directory to Konsole fonts in /usr/share/fonts in the install target. (closes: #127871) - * debian/kdmrc: + * debian/tdmrc: - Disallow remote users from shutting down the machine. (Yeah, yeah, I know - dodgy grammar). (closes: #127616) * debian/control: @@ -3739,7 +3739,7 @@ kdebase (4:2.2.2-4) unstable; urgency=low * Build cleanup * Build with xinerama support for i386 * Another update for Nedit.ad to work with newer Nedit - * Cleanup kdmrc for release..default to security + * Cleanup tdmrc for release..default to security * Update documentation for freeze -- Ivan E. Moore II <rkrusty@debian.org> Fri, 30 Nov 2001 02:30:00 -0700 @@ -3747,7 +3747,7 @@ kdebase (4:2.2.2-4) unstable; urgency=low kdebase (4:2.2.2-3) unstable; urgency=low * Update Brazilian Portuguese debconf entries (Closes: #120841) - * Remove kdmrc debconf note + * Remove tdmrc debconf note * Add in replaces to fix those people using testing who don't know how to use --force-overwrite or don't know how to let dpkg fix things on the second go around. What a waste of disk space. @@ -3767,14 +3767,14 @@ kdebase (4:2.2.2-2) unstable; urgency=low kdebase (4:2.2.2-1) unstable; urgency=low * new upstream version - * Add in suggests for libpam-krb/heimdel to kdm so we can get rid of the - kdm-krb package + * Add in suggests for libpam-krb/heimdel to tdm so we can get rid of the + tdm-krb package * Update Nedit.ad (Closes: #117881) - * Apply kdm cleanup patch by Branden (Closes: #118217) + * Apply tdm cleanup patch by Branden (Closes: #118217) * Fix mime checks (Closes: #117747) * Fix kate syntax highlights (Closes: #113773) * Add kate undocumented manpage - * Run lilo query for kdm with -w + * Run lilo query for tdm with -w * Fix konsole crashes (Closes: #119480) -- Ivan E. Moore II <rkrusty@debian.org> Wed, 21 Nov 2001 16:18:00 -0700 @@ -3867,9 +3867,9 @@ kdebase (4:2.2.1-3) unstable; urgency=low kdebase (4:2.2.1-2) unstable; urgency=low - * fix kdm preinst (Closes: #112900) + * fix tdm preinst (Closes: #112900) * fix overwrite (Closes: #112903) - * A couple kdm fixes and on keditbookmarks fix from upstream + * A couple tdm fixes and on keditbookmarks fix from upstream * Use usbutils's usb.ids if it exists (Closes: #112879) * konsole save fixes (Closes: #112982, 112943) @@ -3905,8 +3905,8 @@ kdebase (4:2.2.0.20010822-1) unstable; urgency=low * Remove gvim.desktop and gvim.png files so there is no confliction with new vim package. * sync with upstream - * Fix kdm not allowing typing after the first boot - * kdm now uses new x-display-manager bits + * Fix tdm not allowing typing after the first boot + * tdm now uses new x-display-manager bits * Fix typos and update script bits from Branden -- Ivan E. Moore II <rkrusty@debian.org> Wed, 22 Aug 2001 00:01:00 -0700 @@ -3922,10 +3922,10 @@ kdebase (4:2.2.0-final-3) unstable; urgency=low kdebase (4:2.2.0-final-2) unstable; urgency=low * Re-Add the *proper* Xsession script that will use the one provided - by Debian's X rather than the one provided by kdm which is broken. + by Debian's X rather than the one provided by tdm which is broken. The one provided by Debian works better anyways. (Closes: #108736) * Fix klipperrc (Closes: #108856) - * Add a debconf note to kdm about SessionTypes being auto-generated. This + * Add a debconf note to tdm about SessionTypes being auto-generated. This is now noted in 3 locations. -- Ivan E. Moore II <rkrusty@debian.org> Tue, 14 Aug 2001 16:53:00 -0700 @@ -3964,7 +3964,7 @@ kdebase (4:2.2.0-0.2beta1-1) unstable; urgency=low * Update Build-Depends and Depends * Fix pdf viewing problem (Closes: #88006) * Fix reference to woody's version in userguide (Closes: #105301) - * kdm Brazilian debconf translations (Closes: #105374) + * tdm Brazilian debconf translations (Closes: #105374) * Fix kde-update-menu script so that it can be run as a normal user (Closes: #105786) * sync with upstream @@ -4003,22 +4003,22 @@ kdebase (4:2.2.0-0beta1-3) unstable; urgency=low kdebase (4:2.2.0-0beta1-2) unstable; urgency=low - * Fix kdm preinst + * Fix tdm preinst -- Ivan E. Moore II <rkrusty@debian.org> Fri, 29 Jun 2001 09:51:00 -0700 kdebase (4:2.2.0-0beta1-1) unstable; urgency=low - * Update path info in kdm files...these were in the comments so + * Update path info in tdm files...these were in the comments so it wasn't a big deal - * Add a comment to default kdmrc about SessionType generation - * Re-hash kdm README + * Add a comment to default tdmrc about SessionType generation + * Re-hash tdm README * KDE 2.2 beta1 * Sync with upstream * Fix typo in Xsetup * Fix dup dependencies (Closes: #99690) * Fix other replaces and whatnot (Closes: #101187) - * Add filterproxy,freenet user to kdmrc (Closes: #96707, #98746) + * Add filterproxy,freenet user to tdmrc (Closes: #96707, #98746) * Upstream reports these bugs fixed (Closes: #77151) * Adding in a note about kwrited (Closes: #97245) * Add w3m to klipperrc @@ -4032,7 +4032,7 @@ kdebase (4:2.2.0-0beta1-1) unstable; urgency=low date listed in the version number states when the initial pull was made however updates may and most likely will have taken place since that date. Look at it as a >= cvs{date} - * Generate SessionTypes line in kdmrc during kdm postinst. + * Generate SessionTypes line in tdmrc during tdm postinst. * Change KDE logo's in konq's about:konqueror to Debian powered-by logo with link to debian.org instead of kde.org * Remove old menu debian xpm files and use existing debian png mimetype @@ -4049,11 +4049,11 @@ kdebase (4:2.2.0-0beta1-1) unstable; urgency=low we were using. * Fix description of kate...oops..thanks Oswald. :) * More menu clean...full pathing - * ton of kdm updates...basically syncing conffiles with those from + * ton of tdm updates...basically syncing conffiles with those from the xdm from 4.0.3 * More build-deps: libogg-dev, libvorbis-dev (For auidocd:/ support) - * Provide man link from kdm to chooser + * Provide man link from tdm to chooser * More build cleanup..take more of the automation out to make sure things are constant * Remove custom startkde @@ -4085,9 +4085,9 @@ kdebase (4:2.2.0-0beta1-1) unstable; urgency=low * New man pages for: konqueror * More debconf cleanup * Adding in suggests for xearth - * Add in Dependency for x-window-manager | x-session-manager to kdm + * Add in Dependency for x-window-manager | x-session-manager to tdm * Add icons to debian sub menus - * kdm auto-generation of session list + * tdm auto-generation of session list * Merging Debian and KDE menus a bit * Add lynx and links to default klipperc * Fixed communicator entry in klipperrc so that it will actually launch @@ -4123,7 +4123,7 @@ kdebase (4:2.1.1-4) unstable; urgency=low kdebase (4:2.1.1-3) unstable; urgency=low - * Fix kdmrc file (Closes: #92415) + * Fix tdmrc file (Closes: #92415) * Update XftConfig example * Fix kfmclient and kicker crashes (Closes: #89146, #88647) * More upstream fixes @@ -4156,7 +4156,7 @@ kdebase (4:2.1.0.1-5) unstable; urgency=low kdebase (4:2.1.0.1-4) unstable; urgency=low - * pam_env fixes for kdm as well as a ton of other updates to kdm + * pam_env fixes for tdm as well as a ton of other updates to tdm * Fixing a problem with the default AA settings. It looks like I "fixed" the wrong bit when I first fixed this. (Closes: #89741) @@ -4165,14 +4165,14 @@ kdebase (4:2.1.0.1-4) unstable; urgency=low kdebase (4:2.1.0.1-3) unstable; urgency=low * Adding in debconf note for systems that have a /.kde directory - * Adding debconf dependency to kdm + * Adding debconf dependency to tdm * More upstream fixes -- Ivan E. Moore II <rkrusty@debian.org> Tue, 13 Mar 2001 18:20:00 -0700 kdebase (4:2.1.0.1-2) unstable; urgency=low - * Fix kdm init script. actually stop when we tell you to stop (Closes: #89235) + * Fix tdm init script. actually stop when we tell you to stop (Closes: #89235) * More documentation added to the QT AA Font Howto * Fix for K Menu restarts and other funky behaviour * XftConfig example included @@ -4253,19 +4253,19 @@ kdebase (4:2.1.0-1) unstable; urgency=low kdebase (4:2.1-final-1) unstable; urgency=low * New upstream version - * Fix kdm init.d script + * Fix tdm init.d script * Upping standards version - * Fix for "chooser not running from kdm" (Closes: #76586) + * Fix for "chooser not running from tdm" (Closes: #76586) * Fix graphics display (Closes: #85166) * Fix bg clear issue (Closes: #77649) - * Fix kdm and expiring passwords + * Fix tdm and expiring passwords * Fix for konq crash on startup and other crashes (Closes: 84472, #77151, #80102) * Moving task-kde* packages out of kdebase source * Fixes for khelpcenter hangs (Closes: #81683) * konq provides ftp-client as well * Update /usr/bin/kde2 script * Compile ldap kioslave - * Updated kdm init.d script + * Updated tdm init.d script * Fix these rendering issues (Closes: #87183) -- Ivan E. Moore II <rkrusty@debian.org> Mon, 19 Feb 2001 02:31:00 -0700 @@ -4301,7 +4301,7 @@ kdebase (4:2.1-beta2-2) unstable; urgency=low * Updating menu entries (Closes: #83216) * Fixes form content memory in konq (Closes: #77317) * Fixes problem with version numbers not showing - * Adding Build-Depends for xutils as it seems kdm needs imake + * Adding Build-Depends for xutils as it seems tdm needs imake * Applied patch for konq template (Closes: #83355) -- Ivan E. Moore II <rkrusty@debian.org> Tue, 23 Jan 2001 12:36:00 -0700 @@ -4333,8 +4333,8 @@ kdebase (4:2.1-20010115-1) unstable; urgency=low * 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 - * Updating kdmrc to match current features and all - * Add a link in /etc/X11/kdm to kdmrc (Closes: #82643) + * 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 * This version fixes smb problems...you just need to make sure you have smbclient installed. Added that as a Recommend (Closes: #82612) @@ -4384,7 +4384,7 @@ kdebase (4:2.1-20001218-1) unstable; urgency=low * More upstream fixes * Fix for GDM Session (Closes: #79987) - * Update to kdm man page and README + * Update to tdm man page and README * Adding /usr/bin/kde2 as a x-session-manager * Adding new menu hints (Closes: #80022, #80020) * Fixing menu-method to handle new hints @@ -4406,13 +4406,13 @@ kdebase (4:2.1-20001213-1) unstable; urgency=low * New upstream beta * Fixing alternative priority for konsole * Adding in a session for gdm (Closes: #74678) - * new x4 port of xdm -> kdm (Closes: #79196, #79509) + * new x4 port of xdm -> tdm (Closes: #79196, #79509) * Fix whatis typo (Closes: #78178) * Fix segfaults (Closes: #78903) * Adding in a Recommend for kview to konqueror (Closes: #79201) * Changing x-window-manager alternative from kde2 to kwin - * KDM init.d script cleanup (Closes: #79320) - * Fixed default kdmrc script to show new options + * TDM init.d script cleanup (Closes: #79320) + * Fixed default tdmrc script to show new options * Adding in a kwm script for non-session launches * Adding new users to NoUsers (Closes: #79617) @@ -4457,21 +4457,21 @@ kdebase (4:2.0-final-4) unstable; urgency=low * more kdebase-libs work now properly handles pop3 and other services correctly now allows for email configuration without kdebase installed - * more dependency work with kdm (Closes: #76565) + * more dependency work with tdm (Closes: #76565) -- Ivan E. Moore II <rkrusty@debian.org> Wed, 08 Nov 2000 17:30:00 -0700 kdebase (4:2.0-final-3.1) unstable; urgency=low * applying i18n patch (Closes: #75831) - * more kdmrc default setting updates + * more tdmrc default setting updates -- Ivan E. Moore II <rkrusty@debian.org> Sun, 05 Nov 2000 23:00:00 -0700 kdebase (4:2.0-final-3) unstable; urgency=low * more upstream fixes - * more kdmrc default setting updates + * more tdmrc default setting updates * build against new xlibs and updating depends -- Ivan E. Moore II <rkrusty@debian.org> Sat, 04 Nov 2000 01:00:00 -0700 @@ -4509,7 +4509,7 @@ kdebase (4:2.0-20001015-0) unstable; urgency=low kdebase (4:2.0-20001013-0) unstable; urgency=low - * kdmdesktop fixes from upstream + * tdmdesktop fixes from upstream * more i18n work * applying i18n patche * more fixes for konqueror @@ -4533,7 +4533,7 @@ kdebase (4:2.0-20001009-0) unstable; urgency=low * KDE 2.0 RC2 * more upstream fixes - * minor kdmdekstop fix + * minor tdmdekstop fix -- Ivan E. Moore II <rkrusty@debian.org> Mon, 09 Oct 2000 08:00:00 -0700 @@ -4561,8 +4561,8 @@ kdebase (4:2.0-20001004-0) unstable; urgency=low * More upstream fixes * No longer depend on versioned kdelibs - * Fixing up kdm's postinst to better handle kdmrc - * More spice for kdm + * Fixing up tdm's postinst to better handle tdmrc + * More spice for tdm * Fixes the following: (Closes: #73057, #73015, #73002, #72921, #72989, #72919, #72638) -- Ivan E. Moore II <rkrusty@debian.org> Mon, 02 Oct 2000 01:00:00 -0700 @@ -4647,14 +4647,14 @@ kdebase (4:2.0-20000912-0) unstable; urgency=low kdebase (4:2.0-20000910-2) unstable; urgency=low * Fixing Debian menu graphic problem - * More cleanup of kdm settings + * More cleanup of tdm settings * More dependency fixes -- Ivan E. Moore II <rkrusty@debian.org> Sun, 10 Sep 2000 23:00:00 -0700 kdebase (4:2.0-20000910-0) unstable; urgency=low - * Changing kdm banner graphic to be the Debian swirl + * Changing tdm banner graphic to be the Debian swirl * Fixing start script so that kde actually starts with the desktop functional. (sorry) @@ -4663,7 +4663,7 @@ kdebase (4:2.0-20000910-0) unstable; urgency=low kdebase (4:2.0-20000909-0) unstable; urgency=low * More upstream updates - * More kdm cleanup (star'd password option added) + * More tdm cleanup (star'd password option added) * Migrating binary-indep build pieces into their own area -- Ivan E. Moore II <rkrusty@debian.org> Sat, 09 Sep 2000 01:00:00 -0700 @@ -4693,9 +4693,9 @@ kdebase (4:2.0-20000901-0) unstable; urgency=low kdebase (4:2.0-20000825-0) unstable; urgency=low * New upstream fixes - * Updating kdm init script to match current xdm one - * Typo fixes in kdmrc - * Turning off xconsole by default for kdm + * Updating tdm init script to match current xdm one + * Typo fixes in tdmrc + * Turning off xconsole by default for tdm * Some work on menus -- Ivan E. Moore II <rkrusty@debian.org> Fri, 25 Aug 2000 21:30:00 -0700 @@ -4703,9 +4703,9 @@ kdebase (4:2.0-20000825-0) unstable; urgency=low kdebase (4:2.0-20000821-1.0) experimental; urgency=low * New upstream fixes - * changed xdm.options to kdm.options to seperate from xdm - * cleaned up pre/post scripts for kdm to handle proper upgrade from - kdm1. Forcing a restart (if possible and without killing the upgrade) + * changed xdm.options to tdm.options to seperate from xdm + * cleaned up pre/post scripts for tdm to handle proper upgrade from + tdm1. Forcing a restart (if possible and without killing the upgrade) during an upgrade. -- Ivan E. Moore II <rkrusty@debian.org> Mon, 21 Aug 2000 22:45:00 -0700 @@ -4727,7 +4727,7 @@ kdebase-cvs (4:2.0-20000521-1.0) experimental; urgency=low * Adding in a conflict for man2html since we provide it * Fixing ln issues with documentation * Fixing file permissions in CVS tree - * Fixing some kdm issues + * Fixing some tdm issues * Changing suggest to depend for kde-i18n since some documentation, etc resides in that package now. (including english) @@ -4755,9 +4755,9 @@ kdebase-cvs (4:2.0-20000306-1.1) experimental; urgency=low kdebase-cvs (4:2.0-20000302-1.0) experimental; urgency=low * New upstream CVS fixes - * Migrating chooser over to kdm-cvs package - * Updating kdm config files to match current versions of xdm - * Fixing kdm init.d scripts to handle now missing parser script + * Migrating chooser over to tdm-cvs package + * Updating tdm config files to match current versions of xdm + * Fixing tdm init.d scripts to handle now missing parser script * Fixing kicker applet issues (required -dev to be installed to work) -- Ivan E. Moore II <rkrusty@debian.org> Thu, 02 Mar 2000 22:00:00 -0700 @@ -4773,7 +4773,7 @@ kdebase-cvs (4:2.0-20000223-1.0) experimental; urgency=low * New upstream CVS fixes * Fixing pathing for kde help files - * Adding in md5 options to pam.d file for kdm + * Adding in md5 options to pam.d file for tdm -- Ivan E. Moore II <rkrusty@debian.org> Wed, 23 Feb 2000 22:00:36 -0700 @@ -4833,7 +4833,7 @@ kdebase-cvs (4:2.0-19990825-1) experimental; urgency=low kdebase-cvs (4:2.0-19990823-1) experimental; urgency=low * New upstream CVS changes - * Fixes bug with init.d script for kdm2 + * Fixes bug with init.d script for tdm2 -- Ivan E. Moore II <rkrusty@debian.org> Mon, 23 Aug 1999 07:00:56 -0400 @@ -4877,12 +4877,12 @@ kdebase-cvs (4:2.0-19990601-1) experimental; urgency=low kdebase-cvs (4:2.0-19990531-1) experimental; urgency=low - * Making kdm not require xdm + * Making tdm not require xdm * Fixing some pam stuff which includes a /etc/pam.d/kde file, making the pam name=kde so that it uses the /etc/pam.d/kde file instead of - xdm, kdm, or whatever. + xdm, tdm, or whatever. * Fixing the linux fonts for konsole. - * Fixing the /var/state/kdm issue + * Fixing the /var/state/tdm issue -- Ivan E. Moore II <rkrusty@debian.org> Mon, 31 May 1999 19:30:29 -0400 @@ -4940,7 +4940,7 @@ kdebase (4:1.1-19990217-1) unstable; urgency=low kdebase (4:1.1-19990214-2) unstable; urgency=low * move the link from /var/ to /usr, since /usr may be read only - * patch Xserver_0 to run kdmgreeter if kdm runs + * patch Xserver_0 to run tdmgreeter if tdm runs -- Stephan Kulow <coolo@kde.org> Tue, 16 Feb 1999 18:52:03 +0100 @@ -4952,7 +4952,7 @@ kdebase (4:1.1-19990214-1) unstable; urgency=low kdebase (4:1.1-19990207-3) unstable; urgency=low - * new kdmrc handling + * new tdmrc handling -- Stephan Kulow <coolo@kde.org> Fri, 12 Feb 1999 11:03:56 +0100 @@ -4990,7 +4990,7 @@ kdebase (2:980312-5) unstable; urgency=low kdebase (2:980312-4) frozen; urgency=low * added undocumented man page - * renamed kdmconfig to switchdm. This name existed twice + * renamed tdmconfig to switchdm. This name existed twice * new compile with latest kdelibs shlibs -- Stephan Kulow <coolo@kde.org> Tue, 31 Mar 1998 20:26:23 +0200 @@ -5001,7 +5001,7 @@ kdebase (2:980312-3) unstable; urgency=low * changed the directory for debian apps to /var/spool/applnk * set the correct UTMP file * test prefix() before removing it. This should avoid a rm -rf /, when possible - * new kdm (with bugfixes and new location for configuration files) + * new tdm (with bugfixes and new location for configuration files) -- Stephan Kulow <coolo@kde.org> Fri, 27 Mar 1998 16:07:37 +0100 diff --git a/ubuntu/maverick_automake/kdebase/debian/control b/ubuntu/maverick_automake/kdebase/debian/control index f2fe71262..dfae80fa1 100644 --- a/ubuntu/maverick_automake/kdebase/debian/control +++ b/ubuntu/maverick_automake/kdebase/debian/control @@ -13,7 +13,7 @@ Package: kdebase-kde3 Section: kde Architecture: all Depends: kappfinder-kde3 (>= ${Source-Version}), kate-kde3 (>= ${Source-Version}), kcontrol-kde3 (>= ${Source-Version}), kdebase-kde3-bin (>= ${Source-Version}), kdebase-data-kde3 (>= ${Source-Version}), kdebase-kio-plugins-kde3 (>= ${Source-Version}), kdepasswd-kde3 (>= ${Source-Version}), kdeprint-kde3 (>= ${Source-Version}), kdesktop-kde3 (>= ${Source-Version}), kfind-kde3 (>= ${Source-Version}), khelpcenter-kde3 (>= ${Source-Version}), kicker-kde3 (>= ${Source-Version}), klipper-kde3 (>= ${Source-Version}), kmenuedit-kde3 (>= ${Source-Version}), konqueror-nsplugins-kde3 (>= ${Source-Version}), konqueror-kde3 (>= ${Source-Version}), konsole-kde3 (>= ${Source-Version}), kpager-kde3 (>= ${Source-Version}), kpersonalizer-kde3 (>= ${Source-Version}), ksmserver-kde3 (>= ${Source-Version}), ksplash-kde3 (>= ${Source-Version}), ksysguard-kde3 (>= ${Source-Version}), ktip-kde3 (>= ${Source-Version}), kwin-kde3 (>= ${Source-Version}), libkonq4-kde3 (>= ${Source-Version}), hal-kde3 | kfreebsd-gnu | hurd, xcalib -Recommends: kdm-kde3 (>= ${Source-Version}), kdebase-runtime-data-common-kde3 +Recommends: tdm-kde3 (>= ${Source-Version}), kdebase-runtime-data-common-kde3 Suggests: kdebase-kde3-doc-html (>= ${Source-Version}) Description: base components from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -105,8 +105,8 @@ Section: kde Architecture: any Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14) Suggests: khelpcenter-kde3, gdb -Conflicts: kdebase-libs-kde3 (<< 4:3.0.0), kdm-kde3 (<< 4:3.4.1-2), kdebase-workspace-data-kde3 (<< 7:3.5.0) -Replaces: kcontrol-kde3 (<< 4:3.3.0), kdebase-kde3 (<< 4:3.0.0), kdebase-kde3-doc (<< 4:3.0.0), kdebase-libs-kde3 (<< 4:3.0.0), kscreensaver-kde3 (<< 4:3.0.0), kdm-kde3 (= 4:3.3.2-1b) +Conflicts: kdebase-libs-kde3 (<< 4:3.0.0), tdm-kde3 (<< 4:3.4.1-2), kdebase-workspace-data-kde3 (<< 7:3.5.0) +Replaces: kcontrol-kde3 (<< 4:3.3.0), kdebase-kde3 (<< 4:3.0.0), kdebase-kde3-doc (<< 4:3.0.0), kdebase-libs-kde3 (<< 4:3.0.0), kscreensaver-kde3 (<< 4:3.0.0), tdm-kde3 (= 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. @@ -230,7 +230,7 @@ Description: miscellaneous binaries and files for the KDE desktop This package is part of KDE, and a component of the KDE base module. See the 'kde-kde3' and 'kdebase-kde3' packages for more information. -Package: kdm-kde3 +Package: tdm-kde3 Section: kde Architecture: any Depends: ${shlibs:Depends}, kdebase-kde3-bin (= ${Source-Version}), kdebase-data-kde3 (>> ${KDE-Version3}), kdebase-data-kde3 (<< ${KDE-Next-Version3}), debconf (>= 1.2.9) | debconf-2.0, libpam-runtime (>= 0.76-14), xbase-clients @@ -238,10 +238,10 @@ Recommends: logrotate, xserver-xorg Suggests: khelpcenter-kde3, ksmserver-kde3 (= ${Source-Version}), kdepasswd-kde3 (= ${Source-Version}), menu Provides: x-display-manager Description: X display manager for KDE - kdm manages a collection of X servers, which may be on the local host or + tdm manages a collection of X servers, which may be on the local host or remote machines. It provides services similar to those provided by init, getty, and login on character-based terminals: prompting for login name and - password, authenticating the user, and running a session. kdm supports XDMCP + password, authenticating the user, and running a session. tdm supports XDMCP (X Display Manager Control Protocol) and can also be used to run a chooser process which presents the user with a menu of possible hosts that offer XDMCP display management. @@ -249,8 +249,8 @@ Description: X display manager for KDE A collection of icons to associate with individual users is included with KDE, but as part of the kdepasswd package. . - The menu package will help to provide KDM with a list of window managers - that can be launched, if the window manager does not register with KDM + The menu package will help to provide TDM with a list of window managers + that can be launched, if the window manager does not register with TDM already. Most users won't need this. . This package is part of KDE, and a component of the KDE base module. diff --git a/ubuntu/maverick_automake/kdebase/debian/control.in b/ubuntu/maverick_automake/kdebase/debian/control.in index 62116ce88..61d7197f8 100644 --- a/ubuntu/maverick_automake/kdebase/debian/control.in +++ b/ubuntu/maverick_automake/kdebase/debian/control.in @@ -14,7 +14,7 @@ Package: kdebase Section: kde Architecture: all Depends: kappfinder (>= ${Source-Version}), kate (>= ${Source-Version}), kcontrol (>= ${Source-Version}), kdebase-bin (>= ${Source-Version}), kdebase-data (>= ${Source-Version}), kdebase-kio-plugins (>= ${Source-Version}), kdepasswd (>= ${Source-Version}), kdeprint (>= ${Source-Version}), kdesktop (>= ${Source-Version}), kfind (>= ${Source-Version}), khelpcenter (>= ${Source-Version}), kicker (>= ${Source-Version}), klipper (>= ${Source-Version}), kmenuedit (>= ${Source-Version}), konqueror-nsplugins (>= ${Source-Version}), konqueror (>= ${Source-Version}), konsole (>= ${Source-Version}), kpager (>= ${Source-Version}), kpersonalizer (>= ${Source-Version}), ksmserver (>= ${Source-Version}), ksplash (>= ${Source-Version}), ksysguard (>= ${Source-Version}), ktip (>= ${Source-Version}), kwin (>= ${Source-Version}), libkonq4 (>= ${Source-Version}), hal | kfreebsd-gnu | hurd, pmount | kfreebsd-gnu | hurd -Recommends: kdm (>= ${Source-Version}) +Recommends: tdm (>= ${Source-Version}) Suggests: kdebase-doc-html (>= ${Source-Version}) Description: base components from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -97,8 +97,8 @@ Section: kde Architecture: any Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14) Suggests: khelpcenter, gdb -Conflicts: kdebase-libs (<< 4:3.0.0), kdm (<< 4:3.4.1-2) -Replaces: kcontrol (<< 4:3.3.0), kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0), kscreensaver (<< 4:3.0.0), kdm (= 4:3.3.2-1b) +Conflicts: kdebase-libs (<< 4:3.0.0), tdm (<< 4:3.4.1-2) +Replaces: kcontrol (<< 4:3.3.0), kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0), kscreensaver (<< 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. @@ -222,7 +222,7 @@ Description: miscellaneous binaries and files for the KDE desktop This package is part of KDE, and a component of the KDE base module. See the 'kde' and 'kdebase' packages for more information. -Package: kdm +Package: tdm Section: kde Architecture: any Depends: ${shlibs:Depends}, kdebase-bin (= ${Source-Version}), kdebase-data (>> ${KDE-Version3}), kdebase-data (<< ${KDE-Next-Version3}), debconf (>= 1.2.9) | debconf-2.0, libpam-runtime (>= 0.76-14), xbase-clients @@ -230,10 +230,10 @@ Recommends: logrotate, xserver-xorg Suggests: khelpcenter, ksmserver (= ${Source-Version}), kdepasswd (= ${Source-Version}), menu Provides: x-display-manager Description: X display manager for KDE - kdm manages a collection of X servers, which may be on the local host or + tdm manages a collection of X servers, which may be on the local host or remote machines. It provides services similar to those provided by init, getty, and login on character-based terminals: prompting for login name and - password, authenticating the user, and running a session. kdm supports XDMCP + password, authenticating the user, and running a session. tdm supports XDMCP (X Display Manager Control Protocol) and can also be used to run a chooser process which presents the user with a menu of possible hosts that offer XDMCP display management. @@ -241,8 +241,8 @@ Description: X display manager for KDE A collection of icons to associate with individual users is included with KDE, but as part of the kdepasswd package. . - The menu package will help to provide KDM with a list of window managers - that can be launched, if the window manager does not register with KDM + The menu package will help to provide TDM with a list of window managers + that can be launched, if the window manager does not register with TDM already. Most users won't need this. . This package is part of KDE, and a component of the KDE base module. diff --git a/ubuntu/maverick_automake/kdebase/debian/copyright b/ubuntu/maverick_automake/kdebase/debian/copyright index 8e0933735..721e1fd93 100644 --- a/ubuntu/maverick_automake/kdebase/debian/copyright +++ b/ubuntu/maverick_automake/kdebase/debian/copyright @@ -24,7 +24,7 @@ drkonqi, kaddressbook, kicker, ksmserver, ksplash, kwin, legacyimport GPL --- -kappfinder, kate, kcheckpass, kdeprint, kdm, kfind, khelpcenter, kmenuedit, +kappfinder, kate, kcheckpass, kdeprint, tdm, kfind, khelpcenter, kmenuedit, konqueror, konsole, kpager, kpersonalizer, kreadconfig, kstart, ksysguard, ktip LGPL diff --git a/ubuntu/maverick_automake/kdebase/debian/img/medialuks/cr128-device-compact_flash_unmount_encrypt.png.uu b/ubuntu/maverick_automake/kdebase/debian/img/medialuks/cr128-device-compact_flash_unmount_encrypt.png.uu index 1bcc196b8..99b1e61f2 100644 --- a/ubuntu/maverick_automake/kdebase/debian/img/medialuks/cr128-device-compact_flash_unmount_encrypt.png.uu +++ b/ubuntu/maverick_automake/kdebase/debian/img/medialuks/cr128-device-compact_flash_unmount_encrypt.png.uu @@ -205,7 +205,7 @@ MU?^>>^ZYYYY[9$)56T>^W(PM6[9LV;(E<.+$B1,G3LCK]_3ITZ=/GY8C!BGK M%/CHHX\^^N@CV4BIM`EX5Q8:/YY^Q5=I,78/LG>@Z>!/"8!T^>CHCAT[=NS8 M<?%B>L`E2W@:>(*(L^;FT@X?&DJ$[]EMS7NB?>GR:A]&[7ALK,%@-@/WWY^2 MLG\_,&A0>'A^/A$<[92-V]D;J^LK2V#Q3B\GN]2=]FH_K=D?N`TH'(W]2:\# -MKDM#2M+6`=%2RATM$X#8RUM<$Y\"1$1$1(2$R"*U9^U`LYEVT(H*(._@Z:0S +MTDM#2M+6`=%2RATM$X#8RUM<$Y\"1$1$1(2$R"*U9^U`LYEVT(H*(._@Z:0S M1X'\_J?&9+\*N(<777?T32!FG37@]R>!V,>EBLSG`'-^2.?T9P%L&/W@BSN` MSN^.N/W&54#4%5%=HHWRCFB\W'BY\7*@RE9EJ[(!$"#@*\#O<K_+C>,!;8HV M17LUX+C/<9_3#W!&."/<^P"WP^T0!P+N%NX68K!<HHL9&1OKF`#,9K/9:@4L diff --git a/ubuntu/maverick_automake/kdebase/debian/img/medialuks/cr128-device-sd_mmc_unmount_encrypt.png.uu b/ubuntu/maverick_automake/kdebase/debian/img/medialuks/cr128-device-sd_mmc_unmount_encrypt.png.uu index 53ba3286d..edc1cc809 100644 --- a/ubuntu/maverick_automake/kdebase/debian/img/medialuks/cr128-device-sd_mmc_unmount_encrypt.png.uu +++ b/ubuntu/maverick_automake/kdebase/debian/img/medialuks/cr128-device-sd_mmc_unmount_encrypt.png.uu @@ -226,7 +226,7 @@ M9`ANV!`;F<4P#*/7&PP\7UY.0H>!Y.2DI-@TV5,UUX\')5B;P2S@%:#SM,XW MI"9KA"%)FI&/&,_J;VM3!8V05!60_R'_`P#D#<H8;`#4>_`]`T`=ITYA[@68 ME<Q*YDD`*[&2>2JF;2&:96@_*@HV`-($>9BBT^Y+5>G:?%HD'BWB6;\E*C=M ME1_5*>K3`%:B`V,$]/.%BYBW@58_'6BM1("L^ZKN4G8!NGNY=.9SH"'!UR?H -MA@1?GS'$,HC8XS3(IU4KDMY-02,S#0:3R6QNJ.%8K293UZXC1@!DF39R5E86 +MA@1?GS'$,HC8XS3(IU4TDMY-02,S#0:3R6QNJ.%8K293UZXC1@!DF39R5E86 M:6-C64\OG+8,@(+4?*NO"=!BD`QS_ODLRW$,$XFDI!`_>DMQLC0#:O4VWFNZ M5S<-8/R,GXEJ12EC";^^U5\C?,H(ZA6S'*9V4#L`>%A]&`#41:K*C`70%FV8 MV0!N0[TY/VV/%\.3OY&^EGV`^J.Z#NLUB5C?I*DMEJK=?_WG^T-OZ*W\QLP% diff --git a/ubuntu/maverick_automake/kdebase/debian/img/medialuks/cr128-device-usbpendrive_unmount_encrypt.png.uu b/ubuntu/maverick_automake/kdebase/debian/img/medialuks/cr128-device-usbpendrive_unmount_encrypt.png.uu index 95cd850b0..b989c74df 100644 --- a/ubuntu/maverick_automake/kdebase/debian/img/medialuks/cr128-device-usbpendrive_unmount_encrypt.png.uu +++ b/ubuntu/maverick_automake/kdebase/debian/img/medialuks/cr128-device-usbpendrive_unmount_encrypt.png.uu @@ -301,7 +301,7 @@ MZ`\>/'"@ID8I:LH:G]QQQQUW7'ZYDCQ%])>_D&T@+^_LW7G7I#KY2Q!16N6. M'?2@[[Q#$V+.G)T[=^TZ?)AJNA45`11;U[F99R3O;J^O'.MY"]!=[4)&1J/! M0`+7NQJ'L050V-58]N'6K=NV554!%17EY7EYM$)$QN;+T^2IF`9P5:)+/%^Y M3FSY;V;E9X(?VW69V3)"5\A3Y#%`:)[\,1\",%$8J&X'PL.$%,U'@-2FOD-S -M!<`]J59IC@+B<,&BK@?\YW$K>"<@NR@KDM5B8(5;`P%ZLF"0M5/_+K;>(EOY +M!<`]J59IC@+B<,&BK@?\YW$K>"<@NR@TDM5B8(5;`P%ZLF"0M5/_+K;>(EOY M?$#:P6TP)`*N]P2]IAH(5$O[<#^@&A0.AP<H]\L$WN?S^7P^Q3VHT5!1U=C< M!?%IZ6GI:4!Z4GR:TP#2'"E#\@!2H50J^0%YC;Q!?@O`Y9B*A-,G$"83N0'3 MTM+367-<:O22D9&:"J2F4E?DV/MGE)9&G]]VVVVW77()\/CCCS_^VFL&`P'Z diff --git a/ubuntu/maverick_automake/kdebase/debian/kcontrol-kde3.install b/ubuntu/maverick_automake/kdebase/debian/kcontrol-kde3.install index bce0878ab..cb7900105 100644 --- a/ubuntu/maverick_automake/kdebase/debian/kcontrol-kde3.install +++ b/ubuntu/maverick_automake/kdebase/debian/kcontrol-kde3.install @@ -52,8 +52,8 @@ debian/tmp/opt/kde3/lib/kde3/kcm_joystick.la debian/tmp/opt/kde3/lib/kde3/kcm_joystick.so debian/tmp/opt/kde3/lib/kde3/kcm_kded.la debian/tmp/opt/kde3/lib/kde3/kcm_kded.so -debian/tmp/opt/kde3/lib/kde3/kcm_kdm.la -debian/tmp/opt/kde3/lib/kde3/kcm_kdm.so +debian/tmp/opt/kde3/lib/kde3/kcm_tdm.la +debian/tmp/opt/kde3/lib/kde3/kcm_tdm.so debian/tmp/opt/kde3/lib/kde3/kcm_kdnssd.so debian/tmp/opt/kde3/lib/kde3/kcm_kdnssd.la debian/tmp/opt/kde3/lib/kde3/kcm_keys.la @@ -165,7 +165,7 @@ debian/tmp/opt/kde3/share/applications/kde/kcmtaskbar.desktop debian/tmp/opt/kde3/share/applications/kde/kcmusb.desktop debian/tmp/opt/kde3/share/applications/kde/kcmview1394.desktop debian/tmp/opt/kde3/share/applications/kde/KControl.desktop -debian/tmp/opt/kde3/share/applications/kde/kdm.desktop +debian/tmp/opt/kde3/share/applications/kde/tdm.desktop debian/tmp/opt/kde3/share/applications/kde/keys.desktop debian/tmp/opt/kde3/share/applications/kde/kfontview.desktop debian/tmp/opt/kde3/share/applications/kde/khtml_behavior.desktop diff --git a/ubuntu/maverick_automake/kdebase/debian/kdebase-data-kde3.install b/ubuntu/maverick_automake/kdebase/debian/kdebase-data-kde3.install index 820a63da9..d6dc0841f 100644 --- a/ubuntu/maverick_automake/kdebase/debian/kdebase-data-kde3.install +++ b/ubuntu/maverick_automake/kdebase/debian/kdebase-data-kde3.install @@ -202,9 +202,9 @@ debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/kcmstyle/index.docbook debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/kcmtaskbar/common debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/kcmtaskbar/index.cache.bz2 debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/kcmtaskbar/index.docbook -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/kdm/common -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/kdm/index.cache.bz2 -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/kdm/index.docbook +debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/tdm/common +debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/tdm/index.cache.bz2 +debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/tdm/index.docbook debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/keyboard/common debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/keyboard/index.cache.bz2 debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/keyboard/index.docbook @@ -342,7 +342,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/kcmmemory.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/kcmpartitions.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/kcmpci.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/kcontrol.png -debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/kdmconfig.png +debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/tdmconfig.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/key_bindings.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/kfm_home.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/kscreensaver.png @@ -443,7 +443,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/kcmsound.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/kcmsystem.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/kcmx.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/kcontrol.png -debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/kdmconfig.png +debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/tdmconfig.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/key_bindings.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/keyboard_layout.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/keyboard.png @@ -548,7 +548,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/kcmdevices.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/kcmkicker.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/kcmkwm.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/kcmx.png -debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/kdmconfig.png +debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/tdmconfig.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/key_bindings.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/keyboard.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/kscreensaver.png @@ -630,7 +630,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/kcmsound.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/kcmsystem.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/kcmx.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/kcontrol.png -debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/kdmconfig.png +debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/tdmconfig.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/key_bindings.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/keyboard_layout.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/keyboard.png @@ -774,7 +774,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/kcmscsi.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/kcmsystem.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/kcmx.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/kcontrol.png -debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/kdmconfig.png +debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/tdmconfig.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/key_bindings.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/keyboard_layout.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/keyboard.png @@ -872,7 +872,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/kcmpartitions.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/kcmpci.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/kcmx.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/kcontrol.png -debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/kdmconfig.png +debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/tdmconfig.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/key_bindings.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/kfm_home.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/knotify.png diff --git a/ubuntu/maverick_automake/kdebase/debian/kdebase-doc-html.doc-base.kdm b/ubuntu/maverick_automake/kdebase/debian/kdebase-doc-html.doc-base.kdm deleted file mode 100644 index 759e6ea04..000000000 --- a/ubuntu/maverick_automake/kdebase/debian/kdebase-doc-html.doc-base.kdm +++ /dev/null @@ -1,10 +0,0 @@ -Document: kdebase-doc-html-kdm -Title: KDM Handbook -Author: Oswald Buddenhagen -Abstract: This document describes KDM, the KDE Display Manager, an X session manager. -Section: System - -Format: HTML -Index: /opt/kde3/share/doc/kde/HTML/en/kdm/index.html -Files: /opt/kde3/share/doc/kde/HTML/en/kdm/*.html - diff --git a/ubuntu/maverick_automake/kdebase/debian/kdebase-doc-html.doc-base.tdm b/ubuntu/maverick_automake/kdebase/debian/kdebase-doc-html.doc-base.tdm new file mode 100644 index 000000000..b2fae568e --- /dev/null +++ b/ubuntu/maverick_automake/kdebase/debian/kdebase-doc-html.doc-base.tdm @@ -0,0 +1,10 @@ +Document: kdebase-doc-html-tdm +Title: TDM Handbook +Author: Oswald Buddenhagen +Abstract: This document describes TDM, the KDE Display Manager, an X session manager. +Section: System + +Format: HTML +Index: /opt/kde3/share/doc/kde/HTML/en/tdm/index.html +Files: /opt/kde3/share/doc/kde/HTML/en/tdm/*.html + diff --git a/ubuntu/maverick_automake/kdebase/debian/kdebase-kde3.README.Debian b/ubuntu/maverick_automake/kdebase/debian/kdebase-kde3.README.Debian index d225a3b34..f8dba94d8 100644 --- a/ubuntu/maverick_automake/kdebase/debian/kdebase-kde3.README.Debian +++ b/ubuntu/maverick_automake/kdebase/debian/kdebase-kde3.README.Debian @@ -1,7 +1,7 @@ Kdm === -For notes on kdm, read: /opt/kde3/share/doc/kdm/README.Debian +For notes on tdm, read: /opt/kde3/share/doc/tdm/README.Debian KDE and media kioslave support diff --git a/ubuntu/maverick_automake/kdebase/debian/kdepasswd-kde3.install b/ubuntu/maverick_automake/kdebase/debian/kdepasswd-kde3.install index 977b01e59..8e5e2315b 100644 --- a/ubuntu/maverick_automake/kdebase/debian/kdepasswd-kde3.install +++ b/ubuntu/maverick_automake/kdebase/debian/kdepasswd-kde3.install @@ -3,33 +3,33 @@ debian/tmp/opt/kde3/lib/kde3/kcm_useraccount.la debian/tmp/opt/kde3/lib/kde3/kcm_useraccount.so debian/tmp/opt/kde3/share/applications/kde/kcm_useraccount.desktop debian/tmp/opt/kde3/share/applications/kde/kdepasswd.desktop -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Apple.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/BeachBall.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Blowfish.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Bug.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Butterfly.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Car.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Cow.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Daemon.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Dog.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Elephant.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Flower.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Frog.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Ghost.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Guitar.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Heart.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Konqui.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Lion.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Monkey.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Penguin.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Pig.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Rabbit.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Ring.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Scream.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Shark.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Splash.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Star.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Teddybear.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/Turtle.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Apple.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/BeachBall.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Blowfish.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Bug.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Butterfly.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Car.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Cow.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Daemon.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Dog.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Elephant.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Flower.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Frog.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Ghost.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Guitar.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Heart.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Konqui.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Lion.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Monkey.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Penguin.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Pig.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Rabbit.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Ring.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Scream.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Shark.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Splash.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Star.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Teddybear.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/Turtle.png debian/tmp/opt/kde3/share/config.kcfg/kcm_useraccount.kcfg debian/tmp/opt/kde3/share/config.kcfg/kcm_useraccount_pass.kcfg diff --git a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.dirs b/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.dirs deleted file mode 100644 index aaf81895f..000000000 --- a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.dirs +++ /dev/null @@ -1,2 +0,0 @@ -etc/default/kdm-kde3.d -var/lib/kdm-kde3 diff --git a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.install b/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.install deleted file mode 100644 index ca77735d7..000000000 --- a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.install +++ /dev/null @@ -1,52 +0,0 @@ -debian/local/kdm.options etc/kde3/kdm/ -debian/tmp/etc/kde3/kdm/kdmrc -debian/tmp/etc/kde3/kdm/Xaccess -debian/tmp/etc/kde3/kdm/Xreset -debian/tmp/etc/kde3/kdm/Xsession -debian/tmp/etc/kde3/kdm/Xsetup -debian/tmp/etc/kde3/kdm/Xstartup -debian/tmp/etc/kde3/kdm/Xwilling -debian/tmp/opt/kde3/bin/genkdmconf -debian/tmp/opt/kde3/bin/kdm -debian/tmp/opt/kde3/bin/kdm_config -debian/tmp/opt/kde3/bin/kdmctl -debian/tmp/opt/kde3/bin/kdm_greet -debian/tmp/opt/kde3/bin/krootimage -debian/tmp/opt/kde3/share/apps/kdm/pics/kdelogo-crystal.png -debian/tmp/opt/kde3/share/apps/kdm/pics/kdelogo.png -debian/tmp/opt/kde3/share/apps/kdm/pics/shutdown.jpg -debian/tmp/opt/kde3/share/apps/kdm/pics/users/default1.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/default2.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/default3.png -debian/tmp/opt/kde3/share/apps/kdm/pics/users/root1.png -debian/tmp/opt/kde3/share/apps/kdm/sessions/9wm.desktop -debian/tmp/opt/kde3/share/apps/kdm/sessions/aewm.desktop -debian/tmp/opt/kde3/share/apps/kdm/sessions/amaterus.desktop -debian/tmp/opt/kde3/share/apps/kdm/sessions/asclassic.desktop -debian/tmp/opt/kde3/share/apps/kdm/sessions/ctwm.desktop -debian/tmp/opt/kde3/share/apps/kdm/sessions/evilwm.desktop -debian/tmp/opt/kde3/share/apps/kdm/sessions/flwm.desktop -debian/tmp/opt/kde3/share/apps/kdm/sessions/lwm.desktop -debian/tmp/opt/kde3/share/apps/kdm/sessions/matchbox.desktop -debian/tmp/opt/kde3/share/apps/kdm/sessions/mwm.desktop -debian/tmp/opt/kde3/share/apps/kdm/sessions/olvwm.desktop -debian/tmp/opt/kde3/share/apps/kdm/sessions/olwm.desktop -debian/tmp/opt/kde3/share/apps/kdm/sessions/oroborus.desktop -debian/tmp/opt/kde3/share/apps/kdm/sessions/pwm.desktop -debian/tmp/opt/kde3/share/apps/kdm/sessions/twm.desktop -debian/tmp/opt/kde3/share/apps/kdm/sessions/ude.desktop -debian/tmp/opt/kde3/share/apps/kdm/sessions/vtwm.desktop -debian/tmp/opt/kde3/share/apps/kdm/sessions/wm2.desktop -debian/tmp/opt/kde3/share/apps/kdm/themes/circles/background.svg -debian/tmp/opt/kde3/share/apps/kdm/themes/circles/circles.xml -debian/tmp/opt/kde3/share/apps/kdm/themes/circles/flower.png -debian/tmp/opt/kde3/share/apps/kdm/themes/circles/GdmGreeterTheme.desktop -debian/tmp/opt/kde3/share/apps/kdm/themes/circles/help.png -debian/tmp/opt/kde3/share/apps/kdm/themes/circles/options.png -debian/tmp/opt/kde3/share/apps/kdm/themes/circles/screenshot.png -debian/tmp/opt/kde3/share/apps/kdm/themes/o2_enterprise -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kdm/common -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kdm/index.cache.bz2 -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kdm/index.docbook -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kdm/kdmrc-ref.docbook -debian/tmp/opt/kde3/share/doc/kdm/README diff --git a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.links b/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.links deleted file mode 100644 index 1a3c396b9..000000000 --- a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.links +++ /dev/null @@ -1 +0,0 @@ -opt/kde3/share/apps/kdm/pics/users/default1.png opt/kde3/share/apps/kdm/faces/.default.face diff --git a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.manpages b/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.manpages deleted file mode 100644 index a071eaabb..000000000 --- a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.manpages +++ /dev/null @@ -1,6 +0,0 @@ -debian/man/genkdmconf-kde3.1 -debian/man/kdm-kde3.1 -debian/man/kdm_config-kde3.1 -debian/man/kdmctl-kde3.1 -debian/man/kdm_greet-kde3.1 -debian/man/krootimage-kde3.1 diff --git a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.preinst b/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.preinst deleted file mode 100644 index 636c7d840..000000000 --- a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.preinst +++ /dev/null @@ -1,29 +0,0 @@ -#! /bin/sh -e - -case "$1" in - - upgrade) - rm -f /etc/kde3/debian/kdm-update-menu.sh - rm -f /etc/kde3/debian/kdm.options - rm -f /etc/kde3/kdm/pixmaps/XFree86bw.xpm - rm -f /etc/kde3/kdm/pixmaps/XFree86.xpm - rm -f /etc/kde3/kdm/Xresources - rm -f /etc/menu-methods/kdm - ;; - - install) - ;; - - abort-upgrade) - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; - -esac - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/maverick_automake/kdebase/debian/local/kdm.options b/ubuntu/maverick_automake/kdebase/debian/local/kdm.options deleted file mode 100644 index 5d8bbb624..000000000 --- a/ubuntu/maverick_automake/kdebase/debian/local/kdm.options +++ /dev/null @@ -1,8 +0,0 @@ -# /etc/kde3/kdm/kdm.options -# -# configuration options for kdm -# See kdm.options(5) for an explanation of the available options. - -no-ignore-nologin -no-restart-on-upgrade -use-sessreg diff --git a/ubuntu/maverick_automake/kdebase/debian/local/tdm.options b/ubuntu/maverick_automake/kdebase/debian/local/tdm.options new file mode 100644 index 000000000..2993b7f09 --- /dev/null +++ b/ubuntu/maverick_automake/kdebase/debian/local/tdm.options @@ -0,0 +1,8 @@ +# /etc/kde3/tdm/tdm.options +# +# configuration options for tdm +# See tdm.options(5) for an explanation of the available options. + +no-ignore-nologin +no-restart-on-upgrade +use-sessreg diff --git a/ubuntu/lucid_automake/kdebase/debian/local/kdm.options.5 b/ubuntu/maverick_automake/kdebase/debian/local/tdm.options.5 index 1b235c2ce..36189b00a 100644 --- a/ubuntu/lucid_automake/kdebase/debian/local/kdm.options.5 +++ b/ubuntu/maverick_automake/kdebase/debian/local/tdm.options.5 @@ -1,4 +1,4 @@ -.\" $Id: kdm.options.5,v 1.2 2004/02/27 22:45:20 ccheney Exp $ +.\" $Id: tdm.options.5,v 1.2 2004/02/27 22:45:20 ccheney Exp $ .\" .\" Copyright 1998, 2002, 2003 Branden Robinson <branden@debian.org>. .\" @@ -15,16 +15,16 @@ .\" the Debian operating system, in /usr/share/common-licenses/GPL; if .\" not, write to the Free Software Foundation, Inc., 59 Temple Place, .\" Suite 330, Boston, MA 02111-1307 USA -.TH kdm.options 5 "2003\-09\-18" "Debian Project" +.TH tdm.options 5 "2003\-09\-18" "Debian Project" .SH NAME -kdm.options \- configuration options for X display manager +tdm.options \- configuration options for X display manager .SH DESCRIPTION -.I /etc/kde3/kdm/kdm.options +.I /etc/kde3/tdm/tdm.options contains a set of flags that determine some of the behavior of the X display manager -.BR kdm (1). +.BR tdm (1). .PP -.I /etc/kde3/kdm/kdm.options +.I /etc/kde3/tdm/tdm.options may contain comments, which begin with a hash mark and end at the next newline, just like comments in shell scripts. The rest of the file consists of options which are expressed as words separated by hyphens, with @@ -38,50 +38,50 @@ Normally, the contents of the /etc/nologin file will be displayed using .BR xmessage (1x) (if .B xmessage -is available), and the user will be returned to the kdm login screen after -the xmessage is dismissed. If this option is enabled, kdm starts a session +is available), and the user will be returned to the tdm login screen after +the xmessage is dismissed. If this option is enabled, tdm starts a session as usual (after the xmessage is dismissed, if xmessage is available). .TP .B restart\-on\-upgrade Enable this option with caution on \(oqproduction\(cq machines; it causes -the kdm daemon to be stopped and restarted on upgrade, even if the process +the tdm daemon to be stopped and restarted on upgrade, even if the process has children (which means it is managing X sessions). Typically when a package that contains a daemon is being installed or upgraded, its maintainer scripts stop a running daemon process before installing the new -binary, and restart it after the new binary is installed. Stopping kdm +binary, and restart it after the new binary is installed. Stopping tdm causes immediate termination of any sessions it manages; in some situations -this could be an unwelcome surprise (for instance, for remote kdm users who +this could be an unwelcome surprise (for instance, for remote tdm users who had no idea the administrator was performing system maintenance). On the other hand, for machines that stay up for long periods of time, leaving the old daemon running can be a bad idea if the new version has, for instance, -a fix for a security vulnerability (overwriting kdm's executable on the -file system has no effect on the copy of kdm in memory). The kdm -pre\-removal script checks to see if the kdm process has any children; if +a fix for a security vulnerability (overwriting tdm's executable on the +file system has no effect on the copy of tdm in memory). The tdm +pre\-removal script checks to see if the tdm process has any children; if it does, it is possible that someone's session would be killed by stopping -kdm, so a warning is issued and an opportunity to abort the upgrade of kdm -is provided. If this option is disabled (the Debian default), kdm will be +tdm, so a warning is issued and an opportunity to abort the upgrade of tdm +is provided. If this option is disabled (the Debian default), tdm will be not be stopped or started during an install or upgrade; the administrator -will have to do so by hand (with \(oq/etc/init.d/kdm restart\(cq, or by -rebooting the system) before the newly installed kdm binary is used. +will have to do so by hand (with \(oq/etc/init.d/tdm restart\(cq, or by +rebooting the system) before the newly installed tdm binary is used. .TP .B use\-sessreg If this option is enabled (the Debian default), the sessreg program will be -invoked to register X sessions managed by kdm in the utmp and wtmp files. +invoked to register X sessions managed by tdm in the utmp and wtmp files. Otherwise, it is not, and the utmp and wtmp files will have no record of -kdm sessions. +tdm sessions. .PP Users of older versions of the Debian system should note that the \(oqrun\-xconsole\(cq option has been removed. Shell scripts named -.I /etc/kde3/kdm/Xsetup +.I /etc/kde3/tdm/Xsetup and -.I /etc/kde3/kdm/Xreset -can be edited to disable or modify the running of xconsole on the kdm +.I /etc/kde3/tdm/Xreset +can be edited to disable or modify the running of xconsole on the tdm greeter screen; see the -.B kdm +.B tdm manual page for more information. .SH AUTHOR This manpage was written by Branden Robinson for the Debian Project. .SH SEE ALSO .BR sessreg (1x), .BR xmessage (1x), -.BR kdm (1x) +.BR tdm (1x) diff --git a/ubuntu/lucid_automake/kdebase/debian/man/genkdmconf-kde3.1 b/ubuntu/maverick_automake/kdebase/debian/man/gentdmconf-kde3.1 index e627bdaf0..fe759bed4 100644 --- a/ubuntu/lucid_automake/kdebase/debian/man/genkdmconf-kde3.1 +++ b/ubuntu/maverick_automake/kdebase/debian/man/gentdmconf-kde3.1 @@ -1,12 +1,12 @@ .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH GENKDMCONF 1 "June 2006" "K Desktop Environment" "generate configuration files for kdm" +.TH GENTDMCONF 1 "June 2006" "K Desktop Environment" "generate configuration files for tdm" .SH NAME -genkdmconf -\- generate configuration files for kdm +gentdmconf +\- generate configuration files for tdm .SH SYNOPSIS -\fBgenkdmconf\fP +\fBgentdmconf\fP .RB [ \-\-in -.IR /path/to/new/kdm\-config\-dir ] +.IR /path/to/new/tdm\-config\-dir ] .RS 11 .RB [ \-\-old\-xdm .IR /path/to/old/xdm\-dir ] @@ -27,49 +27,49 @@ genkdmconf .RE .SH DESCRIPTION -\fBgenkdmconf\fP is used to generate configuration files for \fBkdm\fP. +\fBgentdmconf\fP is used to generate configuration files for \fBtdm\fP. .br -If an older xdm/kdm configuration is found, its config files are "absorbed"; +If an older xdm/tdm configuration is found, its config files are "absorbed"; if it lives in the new target directory, its scripts are reused (and possibly modified) as well, otherwise the scripts are ignored and default scripts are installed. .SH OPTIONS .TP -.BI \-\-in \ /path/to/new/kdm\-config\-dir +.BI \-\-in \ /path/to/new/tdm\-config\-dir In which directory to put the new configuration. You can use this to support a $(DESTDIR), but not to change the final location of the installation \- the paths inside the files are not affected. .br -Default is \fI/etc/kde3/kdm\fP. +Default is \fI/etc/kde3/tdm\fP. .TP .BI \-\-old\-xdm \ /path/to/old/xdm\-dir -Where to look for the config files of an \fBxdm\fP / older \fBkdm\fP. Default is to scan -.IR /etc/X11/kdm , \ $XLIBDIR/kdm , \ /etc/X11/xdm , \ $XLIBDIR/xdm ; -there in turn look for \fIkdm\-config\fP and \fIxdm\-config\fP. +Where to look for the config files of an \fBxdm\fP / older \fBtdm\fP. Default is to scan +.IR /etc/X11/tdm , \ $XLIBDIR/tdm , \ /etc/X11/xdm , \ $XLIBDIR/xdm ; +there in turn look for \fItdm\-config\fP and \fIxdm\-config\fP. .br Note that you possibly need to use \fB\-\-no\-old\-kde\fP to make this take effect. .TP .BI \-\-old\-kde \ /path/to/old/kde\-config\-dir -Where to look for the \fIkdmrc\fP of an older \fBkdm\fP. +Where to look for the \fItdmrc\fP of an older \fBtdm\fP. .br .RI Default\ is\ to\ scan\ /etc/kde3 \ and\ { /usr,/usr/local , .RI { /opt,/usr/local }{ kde3,kde,kde2,kde1 }} /share/config . .TP .B \-\-no\-old -Don't look at older xdm/kdm configurations, just create default config. +Don't look at older xdm/tdm configurations, just create default config. .TP .B \-\-no\-old\-xdm Don't look at older xdm configurations. .TP .B \-\-no\-old\-kde -Don't look at older kdm configurations. +Don't look at older tdm configurations. .TP .B \-\-old\-scripts -Directly use all scripts from the older xdm/kdm configuration. +Directly use all scripts from the older xdm/tdm configuration. .TP .B \-\-no\-old\-scripts -Don't use scripts from the older xdm/kdm configuration even if it lives in the new target directory. +Don't use scripts from the older xdm/tdm configuration even if it lives in the new target directory. .TP .B \-\-old\-confs -Directly use all ancillary config files from the older xdm/kdm configuration. This is usually a bad idea. +Directly use all ancillary config files from the older xdm/tdm configuration. This is usually a bad idea. .TP .B \-\-no\-backup Overwrite/delete old config files instead of backing them up. @@ -77,7 +77,7 @@ Overwrite/delete old config files instead of backing them up. .B \-\-no\-in\-notice Don't put the notice about \fB\-\-in\fP being used into the generated README. .SH SEE ALSO -.BR kdm (1) +.BR tdm (1) .SH AUTHORS .nf Oswald Buddenhagen <ossi@kde.org> diff --git a/ubuntu/maverick_automake/kdebase/debian/man/krootimage-kde3.1 b/ubuntu/maverick_automake/kdebase/debian/man/krootimage-kde3.1 index 2b683c19e..66464cf62 100644 --- a/ubuntu/maverick_automake/kdebase/debian/man/krootimage-kde3.1 +++ b/ubuntu/maverick_automake/kdebase/debian/man/krootimage-kde3.1 @@ -2,11 +2,11 @@ .TH KROOTIMAGE 1 "June 2006" "K Desktop Environment" "helper program" .SH NAME krootimage -\- set desktop background for kdm +\- set desktop background for tdm .SH SYNOPSIS \fBkrootimage\fP [Qt\-options] [KDE\-options] config .SH DESCRIPTION -\fBkrootimage\fP is a helper program for \fBkdm\fP to set the desktop background. +\fBkrootimage\fP is a helper program for \fBtdm\fP to set the desktop background. .SH OPTIONS .SS .SS Arguments: @@ -135,7 +135,7 @@ sets the application GUI style sets the client geometry of the main widget \- see man X for the argument format .SS .SH SEE ALSO -.BR kdm (1) +.BR tdm (1) .SH AUTHORS .nf Matthias Hoelzer\-Kluepfel <hoelzer@kde.org> diff --git a/ubuntu/maverick_automake/kdebase/debian/man/startkde-kde3.1 b/ubuntu/maverick_automake/kdebase/debian/man/startkde-kde3.1 index f26b7f128..bb279319f 100644 --- a/ubuntu/maverick_automake/kdebase/debian/man/startkde-kde3.1 +++ b/ubuntu/maverick_automake/kdebase/debian/man/startkde-kde3.1 @@ -12,7 +12,7 @@ This manual page was written for the Debian distribution because the original program does not have a manual page. .PP The \fBstartkde\fP script starts up the K Desktop Environment and -is typically executed by your login manager (e.g. xdm, gdm, kdm, wdm or from +is typically executed by your login manager (e.g. xdm, gdm, tdm, wdm or from your X startup scripts). \fBstartkde\fP in turn launches ksmserver, which will load your last session, or a default session that includes the standard KDE programs if no saved session is available. diff --git a/ubuntu/lucid_automake/kdebase/debian/man/kdm-kde3.1 b/ubuntu/maverick_automake/kdebase/debian/man/tdm-kde3.1 index 48637989d..d7eb868fa 100644 --- a/ubuntu/lucid_automake/kdebase/debian/man/kdm-kde3.1 +++ b/ubuntu/maverick_automake/kdebase/debian/man/tdm-kde3.1 @@ -1,16 +1,16 @@ .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH KDM 1 "June 2006" "K Desktop Environment" "KDE Display Manager" +.TH TDM 1 "June 2006" "K Desktop Environment" "KDE Display Manager" .SH NAME -kdm +tdm \- KDE Display Manager .SH SYNOPSIS -\fBkdm\fP [options] [tty] +\fBtdm\fP [options] [tty] .SH DESCRIPTION -\fBkdm\fP is the KDE display manager also known as login manager. It shows a graphical login screen for username and password. After authenticating the user it starts a session. +\fBtdm\fP is the KDE display manager also known as login manager. It shows a graphical login screen for username and password. After authenticating the user it starts a session. .br -\fBkdm\fP can be configured for remote login via XDMCP. XDMCP is the "X Display Manager Control Protocol" which is used to set up connections between remote systems over the network. +\fBtdm\fP can be configured for remote login via XDMCP. XDMCP is the "X Display Manager Control Protocol" which is used to set up connections between remote systems over the network. .sp 1 -\fBkdm\fP is a derivative of \fBxdm\fP. \fBman 1 xdm\fP may provide useful information (requires installed \fBxdm\fP). For X-related problems try \fBman 7x X\fP and \fBman 1 startx\fP. +\fBtdm\fP is a derivative of \fBxdm\fP. \fBman 1 xdm\fP may provide useful information (requires installed \fBxdm\fP). For X-related problems try \fBman 7x X\fP and \fBman 1 startx\fP. .SH OPTIONS .TP .B \-daemon @@ -55,48 +55,48 @@ Debug option bitfield: .RE .SH FILES .TP -.I /etc/kde3/kdm/backgroundrc +.I /etc/kde3/tdm/backgroundrc configuration file with background settings .TP -.I /etc/kde3/kdm/kdm.options -options for X display manager kdm +.I /etc/kde3/tdm/tdm.options +options for X display manager tdm .TP -.I /etc/kde3/kdm/kdmrc -the kdm configuration file +.I /etc/kde3/tdm/tdmrc +the tdm configuration file .TP -.I /etc/kde3/kdm/Xaccess +.I /etc/kde3/tdm/Xaccess access control file for XDMCP connections .TP -.I /etc/kde3/kdm/Xservers +.I /etc/kde3/tdm/Xservers list of local X-servers .TP -.I /etc/kde3/kdm/Xreset +.I /etc/kde3/tdm/Xreset script to run as root after session exits .TP -.I /etc/kde3/kdm/Xsession +.I /etc/kde3/tdm/Xsession script to run as user after login of user .TP -.I /etc/kde3/kdm/Xsetup +.I /etc/kde3/tdm/Xsetup script to run as root before the login dialog appears .sp 1 -this script can be edited to disable or modify the running of \fBxconsole\fP on the kdm greeter screen +this script can be edited to disable or modify the running of \fBxconsole\fP on the tdm greeter screen .TP -.I /etc/kde3/kdm/Xstartup +.I /etc/kde3/tdm/Xstartup script to run as root before session starts .TP -.I /etc/kde3/kdm/Xwilling +.I /etc/kde3/tdm/Xwilling output of this script is displayed in the chooser window .SH SEE ALSO -.BR kdm.options (5),\ kdmctl (1),\ kdm_config (1),\ kdm_greet (1),\ startx (1),\ X (7x),\ xconsole (1),\ xdm (1) +.BR tdm.options (5),\ tdmctl (1),\ tdm_config (1),\ tdm_greet (1),\ startx (1),\ X (7x),\ xconsole (1),\ xdm (1) .TP -.I /opt/kde3/share/doc/kdm/README.gz -Information about \fBkdm\fP and its options +.I /opt/kde3/share/doc/tdm/README.gz +Information about \fBtdm\fP and its options .sp 1 .RE Full user documentation is available through the KDE Help Center. You can also enter the URL -.BR help:/kdm/ +.BR help:/tdm/ directly into konqueror or you can run -.BR "khelpcenter help:/kdm/" +.BR "khelpcenter help:/tdm/" from the command\-line. .br .SH AUTHORS diff --git a/ubuntu/lucid_automake/kdebase/debian/man/kdm_config-kde3.1 b/ubuntu/maverick_automake/kdebase/debian/man/tdm_config-kde3.1 index d1cbfea1d..d9325214a 100644 --- a/ubuntu/lucid_automake/kdebase/debian/man/kdm_config-kde3.1 +++ b/ubuntu/maverick_automake/kdebase/debian/man/tdm_config-kde3.1 @@ -1,14 +1,14 @@ .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH KDM_CONFIG 1 "June 2006" "K Desktop Environment" "helper program" +.TH TDM_CONFIG 1 "June 2006" "K Desktop Environment" "helper program" .SH NAME -kdm_config -\- helper programm for kdm to read configuration files +tdm_config +\- helper programm for tdm to read configuration files .SH SYNOPSIS -\fBkdm_config\fP +\fBtdm_config\fP .SH DESCRIPTION -\fBkdm_config\fP is a helper program for \fBkdm\fP to read configuration files. +\fBtdm_config\fP is a helper program for \fBtdm\fP to read configuration files. .SH SEE ALSO -\fBkdm\fP(1) +\fBtdm\fP(1) .SH AUTHORS .nf Oswald Buddenhagen <ossi@kde.org> diff --git a/ubuntu/maverick_automake/kdebase/debian/man/kdm_greet-kde3.1 b/ubuntu/maverick_automake/kdebase/debian/man/tdm_greet-kde3.1 index f1607e2b1..c33f57d5f 100644 --- a/ubuntu/maverick_automake/kdebase/debian/man/kdm_greet-kde3.1 +++ b/ubuntu/maverick_automake/kdebase/debian/man/tdm_greet-kde3.1 @@ -1,14 +1,14 @@ .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH KDM_GREET 1 "June 2006" "K Desktop Environment" "KDE greeter module" +.TH TDM_GREET 1 "June 2006" "K Desktop Environment" "KDE greeter module" .SH NAME -kdm_greet -\- KDE greeter module for kdm +tdm_greet +\- KDE greeter module for tdm .SH SYNOPSIS -\fBkdm_greet\fP +\fBtdm_greet\fP .SH DESCRIPTION -\fBkdm_greet\fP is a KDE greeter module for \fBkdm\fP. It shows the login dialog. +\fBtdm_greet\fP is a KDE greeter module for \fBtdm\fP. It shows the login dialog. .SH SEE ALSO -.BR kdm (1) +.BR tdm (1) .SH AUTHORS .nf Oswald Buddenhagen <ossi@kde.org> diff --git a/ubuntu/lucid_automake/kdebase/debian/man/kdmctl-kde3.1 b/ubuntu/maverick_automake/kdebase/debian/man/tdmctl-kde3.1 index 6e5ab781f..9833845bf 100644 --- a/ubuntu/lucid_automake/kdebase/debian/man/kdmctl-kde3.1 +++ b/ubuntu/maverick_automake/kdebase/debian/man/tdmctl-kde3.1 @@ -1,12 +1,12 @@ .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH KDMCTL 1 "June 2006" "K Desktop Environment" "KDM remote control application" +.TH TDMCTL 1 "June 2006" "K Desktop Environment" "TDM remote control application" .SH NAME -kdmctl -\- kdm remote control application +tdmctl +\- tdm remote control application .SH SYNOPSIS -\fBkdmctl\fP [options] [command [command arguments]] +\fBtdmctl\fP [options] [command [command arguments]] .SH DESCRIPTION -\fBkdmctl\fP is an application to remote\-control \fBkdm\fP. It makes use of UNIX domain sockets. +\fBtdmctl\fP is an application to remote\-control \fBtdm\fP. It makes use of UNIX domain sockets. .sp 1 There are two types of sockets: the global one (dmctl) and the per\-display ones (dmctl\-<display>). The global one's subdir is owned by root, the subdirs of the per\-display ones' are owned by the user currently owning the session (root or the logged in user). .sp 1 @@ -16,7 +16,7 @@ The directory in which the sockets are located is determined this way: .br \- the $DM_CONTROL variable is examined .br -\- the kdm config file is searched for the FifoDir key +\- the tdm config file is searched for the FifoDir key .br .RI \- /var/run/xdmctl \ and\ /var/run \ are\ tried .RE @@ -28,7 +28,7 @@ Tokens in the command and the reply are tab\-separated. Command arguments can be specified as separate command line parameters, in which case they are simply concatenated with tabs in between. .sp 1 -If the command is '\-', \fBkdmctl\fP reads commands from stdin. +If the command is '\-', \fBtdmctl\fP reads commands from stdin. The default command is 'caps'. .SH OPTIONS .SS @@ -47,7 +47,7 @@ Override $DISPLAY Override $DM_CONTROL .TP .B \-c \-config -Use alternative kdm config file +Use alternative tdm config file .SS Commands: .br .SS Global commands: @@ -72,8 +72,8 @@ The currently running session is forcibly terminated. No auto\-relogin is attemp .TP .B caps Returns a list of this socket's capabilities: -.IP " \- kdm" -identifies kdm, in case some other DM implements this protocol, too. +.IP " \- tdm" +identifies tdm, in case some other DM implements this protocol, too. .IP " \- list, activate, lock, suicide, login" the respective command is supported. .IP " \- bootoptions" @@ -155,7 +155,7 @@ Shutdowns requested from per\-display sockets are executed when the current sess .sp 1 start is the time for which the shutdown is scheduled. If it starts with a plus\-sign, the current time is added. Zero means immediately. .sp 1 -end is the latest time at which the shutdown should be performed if active sessions are still running. If it starts with a plus\-sign, the start time is added. Minus one means wait infinitely. If end is through and active sessions are still running, \fBKDM\fP can do one of the following: +end is the latest time at which the shutdown should be performed if active sessions are still running. If it starts with a plus\-sign, the start time is added. Minus one means wait infinitely. If end is through and active sessions are still running, \fBTDM\fP can do one of the following: .RS 3 - "cancel" \- give up the shutdown. .br @@ -203,10 +203,10 @@ The entries are comma\-separated tuples of: \- New fields might be added later. .RE .SH SEE ALSO -.BR kdm (1) +.BR tdm (1) .TP -.I /opt/kde3/share/doc/kdm/README.gz -Information about the command sockets (and \fBkdm\fP) +.I /opt/kde3/share/doc/tdm/README.gz +Information about the command sockets (and \fBtdm\fP) .SH AUTHORS .nf Oswald Buddenhagen <ossi@kde.org> diff --git a/ubuntu/maverick_automake/kdebase/debian/not-installed.list b/ubuntu/maverick_automake/kdebase/debian/not-installed.list index 28d931349..06a9e8a78 100644 --- a/ubuntu/maverick_automake/kdebase/debian/not-installed.list +++ b/ubuntu/maverick_automake/kdebase/debian/not-installed.list @@ -1,12 +1,12 @@ The following files are not installed in any binary package. This is deliberate. -/usr/share/apps/kdm/sessions/*.desktop +/usr/share/apps/tdm/sessions/*.desktop - many .desktop files are not included since they either do not have Debian packages, or their Debian packages include their own .desktop session - files for gdm/kdm, or they're not intended to be stand-alone window + files for gdm/tdm, or they're not intended to be stand-alone window managers. Eventually, these should ALL be dropped, since they aren't - really maintained upstream, and kdm isn't the correct place to ship these + really maintained upstream, and tdm isn't the correct place to ship these anyway. Here's the current list of those dropped: aewm++ @@ -38,7 +38,7 @@ This is deliberate. xfce4 xfce -/etc/kde3/kdm/README +/etc/kde3/tdm/README - useless comments, not intended for the end user. /usr/share/fonts/override/fonts.dir diff --git a/ubuntu/maverick_automake/kdebase/debian/patches/disable_default_kdm_theme.diff b/ubuntu/maverick_automake/kdebase/debian/patches/disable_default_tdm_theme.diff index ad6fa4cf8..200843f01 100644 --- a/ubuntu/maverick_automake/kdebase/debian/patches/disable_default_kdm_theme.diff +++ b/ubuntu/maverick_automake/kdebase/debian/patches/disable_default_tdm_theme.diff @@ -1,5 +1,5 @@ ---- kdm/config.def -+++ kdm/config.def +--- tdm/config.def ++++ tdm/config.def @@ -2614,18 +2614,18 @@ Key: UseTheme @@ -15,10 +15,10 @@ Key: Theme Type: string --Default: KDMDATA "/themes/o2_enterprise" +-Default: TDMDATA "/themes/o2_enterprise" +Default: "" User: greeter --Instance: */KDMDATA "/themes/o2_enterprise" +-Instance: */TDMDATA "/themes/o2_enterprise" +Instance: */ "@@@ToBeReplacedByDesktopBase@@@" Comment: & Description: diff --git a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_89_new_logout_ui.diff b/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_89_new_logout_ui.diff index 52fa6a4d5..2c106549e 100644 --- a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_89_new_logout_ui.diff +++ b/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_89_new_logout_ui.diff @@ -1,5 +1,5 @@ ---- kdm/kfrontend/kdmshutdown.cpp -+++ kdm/kfrontend/kdmshutdown.cpp +--- tdm/kfrontend/tdmshutdown.cpp ++++ tdm/kfrontend/tdmshutdown.cpp @@ -467,7 +467,7 @@ , targetList( 0 ) { diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_9921_kdm_bulletproof_x.diff b/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff index 781faa9fc..f2584303c 100644 --- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_9921_kdm_bulletproof_x.diff +++ b/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff @@ -1,5 +1,5 @@ ---- tdebase-3.5.8/kdm/backend/dm.c 2008-02-13 23:59:17.000000000 +0200 -+++ tdebase-3.5.8/kdm/backend/dm.c 2008-02-14 11:22:41.000000000 +0200 +--- kdebase-3.5.8/tdm/backend/dm.c 2008-02-13 23:59:17.000000000 +0200 ++++ kdebase-3.5.8/tdm/backend/dm.c 2008-02-14 11:22:41.000000000 +0200 @@ -996,9 +996,14 @@ ReapChildren( void ) /* don't kill again */ break; @@ -18,8 +18,8 @@ StartServerFailed(); break; } ---- tdebase-3.5.8/kdm/backend/server.c 2008-02-13 23:59:17.000000000 +0200 -+++ tdebase-3.5.8/kdm/backend/server.c 2008-02-14 11:41:20.000000000 +0200 +--- kdebase-3.5.8/tdm/backend/server.c 2008-02-13 23:59:17.000000000 +0200 ++++ kdebase-3.5.8/tdm/backend/server.c 2008-02-14 11:41:20.000000000 +0200 @@ -48,6 +48,10 @@ from the copyright holder. struct display *startingServer; time_t serverTimeout = TO_INF; diff --git a/ubuntu/maverick_automake/kdebase/debian/po/POTFILES.in b/ubuntu/maverick_automake/kdebase/debian/po/POTFILES.in index 416e5f394..1f7bb4d7d 100644 --- a/ubuntu/maverick_automake/kdebase/debian/po/POTFILES.in +++ b/ubuntu/maverick_automake/kdebase/debian/po/POTFILES.in @@ -1 +1 @@ -[type: gettext/rfc822deb] kdm.templates +[type: gettext/rfc822deb] tdm.templates diff --git a/ubuntu/maverick_automake/kdebase/debian/po/ar.po b/ubuntu/maverick_automake/kdebase/debian/po/ar.po index a8dc77710..d2da9442b 100644 --- a/ubuntu/maverick_automake/kdebase/debian/po/ar.po +++ b/ubuntu/maverick_automake/kdebase/debian/po/ar.po @@ -28,13 +28,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "مدير العرض الاÙتراضي:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -44,7 +44,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -56,7 +56,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -70,29 +70,29 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "هل تود إيقا٠تشغيل عÙريت kdmØŸ" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "هل تود إيقا٠تشغيل عÙريت tdmØŸ" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"يكون عÙريت مدير Ø³Ø·Ø Ù…ÙƒØªØ¨ كي (kdm) عادة موقÙاً عند ترقية الØزمة " +"يكون عÙريت مدير Ø³Ø·Ø Ù…ÙƒØªØ¨ كي (tdm) عادة موقÙاً عند ترقية الØزمة " "وإزالتها، ولكن يبدو أنه يدير على الأقل جلسة X واØدة تعمل Øالياً." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"إن تم إيقا٠kdm الآن، Ùستنهى أي جلسات X يقوم بإدارتها. " +"إن تم إيقا٠tdm الآن، Ùستنهى أي جلسات X يقوم بإدارتها. " "عدى ذلك، سيسري Ù…Ùعول النسخة الجديدة ÙÙŠ المرة التالية التي " "يتم Ùيها إعادة تشغيل العÙريت." diff --git a/ubuntu/maverick_automake/kdebase/debian/po/ca.po b/ubuntu/maverick_automake/kdebase/debian/po/ca.po index 88ea30560..c483cfd6f 100644 --- a/ubuntu/maverick_automake/kdebase/debian/po/ca.po +++ b/ubuntu/maverick_automake/kdebase/debian/po/ca.po @@ -39,13 +39,13 @@ msgstr "" #. Type: select
#. Description
-#: ../kdm.templates:1001
+#: ../tdm.templates:1001
msgid "Default display manager:"
msgstr "Escolliu el gestor de pantalla:"
#. Type: select
#. Description
-#: ../kdm.templates:1001
+#: ../tdm.templates:1001
msgid ""
"A display manager is a program that provides graphical login capabilities "
"for the X Window System."
@@ -55,7 +55,7 @@ msgstr "" #. Type: select
#. Description
-#: ../kdm.templates:1001
+#: ../tdm.templates:1001
msgid ""
"Only one display manager can manage a given X server, but multiple display "
"manager packages are installed. Please select which display manager should "
@@ -67,7 +67,7 @@ msgstr "" #. Type: select
#. Description
-#: ../kdm.templates:1001
+#: ../tdm.templates:1001
msgid ""
"Multiple display managers can run simultaneously if they are configured to "
"manage different servers; to achieve this, configure the display managers "
@@ -82,39 +82,39 @@ msgstr "" #. Type: boolean
#. Description
-#: ../kdm.templates:3001
-msgid "Stop the kdm daemon?"
-msgstr "Voleu detenir el dimoni «kdm»?"
+#: ../tdm.templates:3001
+msgid "Stop the tdm daemon?"
+msgstr "Voleu detenir el dimoni «tdm»?"
#. Type: boolean
#. Description
-#: ../kdm.templates:3001
+#: ../tdm.templates:3001
msgid ""
-"The K Desktop manager (kdm) daemon is typically stopped on package upgrade "
+"The K Desktop manager (tdm) daemon is typically stopped on package upgrade "
"and removal, but it appears to be managing at least one running X session."
msgstr ""
-"El dimoni gestor de pantalla de KDE, (kdm), sol ser detingut en actualitzar-ne "
+"El dimoni gestor de pantalla de KDE, (tdm), sol ser detingut en actualitzar-ne "
"i eliminar-ne el paquet, però sembla que ara està gestionant almenys una "
"sessió X activa."
#. Type: boolean
#. Description
-#: ../kdm.templates:3001
+#: ../tdm.templates:3001
msgid ""
-"If kdm is stopped now, any X sessions it manages will be terminated. "
+"If tdm is stopped now, any X sessions it manages will be terminated. "
"Otherwise, the new version will take effect the next time the daemon is "
"restarted."
msgstr ""
-"Si es deté «kdm» ara, terminaran totes les sessions X que està gestionant. "
-"Altrament, podeu deixar corrent «kdm», i la nova versió surtirà efecte a la "
+"Si es deté «tdm» ara, terminaran totes les sessions X que està gestionant. "
+"Altrament, podeu deixar corrent «tdm», i la nova versió surtirà efecte a la "
"següent volta que el dimoni es reinicie."
msgid ""
-"The X display manager (kdm) daemon is typically stopped on package "
+"The X display manager (tdm) daemon is typically stopped on package "
"upgrade and removal, but it appears to be managing at least one running X "
"session."
msgstr ""
-"El dimoni gestor de pantalla d’X, «kdm», sol ser detingut en actualitzarâ€ne"
+"El dimoni gestor de pantalla d’X, «tdm», sol ser detingut en actualitzarâ€ne"
"i eliminarâ€ne el paquet, però sembla que ara està gestionant almenys "
"una sessió X activa."
diff --git a/ubuntu/maverick_automake/kdebase/debian/po/cs.po b/ubuntu/maverick_automake/kdebase/debian/po/cs.po index e1f71369f..cf9809978 100644 --- a/ubuntu/maverick_automake/kdebase/debian/po/cs.po +++ b/ubuntu/maverick_automake/kdebase/debian/po/cs.po @@ -1,4 +1,4 @@ -# debconf templates for kdm package +# debconf templates for tdm package # Czech translation # # $Id: cs.po 1042 2006-01-09 07:55:08Z ender $ @@ -24,7 +24,7 @@ # msgid "" msgstr "" -"Project-Id-Version: kdm\n" +"Project-Id-Version: tdm\n" "Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n" "POT-Creation-Date: 2007-03-23 07:15+0100\n" "PO-Revision-Date: 2007-04-10 18:15+0200\n" @@ -36,13 +36,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Výchozà správce obrazovky:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -52,7 +52,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -63,7 +63,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -77,38 +77,38 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Zastavit démona kdm?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Zastavit démona tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Démon kdm (K Desktop manager) je obvykle pÅ™i aktualizaci nebo odstranÄ›nà " +"Démon tdm (K Desktop manager) je obvykle pÅ™i aktualizaci nebo odstranÄ›nà " "balÃku zastaven, ale zdá se, že spravuje minimálnÄ› jedno X sezenÃ." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Pokud by byl kdm zastaven nynÃ, vÅ¡echna jÃm spravovaná X sezenà by se " -"ukonÄila. V opaÄném pÅ™ÃpadÄ› zůstane kdm běžet a nová verze se spustà s " +"Pokud by byl tdm zastaven nynÃ, vÅ¡echna jÃm spravovaná X sezenà by se " +"ukonÄila. V opaÄném pÅ™ÃpadÄ› zůstane tdm běžet a nová verze se spustà s " "pÅ™ÃÅ¡tÃm restartem démona." #~ msgid "" -#~ "The X display manager (kdm) daemon is typically stopped on package " +#~ "The X display manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " #~ "session." #~ msgstr "" -#~ "Démon kdm (X display manager) je obvykle pÅ™i aktualizaci nebo odstranÄ›nà " +#~ "Démon tdm (X display manager) je obvykle pÅ™i aktualizaci nebo odstranÄ›nà " #~ "balÃku zastaven, ale zdá se, že spravuje minimálnÄ› jedno X sezenÃ." #~ msgid "Select the desired default display manager." @@ -134,18 +134,18 @@ msgstr "" #~ "nakonfigurovat, upravit jejich spouÅ¡tÄ›cà skripty v /etc/init.d a zakázat " #~ "kontrolu standardnÃho správce obrazovky.)" -#~ msgid "Do you wish to stop the kdm daemon?" -#~ msgstr "Chcete zastavit daemona kdm?" +#~ msgid "Do you wish to stop the tdm daemon?" +#~ msgstr "Chcete zastavit daemona tdm?" #~ msgid "" -#~ "The K Desktop manager (kdm) daemon is typically stopped on package " +#~ "The K Desktop manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " -#~ "session. If kdm is stopped now, any X sessions it manages will be " -#~ "terminated. Otherwise you may leave kdm running, and the new version will " +#~ "session. If tdm is stopped now, any X sessions it manages will be " +#~ "terminated. Otherwise you may leave tdm running, and the new version will " #~ "take effect the next time the daemon is restarted." #~ msgstr "" -#~ "Daemon kdm (K Desktop manager) je obvykle pÅ™i aktualizaci nebo odstranÄ›nà " +#~ "Daemon tdm (K Desktop manager) je obvykle pÅ™i aktualizaci nebo odstranÄ›nà " #~ "balÃku zastaven, ale zdá se, že právÄ› spravuje minimálnÄ› jedno X sezenÃ. " -#~ "Pokud by byl kdm zastaven nynÃ, vÅ¡echna jÃm spravovaná X sezenà by byla " -#~ "ukonÄena. V opaÄném pÅ™ÃpadÄ› můžene nechat kdm běžet a nová verze se " +#~ "Pokud by byl tdm zastaven nynÃ, vÅ¡echna jÃm spravovaná X sezenà by byla " +#~ "ukonÄena. V opaÄném pÅ™ÃpadÄ› můžene nechat tdm běžet a nová verze se " #~ "spustà s pÅ™ÃÅ¡tÃm restartem daemona." diff --git a/ubuntu/maverick_automake/kdebase/debian/po/da.po b/ubuntu/maverick_automake/kdebase/debian/po/da.po index d41e03dba..394004a2e 100644 --- a/ubuntu/maverick_automake/kdebase/debian/po/da.po +++ b/ubuntu/maverick_automake/kdebase/debian/po/da.po @@ -29,13 +29,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Standard logind-håndtering:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -45,7 +45,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -57,7 +57,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -71,30 +71,30 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Stop kdm-dæmonen?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Stop tdm-dæmonen?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Skrivebordshåndterings-dæmonen kdm stoppes typisk ved opgradering og " +"Skrivebordshåndterings-dæmonen tdm stoppes typisk ved opgradering og " "fjernelse af pakken, men den lader til at være beskæftiget med mindst én " "kørende X-session." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Hvis kdm stoppes nu, vil de X-sessioner, den håndterer, " -"blive afsluttet. Ellers kan du lade kdm køre. Så vil den nye version først " +"Hvis tdm stoppes nu, vil de X-sessioner, den håndterer, " +"blive afsluttet. Ellers kan du lade tdm køre. Så vil den nye version først " "tage over når dæmonen genstartes." diff --git a/ubuntu/maverick_automake/kdebase/debian/po/de.po b/ubuntu/maverick_automake/kdebase/debian/po/de.po index e71aa86b2..d635bf7df 100644 --- a/ubuntu/maverick_automake/kdebase/debian/po/de.po +++ b/ubuntu/maverick_automake/kdebase/debian/po/de.po @@ -45,13 +45,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Standardmäßiger Display-Manager:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -61,7 +61,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -73,7 +73,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -88,30 +88,30 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Soll der kdm-Dienst gestoppt werden?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Soll der tdm-Dienst gestoppt werden?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Der K Display Manager (kdm) Dienst wird meist beim Aktualisieren oder " +"Der K Display Manager (tdm) Dienst wird meist beim Aktualisieren oder " "Entfernen eines Pakets gestoppt, aber er scheint mindestens eine laufende X-" "Sitzung zu verwalten." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Wenn kdm jetzt gestoppt wird, werden alle Sitzungen beendet, die er gerade " -"verwaltet. Alternativ können Sie kdm weiter laufen lassen, die neue Version " +"Wenn tdm jetzt gestoppt wird, werden alle Sitzungen beendet, die er gerade " +"verwaltet. Alternativ können Sie tdm weiter laufen lassen, die neue Version " "wird dann aktiv, sobald der Dienst das nächste Mal gestartet wird." diff --git a/ubuntu/maverick_automake/kdebase/debian/po/el.po b/ubuntu/maverick_automake/kdebase/debian/po/el.po index c0ced55f3..9723b2f9f 100644 --- a/ubuntu/maverick_automake/kdebase/debian/po/el.po +++ b/ubuntu/maverick_automake/kdebase/debian/po/el.po @@ -36,14 +36,14 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "Default display manager:" msgstr "ΕπιλÎξτε τον επιθυμητό διαχειÏιστή οθόνης." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -53,7 +53,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "" "Only one display manager can manage a given X server, but multiple display " @@ -66,7 +66,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "" "Multiple display managers can run simultaneously if they are configured to " @@ -82,54 +82,54 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy -msgid "Stop the kdm daemon?" -msgstr "ΘÎλετε να σταματήσετε να χÏησιμοποιείτε τον δαίμονα kdm;" +msgid "Stop the tdm daemon?" +msgstr "ΘÎλετε να σταματήσετε να χÏησιμοποιείτε τον δαίμονα tdm;" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Κανονικά, η λειτουÏγία του δαίμονα του διαχειÏιστή οθόνης των X (kdm) " +"Κανονικά, η λειτουÏγία του δαίμονα του διαχειÏιστή οθόνης των X (tdm) " "διακόπτεται με κάθε αναβάθμιση και διαγÏαφή του πακÎτου, αλλά στη " "συγκεκÏιμÎνη πεÏίπτωση φαίνεται ότι διαχειÏίζεται ήδη τουλάχιστον μια " -"συνεδÏία των X (X session). Αν ο kdm τεÏματιστεί Ï„ÏŽÏα, οποιεσδήποτε " +"συνεδÏία των X (X session). Αν ο tdm τεÏματιστεί Ï„ÏŽÏα, οποιεσδήποτε " "συνεδÏίες των X χειÏίζεται θα τεÏματιστοÏν επίσης. ΔιαφοÏετικά, μποÏείτε να " -"αφήσετε τον kdm να συνεχίσει τη λειτουÏγία του και η νÎα Îκδοση να " +"αφήσετε τον tdm να συνεχίσει τη λειτουÏγία του και η νÎα Îκδοση να " "χÏησιμοποιηθεί την επόμενη φοÏά που θα Ï„ÏÎξει ο δαίμονας." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Κανονικά, η λειτουÏγία του δαίμονα του διαχειÏιστή οθόνης των X (kdm) " +"Κανονικά, η λειτουÏγία του δαίμονα του διαχειÏιστή οθόνης των X (tdm) " "διακόπτεται με κάθε αναβάθμιση και διαγÏαφή του πακÎτου, αλλά στη " "συγκεκÏιμÎνη πεÏίπτωση φαίνεται ότι διαχειÏίζεται ήδη τουλάχιστον μια " -"συνεδÏία των X (X session). Αν ο kdm τεÏματιστεί Ï„ÏŽÏα, οποιεσδήποτε " +"συνεδÏία των X (X session). Αν ο tdm τεÏματιστεί Ï„ÏŽÏα, οποιεσδήποτε " "συνεδÏίες των X χειÏίζεται θα τεÏματιστοÏν επίσης. ΔιαφοÏετικά, μποÏείτε να " -"αφήσετε τον kdm να συνεχίσει τη λειτουÏγία του και η νÎα Îκδοση να " +"αφήσετε τον tdm να συνεχίσει τη λειτουÏγία του και η νÎα Îκδοση να " "χÏησιμοποιηθεί την επόμενη φοÏά που θα Ï„ÏÎξει ο δαίμονας." #, fuzzy #~ msgid "" -#~ "The X display manager (kdm) daemon is typically stopped on package " +#~ "The X display manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " #~ "session." #~ msgstr "" -#~ "Κανονικά, η λειτουÏγία του δαίμονα του διαχειÏιστή οθόνης των X (kdm) " +#~ "Κανονικά, η λειτουÏγία του δαίμονα του διαχειÏιστή οθόνης των X (tdm) " #~ "διακόπτεται με κάθε αναβάθμιση και διαγÏαφή του πακÎτου, αλλά στη " #~ "συγκεκÏιμÎνη πεÏίπτωση φαίνεται ότι διαχειÏίζεται ήδη τουλάχιστον μια " -#~ "συνεδÏία των X (X session). Αν ο kdm τεÏματιστεί Ï„ÏŽÏα, οποιεσδήποτε " +#~ "συνεδÏία των X (X session). Αν ο tdm τεÏματιστεί Ï„ÏŽÏα, οποιεσδήποτε " #~ "συνεδÏίες των X χειÏίζεται θα τεÏματιστοÏν επίσης. ΔιαφοÏετικά, μποÏείτε " -#~ "να αφήσετε τον kdm να συνεχίσει τη λειτουÏγία του και η νÎα Îκδοση να " +#~ "να αφήσετε τον tdm να συνεχίσει τη λειτουÏγία του και η νÎα Îκδοση να " #~ "χÏησιμοποιηθεί την επόμενη φοÏά που θα Ï„ÏÎξει ο δαίμονας." diff --git a/ubuntu/maverick_automake/kdebase/debian/po/es.po b/ubuntu/maverick_automake/kdebase/debian/po/es.po index bf23041ba..04d93a9a2 100644 --- a/ubuntu/maverick_automake/kdebase/debian/po/es.po +++ b/ubuntu/maverick_automake/kdebase/debian/po/es.po @@ -40,13 +40,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Gestor de sesiones predefinido:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -56,7 +56,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -65,7 +65,7 @@ msgstr "Cada servidor X s�lo puede ser gestionado por un �nico gestor de ses #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -77,24 +77,24 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "�Desea detener el daemon kdm?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "�Desea detener el daemon tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." -msgstr "Normalmente se detiene el daemon del gestor de sesiones de KDE (kdm) al actualizar o borrar el paquete, pero parece que est� gestionando al menos una sesi�n X activa." +msgstr "Normalmente se detiene el daemon del gestor de sesiones de KDE (tdm) al actualizar o borrar el paquete, pero parece que est� gestionando al menos una sesi�n X activa." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." -msgstr "Si detiene kdm ahora, se finalizar�n todas las sesiones X que est� gestionando. La otra posibilidad es mantener kdm en ejecuci�n, con lo que la nueva versi�n no se activar� hasta la pr�xima vez que se reinicie el daemon." +msgstr "Si detiene tdm ahora, se finalizar�n todas las sesiones X que est� gestionando. La otra posibilidad es mantener tdm en ejecuci�n, con lo que la nueva versi�n no se activar� hasta la pr�xima vez que se reinicie el daemon." diff --git a/ubuntu/maverick_automake/kdebase/debian/po/eu.po b/ubuntu/maverick_automake/kdebase/debian/po/eu.po index 406af4b13..76252143d 100644 --- a/ubuntu/maverick_automake/kdebase/debian/po/eu.po +++ b/ubuntu/maverick_automake/kdebase/debian/po/eu.po @@ -39,13 +39,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Lehenetsiriko pantaila kudeatzailea:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -55,7 +55,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -67,7 +67,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -81,30 +81,30 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" msgstr "Kdm deabrua gelditu?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"K Pantaila Kudeatzaile (kdm) deabrua arruntean gelditu egiten da pakete " +"K Pantaila Kudeatzaile (tdm) deabrua arruntean gelditu egiten da pakete " "bertsio berritze edo ezabaketa egiterakoan, baina dirudienez martxan dagoen " "X saio bat behintzat kudeatzen ari da." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"kdm orain gelditu ezkero, kudeatzen ari den edozein X saio itxi egingo da. " -"Bestela kdm martxan utz dezakezu eta bertsio berria deabrua abiarazten den " +"tdm orain gelditu ezkero, kudeatzen ari den edozein X saio itxi egingo da. " +"Bestela tdm martxan utz dezakezu eta bertsio berria deabrua abiarazten den " "hurrengo aldian erabiliko da." diff --git a/ubuntu/maverick_automake/kdebase/debian/po/fi.po b/ubuntu/maverick_automake/kdebase/debian/po/fi.po index 3fbbd16d4..fee2513e5 100644 --- a/ubuntu/maverick_automake/kdebase/debian/po/fi.po +++ b/ubuntu/maverick_automake/kdebase/debian/po/fi.po @@ -14,43 +14,43 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Oletusnäytönhallintaohjelma:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "A display manager is a program that provides graphical login capabilities for the X Window System." msgstr "Näytönhallintaohjelma on ohjelma, joka tarjoaa graafisen sisäänkirjautumisruudun X-ikkunointijärjestelmään." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Only one display manager can manage a given X server, but multiple display manager packages are installed. Please select which display manager should run by default." msgstr "Kutakin X-palvelinta voi hoitaa vain yksi näytönhallintaohjelma, mutta useampia näytönhallintaohjelmapaketteja on asennettuna. Valitse mikä näytönhallintaohjelma tulisi ajaa oletuksena." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Multiple display managers can run simultaneously if they are configured to manage different servers; to achieve this, configure the display managers accordingly, edit each of their init scripts in /etc/init.d, and disable the check for a default display manager." msgstr "Useampi näytönhallintaohjelma voi olla ajossa yhtäaikaisesti, jos ne on asetettu hoitamaan eri palvelimia. Saadaksesi tämän aikaan, aseta näytönhallintaohjelmat tämän mukaisesti, muokkaa kunkin niistä alustustiedostoja hakemistossa /etc/init.d ja poista oletusnäytönhallintaohjelman tarkistus käytöstä." #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Pysäytetäänkö kdm-taustaohjelma?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Pysäytetäänkö tdm-taustaohjelma?" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "The K Desktop manager (kdm) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session." -msgstr "K Desktop manager (kdm) -taustaohjelma pysäytetään yleensä päivitettäessä tai poistettaessa pakettia, mutta se näyttää hoitavan ainakin yhtä ajossa olevaa X-istuntoa." +#: ../tdm.templates:3001 +msgid "The K Desktop manager (tdm) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session." +msgstr "K Desktop manager (tdm) -taustaohjelma pysäytetään yleensä päivitettäessä tai poistettaessa pakettia, mutta se näyttää hoitavan ainakin yhtä ajossa olevaa X-istuntoa." #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "If kdm is stopped now, any X sessions it manages will be terminated. Otherwise, the new version will take effect the next time the daemon is restarted." -msgstr "Jos kdm pysäytetään nyt, kaikki sen hoitamat X-istunnot lopetetaan. Muussa tapauksessa uusi versio otetaan käyttöön ensi kerralla, kun taustaohjelma käynnistetään uudelleen." +#: ../tdm.templates:3001 +msgid "If tdm is stopped now, any X sessions it manages will be terminated. Otherwise, the new version will take effect the next time the daemon is restarted." +msgstr "Jos tdm pysäytetään nyt, kaikki sen hoitamat X-istunnot lopetetaan. Muussa tapauksessa uusi versio otetaan käyttöön ensi kerralla, kun taustaohjelma käynnistetään uudelleen." diff --git a/ubuntu/maverick_automake/kdebase/debian/po/fr.po b/ubuntu/maverick_automake/kdebase/debian/po/fr.po index ba49906b6..90e090ddb 100644 --- a/ubuntu/maverick_automake/kdebase/debian/po/fr.po +++ b/ubuntu/maverick_automake/kdebase/debian/po/fr.po @@ -44,13 +44,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Gestionnaire graphique de session par défaut :" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -60,7 +60,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -72,7 +72,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -86,30 +86,30 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Faut-il arrêter le démon kdm ?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Faut-il arrêter le démon tdm ?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Le gestionnaire de sessions KDE (kdm) est généralement arrêté lors de la mise " +"Le gestionnaire de sessions KDE (tdm) est généralement arrêté lors de la mise " "à jour ou de la suppression du paquet. Cependant, il semble qu'il gère " "actuellement encore au moins une session X." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Si kdm est arrêté maintenant, toutes les sessions X qu'il gère seront " -"terminées. L'autre possibilité est de laisser fonctionner kdm, la nouvelle " +"Si tdm est arrêté maintenant, toutes les sessions X qu'il gère seront " +"terminées. L'autre possibilité est de laisser fonctionner tdm, la nouvelle " "version ne devenant active qu'au prochain redémarrage du démon." diff --git a/ubuntu/maverick_automake/kdebase/debian/po/gl.po b/ubuntu/maverick_automake/kdebase/debian/po/gl.po index 896b37aae..173f4f8ed 100644 --- a/ubuntu/maverick_automake/kdebase/debian/po/gl.po +++ b/ubuntu/maverick_automake/kdebase/debian/po/gl.po @@ -18,13 +18,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Xestor de pantalla por defecto:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -34,7 +34,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -46,7 +46,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -60,38 +60,38 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "¿Deter o servizo de kdm?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "¿Deter o servizo de tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Adoita se deter o servizo do xestor de pantalla de KDE (kdm) ao actualizar " +"Adoita se deter o servizo do xestor de pantalla de KDE (tdm) ao actualizar " "ou eliminar o paquete, pero semella que está a xestionar alomenos unha " "sesión X en execución." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Se se detén kdm agora, hase cortar calquera sesión X que xestione. Se non, a " +"Se se detén tdm agora, hase cortar calquera sesión X que xestione. Se non, a " "nova versión ha tomar efecto a próxima vez que reinicie o servizo." #~ msgid "" -#~ "The X display manager (kdm) daemon is typically stopped on package " +#~ "The X display manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " #~ "session." #~ msgstr "" -#~ "Adoita se deter o servizo do xestor de pantalla de X (kdm) ao actualizar " +#~ "Adoita se deter o servizo do xestor de pantalla de X (tdm) ao actualizar " #~ "ou eliminar o paquete, pero semella que está a xestionar alomenos unha " #~ "sesión X en execución." @@ -118,18 +118,18 @@ msgstr "" #~ "xestores de pantalla, edite os seus scripts de inicio de /etc/init.d e " #~ "desactive a comprobación do xestor de pantalla por defecto)." -#~ msgid "Do you wish to stop the kdm daemon?" -#~ msgstr "¿Quere deter o daemon de kdm?" +#~ msgid "Do you wish to stop the tdm daemon?" +#~ msgstr "¿Quere deter o daemon de tdm?" #~ msgid "" -#~ "The K Desktop manager (kdm) daemon is typically stopped on package " +#~ "The K Desktop manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " -#~ "session. If kdm is stopped now, any X sessions it manages will be " -#~ "terminated. Otherwise you may leave kdm running, and the new version will " +#~ "session. If tdm is stopped now, any X sessions it manages will be " +#~ "terminated. Otherwise you may leave tdm running, and the new version will " #~ "take effect the next time the daemon is restarted." #~ msgstr "" -#~ "Normalmente adóitase deter o daemon do xestor de pantalla de KDE (kdm) ao " +#~ "Normalmente adóitase deter o daemon do xestor de pantalla de KDE (tdm) ao " #~ "actualizar ou eliminar o paquete, pero semella que está a xestionar " -#~ "alomenos unha sesión X en execución. Se se detén kdm agora, hase cortar " -#~ "calquera sesión X que xestione. Se non, pode deixar kdm a se executar, e " +#~ "alomenos unha sesión X en execución. Se se detén tdm agora, hase cortar " +#~ "calquera sesión X que xestione. Se non, pode deixar tdm a se executar, e " #~ "a nova versión ha tomar efecto a próxima vez que reinicie o daemon." diff --git a/ubuntu/maverick_automake/kdebase/debian/po/it.po b/ubuntu/maverick_automake/kdebase/debian/po/it.po index 76de3e664..d93fad397 100644 --- a/ubuntu/maverick_automake/kdebase/debian/po/it.po +++ b/ubuntu/maverick_automake/kdebase/debian/po/it.po @@ -39,13 +39,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Display manager predefinito." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -55,7 +55,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -67,7 +67,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -82,29 +82,29 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Arrestare il demone kdm?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Arrestare il demone tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Il demone del display manager KDE (kdm) viene tipicamente fermato in fase " +"Il demone del display manager KDE (tdm) viene tipicamente fermato in fase " "di aggiornamento o rimozione del pacchetto, ma pare che al momento stia " "gestendo almeno una sessione attiva di X." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Se kdm viene arrestato ora, anche tutte le sessioni di X che gestisce " +"Se tdm viene arrestato ora, anche tutte le sessioni di X che gestisce " "verranno terminate. In alternativa, la nuova versione sarà usata a partire " "dal prossimo avvio del demone." diff --git a/ubuntu/maverick_automake/kdebase/debian/po/ja.po b/ubuntu/maverick_automake/kdebase/debian/po/ja.po index 1f876f9c6..74863f343 100644 --- a/ubuntu/maverick_automake/kdebase/debian/po/ja.po +++ b/ubuntu/maverick_automake/kdebase/debian/po/ja.po @@ -39,13 +39,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "デフォルトã®ãƒ‡ã‚£ã‚¹ãƒ—レイマãƒãƒ¼ã‚¸ãƒ£:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -55,7 +55,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -67,7 +67,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -81,37 +81,37 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "kdm デーモンをåœæ¢ã—ã¾ã™ã‹?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "tdm デーモンをåœæ¢ã—ã¾ã™ã‹?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." -msgstr "K デスクトップマãƒãƒ¼ã‚¸ãƒ£ (kdm) デーモンã¯ã€æ™®é€šã€ãƒ‘ッケージã®æ›´æ–°ã‚„削除ã®éš›ã«åœæ¢ã•ã›ã‚‰ã‚Œã¾ã™ã€‚ã—ã‹ã— kdm ã¯ç¾åœ¨å‹•ä½œä¸ã® X セッションを最低ã²ã¨ã¤ã¯ç®¡ç†ã—ã¦ã„るよã†ã§ã™ã€‚" +msgstr "K デスクトップマãƒãƒ¼ã‚¸ãƒ£ (tdm) デーモンã¯ã€æ™®é€šã€ãƒ‘ッケージã®æ›´æ–°ã‚„削除ã®éš›ã«åœæ¢ã•ã›ã‚‰ã‚Œã¾ã™ã€‚ã—ã‹ã— tdm ã¯ç¾åœ¨å‹•ä½œä¸ã® X セッションを最低ã²ã¨ã¤ã¯ç®¡ç†ã—ã¦ã„るよã†ã§ã™ã€‚" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"ã„ã¾ kdm ã‚’åœæ¢ã™ã‚‹ã¨ã€ã“ã® kdm ãŒç®¡ç†ã—ã¦ã„ã‚‹ X セッションã¯åœæ¢ã—ã¾ã™ã€‚ã‚ã‚‹" -"ã„ã¯æ¬¡ã«ãƒ‡ãƒ¼ãƒ¢ãƒ³ã‚’リスタートã—ãŸã¨ãã«æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã® kdm を有効ã«ã™ã‚‹ã“ã¨" +"ã„ã¾ tdm ã‚’åœæ¢ã™ã‚‹ã¨ã€ã“ã® tdm ãŒç®¡ç†ã—ã¦ã„ã‚‹ X セッションã¯åœæ¢ã—ã¾ã™ã€‚ã‚ã‚‹" +"ã„ã¯æ¬¡ã«ãƒ‡ãƒ¼ãƒ¢ãƒ³ã‚’リスタートã—ãŸã¨ãã«æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã® tdm を有効ã«ã™ã‚‹ã“ã¨" "ã‚‚ã§ãã¾ã™ã€‚" #~ msgid "" -#~ "The X display manager (kdm) daemon is typically stopped on package " +#~ "The X display manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " #~ "session." #~ msgstr "" -#~ "X ディスプレイマãƒãƒ¼ã‚¸ãƒ£ (kdm) デーモンã¯ã€æ™®é€šã€ãƒ‘ッケージã®æ›´æ–°ã‚„削除ã®" -#~ "éš›ã«åœæ¢ã•ã›ã‚‰ã‚Œã¾ã™ã€‚ã—ã‹ã— kdm ã¯ç¾åœ¨å‹•ä½œä¸ã® X セッションを最低ã²ã¨ã¤ã¯" +#~ "X ディスプレイマãƒãƒ¼ã‚¸ãƒ£ (tdm) デーモンã¯ã€æ™®é€šã€ãƒ‘ッケージã®æ›´æ–°ã‚„削除ã®" +#~ "éš›ã«åœæ¢ã•ã›ã‚‰ã‚Œã¾ã™ã€‚ã—ã‹ã— tdm ã¯ç¾åœ¨å‹•ä½œä¸ã® X セッションを最低ã²ã¨ã¤ã¯" #~ "管ç†ã—ã¦ã„るよã†ã§ã™ã€‚" #~ msgid "Select the desired default display manager." @@ -139,18 +139,18 @@ msgstr "" #~ "切ã«è¨å®šã—ã¦ã€/etc/init.d ã«ã‚ã‚‹å„ init スクリプトを編集ã—ã€ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®" #~ "ディスプレイマãƒãƒ¼ã‚¸ãƒ£ã®ç¢ºèªã‚’無効ã«ã—ã¦ãã ã•ã„。)" -#~ msgid "Do you wish to stop the kdm daemon?" -#~ msgstr "kdm デーモンをåœæ¢ã—ãŸã„ã§ã™ã‹?" +#~ msgid "Do you wish to stop the tdm daemon?" +#~ msgstr "tdm デーモンをåœæ¢ã—ãŸã„ã§ã™ã‹?" #~ msgid "" -#~ "The K Desktop manager (kdm) daemon is typically stopped on package " +#~ "The K Desktop manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " -#~ "session. If kdm is stopped now, any X sessions it manages will be " -#~ "terminated. Otherwise you may leave kdm running, and the new version will " +#~ "session. If tdm is stopped now, any X sessions it manages will be " +#~ "terminated. Otherwise you may leave tdm running, and the new version will " #~ "take effect the next time the daemon is restarted." #~ msgstr "" -#~ "K Desktop manager (kdm) デーモンã¯é€šå¸¸ã€ãƒ‘ッケージã®æ›´æ–°ãŠã‚ˆã³å‰Šé™¤æ™‚ã«åœæ¢" +#~ "K Desktop manager (tdm) デーモンã¯é€šå¸¸ã€ãƒ‘ッケージã®æ›´æ–°ãŠã‚ˆã³å‰Šé™¤æ™‚ã«åœæ¢" #~ "ã—ã¾ã™ãŒã€å°‘ãªãã¨ã‚‚ 1 ã¤ã®å‹•ä½œä¸ã® X セッションを管ç†ã—ã¦ã„るよã†ã§ã™ã€‚" -#~ "kdm を今åœæ¢ã™ã‚‹ã¨ã€ã“ã‚ŒãŒç®¡ç†ã™ã‚‹ X セッションã¯æ®ºã•ã‚Œã¾ã™ã€‚ãã®ä»£ã‚ã‚Š" -#~ "ã«ã€kdm を動作ã—ã¦ã„ã‚‹ã¾ã¾ã«ã—ã¦ãŠãã€æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯æ¬¡å›žã®ãƒ‡ãƒ¼ãƒ¢ãƒ³ã®å†" +#~ "tdm を今åœæ¢ã™ã‚‹ã¨ã€ã“ã‚ŒãŒç®¡ç†ã™ã‚‹ X セッションã¯æ®ºã•ã‚Œã¾ã™ã€‚ãã®ä»£ã‚ã‚Š" +#~ "ã«ã€tdm を動作ã—ã¦ã„ã‚‹ã¾ã¾ã«ã—ã¦ãŠãã€æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯æ¬¡å›žã®ãƒ‡ãƒ¼ãƒ¢ãƒ³ã®å†" #~ "起動時ã«åŠ¹æžœã‚’表ã™ã‚ˆã†ã«ã§ãã¾ã™ã€‚" diff --git a/ubuntu/maverick_automake/kdebase/debian/po/ko.po b/ubuntu/maverick_automake/kdebase/debian/po/ko.po index 6200caa12..6bde61a03 100644 --- a/ubuntu/maverick_automake/kdebase/debian/po/ko.po +++ b/ubuntu/maverick_automake/kdebase/debian/po/ko.po @@ -19,13 +19,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "기본 화면관리ìž:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -35,7 +35,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -46,7 +46,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -59,27 +59,27 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "kdm ë°ëª¬ì„ 중지시킬까요?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "tdm ë°ëª¬ì„ 중지시킬까요?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"K ë°ìŠ¤í¬íƒ‘ 관리ìž(kdm) ë°ëª¬ì€ ì¼ë°˜ì 으로 꾸러미를 ì„¤ì¹˜í•˜ê³ ì—…ê·¸ë ˆì´ë“œí• ë•Œ " +"K ë°ìŠ¤í¬íƒ‘ 관리ìž(tdm) ë°ëª¬ì€ ì¼ë°˜ì 으로 꾸러미를 ì„¤ì¹˜í•˜ê³ ì—…ê·¸ë ˆì´ë“œí• ë•Œ " "중지ë˜ì§€ë§Œ 현재 하나 ì´ìƒì˜ X ì„¸ì…˜ì„ ê´€ë¦¬í•˜ëŠ” ì¤‘ì¸ ê²ƒ 같습니다." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"kdmì„ ì§€ê¸ˆ 중지시키면 kdmì´ ê´€ë¦¬í•˜ê³ ìžˆëŠ” X ì„¸ì…˜ì€ ëª¨ë‘ ì¤‘ë‹¨ë©ë‹ˆë‹¤. 지금 중지" +"tdmì„ ì§€ê¸ˆ 중지시키면 tdmì´ ê´€ë¦¬í•˜ê³ ìžˆëŠ” X ì„¸ì…˜ì€ ëª¨ë‘ ì¤‘ë‹¨ë©ë‹ˆë‹¤. 지금 중지" "시키지 않으면 새로 설치한 ë²„ì „ì€ ë°ëª¬ì„ 다시 ì‹œìž‘í• ë•Œë¶€í„° 사용ë©ë‹ˆë‹¤." diff --git a/ubuntu/maverick_automake/kdebase/debian/po/ml.po b/ubuntu/maverick_automake/kdebase/debian/po/ml.po index b4b07f9b2..9e28db764 100644 --- a/ubuntu/maverick_automake/kdebase/debian/po/ml.po +++ b/ubuntu/maverick_automake/kdebase/debian/po/ml.po @@ -1,11 +1,11 @@ -# Malayalam translation of kdm debconf template. +# Malayalam translation of tdm debconf template. # Copyright (C) 2007 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the kdm package. +# This file is distributed under the same license as the tdm package. # Praveen|à´ªàµà´°à´µàµ€à´£àµâ€ A|à´Ž <pravi.a@gmail.com>, Anivar|അനിവരàµâ€ Aravind|അരവിനàµà´¦àµ <anivar@movingrepublic.org> 2007. # msgid "" msgstr "" -"Project-Id-Version: kdm 1.0\n" +"Project-Id-Version: tdm 1.0\n" "Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n" "POT-Creation-Date: 2007-03-23 07:15+0100\n" "PO-Revision-Date: 2007-03-23 09:46+0530\n" @@ -18,13 +18,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "ഡിഫാളàµâ€à´Ÿàµà´Ÿà´¾à´¯à´¿ വേണàµà´Ÿ à´ªàµà´°à´¦à´°àµâ€à´¶à´¨ മാനേജരàµâ€:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -33,7 +33,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -45,7 +45,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -59,29 +59,29 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "kdm ഡീമണെ നിരàµâ€à´¤àµà´¤à´¿à´•àµà´•àµ‡à´¾à´Ÿàµà´Ÿàµ†?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "tdm ഡീമണെ നിരàµâ€à´¤àµà´¤à´¿à´•àµà´•àµ‡à´¾à´Ÿàµà´Ÿàµ†?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"കെ à´ªàµà´°à´¦à´°àµâ€à´¶à´¨ മാനേജരàµâ€ (kdm) ഡീമണàµâ€ സാധാരണയായി പാകàµà´•àµ‡à´œàµ à´ªàµà´¤àµà´•àµà´•à´²à´¿à´¨àµà´±àµ‡à´¯àµà´‚ നീകàµà´•à´‚ " +"കെ à´ªàµà´°à´¦à´°àµâ€à´¶à´¨ മാനേജരàµâ€ (tdm) ഡീമണàµâ€ സാധാരണയായി പാകàµà´•àµ‡à´œàµ à´ªàµà´¤àµà´•àµà´•à´²à´¿à´¨àµà´±àµ‡à´¯àµà´‚ നീകàµà´•à´‚ " "ചെയàµà´¯à´²à´¿à´¨àµà´±àµ‡à´¯àµà´‚ സമയതàµà´¤à´¾à´£àµ നിരàµâ€à´¤àµà´¤à´¾à´±àµà´³àµà´³à´¤àµ, പകàµà´·àµ‡ à´ªàµà´°à´µà´°àµâ€à´¤àµà´¤à´¿à´šàµà´šàµà´•àµŠà´£àµà´Ÿà´¿à´°à´¿à´•àµà´•àµà´¨àµà´¨ ഒരൠഎകàµà´¸àµ " "സെഷനെയെങàµà´•à´¿à´²àµà´‚ ഇപàµà´ªàµ‹à´³àµâ€ ഇതൠനിയനàµà´¤àµà´°à´¿à´šàµà´šàµà´•àµŠà´£àµà´Ÿà´¿à´°à´¿à´•àµà´•àµà´¨àµà´¨à´¤àµ പോലെ തോനàµà´¨àµà´¨àµà´¨àµ." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"kdm ഇപàµà´ªàµ‹à´³àµâ€ നിരàµâ€à´¤àµà´¤àµà´•à´¯à´¾à´£àµ†à´™àµà´•à´¿à´²àµâ€, ഇതൠനിയനàµà´¤àµà´°à´¿à´šàµà´šàµà´•àµŠà´£àµà´Ÿà´¿à´°à´¿à´•àµà´•àµà´¨àµà´¨ à´Žà´•àµà´¸àµ സെഷനàµà´•à´³àµà´‚ " +"tdm ഇപàµà´ªàµ‹à´³àµâ€ നിരàµâ€à´¤àµà´¤àµà´•à´¯à´¾à´£àµ†à´™àµà´•à´¿à´²àµâ€, ഇതൠനിയനàµà´¤àµà´°à´¿à´šàµà´šàµà´•àµŠà´£àµà´Ÿà´¿à´°à´¿à´•àµà´•àµà´¨àµà´¨ à´Žà´•àµà´¸àµ സെഷനàµà´•à´³àµà´‚ " "അവസാനിപàµà´ªà´¿à´•àµà´•àµà´¨àµà´¨à´¤à´¾à´¯à´¿à´°à´¿à´•àµà´•àµà´‚. à´…à´²àµà´²àµ†à´™àµà´•à´¿à´²àµâ€, à´…à´Ÿàµà´¤àµà´¤ തവണ ഡീമണàµâ€ വീണàµà´Ÿàµà´‚ à´¤àµà´Ÿà´™àµà´™àµà´®àµà´ªàµ‹à´³àµâ€ à´ªàµà´¤à´¿à´¯ ലകàµà´•à´‚ " "നിലവിലàµâ€ വരàµà´‚." diff --git a/ubuntu/maverick_automake/kdebase/debian/po/nb.po b/ubuntu/maverick_automake/kdebase/debian/po/nb.po index f770838af..87e1fefb3 100644 --- a/ubuntu/maverick_automake/kdebase/debian/po/nb.po +++ b/ubuntu/maverick_automake/kdebase/debian/po/nb.po @@ -18,13 +18,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Standard skjermstyrer:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -34,7 +34,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -45,7 +45,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -59,26 +59,26 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Stoppe kdm-nissen?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Stoppe tdm-nissen?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Nissen K Desktop Manager (kdm) stoppes normalt nÃ¥r dens pakke fjernes eller " +"Nissen K Desktop Manager (tdm) stoppes normalt nÃ¥r dens pakke fjernes eller " "oppgraderes, men det ser ut til at den styrer minst en pÃ¥gÃ¥ende X-økt." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." -msgstr "Hvis kdm stoppes nÃ¥ blir alle X-økter den styrer avbrutt. Ellers vil den nye versjonen blir tatt i bruk neste gang nissen startes." +msgstr "Hvis tdm stoppes nÃ¥ blir alle X-økter den styrer avbrutt. Ellers vil den nye versjonen blir tatt i bruk neste gang nissen startes." diff --git a/ubuntu/maverick_automake/kdebase/debian/po/nl.po b/ubuntu/maverick_automake/kdebase/debian/po/nl.po index 548713017..6956057bc 100644 --- a/ubuntu/maverick_automake/kdebase/debian/po/nl.po +++ b/ubuntu/maverick_automake/kdebase/debian/po/nl.po @@ -25,7 +25,7 @@ # msgid "" msgstr "" -"Project-Id-Version: kdm\n" +"Project-Id-Version: tdm\n" "Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n" "POT-Creation-Date: 2007-03-23 07:15+0100\n" "PO-Revision-Date: 2007-04-05 17:35+0100\n" @@ -38,52 +38,52 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Standaard beeldschermbeheerder:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "A display manager is a program that provides graphical login capabilities for the X Window System." msgstr "Een beeldschermbeheerder is een programma waarmee u zich grafisch op het systeem kunt aanmelden, waarna u in de grafische omgeving (het X Window System) terecht komt." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Only one display manager can manage a given X server, but multiple display manager packages are installed. Please select which display manager should run by default." msgstr "Elke X-server kan door slechts één beeldschermbeheerder beheerd worden, hoewel er meerdere beeldschermbeheerders geïnstalleerd kunnen zijn. Welke beeldschermbeheerder dient standaard gebruikt te worden?" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Multiple display managers can run simultaneously if they are configured to manage different servers; to achieve this, configure the display managers accordingly, edit each of their init scripts in /etc/init.d, and disable the check for a default display manager." msgstr "Het is mogelijk om meerdere beeldschermbeheerders tegelijk te draaien zolang deze verschillende servers beheren. Om dat te bereiken dient u de beeldschermbeheerders overeenkomstig in te stellen door in hun init-scripts (in /etc/init.d) de controle of ze de standaard beeldschermbeheerder zijn uit te schakelen." #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Wilt u de kdm-achtergronddienst stoppen?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Wilt u de tdm-achtergronddienst stoppen?" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "The K Desktop manager (kdm) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session." -msgstr "Normaal wordt de kdm-achtergronddienst gestopt bij opwaardering en verwijdering van het pakket kdm; momenteel blijkt deze echter minstens 1 X-sessie te beheren." +#: ../tdm.templates:3001 +msgid "The K Desktop manager (tdm) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session." +msgstr "Normaal wordt de tdm-achtergronddienst gestopt bij opwaardering en verwijdering van het pakket tdm; momenteel blijkt deze echter minstens 1 X-sessie te beheren." #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "If kdm is stopped now, any X sessions it manages will be terminated. Otherwise, the new version will take effect the next time the daemon is restarted." -msgstr "Als kdm nu gestopt wordt, worden alle door kdm beheerde X-sessies afgesloten. Als u kdm nu laat draaien wordt de nieuwe versie pas actief de eerstvolgende keer dat de achtergronddienst herstart wordt. " +#: ../tdm.templates:3001 +msgid "If tdm is stopped now, any X sessions it manages will be terminated. Otherwise, the new version will take effect the next time the daemon is restarted." +msgstr "Als tdm nu gestopt wordt, worden alle door tdm beheerde X-sessies afgesloten. Als u tdm nu laat draaien wordt de nieuwe versie pas actief de eerstvolgende keer dat de achtergronddienst herstart wordt. " #~ msgid "" -#~ "The X display manager (kdm) daemon is typically stopped on package " +#~ "The X display manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " #~ "session." #~ msgstr "" -#~ "Normaal wordt de beeldschermbeheerder (kdm) gestopt bij opwaardering en " +#~ "Normaal wordt de beeldschermbeheerder (tdm) gestopt bij opwaardering en " #~ "verwijdering van dit pakket; momenteel is er echter minstens één lopende " #~ "X-sessie actief." #~ msgid "Select the desired default display manager." @@ -107,19 +107,19 @@ msgstr "Als kdm nu gestopt wordt, worden alle door kdm beheerde X-sessies afgesl #~ "bereiken, configureert u de weergavebeheerders op de gepaste wijze, " #~ "bewerkt u hun startscripts in /etc/init.d en schakelt u de controle voor " #~ "een standaard weergavebeheerder uit.)" -#~ msgid "Do you wish to stop the kdm daemon?" -#~ msgstr "Wilt u de kdm-achtergronddienst stoppen?" +#~ msgid "Do you wish to stop the tdm daemon?" +#~ msgstr "Wilt u de tdm-achtergronddienst stoppen?" #~ msgid "" -#~ "The K Desktop manager (kdm) daemon is typically stopped on package " +#~ "The K Desktop manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " -#~ "session. If kdm is stopped now, any X sessions it manages will be " -#~ "terminated. Otherwise you may leave kdm running, and the new version will " +#~ "session. If tdm is stopped now, any X sessions it manages will be " +#~ "terminated. Otherwise you may leave tdm running, and the new version will " #~ "take effect the next time the daemon is restarted." #~ msgstr "" -#~ "De K Desktop manager (kdm) achtergronddienst wordt typisch gestopt bij " +#~ "De K Desktop manager (tdm) achtergronddienst wordt typisch gestopt bij " #~ "pakketopwaarderingen en -verwijderingen, maar het blijkt minstens één " -#~ "actieve X-sessie te beheren. Als kdm nu wordt gestopt, dan zullen alle X-" -#~ "sessies die het beheert worden beëindigd. Anders kunt u kdm laten draaien " +#~ "actieve X-sessie te beheren. Als tdm nu wordt gestopt, dan zullen alle X-" +#~ "sessies die het beheert worden beëindigd. Anders kunt u tdm laten draaien " #~ "en zal de nieuwe versie gebruikt worden wanneer de achtergronddienst de " #~ "volgende keer wordt gestart." diff --git a/ubuntu/maverick_automake/kdebase/debian/po/pl.po b/ubuntu/maverick_automake/kdebase/debian/po/pl.po index 9f4940f7b..ff2df8574 100644 --- a/ubuntu/maverick_automake/kdebase/debian/po/pl.po +++ b/ubuntu/maverick_automake/kdebase/debian/po/pl.po @@ -26,14 +26,14 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "Default display manager:" msgstr "Wybierz domy¶lny display manager." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -43,7 +43,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "" "Only one display manager can manage a given X server, but multiple display " @@ -56,7 +56,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "" "Multiple display managers can run simultaneously if they are configured to " @@ -71,21 +71,21 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy -msgid "Stop the kdm daemon?" -msgstr "Czy chcesz zatrzymaæ daemona kdm?" +msgid "Stop the tdm daemon?" +msgstr "Czy chcesz zatrzymaæ daemona tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" "Daemon K Desktop manager jest zazwyczaj zatrzymywany w czasie aktualizacji i " -"usuwania pakietu kdm, ale wygl±da na to, ¿e w tej chwili zarz±dza on " +"usuwania pakietu tdm, ale wygl±da na to, ¿e w tej chwili zarz±dza on " "conajmniej jedn± sesj± X Window. Je¶li zostanie on teraz zatrzymany, " "wszystkie zarz±dzane przez niego sesje zostan± przerwane. Mo¿na jednak nie " "zatrzymywaæ teraz tego daemona -- nowa wersja zacznie dzia³aæ przy jego " @@ -93,15 +93,15 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" "Daemon K Desktop manager jest zazwyczaj zatrzymywany w czasie aktualizacji i " -"usuwania pakietu kdm, ale wygl±da na to, ¿e w tej chwili zarz±dza on " +"usuwania pakietu tdm, ale wygl±da na to, ¿e w tej chwili zarz±dza on " "conajmniej jedn± sesj± X Window. Je¶li zostanie on teraz zatrzymany, " "wszystkie zarz±dzane przez niego sesje zostan± przerwane. Mo¿na jednak nie " "zatrzymywaæ teraz tego daemona -- nowa wersja zacznie dzia³aæ przy jego " diff --git a/ubuntu/maverick_automake/kdebase/debian/po/pt.po b/ubuntu/maverick_automake/kdebase/debian/po/pt.po index 9720aa0f0..7526913c8 100644 --- a/ubuntu/maverick_automake/kdebase/debian/po/pt.po +++ b/ubuntu/maverick_automake/kdebase/debian/po/pt.po @@ -20,13 +20,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Gestor de ecrã por omissão:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -36,7 +36,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -48,7 +48,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -63,39 +63,39 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Deseja parar o daemon kdm?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Deseja parar o daemon tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"O daemon do gestor de ecrã X (kdm) é tipicamente parado na actualização ou " +"O daemon do gestor de ecrã X (tdm) é tipicamente parado na actualização ou " "remoção de pacotes, mas parece que este está a gerir pelo menos uma sessão X " "activa." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Se o kdm for parado agora, todas as sessões X que este estiver a gerir serão " +"Se o tdm for parado agora, todas as sessões X que este estiver a gerir serão " "terminadas. Caso contrário, a nova versão terá efeito da próxima vez que o " "daemon for reiniciado." #~ msgid "" -#~ "The X display manager (kdm) daemon is typically stopped on package " +#~ "The X display manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " #~ "session." #~ msgstr "" -#~ "O daemon do gestor de ecrã X (kdm) é tipicamente parado na actualização " +#~ "O daemon do gestor de ecrã X (tdm) é tipicamente parado na actualização " #~ "ou remoção de pacotes, mas parece que este está a gerir pelo menos uma " #~ "sessão X activa." @@ -122,18 +122,18 @@ msgstr "" #~ "e edite um dos seus 'init scripts' em /etc/init.d, e desligue a " #~ "verificação do gestor de ecrã por omissão.)" -#~ msgid "Do you wish to stop the kdm daemon?" -#~ msgstr "Deseja desligar o daemon kdm?" +#~ msgid "Do you wish to stop the tdm daemon?" +#~ msgstr "Deseja desligar o daemon tdm?" #~ msgid "" -#~ "The K Desktop manager (kdm) daemon is typically stopped on package " +#~ "The K Desktop manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " -#~ "session. If kdm is stopped now, any X sessions it manages will be " -#~ "terminated. Otherwise you may leave kdm running, and the new version will " +#~ "session. If tdm is stopped now, any X sessions it manages will be " +#~ "terminated. Otherwise you may leave tdm running, and the new version will " #~ "take effect the next time the daemon is restarted." #~ msgstr "" -#~ "O daemon K Destop manager (kdm) é normalmente parado quando ocorre um " +#~ "O daemon K Destop manager (tdm) é normalmente parado quando ocorre um " #~ "upgrade ou remoção do pacote, no entanto parece que se encontra pelo " -#~ "menos uma sessão X em andamento. Se o kdm for parado agora, todas as " -#~ "sessões X serão terminadas. Por outro lado, pode deixar o kdm a correr e " +#~ "menos uma sessão X em andamento. Se o tdm for parado agora, todas as " +#~ "sessões X serão terminadas. Por outro lado, pode deixar o tdm a correr e " #~ "a nova versão irá ser usada na próxima vez que o daemon for reiniciado." diff --git a/ubuntu/maverick_automake/kdebase/debian/po/pt_BR.po b/ubuntu/maverick_automake/kdebase/debian/po/pt_BR.po index 8cf324e24..b24bcdadd 100644 --- a/ubuntu/maverick_automake/kdebase/debian/po/pt_BR.po +++ b/ubuntu/maverick_automake/kdebase/debian/po/pt_BR.po @@ -22,13 +22,13 @@ msgstr "pt_BR utf-8\n" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Gerenciador de sessão padrão:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -38,7 +38,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -50,7 +50,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -65,28 +65,28 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Deseja parar o daemon kdm?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Deseja parar o daemon tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." -msgstr "O K Desktop manager (kdm) é tipicamente parado em atualizações e " +msgstr "O K Desktop manager (tdm) é tipicamente parado em atualizações e " "remoções de pacotes, mas parece que ele está gerenciando pelo menos uma " "seção X em execução." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Caso o kdm seja parado agora, quaisquer sessões X que ele esteja gerenciando " +"Caso o tdm seja parado agora, quaisquer sessões X que ele esteja gerenciando " "serão encerradas. Caso contrário a nova versão terá efeito na próxima vez " "que o daemon for reiniciado." diff --git a/ubuntu/maverick_automake/kdebase/debian/po/ro.po b/ubuntu/maverick_automake/kdebase/debian/po/ro.po index 13bc24c72..f5e0f91d6 100644 --- a/ubuntu/maverick_automake/kdebase/debian/po/ro.po +++ b/ubuntu/maverick_automake/kdebase/debian/po/ro.po @@ -20,14 +20,14 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "Default display manager:" msgstr "AlegeÅ£i administratorul de ecran implicit, pe care îl doriÅ£i." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -37,7 +37,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "" "Only one display manager can manage a given X server, but multiple display " @@ -50,7 +50,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "" "Multiple display managers can run simultaneously if they are configured to " @@ -66,36 +66,36 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy -msgid "Stop the kdm daemon?" -msgstr "DoriÅ£i să opriÅ£i demonul kdm?" +msgid "Stop the tdm daemon?" +msgstr "DoriÅ£i să opriÅ£i demonul tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Demonul K Desktop manager (kdm) este oprit de obicei la actualizarea " +"Demonul K Desktop manager (tdm) este oprit de obicei la actualizarea " "pachetuluiÅŸi la eliminarea sa, dar se pare că acum administrează o sesiune X " -"de lucru.Dacă demonul kdm este oprit acum, orice sesiune X pe care o " -"administrează va fi oprită. O alternativă ar fi să lăsaÅ£i kdm să ruleze, iar " +"de lucru.Dacă demonul tdm este oprit acum, orice sesiune X pe care o " +"administrează va fi oprită. O alternativă ar fi să lăsaÅ£i tdm să ruleze, iar " "noua versiune va ruladata viitoare când demonul va fi repornit." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Demonul K Desktop manager (kdm) este oprit de obicei la actualizarea " +"Demonul K Desktop manager (tdm) este oprit de obicei la actualizarea " "pachetuluiÅŸi la eliminarea sa, dar se pare că acum administrează o sesiune X " -"de lucru.Dacă demonul kdm este oprit acum, orice sesiune X pe care o " -"administrează va fi oprită. O alternativă ar fi să lăsaÅ£i kdm să ruleze, iar " +"de lucru.Dacă demonul tdm este oprit acum, orice sesiune X pe care o " +"administrează va fi oprită. O alternativă ar fi să lăsaÅ£i tdm să ruleze, iar " "noua versiune va ruladata viitoare când demonul va fi repornit." diff --git a/ubuntu/maverick_automake/kdebase/debian/po/ru.po b/ubuntu/maverick_automake/kdebase/debian/po/ru.po index 08b8d489e..e1a392d8c 100644 --- a/ubuntu/maverick_automake/kdebase/debian/po/ru.po +++ b/ubuntu/maverick_automake/kdebase/debian/po/ru.po @@ -42,13 +42,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Менеджер диÑплеев по умолчанию:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -58,7 +58,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -70,7 +70,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -84,30 +84,30 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "ОÑтановить Ñервер-демон kdm?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "ОÑтановить Ñервер-демон tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Сервер-демон менеджера K Desktop (kdm) обычно оÑтанавливают при обновлении " -"или удалении пакета, но, кажетÑÑ, что kdm ÑÐµÐ¹Ñ‡Ð°Ñ ÑƒÐ¿Ñ€Ð°Ð²Ð»Ñет по крайней мере " +"Сервер-демон менеджера K Desktop (tdm) обычно оÑтанавливают при обновлении " +"или удалении пакета, но, кажетÑÑ, что tdm ÑÐµÐ¹Ñ‡Ð°Ñ ÑƒÐ¿Ñ€Ð°Ð²Ð»Ñет по крайней мере " "одним X-ÑеанÑом." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"ЕÑли ÑÐµÐ¹Ñ‡Ð°Ñ Ð¾Ñтановить kdm, то вÑе управлÑемые им X-ÑеанÑÑ‹ будут прерваны. " -"Или вы можете не оÑтанавливать kdm, и тогда Ð½Ð¾Ð²Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ð±ÑƒÐ´ÐµÑ‚ загружена " -"тогда, когда kdm Ñнова перезапуÑÑ‚ÑÑ‚." +"ЕÑли ÑÐµÐ¹Ñ‡Ð°Ñ Ð¾Ñтановить tdm, то вÑе управлÑемые им X-ÑеанÑÑ‹ будут прерваны. " +"Или вы можете не оÑтанавливать tdm, и тогда Ð½Ð¾Ð²Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ð±ÑƒÐ´ÐµÑ‚ загружена " +"тогда, когда tdm Ñнова перезапуÑÑ‚ÑÑ‚." diff --git a/ubuntu/maverick_automake/kdebase/debian/po/sk.po b/ubuntu/maverick_automake/kdebase/debian/po/sk.po index e7b350961..4c6241e4a 100644 --- a/ubuntu/maverick_automake/kdebase/debian/po/sk.po +++ b/ubuntu/maverick_automake/kdebase/debian/po/sk.po @@ -21,13 +21,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Zvoľte predvoleného správcu obrazovky:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -37,7 +37,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -48,7 +48,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -62,30 +62,30 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "ZastaviÅ¥ správcu obrazovky kdm?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "ZastaviÅ¥ správcu obrazovky tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Správca obrazovky K desktop manager (kdm) sa zvykne zastaviÅ¥ pri " +"Správca obrazovky K desktop manager (tdm) sa zvykne zastaviÅ¥ pri " "aktualizácii alebo odstraňovanà balÃka, lenže teraz to vyzerá tak, že má na " "starosti aspoň jedno ÄalÅ¡ie spustené X sedenie." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Ak by sa teraz kdm zastavil, vÅ¡etky nÃm ovládané X sedenia by sa ukonÄili. V " -"opaÄnom prÃpade môžete nechaÅ¥ kdm spustený, priÄom nová verzia sa spustà pri " -"ÄalÅ¡om reÅ¡tarte kdm." +"Ak by sa teraz tdm zastavil, vÅ¡etky nÃm ovládané X sedenia by sa ukonÄili. V " +"opaÄnom prÃpade môžete nechaÅ¥ tdm spustený, priÄom nová verzia sa spustà pri " +"ÄalÅ¡om reÅ¡tarte tdm." diff --git a/ubuntu/maverick_automake/kdebase/debian/po/sv.po b/ubuntu/maverick_automake/kdebase/debian/po/sv.po index fd2409ee1..080dde351 100644 --- a/ubuntu/maverick_automake/kdebase/debian/po/sv.po +++ b/ubuntu/maverick_automake/kdebase/debian/po/sv.po @@ -41,52 +41,52 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Standarddisplayhanterare:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "A display manager is a program that provides graphical login capabilities for the X Window System." msgstr "En displayhanterare är ett program som tillhandahÃ¥ller grafiska inloggningsmöjligheter för X Window System." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Only one display manager can manage a given X server, but multiple display manager packages are installed. Please select which display manager should run by default." msgstr "Endast en displayhanterare kan hantera en angiven X-server men flera displayhanterarpaket är installerade. Välj vilken displayhanterare som skall köras som standard." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Multiple display managers can run simultaneously if they are configured to manage different servers; to achieve this, configure the display managers accordingly, edit each of their init scripts in /etc/init.d, and disable the check for a default display manager." msgstr "Flera displayhanterare kan köras samtidigt om de är konfigurerade att hantera olika servrar. För att uppnÃ¥ detta ska du konfigurera displayhanterarnas pÃ¥ lämpligt sätt, redigera dess init-skript under /etc/init.d och inaktivera kontrollen efter en standarddisplayhanterare." #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Stoppa kdm-demonen?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Stoppa tdm-demonen?" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "The K Desktop manager (kdm) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session." -msgstr "K Desktop manager-demonen (kdm) stoppas vanligtvis vid paketuppgradering och borttagning men det verkar som om den hanterar Ã¥tminstone en körande X-session." +#: ../tdm.templates:3001 +msgid "The K Desktop manager (tdm) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session." +msgstr "K Desktop manager-demonen (tdm) stoppas vanligtvis vid paketuppgradering och borttagning men det verkar som om den hanterar Ã¥tminstone en körande X-session." #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "If kdm is stopped now, any X sessions it manages will be terminated. Otherwise, the new version will take effect the next time the daemon is restarted." -msgstr "Om kdm stoppas nu kommer de X-sessioner som den hanterar att avslutas. Om inte kommer den nya versionen att bli aktiverad nästa gÃ¥ng som demonen startas om." +#: ../tdm.templates:3001 +msgid "If tdm is stopped now, any X sessions it manages will be terminated. Otherwise, the new version will take effect the next time the daemon is restarted." +msgstr "Om tdm stoppas nu kommer de X-sessioner som den hanterar att avslutas. Om inte kommer den nya versionen att bli aktiverad nästa gÃ¥ng som demonen startas om." #~ msgid "" -#~ "The X display manager (kdm) daemon is typically stopped on package " +#~ "The X display manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " #~ "session." #~ msgstr "" -#~ "X-displayhanterardemonen (kdm) stoppas vanligtvis vid paketuppgradering " +#~ "X-displayhanterardemonen (tdm) stoppas vanligtvis vid paketuppgradering " #~ "och borttagning men det verkar som om den hanterar Ã¥tminstone en körande " #~ "X-session." #~ msgid "Select the desired default display manager." @@ -109,18 +109,18 @@ msgstr "Om kdm stoppas nu kommer de X-sessioner som den hanterar att avslutas. O #~ "hantera olika servrar, för att göra detta, konfigurera fönsterhanterarna " #~ "genom att ändra respektives init-skript i /etc/init.d och stäng av " #~ "kontrollen för standard fönsterhanterare.)" -#~ msgid "Do you wish to stop the kdm daemon?" -#~ msgstr "Vill du stoppa kdm-daemonen?" +#~ msgid "Do you wish to stop the tdm daemon?" +#~ msgstr "Vill du stoppa tdm-daemonen?" #~ msgid "" -#~ "The K Desktop manager (kdm) daemon is typically stopped on package " +#~ "The K Desktop manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " -#~ "session. If kdm is stopped now, any X sessions it manages will be " -#~ "terminated. Otherwise you may leave kdm running, and the new version will " +#~ "session. If tdm is stopped now, any X sessions it manages will be " +#~ "terminated. Otherwise you may leave tdm running, and the new version will " #~ "take effect the next time the daemon is restarted." #~ msgstr "" -#~ "Daemonen (kdm) för skrivbordsmiljön KDE stoppas normalt vid uppgradering " +#~ "Daemonen (tdm) för skrivbordsmiljön KDE stoppas normalt vid uppgradering " #~ "och avinstallation av paketet men det verkar som om den hanterar " -#~ "Ã¥tminstone en körande X-session. Om kdm stoppas nu kommer de X-sessioner " -#~ "den hanterar att avslutas. Annars kan du lämna kdm körande och den nya " +#~ "Ã¥tminstone en körande X-session. Om tdm stoppas nu kommer de X-sessioner " +#~ "den hanterar att avslutas. Annars kan du lämna tdm körande och den nya " #~ "versioner blir aktiverad nästa gÃ¥ng daemonen startas om." diff --git a/ubuntu/maverick_automake/kdebase/debian/po/ta.po b/ubuntu/maverick_automake/kdebase/debian/po/ta.po index 993ae3933..eb68492d6 100644 --- a/ubuntu/maverick_automake/kdebase/debian/po/ta.po +++ b/ubuntu/maverick_automake/kdebase/debian/po/ta.po @@ -18,13 +18,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "à®®à¯à®©à¯à®©à®¿à®°à¯à®ªà¯à®ªà¯ காடà¯à®šà®¿ மேலாளரà¯:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -34,7 +34,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -45,7 +45,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -59,15 +59,15 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "கேடிஎம௠கிஙà¯à®•à®°à®©à¯ˆ (kdm daemon) நிறà¯à®¤à¯à®¤à®µà®¾?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "கேடிஎம௠கிஙà¯à®•à®°à®©à¯ˆ (tdm daemon) நிறà¯à®¤à¯à®¤à®µà®¾?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" "கே மேலà¯à®®à¯‡à®šà¯ˆ மேலாளர௠(கேடிஎமà¯) கிஙà¯à®•à®°à®©à¯ வழகà¯à®•à®®à®¾à®• பொதி மேலாகà¯à®•à®®à¯ அலà¯à®²à®¤à¯ நீகà¯à®•à®®à¯ நிகழà¯à®®à¯ போத௠நிறà¯à®¤à¯à®¤à®ªà¯ படà¯à®®à¯. " @@ -75,9 +75,9 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" diff --git a/ubuntu/maverick_automake/kdebase/debian/po/templates.pot b/ubuntu/maverick_automake/kdebase/debian/po/templates.pot index f8b19923e..42689d3b2 100644 --- a/ubuntu/maverick_automake/kdebase/debian/po/templates.pot +++ b/ubuntu/maverick_automake/kdebase/debian/po/templates.pot @@ -18,13 +18,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -32,7 +32,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -41,7 +41,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -51,23 +51,23 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" diff --git a/ubuntu/maverick_automake/kdebase/debian/po/tr.po b/ubuntu/maverick_automake/kdebase/debian/po/tr.po index bc0e664d2..2cc7c274e 100644 --- a/ubuntu/maverick_automake/kdebase/debian/po/tr.po +++ b/ubuntu/maverick_automake/kdebase/debian/po/tr.po @@ -16,14 +16,14 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "Default display manager:" msgstr "Kullanmak istediÄŸiniz öntanımlı ekran yöneticisini seçin." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -32,7 +32,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "" "Only one display manager can manage a given X server, but multiple display " @@ -45,7 +45,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "" "Multiple display managers can run simultaneously if they are configured to " @@ -60,38 +60,38 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy -msgid "Stop the kdm daemon?" -msgstr "kdm servisini durdurmak istiyor musunuz?" +msgid "Stop the tdm daemon?" +msgstr "tdm servisini durdurmak istiyor musunuz?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"K Masaüstü yöneticisi (kdm) servisi, paket güncelleme ve kaldırma sırasında " -"genellikle durdurulur. Fakat öyle görünüyor ki kdm, çalışan (en az) bir X " -"oturumunu yönetiyor. EÄŸer kdm ÅŸimdi durdurulursa, yönetilen X oturumları da " -"sonlandırılacaktır. Böyle yapmak yerine kdm'i çalışır vaziyette " -"bırakabilirsiniz. Yeni sürüm, kdm servisinin bir sonraki çalıştırılışında " +"K Masaüstü yöneticisi (tdm) servisi, paket güncelleme ve kaldırma sırasında " +"genellikle durdurulur. Fakat öyle görünüyor ki tdm, çalışan (en az) bir X " +"oturumunu yönetiyor. EÄŸer tdm ÅŸimdi durdurulursa, yönetilen X oturumları da " +"sonlandırılacaktır. Böyle yapmak yerine tdm'i çalışır vaziyette " +"bırakabilirsiniz. Yeni sürüm, tdm servisinin bir sonraki çalıştırılışında " "etkin olacaktır." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"K Masaüstü yöneticisi (kdm) servisi, paket güncelleme ve kaldırma sırasında " -"genellikle durdurulur. Fakat öyle görünüyor ki kdm, çalışan (en az) bir X " -"oturumunu yönetiyor. EÄŸer kdm ÅŸimdi durdurulursa, yönetilen X oturumları da " -"sonlandırılacaktır. Böyle yapmak yerine kdm'i çalışır vaziyette " -"bırakabilirsiniz. Yeni sürüm, kdm servisinin bir sonraki çalıştırılışında " +"K Masaüstü yöneticisi (tdm) servisi, paket güncelleme ve kaldırma sırasında " +"genellikle durdurulur. Fakat öyle görünüyor ki tdm, çalışan (en az) bir X " +"oturumunu yönetiyor. EÄŸer tdm ÅŸimdi durdurulursa, yönetilen X oturumları da " +"sonlandırılacaktır. Böyle yapmak yerine tdm'i çalışır vaziyette " +"bırakabilirsiniz. Yeni sürüm, tdm servisinin bir sonraki çalıştırılışında " "etkin olacaktır." diff --git a/ubuntu/maverick_automake/kdebase/debian/po/vi.po b/ubuntu/maverick_automake/kdebase/debian/po/vi.po index 0875e65e8..f45153cdb 100644 --- a/ubuntu/maverick_automake/kdebase/debian/po/vi.po +++ b/ubuntu/maverick_automake/kdebase/debian/po/vi.po @@ -18,13 +18,13 @@ msgstr "Project-Id-Version: kdebase_4-3.5.7-1\n" #.Type: select #.Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Bá»™ quản lý trình bà y mặc định:" #.Type: select #.Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -32,7 +32,7 @@ msgstr "Bá»™ quản lý trình bà y là chÆ°Æ¡ng trình cung cấp khả năng Ä #.Type: select #.Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -41,7 +41,7 @@ msgstr "Chỉ má»™t bá»™ quản lý trình bà y có quyá»n quản lý trình ph #.Type: select #.Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -51,23 +51,23 @@ msgstr "Nhiá»u bá»™ quản lý trình bà y vẫn có thể chạy đồng thá» #.Type: boolean #.Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Thôi trình ná»n kdm không?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Thôi trình ná»n tdm không?" #.Type: boolean #.Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." -msgstr "Trình ná»n quản lý mà n hình ná»n K (kdm) thÆ°á»ng bị thôi khi nâng cấp/gỡ bá» gói, nhÆ°ng hiện thá»i có vẻ là nó quản lý Ãt nhất má»™t phiên chạy X Ä‘ang hoạt Ä‘á»™ng." +msgstr "Trình ná»n quản lý mà n hình ná»n K (tdm) thÆ°á»ng bị thôi khi nâng cấp/gỡ bá» gói, nhÆ°ng hiện thá»i có vẻ là nó quản lý Ãt nhất má»™t phiên chạy X Ä‘ang hoạt Ä‘á»™ng." #.Type: boolean #.Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." -msgstr "Thôi chạy kdm ngay bây giá» thì phiên chạy X nà o được quản lý bởi nó sẽ bị chấm dứt. Không thì phiên bản má»›i sẽ có tác Ä‘á»™ng lần tá»›i khởi chạy lại trình ná»n." +msgstr "Thôi chạy tdm ngay bây giá» thì phiên chạy X nà o được quản lý bởi nó sẽ bị chấm dứt. Không thì phiên bản má»›i sẽ có tác Ä‘á»™ng lần tá»›i khởi chạy lại trình ná»n." diff --git a/ubuntu/maverick_automake/kdebase/debian/po/zh_CN.po b/ubuntu/maverick_automake/kdebase/debian/po/zh_CN.po index 31aca54f6..49be70d4b 100644 --- a/ubuntu/maverick_automake/kdebase/debian/po/zh_CN.po +++ b/ubuntu/maverick_automake/kdebase/debian/po/zh_CN.po @@ -6,7 +6,7 @@ # Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2005 # Ming Hua <minghua@rice.edu>, 2005,2007 # -# This file is distributed under the same license as the kdm package. +# This file is distributed under the same license as the tdm package. # Please see debian/copyright. # # Translators, if you are not familiar with the PO format, gettext @@ -36,13 +36,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "默认显示管ç†å™¨ï¼š" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -50,7 +50,7 @@ msgstr "显示管ç†å™¨æ˜¯ä¸º X 窗å£ç³»ç»Ÿæ供图形界é¢ç™»å½•æ¨¡å¼çš„程 #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -61,7 +61,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -74,27 +74,27 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "åœæ¢ kdm 守护进程å—？" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "åœæ¢ tdm 守护进程å—？" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"K æ¡Œé¢ç®¡ç†å™¨ (kdm) 守护进程通常会在软件包å‡çº§å’Œå¸è½½æ—¶è¢«åœæ¢ï¼Œä½†çœ‹èµ·æ¥å®ƒç›®å‰åœ¨" +"K æ¡Œé¢ç®¡ç†å™¨ (tdm) 守护进程通常会在软件包å‡çº§å’Œå¸è½½æ—¶è¢«åœæ¢ï¼Œä½†çœ‹èµ·æ¥å®ƒç›®å‰åœ¨" "管ç†ä¸€ä¸ªæˆ–多个æ£åœ¨è¿è¡Œçš„ X 会è¯ã€‚" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"如果 kdm 现在就被åœæ¢ï¼Œå®ƒæ‰€ç®¡ç†çš„全部 X 会è¯éƒ½ä¼šè¢«ä¸æ¢ã€‚如果ä¸åœæ¢ kdm，新安" +"如果 tdm 现在就被åœæ¢ï¼Œå®ƒæ‰€ç®¡ç†çš„全部 X 会è¯éƒ½ä¼šè¢«ä¸æ¢ã€‚如果ä¸åœæ¢ tdm，新安" "装的版本将会在守护进程下次é‡æ–°å¯åŠ¨æ—¶ç”Ÿæ•ˆã€‚" diff --git a/ubuntu/maverick_automake/kdebase/debian/rules b/ubuntu/maverick_automake/kdebase/debian/rules index a3d4dcc03..5451ff821 100755 --- a/ubuntu/maverick_automake/kdebase/debian/rules +++ b/ubuntu/maverick_automake/kdebase/debian/rules @@ -17,7 +17,7 @@ DEB_KDE_APIDOX := yes CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG) DEB_CONFIGURE_EXTRA_FLAGS := --with-shadow --without-java --with-pam=kde-kde3 --prefix=/opt/kde3 \ - --with-kcp-pam=kcheckpass-kde3 --with-kdm-pam=kdm-kde3 --with-kss-pam=kscreensaver-kde3 --with-extra-libs=/opt/kde3/lib \ + --with-kcp-pam=kcheckpass-kde3 --with-tdm-pam=tdm-kde3 --with-kss-pam=kscreensaver-kde3 --with-extra-libs=/opt/kde3/lib \ --with-extra-includes=/usr/include/sasl --with-usbids=/usr/share/misc/usb.ids --with-sudo-kdesu-backend \ --enable-closure @@ -225,15 +225,15 @@ binary-install/kdebase-data-kde3:: rm -rf debian/tmp/etc/xdg/* rm -rf debian/kdebase-data-kde3/etc/xdg/* -install/kdm-kde3:: - sed -i 's/#UseTheme=true/UseTheme=true/g' debian/tmp/etc/kde3/kdm/kdmrc - sed -i 's/Theme=@@@ToBeReplacedByDesktopBase@@@/Theme=\/opt\/kde3\/share\/apps\/kdm\/themes\/kubuntu-kde3/g' debian/tmp/etc/kde3/kdm/kdmrc +install/tdm-kde3:: + sed -i 's/#UseTheme=true/UseTheme=true/g' debian/tmp/etc/kde3/tdm/tdmrc + sed -i 's/Theme=@@@ToBeReplacedByDesktopBase@@@/Theme=\/opt\/kde3\/share\/apps\/tdm\/themes\/kubuntu-kde3/g' debian/tmp/etc/kde3/tdm/tdmrc -binary-install/kdm-kde3:: - mkdir -p debian/kdm-kde3/etc/init - install -p -D -m644 debian/kdm-kde3.conf debian/kdm-kde3/etc/init/kdm-kde3.conf - install -p -D -m644 debian/kdm-kde3.pam debian/kdm-kde3/etc/pam.d/kdm-kde3 - install -p -D -m644 debian/kdm-kde3-np.pam debian/kdm-kde3/etc/pam.d/kdm-kde3-np +binary-install/tdm-kde3:: + mkdir -p debian/tdm-kde3/etc/init + install -p -D -m644 debian/tdm-kde3.conf debian/tdm-kde3/etc/init/tdm-kde3.conf + install -p -D -m644 debian/tdm-kde3.pam debian/tdm-kde3/etc/pam.d/tdm-kde3 + install -p -D -m644 debian/tdm-kde3-np.pam debian/tdm-kde3/etc/pam.d/tdm-kde3-np binary-install/kcontrol-kde3:: mkdir -p debian/kcontrol/etc/udev/rules.d @@ -267,6 +267,6 @@ install/ksysguardd-kde3:: install -D -p -m0644 debian/tmp/etc/ksysguarddrc debian/ksysguardd-kde3/etc/kde3/ binary-install/ksmserver-kde3:: - install -p -D -m644 debian/tmp/opt/kde3/share/apps/kdm/sessions/kde.desktop debian/ksmserver-kde3/usr/share/xsessions/kde3.desktop + install -p -D -m644 debian/tmp/opt/kde3/share/apps/tdm/sessions/kde.desktop debian/ksmserver-kde3/usr/share/xsessions/kde3.desktop install -p -D -m755 debian/plasma.autodetect debian/ksmserver-kde3/usr/bin/plasma.autodetect install -p -D -m755 debian/plasma-desktop.autodetect debian/ksmserver-kde3/usr/bin/plasma-desktop.autodetect diff --git a/ubuntu/maverick_automake/kdebase/debian/source.lintian-overrides b/ubuntu/maverick_automake/kdebase/debian/source.lintian-overrides index 0787795d0..620c1d904 100644 --- a/ubuntu/maverick_automake/kdebase/debian/source.lintian-overrides +++ b/ubuntu/maverick_automake/kdebase/debian/source.lintian-overrides @@ -1,2 +1,2 @@ -kdebase source: maintainer-script-lacks-debhelper-token debian/kdm-kde3.postinst -kdebase source: maintainer-script-lacks-debhelper-token debian/kdm-kde3.prerm +kdebase source: maintainer-script-lacks-debhelper-token debian/tdm-kde3.postinst +kdebase source: maintainer-script-lacks-debhelper-token debian/tdm-kde3.prerm diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity-np.pam b/ubuntu/maverick_automake/kdebase/debian/tdm-kde3-np.pam index a13232b98..4cada235b 100644 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity-np.pam +++ b/ubuntu/maverick_automake/kdebase/debian/tdm-kde3-np.pam @@ -1,5 +1,5 @@ # -# /etc/pam.d/kdm-np - specify the PAM behaviour of kdm for passwordless logins +# /etc/pam.d/tdm-np - specify the PAM behaviour of tdm for passwordless logins # auth required pam_nologin.so auth required pam_env.so readenv=1 diff --git a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.README.Debian b/ubuntu/maverick_automake/kdebase/debian/tdm-kde3.README.Debian index 438b8d910..f7f09290b 100644 --- a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.README.Debian +++ b/ubuntu/maverick_automake/kdebase/debian/tdm-kde3.README.Debian @@ -1,23 +1,23 @@ -KDM in Debian +TDM in Debian ============= -This package comes with a copy of the KDM handbook in docbook format. -To read it, run "khelpcenter help:/kdm" from a command-line or go to the -URL "help:/kdm" in konqueror. +This package comes with a copy of the TDM handbook in docbook format. +To read it, run "khelpcenter help:/tdm" from a command-line or go to the +URL "help:/tdm" in konqueror. -By default, the use of special graphical themes with KDM is disabled. -If you wish to use the 'Circles' theme that comes with the kdm package, or +By default, the use of special graphical themes with TDM is disabled. +If you wish to use the 'Circles' theme that comes with the tdm package, or any other theme that you have installed, you should research the -'UseTheme' and 'Theme' fields in /etc/kde3/kdm/kdmrc. This can be done +'UseTheme' and 'Theme' fields in /etc/kde3/tdm/tdmrc. This can be done by browsing this URL in Konqueror: -help:/kdm/kdm-files.html#kdmrc-greeter +help:/tdm/tdm-files.html#tdmrc-greeter -KDM Customization +TDM Customization ================= We provide a way to override theme-related values normally set in the -master configuration file (kdmrc): +master configuration file (tdmrc): * USEBACKGROUND * BACKGROUNDCFG * USETHEME @@ -31,7 +31,7 @@ and background configuration file (backgroundrc): * WALLPAPER You just need to create a file with overridden value(s) and put it in -kdm override directory (default is /etc/default/kdm.d). +tdm override directory (default is /etc/default/tdm.d). ================================================ Below this is direct from the xdm package README diff --git a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.conf b/ubuntu/maverick_automake/kdebase/debian/tdm-kde3.conf index 40acdd6b6..f6da8a4b0 100755 --- a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.conf +++ b/ubuntu/maverick_automake/kdebase/debian/tdm-kde3.conf @@ -1,4 +1,4 @@ -# kdm-kde3 - K Display Manager +# tdm-kde3 - K Display Manager # # The display manager service manages the X servers running on the # system, providing login and auto-login services @@ -18,7 +18,7 @@ emits starting-dm respawn script - [ ! -f /etc/X11/default-display-manager -o "$(cat /etc/X11/default-display-manager 2>/dev/null)" = "/opt/kde3/bin/kdm" ] + [ ! -f /etc/X11/default-display-manager -o "$(cat /etc/X11/default-display-manager 2>/dev/null)" = "/opt/kde3/bin/tdm" ] # Check kernel command-line for inhibitors for ARG in $(cat /proc/cmdline) @@ -38,11 +38,11 @@ script export LANG LANGUAGE fi - KDEDIRS=/opt/kde3/ + TDEDIRS=/opt/kde3/ PATH=/opt/kde3/bin:/bin:/usr/bin:/sbin:/usr/sbin - initctl emit starting-dm DM=kdm-kde3 + initctl emit starting-dm DM=tdm-kde3 - exec /opt/kde3/bin/kdm + exec /opt/kde3/bin/tdm end script diff --git a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.config b/ubuntu/maverick_automake/kdebase/debian/tdm-kde3.config index 9a19df1e0..1ecedb65c 100644 --- a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.config +++ b/ubuntu/maverick_automake/kdebase/debian/tdm-kde3.config @@ -1,5 +1,5 @@ #!/bin/sh -# Debian kdm package configuration script +# Debian tdm package configuration script # stolen from the xdm scripts # Copyright 2000--2003 Branden Robinson. # Licensed under the GNU General Public License, version 2. See the file @@ -10,7 +10,7 @@ set -e # source debconf library . /usr/share/debconf/confmodule -THIS_PACKAGE=kdm-kde3 +THIS_PACKAGE=tdm-kde3 # set default display manager DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager @@ -38,9 +38,9 @@ if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then CURRENT_DEFAULT=$(grep -v '^[[:space:]]*#' \ "$DEFAULT_DISPLAY_MANAGER_FILE" | head -n 1) - # both the binaries for kdm and kdm-kde4 share the same basename - # so we need to check if it's kdm-kde4 or another display manager - if [ "$CURRENT_DEFAULT" = "/usr/lib/kde4/bin/kdm" ]; then + # both the binaries for tdm and tdm-kde4 share the same basename + # so we need to check if it's tdm-kde4 or another display manager + if [ "$CURRENT_DEFAULT" = "/usr/lib/kde4/bin/tdm" ]; then CURRENT_DEFAULT=${THIS_PACKAGE}-kde4 else CURRENT_DEFAULT=$(basename $CURRENT_DEFAULT) diff --git a/ubuntu/maverick_automake/kdebase/debian/tdm-kde3.dirs b/ubuntu/maverick_automake/kdebase/debian/tdm-kde3.dirs new file mode 100644 index 000000000..38d09f9d8 --- /dev/null +++ b/ubuntu/maverick_automake/kdebase/debian/tdm-kde3.dirs @@ -0,0 +1,2 @@ +etc/default/tdm-kde3.d +var/lib/tdm-kde3 diff --git a/ubuntu/maverick_automake/kdebase/debian/tdm-kde3.install b/ubuntu/maverick_automake/kdebase/debian/tdm-kde3.install new file mode 100644 index 000000000..f5747fbba --- /dev/null +++ b/ubuntu/maverick_automake/kdebase/debian/tdm-kde3.install @@ -0,0 +1,52 @@ +debian/local/tdm.options etc/kde3/tdm/ +debian/tmp/etc/kde3/tdm/tdmrc +debian/tmp/etc/kde3/tdm/Xaccess +debian/tmp/etc/kde3/tdm/Xreset +debian/tmp/etc/kde3/tdm/Xsession +debian/tmp/etc/kde3/tdm/Xsetup +debian/tmp/etc/kde3/tdm/Xstartup +debian/tmp/etc/kde3/tdm/Xwilling +debian/tmp/opt/kde3/bin/gentdmconf +debian/tmp/opt/kde3/bin/tdm +debian/tmp/opt/kde3/bin/tdm_config +debian/tmp/opt/kde3/bin/tdmctl +debian/tmp/opt/kde3/bin/tdm_greet +debian/tmp/opt/kde3/bin/krootimage +debian/tmp/opt/kde3/share/apps/tdm/pics/kdelogo-crystal.png +debian/tmp/opt/kde3/share/apps/tdm/pics/kdelogo.png +debian/tmp/opt/kde3/share/apps/tdm/pics/shutdown.jpg +debian/tmp/opt/kde3/share/apps/tdm/pics/users/default1.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/default2.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/default3.png +debian/tmp/opt/kde3/share/apps/tdm/pics/users/root1.png +debian/tmp/opt/kde3/share/apps/tdm/sessions/9wm.desktop +debian/tmp/opt/kde3/share/apps/tdm/sessions/aewm.desktop +debian/tmp/opt/kde3/share/apps/tdm/sessions/amaterus.desktop +debian/tmp/opt/kde3/share/apps/tdm/sessions/asclassic.desktop +debian/tmp/opt/kde3/share/apps/tdm/sessions/ctwm.desktop +debian/tmp/opt/kde3/share/apps/tdm/sessions/evilwm.desktop +debian/tmp/opt/kde3/share/apps/tdm/sessions/flwm.desktop +debian/tmp/opt/kde3/share/apps/tdm/sessions/lwm.desktop +debian/tmp/opt/kde3/share/apps/tdm/sessions/matchbox.desktop +debian/tmp/opt/kde3/share/apps/tdm/sessions/mwm.desktop +debian/tmp/opt/kde3/share/apps/tdm/sessions/olvwm.desktop +debian/tmp/opt/kde3/share/apps/tdm/sessions/olwm.desktop +debian/tmp/opt/kde3/share/apps/tdm/sessions/oroborus.desktop +debian/tmp/opt/kde3/share/apps/tdm/sessions/pwm.desktop +debian/tmp/opt/kde3/share/apps/tdm/sessions/twm.desktop +debian/tmp/opt/kde3/share/apps/tdm/sessions/ude.desktop +debian/tmp/opt/kde3/share/apps/tdm/sessions/vtwm.desktop +debian/tmp/opt/kde3/share/apps/tdm/sessions/wm2.desktop +debian/tmp/opt/kde3/share/apps/tdm/themes/circles/background.svg +debian/tmp/opt/kde3/share/apps/tdm/themes/circles/circles.xml +debian/tmp/opt/kde3/share/apps/tdm/themes/circles/flower.png +debian/tmp/opt/kde3/share/apps/tdm/themes/circles/GdmGreeterTheme.desktop +debian/tmp/opt/kde3/share/apps/tdm/themes/circles/help.png +debian/tmp/opt/kde3/share/apps/tdm/themes/circles/options.png +debian/tmp/opt/kde3/share/apps/tdm/themes/circles/screenshot.png +debian/tmp/opt/kde3/share/apps/tdm/themes/o2_enterprise +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdm/common +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdm/index.cache.bz2 +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdm/index.docbook +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdm/tdmrc-ref.docbook +debian/tmp/opt/kde3/share/doc/tdm/README diff --git a/ubuntu/maverick_automake/kdebase/debian/tdm-kde3.links b/ubuntu/maverick_automake/kdebase/debian/tdm-kde3.links new file mode 100644 index 000000000..1bdab2cb6 --- /dev/null +++ b/ubuntu/maverick_automake/kdebase/debian/tdm-kde3.links @@ -0,0 +1 @@ +opt/kde3/share/apps/tdm/pics/users/default1.png opt/kde3/share/apps/tdm/faces/.default.face diff --git a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.logrotate b/ubuntu/maverick_automake/kdebase/debian/tdm-kde3.logrotate index 174e086b6..99853b7ba 100644 --- a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.logrotate +++ b/ubuntu/maverick_automake/kdebase/debian/tdm-kde3.logrotate @@ -1,4 +1,4 @@ -/var/log/kdm-kde3.log { +/var/log/tdm-kde3.log { rotate 7 daily compress diff --git a/ubuntu/maverick_automake/kdebase/debian/tdm-kde3.manpages b/ubuntu/maverick_automake/kdebase/debian/tdm-kde3.manpages new file mode 100644 index 000000000..3c0748068 --- /dev/null +++ b/ubuntu/maverick_automake/kdebase/debian/tdm-kde3.manpages @@ -0,0 +1,6 @@ +debian/man/gentdmconf-kde3.1 +debian/man/tdm-kde3.1 +debian/man/tdm_config-kde3.1 +debian/man/tdmctl-kde3.1 +debian/man/tdm_greet-kde3.1 +debian/man/krootimage-kde3.1 diff --git a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.pam b/ubuntu/maverick_automake/kdebase/debian/tdm-kde3.pam index 1c6ebce63..6fc929be0 100644 --- a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.pam +++ b/ubuntu/maverick_automake/kdebase/debian/tdm-kde3.pam @@ -1,5 +1,5 @@ # -# /etc/pam.d/kdm-kde3 - specify the PAM behaviour of kdm +# /etc/pam.d/tdm-kde3 - specify the PAM behaviour of tdm # auth required pam_nologin.so auth required pam_env.so readenv=1 diff --git a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.postinst b/ubuntu/maverick_automake/kdebase/debian/tdm-kde3.postinst index 4df633c59..93207ff88 100644 --- a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.postinst +++ b/ubuntu/maverick_automake/kdebase/debian/tdm-kde3.postinst @@ -10,7 +10,7 @@ set -e DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager if [ ! -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then - DEFAULT_DISPLAY_MANAGER=kdm-kde3 + DEFAULT_DISPLAY_MANAGER=tdm-kde3 if db_get shared/default-x-display-manager; then DEFAULT_DISPLAY_MANAGER="$RET" fi @@ -48,9 +48,9 @@ fi # restarting the daemon may cause output to stdout db_stop -# don't start kdm if we are upgrading without stopping it +# don't start tdm if we are upgrading without stopping it NOSTART= -if [ -e /var/run/kdm-kde3.upgrade ]; then +if [ -e /var/run/tdm-kde3.upgrade ]; then NOSTART=yes fi # or if we're currently in X on the display it attempts to manage by default @@ -64,11 +64,11 @@ for HOST in "" \ fi done # or if it's already running -if start-stop-daemon --stop --quiet --signal 0 --pid /var/run/kdm.pid --name kdm-kde3; then +if start-stop-daemon --stop --quiet --signal 0 --pid /var/run/tdm.pid --name tdm-kde3; then NOSTART=yes fi # or if the options file says not to -if ! grep -qs ^restart-on-upgrade /etc/kde3/kdm/kdm.options; then +if ! grep -qs ^restart-on-upgrade /etc/kde3/tdm/tdm.options; then NOSTART=yes fi @@ -76,40 +76,40 @@ fi # md5sum of the stock Xservers shipped with KDE 3.3.2, which shipped with Sarge SARGEXSERVERS=d3ab063f564492e0e31830f56ccd350e -CONFIGLEVEL=`grep -s ^ConfigVersion= /etc/kde3/kdm/kdmrc | sed s/^ConfigVersion=//` +CONFIGLEVEL=`grep -s ^ConfigVersion= /etc/kde3/tdm/tdmrc | sed s/^ConfigVersion=//` -if [ -e /etc/kde3/kdm/kdmrc ]; then +if [ -e /etc/kde3/tdm/tdmrc ]; then if dpkg --compare-versions "$CONFIGLEVEL" ge "2.3"; then - KDMRCUPDATED=yes + TDMRCUPDATED=yes fi fi -if [ -e /etc/kde3/kdm/Xservers ]; then - if [ `md5sum /etc/kde3/kdm/Xservers | sed s/\ .*$//` = $SARGEXSERVERS ]; then +if [ -e /etc/kde3/tdm/Xservers ]; then + if [ `md5sum /etc/kde3/tdm/Xservers | sed s/\ .*$//` = $SARGEXSERVERS ]; then XSERVERSUNCHANGED=yes fi fi -# With KDE 3.4, /etc/kde3/kdm/Xservers is no longer required, so we remove it, if -# the user has updated their kdmrc (if they haven't, kdm notices and keeps using +# With KDE 3.4, /etc/kde3/tdm/Xservers is no longer required, so we remove it, if +# the user has updated their tdmrc (if they haven't, tdm notices and keeps using # Xservers), and if it wasn't touched, i.e. there are no local changes the user -# will want to merge into kdmrc. +# will want to merge into tdmrc. case "$1" in configure) - if [ ! -z $KDMRCUPDATED ] && [ ! -z $XSERVERSUNCHANGED ]; then - echo "Removing obsolete /etc/kde3/kdm/Xservers (detected no user changes)." - rm -f /etc/kde3/kdm/Xservers - elif [ ! -z $KDMRCUPDATED ] && [ -e /etc/kde3/kdm/Xservers ]; then - echo "Note that /etc/kde3/kdm/Xservers is no longer used by KDM." - echo "You must merge your changes (if any) into /etc/kde3/kdm/kdmrc manually." - echo "Otherwise, /etc/kde3/kdm/Xservers is safe to remove." + if [ ! -z $TDMRCUPDATED ] && [ ! -z $XSERVERSUNCHANGED ]; then + echo "Removing obsolete /etc/kde3/tdm/Xservers (detected no user changes)." + rm -f /etc/kde3/tdm/Xservers + elif [ ! -z $TDMRCUPDATED ] && [ -e /etc/kde3/tdm/Xservers ]; then + echo "Note that /etc/kde3/tdm/Xservers is no longer used by TDM." + echo "You must merge your changes (if any) into /etc/kde3/tdm/tdmrc manually." + echo "Otherwise, /etc/kde3/tdm/Xservers is safe to remove." fi - rm -f /etc/init.d/kdm-kde3 - ln -s /lib/init/upstart-job /etc/init.d/kdm-kde3 + rm -f /etc/init.d/tdm-kde3 + ln -s /lib/init/upstart-job /etc/init.d/tdm-kde3 ;; diff --git a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.postrm b/ubuntu/maverick_automake/kdebase/debian/tdm-kde3.postrm index 77e9f362d..f33a54fc4 100644 --- a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.postrm +++ b/ubuntu/maverick_automake/kdebase/debian/tdm-kde3.postrm @@ -2,7 +2,7 @@ case "$1" in purge) - rm -rf /var/log/kdm-kde3.log* + rm -rf /var/log/tdm-kde3.log* ;; remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) @@ -25,12 +25,12 @@ if [ "$1" = "abort-install" -o "$1" = "abort-upgrade" ]; then fi if [ "$1" = "purge" ]; then - for DIR in /var/lib/kdm-kde3; do + for DIR in /var/lib/tdm-kde3; do if [ -d "$DIR" ]; then rm -rf "$DIR" fi done - rm -f /var/log/kdm-kde3.log* + rm -f /var/log/tdm-kde3.log* fi #DEBHELPER# diff --git a/ubuntu/maverick_automake/kdebase/debian/tdm-kde3.preinst b/ubuntu/maverick_automake/kdebase/debian/tdm-kde3.preinst new file mode 100644 index 000000000..8160e6810 --- /dev/null +++ b/ubuntu/maverick_automake/kdebase/debian/tdm-kde3.preinst @@ -0,0 +1,29 @@ +#! /bin/sh -e + +case "$1" in + + upgrade) + rm -f /etc/kde3/debian/tdm-update-menu.sh + rm -f /etc/kde3/debian/tdm.options + rm -f /etc/kde3/tdm/pixmaps/XFree86bw.xpm + rm -f /etc/kde3/tdm/pixmaps/XFree86.xpm + rm -f /etc/kde3/tdm/Xresources + rm -f /etc/menu-methods/tdm + ;; + + install) + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; + +esac + +#DEBHELPER# + +exit 0 diff --git a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.prerm b/ubuntu/maverick_automake/kdebase/debian/tdm-kde3.prerm index 7142a2b61..6c3e8fb97 100644 --- a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.prerm +++ b/ubuntu/maverick_automake/kdebase/debian/tdm-kde3.prerm @@ -1,5 +1,5 @@ #! /bin/sh -# prerm script for kdm-kde3 +# prerm script for tdm-kde3 # # see: dh_installdeb(1) @@ -24,14 +24,14 @@ if [ -e /usr/share/debconf/confmodule ]; then fi case "$1" in - # we NEVER want to unconditionally stop kdm; see below + # we NEVER want to unconditionally stop tdm; see below upgrade|failed-upgrade) REMOVING= ;; remove|deconfigure) REMOVING=yes - rm -f /etc/init.d/kdm-kde3 + rm -f /etc/init.d/tdm-kde3 ;; *) @@ -41,14 +41,14 @@ case "$1" in esac STOP= -# are we supposed to restart on upgrade? if REMOVING kdm, we don't care what +# are we supposed to restart on upgrade? if REMOVING tdm, we don't care what # the user says, we have to stop the daemon -if grep -qs ^restart-on-upgrade /etc/kde3/kdm/kdm.options || +if grep -qs ^restart-on-upgrade /etc/kde3/tdm/tdm.options || [ -n "$REMOVING" ]; then - # is there an kdm process running? - if start-stop-daemon --stop --quiet --signal 0 --name kdm-kde3; then + # is there an tdm process running? + if start-stop-daemon --stop --quiet --signal 0 --name tdm-kde3; then # any children? - PARENTS=$(pidof /usr/bin/kdm-kde3 || true) + PARENTS=$(pidof /usr/bin/tdm-kde3 || true) CHILDREN= if [ -n "$PARENTS" ]; then for PROCESS in $PARENTS; do @@ -65,11 +65,11 @@ if grep -qs ^restart-on-upgrade /etc/kde3/kdm/kdm.options || if [ -n "$CHILDREN" ]; then if [ -n "$HAVE_DEBCONF" ]; then # ask the question - db_input high kdm/stop_running_server_with_children || true + db_input high tdm/stop_running_server_with_children || true db_go # what did the user say? ANSWER= - if db_get kdm/stop_running_server_with_children; then + if db_get tdm/stop_running_server_with_children; then ANSWER="$RET" fi if [ "$ANSWER" = "true" ]; then @@ -77,7 +77,7 @@ if grep -qs ^restart-on-upgrade /etc/kde3/kdm/kdm.options || fi # forget that we have seen the question; this is the sort of # non-configuration question that should be asked every time - db_fset kdm/stop_running_server_with_children seen false + db_fset tdm/stop_running_server_with_children seen false fi else STOP=yes @@ -88,13 +88,13 @@ fi if [ -n "$STOP" ]; then if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then - invoke-rc.d kdm-kde3 stop || true + invoke-rc.d tdm-kde3 stop || true else - /etc/init.d/kdm-kde3 stop || true + /etc/init.d/tdm-kde3 stop || true fi else if [ "$1" = "upgrade" -o "$1" = "failed-upgrade" ]; then - touch /var/run/kdm-kde3.upgrade + touch /var/run/tdm-kde3.upgrade fi fi @@ -117,7 +117,7 @@ if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then fi # are we removing the currently selected display manager? if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then - if [ "kdm-kde3" = "$DEFAULT_DISPLAY_MANAGER" ]; then + if [ "tdm-kde3" = "$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 diff --git a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.templates b/ubuntu/maverick_automake/kdebase/debian/tdm-kde3.templates index 99aa93d7a..9730af3ff 100644 --- a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.templates +++ b/ubuntu/maverick_automake/kdebase/debian/tdm-kde3.templates @@ -14,19 +14,19 @@ _Description: Default display manager: accordingly, edit each of their init scripts in /etc/init.d, and disable the check for a default display manager. -Template: kdm-kde3/daemon_name +Template: tdm-kde3/daemon_name Type: string -Default: /opt/kde3/bin/kdm +Default: /opt/kde3/bin/tdm Description: internal use only This template is never shown to the user and does not require translation. -Template: kdm-kde3/stop_running_server_with_children +Template: tdm-kde3/stop_running_server_with_children Type: boolean Default: false -_Description: Stop the kdm-kde3 daemon? - The K Desktop manager (kdm-kde3) daemon is typically stopped on package upgrade +_Description: Stop the tdm-kde3 daemon? + The K Desktop manager (tdm-kde3) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session. . - If kdm is stopped now, any X sessions it manages will be terminated. + If tdm is stopped now, any X sessions it manages will be terminated. Otherwise, the new version will take effect the next time the daemon is restarted. diff --git a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.txt b/ubuntu/maverick_automake/kdebase/debian/tdm-kde3.txt index 191c344fd..edbfdd647 100644 --- a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.txt +++ b/ubuntu/maverick_automake/kdebase/debian/tdm-kde3.txt @@ -1,6 +1,6 @@ #!/bin/sh ### BEGIN INIT INFO -# Provides: x-display-manager kdm-kde3 +# Provides: x-display-manager tdm-kde3 # Required-Start: $local_fs $remote_fs # Required-Stop: $local_fs $remote_fs # Should-Start: console-screen @@ -8,40 +8,40 @@ # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: X display manager for KDE3 -# Description: KDM manages a collection of X servers, which may be on the local host or remote machines. +# Description: TDM manages a collection of X servers, which may be on the local host or remote machines. ### END INIT INFO -# /etc/init.d/kdm-kde3: start or stop the X display manager +# /etc/init.d/tdm-kde3: start or stop the X display manager # Script originally stolen from the xdm package # # description: K Display Manager # set -e -# To start kdm-kde3 even if it is not the default display manager, change +# To start tdm-kde3 even if it is not the default display manager, change # HEED_DEFAULT_DISPLAY_MANAGER to "false." HEED_DEFAULT_DISPLAY_MANAGER=true DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager -KDEDIRS=/opt/kde3/ +TDEDIRS=/opt/kde3/ PATH=/opt/kde3/bin:/bin:/usr/bin:/sbin:/usr/sbin -DAEMON=/opt/kde3/bin/kdm -PIDFILE=/var/run/kdm.pid -UPGRADEFILE=/var/run/kdm.upgrade +DAEMON=/opt/kde3/bin/tdm +PIDFILE=/var/run/tdm.pid +UPGRADEFILE=/var/run/tdm.upgrade -# parameters to support kdm customization -KDMRC=/etc/kde3/kdm/kdmrc -BACKGROUNDRC=/etc/kde3/kdm/backgroundrc +# parameters to support tdm customization +TDMRC=/etc/kde3/tdm/tdmrc +BACKGROUNDRC=/etc/kde3/tdm/backgroundrc -#if configuration is changed by kdmtheme or other tools, don't do magick -if grep -q "Theme=@@@ToBeReplacedByDesktopBase@@@" ${KDMRC} && grep -q "Wallpaper=default_blue.jpg" ${BACKGROUNDRC} +#if configuration is changed by tdmtheme or other tools, don't do magick +if grep -q "Theme=@@@ToBeReplacedByDesktopBase@@@" ${TDMRC} && grep -q "Wallpaper=default_blue.jpg" ${BACKGROUNDRC} then -KDMOVERRIDEDIR=/etc/default/kdm-kde3.d -KDMCFGDIR=/var/run/kdm-kde3 -KDMCFG=$KDMCFGDIR/kdmrc -BACKGROUNDCFG=$KDMCFGDIR/backgroundrc +TDMOVERRIDEDIR=/etc/default/tdm-kde3.d +TDMCFGDIR=/var/run/tdm-kde3 +TDMCFG=$TDMCFGDIR/tdmrc +BACKGROUNDCFG=$TDMCFGDIR/backgroundrc test -x $DAEMON || exit 0 @@ -52,36 +52,36 @@ test -x $DAEMON || exit 0 # uncomment, if you want tons of debug info in your syslog #ARG="$ARG -debug 255" -# we use an alternative kdm master configuration file -ARG="$ARG -config $KDMCFG" +# we use an alternative tdm master configuration file +ARG="$ARG -config $TDMCFG" # we source overrides. run-parts sorts the list in a predictable order -if [ -d "$KDMOVERRIDEDIR" ]; then - for part in $(run-parts --list "$KDMOVERRIDEDIR" 2>/dev/null || true); do +if [ -d "$TDMOVERRIDEDIR" ]; then + for part in $(run-parts --list "$TDMOVERRIDEDIR" 2>/dev/null || true); do . "$part" done fi -# we generate kdm configuration files -genkdmconf --in $KDMCFGDIR 1> /dev/null +# we generate tdm configuration files +gentdmconf --in $TDMCFGDIR 1> /dev/null -# we update kdm configuration files (only overridden values) -[ -n "$USEBACKGROUND" ] && sed -i "s|^#\?UseBackground=.*|UseBackground=$USEBACKGROUND|" $KDMCFG -[ -n "$BACKGROUNDCFG" ] && sed -i "s|^#\?BackgroundCfg=.*|BackgroundCfg=$BACKGROUNDCFG|" $KDMCFG -[ -n "$USETHEME" ] && sed -i "s|^#\?UseTheme=.*|UseTheme=$USETHEME|" $KDMCFG -[ -n "$THEME" ] && sed -i "s|^#\?Theme=.*|Theme=$THEME|" $KDMCFG +# we update tdm configuration files (only overridden values) +[ -n "$USEBACKGROUND" ] && sed -i "s|^#\?UseBackground=.*|UseBackground=$USEBACKGROUND|" $TDMCFG +[ -n "$BACKGROUNDCFG" ] && sed -i "s|^#\?BackgroundCfg=.*|BackgroundCfg=$BACKGROUNDCFG|" $TDMCFG +[ -n "$USETHEME" ] && sed -i "s|^#\?UseTheme=.*|UseTheme=$USETHEME|" $TDMCFG +[ -n "$THEME" ] && sed -i "s|^#\?Theme=.*|Theme=$THEME|" $TDMCFG [ -n "$WALLPAPER" ] && sed -i "s|^#\?Wallpaper=.*|Wallpaper=`readlink -f $WALLPAPER`|" $BACKGROUNDCFG fi # autologin overrides are useful for live debian environment if [ -n "$AUTOLOGINUSER" ]; then - sed -i "s|^#\?AutoLoginEnable=.*|AutoLoginEnable=true|" $KDMCFG - sed -i "s|^#\?AutoLoginUser=.*|AutoLoginUser=$AUTOLOGINUSER|" $KDMCFG + sed -i "s|^#\?AutoLoginEnable=.*|AutoLoginEnable=true|" $TDMCFG + sed -i "s|^#\?AutoLoginUser=.*|AutoLoginUser=$AUTOLOGINUSER|" $TDMCFG fi -[ -n "$AUTOLOGINDELAY" ] && sed -i "s|^#\?AutoLoginDelay=.*|AutoLoginDelay=$AUTOLOGINDELAY|" $KDMCFG -[ -n "$AUTOLOGINAGAIN" ] && sed -i "s|^#\?AutoLoginAgain=.*|AutoLoginAgain=$AUTOLOGINAGAIN|" $KDMCFG -[ -n "$AUTOLOGINLOCKED" ] && sed -i "s|^#\?AutoLoginLocked=.*|AutoLoginLocked=$AUTOLOGINLOCKED|" $KDMCFG +[ -n "$AUTOLOGINDELAY" ] && sed -i "s|^#\?AutoLoginDelay=.*|AutoLoginDelay=$AUTOLOGINDELAY|" $TDMCFG +[ -n "$AUTOLOGINAGAIN" ] && sed -i "s|^#\?AutoLoginAgain=.*|AutoLoginAgain=$AUTOLOGINAGAIN|" $TDMCFG +[ -n "$AUTOLOGINLOCKED" ] && sed -i "s|^#\?AutoLoginLocked=.*|AutoLoginLocked=$AUTOLOGINLOCKED|" $TDMCFG # If we upgraded the daemon, we can't use the --exec argument to # start-stop-daemon since the inode will have changed. The risk here is that @@ -110,22 +110,22 @@ case "$1" in if [ -e $DEFAULT_DISPLAY_MANAGER_FILE ] && [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] && [ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" != "$DAEMON" ]; then - echo "Not starting K Display Manager (kdm-kde3); it is not the default display manager." + echo "Not starting K Display Manager (tdm-kde3); it is not the default display manager." else - echo -n "Starting K Display Manager: kdm-kde3" + echo -n "Starting K Display Manager: tdm-kde3" start-stop-daemon --start --quiet $SSD_ARGS -- $ARG || echo -n " already running" echo "." fi ;; restart) - /etc/init.d/kdm-kde3 stop + /etc/init.d/tdm-kde3 stop if [ -f $PIDFILE ]; then if stillrunning; then exit 1 fi fi - /etc/init.d/kdm-kde3 start + /etc/init.d/tdm-kde3 start ;; reload) @@ -133,16 +133,16 @@ case "$1" in if start-stop-daemon --stop --signal 1 --quiet $SSD_ARGS; then echo "done." else - echo "kdm-kde3 not running." + echo "tdm-kde3 not running." fi ;; force-reload) - /etc/init.d/kdm-kde3 reload + /etc/init.d/tdm-kde3 reload ;; stop) - echo -n "Stopping K Display Manager: kdm-kde3" + echo -n "Stopping K Display Manager: tdm-kde3" if [ ! -f $PIDFILE ]; then echo " not running ($PIDFILE not found)." exit 0 @@ -151,7 +151,7 @@ case "$1" in KILLCOUNT=1 if [ ! -e $UPGRADEFILE ]; then if start-stop-daemon --stop --quiet $SSD_ARGS; then - # give kdm's signal handler a second to catch its breath + # give tdm's signal handler a second to catch its breath sleep 1 else echo -n " not running" @@ -181,7 +181,7 @@ case "$1" in ;; *) - echo "Usage: /etc/init.d/kdm-kde3 {start|stop|restart|reload|force-reload}" + echo "Usage: /etc/init.d/tdm-kde3 {start|stop|restart|reload|force-reload}" exit 1 ;; esac diff --git a/ubuntu/maverick_automake/kdebindings/debian/changelog b/ubuntu/maverick_automake/kdebindings/debian/changelog index 381d60921..b1b390990 100644 --- a/ubuntu/maverick_automake/kdebindings/debian/changelog +++ b/ubuntu/maverick_automake/kdebindings/debian/changelog @@ -483,7 +483,7 @@ kdebindings (4:3.2.92-1) unstable; urgency=low was accepted upstream. * debian/libkjsembed1.install: install the qprocess kjsembed plugin. * debian/rules: disable the python directory, as sip, pyqt and - pykde are all packaged in Debian already. + pytde are all packaged in Debian already. * debian/control: added the libsmokekde1, libsmokekde-dev, libkorundum-ruby1.8 and libqtruby-ruby1.8 packages because of upstream additions. diff --git a/ubuntu/maverick_automake/kdeedu/debian/copyright b/ubuntu/maverick_automake/kdeedu/debian/copyright index 272e4f376..fca32cf86 100644 --- a/ubuntu/maverick_automake/kdeedu/debian/copyright +++ b/ubuntu/maverick_automake/kdeedu/debian/copyright @@ -30,7 +30,7 @@ Upstream Authors: KLettres: Anne-Marie Mahfouf <annma@kde.org> and many others KMathTool: Birgit Schulz <B.Schulz@Superlehrer.de>, Marco Wegner <mail@marcowegner.de> - KmPlot: Klaus-Dieter Möller <kdmoeller@foni.net>, + KmPlot: Klaus-Dieter Möller <tdmoeller@foni.net>, Matthias Messmer <bmlmessmer@web.de>, Fredrik Edemar <f_edemar@linux.se> KPercentage: Matthias Messmer <bmlmessmer@web.de>, diff --git a/ubuntu/maverick_automake/kdeedu/debian/man/kmplot-kde3.1 b/ubuntu/maverick_automake/kdeedu/debian/man/kmplot-kde3.1 index 99478b688..904fac69d 100644 --- a/ubuntu/maverick_automake/kdeedu/debian/man/kmplot-kde3.1 +++ b/ubuntu/maverick_automake/kdeedu/debian/man/kmplot-kde3.1 @@ -51,7 +51,7 @@ If the KDE Help Centre is not installed then you can install the package \fIkdeedu-doc-html\fP and read this documentation in HTML format from \fI/opt/kde3/share/doc/kde/HTML/en/kmplot/\fP. .SH AUTHOR -KmPlot was written by Klaus-Dieter Moeller <kdmoeller@foni.net>, +KmPlot was written by Klaus-Dieter Moeller <tdmoeller@foni.net>, Matthias Messmer <bmlmessmer@web.de> and Fredrik Edemar <f_edemar@linux.se>. .br This manual page was prepared by Ben Burton <bab@debian.org> diff --git a/ubuntu/maverick_automake/kdelibs/debian/changelog b/ubuntu/maverick_automake/kdelibs/debian/changelog index 323cc6749..9e6d8143f 100644 --- a/ubuntu/maverick_automake/kdelibs/debian/changelog +++ b/ubuntu/maverick_automake/kdelibs/debian/changelog @@ -520,7 +520,7 @@ kdelibs (4:3.5.7-1ubuntu9) gutsy; urgency=low [ Sarah Hobbs ] * Added kubuntu_93_kdelibs-kdesudo-support-wflags-and-kab-fix.diff. Thankyou to Stefan Skotte for this patch - * Removed kubuntu_28_fix_sudo.diff to fix KDM memory corruption + * Removed kubuntu_28_fix_sudo.diff to fix TDM memory corruption (LP: #47455, KDE bug #147454) -- Sarah Hobbs <hobbsee@ubuntu.com> Sat, 14 Jul 2007 01:51:38 +1000 @@ -2087,7 +2087,7 @@ kdelibs (4:3.4.0-0pre5) alioth; urgency=low output them expanded even when --expandvars is not used. (Closes: #287822) * Fixed the ability of the build system to find kde.pot, even when it is not - located at KDEDIR/include/kde.pot. This allows the use of targets such as + located at TDEDIR/include/kde.pot. This allows the use of targets such as "package-messages" without specifying includedir. (Closes: #283858) * Now that graphviz is in main, add it to Build-Depends-Indep together with diff --git a/ubuntu/maverick_automake/kdelibs/debian/kcmshell b/ubuntu/maverick_automake/kdelibs/debian/kcmshell index 4ca9629ed..57d0e82bb 100755 --- a/ubuntu/maverick_automake/kdelibs/debian/kcmshell +++ b/ubuntu/maverick_automake/kdelibs/debian/kcmshell @@ -1,4 +1,4 @@ #!/bin/sh -export KDEDIRS=/usr/:/opt/kde3/ +export TDEDIRS=/usr/:/opt/kde3/ /opt/kde3/bin/kcmshell.real $1 $2 $3 $4 $5 $6 $7 $8 diff --git a/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.install b/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.install index 57b3291f2..e2b5d076c 100644 --- a/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.install +++ b/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.install @@ -532,9 +532,9 @@ debian/tmp/opt/kde3/include/kde/kshred.h debian/tmp/opt/kde3/include/kde/ksimpleconfig.h debian/tmp/opt/kde3/include/kde/ksmimecrypto.h debian/tmp/opt/kde3/include/kde/ksockaddr.h -debian/tmp/opt/kde3/include/kde/ksocketaddress.h -debian/tmp/opt/kde3/include/kde/ksocketbase.h -debian/tmp/opt/kde3/include/kde/ksocketdevice.h +debian/tmp/opt/kde3/include/kde/tdesocketaddress.h +debian/tmp/opt/kde3/include/kde/tdesocketbase.h +debian/tmp/opt/kde3/include/kde/tdesocketdevice.h debian/tmp/opt/kde3/include/kde/ksock.h debian/tmp/opt/kde3/include/kde/ksocks.h debian/tmp/opt/kde3/include/kde/ksockssocketdevice.h diff --git a/ubuntu/maverick_automake/kdelibs/debian/man/kstartupconfig-kde3.1 b/ubuntu/maverick_automake/kdelibs/debian/man/kstartupconfig-kde3.1 index dca82fb5e..87733d37f 100644 --- a/ubuntu/maverick_automake/kdelibs/debian/man/kstartupconfig-kde3.1 +++ b/ubuntu/maverick_automake/kdelibs/debian/man/kstartupconfig-kde3.1 @@ -4,7 +4,7 @@ kstartupconfig, kdostartupconfig \- KDE configuration options loader .SH SYNOPSIS -\fBkstartupconfig\fP [$KDEHOME] +\fBkstartupconfig\fP [$TDEHOME] .sp 1 \fBkdostartupconfig\fP .SH DESCRIPTION @@ -27,19 +27,19 @@ do not use frequently changed config files since the checking is timestamp\-base if \fBkconf_update\fP is used to update an option also touch the matching global config file to allow \fBkstartupconfig\fP to see changes .SH OPTIONS .TP -.B $KDEHOME +.B $TDEHOME KDE home directory, if different to ~/.kde .SS .SH FILES -In case $KDEHOME is not set ~/.kde is assumed. +In case $TDEHOME is not set ~/.kde is assumed. .TP -.I $KDEHOME/share/config/startupconfig +.I $TDEHOME/share/config/startupconfig script, sourced to set shell variables with configuration options .TP -.I $KDEHOME/share/config/startupconfigfiles +.I $TDEHOME/share/config/startupconfigfiles configuration options and files they belong to .TP -.I $KDEHOME/share/config/startupconfigkeys +.I $TDEHOME/share/config/startupconfigkeys configuration options to load .SH SEE ALSO .BR kconf_update (1),\ startkde (1) diff --git a/ubuntu/maverick_automake/kdelibs/debian/man/lnusertemp-kde3.sgml b/ubuntu/maverick_automake/kdelibs/debian/man/lnusertemp-kde3.sgml index c40c64520..a75709316 100644 --- a/ubuntu/maverick_automake/kdelibs/debian/man/lnusertemp-kde3.sgml +++ b/ubuntu/maverick_automake/kdelibs/debian/man/lnusertemp-kde3.sgml @@ -72,7 +72,7 @@ manpage.1: manpage.sgml <para><command>&dhpackage;</command> is used to create KDE resources in temporary directories and symlinks to them in - <envar>KDEHOME</envar>. The resource that needs to be created is + <envar>TDEHOME</envar>. The resource that needs to be created is given as an argument and can be anyone of:</para> <itemizedlist> diff --git a/ubuntu/maverick_automake/kdelibs/debian/man/make_driver_db_cups-kde3.1 b/ubuntu/maverick_automake/kdelibs/debian/man/make_driver_db_cups-kde3.1 index e4eb8251f..15d534206 100644 --- a/ubuntu/maverick_automake/kdelibs/debian/man/make_driver_db_cups-kde3.1 +++ b/ubuntu/maverick_automake/kdelibs/debian/man/make_driver_db_cups-kde3.1 @@ -25,10 +25,10 @@ directory with ppd files write printer database into this file .SH FILES .TP -.I $KDEHOME/share/apps/kdeprint/printerdb_cups.txt +.I $TDEHOME/share/apps/kdeprint/printerdb_cups.txt KDE printer database .br -(if $KDEHOME is not set ~/.kde is used) +(if $TDEHOME is not set ~/.kde is used) .SH SEE ALSO .BR make_driver_db_lpr (1) .TP diff --git a/ubuntu/maverick_automake/kdemultimedia/debian/man/kaboodle-kde3.1 b/ubuntu/maverick_automake/kdemultimedia/debian/man/kaboodle-kde3.1 index c7852c5db..ef2e440bd 100644 --- a/ubuntu/maverick_automake/kdemultimedia/debian/man/kaboodle-kde3.1 +++ b/ubuntu/maverick_automake/kdemultimedia/debian/man/kaboodle-kde3.1 @@ -70,7 +70,7 @@ Use an alternative configuration file, instead of the default, which is normally located in .I /usr/share/config or in -.RB $ KDEHOME\fI/share/config +.RB $ TDEHOME\fI/share/config .TP .BI \-\-dcopserver \ server Set the address of the DCOP server to attach to. @@ -218,7 +218,7 @@ The session manager to use. This option is set automatically by KDE and is a network path to the session manager socket. .IP HOME Path to the home directory for the current user. -.IP KDEHOME +.IP TDEHOME The KDE per-user setting directory. Default if not specified is .I $HOME/.kde .lf 55 info/kdemultimedia.kaboodle.1 diff --git a/ubuntu/maverick_automake/kdesdk/debian/changelog b/ubuntu/maverick_automake/kdesdk/debian/changelog index 25885a31a..6e4dc71dc 100644 --- a/ubuntu/maverick_automake/kdesdk/debian/changelog +++ b/ubuntu/maverick_automake/kdesdk/debian/changelog @@ -153,7 +153,7 @@ kdesdk (4:3.5.6-2) unstable; urgency=low +++ Changes by Sune Vuorela: - * Promote graphviz from kcachegrind Suggests to Recommends. (Closes: #407043) + * Promote graphviz from tdecachegrind Suggests to Recommends. (Closes: #407043) * Don't install the licensecheck script in kdesdk. The devscripts package has taken it and is working actively on it. Let kdesdk-scripts suggest devscripts instead. (Closes: #420154) @@ -617,7 +617,7 @@ kdesdk (4:3.3.2-3) unstable; urgency=high under the LGPL. * Fix kdemangen.pl output to use minus instead of hyphen where appropriate, thanks to Achim Bohnet (closes: #295454). - * Fixed amd64/gcc-4.0 build by using longs for node IDs in kcachegrind, + * Fixed amd64/gcc-4.0 build by using longs for node IDs in tdecachegrind, thanks to Andreas Jochens (closes: #287032). -- Ben Burton <bab@debian.org> Thu, 31 Mar 2005 19:59:13 +1000 @@ -672,8 +672,8 @@ kdesdk (4:3.3.1-1) unstable; urgency=medium kdesdk (4:3.3.0-1) unstable; urgency=low * New upstream release. - * New package kcachegrind-converters. These foreign format converters - are packaged separately so that kcachegrind need not depend on php. + * New package tdecachegrind-converters. These foreign format converters + are packaged separately so that tdecachegrind need not depend on php. * Binary package kmtrace has returned. Note that the kmtrace libraries for debian are now installed in /usr/lib/kmtrace, not in /usr/lib as is done upstream. @@ -712,7 +712,7 @@ kdesdk (4:3.2.2-1) unstable; urgency=low * New upstream bugfix release. * Add Conflicts/Replaces for umbrello-manual (closes: #237173). * Don't use Conflicts/Replaces elsewhere where we should just use Replaces. - * Have kcachegrind suggest graphviz (closes: #243883). + * Have tdecachegrind suggest graphviz (closes: #243883). -- Ben Burton <bab@debian.org> Tue, 16 Mar 2004 09:15:01 +1100 @@ -735,8 +735,8 @@ kdesdk (4:3.2.0-1) unstable; urgency=low * New upstream release. * Many thanks to Ralf Nolden for all his help with packaging KDE 3.2. * Thanks to Robert Lemmen for previous packaging work on umbrello and - to Philipp Frauenfelder for previous packaging work on kcachegrind. - * New binary packages kcachegrind, kuiviewer and umbrello. + to Philipp Frauenfelder for previous packaging work on tdecachegrind. + * New binary packages tdecachegrind, kuiviewer and umbrello. * Created a new package kdesdk-doc-html for HTML documentation. -- Ben Burton <bab@debian.org> Sat, 31 Jan 2004 12:08:48 +1100 diff --git a/ubuntu/maverick_automake/kdesdk/debian/control b/ubuntu/maverick_automake/kdesdk/debian/control index dcd924a55..995f4136f 100644 --- a/ubuntu/maverick_automake/kdesdk/debian/control +++ b/ubuntu/maverick_automake/kdesdk/debian/control @@ -14,8 +14,8 @@ Standards-Version: 3.8.3 Package: kdesdk-kde3 Architecture: all Section: kde -Depends: cervisia-kde3 (>= ${Source-Version}), kapptemplate-kde3 (>= ${Source-Version}), kbabel-kde3 (>= ${Source-Version}), kbugbuster-kde3 (>= ${Source-Version}), kcachegrind-kde3 (>= ${Source-Version}), kdesdk-kfile-plugins-kde3 (>= ${Source-Version}), kdesdk-kio-plugins-kde3 (>= ${Source-Version}) | kdesvn-kio-plugins-kde3, kdesdk-misc-kde3 (>= ${Source-Version}), kdesdk-scripts-kde3, kmtrace-kde3 (>= ${Source-Version}), kompare-kde3 (>= ${Source-Version}), kspy-kde3 (>= ${Source-Version}), kuiviewer-kde3 (>= ${Source-Version}), kunittest-kde3 (>= ${Source-Version}), poxml-kde3 (>= ${Source-Version}), umbrello-kde3 (>= ${Source-Version}) -Suggests: kcachegrind-converters-kde3, kbabel-kde3-dev, kdesdk-kde3-doc-html +Depends: cervisia-kde3 (>= ${Source-Version}), kapptemplate-kde3 (>= ${Source-Version}), kbabel-kde3 (>= ${Source-Version}), kbugbuster-kde3 (>= ${Source-Version}), tdecachegrind-kde3 (>= ${Source-Version}), kdesdk-kfile-plugins-kde3 (>= ${Source-Version}), kdesdk-kio-plugins-kde3 (>= ${Source-Version}) | kdesvn-kio-plugins-kde3, kdesdk-misc-kde3 (>= ${Source-Version}), kdesdk-scripts-kde3, kmtrace-kde3 (>= ${Source-Version}), kompare-kde3 (>= ${Source-Version}), kspy-kde3 (>= ${Source-Version}), kuiviewer-kde3 (>= ${Source-Version}), kunittest-kde3 (>= ${Source-Version}), poxml-kde3 (>= ${Source-Version}), umbrello-kde3 (>= ${Source-Version}) +Suggests: tdecachegrind-converters-kde3, kbabel-kde3-dev, kdesdk-kde3-doc-html Description: software development kit from the official KDE3 release KDE (the K Desktop Environment) is a powerful Open Source graphical desktop environment for Unix workstations. It combines ease of use, @@ -133,13 +133,13 @@ Description: a front end for the KDE3 bug tracking system This package is part of KDE3, and a component of the KDE SDK module. See the 'kde-kde3' and 'kdesdk-kde3' packages for more information. -Package: kcachegrind-kde3 +Package: tdecachegrind-kde3 Architecture: any Section: devel Depends: ${shlibs:Depends} -Conflicts: kcachegrind +Conflicts: tdecachegrind Recommends: valgrind-callgrind-kde3 | valgrind-calltree-kde3, graphviz -Suggests: kcachegrind-converters-kde3, khelpcenter-kde3, kdesdk-kde3-doc-html +Suggests: tdecachegrind-converters-kde3, khelpcenter-kde3, kdesdk-kde3-doc-html Description: visualisation tool for valgrind profiling output KCachegrind is a visualisation tool for the profiling data generated by calltree, a profiling skin for valgrind. Applications can be @@ -147,17 +147,17 @@ Description: visualisation tool for valgrind profiling output and plugin architectures are supported. . For visualising the output from other profiling tools, several converters - can be found in the kcachegrind-converters package. + can be found in the tdecachegrind-converters package. . This package is part of KDE3, and a component of the KDE SDK module. See the 'kde-kde3' and 'kdesdk-kde3' packages for more information. -Package: kcachegrind-converters-kde3 +Package: tdecachegrind-converters-kde3 Architecture: all Section: devel Depends: ${perl:Depends}, php5-cli, python -Conflicts: kcachegrind-converters -Recommends: kcachegrind-kde3 +Conflicts: tdecachegrind-converters +Recommends: tdecachegrind-kde3 Description: format converters for KCachegrind profiling visualisation tool This is a collection of scripts for converting the output from different profiling tools into a format that KCachegrind can use. diff --git a/ubuntu/maverick_automake/kdesdk/debian/control.in b/ubuntu/maverick_automake/kdesdk/debian/control.in index 3a8aa1ced..fb2d6cec3 100644 --- a/ubuntu/maverick_automake/kdesdk/debian/control.in +++ b/ubuntu/maverick_automake/kdesdk/debian/control.in @@ -13,8 +13,8 @@ Standards-Version: 3.7.2 Package: kdesdk Architecture: all Section: kde -Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), kcachegrind (>= ${Source-Version}), kdesdk-kfile-plugins (>= ${Source-Version}), kdesdk-kio-plugins (>= ${Source-Version}) | kdesvn-kio-plugins, kdesdk-misc (>= ${Source-Version}), kdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), kunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version}) -Suggests: kcachegrind-converters, kbabel-dev, kdesdk-doc-html +Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), tdecachegrind (>= ${Source-Version}), kdesdk-kfile-plugins (>= ${Source-Version}), kdesdk-kio-plugins (>= ${Source-Version}) | kdesvn-kio-plugins, kdesdk-misc (>= ${Source-Version}), kdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), kunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version}) +Suggests: tdecachegrind-converters, kbabel-dev, kdesdk-doc-html Description: software development kit from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical desktop environment for Unix workstations. It combines ease of use, @@ -127,12 +127,12 @@ Description: a front end for the KDE bug tracking system This package is part of KDE, and a component of the KDE SDK module. See the 'kde' and 'kdesdk' packages for more information. -Package: kcachegrind +Package: tdecachegrind Architecture: any Section: devel Depends: ${shlibs:Depends} Recommends: valgrind-callgrind | valgrind-calltree, graphviz -Suggests: kcachegrind-converters, khelpcenter, kdesdk-doc-html +Suggests: tdecachegrind-converters, khelpcenter, kdesdk-doc-html Description: visualisation tool for valgrind profiling output KCachegrind is a visualisation tool for the profiling data generated by calltree, a profiling skin for valgrind. Applications can be @@ -140,16 +140,16 @@ Description: visualisation tool for valgrind profiling output and plugin architectures are supported. . For visualising the output from other profiling tools, several converters - can be found in the kcachegrind-converters package. + can be found in the tdecachegrind-converters package. . This package is part of KDE, and a component of the KDE SDK module. See the 'kde' and 'kdesdk' packages for more information. -Package: kcachegrind-converters +Package: tdecachegrind-converters Architecture: all Section: devel Depends: ${perl:Depends}, php5-cli, python -Recommends: kcachegrind +Recommends: tdecachegrind Description: format converters for KCachegrind profiling visualisation tool This is a collection of scripts for converting the output from different profiling tools into a format that KCachegrind can use. diff --git a/ubuntu/maverick_automake/kdesdk/debian/copyright b/ubuntu/maverick_automake/kdesdk/debian/copyright index 57c7c1593..ac5587a4a 100644 --- a/ubuntu/maverick_automake/kdesdk/debian/copyright +++ b/ubuntu/maverick_automake/kdesdk/debian/copyright @@ -3,7 +3,7 @@ Fri, 26 Jan 2001 18:00:00 -0700. It was brought up to date by Ben Burton <bab@debian.org> on Mon, 26 Mar 2001 09:10:56 -0600. Thanks to Robert Lemmen and Philipp Frauenfelder for originally packaging -umbrello and kcachegrind respectively. +umbrello and tdecachegrind respectively. It was downloaded from: http://www.kde.org/download diff --git a/ubuntu/lucid_automake/kdesdk/debian/icons/kcachegrind.xpm b/ubuntu/maverick_automake/kdesdk/debian/icons/tdecachegrind.xpm index 843263759..bfcdfc6e2 100644 --- a/ubuntu/lucid_automake/kdesdk/debian/icons/kcachegrind.xpm +++ b/ubuntu/maverick_automake/kdesdk/debian/icons/tdecachegrind.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * kcachegrind_xpm[] = { +static char * tdecachegrind_xpm[] = { "32 30 256 2", " c None", ". c #0036CA", diff --git a/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-converters-kde3.docs b/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-converters-kde3.docs deleted file mode 100644 index b19a948df..000000000 --- a/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-converters-kde3.docs +++ /dev/null @@ -1 +0,0 @@ -kcachegrind/converters/README diff --git a/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-kde3.docs b/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-kde3.docs deleted file mode 100644 index aef510285..000000000 --- a/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-kde3.docs +++ /dev/null @@ -1,3 +0,0 @@ -kcachegrind/AUTHORS -kcachegrind/README -kcachegrind/TODO diff --git a/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-kde3.install b/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-kde3.install deleted file mode 100644 index 7b5f5605a..000000000 --- a/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-kde3.install +++ /dev/null @@ -1,19 +0,0 @@ -debian/tmp/opt/kde3/bin/kcachegrind -debian/tmp/opt/kde3/share/applications/kde/kcachegrind.desktop -debian/tmp/opt/kde3/share/apps/kcachegrind/icons/hicolor/16x16/actions/fromrec.png -debian/tmp/opt/kde3/share/apps/kcachegrind/icons/hicolor/16x16/actions/percent.png -debian/tmp/opt/kde3/share/apps/kcachegrind/icons/hicolor/16x16/actions/recrec.png -debian/tmp/opt/kde3/share/apps/kcachegrind/icons/hicolor/16x16/actions/torec.png -debian/tmp/opt/kde3/share/apps/kcachegrind/icons/hicolor/22x22/actions/percent.png -debian/tmp/opt/kde3/share/apps/kcachegrind/icons/hicolor/32x32/actions/percent.png -debian/tmp/opt/kde3/share/apps/kcachegrind/kcachegrindui.rc -debian/tmp/opt/kde3/share/apps/kcachegrind/tips -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcachegrind/*.bz2 -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcachegrind/common -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcachegrind/*.docbook -debian/tmp/opt/kde3/share/icons/locolor/32x32/apps/kcachegrind.png -debian/tmp/opt/kde3/share/icons/locolor/16x16/apps/kcachegrind.png -debian/tmp/opt/kde3/share/icons/hicolor/48x48/apps/kcachegrind.png -debian/tmp/opt/kde3/share/icons/hicolor/32x32/apps/kcachegrind.png -debian/tmp/opt/kde3/share/mimelnk/application/x-kcachegrind.desktop -debian/icons/kcachegrind.xpm /opt/kde3/share/pixmaps diff --git a/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-kde3.manpages b/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-kde3.manpages deleted file mode 100644 index f994baff0..000000000 --- a/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-kde3.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/man/kcachegrind.1 diff --git a/ubuntu/lucid_automake/kdesdk/debian/kdesdk-doc-html.doc-base.kcachegrind b/ubuntu/maverick_automake/kdesdk/debian/kdesdk-doc-html.doc-base.tdecachegrind index d105a0bc8..23c698acb 100644 --- a/ubuntu/lucid_automake/kdesdk/debian/kdesdk-doc-html.doc-base.kcachegrind +++ b/ubuntu/maverick_automake/kdesdk/debian/kdesdk-doc-html.doc-base.tdecachegrind @@ -1,4 +1,4 @@ -Document: kdesdk-doc-html-kcachegrind +Document: kdesdk-doc-html-tdecachegrind Title: KCachegrind Handbook Author: Josef Weidendorfer <Josef.Weidendorfer@gmx.de> Abstract: KCachegrind is a profile data visualization tool, written @@ -6,6 +6,6 @@ Abstract: KCachegrind is a profile data visualization tool, written Section: Apps/Programming Format: HTML -Index: /usr/share/doc/kde/HTML/en/kcachegrind/index.html -Files: /usr/share/doc/kde/HTML/en/kcachegrind/*.html +Index: /usr/share/doc/kde/HTML/en/tdecachegrind/index.html +Files: /usr/share/doc/kde/HTML/en/tdecachegrind/*.html diff --git a/ubuntu/maverick_automake/kdesdk/debian/man/dprof2calltree.1 b/ubuntu/maverick_automake/kdesdk/debian/man/dprof2calltree.1 index f1e7691a4..ce66a6b30 100644 --- a/ubuntu/maverick_automake/kdesdk/debian/man/dprof2calltree.1 +++ b/ubuntu/maverick_automake/kdesdk/debian/man/dprof2calltree.1 @@ -49,10 +49,10 @@ work with this data in KCachegrind as follows: .RS dprof2calltree -f tmin.out -o cachegrind.out.foo .br -kcachegrind cachegrind.out.foo +tdecachegrind cachegrind.out.foo .RE .SH SEE ALSO -.BR kcachegrind (1). +.BR tdecachegrind (1). .SH AUTHOR This converter was written by George Schlossnagle <george@omniti.com>. .br diff --git a/ubuntu/maverick_automake/kdesdk/debian/man/hotshot2calltree.1 b/ubuntu/maverick_automake/kdesdk/debian/man/hotshot2calltree.1 index 3b31794aa..a07ce76b4 100644 --- a/ubuntu/maverick_automake/kdesdk/debian/man/hotshot2calltree.1 +++ b/ubuntu/maverick_automake/kdesdk/debian/man/hotshot2calltree.1 @@ -46,10 +46,10 @@ data in KCachegrind as follows. .RS hotshot2cachegrind \-o cachegrind.out.0 pythongrind.prof .br -kcachegrind cachegrind.out.0 +tdecachegrind cachegrind.out.0 .RE .SH SEE ALSO -.BR kcachegrind (1). +.BR tdecachegrind (1). .SH AUTHOR This converter was written by Jorg Beyer <job@webde-ag.de>. .br diff --git a/ubuntu/maverick_automake/kdesdk/debian/man/memprof2calltree.1 b/ubuntu/maverick_automake/kdesdk/debian/man/memprof2calltree.1 index 0bd0582a3..c4042c126 100644 --- a/ubuntu/maverick_automake/kdesdk/debian/man/memprof2calltree.1 +++ b/ubuntu/maverick_automake/kdesdk/debian/man/memprof2calltree.1 @@ -28,7 +28,7 @@ corresponding calltree data will be written to standard output. .PP This utility is part of the KDE Software Development Kit. .SH SEE ALSO -.BR kcachegrind (1). +.BR tdecachegrind (1). .SH AUTHOR This converter was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>. .br diff --git a/ubuntu/maverick_automake/kdesdk/debian/man/op2calltree.1 b/ubuntu/maverick_automake/kdesdk/debian/man/op2calltree.1 index c81836a46..d18231d3e 100644 --- a/ubuntu/maverick_automake/kdesdk/debian/man/op2calltree.1 +++ b/ubuntu/maverick_automake/kdesdk/debian/man/op2calltree.1 @@ -35,7 +35,7 @@ application, to a file of the form \fIoprof.out.<app>\fP. .PP This utility is part of the KDE Software Development Kit. .SH SEE ALSO -.BR kcachegrind (1). +.BR tdecachegrind (1). .SH AUTHOR This converter was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>. .br diff --git a/ubuntu/maverick_automake/kdesdk/debian/man/pprof2calltree.1 b/ubuntu/maverick_automake/kdesdk/debian/man/pprof2calltree.1 index dc80f91ad..b98a06aec 100644 --- a/ubuntu/maverick_automake/kdesdk/debian/man/pprof2calltree.1 +++ b/ubuntu/maverick_automake/kdesdk/debian/man/pprof2calltree.1 @@ -40,11 +40,11 @@ follows. .RS pprof2calltree -f pprof.12345.1 .br -kcachegrind cachegrind.out.12345.1 +tdecachegrind cachegrind.out.12345.1 .RE .PP .SH SEE ALSO -.BR kcachegrind (1). +.BR tdecachegrind (1). .SH AUTHOR This converter was written by George Schlossnagle <george@omniti.com>. .br diff --git a/ubuntu/maverick_automake/kdesdk/debian/man/kcachegrind.1 b/ubuntu/maverick_automake/kdesdk/debian/man/tdecachegrind.1 index 4f7db6435..47f4c27b3 100644 --- a/ubuntu/maverick_automake/kdesdk/debian/man/kcachegrind.1 +++ b/ubuntu/maverick_automake/kdesdk/debian/man/tdecachegrind.1 @@ -2,7 +2,7 @@ .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) -.TH KCACHEGRIND 1 "March 25, 2005" +.TH TDECACHEGRIND 1 "March 25, 2005" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -16,9 +16,9 @@ .\" .sp <n> insert n+1 empty lines .\" for manpage-specific macros, see man(7) .SH NAME -kcachegrind \- a visualisation tool for valgrind profiling output +tdecachegrind \- a visualisation tool for valgrind profiling output .SH SYNOPSIS -.B kcachegrind +.B tdecachegrind .RI "[ " generic-options " ]" [ \fB\-r\fP \fIexec\fP ] [ \fItrace-file\fP ] .SH DESCRIPTION @@ -29,12 +29,12 @@ and plugin architectures are supported. .PP For visualising the output from other profiling tools, several converters are available. On Debian systems these can be found in the -\fIkcachegrind-converters\fP package. +\fItdecachegrind-converters\fP package. .PP This application is part of the KDE Software Development Kit. .SH OPTIONS -Below are the kcachegrind-specific options. -For a full summary of options, run \fIkcachegrind \-\-help\fP. +Below are the tdecachegrind-specific options. +For a full summary of options, run \fItdecachegrind \-\-help\fP. .TP \fB\-r\fP \fIexec\fP Run the program \fIexec\fP under cachegrind. @@ -52,14 +52,14 @@ Visualise data from the given trace. .PP Full user documentation is available through the KDE Help Centre. You can also enter the URL -\fIhelp:/kcachegrind/\fP +\fIhelp:/tdecachegrind/\fP directly into konqueror or you can run -`\fIkhelpcenter help:/kcachegrind/\fP' +`\fIkhelpcenter help:/tdecachegrind/\fP' from the command-line. .PP If the KDE Help Centre is not installed then you can install the package \fIkdesdk-doc-html\fP and read this documentation in HTML format from -\fI/usr/share/doc/kde/HTML/en/kcachegrind/\fP. +\fI/usr/share/doc/kde/HTML/en/tdecachegrind/\fP. .SH AUTHOR KCachegrind was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>. .br diff --git a/ubuntu/maverick_automake/kdesdk/debian/rules b/ubuntu/maverick_automake/kdesdk/debian/rules index d1da98bcc..bab4e2b82 100755 --- a/ubuntu/maverick_automake/kdesdk/debian/rules +++ b/ubuntu/maverick_automake/kdesdk/debian/rules @@ -31,7 +31,7 @@ DEB_DH_MAKESHLIBS_ARGS_umbrello-kde3 := -V'umbrello-kde3 (>= 4:3.5.8-1)' DEB_INSTALL_CHANGELOGS_cervisia-kde3 := cervisia/ChangeLog DEB_INSTALL_CHANGELOGS_kapptemplate-kde3 := kapptemplate/ChangeLog DEB_INSTALL_CHANGELOGS_kbabel-kde3 := kbabel/ChangeLog -DEB_INSTALL_CHANGELOGS_kcachegrind-kde3 := kcachegrind/ChangeLog +DEB_INSTALL_CHANGELOGS_tdecachegrind-kde3 := tdecachegrind/ChangeLog DEB_INSTALL_CHANGELOGS_kompare-kde3 := kompare/ChangeLog DEB_INSTALL_CHANGELOGS_umbrello-kde3 := umbrello/ChangeLog diff --git a/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-converters-kde3.docs b/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-converters-kde3.docs new file mode 100644 index 000000000..613037510 --- /dev/null +++ b/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-converters-kde3.docs @@ -0,0 +1 @@ +tdecachegrind/converters/README diff --git a/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-converters-kde3.install b/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-converters-kde3.install index c45981077..c45981077 100644 --- a/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-converters-kde3.install +++ b/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-converters-kde3.install diff --git a/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-converters-kde3.manpages b/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-converters-kde3.manpages index 977c48e2d..977c48e2d 100644 --- a/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-converters-kde3.manpages +++ b/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-converters-kde3.manpages diff --git a/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-kde3.README.Debian b/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-kde3.README.Debian index 3b9a9f290..3b9a9f290 100644 --- a/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-kde3.README.Debian +++ b/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-kde3.README.Debian diff --git a/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-kde3.docs b/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-kde3.docs new file mode 100644 index 000000000..dd7f4d534 --- /dev/null +++ b/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-kde3.docs @@ -0,0 +1,3 @@ +tdecachegrind/AUTHORS +tdecachegrind/README +tdecachegrind/TODO diff --git a/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-kde3.install b/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-kde3.install new file mode 100644 index 000000000..0a1090e0c --- /dev/null +++ b/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-kde3.install @@ -0,0 +1,19 @@ +debian/tmp/opt/kde3/bin/tdecachegrind +debian/tmp/opt/kde3/share/applications/kde/tdecachegrind.desktop +debian/tmp/opt/kde3/share/apps/tdecachegrind/icons/hicolor/16x16/actions/fromrec.png +debian/tmp/opt/kde3/share/apps/tdecachegrind/icons/hicolor/16x16/actions/percent.png +debian/tmp/opt/kde3/share/apps/tdecachegrind/icons/hicolor/16x16/actions/recrec.png +debian/tmp/opt/kde3/share/apps/tdecachegrind/icons/hicolor/16x16/actions/torec.png +debian/tmp/opt/kde3/share/apps/tdecachegrind/icons/hicolor/22x22/actions/percent.png +debian/tmp/opt/kde3/share/apps/tdecachegrind/icons/hicolor/32x32/actions/percent.png +debian/tmp/opt/kde3/share/apps/tdecachegrind/tdecachegrindui.rc +debian/tmp/opt/kde3/share/apps/tdecachegrind/tips +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdecachegrind/*.bz2 +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdecachegrind/common +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdecachegrind/*.docbook +debian/tmp/opt/kde3/share/icons/locolor/32x32/apps/tdecachegrind.png +debian/tmp/opt/kde3/share/icons/locolor/16x16/apps/tdecachegrind.png +debian/tmp/opt/kde3/share/icons/hicolor/48x48/apps/tdecachegrind.png +debian/tmp/opt/kde3/share/icons/hicolor/32x32/apps/tdecachegrind.png +debian/tmp/opt/kde3/share/mimelnk/application/x-tdecachegrind.desktop +debian/icons/tdecachegrind.xpm /opt/kde3/share/pixmaps diff --git a/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-kde3.manpages b/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-kde3.manpages new file mode 100644 index 000000000..367c3db5d --- /dev/null +++ b/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-kde3.manpages @@ -0,0 +1 @@ +debian/man/tdecachegrind.1 diff --git a/ubuntu/lucid_automake/kdesdk/debian/kcachegrind-kde3.menu b/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-kde3.menu index fb693d3ec..fb9e177a0 100644 --- a/ubuntu/lucid_automake/kdesdk/debian/kcachegrind-kde3.menu +++ b/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-kde3.menu @@ -1,9 +1,9 @@ -?package(kcachegrind):\ +?package(tdecachegrind):\ needs="x11"\ section="Applications/Programming"\ hints="KDE"\ title="KCachegrind"\ longtitle="KCachegrind (Profiler Frontend)"\ - icon="/usr/share/pixmaps/kcachegrind.xpm"\ - command="/opt/kde3/bin/kcachegrind" + icon="/usr/share/pixmaps/tdecachegrind.xpm"\ + command="/opt/kde3/bin/tdecachegrind" diff --git a/ubuntu/maverick_automake/kdeutils/debian/man/kcharselect-kde3.1 b/ubuntu/maverick_automake/kdeutils/debian/man/kcharselect-kde3.1 index bc0fb442b..63429d234 100644 --- a/ubuntu/maverick_automake/kdeutils/debian/man/kcharselect-kde3.1 +++ b/ubuntu/maverick_automake/kdeutils/debian/man/kcharselect-kde3.1 @@ -69,7 +69,7 @@ Use an alternative configuration file, instead of the default, which is normally located in .I /usr/share/config or in -.RB $ KDEHOME\fI/share/config +.RB $ TDEHOME\fI/share/config .TP .BI \-\-dcopserver \ server Set the address of the DCOP server to attach to. @@ -217,7 +217,7 @@ The session manager to use. This option is set automatically by KDE and is a network path to the session manager socket. .IP HOME Path to the home directory for the current user. -.IP KDEHOME +.IP TDEHOME The KDE per-user setting directory. Default if not specified is .I $HOME/.kde .lf 50 info/kdeutils.kcharselect.1 diff --git a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/pykdeextensions-kde3.install b/ubuntu/maverick_automake/libraries/pykdeextensions/debian/pykdeextensions-kde3.install deleted file mode 100644 index 7fa6e9508..000000000 --- a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/pykdeextensions-kde3.install +++ /dev/null @@ -1,7 +0,0 @@ -usr/lib/python*/dist-packages -opt/kde3/share/apps/pykdeextensions/AUTHORS -opt/kde3/share/apps/pykdeextensions/ChangeLog -opt/kde3/share/apps/pykdeextensions/INSTALL -opt/kde3/share/apps/pykdeextensions/NEWS -opt/kde3/share/apps/pykdeextensions/app_templates -opt/kde3/share/doc/kde/HTML/en/pykdeextensions diff --git a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/pykdeextensions-kde3.lintian-overrides b/ubuntu/maverick_automake/libraries/pykdeextensions/debian/pykdeextensions-kde3.lintian-overrides deleted file mode 100644 index 06b60205b..000000000 --- a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/pykdeextensions-kde3.lintian-overrides +++ /dev/null @@ -1,10 +0,0 @@ -pykdeextensions: desktop-entry-contains-unknown-key ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop:4 name[en_GB] -pykdeextensions: desktop-command-not-in-package ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop kcmshell -pykdeextensions: desktop-entry-invalid-category QT ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop -pykdeextensions: desktop-entry-invalid-category X-KDE-settings-system ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop -pykdeextensions: desktop-entry-lacks-main-category ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop -pykdeextensions: desktop-command-not-in-package ./usr/share/apps/pykdeextensions/app_templates/kdeapp/src/kdeapp.desktop $APPNAMELC$ -pykdeextensions: desktop-command-not-in-package ./usr/share/apps/pykdeextensions/app_templates/kdeutility/src/kdeutility.desktop $APPNAMELC$ - -pykdeextensions: executable-not-elf-or-script ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py -pykdeextensions: executable-not-elf-or-script ./usr/share/apps/pykdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py diff --git a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/README.Debian b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/README.Debian index b0302c211..b0302c211 100644 --- a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/README.Debian +++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/README.Debian diff --git a/ubuntu/lucid_automake/libraries/pykdeextensions/debian/changelog b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/changelog index 6e632ec6b..9a5d57c27 100644 --- a/ubuntu/lucid_automake/libraries/pykdeextensions/debian/changelog +++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/changelog @@ -1,23 +1,23 @@ -pykdeextensions-kde3 (0.4.0-6ubuntu6) karmic; urgency=low +pytdeextensions-kde3 (0.4.0-6ubuntu6) karmic; urgency=low * Karmic rebuild -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 02 July 2009 16:08:00 -0600 -pykdeextensions-kde3 (0.4.0-5ubuntu5) intrepid; urgency=low +pytdeextensions-kde3 (0.4.0-5ubuntu5) intrepid; urgency=low * Added -kde3 suffix -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Wed, 03 Dec 2008 21:38:00 -0600 -pykdeextensions (0.4.0-5ubuntu3) hardy; urgency=low +pytdeextensions (0.4.0-5ubuntu3) hardy; urgency=low * Re-add libpythoniz0 dependency on python-dev to work around libpythonize0 dlopening libpython2.5.so and not ...so.1 (LP: #179668) -- Scott Kitterman <scott@kitterman.com> Sat, 01 Mar 2008 11:15:08 -0500 -pykdeextensions (0.4.0-5ubuntu2) hardy; urgency=low +pytdeextensions (0.4.0-5ubuntu2) hardy; urgency=low * debian/control: - remove the python-all-dev dependency in libpythonize0 @@ -26,14 +26,14 @@ pykdeextensions (0.4.0-5ubuntu2) hardy; urgency=low -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 17 Dec 2007 12:38:49 +0100 -pykdeextensions (0.4.0-5ubuntu1) hardy; urgency=low +pytdeextensions (0.4.0-5ubuntu1) hardy; urgency=low * Merge with Debian, remaining changes: - libpythonize0 depends on python2.5-dev, it tries to load .so file -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 29 Nov 2007 17:59:47 +0000 -pykdeextensions (0.4.0-5) unstable; urgency=low +pytdeextensions (0.4.0-5) unstable; urgency=low * Add python-qt-dev build dependency. pyqtconfig moved from python-qt3 to python-qt-dev. (Closes: #439504) @@ -44,17 +44,17 @@ pykdeextensions (0.4.0-5) unstable; urgency=low * Remove *.py[co] files. * lintian cleanup: substvar-source-version-is-deprecated. Use ${binary:Version}. - * Make pykdeextensions package arch all. + * Make pytdeextensions package arch all. -- Fathi Boudra <fboudra@free.fr> Sun, 07 Oct 2007 12:06:15 +0200 -pykdeextensions (0.4.0-4ubuntu4) gutsy; urgency=low +pytdeextensions (0.4.0-4ubuntu4) gutsy; urgency=low * Fix depends to python2.5-dev -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 25 Sep 2007 18:48:45 +0100 -pykdeextensions (0.4.0-4ubuntu3) gutsy; urgency=low +pytdeextensions (0.4.0-4ubuntu3) gutsy; urgency=low * Add libpython2.5-dev as a depends for libpythonize0, it wants to load libpython2.5.so, reverts change from previous upload, LP: #84689, @@ -62,7 +62,7 @@ pykdeextensions (0.4.0-4ubuntu3) gutsy; urgency=low -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 25 Sep 2007 16:32:17 +0100 -pykdeextensions (0.4.0-4ubuntu2) gutsy; urgency=low +pytdeextensions (0.4.0-4ubuntu2) gutsy; urgency=low * Fix build failure, build-depend on python-qt-dev. * Use the unversioned python interpreter for scripts. @@ -71,14 +71,14 @@ pykdeextensions (0.4.0-4ubuntu2) gutsy; urgency=low -- Matthias Klose <doko@ubuntu.com> Wed, 29 Aug 2007 20:48:25 +0000 -pykdeextensions (0.4.0-4ubuntu1) gutsy; urgency=low +pytdeextensions (0.4.0-4ubuntu1) gutsy; urgency=low * Merge with Debian, remaining changes: - build on python 2.5 -- Jonathan Riddell <jriddell@ubuntu.com> Sun, 03 Jun 2007 13:51:42 +0100 -pykdeextensions (0.4.0-4) unstable; urgency=low +pytdeextensions (0.4.0-4) unstable; urgency=low * Update pyversions. Force to build with python2.4 only. (Closes: #424505) * Remove python-all-dev build dependency. Replaced by python-dev. @@ -86,7 +86,7 @@ pykdeextensions (0.4.0-4) unstable; urgency=low -- Fathi Boudra <fboudra@free.fr> Wed, 16 May 2007 11:02:06 +0200 -pykdeextensions (0.4.0-3ubuntu1) feisty; urgency=low +pytdeextensions (0.4.0-3ubuntu1) feisty; urgency=low * Force to build with python2.5. * FIXME: The package is unlikely to work with python2.4; maybe @@ -94,20 +94,20 @@ pykdeextensions (0.4.0-3ubuntu1) feisty; urgency=low -- Matthias Klose <doko@ubuntu.com> Sun, 14 Jan 2007 16:42:27 +0000 -pykdeextensions (0.4.0-3) unstable; urgency=low +pytdeextensions (0.4.0-3) unstable; urgency=low * Converted package to python-support * Added pycompat and pyversions * Force to use python2.4 (Closes: #375618) * Added to Build-Depends: python-support, python-all-dev, kdelibs4c2a (for kde-config) - * Updated libpythonize0-dev, libpythonize0, and pykdextensions install files + * Updated libpythonize0-dev, libpythonize0, and pytdextensions install files * Cleaned up rules * Added 12_force_python2.4_script.diff to force python2.4 in scripts -- Fathi Boudra <fboudra@free.fr> Thu, 29 Jun 2006 15:41:39 +0200 -pykdeextensions (0.4.0-2) unstable; urgency=low +pytdeextensions (0.4.0-2) unstable; urgency=low * Converted package to cdbs * Added 2 patches (thanks to Jonathan Riddell) @@ -118,7 +118,7 @@ pykdeextensions (0.4.0-2) unstable; urgency=low -- Fathi Boudra <fboudra@free.fr> Tue, 6 Jun 2006 08:56:40 +0200 -pykdeextensions (0.4.0-1) unstable; urgency=low +pytdeextensions (0.4.0-1) unstable; urgency=low [ Fathi Boudra ] * Initial Debian release Closes: #340141 diff --git a/ubuntu/maverick_automake/libraries/pytdeextensions/debian/compat b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/compat @@ -0,0 +1 @@ +5 diff --git a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/control b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/control index 9adc365d1..14412fec1 100644 --- a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/control +++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/control @@ -1,4 +1,4 @@ -Source: pykdeextensions-kde3 +Source: pytdeextensions-kde3 Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> @@ -8,16 +8,16 @@ Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, kdelibs4c2a-kde3, libtool python-qt-dev, python-sip4-dev, python-support (>= 0.6), python (>= 2.5), python-dev (>= 2.5) Standards-Version: 3.8.3 -Package: pykdeextensions-kde3 +Package: pytdeextensions-kde3 Architecture: all Depends: ${python:Depends} -Conflicts: pykdeextensions +Conflicts: pytdeextensions Provides: ${python:Provides} Description: Python packages to support KDE applications (scripts) [KDE3] PyKDE Extensions is a collection of software and Python packages to support the creation and installation of KDE applications. . - Homepage: http://www.simonzone.com/software/pykdeextensions + Homepage: http://www.simonzone.com/software/pytdeextensions Package: libpythonize0-kde3-dev Architecture: any @@ -29,7 +29,7 @@ Description: Python packages to support KDE applications (development) [KDE3] . This package contains the libpythonize development files. . - Homepage: http://www.simonzone.com/software/pykdeextensions + Homepage: http://www.simonzone.com/software/pytdeextensions Package: libpythonize0-kde3 Architecture: any @@ -42,4 +42,4 @@ Description: Python packages to support KDE applications (library) [KDE3] . This package contains the libpythonize library files. . - Homepage: http://www.simonzone.com/software/pykdeextensions + Homepage: http://www.simonzone.com/software/pytdeextensions diff --git a/ubuntu/lucid_automake/libraries/pykdeextensions/debian/copyright b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/copyright index a90a21587..9ed7bf6cd 100644 --- a/ubuntu/lucid_automake/libraries/pykdeextensions/debian/copyright +++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/copyright @@ -1,9 +1,9 @@ This package was debianized by Fathi Boudra <fboudra@free.fr> on Wed, 27 Jul 2005 20:19:26 +0200. -It was downloaded from <http://www.simonzone.com/software/pykdeextensions> +It was downloaded from <http://www.simonzone.com/software/pytdeextensions> -Application templates and pykde helper modules copyright: +Application templates and pytde helper modules copyright: Simon Edwards <simon@simonzone.com> License: diff --git a/ubuntu/maverick_automake/libraries/pytdeextensions/debian/docs b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/docs new file mode 100644 index 000000000..e845566c0 --- /dev/null +++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/docs @@ -0,0 +1 @@ +README diff --git a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/libpythonize0-kde3-dev.install b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/libpythonize0-kde3-dev.install index fa6727d83..fa6727d83 100644 --- a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/libpythonize0-kde3-dev.install +++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/libpythonize0-kde3-dev.install diff --git a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/libpythonize0-kde3.install b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/libpythonize0-kde3.install index 774c4fddf..774c4fddf 100644 --- a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/libpythonize0-kde3.install +++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/libpythonize0-kde3.install diff --git a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/patches/.gitignore b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/patches/.gitignore index e69de29bb..e69de29bb 100644 --- a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/patches/.gitignore +++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/patches/.gitignore diff --git a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/pycompat b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/pycompat index 0cfbf0888..0cfbf0888 100644 --- a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/pycompat +++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/pycompat diff --git a/ubuntu/maverick_automake/libraries/pytdeextensions/debian/pytdeextensions-kde3.install b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/pytdeextensions-kde3.install new file mode 100644 index 000000000..60b8f3085 --- /dev/null +++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/pytdeextensions-kde3.install @@ -0,0 +1,7 @@ +usr/lib/python*/dist-packages +opt/kde3/share/apps/pytdeextensions/AUTHORS +opt/kde3/share/apps/pytdeextensions/ChangeLog +opt/kde3/share/apps/pytdeextensions/INSTALL +opt/kde3/share/apps/pytdeextensions/NEWS +opt/kde3/share/apps/pytdeextensions/app_templates +opt/kde3/share/doc/kde/HTML/en/pytdeextensions diff --git a/ubuntu/maverick_automake/libraries/pytdeextensions/debian/pytdeextensions-kde3.lintian-overrides b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/pytdeextensions-kde3.lintian-overrides new file mode 100644 index 000000000..3b34d51a5 --- /dev/null +++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/pytdeextensions-kde3.lintian-overrides @@ -0,0 +1,10 @@ +pytdeextensions: desktop-entry-contains-unknown-key ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop:4 name[en_GB] +pytdeextensions: desktop-command-not-in-package ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop kcmshell +pytdeextensions: desktop-entry-invalid-category QT ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop +pytdeextensions: desktop-entry-invalid-category X-KDE-settings-system ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop +pytdeextensions: desktop-entry-lacks-main-category ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop +pytdeextensions: desktop-command-not-in-package ./usr/share/apps/pytdeextensions/app_templates/kdeapp/src/kdeapp.desktop $APPNAMELC$ +pytdeextensions: desktop-command-not-in-package ./usr/share/apps/pytdeextensions/app_templates/kdeutility/src/kdeutility.desktop $APPNAMELC$ + +pytdeextensions: executable-not-elf-or-script ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py +pytdeextensions: executable-not-elf-or-script ./usr/share/apps/pytdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py diff --git a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/python-distutils-jaunty.mk b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/python-distutils-jaunty.mk index 63fce07d5..63fce07d5 100644 --- a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/python-distutils-jaunty.mk +++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/python-distutils-jaunty.mk diff --git a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/pyversions b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/pyversions index b3dc41ebc..b3dc41ebc 100644 --- a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/pyversions +++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/pyversions diff --git a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/rules b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/rules index 38e8bfc86..f6a1d85e6 100755 --- a/ubuntu/maverick_automake/libraries/pykdeextensions/debian/rules +++ b/ubuntu/maverick_automake/libraries/pytdeextensions/debian/rules @@ -18,14 +18,14 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde -install/pykdeextensions-kde3:: +install/pytdeextensions-kde3:: # We have no idea if the built product is site-packages or dist-packages cd debian/tmp/usr/lib/python*/ && mv site-packages/ dist-packages/ || echo "site-packages --> dist-packages" rm -rf debian/tmp/usr/lib/python*/site-packages/ # install lintian overrides - install -D -p -m0644 debian/pykdeextensions-kde3.lintian-overrides \ - debian/pykdeextensions-kde3/usr/share/lintian/overrides/pykdeextensions-kde3 + install -D -p -m0644 debian/pytdeextensions-kde3.lintian-overrides \ + debian/pytdeextensions-kde3/usr/share/lintian/overrides/pytdeextensions-kde3 # fix script-not-executable find debian -type f -name '*.py' | xargs chmod 0755 diff --git a/ubuntu/maverick_automake/libraries/python-kde3/debian/changelog b/ubuntu/maverick_automake/libraries/python-kde3/debian/changelog index 948b079e2..afeaa1689 100644 --- a/ubuntu/maverick_automake/libraries/python-kde3/debian/changelog +++ b/ubuntu/maverick_automake/libraries/python-kde3/debian/changelog @@ -320,7 +320,7 @@ python-kde3 (3.11.3+20050829-1) unstable; urgency=low * Added the homepage of PyKDE to the package descriptions * HTML documentations is now installed into /usr/share/doc/python-kde3-doc/html - * pykdeconfig.py now also knows that the sip files + * pytdeconfig.py now also knows that the sip files are in /usr/share/sip/kde3, not in /usr/share/sip/kde (Closes: #312708) diff --git a/ubuntu/maverick_automake/libraries/python-kde3/debian/control b/ubuntu/maverick_automake/libraries/python-kde3/debian/control index 617cc9a1b..da397514b 100644 --- a/ubuntu/maverick_automake/libraries/python-kde3/debian/control +++ b/ubuntu/maverick_automake/libraries/python-kde3/debian/control @@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Ricardo Javier Cardenes Medina <rcardenes@debian.org> Uploaders: Torsten Marek <shlomme@debian.org>, Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> Build-Depends: debhelper (>= 5.0.38), libqt3-mt-dev (>= 3:3.3.7), qt3-dev-tools (>= 3:3.3.7), qt3-apps-dev (>= 3:3.3.7), python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-qt-dev (>= 3.18), kdelibs4-kde3-dev, python-central (>= 0.6.11), dpatch, python-sip4, python-sip4-dbg, python-sip4-dev Standards-Version: 3.8.3 -Homepage: http://www.riverbankcomputing.co.uk/pykde/index.php +Homepage: http://www.riverbankcomputing.co.uk/pytde/index.php XS-Python-Version: all Package: python-kde3-kde3 diff --git a/ubuntu/lucid_automake/libraries/python-kde3/debian/pykdeconfig.py b/ubuntu/maverick_automake/libraries/python-kde3/debian/pytdeconfig.py index b6c29318e..baab0b1cf 100644 --- a/ubuntu/lucid_automake/libraries/python-kde3/debian/pykdeconfig.py +++ b/ubuntu/maverick_automake/libraries/python-kde3/debian/pytdeconfig.py @@ -4,8 +4,8 @@ import sys if getattr(sys, "pydebug", False): try: - from pykdeconfig_d import * + from pytdeconfig_d import * except ImportError, msg: - raise ImportError, 'No module named pykdeconfig; package python-kde3-dbg not installed' + raise ImportError, 'No module named pytdeconfig; package python-kde3-dbg not installed' else: - from pykdeconfig_nd import * + from pytdeconfig_nd import * diff --git a/ubuntu/maverick_automake/libraries/python-kde3/debian/rules b/ubuntu/maverick_automake/libraries/python-kde3/debian/rules index bc3dd4991..553c08f56 100755 --- a/ubuntu/maverick_automake/libraries/python-kde3/debian/rules +++ b/ubuntu/maverick_automake/libraries/python-kde3/debian/rules @@ -93,12 +93,12 @@ install-indep: for version in ${PYTHONS};\ do\ mkdir -p debian/python-kde3-kde3-dev/opt/kde3/lib/python-$$version/site-packages;\ - cp debian/pykdeconfig.py debian/python-kde3-kde3-dev/opt/kde3/lib/python-$$version/site-packages/;\ - cp build-$$version/pykdeconfig.py debian/python-kde3-kde3-dev/opt/kde3/lib/python-$$version/site-packages/pykdeconfig_nd.py;\ + cp debian/pytdeconfig.py debian/python-kde3-kde3-dev/opt/kde3/lib/python-$$version/site-packages/;\ + cp build-$$version/pytdeconfig.py debian/python-kde3-kde3-dev/opt/kde3/lib/python-$$version/site-packages/pytdeconfig_nd.py;\ done for version in ${DBG_PYTHONS};\ do\ - cp dbg-build-$$version/pykdeconfig.py debian/python-kde3-kde3-dev/opt/kde3/lib/python-$$version/site-packages/pykdeconfig_d.py;\ + cp dbg-build-$$version/pytdeconfig.py debian/python-kde3-kde3-dev/opt/kde3/lib/python-$$version/site-packages/pytdeconfig_d.py;\ done install-arch: |
