[med-svn] r5463 - trunk/packages/freediams/trunk/debian

[Andreas Tille]

Author: tille
Date: 2010-11-22 15:49:00 +0000 (Mon, 22 Nov 2010)
New Revision: 5463

Modified:
   trunk/packages/freediams/trunk/debian/changelog
   trunk/packages/freediams/trunk/debian/rules
   trunk/packages/freediams/trunk/debian/watch
Log:
Minor corrections to new upstream release packaging; upload to unstable


Modified: trunk/packages/freediams/trunk/debian/changelog
===================================================================
--- trunk/packages/freediams/trunk/debian/changelog	2010-11-22 15:24:45 UTC (rev 5462)
+++ trunk/packages/freediams/trunk/debian/changelog	2010-11-22 15:49:00 UTC (rev 5463)
@@ -5,8 +5,13 @@
   * Updating the description of the package
   * Updating Build-Depends : no more dependence with doxygen
 
- -- Eric Maeker <eric.maeker at gmail.com>  Sat, 13 Nov 2010 12:00:00 +0100
+  [ Andreas Tille ]
+  * debian/rules
+    - do not install /usr/bin/{COPYING,README}
+    - copy the readily provided docs instead of moving
 
+ -- Andreas Tille <tille at debian.org>  Mon, 22 Nov 2010 16:17:06 +0100
+
 freediams (0.5.0~beta-1) unstable; urgency=low
 
   [ Eric Maeker ]

Modified: trunk/packages/freediams/trunk/debian/rules
===================================================================
--- trunk/packages/freediams/trunk/debian/rules	2010-11-22 15:24:45 UTC (rev 5462)
+++ trunk/packages/freediams/trunk/debian/rules	2010-11-22 15:49:00 UTC (rev 5463)
@@ -21,13 +21,16 @@
 	# Install documentation
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/freediams/en
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/freediams/fr
-	mv global_resources/doc/freediams/en/html/* $(CURDIR)/debian/tmp/usr/share/doc/freediams/en
-	mv global_resources/doc/freediams/fr/html/* $(CURDIR)/debian/tmp/usr/share/doc/freediams/fr
+	cp -a global_resources/doc/freediams/en/html/* $(CURDIR)/debian/tmp/usr/share/doc/freediams/en
+	cp -a global_resources/doc/freediams/fr/html/* $(CURDIR)/debian/tmp/usr/share/doc/freediams/fr
 
 	# Remove those Links to dynamic libraries which have no version number (this should only
 	# be provided in -dev packages.  But some *.so files are real files without version number
 	# FIXME
 	# find $(CURDIR)/debian/tmp/usr/lib/freediams -type l -name "*.so" -exec rm -f \{\} \;
+	
+	# remove doc files from /usr/bin
+	rm -f debian/tmp/usr/bin/[CR]*
 
 	dh_install --autodest
 

Modified: trunk/packages/freediams/trunk/debian/watch
===================================================================
--- trunk/packages/freediams/trunk/debian/watch	2010-11-22 15:24:45 UTC (rev 5462)
+++ trunk/packages/freediams/trunk/debian/watch	2010-11-22 15:49:00 UTC (rev 5463)
@@ -7,4 +7,5 @@
 # rather using the redirector
 # http://googlecode.debian.net/p/freemedforms/freediams_(.+)\.orig\.tar\.gz
 opts="uversionmangle=s/%7E/~/" \
-  http://googlecode.debian.net/p/freemedforms/freediams.*_(.+)\.tgz
+  http://googlecode.debian.net/p/freemedforms/freediamsfullsources-(.+)\.tgz
+##  http://googlecode.debian.net/p/freemedforms/freediams.*_(.+)\.tgz