[med-svn] r2721 - trunk/packages/ball/trunk/debian

moeller at alioth.debian.org moeller at alioth.debian.org
Thu Nov 20 16:02:00 UTC 2008 

Author: moeller
Date: 2008-11-20 16:02:00 +0000 (Thu, 20 Nov 2008)
New Revision: 2721

Modified:
   trunk/packages/ball/trunk/debian/createBALLDeb
   trunk/packages/ball/trunk/debian/debian-ball-install
Log:
Continuing.


Modified: trunk/packages/ball/trunk/debian/createBALLDeb
===================================================================
--- trunk/packages/ball/trunk/debian/createBALLDeb	2008-11-20 12:12:40 UTC (rev 2720)
+++ trunk/packages/ball/trunk/debian/createBALLDeb	2008-11-20 16:02:00 UTC (rev 2721)
@@ -4,18 +4,19 @@
 # bail out when a command has a non-zero return value
 set -e
 
+VERSION="1.2"
+PREFIX=/usr
 export BALL_PATH=`pwd | sed 's/debian$//g' | sed 's/debian-upstream$//g'`
-export BALL_INSTALL_PATH=${BALL_PATH}/debian/ball/usr
+export BALL_INSTALL_PATH=${BALL_PATH}/debian/ball/$PREFIX
 
-VERSION="1.2"
 
 cd $BALL_PATH/debian
-mkdir -p libball${VERSION}/usr/lib libball${VERSION}/usr/share/BALL \
-  libball${VERSION}/usr/share/BALL/doc libball${VERSION}-dev/usr/include \
-  libball${VERSION}-dev/usr/lib \
-  libball${VERSION}-doc/usr/share/doc/libball-1.2/html \
-  python-ball/usr/share/BALL python-ball/usr/lib/python2.5/site-packages \
-  ballview/usr/bin ballview/usr/share/man/man1 ballview/usr/share/doc/ballview/html
+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 \
+  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
 
 # remember the targets of the ldconfig symbolic links
 LIBBALL_TARGET=$(ls -l ${BALL_INSTALL_PATH}/lib/libBALL.so)
@@ -33,49 +34,50 @@
 # 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}/usr/lib/
-cp    ${BALL_INSTALL_PATH}/lib/libVIEW*      libball${VERSION}/usr/lib/
-cp -r ${BALL_INSTALL_PATH}/share/BALL/data   libball${VERSION}/usr/share/BALL
-cp -r ${BALL_INSTALL_PATH}/include/BALL      libball${VERSION}-dev/usr/include
+cp    ${BALL_INSTALL_PATH}/lib/libBALL*      libball${VERSION}${PREFIX}/lib/
+cp    ${BALL_INSTALL_PATH}/lib/libVIEW*      libball${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
 #
 # FIXME: the links should be relative!  Steffen
-#
-ln -s ${BALL_INSTALL_PATH}/lib/${LIBBALL_TARGET} libball${VERSION}-dev/usr/lib/libBALL.so
-ln -s ${BALL_INSTALL_PATH}/lib/${LIBVIEW_TARGET} libball${VERSION}-dev/usr/lib/libVIEW.so
-cp    ${BALL_PATH}/source/APPLICATIONS/BALLVIEW/BALLView ballview/usr/bin/
+#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} libball${VERSION}-dev${PREFIX}/lib/libVIEW.so
+cp    ${BALL_PATH}/source/APPLICATIONS/BALLVIEW/BALLView ballview${PREFIX}/bin/
 
-mv libball${VERSION}/usr/lib/libBALL.la  libball${VERSION}-dev/usr/lib &&
-mv libball${VERSION}/usr/lib/libVIEW.la  libball${VERSION}-dev/usr/lib &&
+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}/usr/lib/libBALL.a   libball${VERSION}-dev/usr/lib &&
-#mv libball${VERSION}/usr/lib/libVIEW.a   libball${VERSION}-dev/usr/lib &&
+#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/usr/bin/
-#cp -r ../source/APPLICATIONS/BALLVIEW/BALLView $PNAME/usr/lib/BALL
-#cp    ../source/APPLICATIONS/BALLVIEW/BALLView $PNAME/usr/bin/
+#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/usr/share/doc/ballview/html
-cp    ${BALL_PATH}/doc/TUTORIAL/tutorial.pdf 	libball${VERSION}-doc/usr/share/doc/libball-1.2/
-cp -r ${BALL_PATH}/doc/classes libball${VERSION}/usr/share/BALL/doc
-cp -r ${BALL_PATH}/doc/internal libball${VERSION}/usr/share/BALL/doc
-cp -r ${BALL_PATH}/doc/BALL libball${VERSION}-doc/usr/share/doc/libball-1.2/html
+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_PATH}/doc/BALL libball${VERSION}-doc${PREFIX}/share/doc/libball${VERSION}/html
 
