diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2012-05-07 01:06:22 +0200 |
|---|---|---|
| committer | Francois Andriot <francois.andriot@free.fr> | 2012-05-07 01:06:22 +0200 |
| commit | 08ebc32013861a40347207a40eea0af5e23d94b7 (patch) | |
| tree | e22eb168a2ed8a0688a8b87b993d75696a691d3c /ubuntu/maverick/applications/tde-guidance/debian | |
| parent | 9750a057f2f36c5b88a5bc53c0a051b605dac061 (diff) | |
| parent | 8e6f269bd5a2fb020a174b970873da39aad142c2 (diff) | |
| download | tde-packaging-08ebc32013861a40347207a40eea0af5e23d94b7.tar.gz tde-packaging-08ebc32013861a40347207a40eea0af5e23d94b7.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/applications/tde-guidance/debian')
3 files changed, 3 insertions, 3 deletions
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/control b/ubuntu/maverick/applications/tde-guidance/debian/control index 0a0b81471..1e6619c82 100644 --- a/ubuntu/maverick/applications/tde-guidance/debian/control +++ b/ubuntu/maverick/applications/tde-guidance/debian/control @@ -7,7 +7,7 @@ Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> Build-Depends: cdbs, debhelper (>= 5), chrpath, tdelibs4-trinity-dev, libpythonize0-trinity-dev, libtool, libxml2-utils, libxss-dev, libxxf86vm-dev, pytdeextensions-trinity, pytqt-tools, python-tqt, python-trinity-trinity, python-trinity-trinity-dev, python-sip4-dev, - python-support (>= 0.6), python2.6 (>= 2.5), python2.6-dev (>= 2.5), x11proto-scrnsaver-dev, python-tqt-dev, hwdata + python-support (>= 0.6), python-all (>= 2.5), python-all-dev (>= 2.5), x11proto-scrnsaver-dev, python-tqt-dev, hwdata Standards-Version: 3.8.4 Package: tde-guidance-trinity diff --git a/ubuntu/maverick/applications/tde-guidance/debian/python-distutils-jaunty.mk b/ubuntu/maverick/applications/tde-guidance/debian/python-distutils-jaunty.mk index 9c5e5211f..72efb646f 100644 --- a/ubuntu/maverick/applications/tde-guidance/debian/python-distutils-jaunty.mk +++ b/ubuntu/maverick/applications/tde-guidance/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/applications/tde-guidance/debian/rules b/ubuntu/maverick/applications/tde-guidance/debian/rules index e21db2b6b..df63d31b1 100755 --- a/ubuntu/maverick/applications/tde-guidance/debian/rules +++ b/ubuntu/maverick/applications/tde-guidance/debian/rules @@ -93,7 +93,7 @@ install/guidance-backends-trinity:: install -D -p -m0755 displayconfig/displayconfig-hwprobe.py \ $(PYSUPPORT_PATH)/guidance-backends-trinity/displayconfig-hwprobe.py - cp $(DEB_DESTDIR)/usr/lib/python2.6/site-packages/xf86misc.py $(PYSUPPORT_PATH)/guidance-backends-trinity + cp $(DEB_DESTDIR)/usr/lib/python*/site-packages/xf86misc.py $(PYSUPPORT_PATH)/guidance-backends-trinity cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/MicroHAL.py $(PYSUPPORT_PATH)/guidance-backends-trinity cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/ScanPCI.py $(PYSUPPORT_PATH)/guidance-backends-trinity cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/infimport.py $(PYSUPPORT_PATH)/guidance-backends-trinity |