Packaging changes for heimdal flavour.

Index: emi.canl.canl-c/project/debian.control
===================================================================
RCS file: /cvs/glite/emi.canl.canl-c/project/debian.control,v
retrieving revision 1.11
diff -u -p -r1.11 debian.control
--- emi.canl.canl-c/project/debian.control	22 Oct 2012 15:22:20 -0000	1.11
+++ emi.canl.canl-c/project/debian.control	22 Oct 2012 22:34:57 -0000
@@ -2,7 +2,7 @@ Source: canl-c
 Priority: extra
 Maintainer: @MAINTAINER@
 Uploaders: @UPLOADERS@
-Build-Depends: debhelper (>= 7.0.50~), bison, chrpath, flex, libc-ares-dev, libkrb5-dev, libssl-dev, libtool, pkg-config, texlive-fonts-recommended, texlive-latex-extra, texlive-latex-recommended
+Build-Depends: debhelper (>= 7.0.50~), bison, chrpath, flex, libc-ares-dev, heimdal-dev, libssl-dev, libtool, pkg-config, texlive-fonts-recommended, texlive-latex-extra, texlive-latex-recommended
 Standards-Version: 3.9.1
 Section: libs
 Homepage: http://www.eu-emi.eu
@@ -19,7 +19,7 @@ Description: @SUMMARY@
 Package: libcanl-c-dev
 Section: libdevel
 Architecture: any
-Depends: libcanl-c2 (= ${binary:Version}), libkrb5-dev, ${misc:Depends}
+Depends: libcanl-c2 (= ${binary:Version}), heimdal-dev, ${misc:Depends}
 Description: Development files for EMI caNl
  This package contains development libraries and header files for EMI caNL.
 
Index: org.glite.lbjp-common.db/project/debian.control
===================================================================
RCS file: /cvs/glite/org.glite.lbjp-common.db/project/debian.control,v
retrieving revision 1.5
diff -u -p -r1.5 debian.control
--- org.glite.lbjp-common.db/project/debian.control	8 Jun 2012 09:29:45 -0000	1.5
+++ org.glite.lbjp-common.db/project/debian.control	22 Oct 2012 22:34:58 -0000
@@ -2,7 +2,7 @@ Source: glite-lbjp-common-db
 Priority: extra
 Maintainer: @MAINTAINER@
 Uploaders: @UPLOADERS@
-Build-Depends: debhelper (>= 7.0.50~), chrpath, libcppunit-dev, liblog4c-dev, libglite-lbjp-common-trio-dev, libglite-lbjp-common-log-dev, libmysqlclient-dev, libpq-dev, libtool, pkg-config
+Build-Depends: debhelper (>= 7.0.50~), chrpath, libcppunit-dev, liblog4c-dev, libglite-lbjp-common-trio-dev, libglite-lbjp-common-log-dev, libmysqlclient-dev, libtool, pkg-config
 Standards-Version: 3.9.1
 Section: libs
 Homepage: @URL@
Index: org.glite.lbjp-common.db/project/debian.rules
===================================================================
RCS file: /cvs/glite/org.glite.lbjp-common.db/project/debian.rules,v
retrieving revision 1.3
diff -u -p -r1.3 debian.rules
--- org.glite.lbjp-common.db/project/debian.rules	22 Jun 2012 13:38:15 -0000	1.3
+++ org.glite.lbjp-common.db/project/debian.rules	22 Oct 2012 22:34:58 -0000
@@ -10,7 +10,7 @@ configure: configure-stamp
 configure-stamp:
 	dh_testdir
 	/usr/bin/perl ./configure --thrflavour= --nothrflavour= --root=/ --prefix=/usr --libdir=lib --project=emi --module lbjp-common.db
-	# heimdal: sed -i.orig -e 's/postgresql_prefix.*/postgresql_prefix = no/' Makefile.inc
+	sed -i.orig -e 's/postgresql_prefix.*/postgresql_prefix = no/' Makefile.inc
 	touch $@
 
 build: build-arch build-indep
