summaryrefslogtreecommitdiffstats
path: root/ubuntu/precise
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-07-23 11:27:31 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2013-07-23 11:27:31 +0200
commita28a81a1e4d7de6ba67b1cd65d3f688582a0745e (patch)
tree7434e013d26b3944c3c47fd7648b4bf0d9c662a0 /ubuntu/precise
parent9ca62feb4da4e0a9e0b2ca23788517d7a09017f3 (diff)
parent2a941557a7a8911a4b33912a12aa9792fd8605f9 (diff)
downloadtde-packaging-a28a81a1e4d7de6ba67b1cd65d3f688582a0745e.tar.gz
tde-packaging-a28a81a1e4d7de6ba67b1cd65d3f688582a0745e.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/precise')
-rw-r--r--ubuntu/precise/libraries/libtqt-perl/debian/control2
-rwxr-xr-xubuntu/precise/libraries/libtqt-perl/debian/rules2
-rw-r--r--ubuntu/precise/metapackages/rename-meta/debian/control12
-rw-r--r--ubuntu/precise/tdebindings/debian/control20
-rw-r--r--ubuntu/precise/tdebindings/debian/libsmokekde-trinity-dev.install2
-rw-r--r--ubuntu/precise/tdebindings/debian/libsmokekde-trinity-dev.links1
-rw-r--r--ubuntu/precise/tdebindings/debian/libsmokekde1-trinity.install2
-rw-r--r--ubuntu/precise/tdebindings/debian/libsmokeqt-trinity-dev.install3
-rw-r--r--ubuntu/precise/tdebindings/debian/libsmokeqt-trinity-dev.links1
-rw-r--r--ubuntu/precise/tdebindings/debian/libsmokeqt1-trinity.install2
-rw-r--r--ubuntu/precise/tdebindings/debian/libsmoketde-trinity-dev.install2
-rw-r--r--ubuntu/precise/tdebindings/debian/libsmoketde-trinity-dev.links1
-rw-r--r--ubuntu/precise/tdebindings/debian/libsmoketde1-trinity.install2
-rw-r--r--ubuntu/precise/tdebindings/debian/libsmoketqt-trinity-dev.install3
-rw-r--r--ubuntu/precise/tdebindings/debian/libsmoketqt-trinity-dev.links1
-rw-r--r--ubuntu/precise/tdebindings/debian/libsmoketqt1-trinity.install2
-rwxr-xr-xubuntu/precise/tdebindings/debian/rules12
17 files changed, 41 insertions, 29 deletions
diff --git a/ubuntu/precise/libraries/libtqt-perl/debian/control b/ubuntu/precise/libraries/libtqt-perl/debian/control
index 3bef4f1d3..5be93f4a3 100644
--- a/ubuntu/precise/libraries/libtqt-perl/debian/control
+++ b/ubuntu/precise/libraries/libtqt-perl/debian/control
@@ -3,7 +3,7 @@ Section: perl
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Bart Martens <bartm@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libtqtinterface-dev, perl (>= 5.8.0), automake, autoconf, tdelibs4-trinity-dev, libsmokeqt-trinity-dev, chrpath, libtool (>= 1.5.2)
+Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libtqtinterface-dev, perl (>= 5.8.0), automake, autoconf, tdelibs4-trinity-dev, libsmoketqt-trinity-dev, chrpath, libtool (>= 1.5.2)
Build-Conflicts: libtqt-perl
Standards-Version: 3.8.4
diff --git a/ubuntu/precise/libraries/libtqt-perl/debian/rules b/ubuntu/precise/libraries/libtqt-perl/debian/rules
index 1d77c70fc..5efe954b5 100755
--- a/ubuntu/precise/libraries/libtqt-perl/debian/rules
+++ b/ubuntu/precise/libraries/libtqt-perl/debian/rules
@@ -15,7 +15,7 @@ SAVERESTORE=\
Makefile.in \
puic/Makefile.in \
smoke/Makefile.in \
- smoke/qt/Makefile.in \
+ smoke/tqt/Makefile.in \
PerlTQt/bin \
DEB_AUTO_UPDATE_AUTOCONF := 2.61
diff --git a/ubuntu/precise/metapackages/rename-meta/debian/control b/ubuntu/precise/metapackages/rename-meta/debian/control
index 8a3c151cb..bfc710599 100644
--- a/ubuntu/precise/metapackages/rename-meta/debian/control
+++ b/ubuntu/precise/metapackages/rename-meta/debian/control
@@ -1146,6 +1146,18 @@ Depends: tdebindings-java-trinity
Conflicts: kdebindings-java-trinity (< 4:13.9.9)
Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed.
+Package: libsmokeqt1-trinity
+Architecture: all
+Depends: libsmoketqt1-trinity
+Conflicts: libsmokeqt1-trinity (< 4:13.9.9)
+Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed.
+
+Package: libsmokeqt-trinity-dev
+Architecture: all
+Depends: libsmoketqt-trinity-dev
+Conflicts: libsmokeqt-trinity-dev (< 4:13.9.9)
+Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed.
+
Package: libsmokekde1-trinity
Architecture: all
Depends: libsmoketde1-trinity
diff --git a/ubuntu/precise/tdebindings/debian/control b/ubuntu/precise/tdebindings/debian/control
index 012a9cae0..ad28b4291 100644
--- a/ubuntu/precise/tdebindings/debian/control
+++ b/ubuntu/precise/tdebindings/debian/control
@@ -124,29 +124,29 @@ Description: tdelibs bindings for java ( Native libraries ) [Trinity]
.
This package is part of the official TDE bindings module.
-Package: libsmokeqt1-trinity
+Package: libsmoketqt1-trinity
Architecture: any
Section: libs
Replaces: libsmokeqt1-kde3 (<< 4:14.0.0), libsmokeqt1-trinity (<< 4:14.0.0)
Breaks: libsmokeqt1-kde3 (<< 4:14.0.0), libsmokeqt1-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Description: SMOKE Binding Library to Qt
+Description: SMOKE Binding Library to TQt
The "Scripting Meta Object Kompiler Engine" library is used by
various TDE language bindings packages to provide interfaces to the
- Qt library.
+ TQt library.
.
This package is part of the official TDE bindings module.
-Package: libsmokeqt-trinity-dev
+Package: libsmoketqt-trinity-dev
Architecture: any
Section: libdevel
Replaces: libsmokeqt-kde3-dev (<< 4:14.0.0), libsmokeqt-trinity-dev (<< 4:14.0.0)
Breaks: libsmokeqt-kde3-dev (<< 4:14.0.0), libsmokeqt-trinity-dev (<< 4:14.0.0)
-Depends: libsmokeqt1-trinity (= ${binary:Version})
-Description: SMOKE Binding Library to Qt - Development Files
+Depends: libsmoketqt1-trinity (= ${binary:Version})
+Description: SMOKE Binding Library to TQt - Development Files
The "Scripting Meta Object Kompiler Engine" library is used by
various TDE language bindings packages to provide interfaces to the
- Qt library. This package contains the development files for the
+ TQt library. This package contains the development files for the
library.
.
If you are a normal Debian user, you probably don't need this
@@ -154,7 +154,7 @@ Description: SMOKE Binding Library to Qt - Development Files
.
This package is part of the official TDE bindings module.
-Package: libsmokekde1-trinity
+Package: libsmoketde1-trinity
Architecture: any
Section: libs
Replaces: libsmokekde1-kde3 (<< 4:14.0.0), libsmokekde1-trinity (<< 4:14.0.0)
@@ -167,12 +167,12 @@ Description: SMOKE Binding Library to TDE
.
This package is part of the official TDE bindings module.
-Package: libsmokekde-trinity-dev
+Package: libsmoketde-trinity-dev
Architecture: any
Section: libdevel
Replaces: libsmokekde-kde3-dev (<< 4:14.0.0), libsmokekde-trinity-dev (<< 4:14.0.0)
Breaks: libsmokekde-kde3-dev (<< 4:14.0.0), libsmokekde-trinity-dev (<< 4:14.0.0)
-Depends: libsmokekde1-trinity (= ${binary:Version})
+Depends: libsmoketde1-trinity (= ${binary:Version})
Description: SMOKE Binding Library to TDE - Development Files
The "Scripting Meta Object Kompiler Engine" library is used by
various TDE language bindings packages to provide interfaces to the
diff --git a/ubuntu/precise/tdebindings/debian/libsmokekde-trinity-dev.install b/ubuntu/precise/tdebindings/debian/libsmokekde-trinity-dev.install
deleted file mode 100644
index 85021cc40..000000000
--- a/ubuntu/precise/tdebindings/debian/libsmokekde-trinity-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/opt/trinity/lib/libsmokekde.so
-debian/tmp/opt/trinity/lib/libsmokekde.la
diff --git a/ubuntu/precise/tdebindings/debian/libsmokekde-trinity-dev.links b/ubuntu/precise/tdebindings/debian/libsmokekde-trinity-dev.links
deleted file mode 100644
index da4b8e1a2..000000000
--- a/ubuntu/precise/tdebindings/debian/libsmokekde-trinity-dev.links
+++ /dev/null
@@ -1 +0,0 @@
-/opt/trinity/share/doc/libsmokekde1 /opt/trinity/share/doc/libsmokekde-dev
diff --git a/ubuntu/precise/tdebindings/debian/libsmokekde1-trinity.install b/ubuntu/precise/tdebindings/debian/libsmokekde1-trinity.install
deleted file mode 100644
index 173913313..000000000
--- a/ubuntu/precise/tdebindings/debian/libsmokekde1-trinity.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/opt/trinity/lib/libsmokekde.so.1.2.2
-debian/tmp/opt/trinity/lib/libsmokekde.so.1
diff --git a/ubuntu/precise/tdebindings/debian/libsmokeqt-trinity-dev.install b/ubuntu/precise/tdebindings/debian/libsmokeqt-trinity-dev.install
deleted file mode 100644
index 99a21c1de..000000000
--- a/ubuntu/precise/tdebindings/debian/libsmokeqt-trinity-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/opt/trinity/include/tde/smoke.h
-debian/tmp/opt/trinity/lib/libsmokeqt.so
-debian/tmp/opt/trinity/lib/libsmokeqt.la
diff --git a/ubuntu/precise/tdebindings/debian/libsmokeqt-trinity-dev.links b/ubuntu/precise/tdebindings/debian/libsmokeqt-trinity-dev.links
deleted file mode 100644
index ba0272c14..000000000
--- a/ubuntu/precise/tdebindings/debian/libsmokeqt-trinity-dev.links
+++ /dev/null
@@ -1 +0,0 @@
-/opt/trinity/share/doc/libsmokeqt1 /opt/trinity/share/doc/libsmokeqt-dev
diff --git a/ubuntu/precise/tdebindings/debian/libsmokeqt1-trinity.install b/ubuntu/precise/tdebindings/debian/libsmokeqt1-trinity.install
deleted file mode 100644
index 3bf2b300b..000000000
--- a/ubuntu/precise/tdebindings/debian/libsmokeqt1-trinity.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/opt/trinity/lib/libsmokeqt.so.1.2.2
-debian/tmp/opt/trinity/lib/libsmokeqt.so.1
diff --git a/ubuntu/precise/tdebindings/debian/libsmoketde-trinity-dev.install b/ubuntu/precise/tdebindings/debian/libsmoketde-trinity-dev.install
new file mode 100644
index 000000000..ccc7952cf
--- /dev/null
+++ b/ubuntu/precise/tdebindings/debian/libsmoketde-trinity-dev.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/lib/libsmoketde.so
+debian/tmp/opt/trinity/lib/libsmoketde.la
diff --git a/ubuntu/precise/tdebindings/debian/libsmoketde-trinity-dev.links b/ubuntu/precise/tdebindings/debian/libsmoketde-trinity-dev.links
new file mode 100644
index 000000000..bc9055637
--- /dev/null
+++ b/ubuntu/precise/tdebindings/debian/libsmoketde-trinity-dev.links
@@ -0,0 +1 @@
+/opt/trinity/share/doc/libsmoketde1 /opt/trinity/share/doc/libsmoketde-dev
diff --git a/ubuntu/precise/tdebindings/debian/libsmoketde1-trinity.install b/ubuntu/precise/tdebindings/debian/libsmoketde1-trinity.install
new file mode 100644
index 000000000..d36233050
--- /dev/null
+++ b/ubuntu/precise/tdebindings/debian/libsmoketde1-trinity.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/lib/libsmoketde.so.1.2.2
+debian/tmp/opt/trinity/lib/libsmoketde.so.1
diff --git a/ubuntu/precise/tdebindings/debian/libsmoketqt-trinity-dev.install b/ubuntu/precise/tdebindings/debian/libsmoketqt-trinity-dev.install
new file mode 100644
index 000000000..663329673
--- /dev/null
+++ b/ubuntu/precise/tdebindings/debian/libsmoketqt-trinity-dev.install
@@ -0,0 +1,3 @@
+debian/tmp/opt/trinity/include/tde/smoke.h
+debian/tmp/opt/trinity/lib/libsmoketqt.so
+debian/tmp/opt/trinity/lib/libsmoketqt.la
diff --git a/ubuntu/precise/tdebindings/debian/libsmoketqt-trinity-dev.links b/ubuntu/precise/tdebindings/debian/libsmoketqt-trinity-dev.links
new file mode 100644
index 000000000..36cc65f6e
--- /dev/null
+++ b/ubuntu/precise/tdebindings/debian/libsmoketqt-trinity-dev.links
@@ -0,0 +1 @@
+/opt/trinity/share/doc/libsmoketqt1 /opt/trinity/share/doc/libsmoketqt-dev
diff --git a/ubuntu/precise/tdebindings/debian/libsmoketqt1-trinity.install b/ubuntu/precise/tdebindings/debian/libsmoketqt1-trinity.install
new file mode 100644
index 000000000..9b2cbbe21
--- /dev/null
+++ b/ubuntu/precise/tdebindings/debian/libsmoketqt1-trinity.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/lib/libsmoketqt.so.1.2.2
+debian/tmp/opt/trinity/lib/libsmoketqt.so.1
diff --git a/ubuntu/precise/tdebindings/debian/rules b/ubuntu/precise/tdebindings/debian/rules
index b503f7580..2a486617b 100755
--- a/ubuntu/precise/tdebindings/debian/rules
+++ b/ubuntu/precise/tdebindings/debian/rules
@@ -40,7 +40,7 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
# These are not all the packages with libraries, but only those that
# need to be in DEB_SHLIBDEPS_INCLUDE...
-PACKAGES_WITH_LIBS = libqt3-jni-trinity libsmokeqt1-trinity libsmokekde1-trinity libkjsembed1-trinity
+PACKAGES_WITH_LIBS = libqt3-jni-trinity libsmoketqt1-trinity libsmoketde1-trinity libkjsembed1-trinity
# These packages do not ship files in /usr/lib so need not call ldconfig.
DEB_DH_MAKESHLIBS_ARGS_libtrinity-jni-trinity = -n
@@ -63,10 +63,10 @@ clean::
rm -f dcopjava/binding/libjavadcop.la
rm -f dcopjava/binding/org_kde_DCOP_Client.h
rm -f dcopjava/dcopidl2java/dcopidl2java.all_cpp.cpp
- rm -f smoke/kde/qtdefines
- rm -f smoke/kde/smokedata.cpp.diff
- rm -f smoke/qt/qtdefines
- rm -f smoke/qt/smokedata.cpp.diff
+ rm -f smoke/tde/qtdefines
+ rm -f smoke/tde/smokedata.cpp.diff
+ rm -f smoke/tqt/qtdefines
+ rm -f smoke/tqt/smokedata.cpp.diff
common-build-indep:: stamp-build-dcopjava
@@ -138,5 +138,5 @@ common-binary-post-install-indep::
PACKAGES_WITH_USD_SYMLINK = tdebindings-java-trinity libtrinity-java-trinity libqt3-java-trinity \
libdcop3-java-trinity-dev libdcop3-java-trinity \
- libsmokekde-trinity-dev libsmokeqt-trinity-dev \
+ libsmoketde-trinity-dev libsmoketqt-trinity-dev \
kjscmd-trinity libkjsembed-trinity-dev