Author: anhi-guest Date: 2010-01-15 15:28:21 +0000 (Fri, 15 Jan 2010) New Revision: 4541
Modified: trunk/packages/ball/trunk/debian/changelog trunk/packages/ball/trunk/debian/control trunk/packages/ball/trunk/debian/createBALLDeb trunk/packages/ball/trunk/debian/debian-ball-install Log: Upgraded to upstream V1.3.1 and switched to CMake as build system. Modified: trunk/packages/ball/trunk/debian/changelog =================================================================== --- trunk/packages/ball/trunk/debian/changelog 2010-01-12 20:18:19 UTC (rev 4540) +++ trunk/packages/ball/trunk/debian/changelog 2010-01-15 15:28:21 UTC (rev 4541) @@ -1,3 +1,10 @@ +ball (1.3.1-1) unstable; urgency=low + + * Updated to new upstream release 1.3.1 (Closes: 551241) + * Switched from autoconf to CMake (Closes: 552809) + + -- Andreas Hildebrandt <[email protected]> Fri, 18 Dec 2009 14:20:08 +0100 + ball (1.3.0-2) UNRELEASED; urgency=low [ Andreas Hildebrandt ] Modified: trunk/packages/ball/trunk/debian/control =================================================================== --- trunk/packages/ball/trunk/debian/control 2010-01-12 20:18:19 UTC (rev 4540) +++ trunk/packages/ball/trunk/debian/control 2010-01-15 15:28:21 UTC (rev 4541) @@ -3,9 +3,8 @@ Priority: optional Maintainer: Andreas Hildebrandt <[email protected]> DM-Upload-Allowed: yes -Build-Depends: debhelper (>= 5), libtool (>= 2.2), libqt4-dev, libqt4-gui, libqt4-opengl, - libqt4-opengl-dev, libqt4-sql, libqt4-network, sip4, python-sip4-dev (>= 4.8.2), flex, bison, autoconf, - automake, libglew1.5-dev|libglew-dev, libfftw3-dev, libgsl0-dev, python-dev (>= 2.4), libxrender-dev, +Build-Depends: debhelper (>= 5), libqt4-dev, libqt4-gui, libqt4-opengl, + libqt4-opengl-dev, libqt4-sql, libqt4-network, sip4, python-sip4-dev (>= 4.8.2), flex, bison, cmake, libglew1.5-dev|libglew-dev, libfftw3-dev, libgsl0-dev, python-dev (>= 2.4), libxrender-dev, libboost-dev, libboost-iostreams-dev, libboost-thread-dev, libboost-math-dev | libboost-dev (< 1.37), libboost-system-dev | libboost-dev (< 1.37), libasio-dev, libboost-regex-dev, libxmu-dev, doxygen, tidy, Modified: trunk/packages/ball/trunk/debian/createBALLDeb =================================================================== --- trunk/packages/ball/trunk/debian/createBALLDeb 2010-01-12 20:18:19 UTC (rev 4540) +++ trunk/packages/ball/trunk/debian/createBALLDeb 2010-01-15 15:28:21 UTC (rev 4541) @@ -12,10 +12,10 @@ echo "Pwd: " `pwd` exit -1 fi -export BALL_INSTALL_PATH=${BALL_PATH}/debian/ball/$PREFIX +export BALL_INSTALL_PATH=${BALL_PATH}/build/${PREFIX}/ # we will need the python version used to build our modules later -PYTHON_VERSION=$(ldd ${BALL_INSTALL_PATH}/lib/BALLCoremodule.so | grep python | sed "s_^.*libpython\(...\).*_\1_") +PYTHON_VERSION=$(ldd ${BALL_INSTALL_PATH}/lib/BALLCore.so | grep python | sed "s_^.*libpython\(...\).*_\1_") # and the corresponding site-packages path (without the leading /usr) PYTHON_SITE_PATH=$(python${PYTHON_VERSION} -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(0,0)[4:];") @@ -42,24 +42,25 @@ # remember the targets of the ldconfig symbolic links LIBBALL_TARGET=$(ls -l ${BALL_INSTALL_PATH}/lib/libBALL.so) -LIBBALL_TARGET=${LIBBALL_TARGET#*-> } +LIBBALL_TARGET=${LIBBALL_TARGET#* -> } LIBBALL_TARGET=$(basename ${LIBBALL_TARGET}) LIBVIEW_TARGET=$(ls -l ${BALL_INSTALL_PATH}/lib/libVIEW.so) -LIBVIEW_TARGET=${LIBVIEW_TARGET#*-> } +LIBVIEW_TARGET=${LIBVIEW_TARGET#* -> } LIBVIEW_TARGET=$(basename ${LIBVIEW_TARGET}) # get rid of the symbolic links before we copy anything rm ${BALL_INSTALL_PATH}/lib/libBALL.so rm ${BALL_INSTALL_PATH}/lib/libVIEW.so -cp ${BALL_INSTALL_PATH}/lib/libBALL*.so libball${VERSION}${PREFIX}/lib/ -cp ${BALL_INSTALL_PATH}/lib/libVIEW*.so libballview${VERSION}${PREFIX}/lib/ +cp ${BALL_INSTALL_PATH}/lib/libBALL*.so.* libball${VERSION}${PREFIX}/lib/ +cp ${BALL_INSTALL_PATH}/lib/libVIEW*.so.* libballview${VERSION}${PREFIX}/lib/ cp -r ${BALL_INSTALL_PATH}/share/BALL/data libball${VERSION}${PREFIX}/share/BALL cp -r ${BALL_INSTALL_PATH}/include/BALL libball${VERSION}-dev${PREFIX}/include cp -r ${BALL_INSTALL_PATH}/include/BALL/VIEW libballview${VERSION}-dev${PREFIX}/include/BALL -cp ${BALL_INSTALL_PATH}/lib/libBALL.la libball${VERSION}-dev${PREFIX}/lib -cp ${BALL_INSTALL_PATH}/lib/libVIEW.la libballview${VERSION}-dev${PREFIX}/lib +# CMake does not build .la files by default... +#cp ${BALL_INSTALL_PATH}/lib/libBALL.la libball${VERSION}-dev${PREFIX}/lib +#cp ${BALL_INSTALL_PATH}/lib/libVIEW.la libballview${VERSION}-dev${PREFIX}/lib # debian needs the logo in the ballview - package, not in the libball cp libball${VERSION}${PREFIX}/share/BALL/data/graphics/ballview*.xpm ballview${PREFIX}/share/pixmaps/ @@ -68,37 +69,31 @@ rm -rf libball${VERSION}-dev${PREFIX}/include/BALL/VIEW # FIXME: the links should be relative! Steffen -#ln -s ${BALL_INSTALL_PATH}/lib/${LIBBALL_TARGET} libball${VERSION}-dev${PREFIX}/lib/libBALL.so -#ln -s ${BALL_INSTALL_PATH}/lib/${LIBVIEW_TARGET} libball${VERSION}-dev${PREFIX}/lib/libVIEW.so ln -s ${LIBBALL_TARGET} libball${VERSION}-dev${PREFIX}/lib/libBALL.so ln -s ${LIBVIEW_TARGET} libballview${VERSION}-dev${PREFIX}/lib/libVIEW.so -cp ${BALL_PATH}/source/APPLICATIONS/BALLVIEW/BALLView ballview${PREFIX}/bin/ +cp ${BALL_INSTALL_PATH}/bin/BALLView ballview${PREFIX}/bin/ cp ballview.desktop ballview${PREFIX}/share/applications/ # if you want static libs, uncomment the following two lines #mv libball${VERSION}${PREFIX}/lib/libBALL.a libball${VERSION}-dev${PREFIX}/lib && #mv libball${VERSION}${PREFIX}/lib/libVIEW.a libball${VERSION}-dev${PREFIX}/lib && -#cp ../debian-install/ball/bin/BALLView ballview${PREFIX}/bin/ -#cp -r ../source/APPLICATIONS/BALLVIEW/BALLView $PNAME${PREFIX}/lib/BALL -#cp ../source/APPLICATIONS/BALLVIEW/BALLView $PNAME${PREFIX}/bin/ - # copy the documentation -cp -r ${BALL_PATH}/doc/BALLView/* ballview${PREFIX}/share/doc/ballview/html -cp ${BALL_PATH}/doc/TUTORIAL/tutorial.pdf libball${VERSION}-doc${PREFIX}/share/doc/libball${VERSION}/ -cp -r ${BALL_PATH}/doc/classes libball${VERSION}${PREFIX}/share/BALL/doc -cp -r ${BALL_PATH}/doc/internal libball${VERSION}${PREFIX}/share/BALL/doc +cp -r ${BALL_INSTALL_PATH}/share/BALL/doc/BALLView/* ballview${PREFIX}/share/doc/ballview/html +cp ${BALL_INSTALL_PATH}/share/BALL/doc/TUTORIAL/tutorial.pdf libball${VERSION}-doc${PREFIX}/share/doc/libball${VERSION}/ +cp -r ${BALL_INSTALL_PATH}/share/BALL/doc/classes libball${VERSION}${PREFIX}/share/BALL/doc +cp -r ${BALL_INSTALL_PATH}/share/BALL/doc/internal libball${VERSION}${PREFIX}/share/BALL/doc # we need the BALLView documentation in the data path as well... sorry for that -cp -r ${BALL_PATH}/doc/BALLView libball${VERSION}${PREFIX}/share/BALL/doc -cp -r ${BALL_PATH}/doc/BALL libball${VERSION}-doc${PREFIX}/share/doc/libball${VERSION}/html +cp -r ${BALL_INSTALL_PATH}/share/BALL/doc/BALLView libball${VERSION}${PREFIX}/share/BALL/doc +cp -r ${BALL_INSTALL_PATH}/share/BALL/doc/BALL libball${VERSION}-doc${PREFIX}/share/doc/libball${VERSION}/html gzip -9 -c ${BALL_PATH}/debian/ballview.1 > ballview${PREFIX}/share/man/man1/ballview.1.gz gzip -9 -c ${BALL_PATH}/debian/ballview.1 > ballview${PREFIX}/share/man/man1/BALLView.1.gz cp -r ${BALL_PATH}/source/EXAMPLES/PYTHON python-ball${PREFIX}/share/BALL -cp ${BALL_PATH}/source/PYTHON/EXTENSIONS/BALL.py python-ball${PREFIX}/${PYTHON_SITE_PATH} -cp ${BALL_INSTALL_PATH}/lib/BALLCoremodule.so python-ball${PREFIX}/${PYTHON_SITE_PATH} -cp ${BALL_INSTALL_PATH}/lib/VIEWmodule.so python-ballview${PREFIX}/${PYTHON_SITE_PATH} +cp ${BALL_INSTALL_PATH}/lib/BALL.py python-ball${PREFIX}/${PYTHON_SITE_PATH} +cp ${BALL_INSTALL_PATH}/lib/BALLCore.so python-ball${PREFIX}/${PYTHON_SITE_PATH} +cp ${BALL_INSTALL_PATH}/lib/VIEW.so python-ballview${PREFIX}/${PYTHON_SITE_PATH} chmod ugo-x libball${VERSION}${PREFIX}/share/BALL/data/QSAR/* chmod ugo-x libball${VERSION}${PREFIX}/share/BALL/data/CHARMM/charmm* @@ -113,9 +108,9 @@ chrpath -d python-ball${PREFIX}/${PYTHON_SITE_PATH}/*.so chrpath -d python-ballview${PREFIX}/${PYTHON_SITE_PATH}/*.so -strip --strip-unneeded libball${VERSION}${PREFIX}/lib/*.so -strip --strip-unneeded libballview${VERSION}${PREFIX}/lib/*.so +strip --strip-unneeded libball${VERSION}${PREFIX}/lib/*.so* +strip --strip-unneeded libballview${VERSION}${PREFIX}/lib/*.so* strip --strip-unneeded ballview${PREFIX}/bin/* -strip --strip-unneeded python-ball${PREFIX}/${PYTHON_SITE_PATH}/*.so -strip --strip-unneeded python-ballview${PREFIX}/${PYTHON_SITE_PATH}/*.so +strip --strip-unneeded python-ball${PREFIX}/${PYTHON_SITE_PATH}/*.so* +strip --strip-unneeded python-ballview${PREFIX}/${PYTHON_SITE_PATH}/*.so* Modified: trunk/packages/ball/trunk/debian/debian-ball-install =================================================================== --- trunk/packages/ball/trunk/debian/debian-ball-install 2010-01-12 20:18:19 UTC (rev 4540) +++ trunk/packages/ball/trunk/debian/debian-ball-install 2010-01-15 15:28:21 UTC (rev 4541) @@ -3,11 +3,6 @@ set -e -mymake() -{ - make "MAKE=make -j2" -} - #adapt to your settings export BALL_PATH=`pwd | sed -e 's%/debian-upstream$%%g' -e 's%/debian$%%g'` if [ ! -d "$BALL_PATH" ]; then @@ -20,32 +15,17 @@ if [ "$1" == "configure" ] then - cd $BALL_PATH/source - touch config.lic - rm -f config.cache - ./bootstrap - ./configure \ - --enable-libtool \ - --prefix=$BALL_PATH/debian/ball/usr \ - --with-libtool-rpath=/usr \ - --disable-static \ - --with-ball-path=/usr/share/BALL \ - --enable-optimization \ - --disable-debuginfo \ - --enable-glew \ - --enable-python \ - --enable-fftw \ - --with-qt-libs=/usr/lib \ - --with-moc=/usr/bin/moc-qt4 \ - --with-uic=/usr/bin/uic-qt4 - exit $? + cd $BALL_PATH + mkdir build && cd build && cmake .. -DCMAKE_INSTALL_PREFIX=./usr -DBALL_PATH=/usr + exit $? fi if [ "$1" == "build" ] then - cd $BALL_PATH/source && echo "Running doxygen... This can take a while..." && make doc && echo "Doxygen done!" && make depend && mymake && make install - cd $BALL_PATH/source/PYTHON/EXTENSIONS && mymake && make install - cd $BALL_PATH/source/APPLICATIONS/BALLVIEW && mymake + cd $BALL_PATH/build && make -j 2 all doc doc_tutorial install +# cd $BALL_PATH/source && echo "Running doxygen... This can take a while..." && make doc && echo "Doxygen done!" && make depend && mymake && make install +# cd $BALL_PATH/source/PYTHON/EXTENSIONS && mymake && make install +# cd $BALL_PATH/source/APPLICATIONS/BALLVIEW && mymake exit $? fi _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