-gzip -9 -c ${BALL_PATH}/debian/ballview.1 > ballview/usr/share/man/man1/ballview.1.gz
-gzip -9 -c ${BALL_PATH}/debian/ballview.1 > ballview/usr/share/man/man1/BALLView.1.gz
+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/usr/share/BALL
-cp ${BALL_INSTALL_PATH}/lib/BALLmodule.so python-ball/usr/lib/python2.5/site-packages
+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
 
-chmod ugo-x libball${VERSION}/usr/share/BALL/data/QSAR/*
-chmod ugo-x libball${VERSION}/usr/share/BALL/data/CHARMM/charmm*
-chmod ugo-x libball${VERSION}/usr/share/BALL/data/graphics/*
-chmod ugo-x libball${VERSION}/usr/share/BALL/data/structures/*
-chmod 755   libball${VERSION}/usr/share/BALL/data/structures/DB/
-chmod ugo+x ballview/usr/bin/BALLView
-chmod ugo-x python-ball/usr/share/BALL/PYTHON/*.py
+chmod ugo-x libball${VERSION}${PREFIX}/share/BALL/data/QSAR/*
+chmod ugo-x libball${VERSION}${PREFIX}/share/BALL/data/CHARMM/charmm*
+chmod ugo-x libball${VERSION}${PREFIX}/share/BALL/data/graphics/*
+chmod ugo-x libball${VERSION}${PREFIX}/share/BALL/data/structures/*
+chmod 755   libball${VERSION}${PREFIX}/share/BALL/data/structures/DB/
+chmod ugo+x ballview${PREFIX}/bin/BALLView
+chmod ugo-x python-ball${PREFIX}/share/BALL/PYTHON/*.py
 
-strip --strip-unneeded libball${VERSION}/usr/lib/*.so
-strip --strip-unneeded ballview/usr/bin/*
-strip --strip-unneeded python-ball/usr/lib/python2.5/site-packages/*.so
+strip --strip-unneeded libball${VERSION}${PREFIX}/lib/*.so
+strip --strip-unneeded ballview${PREFIX}/bin/*
+strip --strip-unneeded python-ball${PREFIX}/lib/python2.5/site-packages/*.so
+

Modified: trunk/packages/ball/trunk/debian/debian-ball-install
===================================================================
--- trunk/packages/ball/trunk/debian/debian-ball-install	2008-11-20 12:12:40 UTC (rev 2720)
+++ trunk/packages/ball/trunk/debian/debian-ball-install	2008-11-20 16:02:00 UTC (rev 2721)
@@ -17,8 +17,8 @@
 then
 	cd $BALL_PATH/source 
 	touch config.lic
-	rm -f config.cache || true
-	autoconf &&
+	rm -f config.cache
+	autoconf 
 	./configure \
 		--enable-libtool \
 		--prefix=$BALL_PATH/debian/ball/usr \
@@ -61,8 +61,7 @@
 		make clean
 		rm -rf ../lib/Linux*
 		rm -rf ../doc/doxygen/latex/*
-		rm $BALL_PATH/source/config.status 2>/dev/null
-		true
+		rm -f $BALL_PATH/source/config.status 2>/dev/null
 	fi
 	exit $?
 fi

More information about the debian-med-commit mailing list