[SCM] Tcl interface to FITS Files branch, debian, updated. 6ff47d1fc430ef25b59fc1d74d4301c772adde5c

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 6ff47d1fc430ef25b59fc1d74d4301c772adde5c
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Jul 25 11:03:56 2012 +0200

    Provide Tcl package name, and fix some compiler warnings

diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..fc959ab
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+pkgIndex.tcl
diff --git a/debian/control b/debian/control
index 1c5cead..63df7bc 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,7 @@ Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Ole Streicher <debian at liska.ath.cx>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 9),
-               dh-autoreconf,
-               libcfitsio3-dev
+Build-Depends: debhelper (>= 9), dh-autoreconf, libcfitsio3-dev, wcslib-dev
 Standards-Version: 3.9.3
 Homepage: http://heasarc.gsfc.nasa.gov/docs/software/lheasoft/ftools/fv/fitsTcl_home.html
 Vcs-Git: git://git.debian.org/git/debian-science/packages/tcl-fitstcl.git
@@ -14,7 +12,7 @@ Vcs-Browser: http://git.debian.org/?p=debian-science/packages/tcl-fitstcl.git
 
 Package: tcl-fitstcl
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Tcl interface to FITS files
  fitsTcl is an extension to the Tcl language, providing simple access to
  astronomical data stored in FITS file format. fitsTcl implements a Tcl
diff --git a/debian/patches/char_literal.patch b/debian/patches/fix_compiler_warnings.patch
similarity index 100%
rename from debian/patches/char_literal.patch
rename to debian/patches/fix_compiler_warnings.patch
diff --git a/debian/patches/series b/debian/patches/series
index 80efa9e..3e176a7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
 fix_spelling.patch
 use_shared_cfitsio.patch
 cfitsio_header.patch
-char_literal.patch
+fix_compiler_warnings.patch
 set_installdir.patch
diff --git a/debian/patches/set_installdir.patch b/debian/patches/set_installdir.patch
index d13ecbc..cfde86e 100644
--- a/debian/patches/set_installdir.patch
+++ b/debian/patches/set_installdir.patch
@@ -11,11 +11,38 @@ Description: Correct the installation directory
  CC		= @CC@
  RANLIB		= @RANLIB@
  CFLAGS		= @CFLAGS@
-@@ -64,6 +64,7 @@
+@@ -61,6 +61,7 @@
+ 		${SHLIB_LD} ${LD_FLAGS} ${SHARED_OBJ} ${SHLIB_LD_LIBS} \
+ 			 -L${TCL_LIB_PATH} -l${TCL_LIB} -o ${SHARED_LIB}; \
+ 	fi
++	echo "pkg_mkIndex  . ${SHARED_LIB}" | tclsh
  
  
  install: all
-+	mkdir -p ${INSTALLDIR}/lib/
- 	@if [ "x${C_LIB_OPTION}" = xstatic ]; then \
+@@ -68,12 +69,13 @@
  		echo "cp ${STATIC_LIB} ${INSTALLDIR}/lib/"; \
  		cp ${STATIC_LIB} ${INSTALLDIR}/lib/; \
+ 	else \
++		mkdir -p ${INSTALLDIR}/lib/tcltk/fitsTcl; \
+ 		echo "cp ${SHARED_LIB} ${INSTALLDIR}/lib/"; \
+-		cp ${SHARED_LIB} ${INSTALLDIR}/lib/; \
++		cp ${SHARED_LIB} pkgIndex.tcl ${INSTALLDIR}/lib/tcltk/fitsTcl; \
+ 	fi
+ 
+ clean:
+-	-rm -rf *.o *~ ${STATIC_LIB} ${SHARED_LIB}
++	-rm -rf *.o *~ ${STATIC_LIB} ${SHARED_LIB} pkgIndex.tcl
+ 
+ distclean: clean
+ 	-rm -f config.cache config.status config.log Makefile so_locations
+--- a/fitsInit.c
++++ b/fitsInit.c
+@@ -24,6 +24,8 @@
+ 
+     int i;
+ 
++    Tcl_PkgProvide(interp, "fitsTcl", FITSTCL_VERSION);
++
+     for ( i = 0; i < FITS_MAX_OPEN_FILES; i++) {
+ 	FitsOpenFiles[i].fptr = NULL;
+ 	FitsOpenFiles[i].kwds = FitsOpenKwds + i;
diff --git a/debian/rules b/debian/rules
index 3376a3a..ad5cc23 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,4 +8,4 @@ override_dh_auto_configure:
 	dh_auto_configure -- --with-tcl-includes=/usr/include/tcl
 
 override_dh_installchangelogs:
-	dh_installchangelogs ReleaseNotes
\ No newline at end of file
+	dh_installchangelogs ReleaseNotes

-- 
Tcl interface to FITS Files