Date: Monday, March 5, 2012 @ 03:56:08 Author: ibiru Revision: 152211
db-move: moved liborigin2 from [testing] to [extra] (i686) Added: liborigin2/repos/extra-i686/PKGBUILD (from rev 152196, liborigin2/repos/testing-i686/PKGBUILD) liborigin2/repos/extra-i686/liborigin.pro.archlinux (from rev 152196, liborigin2/repos/testing-i686/liborigin.pro.archlinux) Deleted: liborigin2/repos/extra-i686/PKGBUILD liborigin2/repos/extra-i686/liborigin.pro.archlinux liborigin2/repos/testing-i686/ -------------------------+ PKGBUILD | 114 +++++++++++++++++++++++----------------------- liborigin.pro.archlinux | 61 ++++++++---------------- 2 files changed, 77 insertions(+), 98 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2012-03-05 08:56:07 UTC (rev 152210) +++ extra-i686/PKGBUILD 2012-03-05 08:56:08 UTC (rev 152211) @@ -1,57 +0,0 @@ -# $Id$ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: damir <da...@archlinux.org> - -pkgbase=liborigin2 -pkgname=('liborigin2' 'liborigin2-docs') -pkgver=20100913 -pkgrel=6 -arch=('i686' 'x86_64') -url="http://soft.proindependent.com/liborigin2/" -license=('GPL3') -makedepends=('doxygen' 'qt' 'boost') -replaces=('liborigin') -provides=('liborigin') -source=(http://download.berlios.de/qtiplot/${pkgbase}-13092010.zip - liborigin.pro.archlinux - http://tree.phi-sci.com/tree.hh) -md5sums=('e2b41c4d8a1e2d357dd2b5b331d31375' - '2b19f7a4bd120f6d689edc327468e48e' - '966ef25cb42d192a694a71eedf484c1c') - -build() { - cd "${srcdir}/${pkgbase}" - - install -Dm644 "${srcdir}/liborigin.pro.archlinux" ./liborigin.pro - install -Dm644 "${srcdir}/tree.hh" ./tree.hh # get the header back like it was in previous releases - qmake liborigin.pro QMAKESPEC=linux-g++ - make QTDIR=/usr/ QMAKESPEC=linux-g++ - - # create documentation - cd doc - doxygen -} - -package_liborigin2() { - pkgdesc="A library for reading OriginLab OPJ project files" - depends=('boost-libs') - - cd "${srcdir}/${pkgbase}" - - INSTALL_ROOT="${pkgdir}" make install - - # install missing includes - install -Dm644 tree.hh "${pkgdir}/usr/include/liborigin2/tree.hh" - for i in *.h; do - install -Dm644 ${i} "${pkgdir}/usr/include/liborigin2/${i}" - done -} -package_liborigin2-docs() { - pkgdesc="Documentation for liborigin2: a library for reading OriginLab OPJ project files" - - cd "${srcdir}/${pkgbase}/doc" - install -d "${pkgdir}/usr/share/doc/${pkgbase}" - cp -rf html/* "${pkgdir}/usr/share/doc/${pkgbase}" - chmod 755 "${pkgdir}/usr/share/doc/liborigin2/images" - chmod 644 "${pkgdir}/usr/share/doc/liborigin2/images/origin_import.png" -} Copied: liborigin2/repos/extra-i686/PKGBUILD (from rev 152196, liborigin2/repos/testing-i686/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2012-03-05 08:56:08 UTC (rev 152211) @@ -0,0 +1,57 @@ +# $Id$ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: damir <da...@archlinux.org> + +pkgbase=liborigin2 +pkgname=('liborigin2' 'liborigin2-docs') +pkgver=20110829 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://soft.proindependent.com/liborigin2/" +license=('GPL3') +makedepends=('doxygen' 'qt' 'boost') +replaces=('liborigin') +provides=('liborigin') +source=(http://download.berlios.de/qtiplot/${pkgbase}-20110829.zip + liborigin.pro.archlinux + http://tree.phi-sci.com/tree.hh) +sha1sums=('13851b17b21ec49375e4f5dfbd3ab4b9bf72f5be' + '9bb73eccc031b3a9e7c061b8cdbaf3e20aa2669d' + '2fd9ff17ff6b6f34b20fc473c82bf17ac1922e86') + +build() { + cd "${srcdir}/${pkgbase}" + + install -Dm644 "${srcdir}/liborigin.pro.archlinux" ./liborigin2.pro + install -Dm644 "${srcdir}/tree.hh" ./tree.hh # get the header back like it was in previous releases + qmake liborigin2.pro QMAKESPEC=linux-g++ + make QTDIR=/usr/ QMAKESPEC=linux-g++ + + # create documentation + cd doc + doxygen +} + +package_liborigin2() { + pkgdesc="A library for reading OriginLab OPJ project files" + depends=('boost-libs') + + cd "${srcdir}/${pkgbase}" + + INSTALL_ROOT="${pkgdir}" make install + + # install missing includes + install -Dm644 tree.hh "${pkgdir}/usr/include/liborigin2/tree.hh" + for i in *.h; do + install -Dm644 ${i} "${pkgdir}/usr/include/liborigin2/${i}" + done +} +package_liborigin2-docs() { + pkgdesc="Documentation for liborigin2: a library for reading OriginLab OPJ project files" + + cd "${srcdir}/${pkgbase}/doc" + install -d "${pkgdir}/usr/share/doc/${pkgbase}" + cp -rf html/* "${pkgdir}/usr/share/doc/${pkgbase}" + chmod 755 "${pkgdir}/usr/share/doc/liborigin2/images" + chmod 644 "${pkgdir}/usr/share/doc/liborigin2/images/origin_import.png" +} Deleted: extra-i686/liborigin.pro.archlinux =================================================================== --- extra-i686/liborigin.pro.archlinux 2012-03-05 08:56:07 UTC (rev 152210) +++ extra-i686/liborigin.pro.archlinux 2012-03-05 08:56:08 UTC (rev 152211) @@ -1,41 +0,0 @@ -TARGET = origin2 -TEMPLATE = lib -CONFIG += warn_on release thread -#CONFIG += staticlib -MOC_DIR = ./tmp -OBJECTS_DIR = ./tmp - -DESTDIR = ./ - -#INCLUDEPATH += boost_1_33_0 -LIBS += -lboost_date_time -LIBS += -lboost_thread - -HEADERS += endianfstream.hh -HEADERS += logging.hpp -HEADERS += OriginObj.h -HEADERS += OriginFile.h -HEADERS += OriginParser.h -HEADERS += OriginDefaultParser.h -HEADERS += Origin600Parser.h -HEADERS += Origin610Parser.h -HEADERS += Origin700Parser.h -HEADERS += Origin750Parser.h -HEADERS += Origin800Parser.h -HEADERS += Origin810Parser.h - -SOURCES += OriginFile.cpp -SOURCES += OriginParser.cpp -SOURCES += OriginDefaultParser.cpp -SOURCES += Origin600Parser.cpp -SOURCES += Origin610Parser.cpp -SOURCES += Origin700Parser.cpp -SOURCES += Origin750Parser.cpp -SOURCES += Origin800Parser.cpp -SOURCES += Origin810Parser.cpp - -headers.files = \$\$HEADERS -headers.path = /usr/include/liborigin2 -target.path = /usr/lib -INSTALLS = target headers - Copied: liborigin2/repos/extra-i686/liborigin.pro.archlinux (from rev 152196, liborigin2/repos/testing-i686/liborigin.pro.archlinux) =================================================================== --- extra-i686/liborigin.pro.archlinux (rev 0) +++ extra-i686/liborigin.pro.archlinux 2012-03-05 08:56:08 UTC (rev 152211) @@ -0,0 +1,20 @@ +TARGET = origin2 +TEMPLATE = lib +CONFIG += warn_on release thread +#CONFIG += staticlib +MOC_DIR = ./tmp +OBJECTS_DIR = ./tmp + +DESTDIR = ./ + +#INCLUDEPATH += boost_1_33_0 +LIBS += -lboost_date_time +LIBS += -lboost_thread + +headers.files = \$\$HEADERS +headers.path = /usr/include/liborigin2 +target.path = /usr/lib +INSTALLS = target headers + +include(liborigin2.pri) +