diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2011-12-10 00:52:28 +0100 |
|---|---|---|
| committer | Francois Andriot <francois.andriot@free.fr> | 2011-12-10 00:52:28 +0100 |
| commit | 0b0d138bbc895c01e392bf3fd6c4e916a86935a5 (patch) | |
| tree | 3bd01a9b7276d77c891e2f1d061c121599f00a7f /ubuntu/maverick | |
| parent | 4368359c6192aaff174d4ec6fde1a8ae0682defa (diff) | |
| parent | 947e6baf2df5b3171900c9acd928f06e0da77ac9 (diff) | |
| download | tde-packaging-0b0d138bbc895c01e392bf3fd6c4e916a86935a5.tar.gz tde-packaging-0b0d138bbc895c01e392bf3fd6c4e916a86935a5.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick')
67 files changed, 845 insertions, 113 deletions
diff --git a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1 b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1 index 62faad5d3..e44c4cd99 100644 --- a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1 +++ b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1 @@ -1,10 +1,10 @@ .\" This file was generated by kdemangen.pl -.TH KIOSKTOOL\-KDEDIRS 1 "Ago 2004" "K Desktop Environment" "A tool to set $KDEDIRS according to the current user profile." +.TH KIOSKTOOL\-TDEDIRS 1 "Ago 2004" "K Desktop Environment" "A tool to set $TDEDIRS according to the current user profile." .SH NAME -kiosktool\-kdedirs -\- A tool to set $KDEDIRS according to the current user profile. +kiosktool\-tdedirs +\- A tool to set $TDEDIRS according to the current user profile. .SH SYNOPSIS -kiosktool\-kdedirs [Qt\-options] [KDE\-options] [options] +kiosktool\-tdedirs [Qt\-options] [KDE\-options] [options] .SH DESCRIPTION .SH OPTIONS @@ -136,9 +136,9 @@ mirrors the whole layout of widgets. .SH SEE ALSO Full user documentation is available through the KDE Help Center. You can also enter the URL -.BR help:/kiosktool\-kdedirs/ +.BR help:/kiosktool\-tdedirs/ directly into konqueror or you can run -.BR "`khelpcenter help:/kiosktool\-kdedirs/'" +.BR "`khelpcenter help:/kiosktool\-tdedirs/'" from the command\-line. .br .SH AUTHORS diff --git a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages index 2d009e1db..43bd4d1b8 100644 --- a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages +++ b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages @@ -1,2 +1,2 @@ debian/kiosktool-trinity.1 -debian/kiosktool-kdedirs-trinity.1 +debian/kiosktool-tdedirs-trinity.1 diff --git a/ubuntu/maverick/applications/kvpnc/debian/README.Debian b/ubuntu/maverick/applications/kvpnc/debian/README.Debian new file mode 100644 index 000000000..a65e1a72c --- /dev/null +++ b/ubuntu/maverick/applications/kvpnc/debian/README.Debian @@ -0,0 +1,32 @@ +kvpnc for Debian +---------------- + +kvpnc for Debian uses su-to-root from menu package instead kdesu. + +Howto setup kvpnc for use without root password using sudo: + + * Install sudo + + aptitude install sudo + + * Edit /etc/sudoers + + # Cmnd alias specification + Cmnd_Alias KVPNC = /usr/bin/kvpnc + + # User privilege specification + ALL ALL=NOPASSWD:KVPNC + + * Edit desktop link /usr/share/applications/kde/Internet/kvpnc.desktop + + * replace the folling lines: + + Exec=su-to-root -X -c /usr/bin/kvpnc + X-KDE-SubstituteUID=true + + with: + + Exec=sudo kvpnc + X-KDE-SubstituteUID=false + + -- Fathi Boudra <fboudra@free.fr>, Thu, 18 May 2006 15:17:52 +0100 diff --git a/ubuntu/maverick/applications/kvpnc/debian/changelog b/ubuntu/maverick/applications/kvpnc/debian/changelog new file mode 100644 index 000000000..f8be4973c --- /dev/null +++ b/ubuntu/maverick/applications/kvpnc/debian/changelog @@ -0,0 +1,6 @@ +kvpnc-trinity (0.9.6a-1) lucid; urgency=low + + * Initial build + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Tue, 06 Dec 2011 12:26:00 -0600 + diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/compat b/ubuntu/maverick/applications/kvpnc/debian/compat index 7ed6ff82d..7ed6ff82d 100644 --- a/ubuntu/maverick/libraries/pykdeextensions/debian/compat +++ b/ubuntu/maverick/applications/kvpnc/debian/compat diff --git a/ubuntu/maverick/applications/kvpnc/debian/control b/ubuntu/maverick/applications/kvpnc/debian/control new file mode 100644 index 000000000..7b8ade852 --- /dev/null +++ b/ubuntu/maverick/applications/kvpnc/debian/control @@ -0,0 +1,20 @@ +Source: kvpnc-trinity +Section: kde +Priority: optional +Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org> +Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs4-trinity-dev, libgcrypt11-dev, automake, autoconf, libtool, libltdl-dev +Standards-Version: 3.8.4 + +Package: kvpnc-trinity +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, menu, net-tools, psmisc, tdebase-trinity-bin | gksu | sux, module-init-tools | modutils +Suggests: iptables, openssl, openvpn, racoon, vpnc, pptp-linux, openswan, xl2tpd, openct, opensc +Description: vpn clients frontend for TDE + KVpnc is a TDE frontend for various vpn clients. + . + It supports : + * Cisco-compatible VPN client (vpnc) + * IPSec (freeswan, openswan, racoon) + * Point-to-Point Tunneling Protocol (PPTP) client (pptp-linux) + * Virtual Private Network daemon (openvpn) diff --git a/ubuntu/maverick/applications/kvpnc/debian/copyright b/ubuntu/maverick/applications/kvpnc/debian/copyright new file mode 100644 index 000000000..d6c60aaf4 --- /dev/null +++ b/ubuntu/maverick/applications/kvpnc/debian/copyright @@ -0,0 +1,65 @@ +This package was debianized by Fathi Boudra <fboudra@free.fr> on +Thu, 26 Jan 2006 11:49:10 +0100. + +It was downloaded from http://home.gna.org/kvpnc + +Copyright Holder: Christoph Thielecke <crissi99@gmx.de> + +Copyright for ciscopasswddecoder : + (C) 2005 hal9000 <hal9000@evilscientists.de> + (C) 2005 Maurice Massar <vpnc@unix-ag.uni-kl.de> + (C) 2005 Christoph Thielecke <crissi99@gmx.de> + +Copyright for openvpn-kde-dialogs.pl: + Alon Bar-Lev <alon.barlev@gmail.com> + +kvpnc contains parts of code from klcc project: + Peter Simonsson <psn@linux.se> + +Copyright for kfeedback (user feedback form and mailing utilities) and +parts of code from kdirstat project: + Stefan Hundhammer <sh@suse.de> + +preferencesdialog contains parts of code from konversation project +(konvisettingsdialog.cpp) + (C) 2006 John Tapsell <johnflux@gmail.com> + (C) 2006 Eike Hein <hein@kde.org> + +kfeedback license: + + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL'. + +kvpnc license: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-2'. + diff --git a/ubuntu/maverick/applications/kvpnc/debian/docs b/ubuntu/maverick/applications/kvpnc/debian/docs new file mode 100644 index 000000000..724e08449 --- /dev/null +++ b/ubuntu/maverick/applications/kvpnc/debian/docs @@ -0,0 +1,2 @@ +README +TODO diff --git a/ubuntu/maverick/applications/kvpnc/debian/kvpnc-trinity.1 b/ubuntu/maverick/applications/kvpnc/debian/kvpnc-trinity.1 new file mode 100644 index 000000000..4111d5ff4 --- /dev/null +++ b/ubuntu/maverick/applications/kvpnc/debian/kvpnc-trinity.1 @@ -0,0 +1,69 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH KVPNC 1 "novembre 16, 2005" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp <n> insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +kvpnc \- vpn clients frontend for KDE +.SH SYNOPSIS +.B kvpnc +.RI [ options ] +.br +.SH DESCRIPTION +.\" TeX users may be more comfortable with the \fB<whatever>\fP and +.\" \fI<whatever>\fP escape sequences to invode bold face and italics, +.\" respectively. +\fBkvpnc\fP is a KDE frontend for various vpn clients. +.br +It supports : +.br + * Cisco-compatible VPN client (vpnc) +.br + * IPSec (freeswan, openswan, racoon) +.br + * Point-to-Point Tunneling Protocol (PPTP) client (pptp-linux) +.br + * Virtual Private Network daemon (openvpn) +.SH OPTIONS +All KDE and Qt programs accept some common command\-line options. +.br +Kvpnc has no application\-specific options. +.PP +.TP +\fB\-\-help\fR +Show help about options +.TP +\fB\-\-help\-qt\fR +Show Qt specific options +.TP +\fB\-\-help\-kde\fR +Show KDE specific options +.TP +\fB\-\-help\-all\fR +Show all options +.TP +\fB\-\-author\fR +Show author information +.TP +\fB\-v\fR, \fB\-\-version\fR +Show version information +.TP +\fB\-\-license\fR +Show license information +.SH AUTHOR +kvpnc was written by Christoph Thielecke <crissi99@gmx.de>. +.PP +This manual page was written by Fathi Boudra <fboudra@free.fr>, +for the Debian project (but may be used by others). diff --git a/ubuntu/maverick/applications/kvpnc/debian/menu b/ubuntu/maverick/applications/kvpnc/debian/menu new file mode 100644 index 000000000..1f3e59d31 --- /dev/null +++ b/ubuntu/maverick/applications/kvpnc/debian/menu @@ -0,0 +1,6 @@ +?package(kvpnc):\ + needs="X11"\ + section="Applications/Network/Communication"\ + title="kvpnc"\ + hints="KDE"\ + command="su-to-root -X -c kvpnc" diff --git a/ubuntu/maverick/applications/kvpnc/debian/patches/10_su-to-root_usage.diff b/ubuntu/maverick/applications/kvpnc/debian/patches/10_su-to-root_usage.diff new file mode 100644 index 000000000..9630fd3f8 --- /dev/null +++ b/ubuntu/maverick/applications/kvpnc/debian/patches/10_su-to-root_usage.diff @@ -0,0 +1,11 @@ +--- a/src/kvpnc.desktop ++++ b/src/kvpnc.desktop +@@ -18,7 +18,7 @@ + GenericName[xx]=xxVPN Client GUIxx + + Categories=Network;RemoteAccess;KDE;Qt +-Exec=kvpnc ++Exec=su-to-root -X -c /opt/trinity/bin/kvpnc + X-KDE-SubstituteUID=true + Icon=kvpnc + Type=Application diff --git a/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff new file mode 100644 index 000000000..70fd0192e --- /dev/null +++ b/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff @@ -0,0 +1,29 @@ +diff --git a/src/main.cpp b/src/main.cpp +index 7c45fcf..b933832 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -24,6 +24,7 @@ + #include <kmessagebox.h> + #include <kmainwindow.h> + #include <kapp.h> ++#include <kuser.h> + + #include <klocale.h> + #include <dcopclient.h> +@@ -134,11 +135,11 @@ int main ( int argc, char *argv[] ) + } + else + { +-// if (getenv("USER") != "root") +-// { +-// KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); +-// exit(0); +-// } ++ if (getenv("USER") != "root") ++ { ++ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); ++ exit(0); ++ } + + KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + diff --git a/ubuntu/maverick/applications/kvpnc/debian/patches/series b/ubuntu/maverick/applications/kvpnc/debian/patches/series new file mode 100644 index 000000000..09040ada9 --- /dev/null +++ b/ubuntu/maverick/applications/kvpnc/debian/patches/series @@ -0,0 +1,2 @@ +10_su-to-root_usage.diff +13_add_kuser_issuperuser.diff diff --git a/ubuntu/maverick/applications/kvpnc/debian/rules b/ubuntu/maverick/applications/kvpnc/debian/rules new file mode 100755 index 000000000..8e7f6fc6f --- /dev/null +++ b/ubuntu/maverick/applications/kvpnc/debian/rules @@ -0,0 +1,42 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/kde.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/utils.mk + +DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" +DEB_INSTALL_MANPAGES_kvpnc-trinity := debian/kvpnc-trinity.1 + +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_MANDIR := /opt/trinity/share/man +DEB_CONFIGURE_PREFIX := /opt/trinity +DEB_CONFIGURE_INFODIR := /opt/trinity/share/info + +cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) + +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde + +makebuilddir/kvpnc-trinity:: + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; + touch debian/stamp-cvs-make + +install/kvpnc-trinity:: + # fix script-not-executable + chmod 0755 debian/kvpnc-trinity/opt/trinity/share/apps/kvpnc/ping_check.sh + + # remove uneeded dir + rm -rf debian/kvpnc-trinity/opt/trinity/share/doc/kde/HTML/kvpnc + + # install desktop file in applications + install -D -p -m0644 src/kvpnc.desktop \ + debian/kvpnc-trinity/opt/trinity/share/applications/kde/kvpnc.desktop + +binary-post-install/kvpnc-trinity:: + rm -rf debian/kvpnc-trinity/opt/trinity/share/applnk/ + +clean:: + rm -f config.status config.log + find . -type f -name '*.gmo' | xargs rm -f diff --git a/ubuntu/maverick/applications/kvpnc/debian/watch b/ubuntu/maverick/applications/kvpnc/debian/watch new file mode 100644 index 000000000..5c0ec1d76 --- /dev/null +++ b/ubuntu/maverick/applications/kvpnc/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://download.gna.org/kvpnc/kvpnc-(0.*)\.tar\.bz2 debian svn-upgrade diff --git a/ubuntu/maverick/applications/tde-guidance/debian/changelog b/ubuntu/maverick/applications/tde-guidance/debian/changelog index f73cc1d80..ac2f03395 100644 --- a/ubuntu/maverick/applications/tde-guidance/debian/changelog +++ b/ubuntu/maverick/applications/tde-guidance/debian/changelog @@ -229,7 +229,7 @@ tde-guidance (0.8.0svn20080103-0ubuntu4) hardy; urgency=low tde-guidance (0.8.0svn20080103-0ubuntu3) hardy; urgency=low * Add Add kubuntu_09_mountconfig_no_extensions.patch to remove uneeded call - to pykdeextensions in mountconfig so that pyqt3 no longer needs to be + to pytdeextensions in mountconfig so that pyqt3 no longer needs to be patched to provide -dev files in the regular package (LP: #197867) * Add kubuntu_10_displayconfig_tryagain.patch so that if displayconfig thinks a proprietary driver is installed, but it can't find it, it @@ -618,7 +618,7 @@ tde-guidance (0.7.1~svn20061215-0ubuntu1) feisty; urgency=low tde-guidance (0.7.1~svn20061124-0ubuntu2) feisty; urgency=low - * Rebuilt against new pykde. + * Rebuilt against new pytde. -- Anthony Mercatante <tonio@ubuntu.com> Wed, 06 Dec 2006 23:40:32 +0100 @@ -1029,7 +1029,7 @@ tde-guidance (0.6.2-0ubuntu1) dapper; urgency=low tde-guidance (0.6.1-0ubuntu0) dapper; urgency=low * New release, sets a fixed DPI for Xft - * Add run time dependency on pykdeextensions + * Add run time dependency on pytdeextensions * Add kubuntu_03_userconfig_shebang.diff fix extra space * Change init script to run at S35, Malone No. 32268 diff --git a/ubuntu/maverick/applications/tde-guidance/debian/control b/ubuntu/maverick/applications/tde-guidance/debian/control index 8446115c3..392b99361 100644 --- a/ubuntu/maverick/applications/tde-guidance/debian/control +++ b/ubuntu/maverick/applications/tde-guidance/debian/control @@ -6,13 +6,13 @@ XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.de Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> Build-Depends: cdbs, debhelper (>= 5), chrpath, tdelibs4-trinity-dev, libpythonize0-trinity-dev, libtool, libxml2-utils, libxss-dev, libxxf86vm-dev, - pykdeextensions-trinity, pyqt-tools, python-qt3 (>= 3.17.2-1ubuntu2), python-trinity-trinity, python-trinity-trinity-dev, python-sip4-dev, - python-support (>= 0.6), python2.6 (>= 2.5), python2.6-dev (>= 2.5), x11proto-scrnsaver-dev, python-qt-dev, hwdata + pytdeextensions-trinity, pytqt-tools, python-tqt, python-trinity-trinity, python-trinity-trinity-dev, python-sip4-dev, + python-support (>= 0.6), python2.6 (>= 2.5), python2.6-dev (>= 2.5), x11proto-scrnsaver-dev, python-tqt-dev, hwdata Standards-Version: 3.8.4 Package: tde-guidance-trinity Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pykdeextensions-trinity, python-trinity-trinity, sysv-rc, guidance-backends-trinity, hwdata, python (>= 2.5), python-dev (>= 2.5) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pytdeextensions-trinity, python-trinity-trinity, sysv-rc, guidance-backends-trinity, hwdata, python (>= 2.5), python-dev (>= 2.5) Replaces: tde-guidance-kde3 (<< 4:3.5.13) Breaks: tde-guidance-kde3 (<< 4:3.5.13) Conflicts: guidance-power-manager, tde-guidance-powermanager diff --git a/ubuntu/maverick/applications/tde-guidance/debian/rules b/ubuntu/maverick/applications/tde-guidance/debian/rules index 2bb582451..f3f46453f 100755 --- a/ubuntu/maverick/applications/tde-guidance/debian/rules +++ b/ubuntu/maverick/applications/tde-guidance/debian/rules @@ -175,7 +175,7 @@ clean:: fi common-install-prehook-impl:: - # generate form implementation using pykde user interface compiler + # generate form implementation using pytde user interface compiler (cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n guidance_power_manager_ui.ui) (cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n tooltip.ui) (cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n notify.ui) diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/changelog b/ubuntu/maverick/dependencies/libart-lgpl/debian/changelog new file mode 100644 index 000000000..d9238f241 --- /dev/null +++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/changelog @@ -0,0 +1,252 @@ +libart-lgpl (2.3.22-0ubuntu0) lucid; urgency=low + + * Build patched/maintained TDE version instead of unmaintained upstream + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Wed, 07 Dec 2011 17:50:00 -0600 + +libart-lgpl (2.3.21-1) unstable; urgency=low + + [ Loic Minier ] + * Properly anchor package name regexp. + + [ Sebastian Dröge ] + * New upstream bugfix release: + + debian/control.in: + - Update Standards-Version and build-depend on autotools-dev. + + debian/patches/70_relibtoolize.patch: + - Regenerated for the new version. + + -- Sebastian Dröge <slomo@debian.org> Sun, 25 Apr 2010 11:35:30 +0200 + +libart-lgpl (2.3.20-2) unstable; urgency=low + + * Let libart-2.0-dev depend on shlibs:Depends. + * Extract library package name from control instead of hardcoding it in + rules. + * New patch, 60_libart-config-static, adds --static flag to libart2-config + to avoid -lm in the output of --libs; please consider switching to + pkg-config instead; GNOME #531278; closes: #375812. + * Fix copyright to state LGPL 2 or later as checked with licensecheck; + thanks Thomas Viehmann; closes: #478766. + + -- Loic Minier <lool@dooz.org> Sat, 03 May 2008 22:21:18 +0200 + +libart-lgpl (2.3.20-1) unstable; urgency=low + + [ Kilian Krause ] + * Use binary:version and source:Version for binNMU-safe uploads as + added in dpkg-dev 1.13.19. Add to Build-Depends accordingly. + + [ Sebastian Dröge ] + * New upstream bugfix release: + + debian/patches/90_fix-headers-for-cplusplus.patch: + - Dropped, merged upstream. + + debian/patches/70_relibtoolize.patch: + - Regenerated for the new version. + * debian/control.in: + + Update Standards-Version to 3.7.3, no additional changes needed. + + -- Sebastian Dröge <slomo@debian.org> Wed, 30 Jan 2008 13:38:26 +0100 + +libart-lgpl (2.3.19-3) unstable; urgency=low + + * Upload to unstable; drop check-dist include. + * Wrap build-deps and deps. + * Drop libc6-dev dep in libart-2.0-dev. + * Add ${misc:Depends}. + + -- Loic Minier <lool@dooz.org> Wed, 11 Apr 2007 16:23:30 +0200 + +libart-lgpl (2.3.19-2) experimental; urgency=high + + * Use clean-la.mk and require gnome-pkg-tools 0.7. + * New patch, 90_fix-headers-for-cplusplus.patch, fixes linking with C++ + applications; GNOME #413197; SVN r278; closes: #417568. + * Rename patch 070_relibtoolize to 70_relibtoolize. + + -- Loic Minier <lool@dooz.org> Tue, 03 Apr 2007 15:23:09 +0200 + +libart-lgpl (2.3.19-1) experimental; urgency=low + + * Add a get-orig-source target to retrieve the upstream tarball. + * Add complete licensing information in copyright file. + * Update upstream URL in copyright file. + * Bump up Standards-Version to 3.7.2. + * Use debian/libart-2.0-dev.manpages instead of + DEB_INSTALL_MANPAGES_libart-2.0-dev. + * Use HTTP in watch file and track all branches. + * Include CDBS's utils. + * New upstream releases with API additions. + - Include the new check-dist Makefile to prevent accidental uploads to + unstable; bump build-dep on gnome-pkg-tools to >= 0.10. + - Set shlibs to >= 2.3.18. + - Update and rename relibtoolizing patch, 070_relibtoolize. + * Drop useless libart-2.0-dev.files. + * Drop build-dep on libc6-dev | libc-dev; doh. + * Bump up DebHelper compatibility level to 5. + + -- Loic Minier <lool@dooz.org> Wed, 28 Feb 2007 15:20:45 +0100 + +libart-lgpl (2.3.17-1) unstable; urgency=low + + * GNOME Team Upload. + * New upstream release. + * debian/patches/001_relibtoolize.patch: + - updated. + * debian/watch: + - added. + + -- Sebastien Bacher <seb128@debian.org> Tue, 25 Jan 2005 23:51:07 +0100 + +libart-lgpl (2.3.16-6) unstable; urgency=low + + * Relibtoolize (Closes: #260639) + + -- Ondřej Surý <ondrej@debian.org> Wed, 21 Jul 2004 17:27:15 +0200 + +libart-lgpl (2.3.16-5) unstable; urgency=low + + * Set shlibs version to current. + + -- Ondřej Surý <ondrej@debian.org> Mon, 19 Apr 2004 18:49:50 +0200 + +libart-lgpl (2.3.16-4) unstable; urgency=low + + * Gnome Team upload. + * Setting again the shlibs file. + + -- Sebastien Bacher <seb128@debian.org> Thu, 15 Apr 2004 19:35:09 +0200 + +libart-lgpl (2.3.16-3) unstable; urgency=low + + * New maintainer (Closes: #238891) + + -- Ondřej Surý <ondrej@debian.org> Sat, 20 Mar 2004 15:14:54 +0100 + +libart-lgpl (2.3.16-2) unstable; urgency=low + + * Orphaned package. + + -- Christian Marillat <marillat@debian.org> Fri, 19 Mar 2004 16:06:24 +0100 + +libart-lgpl (2.3.16-1) unstable; urgency=low + + * New upstream release. + * Fix an "assertion failed" who crash gdm (Closes: #208919) + + -- Christian Marillat <marillat@debian.org> Wed, 10 Sep 2003 09:48:22 +0200 + +libart-lgpl (2.3.15-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat <marillat@debian.org> Tue, 2 Sep 2003 14:14:16 +0200 + +libart-lgpl (2.3.14-2) unstable; urgency=low + + * Compiled with -mieee for alpha (Closes: #207748) + + -- Christian Marillat <marillat@debian.org> Fri, 29 Aug 2003 19:24:46 +0200 + +libart-lgpl (2.3.14-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat <marillat@debian.org> Fri, 8 Aug 2003 10:23:11 +0200 + +libart-lgpl (2.3.13-1) unstable; urgency=low + + * new upstream release. + + -- Christian Marillat <marillat@debian.org> Fri, 11 Jul 2003 14:59:55 +0200 + +libart-lgpl (2.3.12-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat <marillat@debian.org> Mon, 5 May 2003 12:58:07 +0200 + +libart-lgpl (2.3.11-4) unstable; urgency=low + + * Update section + + -- Christian Marillat <marillat@debian.org> Tue, 1 Apr 2003 18:52:25 +0200 + +libart-lgpl (2.3.11-3) unstable; urgency=low + + * Add a patche to fix configure for mipsel + + -- Christian Marillat <marillat@debian.org> Sat, 18 Jan 2003 10:11:41 +0100 + +libart-lgpl (2.3.11-2) unstable; urgency=low + + * Update description (Closes: #177003) + + -- Christian Marillat <marillat@debian.org> Fri, 17 Jan 2003 21:27:15 +0100 + +libart-lgpl (2.3.11-1) unstable; urgency=low + + * New upstream release. + * Bump Standards-Version to 3.5.8 + + -- Christian Marillat <marillat@debian.org> Tue, 7 Jan 2003 19:40:48 +0100 + +libart-lgpl (2.3.10-4) unstable; urgency=low + + * Update to standards version 3.5.7 + + -- Christian Marillat <marillat@debian.org> Sat, 21 Sep 2002 14:41:00 +0200 + +libart-lgpl (2.3.10-3) unstable; urgency=low + + * Replace libc6-dev by libc-dev for -dev package. + + -- Christian Marillat <marillat@debian.org> Thu, 5 Sep 2002 18:25:28 +0200 + +libart-lgpl (2.3.10-2) unstable; urgency=low + + * Move libc6-dev dependency in the -dev package. + + -- Christian Marillat <marillat@debian.org> Thu, 8 Aug 2002 14:34:51 +0200 + +libart-lgpl (2.3.10-1) unstable; urgency=low + + * New upstream release (Closes: #151622) + + -- Christian Marillat <marillat@debian.org> Tue, 2 Jul 2002 01:38:03 +0200 + +libart-lgpl (2.3.9-2) unstable; urgency=low + + * debian/control add a versioned dependency for the -dev package + (Closes: #151369) + + -- Christian Marillat <marillat@debian.org> Sat, 29 Jun 2002 17:39:39 +0200 + +libart-lgpl (2.3.9-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat <marillat@debian.org> Tue, 25 Jun 2002 10:26:05 +0200 + +libart-lgpl (2.3.8-2) unstable; urgency=low + + * Add support for DEB_HOST_GNU_TYPE DEB_BUILD_GNU_TYPE and + DEB_BUILD_OPTIONS + + -- Christian Marillat <marillat@debian.org> Wed, 15 May 2002 22:28:40 +0200 + +libart-lgpl (2.3.8-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat <marillat@debian.org> Mon, 14 Jan 2002 10:58:19 +0100 + +libart-lgpl (2.3.7-1) unstable; urgency=low + + * Initial Release. + + -- Christian Marillat <marillat@debian.org> Mon, 19 Nov 2001 18:29:06 +0100 + +Local variables: +mode: debian-changelog +End: diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/compat b/ubuntu/maverick/dependencies/libart-lgpl/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/compat @@ -0,0 +1 @@ +5 diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/control b/ubuntu/maverick/dependencies/libart-lgpl/debian/control new file mode 100644 index 000000000..b797b51d4 --- /dev/null +++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/control @@ -0,0 +1,42 @@ +# This file is autogenerated. DO NOT EDIT! +# +# Modifications should be made to debian/control.in instead. +# This file is regenerated automatically in the clean target. + +Source: libart-lgpl +Section: devel +Priority: optional +Maintainer: Josselin Mouette <joss@debian.org> +Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Loic Minier <lool@dooz.org>, Sebastian Dröge <slomo@debian.org>, Sebastien Bacher <seb128@debian.org> +Standards-Version: 3.8.4 +Build-Depends: debhelper (>= 5), + gnome-pkg-tools (>= 0.7), + cdbs, + dpkg-dev (>= 1.13.19), + automake, autoconf, libtool, libltdl-dev + +Package: libart-2.0-2 +Architecture: any +Section: libs +Depends: ${misc:Depends}, + ${shlibs:Depends} +Description: Library of functions for 2D graphics - runtime files + A library of functions for 2D graphics supporting a superset of the + PostScript imaging model, designed to be integrated with graphics, artwork, + and illustration programs. It is written in optimized C, and is fully + compatible with C++. With a small footprint of 10,000 lines of code, it is + especially suitable for embedded applications. + +Package: libart-2.0-dev +Architecture: any +Section: libdevel +Depends: ${misc:Depends}, + ${shlibs:Depends}, + libart-2.0-2 (= ${binary:Version}), + pkg-config +Description: Library of functions for 2D graphics - development files + A library of functions for 2D graphics supporting a superset of the + PostScript imaging model, designed to be integrated with graphics, artwork, + and illustration programs. It is written in optimized C, and is fully + compatible with C++. With a small footprint of 10,000 lines of code, it is + especially suitable for embedded applications. diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/control.in b/ubuntu/maverick/dependencies/libart-lgpl/debian/control.in new file mode 100644 index 000000000..12f7ab436 --- /dev/null +++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/control.in @@ -0,0 +1,37 @@ +Source: libart-lgpl +Section: devel +Priority: optional +Maintainer: Josselin Mouette <joss@debian.org> +Uploaders: @GNOME_TEAM@ +Standards-Version: 3.8.4 +Build-Depends: debhelper (>= 5), + gnome-pkg-tools (>= 0.7), + cdbs, + dpkg-dev (>= 1.13.19), + autotools-dev + +Package: libart-2.0-2 +Architecture: any +Section: libs +Depends: ${misc:Depends}, + ${shlibs:Depends} +Description: Library of functions for 2D graphics - runtime files + A library of functions for 2D graphics supporting a superset of the + PostScript imaging model, designed to be integrated with graphics, artwork, + and illustration programs. It is written in optimized C, and is fully + compatible with C++. With a small footprint of 10,000 lines of code, it is + especially suitable for embedded applications. + +Package: libart-2.0-dev +Architecture: any +Section: libdevel +Depends: ${misc:Depends}, + ${shlibs:Depends}, + libart-2.0-2 (= ${binary:Version}), + pkg-config +Description: Library of functions for 2D graphics - development files + A library of functions for 2D graphics supporting a superset of the + PostScript imaging model, designed to be integrated with graphics, artwork, + and illustration programs. It is written in optimized C, and is fully + compatible with C++. With a small footprint of 10,000 lines of code, it is + especially suitable for embedded applications. diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/copyright b/ubuntu/maverick/dependencies/libart-lgpl/debian/copyright new file mode 100644 index 000000000..6c6d40347 --- /dev/null +++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/copyright @@ -0,0 +1,27 @@ +This package was debianized by Christian Marillat <marillat@debian.org> on +Mon, 19 Nov 2001 18:29:06 +0100 + +It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/ + +Upstream Author: Raph Levien <raph@acm.org> + +Copyright: 1998, 1999, 2000, 2001 Raph Levien <raph@acm.org> + +License: + + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL'. diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/libart-2.0-2.install b/ubuntu/maverick/dependencies/libart-lgpl/debian/libart-2.0-2.install new file mode 100644 index 000000000..be04efa71 --- /dev/null +++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/libart-2.0-2.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libart_lgpl_2.so.* diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/libart-2.0-dev.install b/ubuntu/maverick/dependencies/libart-lgpl/debian/libart-2.0-dev.install new file mode 100644 index 000000000..154d573e6 --- /dev/null +++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/libart-2.0-dev.install @@ -0,0 +1,6 @@ +debian/tmp/usr/include +debian/tmp/usr/lib/pkgconfig +debian/tmp/usr/bin/libart2-config +debian/tmp/usr/lib/libart_lgpl_2.a +debian/tmp/usr/lib/libart_lgpl_2.la +debian/tmp/usr/lib/libart_lgpl_2.so diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/libart-2.0-dev.manpages b/ubuntu/maverick/dependencies/libart-lgpl/debian/libart-2.0-dev.manpages new file mode 100644 index 000000000..d9f908cc0 --- /dev/null +++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/libart-2.0-dev.manpages @@ -0,0 +1 @@ +debian/libart2-config.1 diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/libart2-config.1 b/ubuntu/maverick/dependencies/libart-lgpl/debian/libart2-config.1 new file mode 100644 index 000000000..7439b2923 --- /dev/null +++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/libart2-config.1 @@ -0,0 +1,52 @@ +.\" This manpage has been automatically generated by docbook2man +.\" from a DocBook document. This tool can be found at: +.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> +.\" Please send any bug reports, improvements, comments, patches, +.\" etc. to Steve Cheng <steve@ggi-project.org>. +.TH "LIBART2-CONFIG" "1" "08 August 2003" "" "" +.SH NAME +libart2-config \- script to get information about the installed version of libart 2.x +.SH SYNOPSIS + +\fBlibart2-config\fR [ \fB --prefix\fI[=DIR]\fB \fR ] [ \fB --exec-prefix\fI[=DIR]\fB \fR ] [ \fB --libs \fR ] [ \fB --cflags \fR ] [ \fB --version \fR ] + +.SH "DESCRIPTION" +.PP +\fBlibart2-config\fR is a tool that is used to determine +the compiler and linker flags that should be used to compile and +link programs that use \fIlibart\fR library. +.SH "OPTIONS" +.TP +\fB--prefix=PREFIX\fR +If specified, use \fIPREFIX\fR instead +of the installation prefix that +\fIlibart\fR was built with when computing +the output for the \fB--cflags\fR and +\fB--libs\fR options. This option is also used for +the exec prefix if \fB--exec-prefix\fR was +not specified. This option must be specified before any +\fB--libs\fR or \fB--cflags\fR options. +.TP +\fB--exec-prefix=PREFIX\fR +If specified, use \fIPREFIX\fR instead +of the installation exec prefix that +\fIlibart\fR was built with when computing +the output for the \fB--cflags\fR and +\fB--libs\fR options. This option must be specified +before any \fB--libs\fR or \fB--cflags\fR options. +.TP +\fB--libs\fR +Print the linker flags that are necessary to link a +\fIlibart\fR program. +.TP +\fB--cflags\fR +Print the compiler flags that are necessary to compile a +\fIlibart\fR program. +.TP +\fB--version\fR +Print the currently installed version of +\fIlibart\fR on the standard output. +.SH "AUTHOR" +.PP +This manual page was written by Christian Marillat <marillat@debian.org> for +the Debian GNU/Linux system (but may be used by others). diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/rules b/ubuntu/maverick/dependencies/libart-lgpl/debian/rules new file mode 100755 index 000000000..4390434f7 --- /dev/null +++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/rules @@ -0,0 +1,22 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +makebuilddir/kvpnc-trinity:: + cp -Rp /usr/share/aclocal/libtool.m4 libtool.m4.in + cp -Rp /usr/share/libtool/config/ltmain.sh ltmain.sh + autoconf + automake + +libart-2.0-N := $(shell sed -rn 's/^Package:[[:space:]]*(libart-2\.0-[0-9]+)[[:space:]]*$$/\1/p' debian/control) + +GNOME_MODULE := libart_lgpl + +DEB_DH_MAKESHLIBS_ARGS_$(libart-2.0-N) += -V '$(libart-2.0-N)(>= 2.3.18)' + diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/watch b/ubuntu/maverick/dependencies/libart-lgpl/debian/watch new file mode 100644 index 000000000..8acf72053 --- /dev/null +++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/watch @@ -0,0 +1,4 @@ +version=2 +http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/([\d\.]+)/ \ + libart_lgpl-(.*)\.tar\.gz \ + debian uupdate diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/control b/ubuntu/maverick/dependencies/python-tqt/debian/control index 79b5b4582..dffd4d77c 100644 --- a/ubuntu/maverick/dependencies/python-tqt/debian/control +++ b/ubuntu/maverick/dependencies/python-tqt/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org> -Build-Depends: debhelper (>= 6.0.7~), python-all-dev (>= 2.3.5-10), libtqt3-mt-dev, tqt3-dev-tools, tqt3-apps-dev, python-sip-dev (>= 4.10.0-2ubuntu1), libtqscintilla-dev, python-support (>= 0.7.1), python-sip-dbg, python-all-dbg +Build-Depends: debhelper (>= 6.0.7~), python-all-dev (>= 2.3.5-10), libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python-sip-dev (>= 4.10.0-2ubuntu1), libtqscintilla-dev, python-support (>= 0.7.1), python-sip-dbg, python-all-dbg Standards-Version: 3.8.4 Package: python-tqt diff --git a/ubuntu/maverick/dependencies/qt3/debian/changelog b/ubuntu/maverick/dependencies/qt3/debian/changelog index 24e9a2fab..018cd497a 100644 --- a/ubuntu/maverick/dependencies/qt3/debian/changelog +++ b/ubuntu/maverick/dependencies/qt3/debian/changelog @@ -499,7 +499,7 @@ qt-x11-free (3:3.3.7-1ubuntu3) feisty; urgency=low qt-x11-free (3:3.3.7-1ubuntu2) feisty; urgency=low * Remove kubuntu_05_gcc_hidden_visibility.dpatch from 00list - of patches, it caused pyqt and pykde to hide init methods which + of patches, it caused pyqt and pytde to hide init methods which are needed to load modules and it broke skim. -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 4 Dec 2006 13:48:56 +0000 diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/pykdeextensions-trinity.install b/ubuntu/maverick/libraries/pykdeextensions/debian/pykdeextensions-trinity.install deleted file mode 100644 index 694850908..000000000 --- a/ubuntu/maverick/libraries/pykdeextensions/debian/pykdeextensions-trinity.install +++ /dev/null @@ -1,7 +0,0 @@ -usr/lib/python*/dist-packages -opt/trinity/share/apps/pykdeextensions/AUTHORS -opt/trinity/share/apps/pykdeextensions/ChangeLog -opt/trinity/share/apps/pykdeextensions/INSTALL -opt/trinity/share/apps/pykdeextensions/NEWS -opt/trinity/share/apps/pykdeextensions/app_templates -opt/trinity/share/doc/kde/HTML/en/pykdeextensions diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/pykdeextensions-trinity.lintian-overrides b/ubuntu/maverick/libraries/pykdeextensions/debian/pykdeextensions-trinity.lintian-overrides deleted file mode 100644 index 06b60205b..000000000 --- a/ubuntu/maverick/libraries/pykdeextensions/debian/pykdeextensions-trinity.lintian-overrides +++ /dev/null @@ -1,10 +0,0 @@ -pykdeextensions: desktop-entry-contains-unknown-key ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop:4 name[en_GB] -pykdeextensions: desktop-command-not-in-package ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop kcmshell -pykdeextensions: desktop-entry-invalid-category QT ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop -pykdeextensions: desktop-entry-invalid-category X-KDE-settings-system ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop -pykdeextensions: desktop-entry-lacks-main-category ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop -pykdeextensions: desktop-command-not-in-package ./usr/share/apps/pykdeextensions/app_templates/kdeapp/src/kdeapp.desktop $APPNAMELC$ -pykdeextensions: desktop-command-not-in-package ./usr/share/apps/pykdeextensions/app_templates/kdeutility/src/kdeutility.desktop $APPNAMELC$ - -pykdeextensions: executable-not-elf-or-script ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py -pykdeextensions: executable-not-elf-or-script ./usr/share/apps/pykdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/README.Debian b/ubuntu/maverick/libraries/pytdeextensions/debian/README.Debian index b0302c211..b0302c211 100644 --- a/ubuntu/maverick/libraries/pykdeextensions/debian/README.Debian +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/README.Debian diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/changelog b/ubuntu/maverick/libraries/pytdeextensions/debian/changelog index 92b728999..4f1eb90be 100644 --- a/ubuntu/maverick/libraries/pykdeextensions/debian/changelog +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/changelog @@ -1,23 +1,23 @@ -pykdeextensions-trinity (0.4.0-6ubuntu6) karmic; urgency=low +pytdeextensions-trinity (0.4.0-6ubuntu6) karmic; urgency=low * Karmic rebuild -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 02 July 2009 16:08:00 -0600 -pykdeextensions-trinity (0.4.0-5ubuntu5) intrepid; urgency=low +pytdeextensions-trinity (0.4.0-5ubuntu5) intrepid; urgency=low * Added -trinity suffix -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Wed, 03 Dec 2008 21:38:00 -0600 -pykdeextensions (0.4.0-5ubuntu3) hardy; urgency=low +pytdeextensions (0.4.0-5ubuntu3) hardy; urgency=low * Re-add libpythoniz0 dependency on python-dev to work around libpythonize0 dlopening libpython2.5.so and not ...so.1 (LP: #179668) -- Scott Kitterman <scott@kitterman.com> Sat, 01 Mar 2008 11:15:08 -0500 -pykdeextensions (0.4.0-5ubuntu2) hardy; urgency=low +pytdeextensions (0.4.0-5ubuntu2) hardy; urgency=low * debian/control: - remove the python-all-dev dependency in libpythonize0 @@ -26,14 +26,14 @@ pykdeextensions (0.4.0-5ubuntu2) hardy; urgency=low -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 17 Dec 2007 12:38:49 +0100 -pykdeextensions (0.4.0-5ubuntu1) hardy; urgency=low +pytdeextensions (0.4.0-5ubuntu1) hardy; urgency=low * Merge with Debian, remaining changes: - libpythonize0 depends on python2.5-dev, it tries to load .so file -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 29 Nov 2007 17:59:47 +0000 -pykdeextensions (0.4.0-5) unstable; urgency=low +pytdeextensions (0.4.0-5) unstable; urgency=low * Add python-qt-dev build dependency. pyqtconfig moved from python-qt3 to python-qt-dev. (Closes: #439504) @@ -44,17 +44,17 @@ pykdeextensions (0.4.0-5) unstable; urgency=low * Remove *.py[co] files. * lintian cleanup: substvar-source-version-is-deprecated. Use ${binary:Version}. - * Make pykdeextensions package arch all. + * Make pytdeextensions package arch all. -- Fathi Boudra <fboudra@free.fr> Sun, 07 Oct 2007 12:06:15 +0200 -pykdeextensions (0.4.0-4ubuntu4) gutsy; urgency=low +pytdeextensions (0.4.0-4ubuntu4) gutsy; urgency=low * Fix depends to python2.5-dev -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 25 Sep 2007 18:48:45 +0100 -pykdeextensions (0.4.0-4ubuntu3) gutsy; urgency=low +pytdeextensions (0.4.0-4ubuntu3) gutsy; urgency=low * Add libpython2.5-dev as a depends for libpythonize0, it wants to load libpython2.5.so, reverts change from previous upload, LP: #84689, @@ -62,7 +62,7 @@ pykdeextensions (0.4.0-4ubuntu3) gutsy; urgency=low -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 25 Sep 2007 16:32:17 +0100 -pykdeextensions (0.4.0-4ubuntu2) gutsy; urgency=low +pytdeextensions (0.4.0-4ubuntu2) gutsy; urgency=low * Fix build failure, build-depend on python-qt-dev. * Use the unversioned python interpreter for scripts. @@ -71,14 +71,14 @@ pykdeextensions (0.4.0-4ubuntu2) gutsy; urgency=low -- Matthias Klose <doko@ubuntu.com> Wed, 29 Aug 2007 20:48:25 +0000 -pykdeextensions (0.4.0-4ubuntu1) gutsy; urgency=low +pytdeextensions (0.4.0-4ubuntu1) gutsy; urgency=low * Merge with Debian, remaining changes: - build on python 2.5 -- Jonathan Riddell <jriddell@ubuntu.com> Sun, 03 Jun 2007 13:51:42 +0100 -pykdeextensions (0.4.0-4) unstable; urgency=low +pytdeextensions (0.4.0-4) unstable; urgency=low * Update pyversions. Force to build with python2.4 only. (Closes: #424505) * Remove python-all-dev build dependency. Replaced by python-dev. @@ -86,7 +86,7 @@ pykdeextensions (0.4.0-4) unstable; urgency=low -- Fathi Boudra <fboudra@free.fr> Wed, 16 May 2007 11:02:06 +0200 -pykdeextensions (0.4.0-3ubuntu1) feisty; urgency=low +pytdeextensions (0.4.0-3ubuntu1) feisty; urgency=low * Force to build with python2.5. * FIXME: The package is unlikely to work with python2.4; maybe @@ -94,20 +94,20 @@ pykdeextensions (0.4.0-3ubuntu1) feisty; urgency=low -- Matthias Klose <doko@ubuntu.com> Sun, 14 Jan 2007 16:42:27 +0000 -pykdeextensions (0.4.0-3) unstable; urgency=low +pytdeextensions (0.4.0-3) unstable; urgency=low * Converted package to python-support * Added pycompat and pyversions * Force to use python2.4 (Closes: #375618) * Added to Build-Depends: python-support, python-all-dev, tdelibs4c2a (for kde-config) - * Updated libpythonize0-dev, libpythonize0, and pykdextensions install files + * Updated libpythonize0-dev, libpythonize0, and pytdextensions install files * Cleaned up rules * Added 12_force_python2.4_script.diff to force python2.4 in scripts -- Fathi Boudra <fboudra@free.fr> Thu, 29 Jun 2006 15:41:39 +0200 -pykdeextensions (0.4.0-2) unstable; urgency=low +pytdeextensions (0.4.0-2) unstable; urgency=low * Converted package to cdbs * Added 2 patches (thanks to Jonathan Riddell) @@ -118,7 +118,7 @@ pykdeextensions (0.4.0-2) unstable; urgency=low -- Fathi Boudra <fboudra@free.fr> Tue, 6 Jun 2006 08:56:40 +0200 -pykdeextensions (0.4.0-1) unstable; urgency=low +pytdeextensions (0.4.0-1) unstable; urgency=low [ Fathi Boudra ] * Initial Debian release Closes: #340141 diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/compat b/ubuntu/maverick/libraries/pytdeextensions/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/compat @@ -0,0 +1 @@ +5 diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/control b/ubuntu/maverick/libraries/pytdeextensions/debian/control index d82091f2d..9a9301d42 100644 --- a/ubuntu/maverick/libraries/pykdeextensions/debian/control +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/control @@ -1,25 +1,25 @@ -Source: pykdeextensions-trinity +Source: pytdeextensions-trinity Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, tdelibs4c2a-trinity, libtool, - libxml2-utils, libxrandr-dev, libxxf86vm-dev, pyqt-tools, python-trinity-trinity, - python-qt-dev, python-sip4-dev, python-support (>= 0.6), python2.6, python2.6-dev + libxml2-utils, libxrandr-dev, libxxf86vm-dev, pytqt-tools, python-trinity-trinity, + python-tqt-dev, python-sip4-dev, python-support (>= 0.6), python2.6, python2.6-dev Standards-Version: 3.8.4 -Package: pykdeextensions-trinity +Package: pytdeextensions-trinity Architecture: all Depends: ${python:Depends} -Replaces: pykdeextensions-kde3 (<< 4:3.5.13) -Breaks: pykdeextensions-kde3 (<< 4:3.5.13) -Conflicts: pykdeextensions +Replaces: pytdeextensions-kde3 (<< 4:3.5.13) +Breaks: pytdeextensions-kde3 (<< 4:3.5.13) +Conflicts: pytdeextensions Provides: ${python:Provides} Description: Python packages to support KDE applications (scripts) [Trinity] PyKDE Extensions is a collection of software and Python packages to support the creation and installation of KDE applications. . - Homepage: http://www.simonzone.com/software/pykdeextensions + Homepage: http://www.simonzone.com/software/pytdeextensions Package: libpythonize0-trinity-dev Architecture: any @@ -33,7 +33,7 @@ Description: Python packages to support KDE applications (development) [Trinity] . This package contains the libpythonize development files. . - Homepage: http://www.simonzone.com/software/pykdeextensions + Homepage: http://www.simonzone.com/software/pytdeextensions Package: libpythonize0-trinity Architecture: any @@ -48,4 +48,4 @@ Description: Python packages to support KDE applications (library) [Trinity] . This package contains the libpythonize library files. . - Homepage: http://www.simonzone.com/software/pykdeextensions + Homepage: http://www.simonzone.com/software/pytdeextensions diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/copyright b/ubuntu/maverick/libraries/pytdeextensions/debian/copyright index a90a21587..9ed7bf6cd 100644 --- a/ubuntu/maverick/libraries/pykdeextensions/debian/copyright +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/copyright @@ -1,9 +1,9 @@ This package was debianized by Fathi Boudra <fboudra@free.fr> on Wed, 27 Jul 2005 20:19:26 +0200. -It was downloaded from <http://www.simonzone.com/software/pykdeextensions> +It was downloaded from <http://www.simonzone.com/software/pytdeextensions> -Application templates and pykde helper modules copyright: +Application templates and pytde helper modules copyright: Simon Edwards <simon@simonzone.com> License: diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/docs b/ubuntu/maverick/libraries/pytdeextensions/debian/docs index e845566c0..e845566c0 100644 --- a/ubuntu/maverick/libraries/pykdeextensions/debian/docs +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/docs diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/libpythonize0-trinity-dev.install b/ubuntu/maverick/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install index f50fc4e15..f50fc4e15 100644 --- a/ubuntu/maverick/libraries/pykdeextensions/debian/libpythonize0-trinity-dev.install +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/libpythonize0-trinity.install b/ubuntu/maverick/libraries/pytdeextensions/debian/libpythonize0-trinity.install index 48601d2d0..48601d2d0 100644 --- a/ubuntu/maverick/libraries/pykdeextensions/debian/libpythonize0-trinity.install +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/libpythonize0-trinity.install diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/patches/.gitignore b/ubuntu/maverick/libraries/pytdeextensions/debian/patches/.gitignore index e69de29bb..e69de29bb 100644 --- a/ubuntu/maverick/libraries/pykdeextensions/debian/patches/.gitignore +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/patches/.gitignore diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/pycompat b/ubuntu/maverick/libraries/pytdeextensions/debian/pycompat index 0cfbf0888..0cfbf0888 100644 --- a/ubuntu/maverick/libraries/pykdeextensions/debian/pycompat +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/pycompat diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/pytdeextensions-trinity.install b/ubuntu/maverick/libraries/pytdeextensions/debian/pytdeextensions-trinity.install new file mode 100644 index 000000000..d8b987d87 --- /dev/null +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/pytdeextensions-trinity.install @@ -0,0 +1,7 @@ +usr/lib/python*/dist-packages +opt/trinity/share/apps/pytdeextensions/AUTHORS +opt/trinity/share/apps/pytdeextensions/ChangeLog +opt/trinity/share/apps/pytdeextensions/INSTALL +opt/trinity/share/apps/pytdeextensions/NEWS +opt/trinity/share/apps/pytdeextensions/app_templates +opt/trinity/share/doc/kde/HTML/en/pytdeextensions diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides b/ubuntu/maverick/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides new file mode 100644 index 000000000..3b34d51a5 --- /dev/null +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides @@ -0,0 +1,10 @@ +pytdeextensions: desktop-entry-contains-unknown-key ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop:4 name[en_GB] +pytdeextensions: desktop-command-not-in-package ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop kcmshell +pytdeextensions: desktop-entry-invalid-category QT ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop +pytdeextensions: desktop-entry-invalid-category X-KDE-settings-system ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop +pytdeextensions: desktop-entry-lacks-main-category ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop +pytdeextensions: desktop-command-not-in-package ./usr/share/apps/pytdeextensions/app_templates/kdeapp/src/kdeapp.desktop $APPNAMELC$ +pytdeextensions: desktop-command-not-in-package ./usr/share/apps/pytdeextensions/app_templates/kdeutility/src/kdeutility.desktop $APPNAMELC$ + +pytdeextensions: executable-not-elf-or-script ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py +pytdeextensions: executable-not-elf-or-script ./usr/share/apps/pytdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/python-distutils-jaunty.mk b/ubuntu/maverick/libraries/pytdeextensions/debian/python-distutils-jaunty.mk index 9c5e5211f..9c5e5211f 100644 --- a/ubuntu/maverick/libraries/pykdeextensions/debian/python-distutils-jaunty.mk +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/python-distutils-jaunty.mk diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/pyversions b/ubuntu/maverick/libraries/pytdeextensions/debian/pyversions index b3dc41ebc..b3dc41ebc 100644 --- a/ubuntu/maverick/libraries/pykdeextensions/debian/pyversions +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/pyversions diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/rules b/ubuntu/maverick/libraries/pytdeextensions/debian/rules index 49c03b6ab..1acb32f7d 100755 --- a/ubuntu/maverick/libraries/pykdeextensions/debian/rules +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/rules @@ -18,14 +18,14 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde -install/pykdeextensions-trinity:: +install/pytdeextensions-trinity:: # We have no idea if the built product is site-packages or dist-packages cd debian/tmp/usr/lib/python*/ && mv site-packages/ dist-packages/ || echo "site-packages --> dist-packages" rm -rf debian/tmp/usr/lib/python*/site-packages/ # install lintian overrides - install -D -p -m0644 debian/pykdeextensions-trinity.lintian-overrides \ - debian/pykdeextensions-trinity/usr/share/lintian/overrides/pykdeextensions-trinity + install -D -p -m0644 debian/pytdeextensions-trinity.lintian-overrides \ + debian/pytdeextensions-trinity/usr/share/lintian/overrides/pytdeextensions-trinity # fix script-not-executable find debian -type f -name '*.py' | xargs chmod 0755 diff --git a/ubuntu/maverick/libraries/python-trinity/debian/changelog b/ubuntu/maverick/libraries/python-trinity/debian/changelog index 688f8d49c..0c28cec76 100644 --- a/ubuntu/maverick/libraries/python-trinity/debian/changelog +++ b/ubuntu/maverick/libraries/python-trinity/debian/changelog @@ -320,7 +320,7 @@ python-trinity (3.11.3+20050829-1) unstable; urgency=low * Added the homepage of PyKDE to the package descriptions * HTML documentations is now installed into /usr/share/doc/python-trinity-doc/html - * pykdeconfig.py now also knows that the sip files + * pytdeconfig.py now also knows that the sip files are in /usr/share/sip/trinity, not in /usr/share/sip/kde (Closes: #312708) diff --git a/ubuntu/maverick/libraries/python-trinity/debian/control b/ubuntu/maverick/libraries/python-trinity/debian/control index 38a85e452..f52038d27 100644 --- a/ubuntu/maverick/libraries/python-trinity/debian/control +++ b/ubuntu/maverick/libraries/python-trinity/debian/control @@ -4,14 +4,14 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Ricardo Javier Cardenes Medina <rcardenes@debian.org> Uploaders: Torsten Marek <shlomme@debian.org>, Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> -Build-Depends: debhelper (>= 5.0.38), libtqtinterface-dev, python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-qt-dev (>= 3.18), tdelibs4-trinity-dev, python-central (>= 0.6.11), dpatch, python-sip4, python-sip4-dbg, python-sip4-dev +Build-Depends: debhelper (>= 5.0.38), libtqtinterface-dev, python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-tqt-dev, tdelibs4-trinity-dev, python-central (>= 0.6.11), dpatch, python-sip4, python-sip4-dbg, python-sip4-dev Standards-Version: 3.8.4 -Homepage: http://www.riverbankcomputing.co.uk/pykde/index.php +Homepage: http://www.riverbankcomputing.co.uk/pytde/index.php XS-Python-Version: all Package: python-trinity-trinity Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends}, python-qt3 (>= 3.18) +Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt Replaces: python-kde3-kde3 (<< 4:3.5.13) Breaks: python-kde3-kde3 (<< 4:3.5.13) XB-Python-Version: ${python:Versions} @@ -27,7 +27,7 @@ Priority: extra Architecture: any Replaces: python-kde3-kde3-dbg (<< 4:3.5.13) Breaks: python-kde3-kde3-dbg (<< 4:3.5.13) -Depends: python-trinity-trinity (= ${binary:Version}), python-dbg, python-qt3-dbg, ${shlibs:Depends} +Depends: python-trinity-trinity (= ${binary:Version}), python-dbg, python-tqt-dbg, ${shlibs:Depends} XB-Python-Version: ${python:Versions} Description: Trinity bindings for Python (debug extensions) [Trinity] Python binding module that provides wide access to the Trinity API, @@ -41,13 +41,13 @@ Section: python Architecture: all Replaces: python-kde3-kde3-dev (<< 4:3.5.13) Breaks: python-kde3-kde3-dev (<< 4:3.5.13) -Depends: pyqt-tools, ${python:Depends} +Depends: pytqt-tools, ${python:Depends} XB-Python-Version: ${python:Versions} Description: Trinity bindings for Python - Development files and scripts [Trinity] Development .sip files with definitions of PyKDE classes. They are needed to build PyKDE, but also as building blocks of other packages based on them. - The package also contains kdepyuic, a wrapper script around PyQt's + The package also contains kdepyuic, a wrapper script around PyTQt's user interface compiler. Package: python-trinity-trinity-doc diff --git a/ubuntu/maverick/libraries/python-trinity/debian/pykdeconfig.py b/ubuntu/maverick/libraries/python-trinity/debian/pytdeconfig.py index 9e3840afe..eac264752 100644 --- a/ubuntu/maverick/libraries/python-trinity/debian/pykdeconfig.py +++ b/ubuntu/maverick/libraries/python-trinity/debian/pytdeconfig.py @@ -4,8 +4,8 @@ import sys if getattr(sys, "pydebug", False): try: - from pykdeconfig_d import * + from pytdeconfig_d import * except ImportError, msg: - raise ImportError, 'No module named pykdeconfig; package python-trinity-dbg not installed' + raise ImportError, 'No module named pytdeconfig; package python-trinity-dbg not installed' else: - from pykdeconfig_nd import * + from pytdeconfig_nd import * diff --git a/ubuntu/maverick/libraries/python-trinity/debian/rules b/ubuntu/maverick/libraries/python-trinity/debian/rules index 85c43a0fe..ffa56ad63 100755 --- a/ubuntu/maverick/libraries/python-trinity/debian/rules +++ b/ubuntu/maverick/libraries/python-trinity/debian/rules @@ -93,12 +93,12 @@ install-indep: for version in ${PYTHONS};\ do\ mkdir -p debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages;\ - cp debian/pykdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/;\ - cp build-$$version/pykdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/pykdeconfig_nd.py;\ + cp debian/pytdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/;\ + cp build-$$version/pytdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/pytdeconfig_nd.py;\ done for version in ${DBG_PYTHONS};\ do\ - cp dbg-build-$$version/pykdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/pykdeconfig_d.py;\ + cp dbg-build-$$version/pytdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/pytdeconfig_d.py;\ done install-arch: diff --git a/ubuntu/maverick/tde-i18n/debian/control b/ubuntu/maverick/tde-i18n/debian/control index 66b972d43..935ff4522 100644 --- a/ubuntu/maverick/tde-i18n/debian/control +++ b/ubuntu/maverick/tde-i18n/debian/control @@ -1,5 +1,5 @@ Source: tde-i18n-trinity -Build-Depends: autoconf, debhelper (>= 5), tdelibs4-trinity-dev, gawk, gettext, bzip2, perl +Build-Depends: debhelper (>= 5), tdelibs4-trinity-dev, gawk, gettext, bzip2, perl, automake, autoconf, libtool, libltdl-dev Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> diff --git a/ubuntu/maverick/tdebase/debian/changelog b/ubuntu/maverick/tdebase/debian/changelog index f19a0e4e8..f4c18cd62 100644 --- a/ubuntu/maverick/tdebase/debian/changelog +++ b/ubuntu/maverick/tdebase/debian/changelog @@ -196,7 +196,7 @@ tdebase-trinity (4:3.5.10-0ubuntu3~intrepid19) intrepid; urgency=low tdebase-trinity (4:3.5.10-0ubuntu3~intrepid18) intrepid; urgency=low - * Added XDG_DATA_DIRS and KDEDIRS to starttde, as suggested by zekica on the Debian forums + * Added XDG_DATA_DIRS and TDEDIRS to starttde, as suggested by zekica on the Debian forums -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 07 Mar 2009 13:18:00 -0600 @@ -758,8 +758,8 @@ tdebase (4:3.5.7-1ubuntu24) gutsy; urgency=low tdebase (4:3.5.7-1ubuntu23) gutsy; urgency=low * Fixed kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff as $kdehome=$HOME/.kde so we should use - $kdehome instead of $HOME/$kdehome + kubuntu_53_kwallet_config.diff as $tdehome=$HOME/.kde so we should use + $tdehome instead of $HOME/$tdehome -- Anthony Mercatante <tonio@ubuntu.com> Wed, 19 Sep 2007 12:22:46 +0200 @@ -780,7 +780,7 @@ tdebase (4:3.5.7-1ubuntu21) gutsy; urgency=low tdebase (4:3.5.7-1ubuntu20) gutsy; urgency=low - * Changed (again) $KDEHOME to $kdehome in kubuntu_52_gtk_qt_engine_config.diff and + * Changed (again) $TDEHOME to $tdehome in kubuntu_52_gtk_qt_engine_config.diff and kubuntu_53_kwallet_config.diff . (LP: #136560) -- Jonathan Riddell <jriddell@ubuntu.com> Sat, 15 Sep 2007 23:12:26 +0100 @@ -799,7 +799,7 @@ tdebase (4:3.5.7-1ubuntu18) gutsy; urgency=low [ Ryan Kavanagh ] * Dropping kubuntu_9902_nspluginviewer_hangs_cpu.diff and the libgtk build-dep as they are no longer needed - * Changed $KDEHOME to $kdehome in kubuntu_52_gtk_qt_engine_config.diff and + * Changed $TDEHOME to $tdehome in kubuntu_52_gtk_qt_engine_config.diff and kubuntu_53_kwallet_config.diff . (LP: #136560) -- Ryan Kavanagh <ryanakca@kubuntu.org> Mon, 03 Sep 2007 10:26:36 -0400 @@ -807,7 +807,7 @@ tdebase (4:3.5.7-1ubuntu18) gutsy; urgency=low tdebase (4:3.5.7-1ubuntu17) gutsy; urgency=low * Edit kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff to use $KDEHOME instead of .kde + kubuntu_53_kwallet_config.diff to use $TDEHOME instead of .kde * Remove kubuntu_77_kiosystem.diff, home:/ better than /home now * Edit kubuntu_27_aboutscreen_searchbar.diff to work with strigi * Add kubuntu_9903_api_docs_move.diff for new API website diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.conf b/ubuntu/maverick/tdebase/debian/kdm-trinity.conf index 554e5a38e..95c0fcd67 100755 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.conf +++ b/ubuntu/maverick/tdebase/debian/kdm-trinity.conf @@ -38,7 +38,7 @@ script export LANG LANGUAGE fi - KDEDIRS=/opt/trinity/ + TDEDIRS=/opt/trinity/ PATH=/opt/trinity/bin:/bin:/usr/bin:/sbin:/usr/sbin initctl emit starting-dm DM=kdm-trinity diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.txt b/ubuntu/maverick/tdebase/debian/kdm-trinity.txt index effad2fd6..a1940a4d8 100644 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.txt +++ b/ubuntu/maverick/tdebase/debian/kdm-trinity.txt @@ -22,7 +22,7 @@ set -e HEED_DEFAULT_DISPLAY_MANAGER=true DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager -KDEDIRS=/opt/trinity/ +TDEDIRS=/opt/trinity/ PATH=/opt/trinity/bin:/bin:/usr/bin:/sbin:/usr/sbin DAEMON=/opt/trinity/bin/kdm PIDFILE=/var/run/kdm.pid diff --git a/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff b/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff index 0eebed280..21011fbd5 100644 --- a/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff +++ b/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff @@ -1,14 +1,14 @@ --- starttde +++ starttde @@ -184,17 +184,17 @@ - . $kdehome/share/config/startupconfig + . $tdehome/share/config/startupconfig fi -# Make sure a default wallpaper is set. --if [ ! -e $kdehome/share/config/kdesktoprc ]; then +-if [ ! -e $tdehome/share/config/kdesktoprc ]; then - # With Trinity KDE this file should exist, but test first. - if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then --cat >$kdehome/share/config/kdesktoprc <<EOF +-cat >$tdehome/share/config/kdesktoprc <<EOF -[Desktop0] -Wallpaper=isadora.png -WallpaperMode=Scaled @@ -16,10 +16,10 @@ - fi -fi +## Make sure a default wallpaper is set. -+#if [ ! -e $kdehome/share/config/kdesktoprc ]; then ++#if [ ! -e $tdehome/share/config/kdesktoprc ]; then +# # With Trinity KDE this file should exist, but test first. +# if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then -+#cat >$kdehome/share/config/kdesktoprc <<EOF ++#cat >$tdehome/share/config/kdesktoprc <<EOF +#[Desktop0] +#Wallpaper=isadora.png +#WallpaperMode=Scaled diff --git a/ubuntu/maverick/tdebindings/debian/changelog b/ubuntu/maverick/tdebindings/debian/changelog index 6d5413584..64d2d34ae 100644 --- a/ubuntu/maverick/tdebindings/debian/changelog +++ b/ubuntu/maverick/tdebindings/debian/changelog @@ -483,7 +483,7 @@ tdebindings (4:3.2.92-1) unstable; urgency=low was accepted upstream. * debian/libkjsembed1.install: install the qprocess kjsembed plugin. * debian/rules: disable the python directory, as sip, pyqt and - pykde are all packaged in Debian already. + pytde are all packaged in Debian already. * debian/control: added the libsmokekde1, libsmokekde-dev, libkorundum-ruby1.8 and libqtruby-ruby1.8 packages because of upstream additions. diff --git a/ubuntu/maverick/tdebindings/debian/control b/ubuntu/maverick/tdebindings/debian/control index aae3c4feb..f16386120 100644 --- a/ubuntu/maverick/tdebindings/debian/control +++ b/ubuntu/maverick/tdebindings/debian/control @@ -2,7 +2,7 @@ Source: tdebindings-trinity Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5), python-dev (>= 2.3.5-11), python-support (>= 0.5), quilt, gawk, gettext, default-jdk [amd64 i386 ia64 lpia powerpc s390 sparc], - tdelibs4-trinity-dev (>= 4:3.5.9), libqt3-compat-headers (>= 3:3.3.5), + tdelibs4-trinity-dev (>= 4:3.5.9), libtqt3-compat-headers (>= 3:3.3.5), ruby, ruby1.8-dev, flex, bison, automake, autoconf, libtool, libltdl-dev Section: devel diff --git a/ubuntu/maverick/tdebindings/debian/libqt0-ruby1.8-trinity.install b/ubuntu/maverick/tdebindings/debian/libqt0-ruby1.8-trinity.install index a1b654969..60f10d40e 100644 --- a/ubuntu/maverick/tdebindings/debian/libqt0-ruby1.8-trinity.install +++ b/ubuntu/maverick/tdebindings/debian/libqt0-ruby1.8-trinity.install @@ -9,7 +9,7 @@ debian/tmp/opt/trinity/lib/ruby/1.8/Qt.rb debian/tmp/opt/trinity/lib/ruby/1.8/*/qtruby.so* debian/tmp/opt/trinity/lib/ruby/1.8/*/qtruby.la -debian/tmp/opt/trinity/lib/ruby/1.8/*/qui.so* -debian/tmp/opt/trinity/lib/ruby/1.8/*/qui.la +debian/tmp/opt/trinity/lib/ruby/1.8/*/tqui.so* +debian/tmp/opt/trinity/lib/ruby/1.8/*/tqui.la qtruby/ChangeLog /opt/trinity/share/doc/libqt0-ruby1.8 diff --git a/ubuntu/maverick/tdelibs/debian/changelog b/ubuntu/maverick/tdelibs/debian/changelog index 936097e90..a3b13e8a4 100644 --- a/ubuntu/maverick/tdelibs/debian/changelog +++ b/ubuntu/maverick/tdelibs/debian/changelog @@ -2087,7 +2087,7 @@ tdelibs (4:3.4.0-0pre5) alioth; urgency=low output them expanded even when --expandvars is not used. (Closes: #287822) * Fixed the ability of the build system to find kde.pot, even when it is not - located at KDEDIR/include/kde.pot. This allows the use of targets such as + located at TDEDIR/include/kde.pot. This allows the use of targets such as "package-messages" without specifying includedir. (Closes: #283858) * Now that graphviz is in main, add it to Build-Depends-Indep together with diff --git a/ubuntu/maverick/tdelibs/debian/kcmshell b/ubuntu/maverick/tdelibs/debian/kcmshell index e8b3d2a84..f5b01f8f1 100755 --- a/ubuntu/maverick/tdelibs/debian/kcmshell +++ b/ubuntu/maverick/tdelibs/debian/kcmshell @@ -1,4 +1,4 @@ #!/bin/sh -export KDEDIRS=/usr/:/opt/trinity/ +export TDEDIRS=/usr/:/opt/trinity/ /opt/trinity/bin/kcmshell.real $1 $2 $3 $4 $5 $6 $7 $8 diff --git a/ubuntu/maverick/tdelibs/debian/man/kstartupconfig-trinity.1 b/ubuntu/maverick/tdelibs/debian/man/kstartupconfig-trinity.1 index 57ae12c1d..897dae97d 100644 --- a/ubuntu/maverick/tdelibs/debian/man/kstartupconfig-trinity.1 +++ b/ubuntu/maverick/tdelibs/debian/man/kstartupconfig-trinity.1 @@ -4,7 +4,7 @@ kstartupconfig, kdostartupconfig \- KDE configuration options loader .SH SYNOPSIS -\fBkstartupconfig\fP [$KDEHOME] +\fBkstartupconfig\fP [$TDEHOME] .sp 1 \fBkdostartupconfig\fP .SH DESCRIPTION @@ -27,19 +27,19 @@ do not use frequently changed config files since the checking is timestamp\-base if \fBkconf_update\fP is used to update an option also touch the matching global config file to allow \fBkstartupconfig\fP to see changes .SH OPTIONS .TP -.B $KDEHOME +.B $TDEHOME KDE home directory, if different to ~/.kde .SS .SH FILES -In case $KDEHOME is not set ~/.kde is assumed. +In case $TDEHOME is not set ~/.kde is assumed. .TP -.I $KDEHOME/share/config/startupconfig +.I $TDEHOME/share/config/startupconfig script, sourced to set shell variables with configuration options .TP -.I $KDEHOME/share/config/startupconfigfiles +.I $TDEHOME/share/config/startupconfigfiles configuration options and files they belong to .TP -.I $KDEHOME/share/config/startupconfigkeys +.I $TDEHOME/share/config/startupconfigkeys configuration options to load .SH SEE ALSO .BR kconf_update (1),\ starttde (1) diff --git a/ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml b/ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml index d4a7162d1..1ab3ff715 100644 --- a/ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml +++ b/ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml @@ -72,7 +72,7 @@ manpage.1: manpage.sgml <para><command>&dhpackage;</command> is used to create KDE resources in temporary directories and symlinks to them in - <envar>KDEHOME</envar>. The resource that needs to be created is + <envar>TDEHOME</envar>. The resource that needs to be created is given as an argument and can be anyone of:</para> <itemizedlist> diff --git a/ubuntu/maverick/tdelibs/debian/man/make_driver_db_cups-trinity.1 b/ubuntu/maverick/tdelibs/debian/man/make_driver_db_cups-trinity.1 index 0201523ce..8ca091265 100644 --- a/ubuntu/maverick/tdelibs/debian/man/make_driver_db_cups-trinity.1 +++ b/ubuntu/maverick/tdelibs/debian/man/make_driver_db_cups-trinity.1 @@ -25,10 +25,10 @@ directory with ppd files write printer database into this file .SH FILES .TP -.I $KDEHOME/share/apps/tdeprint/printerdb_cups.txt +.I $TDEHOME/share/apps/tdeprint/printerdb_cups.txt KDE printer database .br -(if $KDEHOME is not set ~/.kde is used) +(if $TDEHOME is not set ~/.kde is used) .SH SEE ALSO .BR make_driver_db_lpr (1) .TP diff --git a/ubuntu/maverick/tdemultimedia/debian/man/kaboodle-trinity.1 b/ubuntu/maverick/tdemultimedia/debian/man/kaboodle-trinity.1 index 4475e273c..76f29a181 100644 --- a/ubuntu/maverick/tdemultimedia/debian/man/kaboodle-trinity.1 +++ b/ubuntu/maverick/tdemultimedia/debian/man/kaboodle-trinity.1 @@ -70,7 +70,7 @@ Use an alternative configuration file, instead of the default, which is normally located in .I /usr/share/config or in -.RB $ KDEHOME\fI/share/config +.RB $ TDEHOME\fI/share/config .TP .BI \-\-dcopserver \ server Set the address of the DCOP server to attach to. @@ -196,7 +196,7 @@ LANG. Assume that all filenames are in UTF-8 format regardless of the current language setting. Otherwise the filename format is defined by the language. -.IP KDE_MULTIHEAD +.IP TDE_MULTIHEAD If this variable has the value .B true multihead multiple display mode is enabled. The KDE display will be @@ -218,7 +218,7 @@ The session manager to use. This option is set automatically by KDE and is a network path to the session manager socket. .IP HOME Path to the home directory for the current user. -.IP KDEHOME +.IP TDEHOME The KDE per-user setting directory. Default if not specified is .I $HOME/.kde .lf 55 info/tdemultimedia.kaboodle.1 diff --git a/ubuntu/maverick/tdeutils/debian/man/kcharselect-trinity.1 b/ubuntu/maverick/tdeutils/debian/man/kcharselect-trinity.1 index af601f877..15d1c35d9 100644 --- a/ubuntu/maverick/tdeutils/debian/man/kcharselect-trinity.1 +++ b/ubuntu/maverick/tdeutils/debian/man/kcharselect-trinity.1 @@ -69,7 +69,7 @@ Use an alternative configuration file, instead of the default, which is normally located in .I /usr/share/config or in -.RB $ KDEHOME\fI/share/config +.RB $ TDEHOME\fI/share/config .TP .BI \-\-dcopserver \ server Set the address of the DCOP server to attach to. @@ -195,7 +195,7 @@ LANG. Assume that all filenames are in UTF-8 format regardless of the current language setting. Otherwise the filename format is defined by the language. -.IP KDE_MULTIHEAD +.IP TDE_MULTIHEAD If this variable has the value .B true multihead multiple display mode is enabled. The KDE display will be @@ -217,7 +217,7 @@ The session manager to use. This option is set automatically by KDE and is a network path to the session manager socket. .IP HOME Path to the home directory for the current user. -.IP KDEHOME +.IP TDEHOME The KDE per-user setting directory. Default if not specified is .I $HOME/.kde .lf 50 info/tdeutils.kcharselect.1 |