[DebianGIS-dev] r2385 - packages/libhdf4/trunk/debian

[frankie at alioth.debian.org]

Author: frankie
Date: 2009-07-28 15:09:47 +0000 (Tue, 28 Jul 2009)
New Revision: 2385

Modified:
   packages/libhdf4/trunk/debian/changelog
   packages/libhdf4/trunk/debian/rules
Log:
Fixing conflict


Modified: packages/libhdf4/trunk/debian/changelog
===================================================================
--- packages/libhdf4/trunk/debian/changelog	2009-07-27 19:37:58 UTC (rev 2384)
+++ packages/libhdf4/trunk/debian/changelog	2009-07-28 15:09:47 UTC (rev 2385)
@@ -1,3 +1,10 @@
+libhdf4 (4.2r4-4) unstable; urgency=low
+
+  * Do not install conflicting stuff already present in netcdf package.
+    (closes: #538933, #531688)
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 28 Jul 2009 17:00:39 +0200
+
 libhdf4 (4.2r4-3) unstable; urgency=low
 
   * Upload to unstable.

Modified: packages/libhdf4/trunk/debian/rules
===================================================================
--- packages/libhdf4/trunk/debian/rules	2009-07-27 19:37:58 UTC (rev 2384)
+++ packages/libhdf4/trunk/debian/rules	2009-07-28 15:09:47 UTC (rev 2385)
@@ -146,6 +146,10 @@
 		chrpath -d $${obj} || true; \
 	done
 	
+	# remove programs and manpages provided by netcdf-bin
+	rm -f $(DESTDIR)/usr/bin/ncdump $(DESTDIR)/usr/bin/ncgen
+	rm -f $(DESTDIR)/usr/share/man/man1/ncdump* $(DESTDIR)/usr/share/man/man1/ncgen*
+	
 	touch $@
 
 binary-arch: install