diff options
Diffstat (limited to 'ubuntu/maverick/tdebindings/debian')
6 files changed, 51 insertions, 46 deletions
diff --git a/ubuntu/maverick/tdebindings/debian/changelog b/ubuntu/maverick/tdebindings/debian/changelog index 6d5413584..64d2d34ae 100644 --- a/ubuntu/maverick/tdebindings/debian/changelog +++ b/ubuntu/maverick/tdebindings/debian/changelog @@ -483,7 +483,7 @@ tdebindings (4:3.2.92-1) unstable; urgency=low was accepted upstream. * debian/libkjsembed1.install: install the qprocess kjsembed plugin. * debian/rules: disable the python directory, as sip, pyqt and - pykde are all packaged in Debian already. + pytde are all packaged in Debian already. * debian/control: added the libsmokekde1, libsmokekde-dev, libkorundum-ruby1.8 and libqtruby-ruby1.8 packages because of upstream additions. diff --git a/ubuntu/maverick/tdebindings/debian/control b/ubuntu/maverick/tdebindings/debian/control index aae3c4feb..55d1ec903 100644 --- a/ubuntu/maverick/tdebindings/debian/control +++ b/ubuntu/maverick/tdebindings/debian/control @@ -2,7 +2,7 @@ Source: tdebindings-trinity Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5), python-dev (>= 2.3.5-11), python-support (>= 0.5), quilt, gawk, gettext, default-jdk [amd64 i386 ia64 lpia powerpc s390 sparc], - tdelibs4-trinity-dev (>= 4:3.5.9), libqt3-compat-headers (>= 3:3.3.5), + tdelibs4-trinity-dev (>= 4:3.5.9), libtqt3-compat-headers (>= 3:3.3.5), ruby, ruby1.8-dev, flex, bison, automake, autoconf, libtool, libltdl-dev Section: devel @@ -15,8 +15,8 @@ Standards-Version: 3.8.4 Package: tdebindings-java-trinity Section: libs Architecture: all -Replaces: tdebindings-java-kde3 (<< 4:3.5.13) -Breaks: tdebindings-java-kde3 (<< 4:3.5.13) +Replaces: kdebindings-java-trinity (<< 4:14.0.0) +Breaks: kdebindings-java-trinity (<< 4:14.0.0) Depends: libdcop3-java-trinity (= ${source:Version}), libqt3-java-trinity (= ${source:Version}), libtrinity-java-trinity (= ${source:Version}) Description: TDE Java bindings metapackage [Trinity] A metapackage depending on all TDE, Qt and DCOP bindings libraries @@ -27,8 +27,8 @@ Description: TDE Java bindings metapackage [Trinity] Package: libdcop3-java-trinity Architecture: all Section: libs -Replaces: libdcop3-java-kde3 (<< 4:3.5.13) -Breaks: libdcop3-java-kde3 (<< 4:3.5.13) +Replaces: libdcop3-java-trinity (<< 4:14.0.0) +Breaks: libdcop3-java-trinity (<< 4:14.0.0) Depends: libdcop3-jni-trinity (>> ${KDE-Version3}), libdcop3-jni-trinity (<< ${KDE-Next-Version3}), gij | java1-runtime | java2-runtime Description: DCOP bindings for Java [Trinity] This package contains the Java classes necessary to run Java programs @@ -40,8 +40,8 @@ Description: DCOP bindings for Java [Trinity] Package: libdcop3-jni-trinity Architecture: amd64 i386 ia64 powerpc s390 sparc Section: libs -Replaces: libdcop3-jni-kde3 (<< 4:3.5.13) -Breaks: libdcop3-jni-kde3 (<< 4:3.5.13) +Replaces: libdcop3-jni-trinity (<< 4:14.0.0) +Breaks: libdcop3-jni-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: DCOP bindings for Java ( Native libraries ) [Trinity] This package contains the shared libraries and scripts necessary to @@ -54,8 +54,8 @@ Description: DCOP bindings for Java ( Native libraries ) [Trinity] Package: libdcop3-java-trinity-dev Architecture: amd64 i386 ia64 powerpc s390 sparc Section: libdevel -Replaces: libdcop3-java-kde3-dev (<< 4:3.5.13) -Breaks: libdcop3-java-kde3-dev (<< 4:3.5.13) +Replaces: libdcop3-java-trinity-dev (<< 4:14.0.0) +Breaks: libdcop3-java-trinity-dev (<< 4:14.0.0) Depends: libdcop3-java-trinity (>> ${KDE-Version3}), libdcop3-java-trinity (<< ${KDE-Next-Version3}) Description: DCOP bindings for Java (dcopidl2java program) [Trinity] This package contains the dcopidl2java program which generates Java @@ -68,8 +68,8 @@ Description: DCOP bindings for Java (dcopidl2java program) [Trinity] Package: libqt3-java-trinity Architecture: all Section: libs -Replaces: libqt3-java-kde3 (<< 4:3.5.13) -Breaks: libqt3-java-kde3 (<< 4:3.5.13) +Replaces: libqt3-java-trinity (<< 4:14.0.0) +Breaks: libqt3-java-trinity (<< 4:14.0.0) Depends: libqt3-jni-trinity (>> ${KDE-Version3}), libqt3-jni-trinity (<< ${KDE-Next-Version3}), gij | java1-runtime | java2-runtime Suggests: juic-trinity Description: Java bindings for Qt [Trinity] @@ -85,8 +85,8 @@ Description: Java bindings for Qt [Trinity] Package: libqt3-jni-trinity Architecture: amd64 i386 ia64 powerpc s390 sparc Section: libs -Replaces: libqt3-jni-kde3 (<< 4:3.5.13) -Breaks: libqt3-jni-kde3 (<< 4:3.5.13) +Replaces: libqt3-jni-trinity (<< 4:14.0.0) +Breaks: libqt3-jni-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Java bindings for Qt ( Native libraries ) [Trinity] This package contains the shared libraries necessary to run Java @@ -98,8 +98,8 @@ Description: Java bindings for Qt ( Native libraries ) [Trinity] Package: libtrinity-java-trinity Architecture: all Section: libs -Replaces: libtrinity-java-kde3 (<< 4:3.5.13) -Breaks: libtrinity-java-kde3 (<< 4:3.5.13) +Replaces: libtrinity-java-trinity (<< 4:14.0.0) +Breaks: libtrinity-java-trinity (<< 4:14.0.0) Depends: libtrinity-jni-trinity (>> ${KDE-Version3}), libtrinity-jni-trinity (<< ${KDE-Next-Version3}), gij | java1-runtime | java2-runtime Description: tdelibs bindings for Java [Trinity] This package contains the Java classes necessary to run Java programs @@ -114,8 +114,8 @@ Description: tdelibs bindings for Java [Trinity] Package: libtrinity-jni-trinity Architecture: amd64 i386 ia64 powerpc s390 sparc Section: libs -Replaces: libtrinity-jni-kde3 (<< 4:3.5.13) -Breaks: libtrinity-jni-kde3 (<< 4:3.5.13) +Replaces: libtrinity-jni-trinity (<< 4:14.0.0) +Breaks: libtrinity-jni-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: tdelibs bindings for java ( Native libraries ) [Trinity] This package contains the shared libraries necessary to run Java @@ -127,10 +127,9 @@ Description: tdelibs bindings for java ( Native libraries ) [Trinity] Package: libsmokeqt1-trinity Architecture: any Section: libs -Replaces: libsmokeqt1-kde3 (<< 4:3.5.13) -Breaks: libsmokeqt1-kde3 (<< 4:3.5.13) +Replaces: libsmokeqt1-trinity (<< 4:14.0.0) +Breaks: libsmokeqt1-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} -Conflicts: libqt-perl (<= 3.008-1) Description: SMOKE Binding Library to Qt The "Scripting Meta Object Kompiler Engine" library is used by various TDE language bindings packages to provide interfaces to the @@ -141,10 +140,9 @@ Description: SMOKE Binding Library to Qt Package: libsmokeqt-trinity-dev Architecture: any Section: libdevel -Replaces: libsmokeqt-kde3-dev (<< 4:3.5.13) -Breaks: libsmokeqt-kde3-dev (<< 4:3.5.13) +Replaces: libsmokeqt-trinity-dev (<< 4:14.0.0) +Breaks: libsmokeqt-trinity-dev (<< 4:14.0.0) Depends: libsmokeqt1-trinity (= ${binary:Version}) -Conflicts: libqt-perl (<= 3.008-1) Description: SMOKE Binding Library to Qt - Development Files The "Scripting Meta Object Kompiler Engine" library is used by various TDE language bindings packages to provide interfaces to the @@ -159,8 +157,8 @@ Description: SMOKE Binding Library to Qt - Development Files Package: libsmokekde1-trinity Architecture: any Section: libs -Replaces: libsmokekde1-kde3 (<< 4:3.5.13) -Breaks: libsmokekde1-kde3 (<< 4:3.5.13) +Replaces: libsmokekde1-trinity (<< 4:14.0.0) +Breaks: libsmokekde1-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: SMOKE Binding Library to TDE The "Scripting Meta Object Kompiler Engine" library is used by @@ -172,8 +170,8 @@ Description: SMOKE Binding Library to TDE Package: libsmokekde-trinity-dev Architecture: any Section: libdevel -Replaces: libsmokekde-kde3-dev (<< 4:3.5.13) -Breaks: libsmokekde-kde3-dev (<< 4:3.5.13) +Replaces: libsmokekde-trinity-dev (<< 4:14.0.0) +Breaks: libsmokekde-trinity-dev (<< 4:14.0.0) Depends: libsmokekde1-trinity (= ${binary:Version}) Description: SMOKE Binding Library to TDE - Development Files The "Scripting Meta Object Kompiler Engine" library is used by @@ -189,8 +187,8 @@ Description: SMOKE Binding Library to TDE - Development Files Package: python-dcop-trinity Architecture: any Section: python -Replaces: python-dcop-kde3 (<< 4:3.5.13) -Breaks: python-dcop-kde3 (<< 4:3.5.13) +Replaces: python-dcop-trinity (<< 4:14.0.0) +Breaks: python-dcop-trinity (<< 4:14.0.0) Depends: ${python:Depends}, ${shlibs:Depends} Provides: ${python:Provides} Description: DCOP bindings for Python @@ -204,8 +202,8 @@ Description: DCOP bindings for Python Package: libkjsembed1-trinity Architecture: any Section: libs -Replaces: libkjsembed1-kde3 (<< 4:3.5.13) -Breaks: libkjsembed1-kde3 (<< 4:3.5.13) +Replaces: libkjsembed1-trinity (<< 4:14.0.0) +Breaks: libkjsembed1-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: Embedded JavaScript library This package contains the shared libraries necessary to run programs @@ -217,8 +215,8 @@ Description: Embedded JavaScript library Package: libkjsembed-trinity-dev Architecture: any Section: libdevel -Replaces: libkjsembed-kde3-dev (<< 4:3.5.13) -Breaks: libkjsembed-kde3-dev (<< 4:3.5.13) +Replaces: libkjsembed-trinity-dev (<< 4:14.0.0) +Breaks: libkjsembed-trinity-dev (<< 4:14.0.0) Depends: libkjsembed1-trinity (= ${binary:Version}) Description: Embedded JavaScript library (Development files) This package contains the header files and symbolic links necessary @@ -234,8 +232,8 @@ Description: Embedded JavaScript library (Development files) Package: kjscmd-trinity Architecture: any Section: interpreters -Replaces: kjscmd-kde3 (<< 4:3.5.13) -Breaks: kjscmd-kde3 (<< 4:3.5.13) +Replaces: kjscmd-trinity (<< 4:14.0.0) +Breaks: kjscmd-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Description: A script interpreter using the TDE JavaScript library This package contains the kjscmd program, which is a standalone @@ -246,8 +244,8 @@ Description: A script interpreter using the TDE JavaScript library Package: juic-trinity Architecture: all Section: libdevel -Replaces: juic-kde3 (<< 4:3.5.13) -Breaks: juic-kde3 (<< 4:3.5.13) +Replaces: juic-trinity (<< 4:14.0.0) +Breaks: juic-trinity (<< 4:14.0.0) Depends: xsltproc Recommends: libqt3-java-trinity Suggests: qt3-designer @@ -263,8 +261,8 @@ Description: The Qt Java UI Compiler Package: libkorundum0-ruby1.8-trinity Architecture: any Section: interpreters -Replaces: libkorundum0-ruby1.8-kde3 (<< 4:3.5.13) -Breaks: libkorundum0-ruby1.8-kde3 (<< 4:3.5.13) +Replaces: libkorundum0-ruby1.8-trinity (<< 4:14.0.0) +Breaks: libkorundum0-ruby1.8-trinity (<< 4:14.0.0) Depends: libqt0-ruby1.8-trinity (= ${binary:Version}), ${shlibs:Depends} Description: TDE bindings for Ruby [Trinity] This package contains the files necessary for running and developing @@ -278,8 +276,8 @@ Description: TDE bindings for Ruby [Trinity] Package: libqt0-ruby1.8-trinity Architecture: any Section: interpreters -Replaces: libqt0-ruby1.8-kde3 (<< 4:3.5.13) -Breaks: libqt0-ruby1.8-kde3 (<< 4:3.5.13) +Replaces: libqt0-ruby1.8-trinity (<< 4:14.0.0) +Breaks: libqt0-ruby1.8-trinity (<< 4:14.0.0) Depends: ruby1.8, ${shlibs:Depends} Description: Qt bindings for Ruby [Trinity] This package contains the files necessary for running and developing @@ -293,6 +291,8 @@ Description: Qt bindings for Ruby [Trinity] Package: tde-xparts-extras-trinity Architecture: any Depends: ${shlibs:Depends} +Replaces: kde-xparts-extras-trinity (<< 4:14.0.0) +Breaks: kde-xparts-extras-trinity (<< 4:14.0.0) Description: Extra xparts for TDE [Trinity] This package contains extra xparts-based modules for Trinity This includes the mozilla-konqueror plugin diff --git a/ubuntu/maverick/tdebindings/debian/control.in b/ubuntu/maverick/tdebindings/debian/control.in index b9f3e717a..998cde21d 100644 --- a/ubuntu/maverick/tdebindings/debian/control.in +++ b/ubuntu/maverick/tdebindings/debian/control.in @@ -112,7 +112,6 @@ Package: libsmokeqt1 Architecture: any Section: libs Depends: ${shlibs:Depends} -Conflicts: libqt-perl (<= 3.008-1) Description: SMOKE Binding Library to Qt The "Scripting Meta Object Kompiler Engine" library is used by various KDE language bindings packages to provide interfaces to the @@ -124,7 +123,6 @@ Package: libsmokeqt-dev Architecture: any Section: libdevel Depends: libsmokeqt1 (= ${binary:Version}) -Conflicts: libqt-perl (<= 3.008-1) Description: SMOKE Binding Library to Qt - Development Files The "Scripting Meta Object Kompiler Engine" library is used by various KDE language bindings packages to provide interfaces to the diff --git a/ubuntu/maverick/tdebindings/debian/libqt0-ruby1.8-trinity.install b/ubuntu/maverick/tdebindings/debian/libqt0-ruby1.8-trinity.install index a1b654969..60f10d40e 100644 --- a/ubuntu/maverick/tdebindings/debian/libqt0-ruby1.8-trinity.install +++ b/ubuntu/maverick/tdebindings/debian/libqt0-ruby1.8-trinity.install @@ -9,7 +9,7 @@ debian/tmp/opt/trinity/lib/ruby/1.8/Qt.rb debian/tmp/opt/trinity/lib/ruby/1.8/*/qtruby.so* debian/tmp/opt/trinity/lib/ruby/1.8/*/qtruby.la -debian/tmp/opt/trinity/lib/ruby/1.8/*/qui.so* -debian/tmp/opt/trinity/lib/ruby/1.8/*/qui.la +debian/tmp/opt/trinity/lib/ruby/1.8/*/tqui.so* +debian/tmp/opt/trinity/lib/ruby/1.8/*/tqui.la qtruby/ChangeLog /opt/trinity/share/doc/libqt0-ruby1.8 diff --git a/ubuntu/maverick/tdebindings/debian/source/format b/ubuntu/maverick/tdebindings/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/tdebindings/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/tdebindings/debian/source/options b/ubuntu/maverick/tdebindings/debian/source/options new file mode 100644 index 000000000..9d7c8e036 --- /dev/null +++ b/ubuntu/maverick/tdebindings/debian/source/options @@ -0,0 +1,6 @@ +# Use bzip2 instead of gzip +compression = "bzip2" +compression-level = 9 + +# Don't run differences +diff-ignore = .* |