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

[Ole Streicher]

The following commit has been merged in the master branch:
commit a4164ee17172bf5362635074005a0744f6097e3f
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Jan 27 22:02:08 2012 +0100

    Make the rename working; add small Readme about changes

diff --git a/debian/README b/debian/README
new file mode 100644
index 0000000..f8d2a3b
--- /dev/null
+++ b/debian/README
@@ -0,0 +1,14 @@
+wcstools for Debian
+-------------------
+
+The wcstools installation for Debian has some names changed due to conflict
+with other packages:
+
+- libwcs.{so,a} --> libwcstools.{so,a}: Conflict with the "libwcs" package by
+  Mark Calabretta.
+
+- imcat --> imcatalog: Conflict with the "im" package
+
+- remap --> wcsremap: Conflict with the "emboss" package
+
+Ole Streicher <debian at liska.ath.cx>  Fri, 27 Jan 2012 20:26:17 +0100
diff --git a/debian/rules b/debian/rules
index 99306a4..6e8b3c9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,20 +9,21 @@
 override_dh_auto_build:
 	mkdir -p bin
 	dh_auto_build
+	mv bin/imcat bin/imcatalog
+	mv bin/remap bin/wcsremap
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS
 
 override_dh_installman:
 	mkdir -p Man/man_generated
+	mv Man/man1/imcat.1 Man/man1/imcatalog.1
 	for i in `ls bin` ; do \
 	  if [ ! -f Man/man1/$$i.1 ] ; then \
 	    NAME=`fgrep $$i wcstools | sed "s/:/ \\\\- /"` ; \
 	    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:
@@ -31,5 +32,3 @@ override_dh_fixperms:
 
 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