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

[Andreas Hildebrandt]

Author: anhi-guest
Date: 2009-07-21 17:01:32 +0000 (Tue, 21 Jul 2009)
New Revision: 3677

Modified:
   trunk/packages/ball/trunk/debian/ballview.desktop
   trunk/packages/ball/trunk/debian/ballview.menu
   trunk/packages/ball/trunk/debian/control
   trunk/packages/ball/trunk/debian/createBALLDeb
   trunk/packages/ball/trunk/debian/rules
Log:
Several fixes to get rid of lintian warnings for BALL


Modified: trunk/packages/ball/trunk/debian/ballview.desktop
===================================================================
--- trunk/packages/ball/trunk/debian/ballview.desktop	2009-07-21 17:00:03 UTC (rev 3676)
+++ trunk/packages/ball/trunk/debian/ballview.desktop	2009-07-21 17:01:32 UTC (rev 3677)
@@ -2,7 +2,7 @@
 Version=1.0
 Encoding=UTF-8
 Terminal=false
-Icon=/usr/share/BALL/data/graphics/logo.xpm
+Icon=ballview.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-21 17:00:03 UTC (rev 3676)
+++ trunk/packages/ball/trunk/debian/ballview.menu	2009-07-21 17:01:32 UTC (rev 3677)
@@ -3,5 +3,5 @@
 	section="Applications/Science/Chemistry"\
   title="BALLView"\
 	command="/usr/bin/BALLView"\
-	icon="/usr/share/BALL/data/graphics/logo.xpm"\
+	icon="ballview_32x32.xpm"\
   longtitle="BALLView: A Molecular modeling and molecular graphics tool"

Modified: trunk/packages/ball/trunk/debian/control
===================================================================
--- trunk/packages/ball/trunk/debian/control	2009-07-21 17:00:03 UTC (rev 3676)
+++ trunk/packages/ball/trunk/debian/control	2009-07-21 17:01:32 UTC (rev 3677)
@@ -10,7 +10,7 @@
  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
+ texlive-latex-extra, graphviz, chrpath
 XS-Python-Version: all
 Standards-Version: 3.8.2
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/ball/trunk/?rev=0&sc=0

Modified: trunk/packages/ball/trunk/debian/createBALLDeb
===================================================================
--- trunk/packages/ball/trunk/debian/createBALLDeb	2009-07-21 17:00:03 UTC (rev 3676)
+++ trunk/packages/ball/trunk/debian/createBALLDeb	2009-07-21 17:01:32 UTC (rev 3677)
@@ -36,7 +36,9 @@
   ballview${PREFIX}/bin \
 	ballview${PREFIX}/share/man/man1 \
 	ballview${PREFIX}/share/doc/ballview/html \
-	ballview${PREFIX}/share/applications
+	ballview${PREFIX}/share/applications \
+	ballview${PREFIX}/share/pixmaps \
+	ballview${PREFIX}/share/BALL/data/graphics
 
 # remember the targets of the ldconfig symbolic links
 LIBBALL_TARGET=$(ls -l ${BALL_INSTALL_PATH}/lib/libBALL.so)
@@ -59,6 +61,9 @@
 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/
+
 # get rid of the VIEW includes in libball-dev
 rm -rf libball${VERSION}-dev${PREFIX}/include/BALL/VIEW
 
@@ -101,6 +106,11 @@
 chmod ugo+x ballview${PREFIX}/bin/BALLView
 chmod ugo-x python-ball${PREFIX}/share/BALL/PYTHON/*.py
 
+# remove spurious rpaths
+chrpath -d ballview${PREFIX}/bin/BALLView
+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 ballview${PREFIX}/bin/*

Modified: trunk/packages/ball/trunk/debian/rules
===================================================================
--- trunk/packages/ball/trunk/debian/rules	2009-07-21 17:00:03 UTC (rev 3676)
+++ trunk/packages/ball/trunk/debian/rules	2009-07-21 17:01:32 UTC (rev 3677)
@@ -47,7 +47,7 @@
 	dh_installexamples
 #	dh_install
 	dh_installmenu
-	#dh_desktop # deprecated
+	dh_desktop
 # dh_python
 	dh_installman -p ballview
 	dh_link