diff options
| author | albator <albator@arcadia.vtf> | 2011-09-19 22:18:08 +0200 |
|---|---|---|
| committer | albator <albator@arcadia.vtf> | 2011-09-19 22:18:08 +0200 |
| commit | 33626df66b07d906d930e6382d8756613ed6302c (patch) | |
| tree | 13b19f3435e394d3cd58816c5ee9c713bd85e12e | |
| parent | 7097fba6916585b670bc24ac0275608108848a59 (diff) | |
| parent | 540dece0eebd5a0c748507d3cdcb2101318068ed (diff) | |
| download | tde-packaging-33626df66b07d906d930e6382d8756613ed6302c.tar.gz tde-packaging-33626df66b07d906d930e6382d8756613ed6302c.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
| -rw-r--r-- | arch/calvin/trinity-qt3/PKGBUILD | 45 | ||||
| -rwxr-xr-x | debian/lenny/kdebase/debian/rules | 4 | ||||
| -rwxr-xr-x | debian/squeeze/kdebase/debian/rules | 4 | ||||
| -rwxr-xr-x | ubuntu/maverick/kdebase/debian/rules | 4 |
4 files changed, 19 insertions, 38 deletions
diff --git a/arch/calvin/trinity-qt3/PKGBUILD b/arch/calvin/trinity-qt3/PKGBUILD index efa19d7f5..cf8a3ef51 100644 --- a/arch/calvin/trinity-qt3/PKGBUILD +++ b/arch/calvin/trinity-qt3/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Calvin Morrison <MutantTurkey@gmail.com> pkgname=trinity-qt3 -pkgver=20110907 +pkgver=20110918 pkgrel=1 pkgdesc="The Qt3 gui toolkit - with Trinity upstream" _prefix="/opt/qt" @@ -44,47 +44,22 @@ build() { - # remove unwanted mkspecs rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*} - # set arch if x86_64 build - if [ "$CARCH" = "x86_64" ]; then - export ARCH="-64" - else unset ARCH - fi - -# ./configure -prefix /opt/qt -platform linux-g++$ARCH \ -# -system-zlib -qt-gif -release -shared -sm -nis -thread -stl \ -# -system-lib{png,jpeg,mng} \ -# -no-g++-exceptions -plugin-sql-{mysql,psql,sqlite,odbc} + - msg "Starting configure..." - ./configure -prefix ${_prefix} \ - -sysconfdir /etc/qt \ - -qt-gif \ - -system-zlib \ - -system-libjpeg \ - -plugin-imgfmt-jpeg \ - -system-libmng \ - -plugin-imgfmt-mng \ - -system-libpng \ - -plugin-imgfmt-png \ - -plugin-sql-mysql \ - -plugin-sql-psql \ - -plugin-sql-sqlite \ - -no-exceptions \ - -thread \ - -no-tablet - #-platform linux-g++ - make -C qmake || return 1 - make + #make -C qmake || return 1 + ./configure -thread -fast + make } package() { + echo $PWD + echo $pkgdir + mkdir "$pkgdir/lib" + cd "$srcdir/$_gitname" + make INSTALL_ROOT="$pkgdir/lib/" install -echo $PWD -echo "woooot!" - make DESTDIR=${pkgdir} install } diff --git a/debian/lenny/kdebase/debian/rules b/debian/lenny/kdebase/debian/rules index ac42efaf8..9c11fa838 100755 --- a/debian/lenny/kdebase/debian/rules +++ b/debian/lenny/kdebase/debian/rules @@ -27,7 +27,9 @@ DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" - # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL = true -DEB_FIXPERMS_EXCLUDE := usr/bin/kdesud +DEB_FIXPERMS_EXCLUDE := \ + opt/trinity/bin/kdesud \ + opt/trinity/bin/kdmtsak DEB_DH_STRIP_ARGS := --dbg-package=kdebase-trinity-dbg diff --git a/debian/squeeze/kdebase/debian/rules b/debian/squeeze/kdebase/debian/rules index ac42efaf8..9c11fa838 100755 --- a/debian/squeeze/kdebase/debian/rules +++ b/debian/squeeze/kdebase/debian/rules @@ -27,7 +27,9 @@ DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" - # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL = true -DEB_FIXPERMS_EXCLUDE := usr/bin/kdesud +DEB_FIXPERMS_EXCLUDE := \ + opt/trinity/bin/kdesud \ + opt/trinity/bin/kdmtsak DEB_DH_STRIP_ARGS := --dbg-package=kdebase-trinity-dbg diff --git a/ubuntu/maverick/kdebase/debian/rules b/ubuntu/maverick/kdebase/debian/rules index 7ae20af33..1140cd013 100755 --- a/ubuntu/maverick/kdebase/debian/rules +++ b/ubuntu/maverick/kdebase/debian/rules @@ -27,7 +27,9 @@ DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" - # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL = true -DEB_FIXPERMS_EXCLUDE := usr/bin/kdesud +DEB_FIXPERMS_EXCLUDE := \ + opt/trinity/bin/kdesud \ + opt/trinity/bin/kdmtsak DEB_DH_STRIP_ARGS := --dbg-package=kdebase-trinity-dbg |