[SCM] Create, display and manipulate the world coordinate system branch, master, updated. 022d97f9d66a244d9faa1178455d3aaad408bcb2

[Ole Streicher]

The following commit has been merged in the master branch:
commit 022d97f9d66a244d9faa1178455d3aaad408bcb2
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Jan 27 20:29:17 2012 +0100

    Rename imcat to imcatalog and remap to wcsremap to avoid conflicts with
    other packages. Closes: #657644, #657645

diff --git a/debian/changelog b/debian/changelog
index d0ca3d4..cd94b46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+wcstools (3.8.4-2) unstable; urgency=low
+
+  * Rename remap to wcsremap. Closes: #657644
+  * Rename imcat to imcatalog. Closes: #657645
+
+ -- Ole Streicher <debian at liska.ath.cx>  Fri, 27 Jan 2012 20:26:17 +0100
+
 wcstools (3.8.4-1) unstable; urgency=low
 
   * Initial release. (Closes: #655695)
diff --git a/debian/rules b/debian/rules
index b3a0267..99306a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,8 +21,15 @@ override_dh_installman:
 	    LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:libwcs help2man --no-discard-stderr --version-string=3.8.4 -N -h "" -n "$NAME" bin/$$i | fgrep -v WCSTools > Man/man_generated/$$i.1 ; \
 	  fi \
 	done
+	mv Man/man_generated/imcat.1 Man/man_generated/imcatalog.1
+	mv Man/man_generated/remap.1 Man/man_generated/wcsremap.1
 	dh_installman
 
 override_dh_fixperms:
 	dh_fixperms
 	chmod 0644 debian/wcstools/usr/share/doc/wcstools/examples/*
+
+override_dh_install:
+	dh_install
+	mv debian/wcstools/usr/bin/imcat debian/wcstools/usr/bin/imcatalog
+	mv debian/wcstools/usr/bin/remap debian/wcstools/usr/bin/wcsremap

-- 
Create, display and manipulate the world coordinate system