summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2014-01-18 18:47:35 +0100
committerSlávek Banko <slavek.banko@axis.cz>2014-01-18 18:50:29 +0100
commit6fc0f157ab987c78d0cc331b96e31e0d0c1db8ac (patch)
tree306b491e71427364b8977dc08a4006663e63298a
parentbfddfbd0b53a3f24927511d276779b175204a684 (diff)
downloadtde-packaging-6fc0f157ab987c78d0cc331b96e31e0d0c1db8ac.tar.gz
tde-packaging-6fc0f157ab987c78d0cc331b96e31e0d0c1db8ac.zip
Update python-sip-tqt dependencies in pytdeextensions on Debian and Ubuntu
Refresh patch to renamed kdedistutils => tdedistutils
-rw-r--r--debian/lenny/libraries/pytdeextensions/debian/control2
-rw-r--r--debian/lenny/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install2
-rw-r--r--debian/lenny/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff9
-rw-r--r--debian/lenny/libraries/pytdeextensions/debian/python-distutils-jaunty.mk2
-rwxr-xr-xdebian/lenny/libraries/pytdeextensions/debian/rules16
-rw-r--r--debian/squeeze/libraries/pytdeextensions/debian/control2
-rw-r--r--debian/squeeze/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install2
-rw-r--r--debian/squeeze/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff9
-rw-r--r--debian/squeeze/libraries/pytdeextensions/debian/python-distutils-jaunty.mk2
-rwxr-xr-xdebian/squeeze/libraries/pytdeextensions/debian/rules16
-rw-r--r--debian/wheezy/libraries/pytdeextensions/debian/control2
-rw-r--r--debian/wheezy/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install2
-rw-r--r--debian/wheezy/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff9
-rw-r--r--debian/wheezy/libraries/pytdeextensions/debian/python-distutils-jaunty.mk2
-rwxr-xr-xdebian/wheezy/libraries/pytdeextensions/debian/rules16
-rw-r--r--ubuntu/maverick/libraries/pytdeextensions/debian/control2
-rw-r--r--ubuntu/maverick/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install2
-rw-r--r--ubuntu/maverick/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff9
-rw-r--r--ubuntu/maverick/libraries/pytdeextensions/debian/python-distutils-jaunty.mk2
-rwxr-xr-xubuntu/maverick/libraries/pytdeextensions/debian/rules16
-rw-r--r--ubuntu/precise/libraries/pytdeextensions/debian/control2
-rw-r--r--ubuntu/precise/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install2
-rw-r--r--ubuntu/precise/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff9
-rw-r--r--ubuntu/precise/libraries/pytdeextensions/debian/python-distutils-jaunty.mk2
-rwxr-xr-xubuntu/precise/libraries/pytdeextensions/debian/rules16
-rw-r--r--ubuntu/raring/libraries/pytdeextensions/debian/control2
-rw-r--r--ubuntu/raring/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install2
-rw-r--r--ubuntu/raring/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff9
-rw-r--r--ubuntu/raring/libraries/pytdeextensions/debian/python-distutils-jaunty.mk2
-rwxr-xr-xubuntu/raring/libraries/pytdeextensions/debian/rules16
30 files changed, 84 insertions, 102 deletions
diff --git a/debian/lenny/libraries/pytdeextensions/debian/control b/debian/lenny/libraries/pytdeextensions/debian/control
index 2882d612d..55052054e 100644
--- a/debian/lenny/libraries/pytdeextensions/debian/control
+++ b/debian/lenny/libraries/pytdeextensions/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, tdelibs14-trinity, libtool,
libxml2-utils, libxrandr-dev, libxxf86vm-dev, pytqt-tools, python-trinity-trinity,
- python-tqt-dev, python-sip4-dev, python-support (>= 0.6), python (>= 2.5), python-all-dev (>= 2.5)
+ python-tqt-dev, python-sip-tqt-dev, python-support (>= 0.6), python (>= 2.5), python-all-dev (>= 2.5)
Standards-Version: 3.8.4
Package: pytdeextensions-trinity
diff --git a/debian/lenny/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install b/debian/lenny/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install
index d7e5bd651..5e9fd1f3e 100644
--- a/debian/lenny/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install
+++ b/debian/lenny/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install
@@ -1,4 +1,4 @@
-opt/trinity/include/tde/pythonize.h
+opt/trinity/include/pythonize.h
opt/trinity/lib/libpythonize.a
opt/trinity/lib/libpythonize.la
opt/trinity/lib/libpythonize.so
diff --git a/debian/lenny/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff b/debian/lenny/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff
index dc0a1227d..3a65ff190 100644
--- a/debian/lenny/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff
+++ b/debian/lenny/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff
@@ -1,7 +1,8 @@
-diff -Nur pytdeextensions/src/kdedistutils.py pytdeextensions/src/kdedistutils.py
---- pytdeextensions/src/kdedistutils.py
-+++ pytdeextensions/src/kdedistutils.py
-@@ -2184,7 +2184,7 @@
+Index: b/src/tdedistutils.py
+===================================================================
+--- a/src/tdedistutils.py
++++ b/src/tdedistutils.py
+@@ -2272,7 +2272,7 @@
###########################################################################
def get_libdir_name():
diff --git a/debian/lenny/libraries/pytdeextensions/debian/python-distutils-jaunty.mk b/debian/lenny/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
index db329306c..1a1ec9a8e 100644
--- a/debian/lenny/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
+++ b/debian/lenny/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
@@ -83,7 +83,7 @@ endif # pysupport
ifndef DEB_PYTHON_SYSTEM
DEB_PYTHON_COMPILE_VERSION =
-DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5 2.6
+DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5 2.6 2.7
else
# default package is the first one declared in 'debian/control'
# (override if necessary)
diff --git a/debian/lenny/libraries/pytdeextensions/debian/rules b/debian/lenny/libraries/pytdeextensions/debian/rules
index 587245828..1c032e04c 100755
--- a/debian/lenny/libraries/pytdeextensions/debian/rules
+++ b/debian/lenny/libraries/pytdeextensions/debian/rules
@@ -8,15 +8,19 @@ include debian/python-distutils-jaunty.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+DEB_PYTHON_INSTALL_ARGS_ALL += \
+ --install-clib=/opt/trinity/lib \
+ --install-cheaders=/opt/trinity/include
+
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
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/tde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
@@ -40,16 +44,8 @@ install/pytdeextensions-trinity::
find . -type f -name '*.py[co]' | xargs rm -f
install/libpythonize0-trinity::
- # Move the files where they belong
- mkdir -p debian/tmp/opt/trinity/lib
- mv debian/tmp/usr/lib/libpythonize* debian/tmp/opt/trinity/lib/ || echo "moving files 1/2"
- mv debian/tmp/usr/include debian/tmp/opt/trinity/ || echo "moving files 2/2"
-
# fix binary-or-shlib-defines-rpath
chrpath -d debian/tmp/opt/trinity/lib/libpythonize.so.*
- # fix include directory location
- mkdir -p debian/tmp/opt/trinity/include/tde
- mv debian/tmp/opt/trinity/include/*.h debian/tmp/opt/trinity/include/tde
clean::
rm -rf build
diff --git a/debian/squeeze/libraries/pytdeextensions/debian/control b/debian/squeeze/libraries/pytdeextensions/debian/control
index 2882d612d..55052054e 100644
--- a/debian/squeeze/libraries/pytdeextensions/debian/control
+++ b/debian/squeeze/libraries/pytdeextensions/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, tdelibs14-trinity, libtool,
libxml2-utils, libxrandr-dev, libxxf86vm-dev, pytqt-tools, python-trinity-trinity,
- python-tqt-dev, python-sip4-dev, python-support (>= 0.6), python (>= 2.5), python-all-dev (>= 2.5)
+ python-tqt-dev, python-sip-tqt-dev, python-support (>= 0.6), python (>= 2.5), python-all-dev (>= 2.5)
Standards-Version: 3.8.4
Package: pytdeextensions-trinity
diff --git a/debian/squeeze/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install b/debian/squeeze/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install
index d7e5bd651..5e9fd1f3e 100644
--- a/debian/squeeze/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install
+++ b/debian/squeeze/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install
@@ -1,4 +1,4 @@
-opt/trinity/include/tde/pythonize.h
+opt/trinity/include/pythonize.h
opt/trinity/lib/libpythonize.a
opt/trinity/lib/libpythonize.la
opt/trinity/lib/libpythonize.so
diff --git a/debian/squeeze/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff b/debian/squeeze/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff
index dc0a1227d..3a65ff190 100644
--- a/debian/squeeze/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff
+++ b/debian/squeeze/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff
@@ -1,7 +1,8 @@
-diff -Nur pytdeextensions/src/kdedistutils.py pytdeextensions/src/kdedistutils.py
---- pytdeextensions/src/kdedistutils.py
-+++ pytdeextensions/src/kdedistutils.py
-@@ -2184,7 +2184,7 @@
+Index: b/src/tdedistutils.py
+===================================================================
+--- a/src/tdedistutils.py
++++ b/src/tdedistutils.py
+@@ -2272,7 +2272,7 @@
###########################################################################
def get_libdir_name():
diff --git a/debian/squeeze/libraries/pytdeextensions/debian/python-distutils-jaunty.mk b/debian/squeeze/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
index db329306c..1a1ec9a8e 100644
--- a/debian/squeeze/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
+++ b/debian/squeeze/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
@@ -83,7 +83,7 @@ endif # pysupport
ifndef DEB_PYTHON_SYSTEM
DEB_PYTHON_COMPILE_VERSION =
-DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5 2.6
+DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5 2.6 2.7
else
# default package is the first one declared in 'debian/control'
# (override if necessary)
diff --git a/debian/squeeze/libraries/pytdeextensions/debian/rules b/debian/squeeze/libraries/pytdeextensions/debian/rules
index 3147af02a..308059b26 100755
--- a/debian/squeeze/libraries/pytdeextensions/debian/rules
+++ b/debian/squeeze/libraries/pytdeextensions/debian/rules
@@ -8,15 +8,19 @@ include debian/python-distutils-jaunty.mk
#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+DEB_PYTHON_INSTALL_ARGS_ALL += \
+ --install-clib=/opt/trinity/lib \
+ --install-cheaders=/opt/trinity/include
+
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
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/tde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
@@ -40,16 +44,8 @@ install/pytdeextensions-trinity::
find . -type f -name '*.py[co]' | xargs rm -f
install/libpythonize0-trinity::
- # Move the files where they belong
- mkdir -p debian/tmp/opt/trinity/lib
- mv debian/tmp/usr/lib/libpythonize* debian/tmp/opt/trinity/lib/ || echo "moving files 1/2"
- mv debian/tmp/usr/include debian/tmp/opt/trinity/ || echo "moving files 2/2"
-
# fix binary-or-shlib-defines-rpath
chrpath -d debian/tmp/opt/trinity/lib/libpythonize.so.*
- # fix include directory location
- mkdir -p debian/tmp/opt/trinity/include/tde
- mv debian/tmp/opt/trinity/include/*.h debian/tmp/opt/trinity/include/tde
clean::
rm -rf build
diff --git a/debian/wheezy/libraries/pytdeextensions/debian/control b/debian/wheezy/libraries/pytdeextensions/debian/control
index 2882d612d..55052054e 100644
--- a/debian/wheezy/libraries/pytdeextensions/debian/control
+++ b/debian/wheezy/libraries/pytdeextensions/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, tdelibs14-trinity, libtool,
libxml2-utils, libxrandr-dev, libxxf86vm-dev, pytqt-tools, python-trinity-trinity,
- python-tqt-dev, python-sip4-dev, python-support (>= 0.6), python (>= 2.5), python-all-dev (>= 2.5)
+ python-tqt-dev, python-sip-tqt-dev, python-support (>= 0.6), python (>= 2.5), python-all-dev (>= 2.5)
Standards-Version: 3.8.4
Package: pytdeextensions-trinity
diff --git a/debian/wheezy/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install b/debian/wheezy/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install
index d7e5bd651..5e9fd1f3e 100644
--- a/debian/wheezy/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install
+++ b/debian/wheezy/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install
@@ -1,4 +1,4 @@
-opt/trinity/include/tde/pythonize.h
+opt/trinity/include/pythonize.h
opt/trinity/lib/libpythonize.a
opt/trinity/lib/libpythonize.la
opt/trinity/lib/libpythonize.so
diff --git a/debian/wheezy/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff b/debian/wheezy/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff
index dc0a1227d..3a65ff190 100644
--- a/debian/wheezy/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff
+++ b/debian/wheezy/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff
@@ -1,7 +1,8 @@
-diff -Nur pytdeextensions/src/kdedistutils.py pytdeextensions/src/kdedistutils.py
---- pytdeextensions/src/kdedistutils.py
-+++ pytdeextensions/src/kdedistutils.py
-@@ -2184,7 +2184,7 @@
+Index: b/src/tdedistutils.py
+===================================================================
+--- a/src/tdedistutils.py
++++ b/src/tdedistutils.py
+@@ -2272,7 +2272,7 @@
###########################################################################
def get_libdir_name():
diff --git a/debian/wheezy/libraries/pytdeextensions/debian/python-distutils-jaunty.mk b/debian/wheezy/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
index db329306c..1a1ec9a8e 100644
--- a/debian/wheezy/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
+++ b/debian/wheezy/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
@@ -83,7 +83,7 @@ endif # pysupport
ifndef DEB_PYTHON_SYSTEM
DEB_PYTHON_COMPILE_VERSION =
-DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5 2.6
+DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5 2.6 2.7
else
# default package is the first one declared in 'debian/control'
# (override if necessary)
diff --git a/debian/wheezy/libraries/pytdeextensions/debian/rules b/debian/wheezy/libraries/pytdeextensions/debian/rules
index 3147af02a..308059b26 100755
--- a/debian/wheezy/libraries/pytdeextensions/debian/rules
+++ b/debian/wheezy/libraries/pytdeextensions/debian/rules
@@ -8,15 +8,19 @@ include debian/python-distutils-jaunty.mk
#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+DEB_PYTHON_INSTALL_ARGS_ALL += \
+ --install-clib=/opt/trinity/lib \
+ --install-cheaders=/opt/trinity/include
+
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
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/tde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
@@ -40,16 +44,8 @@ install/pytdeextensions-trinity::
find . -type f -name '*.py[co]' | xargs rm -f
install/libpythonize0-trinity::
- # Move the files where they belong
- mkdir -p debian/tmp/opt/trinity/lib
- mv debian/tmp/usr/lib/libpythonize* debian/tmp/opt/trinity/lib/ || echo "moving files 1/2"
- mv debian/tmp/usr/include debian/tmp/opt/trinity/ || echo "moving files 2/2"
-
# fix binary-or-shlib-defines-rpath
chrpath -d debian/tmp/opt/trinity/lib/libpythonize.so.*
- # fix include directory location
- mkdir -p debian/tmp/opt/trinity/include/tde
- mv debian/tmp/opt/trinity/include/*.h debian/tmp/opt/trinity/include/tde
clean::
rm -rf build
diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/control b/ubuntu/maverick/libraries/pytdeextensions/debian/control
index f48c8da1e..985e1a93c 100644
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/control
+++ b/ubuntu/maverick/libraries/pytdeextensions/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, tdelibs14-trinity, libtool,
libxml2-utils, libxrandr-dev, libxxf86vm-dev, pytqt-tools, python-trinity-trinity,
- python-tqt-dev, python-sip4-dev, python-support (>= 0.6), python-all (>= 2.5), python-all-dev (>= 2.5)
+ python-tqt-dev, python-sip-tqt-dev, python-support (>= 0.6), python-all (>= 2.5), python-all-dev (>= 2.5)
Standards-Version: 3.8.4
Package: pytdeextensions-trinity
diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install b/ubuntu/maverick/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install
index d7e5bd651..5e9fd1f3e 100644
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install
+++ b/ubuntu/maverick/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install
@@ -1,4 +1,4 @@
-opt/trinity/include/tde/pythonize.h
+opt/trinity/include/pythonize.h
opt/trinity/lib/libpythonize.a
opt/trinity/lib/libpythonize.la
opt/trinity/lib/libpythonize.so
diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff b/ubuntu/maverick/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff
index dc0a1227d..3a65ff190 100644
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff
+++ b/ubuntu/maverick/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff
@@ -1,7 +1,8 @@
-diff -Nur pytdeextensions/src/kdedistutils.py pytdeextensions/src/kdedistutils.py
---- pytdeextensions/src/kdedistutils.py
-+++ pytdeextensions/src/kdedistutils.py
-@@ -2184,7 +2184,7 @@
+Index: b/src/tdedistutils.py
+===================================================================
+--- a/src/tdedistutils.py
++++ b/src/tdedistutils.py
+@@ -2272,7 +2272,7 @@
###########################################################################
def get_libdir_name():
diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/python-distutils-jaunty.mk b/ubuntu/maverick/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
index db329306c..1a1ec9a8e 100644
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
+++ b/ubuntu/maverick/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
@@ -83,7 +83,7 @@ endif # pysupport
ifndef DEB_PYTHON_SYSTEM
DEB_PYTHON_COMPILE_VERSION =
-DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5 2.6
+DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5 2.6 2.7
else
# default package is the first one declared in 'debian/control'
# (override if necessary)
diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/rules b/ubuntu/maverick/libraries/pytdeextensions/debian/rules
index 3147af02a..308059b26 100755
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/rules
+++ b/ubuntu/maverick/libraries/pytdeextensions/debian/rules
@@ -8,15 +8,19 @@ include debian/python-distutils-jaunty.mk
#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+DEB_PYTHON_INSTALL_ARGS_ALL += \
+ --install-clib=/opt/trinity/lib \
+ --install-cheaders=/opt/trinity/include
+
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
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/tde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
@@ -40,16 +44,8 @@ install/pytdeextensions-trinity::
find . -type f -name '*.py[co]' | xargs rm -f
install/libpythonize0-trinity::
- # Move the files where they belong
- mkdir -p debian/tmp/opt/trinity/lib
- mv debian/tmp/usr/lib/libpythonize* debian/tmp/opt/trinity/lib/ || echo "moving files 1/2"
- mv debian/tmp/usr/include debian/tmp/opt/trinity/ || echo "moving files 2/2"
-
# fix binary-or-shlib-defines-rpath
chrpath -d debian/tmp/opt/trinity/lib/libpythonize.so.*
- # fix include directory location
- mkdir -p debian/tmp/opt/trinity/include/tde
- mv debian/tmp/opt/trinity/include/*.h debian/tmp/opt/trinity/include/tde
clean::
rm -rf build
diff --git a/ubuntu/precise/libraries/pytdeextensions/debian/control b/ubuntu/precise/libraries/pytdeextensions/debian/control
index f48c8da1e..985e1a93c 100644
--- a/ubuntu/precise/libraries/pytdeextensions/debian/control
+++ b/ubuntu/precise/libraries/pytdeextensions/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, tdelibs14-trinity, libtool,
libxml2-utils, libxrandr-dev, libxxf86vm-dev, pytqt-tools, python-trinity-trinity,
- python-tqt-dev, python-sip4-dev, python-support (>= 0.6), python-all (>= 2.5), python-all-dev (>= 2.5)
+ python-tqt-dev, python-sip-tqt-dev, python-support (>= 0.6), python-all (>= 2.5), python-all-dev (>= 2.5)
Standards-Version: 3.8.4
Package: pytdeextensions-trinity
diff --git a/ubuntu/precise/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install b/ubuntu/precise/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install
index d7e5bd651..5e9fd1f3e 100644
--- a/ubuntu/precise/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install
+++ b/ubuntu/precise/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install
@@ -1,4 +1,4 @@
-opt/trinity/include/tde/pythonize.h
+opt/trinity/include/pythonize.h
opt/trinity/lib/libpythonize.a
opt/trinity/lib/libpythonize.la
opt/trinity/lib/libpythonize.so
diff --git a/ubuntu/precise/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff b/ubuntu/precise/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff
index dc0a1227d..3a65ff190 100644
--- a/ubuntu/precise/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff
+++ b/ubuntu/precise/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff
@@ -1,7 +1,8 @@
-diff -Nur pytdeextensions/src/kdedistutils.py pytdeextensions/src/kdedistutils.py
---- pytdeextensions/src/kdedistutils.py
-+++ pytdeextensions/src/kdedistutils.py
-@@ -2184,7 +2184,7 @@
+Index: b/src/tdedistutils.py
+===================================================================
+--- a/src/tdedistutils.py
++++ b/src/tdedistutils.py
+@@ -2272,7 +2272,7 @@
###########################################################################
def get_libdir_name():
diff --git a/ubuntu/precise/libraries/pytdeextensions/debian/python-distutils-jaunty.mk b/ubuntu/precise/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
index db329306c..1a1ec9a8e 100644
--- a/ubuntu/precise/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
+++ b/ubuntu/precise/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
@@ -83,7 +83,7 @@ endif # pysupport
ifndef DEB_PYTHON_SYSTEM
DEB_PYTHON_COMPILE_VERSION =
-DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5 2.6
+DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5 2.6 2.7
else
# default package is the first one declared in 'debian/control'
# (override if necessary)
diff --git a/ubuntu/precise/libraries/pytdeextensions/debian/rules b/ubuntu/precise/libraries/pytdeextensions/debian/rules
index 3147af02a..308059b26 100755
--- a/ubuntu/precise/libraries/pytdeextensions/debian/rules
+++ b/ubuntu/precise/libraries/pytdeextensions/debian/rules
@@ -8,15 +8,19 @@ include debian/python-distutils-jaunty.mk
#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+DEB_PYTHON_INSTALL_ARGS_ALL += \
+ --install-clib=/opt/trinity/lib \
+ --install-cheaders=/opt/trinity/include
+
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
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/tde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
@@ -40,16 +44,8 @@ install/pytdeextensions-trinity::
find . -type f -name '*.py[co]' | xargs rm -f
install/libpythonize0-trinity::
- # Move the files where they belong
- mkdir -p debian/tmp/opt/trinity/lib
- mv debian/tmp/usr/lib/libpythonize* debian/tmp/opt/trinity/lib/ || echo "moving files 1/2"
- mv debian/tmp/usr/include debian/tmp/opt/trinity/ || echo "moving files 2/2"
-
# fix binary-or-shlib-defines-rpath
chrpath -d debian/tmp/opt/trinity/lib/libpythonize.so.*
- # fix include directory location
- mkdir -p debian/tmp/opt/trinity/include/tde
- mv debian/tmp/opt/trinity/include/*.h debian/tmp/opt/trinity/include/tde
clean::
rm -rf build
diff --git a/ubuntu/raring/libraries/pytdeextensions/debian/control b/ubuntu/raring/libraries/pytdeextensions/debian/control
index f48c8da1e..985e1a93c 100644
--- a/ubuntu/raring/libraries/pytdeextensions/debian/control
+++ b/ubuntu/raring/libraries/pytdeextensions/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, tdelibs14-trinity, libtool,
libxml2-utils, libxrandr-dev, libxxf86vm-dev, pytqt-tools, python-trinity-trinity,
- python-tqt-dev, python-sip4-dev, python-support (>= 0.6), python-all (>= 2.5), python-all-dev (>= 2.5)
+ python-tqt-dev, python-sip-tqt-dev, python-support (>= 0.6), python-all (>= 2.5), python-all-dev (>= 2.5)
Standards-Version: 3.8.4
Package: pytdeextensions-trinity
diff --git a/ubuntu/raring/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install b/ubuntu/raring/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install
index d7e5bd651..5e9fd1f3e 100644
--- a/ubuntu/raring/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install
+++ b/ubuntu/raring/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install
@@ -1,4 +1,4 @@
-opt/trinity/include/tde/pythonize.h
+opt/trinity/include/pythonize.h
opt/trinity/lib/libpythonize.a
opt/trinity/lib/libpythonize.la
opt/trinity/lib/libpythonize.so
diff --git a/ubuntu/raring/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff b/ubuntu/raring/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff
index dc0a1227d..3a65ff190 100644
--- a/ubuntu/raring/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff
+++ b/ubuntu/raring/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff
@@ -1,7 +1,8 @@
-diff -Nur pytdeextensions/src/kdedistutils.py pytdeextensions/src/kdedistutils.py
---- pytdeextensions/src/kdedistutils.py
-+++ pytdeextensions/src/kdedistutils.py
-@@ -2184,7 +2184,7 @@
+Index: b/src/tdedistutils.py
+===================================================================
+--- a/src/tdedistutils.py
++++ b/src/tdedistutils.py
+@@ -2272,7 +2272,7 @@
###########################################################################
def get_libdir_name():
diff --git a/ubuntu/raring/libraries/pytdeextensions/debian/python-distutils-jaunty.mk b/ubuntu/raring/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
index db329306c..1a1ec9a8e 100644
--- a/ubuntu/raring/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
+++ b/ubuntu/raring/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
@@ -83,7 +83,7 @@ endif # pysupport
ifndef DEB_PYTHON_SYSTEM
DEB_PYTHON_COMPILE_VERSION =
-DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5 2.6
+DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5 2.6 2.7
else
# default package is the first one declared in 'debian/control'
# (override if necessary)
diff --git a/ubuntu/raring/libraries/pytdeextensions/debian/rules b/ubuntu/raring/libraries/pytdeextensions/debian/rules
index 3147af02a..308059b26 100755
--- a/ubuntu/raring/libraries/pytdeextensions/debian/rules
+++ b/ubuntu/raring/libraries/pytdeextensions/debian/rules
@@ -8,15 +8,19 @@ include debian/python-distutils-jaunty.mk
#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+DEB_PYTHON_INSTALL_ARGS_ALL += \
+ --install-clib=/opt/trinity/lib \
+ --install-cheaders=/opt/trinity/include
+
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
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/tde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
@@ -40,16 +44,8 @@ install/pytdeextensions-trinity::
find . -type f -name '*.py[co]' | xargs rm -f
install/libpythonize0-trinity::
- # Move the files where they belong
- mkdir -p debian/tmp/opt/trinity/lib
- mv debian/tmp/usr/lib/libpythonize* debian/tmp/opt/trinity/lib/ || echo "moving files 1/2"
- mv debian/tmp/usr/include debian/tmp/opt/trinity/ || echo "moving files 2/2"
-
# fix binary-or-shlib-defines-rpath
chrpath -d debian/tmp/opt/trinity/lib/libpythonize.so.*
- # fix include directory location
- mkdir -p debian/tmp/opt/trinity/include/tde
- mv debian/tmp/opt/trinity/include/*.h debian/tmp/opt/trinity/include/tde
clean::
rm -rf build