diff options
17 files changed, 8 insertions, 266 deletions
diff --git a/debian/_base/applications/system/krusader/debian/README.Debian b/debian/_base/applications/system/krusader/debian/README.Debian deleted file mode 100644 index b0302c211..000000000 --- a/debian/_base/applications/system/krusader/debian/README.Debian +++ /dev/null @@ -1,107 +0,0 @@ -Debian kde-extras Team ----------------------- - -1. Contacts ------------ - -General help requests - <debian-kde@lists.debian.org> mailing list - #debian-kde on irc - -Packaging queries - <debian-qt-kde@lists.debian.org> mailing list - #debian-qt-kde on irc - -Maintainers - <pkg-kde-extras@lists.alioth.debian.org> mailing list - - -2. Subversion repository ------------------------- - -You can browse it only at: - -http://svn.debian.org/wsvn/pkg-kde/kde-extras/ - -To "checkout" the repository use these commands: - - $ svn co svn+ssh://${ALIOTH_USERNAME}@svn.debian.org/svn/pkg-kde/kde-extras - -Authorized SSH keys are controlled at https://alioth.debian.org/account/ - -The repository layout is: - -- packagename/ - - trunk/ - - branches/ - - tags/ - - 0.7.2-1/ - - 0.7.2-2/ - - 0.7.2-2ubuntu1/ - - 0.7.2-2ubuntu2/ - - 0.7.2-2ubuntu3/ - - 0.8.0/ - ... - -If only one version of the package is available at the time, development must -be made at trunk/ dir, copying the dir to tags/'pkg-version' each time a new -release is made. - -When, at some point, the need to have two different versions at the same time -arises (for example, if we need a version to be in unstable and a different one -to be in experimental), experimental development will be made in trunk/ and -if a new unstable package needs to be cooked, copying -tag/'latest_version_in_sid' to tag/'latest_version_in_sid'+1 will make the -trick. - -3. Using svn-buildpackage --------------------------- - -Packages with an upstream tarball will require you to set the mergeWithUpstream -property first (from the package root) so that svn-buildpackage will look for -the .orig.tar.gz in the ../tarballs directory. - - % svn propset mergeWithUpstream 1 debian - -Please note that this only works for packages which have only the debian/ -directory committed. Consequently, you must use CDBS's simple-patchsys.mk or -dpatch to modify the upstream sources. - -After you have finished and committed your Debian patches via - - % svn commit [PACKAGE] - -as well as copying the orig.tar.gz to ../tarballs/ if necessary, you may build -your package with the following commands: - - % svn-buildpackage --svn-ignore-new -rfakeroot - -Please, don't commit tarballs/ or build-area/ directories to SVN. - -4. Tarballs and Build-area directories ------------------------------------- - -During pkg development before uploaded to debian the tarballs can be found at: - - http://pkg-kde.alioth.debian.org/kde-extra/orig.tar.gz/ - -You need to place those dirs in the parent directory of the one from which you're -running svn-buildpackage. Usually this means placing tarballs/ and build-area/ dirs -in 'pkgname'/ dir, at the same level as trunk/ - -If you want to compile inside one version in tags/ dir, you'll need to place those -dirs inside that dir. Of course the easiest and cleanest way of doing it is -by making a symlink of those dirs inside tags/ dir. - -5. Using svn-inject -------------------- - -To inject a new package into the Debian KDE Extras svn archive you should use svn-inject(1) -as follows: - - svn-inject -o <package>.dsc svn+ssh://${ALIOTH_USERNAME}@svn.debian.org/svn/pkg-kde/kde-extras - -Type in your alioth password a few hundred times :-) and your package should be -uploaded to the archive. Note you will also need to manually copy the -package.orig.tar.gz to your tarballs directory. The -o option is important as -this ensures that we 'Only keep modified files under SVN control' diff --git a/debian/_base/applications/system/krusader/debian/control b/debian/_base/applications/system/krusader/debian/control index 398f46f36..78a72ad8d 100644 --- a/debian/_base/applications/system/krusader/debian/control +++ b/debian/_base/applications/system/krusader/debian/control @@ -34,15 +34,3 @@ Description: twin-panel (commander-style) file manager for TDE (and other deskto . Almost completely customizable, Krusader is very user friendly, fast and looks great on your desktop. - -Package: krusader-trinity-dbg -Section: devel -Architecture: any -Replaces: krusader-trinity-dbg (<< 4:14.0.0~) -Breaks: krusader-trinity-dbg (<< 4:14.0.0~) -Priority: extra -Depends: krusader-trinity (= ${binary:Version}) -Description: debugging symbols for krusader-trinity - This package contains the debugging symbols associated with krusader-trinity. - They will automatically be used by gdb for debugging krusader-related - issues. diff --git a/debian/_base/applications/system/krusader/debian/krusader.lintian-overrides b/debian/_base/applications/system/krusader/debian/krusader.lintian-overrides deleted file mode 100644 index 62bf48233..000000000 --- a/debian/_base/applications/system/krusader/debian/krusader.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# package depends on tdebase-bin, which provides tdesu -krusader-trinity: menu-command-not-in-package /usr/share/menu/krusader:17 tdesu diff --git a/debian/_base/applications/system/krusader/debian/rules b/debian/_base/applications/system/krusader/debian/rules index 721d1b856..4747ea4c6 100755 --- a/debian/_base/applications/system/krusader/debian/rules +++ b/debian/_base/applications/system/krusader/debian/rules @@ -28,9 +28,6 @@ install/krusader-trinity:: # install properly tdeio_isorc install -D -p -m0644 src/iso/tdeio_isorc \ $(DEB_DESTDIR)/opt/trinity/share/config/tdeio_isorc - # install lintian override - install -D -p -m0644 debian/krusader.lintian-overrides \ - $(DEB_DESTDIR)/usr/share/lintian/overrides/$(cdbs_curpkg) binary-post-install/krusader-trinity:: rm -rf debian/krusader-trinity/etc/trinity/ diff --git a/debian/_base/applications/system/krusader/debian/source.lintian-overrides b/debian/_base/applications/system/krusader/debian/source.lintian-overrides deleted file mode 100644 index 01d57f16c..000000000 --- a/debian/_base/applications/system/krusader/debian/source.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# will be cleaned in next upstream release -krusader source: source-contains-CVS-dir admin/CVS diff --git a/debian/_base/applications/system/krusader/debian/watch b/debian/_base/applications/system/krusader/debian/watch deleted file mode 100644 index d19bef39d..000000000 --- a/debian/_base/applications/system/krusader/debian/watch +++ /dev/null @@ -1,3 +0,0 @@ -version=3 -opts=dversionmangle=s/~/-/ \ - http://sf.net/krusader/krusader-([\d\.].*)\.tar\.gz debian svn-upgrade diff --git a/debian/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff b/debian/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff index 99db98c6f..a4ced0644 100644 --- a/debian/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff +++ b/debian/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff @@ -1,6 +1,6 @@ --- a/starttde +++ b/starttde -@@ -396,17 +396,17 @@ +@@ -414,17 +414,17 @@ . "$tdehome/share/config/startupconfig" fi @@ -27,5 +27,5 @@ +# fi +#fi - # XCursor mouse theme needs to be applied here to work even for kded or ksmserver. + # An XCursor mouse theme is needed to work with kded or ksmserver. if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then diff --git a/dilos/core/tdebase/debian/patches/disable_starttde_wallpaper.diff b/dilos/core/tdebase/debian/patches/disable_starttde_wallpaper.diff index 99db98c6f..a4ced0644 100644 --- a/dilos/core/tdebase/debian/patches/disable_starttde_wallpaper.diff +++ b/dilos/core/tdebase/debian/patches/disable_starttde_wallpaper.diff @@ -1,6 +1,6 @@ --- a/starttde +++ b/starttde -@@ -396,17 +396,17 @@ +@@ -414,17 +414,17 @@ . "$tdehome/share/config/startupconfig" fi @@ -27,5 +27,5 @@ +# fi +#fi - # XCursor mouse theme needs to be applied here to work even for kded or ksmserver. + # An XCursor mouse theme is needed to work with kded or ksmserver. if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then diff --git a/ubuntu/_base/applications/system/krusader/debian/README.Debian b/ubuntu/_base/applications/system/krusader/debian/README.Debian deleted file mode 100644 index b0302c211..000000000 --- a/ubuntu/_base/applications/system/krusader/debian/README.Debian +++ /dev/null @@ -1,107 +0,0 @@ -Debian kde-extras Team ----------------------- - -1. Contacts ------------ - -General help requests - <debian-kde@lists.debian.org> mailing list - #debian-kde on irc - -Packaging queries - <debian-qt-kde@lists.debian.org> mailing list - #debian-qt-kde on irc - -Maintainers - <pkg-kde-extras@lists.alioth.debian.org> mailing list - - -2. Subversion repository ------------------------- - -You can browse it only at: - -http://svn.debian.org/wsvn/pkg-kde/kde-extras/ - -To "checkout" the repository use these commands: - - $ svn co svn+ssh://${ALIOTH_USERNAME}@svn.debian.org/svn/pkg-kde/kde-extras - -Authorized SSH keys are controlled at https://alioth.debian.org/account/ - -The repository layout is: - -- packagename/ - - trunk/ - - branches/ - - tags/ - - 0.7.2-1/ - - 0.7.2-2/ - - 0.7.2-2ubuntu1/ - - 0.7.2-2ubuntu2/ - - 0.7.2-2ubuntu3/ - - 0.8.0/ - ... - -If only one version of the package is available at the time, development must -be made at trunk/ dir, copying the dir to tags/'pkg-version' each time a new -release is made. - -When, at some point, the need to have two different versions at the same time -arises (for example, if we need a version to be in unstable and a different one -to be in experimental), experimental development will be made in trunk/ and -if a new unstable package needs to be cooked, copying -tag/'latest_version_in_sid' to tag/'latest_version_in_sid'+1 will make the -trick. - -3. Using svn-buildpackage --------------------------- - -Packages with an upstream tarball will require you to set the mergeWithUpstream -property first (from the package root) so that svn-buildpackage will look for -the .orig.tar.gz in the ../tarballs directory. - - % svn propset mergeWithUpstream 1 debian - -Please note that this only works for packages which have only the debian/ -directory committed. Consequently, you must use CDBS's simple-patchsys.mk or -dpatch to modify the upstream sources. - -After you have finished and committed your Debian patches via - - % svn commit [PACKAGE] - -as well as copying the orig.tar.gz to ../tarballs/ if necessary, you may build -your package with the following commands: - - % svn-buildpackage --svn-ignore-new -rfakeroot - -Please, don't commit tarballs/ or build-area/ directories to SVN. - -4. Tarballs and Build-area directories ------------------------------------- - -During pkg development before uploaded to debian the tarballs can be found at: - - http://pkg-kde.alioth.debian.org/kde-extra/orig.tar.gz/ - -You need to place those dirs in the parent directory of the one from which you're -running svn-buildpackage. Usually this means placing tarballs/ and build-area/ dirs -in 'pkgname'/ dir, at the same level as trunk/ - -If you want to compile inside one version in tags/ dir, you'll need to place those -dirs inside that dir. Of course the easiest and cleanest way of doing it is -by making a symlink of those dirs inside tags/ dir. - -5. Using svn-inject -------------------- - -To inject a new package into the Debian KDE Extras svn archive you should use svn-inject(1) -as follows: - - svn-inject -o <package>.dsc svn+ssh://${ALIOTH_USERNAME}@svn.debian.org/svn/pkg-kde/kde-extras - -Type in your alioth password a few hundred times :-) and your package should be -uploaded to the archive. Note you will also need to manually copy the -package.orig.tar.gz to your tarballs directory. The -o option is important as -this ensures that we 'Only keep modified files under SVN control' diff --git a/ubuntu/_base/applications/system/krusader/debian/control b/ubuntu/_base/applications/system/krusader/debian/control index 72ea6d112..0d5c6dd3e 100644 --- a/ubuntu/_base/applications/system/krusader/debian/control +++ b/ubuntu/_base/applications/system/krusader/debian/control @@ -34,15 +34,3 @@ Description: twin-panel (commander-style) file manager for TDE (and other deskto . Almost completely customizable, Krusader is very user friendly, fast and looks great on your desktop. - -Package: krusader-trinity-dbg -Section: devel -Architecture: any -Replaces: krusader-kde3-dbg (<< 4:14.0.0~), krusader-trinity-dbg (<< 4:14.0.0~) -Breaks: krusader-kde3-dbg (<< 4:14.0.0~), krusader-trinity-dbg (<< 4:14.0.0~) -Priority: extra -Depends: krusader-trinity (= ${binary:Version}) -Description: debugging symbols for krusader-trinity - This package contains the debugging symbols associated with krusader-trinity. - They will automatically be used by gdb for debugging krusader-related - issues. diff --git a/ubuntu/_base/applications/system/krusader/debian/krusader.lintian-overrides b/ubuntu/_base/applications/system/krusader/debian/krusader.lintian-overrides deleted file mode 100644 index 62bf48233..000000000 --- a/ubuntu/_base/applications/system/krusader/debian/krusader.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# package depends on tdebase-bin, which provides tdesu -krusader-trinity: menu-command-not-in-package /usr/share/menu/krusader:17 tdesu diff --git a/ubuntu/_base/applications/system/krusader/debian/rules b/ubuntu/_base/applications/system/krusader/debian/rules index 721d1b856..4747ea4c6 100755 --- a/ubuntu/_base/applications/system/krusader/debian/rules +++ b/ubuntu/_base/applications/system/krusader/debian/rules @@ -28,9 +28,6 @@ install/krusader-trinity:: # install properly tdeio_isorc install -D -p -m0644 src/iso/tdeio_isorc \ $(DEB_DESTDIR)/opt/trinity/share/config/tdeio_isorc - # install lintian override - install -D -p -m0644 debian/krusader.lintian-overrides \ - $(DEB_DESTDIR)/usr/share/lintian/overrides/$(cdbs_curpkg) binary-post-install/krusader-trinity:: rm -rf debian/krusader-trinity/etc/trinity/ diff --git a/ubuntu/_base/applications/system/krusader/debian/source.lintian-overrides b/ubuntu/_base/applications/system/krusader/debian/source.lintian-overrides deleted file mode 100644 index 01d57f16c..000000000 --- a/ubuntu/_base/applications/system/krusader/debian/source.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# will be cleaned in next upstream release -krusader source: source-contains-CVS-dir admin/CVS diff --git a/ubuntu/_base/applications/system/krusader/debian/watch b/ubuntu/_base/applications/system/krusader/debian/watch deleted file mode 100644 index d19bef39d..000000000 --- a/ubuntu/_base/applications/system/krusader/debian/watch +++ /dev/null @@ -1,3 +0,0 @@ -version=3 -opts=dversionmangle=s/~/-/ \ - http://sf.net/krusader/krusader-([\d\.].*)\.tar\.gz debian svn-upgrade diff --git a/ubuntu/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff b/ubuntu/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff index 99db98c6f..a4ced0644 100644 --- a/ubuntu/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff +++ b/ubuntu/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff @@ -1,6 +1,6 @@ --- a/starttde +++ b/starttde -@@ -396,17 +396,17 @@ +@@ -414,17 +414,17 @@ . "$tdehome/share/config/startupconfig" fi @@ -27,5 +27,5 @@ +# fi +#fi - # XCursor mouse theme needs to be applied here to work even for kded or ksmserver. + # An XCursor mouse theme is needed to work with kded or ksmserver. if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff index fa2b265e5..ffddad5b1 100644 --- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff +++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff @@ -11,7 +11,7 @@ TQHBoxLayout* hbuttonbox; --- a/ksmserver/shutdowndlg.cpp +++ b/ksmserver/shutdowndlg.cpp -@@ -725,7 +725,7 @@ +@@ -726,7 +726,7 @@ 2 * KDialog::spacingHint() ); // default factor diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff index 49a653275..95e6e4116 100644 --- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff +++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff @@ -1,6 +1,6 @@ --- tdebase-3.5.8/tdm/backend/dm.c 2008-02-13 23:59:17.000000000 +0200 +++ tdebase-3.5.8/tdm/backend/dm.c 2008-02-14 11:22:41.000000000 +0200 -@@ -1023,9 +1023,14 @@ ReapChildren( void ) +@@ -1026,9 +1026,14 @@ ReapChildren( void ) /* don't kill again */ break; case running: |