Author: anhi-guest Date: 2009-07-10 14:40:17 +0000 (Fri, 10 Jul 2009) New Revision: 3607
Added: trunk/packages/ball/trunk/debian/libballview-dev.dirs trunk/packages/ball/trunk/debian/libballview.dirs Modified: trunk/packages/ball/trunk/debian/ballview.desktop trunk/packages/ball/trunk/debian/ballview.menu 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 trunk/packages/ball/trunk/debian/python-ball.dirs trunk/packages/ball/trunk/debian/rules Log: Split the BALL packages into X11 dependent and independent parts. Modified: trunk/packages/ball/trunk/debian/ballview.desktop =================================================================== --- trunk/packages/ball/trunk/debian/ballview.desktop 2009-07-10 11:24:40 UTC (rev 3606) +++ trunk/packages/ball/trunk/debian/ballview.desktop 2009-07-10 14:40:17 UTC (rev 3607) @@ -2,7 +2,7 @@ Version=1.0 Encoding=UTF-8 Terminal=false -Icon=/usr/share/BALL/data/graphics/logo.png +Icon=/usr/share/BALL/data/graphics/logo.xpm Exec=BALLView Name=BALLView GenericName=Molecular modeling and visualization tool Modified: trunk/packages/ball/trunk/debian/ballview.menu =================================================================== --- trunk/packages/ball/trunk/debian/ballview.menu 2009-07-10 11:24:40 UTC (rev 3606) +++ trunk/packages/ball/trunk/debian/ballview.menu 2009-07-10 14:40:17 UTC (rev 3607) @@ -1,5 +1,5 @@ ?package(ballview):\ needs="X11" section="Applications/Science/Biology"\ - title="BALLView" command="/usr/bin/BALLView" icon="/usr/share/BALL/data/graphics/logo.png"\ - longtitle="BALLView : Molecular modeling and molecular graphics tool"\ - hint="Molecular modeling and molecular graphics" + title="BALLView" command="/usr/bin/BALLView"\ + icon="/usr/share/BALL/data/graphics/logo.xpm"\ + longtitle="BALLView: A Molecular modeling and molecular graphics tool" Modified: trunk/packages/ball/trunk/debian/changelog =================================================================== --- trunk/packages/ball/trunk/debian/changelog 2009-07-10 11:24:40 UTC (rev 3606) +++ trunk/packages/ball/trunk/debian/changelog 2009-07-10 14:40:17 UTC (rev 3607) @@ -1,6 +1,7 @@ ball (1.3-1) unstable; urgency=low * Updated to version 1.3 + * Split packages into VIEW independent and dependent debs -- Andreas Hildebrandt <[email protected]> Mon, 6 Jul 2009 17:43:00 +0100 Modified: trunk/packages/ball/trunk/debian/control =================================================================== --- trunk/packages/ball/trunk/debian/control 2009-07-10 11:24:40 UTC (rev 3606) +++ trunk/packages/ball/trunk/debian/control 2009-07-10 14:40:17 UTC (rev 3607) @@ -5,10 +5,11 @@ DM-Upload-Allowed: yes Build-Depends: debhelper (>= 4), libtool, libqt4-dev, libqt4-gui, libqt4-opengl, libqt4-opengl-dev, libqt4-sql, sip4, python-sip4-dev, flex, bison, autoconf, - libglew-dev, libfftw3-dev, libgsl0-dev, python2.5-dev, libxrender-dev, - libboost-dev, libboost-iostreams-dev, libboost-system-dev, libboost-thread, - libboost-asio-dev | libasio-dev, libxmu-dev, doxygen, tidy, texlive-base, - texlive-latex-recommended, texlive-fonts-recommended, gs-common, + automake, 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), + libboost-asio-dev | libasio-dev, libboost-regex-dev, libxmu-dev, doxygen, tidy, + texlive-base, texlive-latex-recommended, texlive-fonts-recommended, gs-common, texlive-latex-extra, graphviz XS-Python-Version: all Standards-Version: 3.8.0 @@ -19,8 +20,7 @@ Package: libball1.3 Section: science Architecture: any -Depends: ${shlibs:Depends}, libqt4-core, libqt4-gui, libqt4-sql, libfftw3-3, - libglew1.5, libgsl0ldbl, libqt4-opengl, libxrender1, libxmu6 +Depends: ${shlibs:Depends} Description: Biochemical Algorithms Library BALL (Biochemical Algorithms Library) is an application framework in C++ that has been specifically designed for rapid software @@ -32,6 +32,10 @@ (University of Tuebingen, Germany), Andreas Hildebrandt (Saarland University, Saarbruecken, Germany), and Hans-Peter Lenhof (Saarland University, Saarbruecken, Germany). + . + This package contains the view - independent parts of BALL (libBALL, data + directories, ..., but not libVIEW) and can be installed on machines + without X11. Package: libball1.3-dev Section: libdevel @@ -40,11 +44,57 @@ Recommends: libball1.3-doc Description: Header files for the Biochemical Algorithms Library This package comprises the header files allowing to create - one's own applications with the BAL library. + one's own applications with the BALL library. +Package: libballview1.3 +Section: science +Architecture: any +Depends: ${shlibs:Depends} +Description: Biochemical Algorithms Library, VIEW framework + BALL (Biochemical Algorithms Library) is an application framework + in C++ that has been specifically designed for rapid software + development in Molecular Modeling and Computational Molecular Biology. + It provides an extensive set of data structures as well as classes + for Molecular Mechanics, advanced solvation methods, comparison and + analysis of protein structures, file import/export, and visualization. + BALL is currently being developed in the groups of Oliver Kohlbacher + (University of Tuebingen, Germany), Andreas Hildebrandt (Saarland + University, Saarbruecken, Germany), and Hans-Peter Lenhof (Saarland + University, Saarbruecken, Germany). + . + This package contains the view parts of BALL (libVIEW) required for + molecular visualization and required for running BALLView. + +Package: libballview1.3-dev +Section: libdevel +Architecture: any +Depends: libballview1.3 +Recommends: libball1.3-doc +Description: Header files for the VIEW part of the Biochemical Algorithms Library + This package comprises the header files allowing to create one's own + applications with the VIEW framework of the BALL library. + +Package: python-ball +Architecture: any +Section: python +Depends: ${shlibs:Depends}, ${python:Depends}, python-sip4 (>= 4.7.2), + python (>= 2.4), libball1.3 +Description: Python bindings for the Biochemical Algorithms Library + This package provides scripting access to the VIEW-independent functionality + of the Biochemical Algorithms Library (BALL). + +Package: python-ballview +Architecture: any +Section: python +Depends: ${shlibs:Depends}, ${python:Depends}, python-sip4 (>= 4.7.2), + python (>= 2.4), libball1.3, libballview1.3 +Description: Python bindings for VIEW-parts of the Biochemical Algorithms Library + This package provides scripting access to the VIEW-dependent functionality + of the Biochemical Algorithms Library (BALL). + Package: ballview Architecture: any -Depends: ${shlibs:Depends}, python2.5, libball1.3 +Depends: ${shlibs:Depends}, libball1.3, libballview1.3, python-ball Description: A free molecular modeling and molecular graphics tool BALLView provides fast OpenGL-based visualization of molecular structures, molecular mechanics methods (minimization, MD simulation using the @@ -63,14 +113,6 @@ for Molecular Mechanics, advanced solvation methods, comparison and analysis of protein structures, file import/export, and visualization. -Package: python-ball -Architecture: any -Section: python -Depends: ${shlibs:Depends}, ${python:Depends}, python-sip4 (>= 4.7.2), python-sip4 (<< 4.8), python2.5, libball1.3 -Description: Python bindings for the Biochemical Algorithms Library - This package provides scripting access to the functionality of the - Biochemical Algorithms Library (BALL). - Package: libball1.3-doc Architecture: all Section: doc Modified: trunk/packages/ball/trunk/debian/createBALLDeb =================================================================== --- trunk/packages/ball/trunk/debian/createBALLDeb 2009-07-10 11:24:40 UTC (rev 3606) +++ trunk/packages/ball/trunk/debian/createBALLDeb 2009-07-10 14:40:17 UTC (rev 3607) @@ -9,14 +9,28 @@ export BALL_PATH=`pwd | sed 's/debian$//g' | sed 's/debian-upstream$//g'` export BALL_INSTALL_PATH=${BALL_PATH}/debian/ball/$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_") +# 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:];") + cd $BALL_PATH/debian -mkdir -p libball${VERSION}${PREFIX}/lib libball${VERSION}${PREFIX}/share/BALL \ - libball${VERSION}${PREFIX}/share/BALL/doc libball${VERSION}-dev${PREFIX}/include \ +mkdir -p libball${VERSION}${PREFIX}/lib \ + libball${VERSION}${PREFIX}/share/BALL \ + libball${VERSION}${PREFIX}/share/BALL/doc \ + libball${VERSION}-dev${PREFIX}/include \ libball${VERSION}-dev${PREFIX}/lib \ + libballview${VERSION}${PREFIX}/lib \ + libballview${VERSION}-dev${PREFIX}/include/BALL \ + libballview${VERSION}-dev${PREFIX}/lib \ libball${VERSION}-doc${PREFIX}/share/doc/libball${VERSION}/html \ - python-ball${PREFIX}/share/BALL python-ball${PREFIX}/lib/python2.5/site-packages \ - ballview${PREFIX}/bin ballview${PREFIX}/share/man/man1 ballview${PREFIX}/share/doc/ballview/html + python-ball${PREFIX}/share/BALL \ + python-ball${PREFIX}/${PYTHON_SITE_PATH} \ + python-ballview${PREFIX}/${PYTHON_SITE_PATH} \ + ballview${PREFIX}/bin \ + ballview${PREFIX}/share/man/man1 \ + ballview${PREFIX}/share/doc/ballview/html # remember the targets of the ldconfig symbolic links LIBBALL_TARGET=$(ls -l ${BALL_INSTALL_PATH}/lib/libBALL.so) @@ -28,17 +42,20 @@ 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 +rm ${BALL_INSTALL_PATH}/lib/libBALL.so +rm ${BALL_INSTALL_PATH}/lib/libVIEW.so -# remove static libs. comment out if you need them -rm -f ${BALL_INSTALL_PATH}/lib/libBALL.a -rm -f ${BALL_INSTALL_PATH}/lib/libVIEW.a -cp ${BALL_INSTALL_PATH}/lib/libBALL* libball${VERSION}${PREFIX}/lib/ -cp ${BALL_INSTALL_PATH}/lib/libVIEW* libball${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 + +# get rid of the VIEW includes in libball-dev +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 @@ -46,8 +63,6 @@ ln -s ${LIBVIEW_TARGET} libball${VERSION}-dev${PREFIX}/lib/libVIEW.so cp ${BALL_PATH}/source/APPLICATIONS/BALLVIEW/BALLView ballview${PREFIX}/bin/ -cp libball${VERSION}${PREFIX}/lib/libBALL.la libball${VERSION}${PREFIX}/lib/libVIEW.la libball${VERSION}-dev${PREFIX}/lib - # 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 && @@ -67,7 +82,9 @@ 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_INSTALL_PATH}/lib/BALLmodule.so python-ball${PREFIX}/lib/python2.5/site-packages +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} chmod ugo-x libball${VERSION}${PREFIX}/share/BALL/data/QSAR/* chmod ugo-x libball${VERSION}${PREFIX}/share/BALL/data/CHARMM/charmm* @@ -78,6 +95,8 @@ chmod ugo-x python-ball${PREFIX}/share/BALL/PYTHON/*.py 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}/lib/python2.5/site-packages/*.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 2009-07-10 11:24:40 UTC (rev 3606) +++ trunk/packages/ball/trunk/debian/debian-ball-install 2009-07-10 14:40:17 UTC (rev 3607) @@ -13,12 +13,12 @@ unset QTDIR echo $1 -if [ $1 == "configure" ] +if [ "$1" == "configure" ] then cd $BALL_PATH/source touch config.lic rm -f config.cache - autoconf + ./bootstrap ./configure \ --enable-libtool \ --prefix=$BALL_PATH/debian/ball/usr \ @@ -37,7 +37,7 @@ exit $? fi -if [ $1 == "build" ] +if [ "$1" == "build" ] then cd $BALL_PATH/source && make doc && make depend && mymake && make install cd $BALL_PATH/source/PYTHON/EXTENSIONS && mymake && make install @@ -45,13 +45,13 @@ exit $? fi -if [ $1 == "install" ] +if [ "$1" == "install" ] then - debian/createBALLDeb source + bash debian/createBALLDeb source exit $? fi -if [ $1 == "clean" ] +if [ "$1" == "clean" ] then cd $BALL_PATH/source if [ -f Makefile ] Added: trunk/packages/ball/trunk/debian/libballview-dev.dirs =================================================================== --- trunk/packages/ball/trunk/debian/libballview-dev.dirs (rev 0) +++ trunk/packages/ball/trunk/debian/libballview-dev.dirs 2009-07-10 14:40:17 UTC (rev 3607) @@ -0,0 +1,2 @@ +usr/include +usr/lib Added: trunk/packages/ball/trunk/debian/libballview.dirs =================================================================== --- trunk/packages/ball/trunk/debian/libballview.dirs (rev 0) +++ trunk/packages/ball/trunk/debian/libballview.dirs 2009-07-10 14:40:17 UTC (rev 3607) @@ -0,0 +1 @@ +usr/lib Modified: trunk/packages/ball/trunk/debian/python-ball.dirs =================================================================== --- trunk/packages/ball/trunk/debian/python-ball.dirs 2009-07-10 11:24:40 UTC (rev 3606) +++ trunk/packages/ball/trunk/debian/python-ball.dirs 2009-07-10 14:40:17 UTC (rev 3607) @@ -1,2 +1 @@ usr/share/BALL -usr/lib/python2.5/site-packages Modified: trunk/packages/ball/trunk/debian/rules =================================================================== --- trunk/packages/ball/trunk/debian/rules 2009-07-10 11:24:40 UTC (rev 3606) +++ trunk/packages/ball/trunk/debian/rules 2009-07-10 14:40:17 UTC (rev 3607) @@ -14,19 +14,19 @@ configure: configure-stamp configure-stamp: dh_testdir - debian/debian-ball-install configure + bash debian/debian-ball-install configure touch $@ build: build-stamp build-stamp: configure-stamp dh_testdir - debian/debian-ball-install build + bash debian/debian-ball-install build touch $@ clean: dh_testdir dh_testroot - debian/debian-ball-install clean + bash debian/debian-ball-install clean dh_clean build-stamp configure-stamp install: build @@ -35,7 +35,7 @@ dh_clean -k dh_installdirs #DESTDIR=$(CURDIR)/debian/ballview - debian/debian-ball-install install + bash debian/debian-ball-install install binary-indep: build install _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
