Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

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} \
+  #make -C qmake || return 1
-		-sysconfdir /etc/qt \
+ ./configure -thread -fast 
-		-qt-gif \
+  make  
-		-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 
 
 }
 
 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
 } 

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
 

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
 

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