summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Andriot <francois.andriot@free.fr>2011-12-04 10:20:35 +0100
committerFrancois Andriot <francois.andriot@free.fr>2011-12-04 10:20:35 +0100
commitcfb24d2ee2b35a7278e63370a8036d753f2b9f88 (patch)
tree29e4f56b3a3a1265101e4fa5efb465c21b45db42
parent1403b853a44ae293197d67e0e9c5f7c59a87787f (diff)
parent7d0fe729b027f5e966a3ef7aecaecbed287ca945 (diff)
downloadtde-packaging-cfb24d2ee2b35a7278e63370a8036d753f2b9f88.tar.gz
tde-packaging-cfb24d2ee2b35a7278e63370a8036d753f2b9f88.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat
-rw-r--r--debian/lenny/dependencies/python-tqt/debian/control4
-rwxr-xr-xdebian/lenny/dependencies/python-tqt/debian/rules11
-rwxr-xr-xdebian/lenny/tde-i18n/debian/rules2
-rw-r--r--debian/squeeze/dependencies/python-tqt/debian/control4
-rwxr-xr-xdebian/squeeze/dependencies/python-tqt/debian/rules11
-rwxr-xr-xdebian/squeeze/tde-i18n/debian/rules2
-rw-r--r--ubuntu/maverick/dependencies/python-tqt/debian/control4
-rwxr-xr-xubuntu/maverick/dependencies/python-tqt/debian/rules11
-rwxr-xr-xubuntu/maverick/tde-i18n/debian/rules2
9 files changed, 27 insertions, 24 deletions
diff --git a/debian/lenny/dependencies/python-tqt/debian/control b/debian/lenny/dependencies/python-tqt/debian/control
index 9354c760b..79b5b4582 100644
--- a/debian/lenny/dependencies/python-tqt/debian/control
+++ b/debian/lenny/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 (>= 3:3.3.4-4), tqt3-dev-tools (>= 3:3.3.4-4), tqt3-apps-dev (>= 3:3.3.4-4), python-sip-dev (>= 4.10.0-2ubuntu1), libqscintilla-dev (>= 1.7), python-support (>= 0.7.1), python-sip-dbg, python-all-dbg
+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
Standards-Version: 3.8.4
Package: python-tqt
@@ -72,7 +72,7 @@ Package: python-tqtext-dbg
Priority: extra
Section: debug
Architecture: any
-Depends: ${shlibs:Depends}, python-dbg, python-qtext (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends}
+Depends: ${shlibs:Depends}, python-dbg, python-tqtext (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends}
Description: TQt debug extensions for PyQt
PyQt debug Extensions. Contains:
.
diff --git a/debian/lenny/dependencies/python-tqt/debian/rules b/debian/lenny/dependencies/python-tqt/debian/rules
index 0e74c131e..ebb91c6e4 100755
--- a/debian/lenny/dependencies/python-tqt/debian/rules
+++ b/debian/lenny/dependencies/python-tqt/debian/rules
@@ -25,6 +25,7 @@ ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
else
CXXFLAGS += -O1
endif
+CXXFLAGS += "-I/usr/include/tqt"
PYTHONS := $(shell pyversions -vr debian/control)
@@ -44,7 +45,7 @@ build-%/configure-stamp:
mkdir -p build-$*
cd build-$* && echo yes \
| python$* ../configure.py \
- -c -n /usr/include/qscintilla \
+ -c -n /usr/include/tqscintilla \
-o /usr/lib -u -j $(SPLIT) \
-d /usr/lib/python$*/$(call py_sitename,$*) \
-l /usr/include/python$* \
@@ -58,13 +59,13 @@ dbg-build-%/configure-stamp:
mkdir -p dbg-build-$*
cd dbg-build-$* && echo yes \
| python$*-dbg ../configure.py \
- -c -n /usr/include/qscintilla \
+ -c -n /usr/include/tqscintilla \
-o /usr/lib -u -j $(SPLIT) \
-d /usr/lib/python$*/$(call py_sitename,$*) \
-l /usr/include/python$*_d \
-v /usr/share/sip/tqt \
-m /usr/lib/python$*/config_d \
- CXXFLAGS_RELEASE="" CXXFLAGS="-O0 -g" STRIP=""
+ CXXFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt" STRIP=""
touch $@
build: $(PYTHONS:%=build-%/build-stamp) $(PYTHONS:%=dbg-build-%/build-stamp)
@@ -87,7 +88,7 @@ install-indep: configure
for version in ${PYTHONS}; do\
pylib=$$(python$$version -c 'from distutils import sysconfig; print sysconfig.get_python_lib()'); \
mkdir -p debian/python-tqt-dev/$$pylib;\
- install -m 644 -o root -g root build-$$version/pytqtconfig.py debian/python-tqt-dev/$$pylib;\
+ install -m 644 -o root -g root build-$$version/pyqtconfig.py debian/python-tqt-dev/$$pylib;\
done
dh_install -i
@@ -105,7 +106,7 @@ install-arch: build
mkdir -p debian/python-tqt-gl-dbg/$$pylib;\
mv debian/python-tqt-dbg/$$pylib/qtgl.so \
debian/python-tqt-gl-dbg/$$pylib/;\
- mkdir -p debian/python-qtext-dbg/$$pylib;\
+ mkdir -p debian/python-tqtext-dbg/$$pylib;\
mv debian/python-tqt-dbg/$$pylib/qtext.so \
debian/python-tqtext-dbg/$$pylib/;\
done
diff --git a/debian/lenny/tde-i18n/debian/rules b/debian/lenny/tde-i18n/debian/rules
index 60b78838f..f49804687 100755
--- a/debian/lenny/tde-i18n/debian/rules
+++ b/debian/lenny/tde-i18n/debian/rules
@@ -54,7 +54,7 @@ $(STAMP_EXTRACT):
$(STAMP_BUILD):
# Building the '$(cur_lang)' language ...
- cd $(cur_lang_dir) && ./configure $(configkde) && $(MAKE)
+ cd $(cur_lang_dir) && autoreconf && automake -f && $(MAKE) -f ../admin/Makefile.common && ./configure $(configkde) && $(MAKE)
touch $@
diff --git a/debian/squeeze/dependencies/python-tqt/debian/control b/debian/squeeze/dependencies/python-tqt/debian/control
index 9354c760b..79b5b4582 100644
--- a/debian/squeeze/dependencies/python-tqt/debian/control
+++ b/debian/squeeze/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 (>= 3:3.3.4-4), tqt3-dev-tools (>= 3:3.3.4-4), tqt3-apps-dev (>= 3:3.3.4-4), python-sip-dev (>= 4.10.0-2ubuntu1), libqscintilla-dev (>= 1.7), python-support (>= 0.7.1), python-sip-dbg, python-all-dbg
+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
Standards-Version: 3.8.4
Package: python-tqt
@@ -72,7 +72,7 @@ Package: python-tqtext-dbg
Priority: extra
Section: debug
Architecture: any
-Depends: ${shlibs:Depends}, python-dbg, python-qtext (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends}
+Depends: ${shlibs:Depends}, python-dbg, python-tqtext (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends}
Description: TQt debug extensions for PyQt
PyQt debug Extensions. Contains:
.
diff --git a/debian/squeeze/dependencies/python-tqt/debian/rules b/debian/squeeze/dependencies/python-tqt/debian/rules
index 0e74c131e..ebb91c6e4 100755
--- a/debian/squeeze/dependencies/python-tqt/debian/rules
+++ b/debian/squeeze/dependencies/python-tqt/debian/rules
@@ -25,6 +25,7 @@ ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
else
CXXFLAGS += -O1
endif
+CXXFLAGS += "-I/usr/include/tqt"
PYTHONS := $(shell pyversions -vr debian/control)
@@ -44,7 +45,7 @@ build-%/configure-stamp:
mkdir -p build-$*
cd build-$* && echo yes \
| python$* ../configure.py \
- -c -n /usr/include/qscintilla \
+ -c -n /usr/include/tqscintilla \
-o /usr/lib -u -j $(SPLIT) \
-d /usr/lib/python$*/$(call py_sitename,$*) \
-l /usr/include/python$* \
@@ -58,13 +59,13 @@ dbg-build-%/configure-stamp:
mkdir -p dbg-build-$*
cd dbg-build-$* && echo yes \
| python$*-dbg ../configure.py \
- -c -n /usr/include/qscintilla \
+ -c -n /usr/include/tqscintilla \
-o /usr/lib -u -j $(SPLIT) \
-d /usr/lib/python$*/$(call py_sitename,$*) \
-l /usr/include/python$*_d \
-v /usr/share/sip/tqt \
-m /usr/lib/python$*/config_d \
- CXXFLAGS_RELEASE="" CXXFLAGS="-O0 -g" STRIP=""
+ CXXFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt" STRIP=""
touch $@
build: $(PYTHONS:%=build-%/build-stamp) $(PYTHONS:%=dbg-build-%/build-stamp)
@@ -87,7 +88,7 @@ install-indep: configure
for version in ${PYTHONS}; do\
pylib=$$(python$$version -c 'from distutils import sysconfig; print sysconfig.get_python_lib()'); \
mkdir -p debian/python-tqt-dev/$$pylib;\
- install -m 644 -o root -g root build-$$version/pytqtconfig.py debian/python-tqt-dev/$$pylib;\
+ install -m 644 -o root -g root build-$$version/pyqtconfig.py debian/python-tqt-dev/$$pylib;\
done
dh_install -i
@@ -105,7 +106,7 @@ install-arch: build
mkdir -p debian/python-tqt-gl-dbg/$$pylib;\
mv debian/python-tqt-dbg/$$pylib/qtgl.so \
debian/python-tqt-gl-dbg/$$pylib/;\
- mkdir -p debian/python-qtext-dbg/$$pylib;\
+ mkdir -p debian/python-tqtext-dbg/$$pylib;\
mv debian/python-tqt-dbg/$$pylib/qtext.so \
debian/python-tqtext-dbg/$$pylib/;\
done
diff --git a/debian/squeeze/tde-i18n/debian/rules b/debian/squeeze/tde-i18n/debian/rules
index 60b78838f..f49804687 100755
--- a/debian/squeeze/tde-i18n/debian/rules
+++ b/debian/squeeze/tde-i18n/debian/rules
@@ -54,7 +54,7 @@ $(STAMP_EXTRACT):
$(STAMP_BUILD):
# Building the '$(cur_lang)' language ...
- cd $(cur_lang_dir) && ./configure $(configkde) && $(MAKE)
+ cd $(cur_lang_dir) && autoreconf && automake -f && $(MAKE) -f ../admin/Makefile.common && ./configure $(configkde) && $(MAKE)
touch $@
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/control b/ubuntu/maverick/dependencies/python-tqt/debian/control
index 9354c760b..79b5b4582 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 (>= 3:3.3.4-4), tqt3-dev-tools (>= 3:3.3.4-4), tqt3-apps-dev (>= 3:3.3.4-4), python-sip-dev (>= 4.10.0-2ubuntu1), libqscintilla-dev (>= 1.7), python-support (>= 0.7.1), python-sip-dbg, python-all-dbg
+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
Standards-Version: 3.8.4
Package: python-tqt
@@ -72,7 +72,7 @@ Package: python-tqtext-dbg
Priority: extra
Section: debug
Architecture: any
-Depends: ${shlibs:Depends}, python-dbg, python-qtext (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends}
+Depends: ${shlibs:Depends}, python-dbg, python-tqtext (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends}
Description: TQt debug extensions for PyQt
PyQt debug Extensions. Contains:
.
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/rules b/ubuntu/maverick/dependencies/python-tqt/debian/rules
index 0e74c131e..ebb91c6e4 100755
--- a/ubuntu/maverick/dependencies/python-tqt/debian/rules
+++ b/ubuntu/maverick/dependencies/python-tqt/debian/rules
@@ -25,6 +25,7 @@ ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
else
CXXFLAGS += -O1
endif
+CXXFLAGS += "-I/usr/include/tqt"
PYTHONS := $(shell pyversions -vr debian/control)
@@ -44,7 +45,7 @@ build-%/configure-stamp:
mkdir -p build-$*
cd build-$* && echo yes \
| python$* ../configure.py \
- -c -n /usr/include/qscintilla \
+ -c -n /usr/include/tqscintilla \
-o /usr/lib -u -j $(SPLIT) \
-d /usr/lib/python$*/$(call py_sitename,$*) \
-l /usr/include/python$* \
@@ -58,13 +59,13 @@ dbg-build-%/configure-stamp:
mkdir -p dbg-build-$*
cd dbg-build-$* && echo yes \
| python$*-dbg ../configure.py \
- -c -n /usr/include/qscintilla \
+ -c -n /usr/include/tqscintilla \
-o /usr/lib -u -j $(SPLIT) \
-d /usr/lib/python$*/$(call py_sitename,$*) \
-l /usr/include/python$*_d \
-v /usr/share/sip/tqt \
-m /usr/lib/python$*/config_d \
- CXXFLAGS_RELEASE="" CXXFLAGS="-O0 -g" STRIP=""
+ CXXFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt" STRIP=""
touch $@
build: $(PYTHONS:%=build-%/build-stamp) $(PYTHONS:%=dbg-build-%/build-stamp)
@@ -87,7 +88,7 @@ install-indep: configure
for version in ${PYTHONS}; do\
pylib=$$(python$$version -c 'from distutils import sysconfig; print sysconfig.get_python_lib()'); \
mkdir -p debian/python-tqt-dev/$$pylib;\
- install -m 644 -o root -g root build-$$version/pytqtconfig.py debian/python-tqt-dev/$$pylib;\
+ install -m 644 -o root -g root build-$$version/pyqtconfig.py debian/python-tqt-dev/$$pylib;\
done
dh_install -i
@@ -105,7 +106,7 @@ install-arch: build
mkdir -p debian/python-tqt-gl-dbg/$$pylib;\
mv debian/python-tqt-dbg/$$pylib/qtgl.so \
debian/python-tqt-gl-dbg/$$pylib/;\
- mkdir -p debian/python-qtext-dbg/$$pylib;\
+ mkdir -p debian/python-tqtext-dbg/$$pylib;\
mv debian/python-tqt-dbg/$$pylib/qtext.so \
debian/python-tqtext-dbg/$$pylib/;\
done
diff --git a/ubuntu/maverick/tde-i18n/debian/rules b/ubuntu/maverick/tde-i18n/debian/rules
index 60b78838f..f49804687 100755
--- a/ubuntu/maverick/tde-i18n/debian/rules
+++ b/ubuntu/maverick/tde-i18n/debian/rules
@@ -54,7 +54,7 @@ $(STAMP_EXTRACT):
$(STAMP_BUILD):
# Building the '$(cur_lang)' language ...
- cd $(cur_lang_dir) && ./configure $(configkde) && $(MAKE)
+ cd $(cur_lang_dir) && autoreconf && automake -f && $(MAKE) -f ../admin/Makefile.common && ./configure $(configkde) && $(MAKE)
touch $@
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-10 15:32:39 +0000