diff options
author | Robert Xu <robxu9@gmail.com> | 2011-08-20 22:17:03 -0400 |
---|---|---|
committer | Robert Xu <robxu9@gmail.com> | 2011-08-20 22:17:03 -0400 |
commit | 6f3a1bc646b0d5eb63f09e59e9b0262d47ee4ebf (patch) | |
tree | 141e44b1b831644c739f3ec4e0bef2d10ef71da7 /ubuntu/maverick/libraries | |
parent | 7621ba87b889eccdea4958715c25de4b403ad705 (diff) | |
parent | 26f5630a822b38ef215210699e9e08e74143b38b (diff) | |
download | tde-packaging-6f3a1bc646b0d5eb63f09e59e9b0262d47ee4ebf.tar.gz tde-packaging-6f3a1bc646b0d5eb63f09e59e9b0262d47ee4ebf.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/libraries')
12 files changed, 18 insertions, 18 deletions
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/changelog b/ubuntu/maverick/libraries/kipi-plugins/debian/changelog index 6f7c8ed50..da8fca349 100755 --- a/ubuntu/maverick/libraries/kipi-plugins/debian/changelog +++ b/ubuntu/maverick/libraries/kipi-plugins/debian/changelog @@ -6,7 +6,7 @@ kipi-plugins-trinity (0.1.6-0ubuntu1) karmic; urgency=low kipi-plugins-trinity (0.1.5-0ubuntu4) intrepid; urgency=low - * Moved KDE3 to /opt/trinity + * Moved Trinity to /opt/trinity * Integrated properly with KDE4.2+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 05 March 2009 19:52:00 -0600 diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity.install b/ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity.install index ac3b45042..b01d3720f 100755 --- a/ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity.install +++ b/ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity.install @@ -2,6 +2,6 @@ debian/tmp/opt/trinity/share/services/kipiplugin* debian/tmp/opt/trinity/share/apps/kipi* debian/tmp/opt/trinity/share/config.kcfg/htmlexportconfig.kcfg debian/tmp/opt/trinity/share/locale/* -debian/tmp/opt/trinity/lib/kde3/kipiplugin* +debian/tmp/opt/trinity/lib/trinity/kipiplugin* debian/tmp/opt/trinity/lib/libkipiplugins.* debian/tmp/opt/trinity/bin/* diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/changelog b/ubuntu/maverick/libraries/libkdcraw/debian/changelog index d4eda6180..4458e7b08 100644 --- a/ubuntu/maverick/libraries/libkdcraw/debian/changelog +++ b/ubuntu/maverick/libraries/libkdcraw/debian/changelog @@ -6,7 +6,7 @@ libkdcraw-trinity (0.1.9-0ubuntu1) karmic; urgency=low libkdcraw-trinity (0.1.4-0ubuntu2) intrepid; urgency=low - * Moved KDE3 to /opt/trinity + * Moved Trinity to /opt/trinity * Integrated properly with KDE4.2+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Wed, 05 March 2009 01:11:00 -0600 diff --git a/ubuntu/maverick/libraries/libkexiv2/debian/changelog b/ubuntu/maverick/libraries/libkexiv2/debian/changelog index cebc28b14..b40a8b352 100644 --- a/ubuntu/maverick/libraries/libkexiv2/debian/changelog +++ b/ubuntu/maverick/libraries/libkexiv2/debian/changelog @@ -6,7 +6,7 @@ libkexiv2-trinity (0.1.7-0ubuntu4) karmic; urgency=low libkexiv2-trinity (0.1.7-0ubuntu2) intrepid; urgency=low - * Moved KDE3 to /opt/trinity + * Moved Trinity to /opt/trinity * Integrated properly with KDE4.2+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Wed, 05 March 2009 01:11:00 -0600 diff --git a/ubuntu/maverick/libraries/libkipi/debian/changelog b/ubuntu/maverick/libraries/libkipi/debian/changelog index a5746bc99..ed7cd918a 100644 --- a/ubuntu/maverick/libraries/libkipi/debian/changelog +++ b/ubuntu/maverick/libraries/libkipi/debian/changelog @@ -12,7 +12,7 @@ libkipi-trinity (0.1.5-2intrepid6) jaunty; urgency=low libkipi-trinity (0.1.5-2intrepid5) intrepid; urgency=low - * Moved KDE3 to /opt/trinity + * Moved Trinity to /opt/trinity * Integrated properly with KDE4.2+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Wed, 05 March 2009 01:11:00 -0600 diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/control b/ubuntu/maverick/libraries/libksquirrel/debian/control index 48a5f320e..8fc0ef737 100644 --- a/ubuntu/maverick/libraries/libksquirrel/debian/control +++ b/ubuntu/maverick/libraries/libksquirrel/debian/control @@ -14,18 +14,18 @@ Homagepage: http://ksquirrel.sourceforge.net Package: libksquirrel0-trinity Architecture: any Depends: ${shlibs:Depends} -Description: KDE3 image viewer +Description: Trinity image viewer Runtime libraries for KSquirrel. Package: libksquirrel-trinity-dev Section: libdevel Architecture: any Depends: ${shlibs:Depends}, libksquirrel0-trinity (= ${binary:Version}) -Description: KDE3 image viewer +Description: Trinity image viewer Development libraries for KSquirrel. Package: libksquirrel-tools-trinity Architecture: any Depends: ${shlibs:Depends}, libksquirrel0-trinity (= ${binary:Version}) -Description: KDE3 image viewer +Description: Trinity image viewer Tools for KSquirrel. diff --git a/ubuntu/maverick/libraries/mlt++/debian/changelog b/ubuntu/maverick/libraries/mlt++/debian/changelog index dbdad4092..d49fd4142 100644 --- a/ubuntu/maverick/libraries/mlt++/debian/changelog +++ b/ubuntu/maverick/libraries/mlt++/debian/changelog @@ -6,7 +6,7 @@ mlt++-trinity (0.2.5~svn20071228-0.0ubuntu5) karmic; urgency=low mlt++-trinity (0.2.5~svn20071228-0.0ubuntu4) intrepid; urgency=low - * Moved KDE3 to /opt/trinity + * Moved Trinity to /opt/trinity * Integrated properly with KDE4.2+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Fri, 06 March 2009 01:35:00 -0600 diff --git a/ubuntu/maverick/libraries/mlt/debian/changelog b/ubuntu/maverick/libraries/mlt/debian/changelog index bb56b0cc2..56a1c1fd2 100644 --- a/ubuntu/maverick/libraries/mlt/debian/changelog +++ b/ubuntu/maverick/libraries/mlt/debian/changelog @@ -6,7 +6,7 @@ mlt-trinity (0.2.4.svn20071228-0.0ubuntu5) karmic; urgency=low mlt-trinity (0.2.4.svn20071228-0.0ubuntu4) intrepid; urgency=low - * Moved KDE3 to /opt/trinity + * Moved Trinity to /opt/trinity * Integrated properly with KDE4.2+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Fri, 06 March 2009 01:35:00 -0600 diff --git a/ubuntu/maverick/libraries/python-trinity/debian/control b/ubuntu/maverick/libraries/python-trinity/debian/control index c384f66d6..7f6e42bca 100644 --- a/ubuntu/maverick/libraries/python-trinity/debian/control +++ b/ubuntu/maverick/libraries/python-trinity/debian/control @@ -15,8 +15,8 @@ Depends: ${shlibs:Depends}, ${python:Depends}, python-qt3 (>= 3.18) XB-Python-Version: ${python:Versions} Provides: ${python:Provides} Conflicts: python-trinity-trinity -Description: KDE3 bindings for Python [Trinity] - Python binding module that provides wide access to the KDE3 API, +Description: Trinity bindings for Python [Trinity] + Python binding module that provides wide access to the Trinity API, also known as PyKDE. Using this, you'll get (for example) classes from kio, kjs, khtml and kprint. @@ -25,8 +25,8 @@ Priority: extra Architecture: any Depends: python-trinity-trinity (= ${binary:Version}), python-dbg, python-qt3-dbg, ${shlibs:Depends} XB-Python-Version: ${python:Versions} -Description: KDE3 bindings for Python (debug extensions) [Trinity] - Python binding module that provides wide access to the KDE3 API, +Description: Trinity bindings for Python (debug extensions) [Trinity] + Python binding module that provides wide access to the Trinity API, also known as PyKDE. Using this, you'll get (for example) classes from kio, kjs, khtml and kprint. . @@ -37,7 +37,7 @@ Section: python Architecture: all Depends: pyqt-tools, ${python:Depends} XB-Python-Version: ${python:Versions} -Description: KDE3 bindings for Python - Development files and scripts [Trinity] +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. diff --git a/ubuntu/maverick/libraries/python-trinity/debian/copyright b/ubuntu/maverick/libraries/python-trinity/debian/copyright index d67316545..eec6b36a5 100644 --- a/ubuntu/maverick/libraries/python-trinity/debian/copyright +++ b/ubuntu/maverick/libraries/python-trinity/debian/copyright @@ -6,7 +6,7 @@ It was downloaded from http://www.riverbankcomputing.co.uk Upstream Authors: Jim Bublitz <jbublitz@nwinternet.com> - PyKDE(KDE2, KDE3) + PyKDE(KDE2, Trinity) Phil Thompson <phil@river-bank.demon.co.uk> sip, PyQt, original PyKDE (KDE1) and loads of good advice and help diff --git a/ubuntu/maverick/libraries/python-trinity/debian/rules b/ubuntu/maverick/libraries/python-trinity/debian/rules index 19e69c601..85c43a0fe 100755 --- a/ubuntu/maverick/libraries/python-trinity/debian/rules +++ b/ubuntu/maverick/libraries/python-trinity/debian/rules @@ -120,7 +120,7 @@ install-arch: dh_install -a --sourcedir=$(CURDIR)/debian/tmp mkdir -p $(CURDIR)/debian/python-trinity-trinity/opt/trinity/lib/ - ln -s /opt/trinity/lib/kde3/libkonsolepart.so $(CURDIR)/debian/python-trinity-trinity/opt/trinity/lib/ + ln -s /opt/trinity/lib/trinity/libkonsolepart.so $(CURDIR)/debian/python-trinity-trinity/opt/trinity/lib/ for i in $$(find debian/python-*-dbg -name '*.so'); do \ b=$$(basename $$i .so); \ mv $$i $$(dirname $$i)/$${b}_d.so; \ diff --git a/ubuntu/maverick/libraries/python-trinity/debian/watch b/ubuntu/maverick/libraries/python-trinity/debian/watch index 26518db46..8b3afcac0 100644 --- a/ubuntu/maverick/libraries/python-trinity/debian/watch +++ b/ubuntu/maverick/libraries/python-trinity/debian/watch @@ -1,3 +1,3 @@ version=3 -http://www.riverbankcomputing.com/Downloads/PyKDE3/PyKDE-(.*)\.tar\.bz2 +http://www.riverbankcomputing.com/Downloads/PyTrinity/PyKDE-(.*)\.tar\.bz2 |