[med-svn] r1592 - trunk/packages/gnumed-client/trunk/debian

[tille at alioth.debian.org]

Author: tille
Date: 2008-03-14 13:29:20 +0000 (Fri, 14 Mar 2008)
New Revision: 1592

Removed:
   trunk/packages/gnumed-client/trunk/debian/install_helper/
Modified:
   trunk/packages/gnumed-client/trunk/debian/changelog
   trunk/packages/gnumed-client/trunk/debian/gnumed-client.install
   trunk/packages/gnumed-client/trunk/debian/gnumed-common.install
   trunk/packages/gnumed-client/trunk/debian/rules
Log:
Get rid of obscure install helper stuff and move complete pycommon
directory into gnumed-client package because potentially everything
is needed by the server package


Modified: trunk/packages/gnumed-client/trunk/debian/changelog
===================================================================
--- trunk/packages/gnumed-client/trunk/debian/changelog	2008-03-14 11:57:31 UTC (rev 1591)
+++ trunk/packages/gnumed-client/trunk/debian/changelog	2008-03-14 13:29:20 UTC (rev 1592)
@@ -1,3 +1,11 @@
+gnumed-client (0.2.8.4-2) unstable; urgency=low
+
+  * Get rid of obscure install helper stuff and move complete pycommon
+    directory into gnumed-client package because potentially everything
+    is needed by the server package
+
+ -- Andreas Tille <tille at debian.org>  Fri, 14 Mar 2008 14:06:13 +0100
+
 gnumed-client (0.2.8.4-1) unstable; urgency=low
 
   * New upstream version

Modified: trunk/packages/gnumed-client/trunk/debian/gnumed-client.install
===================================================================
--- trunk/packages/gnumed-client/trunk/debian/gnumed-client.install	2008-03-14 11:57:31 UTC (rev 1591)
+++ trunk/packages/gnumed-client/trunk/debian/gnumed-client.install	2008-03-14 13:29:20 UTC (rev 1592)
@@ -1,5 +1,4 @@
-client/pycommon                             usr/share/python-support/gnumed-client/Gnumed/
-client/business/*.py                        usr/share/python-support/gnumed-client/Gnumed/business
+client/business                             usr/share/python-support/gnumed-client/Gnumed
 client/*porters                             usr/share/python-support/gnumed-client/Gnumed
 client/wxpython                             usr/share/python-support/gnumed-client/Gnumed
 client/wxGladeWidgets                       usr/share/python-support/gnumed-client/Gnumed

Modified: trunk/packages/gnumed-client/trunk/debian/gnumed-common.install
===================================================================
--- trunk/packages/gnumed-client/trunk/debian/gnumed-common.install	2008-03-14 11:57:31 UTC (rev 1591)
+++ trunk/packages/gnumed-client/trunk/debian/gnumed-common.install	2008-03-14 13:29:20 UTC (rev 1592)
@@ -1 +1,2 @@
+client/pycommon         usr/share/python-support/gnumed-common/Gnumed
 client/__init__.py      usr/share/python-support/gnumed-common/Gnumed

Modified: trunk/packages/gnumed-client/trunk/debian/rules
===================================================================
--- trunk/packages/gnumed-client/trunk/debian/rules	2008-03-14 11:57:31 UTC (rev 1591)
+++ trunk/packages/gnumed-client/trunk/debian/rules	2008-03-14 13:29:20 UTC (rev 1592)
@@ -50,32 +50,6 @@
 	   fi ; \
 	done
 
-	# The client directory contains certain files which are also needed 
-	# by the server.  These files have to be moved to the apropriate places.
-	# Because GNUmed is a quite moving target
-	# the files which are known to be needed in other packages in addition
-	# to the client package are moved now to appropriate places while all
-	# other files will be moved to the client package by debian/$(client).install
-	for helper in `ls debian/install_helper` ; do \
-	   targetdir=debian/$${helper}/usr/share/python-support/$${helper}/Gnumed ; \
-	   mkdir -p $${targetdir} ; \
-	   for file in `grep -v "^[[:space:]]*#" debian/install_helper/$${helper}` ; do \
-	      filename=`basename $${file}` ; \
-	      srcfile=`find debian/$(client) -name $${filename} | grep $${file}` ; \
-	      if [ _"$${srcfile}" = _"" ] ; then \
-	         echo "Missing file $${file} for package $${helper}" ; exit -1 ; \
-	      fi ; \
-	      mkdir -p $${targetdir}/`dirname $${file}` ; \
-	      if head -n 1 $${srcfile} | grep -q '^#!/' ; then \
-	         sed '1d' $${srcfile} > $${targetdir}/$${file} ; \
-	         rm -f $${srcfile} ; \
-	      else \
-	         mv $${srcfile} $${targetdir}/`dirname $${file}` ; \
-	      fi ; \
-	      chmod 644 $${targetdir}/$${file} ; \
-	   done ; \
-	done
-
 	# Install locale files into apropriate directories
 	for loc in `ls client/locale/*.mo` ; do \
 	   country=`echo $${loc} | sed 's?.*/\([a-z][a-z]\)-$(pkg).mo?\1?'` ; \
@@ -88,7 +62,7 @@
 	find debian -name "*.template" -exec rm -f \{\} \;
 
 	# Remove appendix .py from gm_ctl_client
-	cp -a client/connectors/gm_ctl_client.py debian/gnumed-client/usr/bin/gm_ctl_client
+	cp -a client/connectors/gm_ctl_client.py debian/$(client)/usr/bin/gm_ctl_client
 
 # To update po files as recommended in po-debconf(7)
 debian/po/templates.pot: $(templates)
@@ -96,12 +70,6 @@
 
 version := $(shell dpkg-parsechangelog | grep "^Version:" | sed -e "s/^Version:[[:space:]]\+\([\.0-9]*\)-[0-9]\+[[:space:]]*/\1/" )
 
-get-orig-source: $(client)_$(version).orig.tar.gz
-
-$(client)_$(version).orig.tar.gz:
-	wget http://www.gnumed.de/downloads/client/0.2/GNUmed-client.$(version).tgz
-	ln -sf GNUmed-client.$(version).tgz $@
-
 install-arch:
 
 # Must not depend on anything. This is to be called by