Cleanup of the packaging + resurection of the debian packages build

CASTOR.spec

@@ -9,10 +9,6 @@
 %{expand:%define compiling_nostk  %(if [ -z $CASTOR_NOSTK ]; then echo 0; else echo 1; fi)}
 %{expand:%define compiling_client %(if [ -z $CASTOR_CLIENT ]; then echo 0; else echo 1; fi)}
 
-# Python definitions
-#-------------------
-%define _python_lib %(python -c "from distutils import sysconfig; print sysconfig.get_python_lib()")
-
 # General settings
 #-----------------
 Summary: Cern Advanced mass STORage

config/Imake.tmpl

@@ -39,7 +39,11 @@ PYTHONLIBDIR = $(shell python -c "from distutils import sysconfig; print sysconf
 
 ACCTFLAG=-DSACCT
 BIN = InstallBinDir
-LIBDIR = InstallLibDir
+ifeq ($(shell ls /etc/debian_version),/etc/debian_version)
+  LIBDIR = /usr/lib
+else
+  LIBDIR = InstallLibDir
+endif
 CONFIGDIR = InstallConfigDir
 CP = cp
 LD = cc

config/Project.tmpl

@@ -33,7 +33,7 @@ checkORACLE:
 	fi
 
 checkLSF:
-	@if [ ! -e InstallLibDir/liblsf.so -o ! -d /usr/include/lsf ]; then \
+	@if [ ! -e $(LIBDIR)/liblsf.so -o ! -d /usr/include/lsf ]; then \
 	  echo "Could not find LSF installation. Giving up."; \
 	  exit 1; \
 	fi
@@ -49,7 +49,7 @@ checkSTK:
 	@if [ ! -z "${CASTOR_NOSTK}" ]; then \
 	  echo "Compiling without STK support."; \
 	else \
-	  if [ ! -e InstallLibDir/CDK/libapi.so -o ! -e InstallLibDir/CDK/libutl.so -o ! -e InstallLibDir/CDK/libipc.so -o ! -e InstallLibDir/CDK/libcl.so ]; then \
+	  if [ ! -e $(LIBDIR)/CDK/libapi.so -o ! -e $(LIBDIR)/CDK/libutl.so -o ! -e $(LIBDIR)/CDK/libipc.so -o ! -e $(LIBDIR)/CDK/libcl.so ]; then \
 	    echo "Could not find STK libraries. Giving up."; \
 	    exit 1; \
           fi; \

debian/README.Debian

-castor for Debian
------------------
-
-Thank to Christian Holm Christensen <cholm@nbi.dk> to have initiated
-the idea of debian packaking for CASTOR.
-
- -- Jean-Damien Durand <Jean-Damien.Durand@cern.ch>, Wed, 19 Jan 2005 14:53:30 +0100

debian/castor-csec.install.perm

-%attr(-,root,root) usr/lib/libCsec_plugin_GSI.so.__MAJOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libCsec_plugin_GSI.so.__MAJOR_CASTOR_VERSION__.__MINOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libCsec_plugin_GSI.so
-%attr(-,root,root) usr/lib/libCsec_plugin_GSI_thread.so.__MAJOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libCsec_plugin_GSI_thread.so.__MAJOR_CASTOR_VERSION__.__MINOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libCsec_plugin_GSI_thread.so
-%attr(-,root,root) usr/lib/libCsec_plugin_ID.so.__MAJOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libCsec_plugin_ID.so.__MAJOR_CASTOR_VERSION__.__MINOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libCsec_plugin_ID.so
-%attr(-,root,root) usr/lib/libCsec_plugin_KRB5.so.__MAJOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libCsec_plugin_KRB5.so.__MAJOR_CASTOR_VERSION__.__MINOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libCsec_plugin_KRB5.so
+%attr(-,root,root) usr/lib/libCsec_plugin_GSI.so*
+%attr(-,root,root) usr/lib/libCsec_plugin_GSI_thread.so*
+%attr(-,root,root) usr/lib/libCsec_plugin_ID.so*
+%attr(-,root,root) usr/lib/libCsec_plugin_KRB5.so*

debian/castor-dbtools.install.perm

@@ -13,7 +13,7 @@
 %attr(0755,root,root) usr/bin/printFileClass
 %attr(0755,root,root) usr/bin/printSvcClass
 %attr(0755,root,root) usr/lib/perl/CASTOR/castor_tools.pm
-%attr(0644,root,root) %{_python_lib}/castor_tools.py
+%attr(0644,root,root) usr/lib/python*/site-packages/castor_tools.py
 %attr(0755,root,root) usr/bin/vdqmDBInit
 %attr(0755,root,root) usr/bin/vdqmdeletepriority
 %attr(0755,root,root) usr/bin/vdqmlistpriority

debian/castor-expert-server.conffiles

+/etc/logrotate.d/castor-expert-server

debian/castor-gc-server.conffiles

+/etc/logrotate.d/castor-gc-server

debian/castor-gridftp-dsi-common.conffiles

+/etc/logrotate.d/castor-gridftp-dsi-common

debian/castor-gridftp-dsi-ext.conffiles

+/etc/xinetd.d/gsiftp

debian/castor-gridftp-dsi-ext.install.perm

-%attr(0755,root,root) opt/globus/lib/libglobus_gridftp_server_CASTOR2ext_gcc32dbg.so
-%attr(0755,root,root) opt/globus/lib/libglobus_gridftp_server_CASTOR2ext_gcc32dbg.so.__MAJOR_CASTOR_VERSION__
-%attr(0755,root,root) opt/globus/lib/libglobus_gridftp_server_CASTOR2ext_gcc32dbg.so.__MAJOR_CASTOR_VERSION__.__MINOR_CASTOR_VERSION__
+%attr(0755,root,root) opt/globus/lib/libglobus_gridftp_server_CASTOR2ext_gcc32dbg.so*
 %attr(0644,root,root) etc/xinetd.d/gsiftp

debian/castor-gridftp-dsi-int.install.perm

-%attr(0755,root,root) opt/globus/lib/libglobus_gridftp_server_CASTOR2int_gcc32dbg.so
-%attr(0755,root,root) opt/globus/lib/libglobus_gridftp_server_CASTOR2int_gcc32dbg.so.__MAJOR_CASTOR_VERSION__
-%attr(0755,root,root) opt/globus/lib/libglobus_gridftp_server_CASTOR2int_gcc32dbg.so.__MAJOR_CASTOR_VERSION__.__MINOR_CASTOR_VERSION__
+%attr(0755,root,root) opt/globus/lib/libglobus_gridftp_server_CASTOR2int_gcc32dbg.so*

debian/castor-gridftp-dsi-xroot.install.perm

-%attr(0755,root,root) opt/globus/lib/libglobus_gridftp_server_CASTOR2xroot_gcc32dbg.so
-%attr(0755,root,root) opt/globus/lib/libglobus_gridftp_server_CASTOR2xroot_gcc32dbg.so.__MAJOR_CASTOR_VERSION__
-%attr(0755,root,root) opt/globus/lib/libglobus_gridftp_server_CASTOR2xroot_gcc32dbg.so.__MAJOR_CASTOR_VERSION__.__MINOR_CASTOR_VERSION__
+%attr(0755,root,root) opt/globus/lib/libglobus_gridftp_server_CASTOR2xroot_gcc32dbg.so*

debian/castor-job.conffiles

+/etc/logrotate.d/castor-job

debian/castor-jobmanager-server.conffiles

+/etc/logrotate.d/castor-jobmanager-server

debian/castor-lib-monitor.install.perm

-%attr(-,root,root) usr/lib/libcastormonitor.so.__MAJOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libcastormonitor.so.__MAJOR_CASTOR_VERSION__.__MINOR_CASTOR_VERSION__
+%attr(-,root,root) usr/lib/libcastormonitor.so.*

debian/castor-lib-oracle.install.perm

 %attr(0640,root,root) etc/castor/ORASTAGERCONFIG.example
-%attr(-,root,root) usr/lib/libcastorcommonora.so.__MAJOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libcastorcommonora.so.__MAJOR_CASTOR_VERSION__.__MINOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libcastorcnvs.so.__MAJOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libcastorcnvs.so.__MAJOR_CASTOR_VERSION__.__MINOR_CASTOR_VERSION__
+%attr(-,root,root) usr/lib/libcastorcommonora.so.*
+%attr(-,root,root) usr/lib/libcastorcnvs.so.*

debian/castor-lib-tape.install.perm

-%attr(-,root,root) usr/lib/libcastortapegatewayprotocol.so.__MAJOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libcastortapegatewayprotocol.so.__MAJOR_CASTOR_VERSION__.__MINOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libcastortapepython.so.__MAJOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libcastortapepython.so.__MAJOR_CASTOR_VERSION__.__MINOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libcastortapeutils.so.__MAJOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libcastortapeutils.so.__MAJOR_CASTOR_VERSION__.__MINOR_CASTOR_VERSION__
+%attr(-,root,root) usr/lib/libcastortapegatewayprotocol.so.*
+%attr(-,root,root) usr/lib/libcastortapepython.so.*
+%attr(-,root,root) usr/lib/libcastortapeutils.so.*

debian/castor-lib.install.perm

-%attr(-,root,root) usr/lib/libshift.so.__MAJOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libshift.so.__MAJOR_CASTOR_VERSION__.__MINOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libcastorcommon.so.__MAJOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libcastorcommon.so.__MAJOR_CASTOR_VERSION__.__MINOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libcastordlf.so.__MAJOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libcastordlf.so.__MAJOR_CASTOR_VERSION__.__MINOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libcastorupv.so.__MAJOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libcastorupv.so.__MAJOR_CASTOR_VERSION__.__MINOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libcastorns.so.__MAJOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libcastorns.so.__MAJOR_CASTOR_VERSION__.__MINOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libcastorsecurity.so.__MAJOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libcastorsecurity.so.__MAJOR_CASTOR_VERSION__.__MINOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libcastortape.so.__MAJOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libcastortape.so.__MAJOR_CASTOR_VERSION__.__MINOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libcastorrfio.so.__MAJOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libcastorrfio.so.__MAJOR_CASTOR_VERSION__.__MINOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libcastorclient.so.__MAJOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libcastorclient.so.__MAJOR_CASTOR_VERSION__.__MINOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libcastorvdqm.so.__MAJOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libcastorvdqm.so.__MAJOR_CASTOR_VERSION__.__MINOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libcastorrtcopy.so.__MAJOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libcastorrtcopy.so.__MAJOR_CASTOR_VERSION__.__MINOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libcastorvmgr.so.__MAJOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libcastorvmgr.so.__MAJOR_CASTOR_VERSION__.__MINOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libcastorexpert.so.__MAJOR_CASTOR_VERSION__
-%attr(-,root,root) usr/lib/libcastorexpert.so.__MAJOR_CASTOR_VERSION__.__MINOR_CASTOR_VERSION__
+%attr(-,root,root) usr/lib/libshift.so.*
+%attr(-,root,root) usr/lib/libcastorcommon.so.*
+%attr(-,root,root) usr/lib/libcastordlf.so.*
+%attr(-,root,root) usr/lib/libcastorupv.so.*
+%attr(-,root,root) usr/lib/libcastorns.so.*
+%attr(-,root,root) usr/lib/libcastorsecurity.so.*
+%attr(-,root,root) usr/lib/libcastortape.so.*
+%attr(-,root,root) usr/lib/libcastorrfio.so.*
+%attr(-,root,root) usr/lib/libcastorclient.so.*
+%attr(-,root,root) usr/lib/libcastorvdqm.so.*
+%attr(-,root,root) usr/lib/libcastorrtcopy.so.*
+%attr(-,root,root) usr/lib/libcastorvmgr.so.*
+%attr(-,root,root) usr/lib/libcastorexpert.so.*

debian/castor-logprocessor-server.conffiles

+/etc/logrotate.d/castor-logprocessor-server