Index: org.glite.lbjp-common.gss/project/debian.control
===================================================================
RCS file: /cvs/glite/org.glite.lbjp-common.gss/project/debian.control,v
retrieving revision 1.7
diff -u -p -r1.7 debian.control
--- org.glite.lbjp-common.gss/project/debian.control	8 Jun 2012 15:36:44 -0000	1.7
+++ org.glite.lbjp-common.gss/project/debian.control	22 Oct 2012 22:34:58 -0000
@@ -2,7 +2,7 @@ Source: glite-lbjp-common-gss
 Priority: extra
 Maintainer: @MAINTAINER@
 Uploaders: @UPLOADERS@
-Build-Depends: debhelper (>= 7.0.50~), chrpath, libcppunit-dev, libc-ares2, libc-ares-dev, libglobus-gssapi-gsi-dev, libssl-dev, libtool, pkg-config
+Build-Depends: debhelper (>= 7.0.50~), chrpath, libcppunit-dev, libc-ares2, libc-ares-dev, libglobus-common-dev, heimdal-dev, libssl-dev, libtool, pkg-config
 Standards-Version: 3.9.1
 Section: libs
 Homepage: @URL@
@@ -20,7 +20,7 @@ Package: libglite-lbjp-common-gss-dev
 Section: libdevel
 Architecture: any
 Provides: glite-lbjp-common-gss
-Depends: libglite-security-gss9 (= ${binary:Version}), ${misc:Depends}, libglobus-gssapi-gsi-dev, pkg-config
+Depends: libglite-security-gss9 (= ${binary:Version}), ${misc:Depends}, libglobus-common-dev, heimdal-dev, pkg-config
 Description: Development files for gLite L&B/JP common gss library
  This package contains development libraries and header files for gLite gss
  library.
Index: org.glite.lbjp-common.gss/project/debian.rules
===================================================================
RCS file: /cvs/glite/org.glite.lbjp-common.gss/project/debian.rules,v
retrieving revision 1.4
diff -u -p -r1.4 debian.rules
--- org.glite.lbjp-common.gss/project/debian.rules	22 Jun 2012 15:17:22 -0000	1.4
+++ org.glite.lbjp-common.gss/project/debian.rules	22 Oct 2012 22:34:58 -0000
@@ -10,11 +10,11 @@ configure: configure-stamp
 configure-stamp:
 	dh_testdir
 	/usr/bin/perl ./configure --thrflavour= --nothrflavour= --root=/ --prefix=/usr --libdir=lib --project=emi --module lbjp-common.gss
-	# krb: echo "gssapi_provider=kerberos" >> Makefile.inc
-	# krb: echo "GLOBUS_COMMON_CFLAGS=`pkg-config --cflags globus-common`" >> Makefile.inc
-	# krb: echo "GLOBUS_COMMON_LIBS=`pkg-config --libs globus-common`" >> Makefile.inc
-	# krb: echo "KERBEROS_GSSAPI_LIBS=`krb5-config --libs gssapi`" >> Makefile.inc
-	# krb: echo "KERBEROS_GSSAPI_CFLAGS=`krb5-config --cflags gssapi`" >> Makefile.inc
+	echo "gssapi_provider=kerberos" >> Makefile.inc
+	echo "GLOBUS_COMMON_CFLAGS=`pkg-config --cflags globus-common`" >> Makefile.inc
+	echo "GLOBUS_COMMON_LIBS=`pkg-config --libs globus-common`" >> Makefile.inc
+	echo "KERBEROS_GSSAPI_LIBS=`krb5-config --libs gssapi`" >> Makefile.inc
+	echo "KERBEROS_GSSAPI_CFLAGS=`krb5-config --cflags gssapi`" >> Makefile.inc
 	touch $@
 
 build: build-arch build-indep
Index: org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec
===================================================================
RCS file: /cvs/glite/org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec,v
retrieving revision 1.19
diff -u -p -r1.19 glite-lbjp-common-gss.spec
--- org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec	16 Oct 2012 10:37:23 -0000	1.19
+++ org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec	22 Oct 2012 22:34:58 -0000
@@ -1,4 +1,4 @@
-%global gssapi_provider_kerberos %{?gssapi_provider_kerberos:0}
+%global gssapi_provider_kerberos 1
 
 Name:           glite-lbjp-common-gss
 Version:        @MAJOR@.@MINOR@.@REVISION@