diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-06 00:16:36 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-06 00:16:36 -0600 |
| commit | f4634b328371616fc548101a85bd9a02dbb98f88 (patch) | |
| tree | fc4d5d0aa17d68cf73f5f7bef92bd17dd402b782 | |
| parent | bac93c22920098660092d956471b89a2ac57ae0a (diff) | |
| download | tde-packaging-f4634b328371616fc548101a85bd9a02dbb98f88.tar.gz tde-packaging-f4634b328371616fc548101a85bd9a02dbb98f88.zip | |
Fix accidental networtde renames
84 files changed, 717 insertions, 717 deletions
diff --git a/debian/lenny/tdeadmin/debian/changelog b/debian/lenny/tdeadmin/debian/changelog index 2a7c44e06..4fca9af79 100644 --- a/debian/lenny/tdeadmin/debian/changelog +++ b/debian/lenny/tdeadmin/debian/changelog @@ -44,9 +44,9 @@ tdeadmin (4:3.5.9-0ubuntu5) hardy; urgency=low tdeadmin (4:3.5.9-0ubuntu4) hardy; urgency=low * Added kubuntu_13_no_samba_tweak.diff. - Knetwortdeconf reads smb.conf parameters but doesn't write them + Knetworkconf reads smb.conf parameters but doesn't write them causing the parameters to be removed from the config file. - Knetwortdeconf doesn't allow changing those, so there is no reason + Knetworkconf doesn't allow changing those, so there is no reason to let it read them. -- Anthony Mercatante <tonio@ubuntu.com> Thu, 03 Apr 2008 15:30:44 +0200 @@ -60,7 +60,7 @@ tdeadmin (4:3.5.9-0ubuntu3) hardy; urgency=low tdeadmin (4:3.5.9-0ubuntu2) hardy; urgency=low - * Add kubuntu_11_knetwortdeconf_icons.diff from Adam Spain, + * Add kubuntu_11_knetworkconf_icons.diff from Adam Spain, closes LP: #93878 "low quality icons" -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 03 Mar 2008 14:20:34 +0000 @@ -81,8 +81,8 @@ tdeadmin (4:3.5.8-1ubuntu1) hardy; urgency=low * Merge with Debian, remaining changes - kubuntu_08_kpackage_sudo.diff, sudo support - - kubuntu_10_knetwortdeconf_localhost.diff, LP #66813 - * Add kubuntu_11_knetwortdeconf_8.04.diff for 8.04 detection in knetwortdeconf + - kubuntu_10_knetworkconf_localhost.diff, LP #66813 + * Add kubuntu_11_knetworkconf_8.04.diff for 8.04 detection in knetworkconf -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 14 Nov 2007 17:25:38 +0000 @@ -135,7 +135,7 @@ tdeadmin (4:3.5.6-2) unstable; urgency=low +++ Changes by Modestas Vainius: - * knetwortdeconf RC bug fix: recognize allow-* statements in + * knetworkconf RC bug fix: recognize allow-* statements in /etc/network/interfaces as stanzas, not as ordinary options. This misrecognition led to corruption of the interfaces file in case allow-* stanza followed the iface stanza that new options were added to. Patch @@ -179,7 +179,7 @@ tdeadmin (4:3.5.5-2) unstable; urgency=low tdeadmin (4:3.5.6-0ubuntu1) feisty; urgency=low * New upstream release - * Remove kubuntu_12_knetwortdeconf_feisty.diff, applied upstream + * Remove kubuntu_12_knetworkconf_feisty.diff, applied upstream -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 17 Jan 2007 11:22:29 +0000 @@ -192,8 +192,8 @@ tdeadmin (4:3.5.5-1ubuntu4) feisty; urgency=low tdeadmin (4:3.5.5-1ubuntu3) feisty; urgency=low - * Added kubuntu_12_knetwortdeconf_feisty.diff to properly autodetect - feisty as knetwortdeconf backend. + * Added kubuntu_12_knetworkconf_feisty.diff to properly autodetect + feisty as knetworkconf backend. -- Luka Renko <lure@ubuntu.com> Sun, 10 Dec 2006 16:16:12 +0100 @@ -235,7 +235,7 @@ tdeadmin (4:3.5.4-1) unstable; urgency=low tdeadmin (4:3.5.5-0ubuntu2) edgy; urgency=low - * kubuntu_10_knetwortdeconf_localhost.diff added, hostname should not + * kubuntu_10_knetworkconf_localhost.diff added, hostname should not be appended as alias to localhost in /etc/hosts Closes Malone #66813 @@ -244,7 +244,7 @@ tdeadmin (4:3.5.5-0ubuntu2) edgy; urgency=low tdeadmin (4:3.5.5-0ubuntu1) edgy; urgency=low * New upstream release - * kubuntu_09_networtdeconf_edgy.diff removed, merged upstream + * kubuntu_09_networkconf_edgy.diff removed, merged upstream -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 3 Oct 2006 10:56:07 +0000 @@ -257,7 +257,7 @@ tdeadmin (4:3.5.4-0ubuntu3) edgy; urgency=low tdeadmin (4:3.5.4-0ubuntu2) edgy; urgency=low - * Add kubuntu_09_networtdeconf_edgy.diff to support Edgy in knetwortdeconf + * Add kubuntu_09_networkconf_edgy.diff to support Edgy in knetworkconf -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 7 Aug 2006 09:08:39 -0400 @@ -315,7 +315,7 @@ tdeadmin (4:3.5.1-2) unstable; urgency=low +++ Changes by Christopher Martin: - * Drop system-tools-backends.pc from knetwortdeconf, since it conflicts with + * Drop system-tools-backends.pc from knetworkconf, since it conflicts with gnome-system-tools. (Closes: #353321) -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sun, 19 Feb 2006 14:30:28 -0500 @@ -416,9 +416,9 @@ tdeadmin (4:3.5.1-0ubuntu1) dapper; urgency=low tdeadmin (4:3.5.0-0ubuntu2) dapper; urgency=low - * Add kubuntu_01_knetwortdeconf_branch_fixes.diff fixes - - http://bugzilla.ubuntu.com/9871 knetwortdeconf doesn't save gateway - - http://bugzilla.ubuntu.com/16921 knetwortdeconf too big for 1024x768 + * Add kubuntu_01_knetworkconf_branch_fixes.diff fixes + - http://bugzilla.ubuntu.com/9871 knetworkconf doesn't save gateway + - http://bugzilla.ubuntu.com/16921 knetworkconf too big for 1024x768 - Ensure changes are applied when clicking OK and don't leave zombie processes around @@ -449,7 +449,7 @@ tdeadmin (4:3.5.0-2) alioth; urgency=low +++ Changes by Josh Metzler: - * Create the new knetwortdeconf package. + * Create the new knetworkconf package. +++ Changes by Christopher Martin: diff --git a/debian/lenny/tdeadmin/debian/control b/debian/lenny/tdeadmin/debian/control index 0042d0d8d..8bcab9710 100644 --- a/debian/lenny/tdeadmin/debian/control +++ b/debian/lenny/tdeadmin/debian/control @@ -12,7 +12,7 @@ Section: tde Architecture: all Replaces: kdeadmin-trinity (<< 4:14.0.0) Breaks: kdeadmin-trinity (<< 4:14.0.0) -Depends: kcron-trinity (>= ${Source-Version}), kdat-trinity (>= ${Source-Version}), tdeadmin-tdefile-plugins-trinity (>= ${Source-Version}), knetwortdeconf-trinity (>= ${Source-Version}), kpackage-trinity (>= ${Source-Version}), ksysv-trinity (>= ${Source-Version}), kuser-trinity (>= ${Source-Version}) +Depends: kcron-trinity (>= ${Source-Version}), kdat-trinity (>= ${Source-Version}), tdeadmin-tdefile-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}) Description: system administration tools from the official Trinity release @@ -91,11 +91,11 @@ Description: Trinity file metainfo plugins for deb and rpm files This package is part of Trinity, as a component of the KDE administration module. See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information. -Package: knetwortdeconf-trinity +Package: knetworkconf-trinity Section: tde Architecture: any -Replaces: knetwortdeconf-trinity (<< 4:14.0.0) -Breaks: knetwortdeconf-trinity (<< 4:14.0.0) +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 diff --git a/debian/lenny/tdeadmin/debian/control.in b/debian/lenny/tdeadmin/debian/control.in index b56d4e54c..8958b98e4 100644 --- a/debian/lenny/tdeadmin/debian/control.in +++ b/debian/lenny/tdeadmin/debian/control.in @@ -10,7 +10,7 @@ Standards-Version: 3.7.2 Package: tdeadmin Section: tde Architecture: all -Depends: kcron (>= ${Source-Version}), kdat (>= ${Source-Version}), tdeadmin-tdefile-plugins (>= ${Source-Version}), knetwortdeconf (>= ${Source-Version}), kpackage (>= ${Source-Version}), ksysv (>= ${Source-Version}), kuser (>= ${Source-Version}) +Depends: kcron (>= ${Source-Version}), kdat (>= ${Source-Version}), tdeadmin-tdefile-plugins (>= ${Source-Version}), knetworkconf (>= ${Source-Version}), kpackage (>= ${Source-Version}), ksysv (>= ${Source-Version}), kuser (>= ${Source-Version}) Recommends: lilo-config (>= ${Source-Version}) Suggests: tdeadmin-doc-html (>= ${Source-Version}) Description: system administration tools from the official KDE release @@ -81,7 +81,7 @@ Description: KDE file metainfo plugins for deb and rpm files This package is part of KDE, as a component of the KDE administration module. See the 'kde' and 'tdeadmin' packages for more information. -Package: knetwortdeconf +Package: knetworkconf Section: tde Architecture: any Depends: ${shlibs:Depends} diff --git a/debian/lenny/tdeadmin/debian/knetworkconf-trinity.install b/debian/lenny/tdeadmin/debian/knetworkconf-trinity.install new file mode 100644 index 000000000..ec0333100 --- /dev/null +++ b/debian/lenny/tdeadmin/debian/knetworkconf-trinity.install @@ -0,0 +1,56 @@ +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/01.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/02.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/11.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/03.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/04.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/05.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/06.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/07.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/about1.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/08.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/09.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/common +debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/knetworkconf.png +debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/knetworkconf.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/knetworkconf.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_disconnected_wlan.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_connected_lan_knc.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_disconnected_lan.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_traffic_wlan.png +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/network-conf +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/debug.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/file.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/general.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/network.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/parse.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/platform.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/process.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/replace.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/report.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/service.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/service-list.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/util.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/xml.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/ark.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/debian.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/blackpanther.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/mandriva.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/pld.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/redhat.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/suse.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/turbolinux.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/conectiva.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/fedora.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/openna.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/slackware.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/freebsd.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/gentoo.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/vine.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/rpath.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/kubuntu.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/yoper.png +debian/tmp/opt/trinity/share/applications/tde/kcm_knetworkconfmodule.desktop +debian/tmp/opt/trinity/lib/trinity/kcm_knetworkconfmodule.so +debian/tmp/opt/trinity/lib/trinity/kcm_knetworkconfmodule.la diff --git a/debian/squeeze/tdeadmin/debian/knetwortdeconf-trinity.postinst b/debian/lenny/tdeadmin/debian/knetworkconf-trinity.postinst index b32c2fb00..bcb12994d 100644 --- a/debian/squeeze/tdeadmin/debian/knetwortdeconf-trinity.postinst +++ b/debian/lenny/tdeadmin/debian/knetworkconf-trinity.postinst @@ -3,9 +3,9 @@ case "$1" in configure) - dpkg-divert --remove /usr/share/icons/hicolor/16x16/apps/knetwortdeconf.png - dpkg-divert --remove /usr/share/icons/hicolor/22x22/apps/knetwortdeconf.png - dpkg-divert --remove /usr/share/icons/hicolor/32x32/apps/knetwortdeconf.png + dpkg-divert --remove /usr/share/icons/hicolor/16x16/apps/knetworkconf.png + dpkg-divert --remove /usr/share/icons/hicolor/22x22/apps/knetworkconf.png + dpkg-divert --remove /usr/share/icons/hicolor/32x32/apps/knetworkconf.png dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_connected_lan_knc.png dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_disconnected_lan.png dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_disconnected_wlan.png diff --git a/debian/lenny/tdeadmin/debian/knetwortdeconf-trinity.install b/debian/lenny/tdeadmin/debian/knetwortdeconf-trinity.install deleted file mode 100644 index dbe573132..000000000 --- a/debian/lenny/tdeadmin/debian/knetwortdeconf-trinity.install +++ /dev/null @@ -1,56 +0,0 @@ -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/01.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/02.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/11.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/03.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/04.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/05.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/06.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/07.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/about1.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/08.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/09.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/common -debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/knetwortdeconf.png -debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/knetwortdeconf.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/knetwortdeconf.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_disconnected_wlan.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_connected_lan_knc.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_disconnected_lan.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_traffic_wlan.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/network-conf -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/debug.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/file.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/general.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/network.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/parse.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/platform.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/process.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/replace.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/report.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/service.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/service-list.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/util.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/xml.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/ark.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/debian.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/blackpanther.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/mandriva.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/pld.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/redhat.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/suse.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/turbolinux.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/conectiva.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/fedora.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/openna.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/slackware.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/freebsd.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/gentoo.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/vine.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/rpath.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/kubuntu.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/yoper.png -debian/tmp/opt/trinity/share/applications/tde/kcm_knetwortdeconfmodule.desktop -debian/tmp/opt/trinity/lib/trinity/kcm_knetwortdeconfmodule.so -debian/tmp/opt/trinity/lib/trinity/kcm_knetwortdeconfmodule.la diff --git a/debian/squeeze/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetwortdeconf b/debian/lenny/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetworkconf index 59e475dd7..134b08805 100644 --- a/debian/squeeze/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetwortdeconf +++ b/debian/lenny/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetworkconf @@ -1,10 +1,10 @@ -Document: tdeadmin-doc-html-knetwortdeconf +Document: tdeadmin-doc-html-knetworkconf Title: KNetworkConf Handbook Author: Sean Wheller, Christoph Eckert Abstract: KNetworkConf is a graphical manager for network devices and settings. Section: Admin Format: HTML -Index: /usr/share/doc/tde/HTML/en/knetwortdeconf/index.html -Files: /usr/share/doc/tde/HTML/en/knetwortdeconf/*.html +Index: /usr/share/doc/tde/HTML/en/knetworkconf/index.html +Files: /usr/share/doc/tde/HTML/en/knetworkconf/*.html diff --git a/debian/lenny/tdelibs/debian/changelog b/debian/lenny/tdelibs/debian/changelog index 28a76fe79..e909d30a2 100644 --- a/debian/lenny/tdelibs/debian/changelog +++ b/debian/lenny/tdelibs/debian/changelog @@ -1965,7 +1965,7 @@ tdelibs (4:3.4.91-0ubuntu1) breezy; urgency=low tdelibs (4:3.4.2-0ubuntu4) breezy; urgency=low - * Add replaces on old knetwortdeconf for tdelibs-data + * Add replaces on old knetworkconf for tdelibs-data -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 3 Aug 2005 12:44:18 +0000 diff --git a/debian/squeeze/tdeadmin/debian/changelog b/debian/squeeze/tdeadmin/debian/changelog index 2a7c44e06..4fca9af79 100644 --- a/debian/squeeze/tdeadmin/debian/changelog +++ b/debian/squeeze/tdeadmin/debian/changelog @@ -44,9 +44,9 @@ tdeadmin (4:3.5.9-0ubuntu5) hardy; urgency=low tdeadmin (4:3.5.9-0ubuntu4) hardy; urgency=low * Added kubuntu_13_no_samba_tweak.diff. - Knetwortdeconf reads smb.conf parameters but doesn't write them + Knetworkconf reads smb.conf parameters but doesn't write them causing the parameters to be removed from the config file. - Knetwortdeconf doesn't allow changing those, so there is no reason + Knetworkconf doesn't allow changing those, so there is no reason to let it read them. -- Anthony Mercatante <tonio@ubuntu.com> Thu, 03 Apr 2008 15:30:44 +0200 @@ -60,7 +60,7 @@ tdeadmin (4:3.5.9-0ubuntu3) hardy; urgency=low tdeadmin (4:3.5.9-0ubuntu2) hardy; urgency=low - * Add kubuntu_11_knetwortdeconf_icons.diff from Adam Spain, + * Add kubuntu_11_knetworkconf_icons.diff from Adam Spain, closes LP: #93878 "low quality icons" -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 03 Mar 2008 14:20:34 +0000 @@ -81,8 +81,8 @@ tdeadmin (4:3.5.8-1ubuntu1) hardy; urgency=low * Merge with Debian, remaining changes - kubuntu_08_kpackage_sudo.diff, sudo support - - kubuntu_10_knetwortdeconf_localhost.diff, LP #66813 - * Add kubuntu_11_knetwortdeconf_8.04.diff for 8.04 detection in knetwortdeconf + - kubuntu_10_knetworkconf_localhost.diff, LP #66813 + * Add kubuntu_11_knetworkconf_8.04.diff for 8.04 detection in knetworkconf -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 14 Nov 2007 17:25:38 +0000 @@ -135,7 +135,7 @@ tdeadmin (4:3.5.6-2) unstable; urgency=low +++ Changes by Modestas Vainius: - * knetwortdeconf RC bug fix: recognize allow-* statements in + * knetworkconf RC bug fix: recognize allow-* statements in /etc/network/interfaces as stanzas, not as ordinary options. This misrecognition led to corruption of the interfaces file in case allow-* stanza followed the iface stanza that new options were added to. Patch @@ -179,7 +179,7 @@ tdeadmin (4:3.5.5-2) unstable; urgency=low tdeadmin (4:3.5.6-0ubuntu1) feisty; urgency=low * New upstream release - * Remove kubuntu_12_knetwortdeconf_feisty.diff, applied upstream + * Remove kubuntu_12_knetworkconf_feisty.diff, applied upstream -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 17 Jan 2007 11:22:29 +0000 @@ -192,8 +192,8 @@ tdeadmin (4:3.5.5-1ubuntu4) feisty; urgency=low tdeadmin (4:3.5.5-1ubuntu3) feisty; urgency=low - * Added kubuntu_12_knetwortdeconf_feisty.diff to properly autodetect - feisty as knetwortdeconf backend. + * Added kubuntu_12_knetworkconf_feisty.diff to properly autodetect + feisty as knetworkconf backend. -- Luka Renko <lure@ubuntu.com> Sun, 10 Dec 2006 16:16:12 +0100 @@ -235,7 +235,7 @@ tdeadmin (4:3.5.4-1) unstable; urgency=low tdeadmin (4:3.5.5-0ubuntu2) edgy; urgency=low - * kubuntu_10_knetwortdeconf_localhost.diff added, hostname should not + * kubuntu_10_knetworkconf_localhost.diff added, hostname should not be appended as alias to localhost in /etc/hosts Closes Malone #66813 @@ -244,7 +244,7 @@ tdeadmin (4:3.5.5-0ubuntu2) edgy; urgency=low tdeadmin (4:3.5.5-0ubuntu1) edgy; urgency=low * New upstream release - * kubuntu_09_networtdeconf_edgy.diff removed, merged upstream + * kubuntu_09_networkconf_edgy.diff removed, merged upstream -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 3 Oct 2006 10:56:07 +0000 @@ -257,7 +257,7 @@ tdeadmin (4:3.5.4-0ubuntu3) edgy; urgency=low tdeadmin (4:3.5.4-0ubuntu2) edgy; urgency=low - * Add kubuntu_09_networtdeconf_edgy.diff to support Edgy in knetwortdeconf + * Add kubuntu_09_networkconf_edgy.diff to support Edgy in knetworkconf -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 7 Aug 2006 09:08:39 -0400 @@ -315,7 +315,7 @@ tdeadmin (4:3.5.1-2) unstable; urgency=low +++ Changes by Christopher Martin: - * Drop system-tools-backends.pc from knetwortdeconf, since it conflicts with + * Drop system-tools-backends.pc from knetworkconf, since it conflicts with gnome-system-tools. (Closes: #353321) -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sun, 19 Feb 2006 14:30:28 -0500 @@ -416,9 +416,9 @@ tdeadmin (4:3.5.1-0ubuntu1) dapper; urgency=low tdeadmin (4:3.5.0-0ubuntu2) dapper; urgency=low - * Add kubuntu_01_knetwortdeconf_branch_fixes.diff fixes - - http://bugzilla.ubuntu.com/9871 knetwortdeconf doesn't save gateway - - http://bugzilla.ubuntu.com/16921 knetwortdeconf too big for 1024x768 + * Add kubuntu_01_knetworkconf_branch_fixes.diff fixes + - http://bugzilla.ubuntu.com/9871 knetworkconf doesn't save gateway + - http://bugzilla.ubuntu.com/16921 knetworkconf too big for 1024x768 - Ensure changes are applied when clicking OK and don't leave zombie processes around @@ -449,7 +449,7 @@ tdeadmin (4:3.5.0-2) alioth; urgency=low +++ Changes by Josh Metzler: - * Create the new knetwortdeconf package. + * Create the new knetworkconf package. +++ Changes by Christopher Martin: diff --git a/debian/squeeze/tdeadmin/debian/control b/debian/squeeze/tdeadmin/debian/control index 0042d0d8d..8bcab9710 100644 --- a/debian/squeeze/tdeadmin/debian/control +++ b/debian/squeeze/tdeadmin/debian/control @@ -12,7 +12,7 @@ Section: tde Architecture: all Replaces: kdeadmin-trinity (<< 4:14.0.0) Breaks: kdeadmin-trinity (<< 4:14.0.0) -Depends: kcron-trinity (>= ${Source-Version}), kdat-trinity (>= ${Source-Version}), tdeadmin-tdefile-plugins-trinity (>= ${Source-Version}), knetwortdeconf-trinity (>= ${Source-Version}), kpackage-trinity (>= ${Source-Version}), ksysv-trinity (>= ${Source-Version}), kuser-trinity (>= ${Source-Version}) +Depends: kcron-trinity (>= ${Source-Version}), kdat-trinity (>= ${Source-Version}), tdeadmin-tdefile-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}) Description: system administration tools from the official Trinity release @@ -91,11 +91,11 @@ Description: Trinity file metainfo plugins for deb and rpm files This package is part of Trinity, as a component of the KDE administration module. See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information. -Package: knetwortdeconf-trinity +Package: knetworkconf-trinity Section: tde Architecture: any -Replaces: knetwortdeconf-trinity (<< 4:14.0.0) -Breaks: knetwortdeconf-trinity (<< 4:14.0.0) +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 diff --git a/debian/squeeze/tdeadmin/debian/control.in b/debian/squeeze/tdeadmin/debian/control.in index b56d4e54c..8958b98e4 100644 --- a/debian/squeeze/tdeadmin/debian/control.in +++ b/debian/squeeze/tdeadmin/debian/control.in @@ -10,7 +10,7 @@ Standards-Version: 3.7.2 Package: tdeadmin Section: tde Architecture: all -Depends: kcron (>= ${Source-Version}), kdat (>= ${Source-Version}), tdeadmin-tdefile-plugins (>= ${Source-Version}), knetwortdeconf (>= ${Source-Version}), kpackage (>= ${Source-Version}), ksysv (>= ${Source-Version}), kuser (>= ${Source-Version}) +Depends: kcron (>= ${Source-Version}), kdat (>= ${Source-Version}), tdeadmin-tdefile-plugins (>= ${Source-Version}), knetworkconf (>= ${Source-Version}), kpackage (>= ${Source-Version}), ksysv (>= ${Source-Version}), kuser (>= ${Source-Version}) Recommends: lilo-config (>= ${Source-Version}) Suggests: tdeadmin-doc-html (>= ${Source-Version}) Description: system administration tools from the official KDE release @@ -81,7 +81,7 @@ Description: KDE file metainfo plugins for deb and rpm files This package is part of KDE, as a component of the KDE administration module. See the 'kde' and 'tdeadmin' packages for more information. -Package: knetwortdeconf +Package: knetworkconf Section: tde Architecture: any Depends: ${shlibs:Depends} diff --git a/debian/squeeze/tdeadmin/debian/knetworkconf-trinity.install b/debian/squeeze/tdeadmin/debian/knetworkconf-trinity.install new file mode 100644 index 000000000..ec0333100 --- /dev/null +++ b/debian/squeeze/tdeadmin/debian/knetworkconf-trinity.install @@ -0,0 +1,56 @@ +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/01.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/02.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/11.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/03.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/04.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/05.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/06.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/07.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/about1.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/08.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/09.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/common +debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/knetworkconf.png +debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/knetworkconf.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/knetworkconf.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_disconnected_wlan.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_connected_lan_knc.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_disconnected_lan.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_traffic_wlan.png +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/network-conf +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/debug.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/file.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/general.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/network.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/parse.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/platform.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/process.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/replace.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/report.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/service.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/service-list.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/util.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/xml.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/ark.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/debian.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/blackpanther.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/mandriva.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/pld.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/redhat.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/suse.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/turbolinux.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/conectiva.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/fedora.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/openna.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/slackware.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/freebsd.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/gentoo.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/vine.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/rpath.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/kubuntu.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/yoper.png +debian/tmp/opt/trinity/share/applications/tde/kcm_knetworkconfmodule.desktop +debian/tmp/opt/trinity/lib/trinity/kcm_knetworkconfmodule.so +debian/tmp/opt/trinity/lib/trinity/kcm_knetworkconfmodule.la diff --git a/debian/lenny/tdeadmin/debian/knetwortdeconf-trinity.postinst b/debian/squeeze/tdeadmin/debian/knetworkconf-trinity.postinst index b32c2fb00..bcb12994d 100644 --- a/debian/lenny/tdeadmin/debian/knetwortdeconf-trinity.postinst +++ b/debian/squeeze/tdeadmin/debian/knetworkconf-trinity.postinst @@ -3,9 +3,9 @@ case "$1" in configure) - dpkg-divert --remove /usr/share/icons/hicolor/16x16/apps/knetwortdeconf.png - dpkg-divert --remove /usr/share/icons/hicolor/22x22/apps/knetwortdeconf.png - dpkg-divert --remove /usr/share/icons/hicolor/32x32/apps/knetwortdeconf.png + dpkg-divert --remove /usr/share/icons/hicolor/16x16/apps/knetworkconf.png + dpkg-divert --remove /usr/share/icons/hicolor/22x22/apps/knetworkconf.png + dpkg-divert --remove /usr/share/icons/hicolor/32x32/apps/knetworkconf.png dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_connected_lan_knc.png dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_disconnected_lan.png dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_disconnected_wlan.png diff --git a/debian/squeeze/tdeadmin/debian/knetwortdeconf-trinity.install b/debian/squeeze/tdeadmin/debian/knetwortdeconf-trinity.install deleted file mode 100644 index dbe573132..000000000 --- a/debian/squeeze/tdeadmin/debian/knetwortdeconf-trinity.install +++ /dev/null @@ -1,56 +0,0 @@ -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/01.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/02.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/11.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/03.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/04.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/05.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/06.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/07.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/about1.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/08.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/09.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/common -debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/knetwortdeconf.png -debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/knetwortdeconf.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/knetwortdeconf.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_disconnected_wlan.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_connected_lan_knc.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_disconnected_lan.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_traffic_wlan.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/network-conf -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/debug.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/file.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/general.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/network.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/parse.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/platform.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/process.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/replace.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/report.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/service.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/service-list.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/util.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/xml.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/ark.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/debian.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/blackpanther.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/mandriva.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/pld.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/redhat.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/suse.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/turbolinux.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/conectiva.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/fedora.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/openna.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/slackware.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/freebsd.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/gentoo.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/vine.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/rpath.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/kubuntu.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/yoper.png -debian/tmp/opt/trinity/share/applications/tde/kcm_knetwortdeconfmodule.desktop -debian/tmp/opt/trinity/lib/trinity/kcm_knetwortdeconfmodule.so -debian/tmp/opt/trinity/lib/trinity/kcm_knetwortdeconfmodule.la diff --git a/debian/wheezy/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetwortdeconf b/debian/squeeze/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetworkconf index 59e475dd7..134b08805 100644 --- a/debian/wheezy/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetwortdeconf +++ b/debian/squeeze/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetworkconf @@ -1,10 +1,10 @@ -Document: tdeadmin-doc-html-knetwortdeconf +Document: tdeadmin-doc-html-knetworkconf Title: KNetworkConf Handbook Author: Sean Wheller, Christoph Eckert Abstract: KNetworkConf is a graphical manager for network devices and settings. Section: Admin Format: HTML -Index: /usr/share/doc/tde/HTML/en/knetwortdeconf/index.html -Files: /usr/share/doc/tde/HTML/en/knetwortdeconf/*.html +Index: /usr/share/doc/tde/HTML/en/knetworkconf/index.html +Files: /usr/share/doc/tde/HTML/en/knetworkconf/*.html diff --git a/debian/squeeze/tdelibs/debian/changelog b/debian/squeeze/tdelibs/debian/changelog index 28a76fe79..e909d30a2 100644 --- a/debian/squeeze/tdelibs/debian/changelog +++ b/debian/squeeze/tdelibs/debian/changelog @@ -1965,7 +1965,7 @@ tdelibs (4:3.4.91-0ubuntu1) breezy; urgency=low tdelibs (4:3.4.2-0ubuntu4) breezy; urgency=low - * Add replaces on old knetwortdeconf for tdelibs-data + * Add replaces on old knetworkconf for tdelibs-data -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 3 Aug 2005 12:44:18 +0000 diff --git a/debian/wheezy/tdeadmin/debian/changelog b/debian/wheezy/tdeadmin/debian/changelog index 2a7c44e06..4fca9af79 100644 --- a/debian/wheezy/tdeadmin/debian/changelog +++ b/debian/wheezy/tdeadmin/debian/changelog @@ -44,9 +44,9 @@ tdeadmin (4:3.5.9-0ubuntu5) hardy; urgency=low tdeadmin (4:3.5.9-0ubuntu4) hardy; urgency=low * Added kubuntu_13_no_samba_tweak.diff. - Knetwortdeconf reads smb.conf parameters but doesn't write them + Knetworkconf reads smb.conf parameters but doesn't write them causing the parameters to be removed from the config file. - Knetwortdeconf doesn't allow changing those, so there is no reason + Knetworkconf doesn't allow changing those, so there is no reason to let it read them. -- Anthony Mercatante <tonio@ubuntu.com> Thu, 03 Apr 2008 15:30:44 +0200 @@ -60,7 +60,7 @@ tdeadmin (4:3.5.9-0ubuntu3) hardy; urgency=low tdeadmin (4:3.5.9-0ubuntu2) hardy; urgency=low - * Add kubuntu_11_knetwortdeconf_icons.diff from Adam Spain, + * Add kubuntu_11_knetworkconf_icons.diff from Adam Spain, closes LP: #93878 "low quality icons" -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 03 Mar 2008 14:20:34 +0000 @@ -81,8 +81,8 @@ tdeadmin (4:3.5.8-1ubuntu1) hardy; urgency=low * Merge with Debian, remaining changes - kubuntu_08_kpackage_sudo.diff, sudo support - - kubuntu_10_knetwortdeconf_localhost.diff, LP #66813 - * Add kubuntu_11_knetwortdeconf_8.04.diff for 8.04 detection in knetwortdeconf + - kubuntu_10_knetworkconf_localhost.diff, LP #66813 + * Add kubuntu_11_knetworkconf_8.04.diff for 8.04 detection in knetworkconf -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 14 Nov 2007 17:25:38 +0000 @@ -135,7 +135,7 @@ tdeadmin (4:3.5.6-2) unstable; urgency=low +++ Changes by Modestas Vainius: - * knetwortdeconf RC bug fix: recognize allow-* statements in + * knetworkconf RC bug fix: recognize allow-* statements in /etc/network/interfaces as stanzas, not as ordinary options. This misrecognition led to corruption of the interfaces file in case allow-* stanza followed the iface stanza that new options were added to. Patch @@ -179,7 +179,7 @@ tdeadmin (4:3.5.5-2) unstable; urgency=low tdeadmin (4:3.5.6-0ubuntu1) feisty; urgency=low * New upstream release - * Remove kubuntu_12_knetwortdeconf_feisty.diff, applied upstream + * Remove kubuntu_12_knetworkconf_feisty.diff, applied upstream -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 17 Jan 2007 11:22:29 +0000 @@ -192,8 +192,8 @@ tdeadmin (4:3.5.5-1ubuntu4) feisty; urgency=low tdeadmin (4:3.5.5-1ubuntu3) feisty; urgency=low - * Added kubuntu_12_knetwortdeconf_feisty.diff to properly autodetect - feisty as knetwortdeconf backend. + * Added kubuntu_12_knetworkconf_feisty.diff to properly autodetect + feisty as knetworkconf backend. -- Luka Renko <lure@ubuntu.com> Sun, 10 Dec 2006 16:16:12 +0100 @@ -235,7 +235,7 @@ tdeadmin (4:3.5.4-1) unstable; urgency=low tdeadmin (4:3.5.5-0ubuntu2) edgy; urgency=low - * kubuntu_10_knetwortdeconf_localhost.diff added, hostname should not + * kubuntu_10_knetworkconf_localhost.diff added, hostname should not be appended as alias to localhost in /etc/hosts Closes Malone #66813 @@ -244,7 +244,7 @@ tdeadmin (4:3.5.5-0ubuntu2) edgy; urgency=low tdeadmin (4:3.5.5-0ubuntu1) edgy; urgency=low * New upstream release - * kubuntu_09_networtdeconf_edgy.diff removed, merged upstream + * kubuntu_09_networkconf_edgy.diff removed, merged upstream -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 3 Oct 2006 10:56:07 +0000 @@ -257,7 +257,7 @@ tdeadmin (4:3.5.4-0ubuntu3) edgy; urgency=low tdeadmin (4:3.5.4-0ubuntu2) edgy; urgency=low - * Add kubuntu_09_networtdeconf_edgy.diff to support Edgy in knetwortdeconf + * Add kubuntu_09_networkconf_edgy.diff to support Edgy in knetworkconf -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 7 Aug 2006 09:08:39 -0400 @@ -315,7 +315,7 @@ tdeadmin (4:3.5.1-2) unstable; urgency=low +++ Changes by Christopher Martin: - * Drop system-tools-backends.pc from knetwortdeconf, since it conflicts with + * Drop system-tools-backends.pc from knetworkconf, since it conflicts with gnome-system-tools. (Closes: #353321) -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sun, 19 Feb 2006 14:30:28 -0500 @@ -416,9 +416,9 @@ tdeadmin (4:3.5.1-0ubuntu1) dapper; urgency=low tdeadmin (4:3.5.0-0ubuntu2) dapper; urgency=low - * Add kubuntu_01_knetwortdeconf_branch_fixes.diff fixes - - http://bugzilla.ubuntu.com/9871 knetwortdeconf doesn't save gateway - - http://bugzilla.ubuntu.com/16921 knetwortdeconf too big for 1024x768 + * Add kubuntu_01_knetworkconf_branch_fixes.diff fixes + - http://bugzilla.ubuntu.com/9871 knetworkconf doesn't save gateway + - http://bugzilla.ubuntu.com/16921 knetworkconf too big for 1024x768 - Ensure changes are applied when clicking OK and don't leave zombie processes around @@ -449,7 +449,7 @@ tdeadmin (4:3.5.0-2) alioth; urgency=low +++ Changes by Josh Metzler: - * Create the new knetwortdeconf package. + * Create the new knetworkconf package. +++ Changes by Christopher Martin: diff --git a/debian/wheezy/tdeadmin/debian/control b/debian/wheezy/tdeadmin/debian/control index 0042d0d8d..8bcab9710 100644 --- a/debian/wheezy/tdeadmin/debian/control +++ b/debian/wheezy/tdeadmin/debian/control @@ -12,7 +12,7 @@ Section: tde Architecture: all Replaces: kdeadmin-trinity (<< 4:14.0.0) Breaks: kdeadmin-trinity (<< 4:14.0.0) -Depends: kcron-trinity (>= ${Source-Version}), kdat-trinity (>= ${Source-Version}), tdeadmin-tdefile-plugins-trinity (>= ${Source-Version}), knetwortdeconf-trinity (>= ${Source-Version}), kpackage-trinity (>= ${Source-Version}), ksysv-trinity (>= ${Source-Version}), kuser-trinity (>= ${Source-Version}) +Depends: kcron-trinity (>= ${Source-Version}), kdat-trinity (>= ${Source-Version}), tdeadmin-tdefile-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}) Description: system administration tools from the official Trinity release @@ -91,11 +91,11 @@ Description: Trinity file metainfo plugins for deb and rpm files This package is part of Trinity, as a component of the KDE administration module. See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information. -Package: knetwortdeconf-trinity +Package: knetworkconf-trinity Section: tde Architecture: any -Replaces: knetwortdeconf-trinity (<< 4:14.0.0) -Breaks: knetwortdeconf-trinity (<< 4:14.0.0) +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 diff --git a/debian/wheezy/tdeadmin/debian/control.in b/debian/wheezy/tdeadmin/debian/control.in index b56d4e54c..8958b98e4 100644 --- a/debian/wheezy/tdeadmin/debian/control.in +++ b/debian/wheezy/tdeadmin/debian/control.in @@ -10,7 +10,7 @@ Standards-Version: 3.7.2 Package: tdeadmin Section: tde Architecture: all -Depends: kcron (>= ${Source-Version}), kdat (>= ${Source-Version}), tdeadmin-tdefile-plugins (>= ${Source-Version}), knetwortdeconf (>= ${Source-Version}), kpackage (>= ${Source-Version}), ksysv (>= ${Source-Version}), kuser (>= ${Source-Version}) +Depends: kcron (>= ${Source-Version}), kdat (>= ${Source-Version}), tdeadmin-tdefile-plugins (>= ${Source-Version}), knetworkconf (>= ${Source-Version}), kpackage (>= ${Source-Version}), ksysv (>= ${Source-Version}), kuser (>= ${Source-Version}) Recommends: lilo-config (>= ${Source-Version}) Suggests: tdeadmin-doc-html (>= ${Source-Version}) Description: system administration tools from the official KDE release @@ -81,7 +81,7 @@ Description: KDE file metainfo plugins for deb and rpm files This package is part of KDE, as a component of the KDE administration module. See the 'kde' and 'tdeadmin' packages for more information. -Package: knetwortdeconf +Package: knetworkconf Section: tde Architecture: any Depends: ${shlibs:Depends} diff --git a/debian/wheezy/tdeadmin/debian/knetworkconf-trinity.install b/debian/wheezy/tdeadmin/debian/knetworkconf-trinity.install new file mode 100644 index 000000000..ec0333100 --- /dev/null +++ b/debian/wheezy/tdeadmin/debian/knetworkconf-trinity.install @@ -0,0 +1,56 @@ +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/01.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/02.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/11.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/03.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/04.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/05.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/06.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/07.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/about1.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/08.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/09.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/common +debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/knetworkconf.png +debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/knetworkconf.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/knetworkconf.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_disconnected_wlan.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_connected_lan_knc.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_disconnected_lan.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_traffic_wlan.png +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/network-conf +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/debug.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/file.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/general.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/network.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/parse.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/platform.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/process.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/replace.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/report.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/service.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/service-list.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/util.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/xml.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/ark.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/debian.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/blackpanther.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/mandriva.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/pld.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/redhat.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/suse.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/turbolinux.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/conectiva.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/fedora.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/openna.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/slackware.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/freebsd.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/gentoo.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/vine.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/rpath.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/kubuntu.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/yoper.png +debian/tmp/opt/trinity/share/applications/tde/kcm_knetworkconfmodule.desktop +debian/tmp/opt/trinity/lib/trinity/kcm_knetworkconfmodule.so +debian/tmp/opt/trinity/lib/trinity/kcm_knetworkconfmodule.la diff --git a/debian/wheezy/tdeadmin/debian/knetwortdeconf-trinity.postinst b/debian/wheezy/tdeadmin/debian/knetworkconf-trinity.postinst index b32c2fb00..bcb12994d 100644 --- a/debian/wheezy/tdeadmin/debian/knetwortdeconf-trinity.postinst +++ b/debian/wheezy/tdeadmin/debian/knetworkconf-trinity.postinst @@ -3,9 +3,9 @@ case "$1" in configure) - dpkg-divert --remove /usr/share/icons/hicolor/16x16/apps/knetwortdeconf.png - dpkg-divert --remove /usr/share/icons/hicolor/22x22/apps/knetwortdeconf.png - dpkg-divert --remove /usr/share/icons/hicolor/32x32/apps/knetwortdeconf.png + dpkg-divert --remove /usr/share/icons/hicolor/16x16/apps/knetworkconf.png + dpkg-divert --remove /usr/share/icons/hicolor/22x22/apps/knetworkconf.png + dpkg-divert --remove /usr/share/icons/hicolor/32x32/apps/knetworkconf.png dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_connected_lan_knc.png dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_disconnected_lan.png dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_disconnected_wlan.png diff --git a/debian/wheezy/tdeadmin/debian/knetwortdeconf-trinity.install b/debian/wheezy/tdeadmin/debian/knetwortdeconf-trinity.install deleted file mode 100644 index dbe573132..000000000 --- a/debian/wheezy/tdeadmin/debian/knetwortdeconf-trinity.install +++ /dev/null @@ -1,56 +0,0 @@ -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/01.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/02.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/11.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/03.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/04.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/05.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/06.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/07.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/about1.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/08.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/09.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/common -debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/knetwortdeconf.png -debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/knetwortdeconf.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/knetwortdeconf.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_disconnected_wlan.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_connected_lan_knc.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_disconnected_lan.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_traffic_wlan.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/network-conf -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/debug.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/file.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/general.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/network.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/parse.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/platform.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/process.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/replace.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/report.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/service.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/service-list.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/util.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/xml.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/ark.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/debian.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/blackpanther.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/mandriva.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/pld.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/redhat.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/suse.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/turbolinux.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/conectiva.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/fedora.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/openna.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/slackware.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/freebsd.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/gentoo.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/vine.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/rpath.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/kubuntu.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/yoper.png -debian/tmp/opt/trinity/share/applications/tde/kcm_knetwortdeconfmodule.desktop -debian/tmp/opt/trinity/lib/trinity/kcm_knetwortdeconfmodule.so -debian/tmp/opt/trinity/lib/trinity/kcm_knetwortdeconfmodule.la diff --git a/debian/lenny/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetwortdeconf b/debian/wheezy/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetworkconf index 59e475dd7..134b08805 100644 --- a/debian/lenny/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetwortdeconf +++ b/debian/wheezy/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetworkconf @@ -1,10 +1,10 @@ -Document: tdeadmin-doc-html-knetwortdeconf +Document: tdeadmin-doc-html-knetworkconf Title: KNetworkConf Handbook Author: Sean Wheller, Christoph Eckert Abstract: KNetworkConf is a graphical manager for network devices and settings. Section: Admin Format: HTML -Index: /usr/share/doc/tde/HTML/en/knetwortdeconf/index.html -Files: /usr/share/doc/tde/HTML/en/knetwortdeconf/*.html +Index: /usr/share/doc/tde/HTML/en/knetworkconf/index.html +Files: /usr/share/doc/tde/HTML/en/knetworkconf/*.html diff --git a/debian/wheezy/tdelibs/debian/changelog b/debian/wheezy/tdelibs/debian/changelog index 28a76fe79..e909d30a2 100644 --- a/debian/wheezy/tdelibs/debian/changelog +++ b/debian/wheezy/tdelibs/debian/changelog @@ -1965,7 +1965,7 @@ tdelibs (4:3.4.91-0ubuntu1) breezy; urgency=low tdelibs (4:3.4.2-0ubuntu4) breezy; urgency=low - * Add replaces on old knetwortdeconf for tdelibs-data + * Add replaces on old knetworkconf for tdelibs-data -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 3 Aug 2005 12:44:18 +0000 diff --git a/ubuntu/lucid_automake/kdeadmin/debian/changelog b/ubuntu/lucid_automake/kdeadmin/debian/changelog index a1bed4850..787a6cb9a 100644 --- a/ubuntu/lucid_automake/kdeadmin/debian/changelog +++ b/ubuntu/lucid_automake/kdeadmin/debian/changelog @@ -44,9 +44,9 @@ kdeadmin (4:3.5.9-0ubuntu5) hardy; urgency=low kdeadmin (4:3.5.9-0ubuntu4) hardy; urgency=low * Added kubuntu_13_no_samba_tweak.diff. - Knetwortdeconf reads smb.conf parameters but doesn't write them + Knetworkconf reads smb.conf parameters but doesn't write them causing the parameters to be removed from the config file. - Knetwortdeconf doesn't allow changing those, so there is no reason + Knetworkconf doesn't allow changing those, so there is no reason to let it read them. -- Anthony Mercatante <tonio@ubuntu.com> Thu, 03 Apr 2008 15:30:44 +0200 @@ -60,7 +60,7 @@ kdeadmin (4:3.5.9-0ubuntu3) hardy; urgency=low kdeadmin (4:3.5.9-0ubuntu2) hardy; urgency=low - * Add kubuntu_11_knetwortdeconf_icons.diff from Adam Spain, + * Add kubuntu_11_knetworkconf_icons.diff from Adam Spain, closes LP: #93878 "low quality icons" -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 03 Mar 2008 14:20:34 +0000 @@ -81,8 +81,8 @@ kdeadmin (4:3.5.8-1ubuntu1) hardy; urgency=low * Merge with Debian, remaining changes - kubuntu_08_kpackage_sudo.diff, sudo support - - kubuntu_10_knetwortdeconf_localhost.diff, LP #66813 - * Add kubuntu_11_knetwortdeconf_8.04.diff for 8.04 detection in knetwortdeconf + - kubuntu_10_knetworkconf_localhost.diff, LP #66813 + * Add kubuntu_11_knetworkconf_8.04.diff for 8.04 detection in knetworkconf -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 14 Nov 2007 17:25:38 +0000 @@ -135,7 +135,7 @@ kdeadmin (4:3.5.6-2) unstable; urgency=low +++ Changes by Modestas Vainius: - * knetwortdeconf RC bug fix: recognize allow-* statements in + * knetworkconf RC bug fix: recognize allow-* statements in /etc/network/interfaces as stanzas, not as ordinary options. This misrecognition led to corruption of the interfaces file in case allow-* stanza followed the iface stanza that new options were added to. Patch @@ -179,7 +179,7 @@ kdeadmin (4:3.5.5-2) unstable; urgency=low kdeadmin (4:3.5.6-0ubuntu1) feisty; urgency=low * New upstream release - * Remove kubuntu_12_knetwortdeconf_feisty.diff, applied upstream + * Remove kubuntu_12_knetworkconf_feisty.diff, applied upstream -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 17 Jan 2007 11:22:29 +0000 @@ -192,8 +192,8 @@ kdeadmin (4:3.5.5-1ubuntu4) feisty; urgency=low kdeadmin (4:3.5.5-1ubuntu3) feisty; urgency=low - * Added kubuntu_12_knetwortdeconf_feisty.diff to properly autodetect - feisty as knetwortdeconf backend. + * Added kubuntu_12_knetworkconf_feisty.diff to properly autodetect + feisty as knetworkconf backend. -- Luka Renko <lure@ubuntu.com> Sun, 10 Dec 2006 16:16:12 +0100 @@ -235,7 +235,7 @@ kdeadmin (4:3.5.4-1) unstable; urgency=low kdeadmin (4:3.5.5-0ubuntu2) edgy; urgency=low - * kubuntu_10_knetwortdeconf_localhost.diff added, hostname should not + * kubuntu_10_knetworkconf_localhost.diff added, hostname should not be appended as alias to localhost in /etc/hosts Closes Malone #66813 @@ -244,7 +244,7 @@ kdeadmin (4:3.5.5-0ubuntu2) edgy; urgency=low kdeadmin (4:3.5.5-0ubuntu1) edgy; urgency=low * New upstream release - * kubuntu_09_networtdeconf_edgy.diff removed, merged upstream + * kubuntu_09_networkconf_edgy.diff removed, merged upstream -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 3 Oct 2006 10:56:07 +0000 @@ -257,7 +257,7 @@ kdeadmin (4:3.5.4-0ubuntu3) edgy; urgency=low kdeadmin (4:3.5.4-0ubuntu2) edgy; urgency=low - * Add kubuntu_09_networtdeconf_edgy.diff to support Edgy in knetwortdeconf + * Add kubuntu_09_networkconf_edgy.diff to support Edgy in knetworkconf -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 7 Aug 2006 09:08:39 -0400 @@ -315,7 +315,7 @@ kdeadmin (4:3.5.1-2) unstable; urgency=low +++ Changes by Christopher Martin: - * Drop system-tools-backends.pc from knetwortdeconf, since it conflicts with + * Drop system-tools-backends.pc from knetworkconf, since it conflicts with gnome-system-tools. (Closes: #353321) -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sun, 19 Feb 2006 14:30:28 -0500 @@ -416,9 +416,9 @@ kdeadmin (4:3.5.1-0ubuntu1) dapper; urgency=low kdeadmin (4:3.5.0-0ubuntu2) dapper; urgency=low - * Add kubuntu_01_knetwortdeconf_branch_fixes.diff fixes - - http://bugzilla.ubuntu.com/9871 knetwortdeconf doesn't save gateway - - http://bugzilla.ubuntu.com/16921 knetwortdeconf too big for 1024x768 + * Add kubuntu_01_knetworkconf_branch_fixes.diff fixes + - http://bugzilla.ubuntu.com/9871 knetworkconf doesn't save gateway + - http://bugzilla.ubuntu.com/16921 knetworkconf too big for 1024x768 - Ensure changes are applied when clicking OK and don't leave zombie processes around @@ -449,7 +449,7 @@ kdeadmin (4:3.5.0-2) alioth; urgency=low +++ Changes by Josh Metzler: - * Create the new knetwortdeconf package. + * Create the new knetworkconf package. +++ Changes by Christopher Martin: diff --git a/ubuntu/lucid_automake/kdeadmin/debian/control b/ubuntu/lucid_automake/kdeadmin/debian/control index d657a1eb7..4c2cc0128 100644 --- a/ubuntu/lucid_automake/kdeadmin/debian/control +++ b/ubuntu/lucid_automake/kdeadmin/debian/control @@ -10,7 +10,7 @@ Standards-Version: 3.8.3 Package: kdeadmin-kde3 Section: kde Architecture: all -Depends: kcron-kde3 (>= ${Source-Version}), kdat-kde3 (>= ${Source-Version}), kdeadmin-tdefile-plugins-kde3 (>= ${Source-Version}), knetwortdeconf-kde3 (>= ${Source-Version}), kpackage-kde3 (>= ${Source-Version}), ksysv-kde3 (>= ${Source-Version}), kuser-kde3 (>= ${Source-Version}) +Depends: kcron-kde3 (>= ${Source-Version}), kdat-kde3 (>= ${Source-Version}), kdeadmin-tdefile-plugins-kde3 (>= ${Source-Version}), knetworkconf-kde3 (>= ${Source-Version}), kpackage-kde3 (>= ${Source-Version}), ksysv-kde3 (>= ${Source-Version}), kuser-kde3 (>= ${Source-Version}) Recommends: lilo-config-kde3 (>= ${Source-Version}) Suggests: kdeadmin-kde3-doc-html (>= ${Source-Version}) Description: system administration tools from the official KDE3 release @@ -81,7 +81,7 @@ Description: KDE3 file metainfo plugins for deb and rpm files This package is part of KDE3, as a component of the KDE administration module. See the 'kde-kde3' and 'kdeadmin-kde3' packages for more information. -Package: knetwortdeconf-kde3 +Package: knetworkconf-kde3 Section: kde Architecture: any Depends: ${shlibs:Depends} diff --git a/ubuntu/lucid_automake/kdeadmin/debian/control.in b/ubuntu/lucid_automake/kdeadmin/debian/control.in index e1cabb2b5..98e03d1f4 100644 --- a/ubuntu/lucid_automake/kdeadmin/debian/control.in +++ b/ubuntu/lucid_automake/kdeadmin/debian/control.in @@ -10,7 +10,7 @@ Standards-Version: 3.7.2 Package: kdeadmin Section: kde Architecture: all -Depends: kcron (>= ${Source-Version}), kdat (>= ${Source-Version}), kdeadmin-tdefile-plugins (>= ${Source-Version}), knetwortdeconf (>= ${Source-Version}), kpackage (>= ${Source-Version}), ksysv (>= ${Source-Version}), kuser (>= ${Source-Version}) +Depends: kcron (>= ${Source-Version}), kdat (>= ${Source-Version}), kdeadmin-tdefile-plugins (>= ${Source-Version}), knetworkconf (>= ${Source-Version}), kpackage (>= ${Source-Version}), ksysv (>= ${Source-Version}), kuser (>= ${Source-Version}) Recommends: lilo-config (>= ${Source-Version}) Suggests: kdeadmin-doc-html (>= ${Source-Version}) Description: system administration tools from the official KDE release @@ -81,7 +81,7 @@ Description: KDE file metainfo plugins for deb and rpm files This package is part of KDE, as a component of the KDE administration module. See the 'kde' and 'kdeadmin' packages for more information. -Package: knetwortdeconf +Package: knetworkconf Section: kde Architecture: any Depends: ${shlibs:Depends} diff --git a/ubuntu/lucid_automake/kdeadmin/debian/kdeadmin-doc-html.doc-base.knetwortdeconf b/ubuntu/lucid_automake/kdeadmin/debian/kdeadmin-doc-html.doc-base.knetworkconf index e776325aa..aeb73ead3 100644 --- a/ubuntu/lucid_automake/kdeadmin/debian/kdeadmin-doc-html.doc-base.knetwortdeconf +++ b/ubuntu/lucid_automake/kdeadmin/debian/kdeadmin-doc-html.doc-base.knetworkconf @@ -1,10 +1,10 @@ -Document: kdeadmin-doc-html-knetwortdeconf +Document: kdeadmin-doc-html-knetworkconf Title: KNetworkConf Handbook Author: Sean Wheller, Christoph Eckert Abstract: KNetworkConf is a graphical manager for network devices and settings. Section: Admin Format: HTML -Index: /usr/share/doc/kde/HTML/en/knetwortdeconf/index.html -Files: /usr/share/doc/kde/HTML/en/knetwortdeconf/*.html +Index: /usr/share/doc/kde/HTML/en/knetworkconf/index.html +Files: /usr/share/doc/kde/HTML/en/knetworkconf/*.html diff --git a/ubuntu/lucid_automake/kdeadmin/debian/knetworkconf-kde3.install b/ubuntu/lucid_automake/kdeadmin/debian/knetworkconf-kde3.install new file mode 100644 index 000000000..944e2d7cf --- /dev/null +++ b/ubuntu/lucid_automake/kdeadmin/debian/knetworkconf-kde3.install @@ -0,0 +1,56 @@ +debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetworkconf/01.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetworkconf/02.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetworkconf/11.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetworkconf/03.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetworkconf/04.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetworkconf/05.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetworkconf/index.docbook +debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetworkconf/06.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetworkconf/07.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetworkconf/about1.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetworkconf/08.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetworkconf/09.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetworkconf/index.cache.bz2 +debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetworkconf/common +debian/tmp/opt/kde3/share/icons/hicolor/32x32/apps/knetworkconf.png +debian/tmp/opt/kde3/share/icons/hicolor/16x16/apps/knetworkconf.png +debian/tmp/opt/kde3/share/icons/hicolor/22x22/apps/knetworkconf.png +debian/tmp/opt/kde3/share/icons/hicolor/22x22/actions/network_disconnected_wlan.png +debian/tmp/opt/kde3/share/icons/hicolor/22x22/actions/network_connected_lan_knc.png +debian/tmp/opt/kde3/share/icons/hicolor/22x22/actions/network_disconnected_lan.png +debian/tmp/opt/kde3/share/icons/hicolor/22x22/actions/network_traffic_wlan.png +debian/tmp/opt/kde3/share/apps/knetworkconf/backends/network-conf +debian/tmp/opt/kde3/share/apps/knetworkconf/backends/debug.pl +debian/tmp/opt/kde3/share/apps/knetworkconf/backends/file.pl +debian/tmp/opt/kde3/share/apps/knetworkconf/backends/general.pl +debian/tmp/opt/kde3/share/apps/knetworkconf/backends/network.pl +debian/tmp/opt/kde3/share/apps/knetworkconf/backends/parse.pl +debian/tmp/opt/kde3/share/apps/knetworkconf/backends/platform.pl +debian/tmp/opt/kde3/share/apps/knetworkconf/backends/process.pl +debian/tmp/opt/kde3/share/apps/knetworkconf/backends/replace.pl +debian/tmp/opt/kde3/share/apps/knetworkconf/backends/report.pl +debian/tmp/opt/kde3/share/apps/knetworkconf/backends/service.pl +debian/tmp/opt/kde3/share/apps/knetworkconf/backends/service-list.pl +debian/tmp/opt/kde3/share/apps/knetworkconf/backends/util.pl +debian/tmp/opt/kde3/share/apps/knetworkconf/backends/xml.pl +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/ark.png +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/debian.png +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/blackpanther.png +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/mandriva.png +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/pld.png +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/redhat.png +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/suse.png +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/turbolinux.png +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/conectiva.png +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/fedora.png +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/openna.png +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/slackware.png +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/freebsd.png +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/gentoo.png +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/vine.png +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/rpath.png +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/kubuntu.png +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/yoper.png +debian/tmp/opt/kde3/share/applications/kde/kcm_knetworkconfmodule.desktop +debian/tmp/opt/kde3/lib/kde3/kcm_knetworkconfmodule.so +debian/tmp/opt/kde3/lib/kde3/kcm_knetworkconfmodule.la diff --git a/ubuntu/lucid_automake/kdeadmin/debian/knetwortdeconf-kde3.postinst b/ubuntu/lucid_automake/kdeadmin/debian/knetworkconf-kde3.postinst index b32c2fb00..bcb12994d 100644 --- a/ubuntu/lucid_automake/kdeadmin/debian/knetwortdeconf-kde3.postinst +++ b/ubuntu/lucid_automake/kdeadmin/debian/knetworkconf-kde3.postinst @@ -3,9 +3,9 @@ case "$1" in configure) - dpkg-divert --remove /usr/share/icons/hicolor/16x16/apps/knetwortdeconf.png - dpkg-divert --remove /usr/share/icons/hicolor/22x22/apps/knetwortdeconf.png - dpkg-divert --remove /usr/share/icons/hicolor/32x32/apps/knetwortdeconf.png + dpkg-divert --remove /usr/share/icons/hicolor/16x16/apps/knetworkconf.png + dpkg-divert --remove /usr/share/icons/hicolor/22x22/apps/knetworkconf.png + dpkg-divert --remove /usr/share/icons/hicolor/32x32/apps/knetworkconf.png dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_connected_lan_knc.png dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_disconnected_lan.png dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_disconnected_wlan.png diff --git a/ubuntu/lucid_automake/kdeadmin/debian/knetwortdeconf-kde3.install b/ubuntu/lucid_automake/kdeadmin/debian/knetwortdeconf-kde3.install deleted file mode 100644 index f24a07fae..000000000 --- a/ubuntu/lucid_automake/kdeadmin/debian/knetwortdeconf-kde3.install +++ /dev/null @@ -1,56 +0,0 @@ -debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetwortdeconf/01.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetwortdeconf/02.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetwortdeconf/11.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetwortdeconf/03.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetwortdeconf/04.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetwortdeconf/05.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetwortdeconf/index.docbook -debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetwortdeconf/06.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetwortdeconf/07.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetwortdeconf/about1.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetwortdeconf/08.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetwortdeconf/09.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetwortdeconf/index.cache.bz2 -debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetwortdeconf/common -debian/tmp/opt/kde3/share/icons/hicolor/32x32/apps/knetwortdeconf.png -debian/tmp/opt/kde3/share/icons/hicolor/16x16/apps/knetwortdeconf.png -debian/tmp/opt/kde3/share/icons/hicolor/22x22/apps/knetwortdeconf.png -debian/tmp/opt/kde3/share/icons/hicolor/22x22/actions/network_disconnected_wlan.png -debian/tmp/opt/kde3/share/icons/hicolor/22x22/actions/network_connected_lan_knc.png -debian/tmp/opt/kde3/share/icons/hicolor/22x22/actions/network_disconnected_lan.png -debian/tmp/opt/kde3/share/icons/hicolor/22x22/actions/network_traffic_wlan.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/backends/network-conf -debian/tmp/opt/kde3/share/apps/knetwortdeconf/backends/debug.pl -debian/tmp/opt/kde3/share/apps/knetwortdeconf/backends/file.pl -debian/tmp/opt/kde3/share/apps/knetwortdeconf/backends/general.pl -debian/tmp/opt/kde3/share/apps/knetwortdeconf/backends/network.pl -debian/tmp/opt/kde3/share/apps/knetwortdeconf/backends/parse.pl -debian/tmp/opt/kde3/share/apps/knetwortdeconf/backends/platform.pl -debian/tmp/opt/kde3/share/apps/knetwortdeconf/backends/process.pl -debian/tmp/opt/kde3/share/apps/knetwortdeconf/backends/replace.pl -debian/tmp/opt/kde3/share/apps/knetwortdeconf/backends/report.pl -debian/tmp/opt/kde3/share/apps/knetwortdeconf/backends/service.pl -debian/tmp/opt/kde3/share/apps/knetwortdeconf/backends/service-list.pl -debian/tmp/opt/kde3/share/apps/knetwortdeconf/backends/util.pl -debian/tmp/opt/kde3/share/apps/knetwortdeconf/backends/xml.pl -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/ark.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/debian.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/blackpanther.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/mandriva.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/pld.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/redhat.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/suse.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/turbolinux.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/conectiva.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/fedora.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/openna.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/slackware.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/freebsd.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/gentoo.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/vine.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/rpath.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/kubuntu.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/yoper.png -debian/tmp/opt/kde3/share/applications/kde/kcm_knetwortdeconfmodule.desktop -debian/tmp/opt/kde3/lib/kde3/kcm_knetwortdeconfmodule.so -debian/tmp/opt/kde3/lib/kde3/kcm_knetwortdeconfmodule.la diff --git a/ubuntu/lucid_automake/kdelibs/debian/changelog b/ubuntu/lucid_automake/kdelibs/debian/changelog index 28baa837e..735e7ef6b 100644 --- a/ubuntu/lucid_automake/kdelibs/debian/changelog +++ b/ubuntu/lucid_automake/kdelibs/debian/changelog @@ -1965,7 +1965,7 @@ kdelibs (4:3.4.91-0ubuntu1) breezy; urgency=low kdelibs (4:3.4.2-0ubuntu4) breezy; urgency=low - * Add replaces on old knetwortdeconf for kdelibs-data + * Add replaces on old knetworkconf for kdelibs-data -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 3 Aug 2005 12:44:18 +0000 diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/control b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/control index 35a8d0680..5deee2c5d 100644 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/control +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.8.4 Package: redmond-default-settings-ii-trinity Architecture: all -Depends: crystalcursors, tde-style-lipstik-trinity, kcalc-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine, acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, hal, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-kio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-kio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, kdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, kio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetwortdeconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libtqt-perl, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, tqca-tls, readahead, screen, smbclient, ttf-bitstream-vera, ttf-dejavu-core, ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, sudo-trinity, kdbusnotification-trinity +Depends: crystalcursors, tde-style-lipstik-trinity, kcalc-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine, acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, hal, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-kio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-kio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, kdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, kio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libtqt-perl, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, tqca-tls, readahead, screen, smbclient, ttf-bitstream-vera, ttf-dejavu-core, ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, sudo-trinity, kdbusnotification-trinity Recommends: firefox, thunderbird, synaptic, kio-apt-trinity, tde-guidance-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikamdesktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gdebi-tde-trinity, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tde-guidance-powermanager-trinity, tdepim-kio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, kio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, tdescreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-default-settings-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, tdewalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, min12xxw, networkstatus, libreoffice-calc, libreoffice-impress, libreoffice-trinity, libreoffice-writer, pinentry-qt, powernowd, pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, ttf-arabeyes, ttf-arphic-ukai, ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic,ttf-kochi-mincho, ttf-lao, ttf-malayalam-fonts, ttf-thai-tlwg, ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, msttfcorefonts, tdmtheme-trinity, kubuntu-tdm-themes, plymouth-theme-kubuntu-logo-trinity, powermanagement-interface, x-ttcidfont-conf Suggests: apport-gtk, hplip-gui Conflicts: kubuntu-default-settings-trinity, kubuntu-default-settings diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/control b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/control index 11f422ac6..bcbd6c2e2 100644 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/control +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.8.4 Package: redmond-default-settings-trinity Architecture: all -Depends: crystalcursors, tde-style-lipstik-trinity, kcalc-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine, acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, hal, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-kio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-kio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, kdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, kio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetwortdeconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libtqt-perl, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, tqca-tls, readahead, screen, smbclient, ttf-bitstream-vera, ttf-dejavu-core, ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, sudo-trinity, kdbusnotification-trinity +Depends: crystalcursors, tde-style-lipstik-trinity, kcalc-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine, acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, hal, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-kio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-kio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, kdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, kio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libtqt-perl, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, tqca-tls, readahead, screen, smbclient, ttf-bitstream-vera, ttf-dejavu-core, ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, sudo-trinity, kdbusnotification-trinity Recommends: firefox, thunderbird, synaptic, kio-apt-trinity, tde-guidance-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikamdesktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gdebi-tde-trinity, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tde-guidance-powermanager-trinity, tdepim-kio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, kio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, tdescreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-default-settings-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, tdewalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, min12xxw, networkstatus, libreoffice-calc, libreoffice-impress, libreoffice-trinity, libreoffice-writer, pinentry-qt, powernowd, pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, ttf-arabeyes, ttf-arphic-ukai, ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic,ttf-kochi-mincho, ttf-lao, ttf-malayalam-fonts, ttf-thai-tlwg, ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, msttfcorefonts, tdmtheme-trinity, kubuntu-tdm-themes, plymouth-theme-kubuntu-logo-trinity, powermanagement-interface, x-ttcidfont-conf Suggests: apport-gtk, hplip-gui Conflicts: kubuntu-default-settings-trinity, kubuntu-default-settings diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/changelog b/ubuntu/maverick/metapackages/kubuntu-meta/debian/changelog index 7a4ef34be..ca8de6216 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/changelog +++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/changelog @@ -2283,7 +2283,7 @@ kubuntu-meta (0.56) dapper; urgency=low - Turn off HTTP caching while fetching seed lists. * Refreshed dependencies - * Added knetwortdeconf to desktop-hppa + * Added knetworkconf to desktop-hppa * Added krita to desktop-hppa * Added tdewalletmanager to desktop-hppa * Added knotes to desktop-hppa @@ -3270,7 +3270,7 @@ kubuntu-meta (0.40) hoary; urgency=low kubuntu-meta (0.39) hoary; urgency=low * Refreshed dependencies - * Added knetwortdeconf to desktop-sparc + * Added knetworkconf to desktop-sparc * Added konq-plugins to desktop-i386, desktop-amd64, desktop-powerpc, desktop-ia64, desktop-sparc * Added openoffice.org-kde to desktop-sparc @@ -3303,7 +3303,7 @@ kubuntu-meta (0.37) hoary; urgency=low * Refreshed dependencies * Added kdm to desktop-sparc - * Added knetwortdeconf to desktop-i386, desktop-amd64, desktop-powerpc, + * Added knetworkconf to desktop-i386, desktop-amd64, desktop-powerpc, desktop-ia64 * Added konserve to desktop-sparc * Added konversation to desktop-sparc diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/control b/ubuntu/maverick/metapackages/kubuntu-meta/debian/control index 769c94396..71fd6207d 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/control +++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 4), germinate (>= 0.38) Package: kubuntu-desktop-trinity Architecture: any -Depends: acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, hal, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-kio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-kio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, kdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, kio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetwortdeconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, powermanagement-interface, readahead, screen, ttf-bitstream-vera, ttf-dejavu-core, ttf-freefont, unzip, vorbis-tools, x-ttcidfont-conf, xdg-user-dirs, xkb-data, xorg, zip, ksplash-engine-moodin-trinity, sudo-trinity, libtqt-perl, tqca-tls, kdbusnotification-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine +Depends: acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, hal, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-kio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-kio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, kdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, kio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, powermanagement-interface, readahead, screen, ttf-bitstream-vera, ttf-dejavu-core, ttf-freefont, unzip, vorbis-tools, x-ttcidfont-conf, xdg-user-dirs, xkb-data, xorg, zip, ksplash-engine-moodin-trinity, sudo-trinity, libtqt-perl, tqca-tls, kdbusnotification-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine Recommends: kio-apt-trinity, tde-guidance-powermanager-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikam-trinity, desktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tdepim-kio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, kio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, tdescreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-default-settings-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, tdewalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, min12xxw, networkstatus-trinity, openoffice.org-calc, openoffice.org-impress, openoffice.org-trinity, openoffice.org-writer, pinentry-qt, powernowd, pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, ttf-arabeyes, ttf-arphic-ukai, ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic,ttf-kochi-mincho, ttf-lao, ttf-malayalam-fonts, ttf-thai-tlwg, ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, smbclient, network-manager-tde-trinity | network-manager-gnome, plymouth-theme-kubuntu-logo-trinity Suggests: apport-gtk, hplip-gui Description: Kubuntu desktop system, TDE version diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop b/ubuntu/maverick/metapackages/kubuntu-meta/desktop index 0ef26f0fd..452f69af8 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop +++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop @@ -148,7 +148,7 @@ We've chosen KDE as our desktop user interface of choice * kcron-trinity * kdeadmin-tdefile-plugins-trinity - * knetwortdeconf-trinity + * knetworkconf-trinity == kdegraphics-trinity == diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-amd64 b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-amd64 index 38ab45844..bcc68af23 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-amd64 +++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-amd64 @@ -44,7 +44,7 @@ kicker-trinity kio-locate-trinity kmenuedit-trinity kmix-trinity -knetwortdeconf-trinity +knetworkconf-trinity konq-plugins-trinity konsole-trinity kpdf-trinity diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-hppa b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-hppa index 2eb22465c..326418d5f 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-hppa +++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-hppa @@ -42,7 +42,7 @@ kio-apt kio-locate kmenuedit kmix -knetwortdeconf +knetworkconf konq-plugins konsole kpdf diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-i386 b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-i386 index 933f1c6a2..d847816f2 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-i386 +++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-i386 @@ -45,7 +45,7 @@ kicker-trinity kio-locate-trinity kmenuedit-trinity kmix-trinity -knetwortdeconf-trinity +knetworkconf-trinity konq-plugins-trinity konsole-trinity kpdf-trinity diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-ia64 b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-ia64 index df57ea09e..5bbe44bd3 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-ia64 +++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-ia64 @@ -45,7 +45,7 @@ kio-apt kio-locate kmenuedit kmix -knetwortdeconf +knetworkconf konq-plugins konsole kpdf diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-lpia b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-lpia index b754eea75..b9e1c4b43 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-lpia +++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-lpia @@ -44,7 +44,7 @@ kicker-trinity kio-locate-trinity kmenuedit-trinity kmix-trinity -knetwortdeconf-trinity +knetworkconf-trinity konq-plugins-trinity konsole-trinity kpdf-trinity diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-powerpc b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-powerpc index d1ac9dd36..1601b9076 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-powerpc +++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-powerpc @@ -42,7 +42,7 @@ kio-apt kio-locate kmenuedit kmix -knetwortdeconf +knetworkconf konq-plugins konsole kpdf diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-sparc b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-sparc index 2eb22465c..326418d5f 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-sparc +++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-sparc @@ -42,7 +42,7 @@ kio-apt kio-locate kmenuedit kmix -knetwortdeconf +knetworkconf konq-plugins konsole kpdf diff --git a/ubuntu/maverick/tdeadmin/debian/changelog b/ubuntu/maverick/tdeadmin/debian/changelog index 2a7c44e06..4fca9af79 100644 --- a/ubuntu/maverick/tdeadmin/debian/changelog +++ b/ubuntu/maverick/tdeadmin/debian/changelog @@ -44,9 +44,9 @@ tdeadmin (4:3.5.9-0ubuntu5) hardy; urgency=low tdeadmin (4:3.5.9-0ubuntu4) hardy; urgency=low * Added kubuntu_13_no_samba_tweak.diff. - Knetwortdeconf reads smb.conf parameters but doesn't write them + Knetworkconf reads smb.conf parameters but doesn't write them causing the parameters to be removed from the config file. - Knetwortdeconf doesn't allow changing those, so there is no reason + Knetworkconf doesn't allow changing those, so there is no reason to let it read them. -- Anthony Mercatante <tonio@ubuntu.com> Thu, 03 Apr 2008 15:30:44 +0200 @@ -60,7 +60,7 @@ tdeadmin (4:3.5.9-0ubuntu3) hardy; urgency=low tdeadmin (4:3.5.9-0ubuntu2) hardy; urgency=low - * Add kubuntu_11_knetwortdeconf_icons.diff from Adam Spain, + * Add kubuntu_11_knetworkconf_icons.diff from Adam Spain, closes LP: #93878 "low quality icons" -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 03 Mar 2008 14:20:34 +0000 @@ -81,8 +81,8 @@ tdeadmin (4:3.5.8-1ubuntu1) hardy; urgency=low * Merge with Debian, remaining changes - kubuntu_08_kpackage_sudo.diff, sudo support - - kubuntu_10_knetwortdeconf_localhost.diff, LP #66813 - * Add kubuntu_11_knetwortdeconf_8.04.diff for 8.04 detection in knetwortdeconf + - kubuntu_10_knetworkconf_localhost.diff, LP #66813 + * Add kubuntu_11_knetworkconf_8.04.diff for 8.04 detection in knetworkconf -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 14 Nov 2007 17:25:38 +0000 @@ -135,7 +135,7 @@ tdeadmin (4:3.5.6-2) unstable; urgency=low +++ Changes by Modestas Vainius: - * knetwortdeconf RC bug fix: recognize allow-* statements in + * knetworkconf RC bug fix: recognize allow-* statements in /etc/network/interfaces as stanzas, not as ordinary options. This misrecognition led to corruption of the interfaces file in case allow-* stanza followed the iface stanza that new options were added to. Patch @@ -179,7 +179,7 @@ tdeadmin (4:3.5.5-2) unstable; urgency=low tdeadmin (4:3.5.6-0ubuntu1) feisty; urgency=low * New upstream release - * Remove kubuntu_12_knetwortdeconf_feisty.diff, applied upstream + * Remove kubuntu_12_knetworkconf_feisty.diff, applied upstream -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 17 Jan 2007 11:22:29 +0000 @@ -192,8 +192,8 @@ tdeadmin (4:3.5.5-1ubuntu4) feisty; urgency=low tdeadmin (4:3.5.5-1ubuntu3) feisty; urgency=low - * Added kubuntu_12_knetwortdeconf_feisty.diff to properly autodetect - feisty as knetwortdeconf backend. + * Added kubuntu_12_knetworkconf_feisty.diff to properly autodetect + feisty as knetworkconf backend. -- Luka Renko <lure@ubuntu.com> Sun, 10 Dec 2006 16:16:12 +0100 @@ -235,7 +235,7 @@ tdeadmin (4:3.5.4-1) unstable; urgency=low tdeadmin (4:3.5.5-0ubuntu2) edgy; urgency=low - * kubuntu_10_knetwortdeconf_localhost.diff added, hostname should not + * kubuntu_10_knetworkconf_localhost.diff added, hostname should not be appended as alias to localhost in /etc/hosts Closes Malone #66813 @@ -244,7 +244,7 @@ tdeadmin (4:3.5.5-0ubuntu2) edgy; urgency=low tdeadmin (4:3.5.5-0ubuntu1) edgy; urgency=low * New upstream release - * kubuntu_09_networtdeconf_edgy.diff removed, merged upstream + * kubuntu_09_networkconf_edgy.diff removed, merged upstream -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 3 Oct 2006 10:56:07 +0000 @@ -257,7 +257,7 @@ tdeadmin (4:3.5.4-0ubuntu3) edgy; urgency=low tdeadmin (4:3.5.4-0ubuntu2) edgy; urgency=low - * Add kubuntu_09_networtdeconf_edgy.diff to support Edgy in knetwortdeconf + * Add kubuntu_09_networkconf_edgy.diff to support Edgy in knetworkconf -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 7 Aug 2006 09:08:39 -0400 @@ -315,7 +315,7 @@ tdeadmin (4:3.5.1-2) unstable; urgency=low +++ Changes by Christopher Martin: - * Drop system-tools-backends.pc from knetwortdeconf, since it conflicts with + * Drop system-tools-backends.pc from knetworkconf, since it conflicts with gnome-system-tools. (Closes: #353321) -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sun, 19 Feb 2006 14:30:28 -0500 @@ -416,9 +416,9 @@ tdeadmin (4:3.5.1-0ubuntu1) dapper; urgency=low tdeadmin (4:3.5.0-0ubuntu2) dapper; urgency=low - * Add kubuntu_01_knetwortdeconf_branch_fixes.diff fixes - - http://bugzilla.ubuntu.com/9871 knetwortdeconf doesn't save gateway - - http://bugzilla.ubuntu.com/16921 knetwortdeconf too big for 1024x768 + * Add kubuntu_01_knetworkconf_branch_fixes.diff fixes + - http://bugzilla.ubuntu.com/9871 knetworkconf doesn't save gateway + - http://bugzilla.ubuntu.com/16921 knetworkconf too big for 1024x768 - Ensure changes are applied when clicking OK and don't leave zombie processes around @@ -449,7 +449,7 @@ tdeadmin (4:3.5.0-2) alioth; urgency=low +++ Changes by Josh Metzler: - * Create the new knetwortdeconf package. + * Create the new knetworkconf package. +++ Changes by Christopher Martin: diff --git a/ubuntu/maverick/tdeadmin/debian/control b/ubuntu/maverick/tdeadmin/debian/control index 0042d0d8d..8bcab9710 100644 --- a/ubuntu/maverick/tdeadmin/debian/control +++ b/ubuntu/maverick/tdeadmin/debian/control @@ -12,7 +12,7 @@ Section: tde Architecture: all Replaces: kdeadmin-trinity (<< 4:14.0.0) Breaks: kdeadmin-trinity (<< 4:14.0.0) -Depends: kcron-trinity (>= ${Source-Version}), kdat-trinity (>= ${Source-Version}), tdeadmin-tdefile-plugins-trinity (>= ${Source-Version}), knetwortdeconf-trinity (>= ${Source-Version}), kpackage-trinity (>= ${Source-Version}), ksysv-trinity (>= ${Source-Version}), kuser-trinity (>= ${Source-Version}) +Depends: kcron-trinity (>= ${Source-Version}), kdat-trinity (>= ${Source-Version}), tdeadmin-tdefile-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}) Description: system administration tools from the official Trinity release @@ -91,11 +91,11 @@ Description: Trinity file metainfo plugins for deb and rpm files This package is part of Trinity, as a component of the KDE administration module. See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information. -Package: knetwortdeconf-trinity +Package: knetworkconf-trinity Section: tde Architecture: any -Replaces: knetwortdeconf-trinity (<< 4:14.0.0) -Breaks: knetwortdeconf-trinity (<< 4:14.0.0) +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 diff --git a/ubuntu/maverick/tdeadmin/debian/control.in b/ubuntu/maverick/tdeadmin/debian/control.in index b56d4e54c..8958b98e4 100644 --- a/ubuntu/maverick/tdeadmin/debian/control.in +++ b/ubuntu/maverick/tdeadmin/debian/control.in @@ -10,7 +10,7 @@ Standards-Version: 3.7.2 Package: tdeadmin Section: tde Architecture: all -Depends: kcron (>= ${Source-Version}), kdat (>= ${Source-Version}), tdeadmin-tdefile-plugins (>= ${Source-Version}), knetwortdeconf (>= ${Source-Version}), kpackage (>= ${Source-Version}), ksysv (>= ${Source-Version}), kuser (>= ${Source-Version}) +Depends: kcron (>= ${Source-Version}), kdat (>= ${Source-Version}), tdeadmin-tdefile-plugins (>= ${Source-Version}), knetworkconf (>= ${Source-Version}), kpackage (>= ${Source-Version}), ksysv (>= ${Source-Version}), kuser (>= ${Source-Version}) Recommends: lilo-config (>= ${Source-Version}) Suggests: tdeadmin-doc-html (>= ${Source-Version}) Description: system administration tools from the official KDE release @@ -81,7 +81,7 @@ Description: KDE file metainfo plugins for deb and rpm files This package is part of KDE, as a component of the KDE administration module. See the 'kde' and 'tdeadmin' packages for more information. -Package: knetwortdeconf +Package: knetworkconf Section: tde Architecture: any Depends: ${shlibs:Depends} diff --git a/ubuntu/maverick/tdeadmin/debian/knetworkconf-trinity.install b/ubuntu/maverick/tdeadmin/debian/knetworkconf-trinity.install new file mode 100644 index 000000000..ec0333100 --- /dev/null +++ b/ubuntu/maverick/tdeadmin/debian/knetworkconf-trinity.install @@ -0,0 +1,56 @@ +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/01.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/02.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/11.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/03.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/04.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/05.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/06.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/07.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/about1.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/08.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/09.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/common +debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/knetworkconf.png +debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/knetworkconf.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/knetworkconf.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_disconnected_wlan.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_connected_lan_knc.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_disconnected_lan.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_traffic_wlan.png +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/network-conf +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/debug.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/file.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/general.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/network.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/parse.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/platform.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/process.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/replace.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/report.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/service.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/service-list.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/util.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/xml.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/ark.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/debian.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/blackpanther.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/mandriva.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/pld.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/redhat.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/suse.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/turbolinux.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/conectiva.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/fedora.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/openna.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/slackware.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/freebsd.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/gentoo.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/vine.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/rpath.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/kubuntu.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/yoper.png +debian/tmp/opt/trinity/share/applications/tde/kcm_knetworkconfmodule.desktop +debian/tmp/opt/trinity/lib/trinity/kcm_knetworkconfmodule.so +debian/tmp/opt/trinity/lib/trinity/kcm_knetworkconfmodule.la diff --git a/ubuntu/maverick/tdeadmin/debian/knetworkconf-trinity.postinst b/ubuntu/maverick/tdeadmin/debian/knetworkconf-trinity.postinst new file mode 100644 index 000000000..bcb12994d --- /dev/null +++ b/ubuntu/maverick/tdeadmin/debian/knetworkconf-trinity.postinst @@ -0,0 +1,27 @@ +#! /bin/sh -e + +case "$1" in + + configure) + dpkg-divert --remove /usr/share/icons/hicolor/16x16/apps/knetworkconf.png + dpkg-divert --remove /usr/share/icons/hicolor/22x22/apps/knetworkconf.png + dpkg-divert --remove /usr/share/icons/hicolor/32x32/apps/knetworkconf.png + dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_connected_lan_knc.png + dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_disconnected_lan.png + dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_disconnected_wlan.png + dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_traffic_wlan.png + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; + +esac + +#DEBHELPER# + +exit 0 diff --git a/ubuntu/maverick/tdeadmin/debian/knetwortdeconf-trinity.install b/ubuntu/maverick/tdeadmin/debian/knetwortdeconf-trinity.install deleted file mode 100644 index dbe573132..000000000 --- a/ubuntu/maverick/tdeadmin/debian/knetwortdeconf-trinity.install +++ /dev/null @@ -1,56 +0,0 @@ -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/01.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/02.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/11.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/03.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/04.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/05.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/06.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/07.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/about1.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/08.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/09.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/common -debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/knetwortdeconf.png -debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/knetwortdeconf.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/knetwortdeconf.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_disconnected_wlan.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_connected_lan_knc.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_disconnected_lan.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_traffic_wlan.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/network-conf -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/debug.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/file.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/general.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/network.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/parse.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/platform.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/process.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/replace.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/report.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/service.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/service-list.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/util.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/xml.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/ark.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/debian.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/blackpanther.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/mandriva.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/pld.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/redhat.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/suse.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/turbolinux.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/conectiva.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/fedora.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/openna.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/slackware.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/freebsd.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/gentoo.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/vine.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/rpath.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/kubuntu.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/yoper.png -debian/tmp/opt/trinity/share/applications/tde/kcm_knetwortdeconfmodule.desktop -debian/tmp/opt/trinity/lib/trinity/kcm_knetwortdeconfmodule.so -debian/tmp/opt/trinity/lib/trinity/kcm_knetwortdeconfmodule.la diff --git a/ubuntu/maverick/tdeadmin/debian/knetwortdeconf-trinity.postinst b/ubuntu/maverick/tdeadmin/debian/knetwortdeconf-trinity.postinst deleted file mode 100644 index b32c2fb00..000000000 --- a/ubuntu/maverick/tdeadmin/debian/knetwortdeconf-trinity.postinst +++ /dev/null @@ -1,27 +0,0 @@ -#! /bin/sh -e - -case "$1" in - - configure) - dpkg-divert --remove /usr/share/icons/hicolor/16x16/apps/knetwortdeconf.png - dpkg-divert --remove /usr/share/icons/hicolor/22x22/apps/knetwortdeconf.png - dpkg-divert --remove /usr/share/icons/hicolor/32x32/apps/knetwortdeconf.png - dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_connected_lan_knc.png - dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_disconnected_lan.png - dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_disconnected_wlan.png - dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_traffic_wlan.png - ;; - - abort-upgrade) - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; - -esac - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetworkconf b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetworkconf new file mode 100644 index 000000000..134b08805 --- /dev/null +++ b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetworkconf @@ -0,0 +1,10 @@ +Document: tdeadmin-doc-html-knetworkconf +Title: KNetworkConf Handbook +Author: Sean Wheller, Christoph Eckert +Abstract: KNetworkConf is a graphical manager for network devices and settings. +Section: Admin + +Format: HTML +Index: /usr/share/doc/tde/HTML/en/knetworkconf/index.html +Files: /usr/share/doc/tde/HTML/en/knetworkconf/*.html + diff --git a/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetwortdeconf b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetwortdeconf deleted file mode 100644 index 59e475dd7..000000000 --- a/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetwortdeconf +++ /dev/null @@ -1,10 +0,0 @@ -Document: tdeadmin-doc-html-knetwortdeconf -Title: KNetworkConf Handbook -Author: Sean Wheller, Christoph Eckert -Abstract: KNetworkConf is a graphical manager for network devices and settings. -Section: Admin - -Format: HTML -Index: /usr/share/doc/tde/HTML/en/knetwortdeconf/index.html -Files: /usr/share/doc/tde/HTML/en/knetwortdeconf/*.html - diff --git a/ubuntu/maverick/tdelibs/debian/changelog b/ubuntu/maverick/tdelibs/debian/changelog index 28a76fe79..e909d30a2 100644 --- a/ubuntu/maverick/tdelibs/debian/changelog +++ b/ubuntu/maverick/tdelibs/debian/changelog @@ -1965,7 +1965,7 @@ tdelibs (4:3.4.91-0ubuntu1) breezy; urgency=low tdelibs (4:3.4.2-0ubuntu4) breezy; urgency=low - * Add replaces on old knetwortdeconf for tdelibs-data + * Add replaces on old knetworkconf for tdelibs-data -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 3 Aug 2005 12:44:18 +0000 diff --git a/ubuntu/maverick_automake/kdeadmin/debian/changelog b/ubuntu/maverick_automake/kdeadmin/debian/changelog index a1bed4850..787a6cb9a 100644 --- a/ubuntu/maverick_automake/kdeadmin/debian/changelog +++ b/ubuntu/maverick_automake/kdeadmin/debian/changelog @@ -44,9 +44,9 @@ kdeadmin (4:3.5.9-0ubuntu5) hardy; urgency=low kdeadmin (4:3.5.9-0ubuntu4) hardy; urgency=low * Added kubuntu_13_no_samba_tweak.diff. - Knetwortdeconf reads smb.conf parameters but doesn't write them + Knetworkconf reads smb.conf parameters but doesn't write them causing the parameters to be removed from the config file. - Knetwortdeconf doesn't allow changing those, so there is no reason + Knetworkconf doesn't allow changing those, so there is no reason to let it read them. -- Anthony Mercatante <tonio@ubuntu.com> Thu, 03 Apr 2008 15:30:44 +0200 @@ -60,7 +60,7 @@ kdeadmin (4:3.5.9-0ubuntu3) hardy; urgency=low kdeadmin (4:3.5.9-0ubuntu2) hardy; urgency=low - * Add kubuntu_11_knetwortdeconf_icons.diff from Adam Spain, + * Add kubuntu_11_knetworkconf_icons.diff from Adam Spain, closes LP: #93878 "low quality icons" -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 03 Mar 2008 14:20:34 +0000 @@ -81,8 +81,8 @@ kdeadmin (4:3.5.8-1ubuntu1) hardy; urgency=low * Merge with Debian, remaining changes - kubuntu_08_kpackage_sudo.diff, sudo support - - kubuntu_10_knetwortdeconf_localhost.diff, LP #66813 - * Add kubuntu_11_knetwortdeconf_8.04.diff for 8.04 detection in knetwortdeconf + - kubuntu_10_knetworkconf_localhost.diff, LP #66813 + * Add kubuntu_11_knetworkconf_8.04.diff for 8.04 detection in knetworkconf -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 14 Nov 2007 17:25:38 +0000 @@ -135,7 +135,7 @@ kdeadmin (4:3.5.6-2) unstable; urgency=low +++ Changes by Modestas Vainius: - * knetwortdeconf RC bug fix: recognize allow-* statements in + * knetworkconf RC bug fix: recognize allow-* statements in /etc/network/interfaces as stanzas, not as ordinary options. This misrecognition led to corruption of the interfaces file in case allow-* stanza followed the iface stanza that new options were added to. Patch @@ -179,7 +179,7 @@ kdeadmin (4:3.5.5-2) unstable; urgency=low kdeadmin (4:3.5.6-0ubuntu1) feisty; urgency=low * New upstream release - * Remove kubuntu_12_knetwortdeconf_feisty.diff, applied upstream + * Remove kubuntu_12_knetworkconf_feisty.diff, applied upstream -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 17 Jan 2007 11:22:29 +0000 @@ -192,8 +192,8 @@ kdeadmin (4:3.5.5-1ubuntu4) feisty; urgency=low kdeadmin (4:3.5.5-1ubuntu3) feisty; urgency=low - * Added kubuntu_12_knetwortdeconf_feisty.diff to properly autodetect - feisty as knetwortdeconf backend. + * Added kubuntu_12_knetworkconf_feisty.diff to properly autodetect + feisty as knetworkconf backend. -- Luka Renko <lure@ubuntu.com> Sun, 10 Dec 2006 16:16:12 +0100 @@ -235,7 +235,7 @@ kdeadmin (4:3.5.4-1) unstable; urgency=low kdeadmin (4:3.5.5-0ubuntu2) edgy; urgency=low - * kubuntu_10_knetwortdeconf_localhost.diff added, hostname should not + * kubuntu_10_knetworkconf_localhost.diff added, hostname should not be appended as alias to localhost in /etc/hosts Closes Malone #66813 @@ -244,7 +244,7 @@ kdeadmin (4:3.5.5-0ubuntu2) edgy; urgency=low kdeadmin (4:3.5.5-0ubuntu1) edgy; urgency=low * New upstream release - * kubuntu_09_networtdeconf_edgy.diff removed, merged upstream + * kubuntu_09_networkconf_edgy.diff removed, merged upstream -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 3 Oct 2006 10:56:07 +0000 @@ -257,7 +257,7 @@ kdeadmin (4:3.5.4-0ubuntu3) edgy; urgency=low kdeadmin (4:3.5.4-0ubuntu2) edgy; urgency=low - * Add kubuntu_09_networtdeconf_edgy.diff to support Edgy in knetwortdeconf + * Add kubuntu_09_networkconf_edgy.diff to support Edgy in knetworkconf -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 7 Aug 2006 09:08:39 -0400 @@ -315,7 +315,7 @@ kdeadmin (4:3.5.1-2) unstable; urgency=low +++ Changes by Christopher Martin: - * Drop system-tools-backends.pc from knetwortdeconf, since it conflicts with + * Drop system-tools-backends.pc from knetworkconf, since it conflicts with gnome-system-tools. (Closes: #353321) -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sun, 19 Feb 2006 14:30:28 -0500 @@ -416,9 +416,9 @@ kdeadmin (4:3.5.1-0ubuntu1) dapper; urgency=low kdeadmin (4:3.5.0-0ubuntu2) dapper; urgency=low - * Add kubuntu_01_knetwortdeconf_branch_fixes.diff fixes - - http://bugzilla.ubuntu.com/9871 knetwortdeconf doesn't save gateway - - http://bugzilla.ubuntu.com/16921 knetwortdeconf too big for 1024x768 + * Add kubuntu_01_knetworkconf_branch_fixes.diff fixes + - http://bugzilla.ubuntu.com/9871 knetworkconf doesn't save gateway + - http://bugzilla.ubuntu.com/16921 knetworkconf too big for 1024x768 - Ensure changes are applied when clicking OK and don't leave zombie processes around @@ -449,7 +449,7 @@ kdeadmin (4:3.5.0-2) alioth; urgency=low +++ Changes by Josh Metzler: - * Create the new knetwortdeconf package. + * Create the new knetworkconf package. +++ Changes by Christopher Martin: diff --git a/ubuntu/maverick_automake/kdeadmin/debian/control b/ubuntu/maverick_automake/kdeadmin/debian/control index d657a1eb7..4c2cc0128 100644 --- a/ubuntu/maverick_automake/kdeadmin/debian/control +++ b/ubuntu/maverick_automake/kdeadmin/debian/control @@ -10,7 +10,7 @@ Standards-Version: 3.8.3 Package: kdeadmin-kde3 Section: kde Architecture: all -Depends: kcron-kde3 (>= ${Source-Version}), kdat-kde3 (>= ${Source-Version}), kdeadmin-tdefile-plugins-kde3 (>= ${Source-Version}), knetwortdeconf-kde3 (>= ${Source-Version}), kpackage-kde3 (>= ${Source-Version}), ksysv-kde3 (>= ${Source-Version}), kuser-kde3 (>= ${Source-Version}) +Depends: kcron-kde3 (>= ${Source-Version}), kdat-kde3 (>= ${Source-Version}), kdeadmin-tdefile-plugins-kde3 (>= ${Source-Version}), knetworkconf-kde3 (>= ${Source-Version}), kpackage-kde3 (>= ${Source-Version}), ksysv-kde3 (>= ${Source-Version}), kuser-kde3 (>= ${Source-Version}) Recommends: lilo-config-kde3 (>= ${Source-Version}) Suggests: kdeadmin-kde3-doc-html (>= ${Source-Version}) Description: system administration tools from the official KDE3 release @@ -81,7 +81,7 @@ Description: KDE3 file metainfo plugins for deb and rpm files This package is part of KDE3, as a component of the KDE administration module. See the 'kde-kde3' and 'kdeadmin-kde3' packages for more information. -Package: knetwortdeconf-kde3 +Package: knetworkconf-kde3 Section: kde Architecture: any Depends: ${shlibs:Depends} diff --git a/ubuntu/maverick_automake/kdeadmin/debian/control.in b/ubuntu/maverick_automake/kdeadmin/debian/control.in index e1cabb2b5..98e03d1f4 100644 --- a/ubuntu/maverick_automake/kdeadmin/debian/control.in +++ b/ubuntu/maverick_automake/kdeadmin/debian/control.in @@ -10,7 +10,7 @@ Standards-Version: 3.7.2 Package: kdeadmin Section: kde Architecture: all -Depends: kcron (>= ${Source-Version}), kdat (>= ${Source-Version}), kdeadmin-tdefile-plugins (>= ${Source-Version}), knetwortdeconf (>= ${Source-Version}), kpackage (>= ${Source-Version}), ksysv (>= ${Source-Version}), kuser (>= ${Source-Version}) +Depends: kcron (>= ${Source-Version}), kdat (>= ${Source-Version}), kdeadmin-tdefile-plugins (>= ${Source-Version}), knetworkconf (>= ${Source-Version}), kpackage (>= ${Source-Version}), ksysv (>= ${Source-Version}), kuser (>= ${Source-Version}) Recommends: lilo-config (>= ${Source-Version}) Suggests: kdeadmin-doc-html (>= ${Source-Version}) Description: system administration tools from the official KDE release @@ -81,7 +81,7 @@ Description: KDE file metainfo plugins for deb and rpm files This package is part of KDE, as a component of the KDE administration module. See the 'kde' and 'kdeadmin' packages for more information. -Package: knetwortdeconf +Package: knetworkconf Section: kde Architecture: any Depends: ${shlibs:Depends} diff --git a/ubuntu/maverick_automake/kdeadmin/debian/kdeadmin-doc-html.doc-base.knetworkconf b/ubuntu/maverick_automake/kdeadmin/debian/kdeadmin-doc-html.doc-base.knetworkconf new file mode 100644 index 000000000..aeb73ead3 --- /dev/null +++ b/ubuntu/maverick_automake/kdeadmin/debian/kdeadmin-doc-html.doc-base.knetworkconf @@ -0,0 +1,10 @@ +Document: kdeadmin-doc-html-knetworkconf +Title: KNetworkConf Handbook +Author: Sean Wheller, Christoph Eckert +Abstract: KNetworkConf is a graphical manager for network devices and settings. +Section: Admin + +Format: HTML +Index: /usr/share/doc/kde/HTML/en/knetworkconf/index.html +Files: /usr/share/doc/kde/HTML/en/knetworkconf/*.html + diff --git a/ubuntu/maverick_automake/kdeadmin/debian/kdeadmin-doc-html.doc-base.knetwortdeconf b/ubuntu/maverick_automake/kdeadmin/debian/kdeadmin-doc-html.doc-base.knetwortdeconf deleted file mode 100644 index e776325aa..000000000 --- a/ubuntu/maverick_automake/kdeadmin/debian/kdeadmin-doc-html.doc-base.knetwortdeconf +++ /dev/null @@ -1,10 +0,0 @@ -Document: kdeadmin-doc-html-knetwortdeconf -Title: KNetworkConf Handbook -Author: Sean Wheller, Christoph Eckert -Abstract: KNetworkConf is a graphical manager for network devices and settings. -Section: Admin - -Format: HTML -Index: /usr/share/doc/kde/HTML/en/knetwortdeconf/index.html -Files: /usr/share/doc/kde/HTML/en/knetwortdeconf/*.html - diff --git a/ubuntu/maverick_automake/kdeadmin/debian/knetworkconf-kde3.install b/ubuntu/maverick_automake/kdeadmin/debian/knetworkconf-kde3.install new file mode 100644 index 000000000..944e2d7cf --- /dev/null +++ b/ubuntu/maverick_automake/kdeadmin/debian/knetworkconf-kde3.install @@ -0,0 +1,56 @@ +debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetworkconf/01.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetworkconf/02.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetworkconf/11.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetworkconf/03.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetworkconf/04.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetworkconf/05.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetworkconf/index.docbook +debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetworkconf/06.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetworkconf/07.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetworkconf/about1.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetworkconf/08.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetworkconf/09.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetworkconf/index.cache.bz2 +debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetworkconf/common +debian/tmp/opt/kde3/share/icons/hicolor/32x32/apps/knetworkconf.png +debian/tmp/opt/kde3/share/icons/hicolor/16x16/apps/knetworkconf.png +debian/tmp/opt/kde3/share/icons/hicolor/22x22/apps/knetworkconf.png +debian/tmp/opt/kde3/share/icons/hicolor/22x22/actions/network_disconnected_wlan.png +debian/tmp/opt/kde3/share/icons/hicolor/22x22/actions/network_connected_lan_knc.png +debian/tmp/opt/kde3/share/icons/hicolor/22x22/actions/network_disconnected_lan.png +debian/tmp/opt/kde3/share/icons/hicolor/22x22/actions/network_traffic_wlan.png +debian/tmp/opt/kde3/share/apps/knetworkconf/backends/network-conf +debian/tmp/opt/kde3/share/apps/knetworkconf/backends/debug.pl +debian/tmp/opt/kde3/share/apps/knetworkconf/backends/file.pl +debian/tmp/opt/kde3/share/apps/knetworkconf/backends/general.pl +debian/tmp/opt/kde3/share/apps/knetworkconf/backends/network.pl +debian/tmp/opt/kde3/share/apps/knetworkconf/backends/parse.pl +debian/tmp/opt/kde3/share/apps/knetworkconf/backends/platform.pl +debian/tmp/opt/kde3/share/apps/knetworkconf/backends/process.pl +debian/tmp/opt/kde3/share/apps/knetworkconf/backends/replace.pl +debian/tmp/opt/kde3/share/apps/knetworkconf/backends/report.pl +debian/tmp/opt/kde3/share/apps/knetworkconf/backends/service.pl +debian/tmp/opt/kde3/share/apps/knetworkconf/backends/service-list.pl +debian/tmp/opt/kde3/share/apps/knetworkconf/backends/util.pl +debian/tmp/opt/kde3/share/apps/knetworkconf/backends/xml.pl +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/ark.png +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/debian.png +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/blackpanther.png +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/mandriva.png +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/pld.png +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/redhat.png +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/suse.png +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/turbolinux.png +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/conectiva.png +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/fedora.png +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/openna.png +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/slackware.png +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/freebsd.png +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/gentoo.png +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/vine.png +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/rpath.png +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/kubuntu.png +debian/tmp/opt/kde3/share/apps/knetworkconf/pixmaps/yoper.png +debian/tmp/opt/kde3/share/applications/kde/kcm_knetworkconfmodule.desktop +debian/tmp/opt/kde3/lib/kde3/kcm_knetworkconfmodule.so +debian/tmp/opt/kde3/lib/kde3/kcm_knetworkconfmodule.la diff --git a/ubuntu/maverick_automake/kdeadmin/debian/knetworkconf-kde3.postinst b/ubuntu/maverick_automake/kdeadmin/debian/knetworkconf-kde3.postinst new file mode 100644 index 000000000..bcb12994d --- /dev/null +++ b/ubuntu/maverick_automake/kdeadmin/debian/knetworkconf-kde3.postinst @@ -0,0 +1,27 @@ +#! /bin/sh -e + +case "$1" in + + configure) + dpkg-divert --remove /usr/share/icons/hicolor/16x16/apps/knetworkconf.png + dpkg-divert --remove /usr/share/icons/hicolor/22x22/apps/knetworkconf.png + dpkg-divert --remove /usr/share/icons/hicolor/32x32/apps/knetworkconf.png + dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_connected_lan_knc.png + dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_disconnected_lan.png + dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_disconnected_wlan.png + dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_traffic_wlan.png + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; + +esac + +#DEBHELPER# + +exit 0 diff --git a/ubuntu/maverick_automake/kdeadmin/debian/knetwortdeconf-kde3.install b/ubuntu/maverick_automake/kdeadmin/debian/knetwortdeconf-kde3.install deleted file mode 100644 index f24a07fae..000000000 --- a/ubuntu/maverick_automake/kdeadmin/debian/knetwortdeconf-kde3.install +++ /dev/null @@ -1,56 +0,0 @@ -debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetwortdeconf/01.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetwortdeconf/02.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetwortdeconf/11.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetwortdeconf/03.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetwortdeconf/04.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetwortdeconf/05.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetwortdeconf/index.docbook -debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetwortdeconf/06.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetwortdeconf/07.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetwortdeconf/about1.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetwortdeconf/08.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetwortdeconf/09.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetwortdeconf/index.cache.bz2 -debian/tmp/opt/kde3/share/doc/kde/HTML/en/knetwortdeconf/common -debian/tmp/opt/kde3/share/icons/hicolor/32x32/apps/knetwortdeconf.png -debian/tmp/opt/kde3/share/icons/hicolor/16x16/apps/knetwortdeconf.png -debian/tmp/opt/kde3/share/icons/hicolor/22x22/apps/knetwortdeconf.png -debian/tmp/opt/kde3/share/icons/hicolor/22x22/actions/network_disconnected_wlan.png -debian/tmp/opt/kde3/share/icons/hicolor/22x22/actions/network_connected_lan_knc.png -debian/tmp/opt/kde3/share/icons/hicolor/22x22/actions/network_disconnected_lan.png -debian/tmp/opt/kde3/share/icons/hicolor/22x22/actions/network_traffic_wlan.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/backends/network-conf -debian/tmp/opt/kde3/share/apps/knetwortdeconf/backends/debug.pl -debian/tmp/opt/kde3/share/apps/knetwortdeconf/backends/file.pl -debian/tmp/opt/kde3/share/apps/knetwortdeconf/backends/general.pl -debian/tmp/opt/kde3/share/apps/knetwortdeconf/backends/network.pl -debian/tmp/opt/kde3/share/apps/knetwortdeconf/backends/parse.pl -debian/tmp/opt/kde3/share/apps/knetwortdeconf/backends/platform.pl -debian/tmp/opt/kde3/share/apps/knetwortdeconf/backends/process.pl -debian/tmp/opt/kde3/share/apps/knetwortdeconf/backends/replace.pl -debian/tmp/opt/kde3/share/apps/knetwortdeconf/backends/report.pl -debian/tmp/opt/kde3/share/apps/knetwortdeconf/backends/service.pl -debian/tmp/opt/kde3/share/apps/knetwortdeconf/backends/service-list.pl -debian/tmp/opt/kde3/share/apps/knetwortdeconf/backends/util.pl -debian/tmp/opt/kde3/share/apps/knetwortdeconf/backends/xml.pl -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/ark.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/debian.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/blackpanther.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/mandriva.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/pld.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/redhat.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/suse.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/turbolinux.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/conectiva.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/fedora.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/openna.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/slackware.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/freebsd.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/gentoo.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/vine.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/rpath.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/kubuntu.png -debian/tmp/opt/kde3/share/apps/knetwortdeconf/pixmaps/yoper.png -debian/tmp/opt/kde3/share/applications/kde/kcm_knetwortdeconfmodule.desktop -debian/tmp/opt/kde3/lib/kde3/kcm_knetwortdeconfmodule.so -debian/tmp/opt/kde3/lib/kde3/kcm_knetwortdeconfmodule.la diff --git a/ubuntu/maverick_automake/kdeadmin/debian/knetwortdeconf-kde3.postinst b/ubuntu/maverick_automake/kdeadmin/debian/knetwortdeconf-kde3.postinst deleted file mode 100644 index b32c2fb00..000000000 --- a/ubuntu/maverick_automake/kdeadmin/debian/knetwortdeconf-kde3.postinst +++ /dev/null @@ -1,27 +0,0 @@ -#! /bin/sh -e - -case "$1" in - - configure) - dpkg-divert --remove /usr/share/icons/hicolor/16x16/apps/knetwortdeconf.png - dpkg-divert --remove /usr/share/icons/hicolor/22x22/apps/knetwortdeconf.png - dpkg-divert --remove /usr/share/icons/hicolor/32x32/apps/knetwortdeconf.png - dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_connected_lan_knc.png - dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_disconnected_lan.png - dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_disconnected_wlan.png - dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_traffic_wlan.png - ;; - - abort-upgrade) - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; - -esac - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/maverick_automake/kdelibs/debian/changelog b/ubuntu/maverick_automake/kdelibs/debian/changelog index 28baa837e..735e7ef6b 100644 --- a/ubuntu/maverick_automake/kdelibs/debian/changelog +++ b/ubuntu/maverick_automake/kdelibs/debian/changelog @@ -1965,7 +1965,7 @@ kdelibs (4:3.4.91-0ubuntu1) breezy; urgency=low kdelibs (4:3.4.2-0ubuntu4) breezy; urgency=low - * Add replaces on old knetwortdeconf for kdelibs-data + * Add replaces on old knetworkconf for kdelibs-data -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 3 Aug 2005 12:44:18 +0000 diff --git a/ubuntu/precise/metapackages/kubuntu-meta/debian/changelog b/ubuntu/precise/metapackages/kubuntu-meta/debian/changelog index 7a4ef34be..ca8de6216 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/debian/changelog +++ b/ubuntu/precise/metapackages/kubuntu-meta/debian/changelog @@ -2283,7 +2283,7 @@ kubuntu-meta (0.56) dapper; urgency=low - Turn off HTTP caching while fetching seed lists. * Refreshed dependencies - * Added knetwortdeconf to desktop-hppa + * Added knetworkconf to desktop-hppa * Added krita to desktop-hppa * Added tdewalletmanager to desktop-hppa * Added knotes to desktop-hppa @@ -3270,7 +3270,7 @@ kubuntu-meta (0.40) hoary; urgency=low kubuntu-meta (0.39) hoary; urgency=low * Refreshed dependencies - * Added knetwortdeconf to desktop-sparc + * Added knetworkconf to desktop-sparc * Added konq-plugins to desktop-i386, desktop-amd64, desktop-powerpc, desktop-ia64, desktop-sparc * Added openoffice.org-kde to desktop-sparc @@ -3303,7 +3303,7 @@ kubuntu-meta (0.37) hoary; urgency=low * Refreshed dependencies * Added kdm to desktop-sparc - * Added knetwortdeconf to desktop-i386, desktop-amd64, desktop-powerpc, + * Added knetworkconf to desktop-i386, desktop-amd64, desktop-powerpc, desktop-ia64 * Added konserve to desktop-sparc * Added konversation to desktop-sparc diff --git a/ubuntu/precise/metapackages/kubuntu-meta/debian/control b/ubuntu/precise/metapackages/kubuntu-meta/debian/control index 769c94396..71fd6207d 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/debian/control +++ b/ubuntu/precise/metapackages/kubuntu-meta/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 4), germinate (>= 0.38) Package: kubuntu-desktop-trinity Architecture: any -Depends: acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, hal, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-kio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-kio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, kdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, kio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetwortdeconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, powermanagement-interface, readahead, screen, ttf-bitstream-vera, ttf-dejavu-core, ttf-freefont, unzip, vorbis-tools, x-ttcidfont-conf, xdg-user-dirs, xkb-data, xorg, zip, ksplash-engine-moodin-trinity, sudo-trinity, libtqt-perl, tqca-tls, kdbusnotification-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine +Depends: acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, hal, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-kio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-kio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, kdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, kio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, powermanagement-interface, readahead, screen, ttf-bitstream-vera, ttf-dejavu-core, ttf-freefont, unzip, vorbis-tools, x-ttcidfont-conf, xdg-user-dirs, xkb-data, xorg, zip, ksplash-engine-moodin-trinity, sudo-trinity, libtqt-perl, tqca-tls, kdbusnotification-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine Recommends: kio-apt-trinity, tde-guidance-powermanager-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikam-trinity, desktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tdepim-kio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, kio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, tdescreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-default-settings-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, tdewalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, min12xxw, networkstatus-trinity, openoffice.org-calc, openoffice.org-impress, openoffice.org-trinity, openoffice.org-writer, pinentry-qt, powernowd, pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, ttf-arabeyes, ttf-arphic-ukai, ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic,ttf-kochi-mincho, ttf-lao, ttf-malayalam-fonts, ttf-thai-tlwg, ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, smbclient, network-manager-tde-trinity | network-manager-gnome, plymouth-theme-kubuntu-logo-trinity Suggests: apport-gtk, hplip-gui Description: Kubuntu desktop system, TDE version diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop b/ubuntu/precise/metapackages/kubuntu-meta/desktop index 0ef26f0fd..452f69af8 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/desktop +++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop @@ -148,7 +148,7 @@ We've chosen KDE as our desktop user interface of choice * kcron-trinity * kdeadmin-tdefile-plugins-trinity - * knetwortdeconf-trinity + * knetworkconf-trinity == kdegraphics-trinity == diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-amd64 b/ubuntu/precise/metapackages/kubuntu-meta/desktop-amd64 index 38ab45844..bcc68af23 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-amd64 +++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-amd64 @@ -44,7 +44,7 @@ kicker-trinity kio-locate-trinity kmenuedit-trinity kmix-trinity -knetwortdeconf-trinity +knetworkconf-trinity konq-plugins-trinity konsole-trinity kpdf-trinity diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-hppa b/ubuntu/precise/metapackages/kubuntu-meta/desktop-hppa index 2eb22465c..326418d5f 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-hppa +++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-hppa @@ -42,7 +42,7 @@ kio-apt kio-locate kmenuedit kmix -knetwortdeconf +knetworkconf konq-plugins konsole kpdf diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-i386 b/ubuntu/precise/metapackages/kubuntu-meta/desktop-i386 index 933f1c6a2..d847816f2 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-i386 +++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-i386 @@ -45,7 +45,7 @@ kicker-trinity kio-locate-trinity kmenuedit-trinity kmix-trinity -knetwortdeconf-trinity +knetworkconf-trinity konq-plugins-trinity konsole-trinity kpdf-trinity diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-ia64 b/ubuntu/precise/metapackages/kubuntu-meta/desktop-ia64 index df57ea09e..5bbe44bd3 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-ia64 +++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-ia64 @@ -45,7 +45,7 @@ kio-apt kio-locate kmenuedit kmix -knetwortdeconf +knetworkconf konq-plugins konsole kpdf diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-lpia b/ubuntu/precise/metapackages/kubuntu-meta/desktop-lpia index b754eea75..b9e1c4b43 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-lpia +++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-lpia @@ -44,7 +44,7 @@ kicker-trinity kio-locate-trinity kmenuedit-trinity kmix-trinity -knetwortdeconf-trinity +knetworkconf-trinity konq-plugins-trinity konsole-trinity kpdf-trinity diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-powerpc b/ubuntu/precise/metapackages/kubuntu-meta/desktop-powerpc index d1ac9dd36..1601b9076 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-powerpc +++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-powerpc @@ -42,7 +42,7 @@ kio-apt kio-locate kmenuedit kmix -knetwortdeconf +knetworkconf konq-plugins konsole kpdf diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-sparc b/ubuntu/precise/metapackages/kubuntu-meta/desktop-sparc index 2eb22465c..326418d5f 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-sparc +++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-sparc @@ -42,7 +42,7 @@ kio-apt kio-locate kmenuedit kmix -knetwortdeconf +knetworkconf konq-plugins konsole kpdf diff --git a/ubuntu/precise/tdeadmin/debian/changelog b/ubuntu/precise/tdeadmin/debian/changelog index 2a7c44e06..4fca9af79 100644 --- a/ubuntu/precise/tdeadmin/debian/changelog +++ b/ubuntu/precise/tdeadmin/debian/changelog @@ -44,9 +44,9 @@ tdeadmin (4:3.5.9-0ubuntu5) hardy; urgency=low tdeadmin (4:3.5.9-0ubuntu4) hardy; urgency=low * Added kubuntu_13_no_samba_tweak.diff. - Knetwortdeconf reads smb.conf parameters but doesn't write them + Knetworkconf reads smb.conf parameters but doesn't write them causing the parameters to be removed from the config file. - Knetwortdeconf doesn't allow changing those, so there is no reason + Knetworkconf doesn't allow changing those, so there is no reason to let it read them. -- Anthony Mercatante <tonio@ubuntu.com> Thu, 03 Apr 2008 15:30:44 +0200 @@ -60,7 +60,7 @@ tdeadmin (4:3.5.9-0ubuntu3) hardy; urgency=low tdeadmin (4:3.5.9-0ubuntu2) hardy; urgency=low - * Add kubuntu_11_knetwortdeconf_icons.diff from Adam Spain, + * Add kubuntu_11_knetworkconf_icons.diff from Adam Spain, closes LP: #93878 "low quality icons" -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 03 Mar 2008 14:20:34 +0000 @@ -81,8 +81,8 @@ tdeadmin (4:3.5.8-1ubuntu1) hardy; urgency=low * Merge with Debian, remaining changes - kubuntu_08_kpackage_sudo.diff, sudo support - - kubuntu_10_knetwortdeconf_localhost.diff, LP #66813 - * Add kubuntu_11_knetwortdeconf_8.04.diff for 8.04 detection in knetwortdeconf + - kubuntu_10_knetworkconf_localhost.diff, LP #66813 + * Add kubuntu_11_knetworkconf_8.04.diff for 8.04 detection in knetworkconf -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 14 Nov 2007 17:25:38 +0000 @@ -135,7 +135,7 @@ tdeadmin (4:3.5.6-2) unstable; urgency=low +++ Changes by Modestas Vainius: - * knetwortdeconf RC bug fix: recognize allow-* statements in + * knetworkconf RC bug fix: recognize allow-* statements in /etc/network/interfaces as stanzas, not as ordinary options. This misrecognition led to corruption of the interfaces file in case allow-* stanza followed the iface stanza that new options were added to. Patch @@ -179,7 +179,7 @@ tdeadmin (4:3.5.5-2) unstable; urgency=low tdeadmin (4:3.5.6-0ubuntu1) feisty; urgency=low * New upstream release - * Remove kubuntu_12_knetwortdeconf_feisty.diff, applied upstream + * Remove kubuntu_12_knetworkconf_feisty.diff, applied upstream -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 17 Jan 2007 11:22:29 +0000 @@ -192,8 +192,8 @@ tdeadmin (4:3.5.5-1ubuntu4) feisty; urgency=low tdeadmin (4:3.5.5-1ubuntu3) feisty; urgency=low - * Added kubuntu_12_knetwortdeconf_feisty.diff to properly autodetect - feisty as knetwortdeconf backend. + * Added kubuntu_12_knetworkconf_feisty.diff to properly autodetect + feisty as knetworkconf backend. -- Luka Renko <lure@ubuntu.com> Sun, 10 Dec 2006 16:16:12 +0100 @@ -235,7 +235,7 @@ tdeadmin (4:3.5.4-1) unstable; urgency=low tdeadmin (4:3.5.5-0ubuntu2) edgy; urgency=low - * kubuntu_10_knetwortdeconf_localhost.diff added, hostname should not + * kubuntu_10_knetworkconf_localhost.diff added, hostname should not be appended as alias to localhost in /etc/hosts Closes Malone #66813 @@ -244,7 +244,7 @@ tdeadmin (4:3.5.5-0ubuntu2) edgy; urgency=low tdeadmin (4:3.5.5-0ubuntu1) edgy; urgency=low * New upstream release - * kubuntu_09_networtdeconf_edgy.diff removed, merged upstream + * kubuntu_09_networkconf_edgy.diff removed, merged upstream -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 3 Oct 2006 10:56:07 +0000 @@ -257,7 +257,7 @@ tdeadmin (4:3.5.4-0ubuntu3) edgy; urgency=low tdeadmin (4:3.5.4-0ubuntu2) edgy; urgency=low - * Add kubuntu_09_networtdeconf_edgy.diff to support Edgy in knetwortdeconf + * Add kubuntu_09_networkconf_edgy.diff to support Edgy in knetworkconf -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 7 Aug 2006 09:08:39 -0400 @@ -315,7 +315,7 @@ tdeadmin (4:3.5.1-2) unstable; urgency=low +++ Changes by Christopher Martin: - * Drop system-tools-backends.pc from knetwortdeconf, since it conflicts with + * Drop system-tools-backends.pc from knetworkconf, since it conflicts with gnome-system-tools. (Closes: #353321) -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sun, 19 Feb 2006 14:30:28 -0500 @@ -416,9 +416,9 @@ tdeadmin (4:3.5.1-0ubuntu1) dapper; urgency=low tdeadmin (4:3.5.0-0ubuntu2) dapper; urgency=low - * Add kubuntu_01_knetwortdeconf_branch_fixes.diff fixes - - http://bugzilla.ubuntu.com/9871 knetwortdeconf doesn't save gateway - - http://bugzilla.ubuntu.com/16921 knetwortdeconf too big for 1024x768 + * Add kubuntu_01_knetworkconf_branch_fixes.diff fixes + - http://bugzilla.ubuntu.com/9871 knetworkconf doesn't save gateway + - http://bugzilla.ubuntu.com/16921 knetworkconf too big for 1024x768 - Ensure changes are applied when clicking OK and don't leave zombie processes around @@ -449,7 +449,7 @@ tdeadmin (4:3.5.0-2) alioth; urgency=low +++ Changes by Josh Metzler: - * Create the new knetwortdeconf package. + * Create the new knetworkconf package. +++ Changes by Christopher Martin: diff --git a/ubuntu/precise/tdeadmin/debian/control b/ubuntu/precise/tdeadmin/debian/control index 0042d0d8d..8bcab9710 100644 --- a/ubuntu/precise/tdeadmin/debian/control +++ b/ubuntu/precise/tdeadmin/debian/control @@ -12,7 +12,7 @@ Section: tde Architecture: all Replaces: kdeadmin-trinity (<< 4:14.0.0) Breaks: kdeadmin-trinity (<< 4:14.0.0) -Depends: kcron-trinity (>= ${Source-Version}), kdat-trinity (>= ${Source-Version}), tdeadmin-tdefile-plugins-trinity (>= ${Source-Version}), knetwortdeconf-trinity (>= ${Source-Version}), kpackage-trinity (>= ${Source-Version}), ksysv-trinity (>= ${Source-Version}), kuser-trinity (>= ${Source-Version}) +Depends: kcron-trinity (>= ${Source-Version}), kdat-trinity (>= ${Source-Version}), tdeadmin-tdefile-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}) Description: system administration tools from the official Trinity release @@ -91,11 +91,11 @@ Description: Trinity file metainfo plugins for deb and rpm files This package is part of Trinity, as a component of the KDE administration module. See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information. -Package: knetwortdeconf-trinity +Package: knetworkconf-trinity Section: tde Architecture: any -Replaces: knetwortdeconf-trinity (<< 4:14.0.0) -Breaks: knetwortdeconf-trinity (<< 4:14.0.0) +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 diff --git a/ubuntu/precise/tdeadmin/debian/control.in b/ubuntu/precise/tdeadmin/debian/control.in index b56d4e54c..8958b98e4 100644 --- a/ubuntu/precise/tdeadmin/debian/control.in +++ b/ubuntu/precise/tdeadmin/debian/control.in @@ -10,7 +10,7 @@ Standards-Version: 3.7.2 Package: tdeadmin Section: tde Architecture: all -Depends: kcron (>= ${Source-Version}), kdat (>= ${Source-Version}), tdeadmin-tdefile-plugins (>= ${Source-Version}), knetwortdeconf (>= ${Source-Version}), kpackage (>= ${Source-Version}), ksysv (>= ${Source-Version}), kuser (>= ${Source-Version}) +Depends: kcron (>= ${Source-Version}), kdat (>= ${Source-Version}), tdeadmin-tdefile-plugins (>= ${Source-Version}), knetworkconf (>= ${Source-Version}), kpackage (>= ${Source-Version}), ksysv (>= ${Source-Version}), kuser (>= ${Source-Version}) Recommends: lilo-config (>= ${Source-Version}) Suggests: tdeadmin-doc-html (>= ${Source-Version}) Description: system administration tools from the official KDE release @@ -81,7 +81,7 @@ Description: KDE file metainfo plugins for deb and rpm files This package is part of KDE, as a component of the KDE administration module. See the 'kde' and 'tdeadmin' packages for more information. -Package: knetwortdeconf +Package: knetworkconf Section: tde Architecture: any Depends: ${shlibs:Depends} diff --git a/ubuntu/precise/tdeadmin/debian/knetworkconf-trinity.install b/ubuntu/precise/tdeadmin/debian/knetworkconf-trinity.install new file mode 100644 index 000000000..ec0333100 --- /dev/null +++ b/ubuntu/precise/tdeadmin/debian/knetworkconf-trinity.install @@ -0,0 +1,56 @@ +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/01.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/02.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/11.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/03.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/04.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/05.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/06.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/07.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/about1.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/08.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/09.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/common +debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/knetworkconf.png +debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/knetworkconf.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/knetworkconf.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_disconnected_wlan.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_connected_lan_knc.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_disconnected_lan.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_traffic_wlan.png +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/network-conf +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/debug.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/file.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/general.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/network.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/parse.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/platform.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/process.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/replace.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/report.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/service.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/service-list.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/util.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/backends/xml.pl +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/ark.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/debian.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/blackpanther.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/mandriva.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/pld.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/redhat.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/suse.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/turbolinux.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/conectiva.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/fedora.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/openna.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/slackware.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/freebsd.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/gentoo.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/vine.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/rpath.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/kubuntu.png +debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/yoper.png +debian/tmp/opt/trinity/share/applications/tde/kcm_knetworkconfmodule.desktop +debian/tmp/opt/trinity/lib/trinity/kcm_knetworkconfmodule.so +debian/tmp/opt/trinity/lib/trinity/kcm_knetworkconfmodule.la diff --git a/ubuntu/precise/tdeadmin/debian/knetworkconf-trinity.postinst b/ubuntu/precise/tdeadmin/debian/knetworkconf-trinity.postinst new file mode 100644 index 000000000..bcb12994d --- /dev/null +++ b/ubuntu/precise/tdeadmin/debian/knetworkconf-trinity.postinst @@ -0,0 +1,27 @@ +#! /bin/sh -e + +case "$1" in + + configure) + dpkg-divert --remove /usr/share/icons/hicolor/16x16/apps/knetworkconf.png + dpkg-divert --remove /usr/share/icons/hicolor/22x22/apps/knetworkconf.png + dpkg-divert --remove /usr/share/icons/hicolor/32x32/apps/knetworkconf.png + dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_connected_lan_knc.png + dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_disconnected_lan.png + dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_disconnected_wlan.png + dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_traffic_wlan.png + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; + +esac + +#DEBHELPER# + +exit 0 diff --git a/ubuntu/precise/tdeadmin/debian/knetwortdeconf-trinity.install b/ubuntu/precise/tdeadmin/debian/knetwortdeconf-trinity.install deleted file mode 100644 index dbe573132..000000000 --- a/ubuntu/precise/tdeadmin/debian/knetwortdeconf-trinity.install +++ /dev/null @@ -1,56 +0,0 @@ -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/01.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/02.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/11.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/03.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/04.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/05.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/06.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/07.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/about1.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/08.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/09.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/common -debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/knetwortdeconf.png -debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/knetwortdeconf.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/knetwortdeconf.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_disconnected_wlan.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_connected_lan_knc.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_disconnected_lan.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_traffic_wlan.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/network-conf -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/debug.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/file.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/general.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/network.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/parse.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/platform.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/process.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/replace.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/report.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/service.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/service-list.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/util.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/xml.pl -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/ark.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/debian.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/blackpanther.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/mandriva.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/pld.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/redhat.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/suse.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/turbolinux.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/conectiva.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/fedora.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/openna.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/slackware.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/freebsd.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/gentoo.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/vine.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/rpath.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/kubuntu.png -debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/yoper.png -debian/tmp/opt/trinity/share/applications/tde/kcm_knetwortdeconfmodule.desktop -debian/tmp/opt/trinity/lib/trinity/kcm_knetwortdeconfmodule.so -debian/tmp/opt/trinity/lib/trinity/kcm_knetwortdeconfmodule.la diff --git a/ubuntu/precise/tdeadmin/debian/knetwortdeconf-trinity.postinst b/ubuntu/precise/tdeadmin/debian/knetwortdeconf-trinity.postinst deleted file mode 100644 index b32c2fb00..000000000 --- a/ubuntu/precise/tdeadmin/debian/knetwortdeconf-trinity.postinst +++ /dev/null @@ -1,27 +0,0 @@ -#! /bin/sh -e - -case "$1" in - - configure) - dpkg-divert --remove /usr/share/icons/hicolor/16x16/apps/knetwortdeconf.png - dpkg-divert --remove /usr/share/icons/hicolor/22x22/apps/knetwortdeconf.png - dpkg-divert --remove /usr/share/icons/hicolor/32x32/apps/knetwortdeconf.png - dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_connected_lan_knc.png - dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_disconnected_lan.png - dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_disconnected_wlan.png - dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_traffic_wlan.png - ;; - - abort-upgrade) - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; - -esac - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/precise/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetworkconf b/ubuntu/precise/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetworkconf new file mode 100644 index 000000000..134b08805 --- /dev/null +++ b/ubuntu/precise/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetworkconf @@ -0,0 +1,10 @@ +Document: tdeadmin-doc-html-knetworkconf +Title: KNetworkConf Handbook +Author: Sean Wheller, Christoph Eckert +Abstract: KNetworkConf is a graphical manager for network devices and settings. +Section: Admin + +Format: HTML +Index: /usr/share/doc/tde/HTML/en/knetworkconf/index.html +Files: /usr/share/doc/tde/HTML/en/knetworkconf/*.html + diff --git a/ubuntu/precise/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetwortdeconf b/ubuntu/precise/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetwortdeconf deleted file mode 100644 index 59e475dd7..000000000 --- a/ubuntu/precise/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetwortdeconf +++ /dev/null @@ -1,10 +0,0 @@ -Document: tdeadmin-doc-html-knetwortdeconf -Title: KNetworkConf Handbook -Author: Sean Wheller, Christoph Eckert -Abstract: KNetworkConf is a graphical manager for network devices and settings. -Section: Admin - -Format: HTML -Index: /usr/share/doc/tde/HTML/en/knetwortdeconf/index.html -Files: /usr/share/doc/tde/HTML/en/knetwortdeconf/*.html - diff --git a/ubuntu/precise/tdelibs/debian/changelog b/ubuntu/precise/tdelibs/debian/changelog index 28a76fe79..e909d30a2 100644 --- a/ubuntu/precise/tdelibs/debian/changelog +++ b/ubuntu/precise/tdelibs/debian/changelog @@ -1965,7 +1965,7 @@ tdelibs (4:3.4.91-0ubuntu1) breezy; urgency=low tdelibs (4:3.4.2-0ubuntu4) breezy; urgency=low - * Add replaces on old knetwortdeconf for tdelibs-data + * Add replaces on old knetworkconf for tdelibs-data -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 3 Aug 2005 12:44:18 +0000 |