Packaging improvements, mainly due to documentaion:

- Debian:
  - multiple libraries of different major versions installable
    (should fix upgrade from previous major versions)
  - package static libraries
  - prefer symlinks in tiny package documentations
  - directories cleanup
- RPM:
  - using '%doc' where possible
- moving 'purge' and 'dump' manpages from lb.client to lb.utils
- not using chrpath where not needed
- package ChangeLogs
- don't install package.* and ChangeLog by make

diff --git a/emi.canl.canl-c/Makefile b/emi.canl.canl-c/Makefile
index 618229a..c804dc0 100644 (file)
--- a/emi.canl.canl-c/Makefile
+++ b/emi.canl.canl-c/Makefile
@@ -37,7 +37,7 @@ SOURCES=\
 SOURCES_EXEC=src/*.pl
 
 CFLAGS_LIB=-fPIC -I${top_srcdir}/src ${LIBCARES_CFLAGS} ${LIBSSL_CFLAGS} -I.
-LFLAGS_LIB=-shared ${LIBCARES_LIBS} ${LIBSSL_LIBS}
+LFLAGS_LIB=${LIBCARES_LIBS} ${LIBSSL_LIBS}
 
 CFLAGS_CLI=-I${top_srcdir}/src -I.
 LFLAGS_CLI=-L. -lcanl_c

diff --git a/emi.canl.canl-c/project/canl-c.spec b/emi.canl.canl-c/project/canl-c.spec
index 5c7432a..26d1ef4 100644 (file)
--- a/emi.canl.canl-c/project/canl-c.spec
+++ b/emi.canl.canl-c/project/canl-c.spec
@@ -12,7 +12,6 @@ BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  bison
 BuildRequires:  c-ares-devel%{?_isa}
-BuildRequires:  chrpath
 BuildRequires:  flex
 BuildRequires:  krb5-devel%{?_isa}
 BuildRequires:  libtool
@@ -75,7 +74,6 @@ mkdir -p $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -rf {} \;
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -rf {} \;
-find $RPM_BUILD_ROOT -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
 
 
 %clean
@@ -90,12 +88,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%dir /usr/share/doc/%{name}-%{version}
-/usr/share/doc/%{name}-%{version}/*.pdf
+%doc project/ChangeLog
 %{_libdir}/libcanl_c.so.*
 
 %files devel
 %defattr(-,root,root)
+%doc canl.pdf
 %{_includedir}/*.h
 %{_libdir}/libcanl_c.so
 

diff --git a/emi.canl.canl-c/project/debian.canl.doc-base b/emi.canl.canl-c/project/debian.canl.doc-base
index 4cc8006..5b48319 100644 (file)
--- a/emi.canl.canl-c/project/debian.canl.doc-base
+++ b/emi.canl.canl-c/project/debian.canl.doc-base
@@ -4,4 +4,4 @@ Abstract: CaNl Developer’s Guide explains how to use the Common Authentication
 Section: Programming/C
 
 Format: PDF
-Files: /usr/share/doc/canl-c/canl.pdf.gz
+Files: /usr/share/doc/libcanl-c-dev/canl.pdf.gz

diff --git a/emi.canl.canl-c/project/debian.control b/emi.canl.canl-c/project/debian.control
index 77dc070..4fe5760 100644 (file)
--- a/emi.canl.canl-c/project/debian.control
+++ b/emi.canl.canl-c/project/debian.control
@@ -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, flex, libc-ares-dev, libkrb5-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

diff --git a/emi.canl.canl-c/project/debian.libcanl-c-dev.dirs b/emi.canl.canl-c/project/debian.libcanl-c-dev.dirs
deleted file mode 100644 (file)
index 8fdf2ee..0000000
--- a/emi.canl.canl-c/project/debian.libcanl-c-dev.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/include
-usr/lib
-usr/share/doc/canl-c

diff --git a/emi.canl.canl-c/project/debian.libcanl-c-dev.install b/emi.canl.canl-c/project/debian.libcanl-c-dev.install
index 4e81d50..d1bffed 100644 (file)
--- a/emi.canl.canl-c/project/debian.libcanl-c-dev.install
+++ b/emi.canl.canl-c/project/debian.libcanl-c-dev.install
@@ -1,3 +1,3 @@
 usr/include/*
+usr/lib/lib*.a
 usr/lib/lib*.so
-usr/share/doc/canl-c/*

diff --git a/emi.canl.canl-c/project/debian.libcanl-c-examples.dirs b/emi.canl.canl-c/project/debian.libcanl-c-examples.dirs
deleted file mode 100644 (file)
index e772481..0000000
--- a/emi.canl.canl-c/project/debian.libcanl-c-examples.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin

diff --git a/emi.canl.canl-c/project/debian.libcanl-c2.dirs b/emi.canl.canl-c/project/debian.libcanl-c2.dirs
deleted file mode 100644 (file)
index 6845771..0000000
--- a/emi.canl.canl-c/project/debian.libcanl-c2.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib

diff --git a/emi.canl.canl-c/project/debian.rules b/emi.canl.canl-c/project/debian.rules
index c8abd81..fc78ec4 100644 (file)
--- a/emi.canl.canl-c/project/debian.rules
+++ b/emi.canl.canl-c/project/debian.rules
@@ -3,6 +3,11 @@
 
 -include /usr/share/dpkg/buildflags.mk
 
+p_dbg=canl-c-dbg
+p_dev=libcanl-c-dev
+p_examples=libcanl-c-examples
+p_lib=libcanl-c2
+
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
@@ -36,20 +41,20 @@ install: build-stamp
        dh_prep
        dh_installdirs
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-       rm -vf $(CURDIR)/debian/tmp/usr/lib/*.la
-       rm -vf $(CURDIR)/debian/tmp/usr/lib/*.a
-       find $(CURDIR)/debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
-       mv $(CURDIR)/debian/tmp/usr/share/doc/canl-c-@MAJOR@.@MINOR@.@REVISION@ $(CURDIR)/debian/tmp/usr/share/doc/canl-c
-       (cd $(CURDIR)/debian/tmp/usr/share/doc/canl-c; \
-        rm -fv ChangeLog LICENSE; \
-        cat $(CURDIR)/project/ChangeLog | gzip -9 > changelog.gz)
+       rm -vf debian/tmp/usr/lib/*.la
+       mkdir -p debian/$(p_dbg)/usr/share/doc
+       mkdir -p debian/$(p_dev)/usr/share/doc
+       mkdir -p debian/$(p_examples)/usr/share/doc
+       mv debian/tmp/usr/share/doc/canl-c-@MAJOR@.@MINOR@.@REVISION@ debian/$(p_dev)/usr/share/doc/$(p_dev)
+       ln -s $(p_lib) debian/$(p_dbg)/usr/share/doc/$(p_dbg)
+       ln -s $(p_lib) debian/$(p_examples)/usr/share/doc/$(p_examples)
 
 binary-indep:
 
 binary-arch: install
        dh_testdir
        dh_testroot
-       dh_installchangelogs
+       dh_installchangelogs project/ChangeLog
        dh_installdocs
        dh_installexamples
        dh_installman
@@ -57,7 +62,7 @@ binary-arch: install
        dh_installcron
        dh_install --fail-missing
        dh_link
-       dh_strip --dbg-package=canl-c-dbg
+       dh_strip --dbg-package=$(p_dbg)
        dh_compress
        dh_fixperms
        dh_makeshlibs

diff --git a/org.glite.jobid.api-c/project/debian.control b/org.glite.jobid.api-c/project/debian.control
index 0c5eb1a..ead1c24 100644 (file)
--- a/org.glite.jobid.api-c/project/debian.control
+++ b/org.glite.jobid.api-c/project/debian.control
@@ -2,7 +2,7 @@ Source: glite-jobid-api-c
 Priority: extra
 Maintainer: @MAINTAINER@
 Uploaders: @UPLOADERS@
-Build-Depends: debhelper (>= 7.0.50~), chrpath, libcppunit-dev, libtool, libssl-dev, pkg-config
+Build-Depends: debhelper (>= 7.0.50~), libcppunit-dev, libtool, libssl-dev, pkg-config
 Standards-Version: 3.9.1
 Section: libs
 Homepage: @URL@

diff --git a/org.glite.jobid.api-c/project/debian.libglite-jobid-api-c-dev.dirs b/org.glite.jobid.api-c/project/debian.libglite-jobid-api-c-dev.dirs
index b0cf754..b940222 100644 (file)
--- a/org.glite.jobid.api-c/project/debian.libglite-jobid-api-c-dev.dirs
+++ b/org.glite.jobid.api-c/project/debian.libglite-jobid-api-c-dev.dirs
@@ -1,2 +1,2 @@
-usr/lib
+usr/include/glite
 usr/include/glite/jobid

diff --git a/org.glite.jobid.api-c/project/debian.libglite-jobid-api-c-dev.install b/org.glite.jobid.api-c/project/debian.libglite-jobid-api-c-dev.install
index 7367086..481a7f9 100644 (file)
--- a/org.glite.jobid.api-c/project/debian.libglite-jobid-api-c-dev.install
+++ b/org.glite.jobid.api-c/project/debian.libglite-jobid-api-c-dev.install
@@ -1,2 +1,3 @@
 usr/include/glite/jobid/*.h
+usr/lib/lib*.a
 usr/lib/lib*.so

diff --git a/org.glite.jobid.api-c/project/debian.libglite-jobid2.dirs b/org.glite.jobid.api-c/project/debian.libglite-jobid2.dirs
deleted file mode 100644 (file)
index 6845771..0000000
--- a/org.glite.jobid.api-c/project/debian.libglite-jobid2.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib

diff --git a/org.glite.jobid.api-c/project/debian.rules b/org.glite.jobid.api-c/project/debian.rules
index 22b9b46..0b6ef02 100644 (file)
--- a/org.glite.jobid.api-c/project/debian.rules
+++ b/org.glite.jobid.api-c/project/debian.rules
@@ -3,6 +3,10 @@
 
 -include /usr/share/dpkg/buildflags.mk
 
+p_dbg=glite-jobid-api-c-dbg
+p_dev=libglite-jobid-api-c-dev
+p_lib=libglite-jobid2
+
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
@@ -36,16 +40,18 @@ install: build-stamp
        dh_prep
        dh_installdirs
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-       rm -f $(CURDIR)/debian/tmp/usr/lib/*.la
-       rm -f $(CURDIR)/debian/tmp/usr/lib/*.a
-       find $(CURDIR)/debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
+       rm -f debian/tmp/usr/lib/*.la
+       mkdir -p debian/$(p_dbg)/usr/share/doc
+       mkdir -p debian/$(p_dev)/usr/share/doc
+       ln -s $(p_lib) debian/$(p_dbg)/usr/share/doc/$(p_dbg)
+       ln -s $(p_lib) debian/$(p_dev)/usr/share/doc/$(p_dev)
 
 binary-indep:
 
 binary-arch: install
        dh_testdir
        dh_testroot
-       dh_installchangelogs
+       dh_installchangelogs project/ChangeLog
        dh_installdocs
        dh_installexamples
        dh_installman
@@ -53,7 +59,7 @@ binary-arch: install
        dh_installcron
        dh_install --fail-missing
        dh_link
-       dh_strip --dbg-package=glite-jobid-api-c-dbg
+       dh_strip --dbg-package=$(p_dbg)
        dh_compress
        dh_fixperms
        dh_makeshlibs

diff --git a/org.glite.jobid.api-cpp/project/debian.libglite-jobid-api-cpp-dev.dirs b/org.glite.jobid.api-cpp/project/debian.libglite-jobid-api-cpp-dev.dirs
deleted file mode 100644 (file)
index 59ad749..0000000
--- a/org.glite.jobid.api-cpp/project/debian.libglite-jobid-api-cpp-dev.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/include/glite/jobid

diff --git a/org.glite.jobid.api-cpp/project/debian.rules b/org.glite.jobid.api-cpp/project/debian.rules
index 6242229..0c7b1fd 100644 (file)
--- a/org.glite.jobid.api-cpp/project/debian.rules
+++ b/org.glite.jobid.api-cpp/project/debian.rules
@@ -42,7 +42,7 @@ binary-indep:
 binary-arch: install
        dh_testdir
        dh_testroot
-       dh_installchangelogs
+       dh_installchangelogs project/ChangeLog
        dh_installdocs
        dh_installexamples
        dh_installman

diff --git a/org.glite.jobid.api-java/project/debian.rules b/org.glite.jobid.api-java/project/debian.rules
index f362021..87abbda 100644 (file)
--- a/org.glite.jobid.api-java/project/debian.rules
+++ b/org.glite.jobid.api-java/project/debian.rules
@@ -40,7 +40,7 @@ install: build-stamp
 binary-indep: install
        dh_testdir
        dh_testroot
-       dh_installchangelogs
+       dh_installchangelogs project/ChangeLog
        dh_installdocs
        dh_installexamples
        dh_installman

diff --git a/org.glite.lb.client-java/project/debian.control b/org.glite.lb.client-java/project/debian.control
index a8e6165..990e32d 100644 (file)
--- a/org.glite.lb.client-java/project/debian.control
+++ b/org.glite.lb.client-java/project/debian.control
@@ -2,7 +2,7 @@ Source: glite-lb-client-java
 Priority: extra
 Maintainer: @MAINTAINER@
 Uploaders: @UPLOADERS@
-Build-Depends: debhelper (>= 7.0.50~), ant, chrpath, default-jdk, emi-trustmanager, emi-trustmanager-axis, glite-jobid-api-java, glite-lb-types, glite-lb-ws-interface, libaxis-java, libcommons-lang-java, libtool
+Build-Depends: debhelper (>= 7.0.50~), ant, default-jdk, emi-trustmanager, emi-trustmanager-axis, glite-jobid-api-java, glite-lb-types, glite-lb-ws-interface, libaxis-java, libcommons-lang-java, libtool
 Standards-Version: 3.9.1
 Section: misc
 Homepage: @URL@

diff --git a/org.glite.lb.client-java/project/debian.glite-lb-client-java.dirs b/org.glite.lb.client-java/project/debian.glite-lb-client-java.dirs
index 42a1652..13c9f03 100644 (file)
--- a/org.glite.lb.client-java/project/debian.glite-lb-client-java.dirs
+++ b/org.glite.lb.client-java/project/debian.glite-lb-client-java.dirs
@@ -1,2 +1 @@
-usr/lib
 usr/share/java

diff --git a/org.glite.lb.client-java/project/debian.rules b/org.glite.lb.client-java/project/debian.rules
index 104d175..3e83780 100644 (file)
--- a/org.glite.lb.client-java/project/debian.rules
+++ b/org.glite.lb.client-java/project/debian.rules
@@ -36,16 +36,15 @@ install: build-stamp
        dh_prep
        dh_installdirs
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-       rm -vf $(CURDIR)/debian/tmp/usr/lib/*.la
-       rm -vf $(CURDIR)/debian/tmp/usr/lib/*.a
-       find $(CURDIR)/debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
+       rm -vf debian/tmp/usr/lib/*.la
+       rm -vf debian/tmp/usr/lib/*.a
 
 binary-indep:
 
 binary-arch: install
        dh_testdir
        dh_testroot
-       dh_installchangelogs
+       dh_installchangelogs project/ChangeLog
        dh_installdocs
        dh_installexamples
        dh_installman

diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile
index e80cd3f..f67b6b0 100644 (file)
--- a/org.glite.lb.client/Makefile
+++ b/org.glite.lb.client/Makefile
@@ -195,9 +195,7 @@ EXAMPLES_CL_THR_SRC:=user_jobs_threaded.c job_status_threaded.c
 EXAMPLES_CL_THR:=${EXAMPLES_CL_THR_SRC:.c=}
 
 MAN_GZ:=glite-lb-logevent.1.gz glite-lb-notify.1.gz
-MAN8_GZ:=glite-lb-dump.8.gz glite-lb-load.8.gz
 MAN = $(MAN_GZ:.gz=)
-MAN8 = $(MAN8_GZ:.gz=)
 
 PLUS_EXTRA_LIB:=-lglite_jobid
 
@@ -217,9 +215,9 @@ m4dir=${PREFIX}${prefix}/share/build/m4
 endif
 
 ifdef LB_STANDALONE
-compile all: generate ${c_LIBRARIES} ${TOOLS} logevent notify register_sandbox examples ${MAN_GZ} ${MAN8_GZ}
+compile all: generate ${c_LIBRARIES} ${TOOLS} logevent notify register_sandbox examples ${MAN_GZ}
 else
-compile all: check_version generate ${lib_LTLIBRARIES} ${TOOLS} logevent notify register_sandbox examples ${MAN_GZ} ${MAN8_GZ}
+compile all: check_version generate ${lib_LTLIBRARIES} ${TOOLS} logevent notify register_sandbox examples ${MAN_GZ}
 endif
 
 generate: ${GEN_HDRS}
@@ -289,10 +287,6 @@ ${MAN_GZ}: ${MAN}
        cp $? .
        gzip -9 -f $(notdir $?)
 
-${MAN8_GZ}: ${MAN8}
-       cp $? .
-       gzip -9 -f $(notdir $?)
-
 perftest_logjobs.o: perftest_logjobs.c
        ${CC} ${CFLAGS} -DLB_PERF_DROP -c $<
 
@@ -338,7 +332,7 @@ producer_test: producer_test.o prod_proto_test.o
 producer_test.o: %.o: %.cpp
        ${CXX} -c ${CXXFLAGS} ${CPPUNIT_CFLAGS} $<
 
-man: ${MAN_GZ} ${MAN8_GZ}
+man: ${MAN_GZ}
 
 stage:  compile
        $(MAKE) install PREFIX=${stagedir} staging=1
@@ -364,7 +358,6 @@ install:
        mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}/examples/
        mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/man/man1
        mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir}/glite-lb/examples
-       mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/man/man8
        mkdir -p ${DESTDIR}${m4dir}
 ifdef LB_STANDALONE
        ${INSTALL} -m 755 ${c_LIBRARIES} ${DESTDIR}${PREFIX}${prefix}/${libdir}
@@ -375,7 +368,6 @@ else
        fi
 endif
        ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
-       ( cd ${top_srcdir}/project && ${INSTALL} -m 644 ChangeLog package.description package.summary ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} )
        ${INSTALL} -m 644 ${top_srcdir}/doc/README-notify ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
        (cd ${top_srcdir}/interface && ${INSTALL} -m 644 ${HDRS} ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix}) 
        ${INSTALL} -m 644 ${GEN_HDRS} ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix} 
@@ -400,12 +392,11 @@ endif
        ${INSTALL} -m 755 ${top_srcdir}/examples/notify.pl ${DESTDIR}${PREFIX}${prefix}/${libdir}/glite-lb/examples/glite-lb-notify.pl
        ${INSTALL} -m 755 ${top_srcdir}/examples/sandbox_transfers.sh ${DESTDIR}${PREFIX}${prefix}/${libdir}/glite-lb/examples/glite-lb-sandbox_transfers.sh
        ${INSTALL} -m 644 ${MAN_GZ} ${DESTDIR}${PREFIX}${prefix}/share/man/man1
-       ${INSTALL} -m 644 ${MAN8_GZ} ${DESTDIR}${PREFIX}${prefix}/share/man/man8
        ${INSTALL} -m 644 ${top_srcdir}/m4/glite_lb.m4 ${DESTDIR}${m4dir}/
 
 clean:
        rm -rvf *.o *.lo .libs lib* *.c *.cpp *.h *.dox producer_test notify C/ CPP/
-       rm -rvf ${lib_LTLIBRARIES} ${TOOLS} logevent  register_sandbox ${MAN_GZ} ${MAN8_GZ}
+       rm -rvf ${lib_LTLIBRARIES} ${TOOLS} logevent  register_sandbox ${MAN_GZ}
        rm -rvf ${EXAMPLES} ${EXAMPLES_CL} ${EXAMPLES_CL_THR} ${sh_PROGS}
        rm -f EventAttrNames.pl StatusAttrNames.pl uiwrap.T
        rm -rvf dist ${package}-*.tar.gz

diff --git a/org.glite.lb.client/project/debian.glite-lb-client-progs.dirs b/org.glite.lb.client/project/debian.glite-lb-client-progs.dirs
index 7ba17ff..2c6f64e 100644 (file)
--- a/org.glite.lb.client/project/debian.glite-lb-client-progs.dirs
+++ b/org.glite.lb.client/project/debian.glite-lb-client-progs.dirs
@@ -1,2 +1,2 @@
-usr/bin
+usr/lib/glite-lb
 usr/lib/glite-lb/examples

diff --git a/org.glite.lb.client/project/debian.glite-lb-client-progs.install b/org.glite.lb.client/project/debian.glite-lb-client-progs.install
index c5cde5a..ea84487 100644 (file)
--- a/org.glite.lb.client/project/debian.glite-lb-client-progs.install
+++ b/org.glite.lb.client/project/debian.glite-lb-client-progs.install
@@ -1,2 +1,3 @@
 usr/bin/*
 usr/lib/glite-lb/examples/*
+usr/share/man/*/*

diff --git a/org.glite.lb.client/project/debian.libglite-lb-client-dev.dirs b/org.glite.lb.client/project/debian.libglite-lb-client-dev.dirs
index 7abab4d..37d51da 100644 (file)
--- a/org.glite.lb.client/project/debian.libglite-lb-client-dev.dirs
+++ b/org.glite.lb.client/project/debian.libglite-lb-client-dev.dirs
@@ -1,6 +1,3 @@
-usr/include/glite/lb
-usr/lib
+usr/share/emi
+usr/share/emi/build
 usr/share/emi/build/m4
-usr/share/doc/glite-lb-client/examples
-usr/share/man/man1
-usr/share/man/man8

diff --git a/org.glite.lb.client/project/debian.libglite-lb-client-dev.install b/org.glite.lb.client/project/debian.libglite-lb-client-dev.install
index 2222094..d0f3469 100644 (file)
--- a/org.glite.lb.client/project/debian.libglite-lb-client-dev.install
+++ b/org.glite.lb.client/project/debian.libglite-lb-client-dev.install
@@ -1,5 +1,4 @@
 usr/include/glite/lb/*.h
+usr/lib/lib*.a
 usr/lib/lib*.so
-usr/share/doc/glite-lb-client/examples/*
 usr/share/emi/build/m4/*
-usr/share/man/*/*

diff --git a/org.glite.lb.client/project/debian.libglite-lb-client14.dirs b/org.glite.lb.client/project/debian.libglite-lb-client14.dirs
deleted file mode 100644 (file)
index 53c4714..0000000
--- a/org.glite.lb.client/project/debian.libglite-lb-client14.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib
-usr/share/doc/glite-lb-client
\ No newline at end of file

diff --git a/org.glite.lb.client/project/debian.libglite-lb-client14.install b/org.glite.lb.client/project/debian.libglite-lb-client14.install
index 8606864..d0dbfd1 100644 (file)
--- a/org.glite.lb.client/project/debian.libglite-lb-client14.install
+++ b/org.glite.lb.client/project/debian.libglite-lb-client14.install
@@ -1,4 +1 @@
 usr/lib/lib*.so.*
-usr/share/doc/glite-lb-client/changelog.gz
-usr/share/doc/glite-lb-client/package.*
-usr/share/doc/glite-lb-client/README-notify

diff --git a/org.glite.lb.client/project/debian.rules b/org.glite.lb.client/project/debian.rules
index 3016ca3..d49e4e5 100644 (file)
--- a/org.glite.lb.client/project/debian.rules
+++ b/org.glite.lb.client/project/debian.rules
@@ -3,6 +3,11 @@
 
 -include /usr/share/dpkg/buildflags.mk
 
+p_dbg=glite-lb-client-dbg
+p_dev=libglite-lb-client-dev
+p_lib=libglite-lb-client14
+p_progs=glite-lb-client-progs
+
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
@@ -36,20 +41,22 @@ install: build-stamp
        dh_prep
        dh_installdirs
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-       rm -vf $(CURDIR)/debian/tmp/usr/lib/*.la
-       rm -vf $(CURDIR)/debian/tmp/usr/lib/*.a
-       find $(CURDIR)/debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
-       mv $(CURDIR)/debian/tmp/usr/share/doc/glite-lb-client-@MAJOR@.@MINOR@.@REVISION@ $(CURDIR)/debian/tmp/usr/share/doc/glite-lb-client
-       (cd $(CURDIR)/debian/tmp/usr/share/doc/glite-lb-client; \
-        rm -fv ChangeLog LICENSE; \
-        cat $(CURDIR)/project/ChangeLog | gzip -9 > changelog.gz)
+       rm -vf debian/tmp/usr/lib/*.la
+       find debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
+       mkdir -p debian/$(p_dbg)/usr/share/doc/$(p_dbg)
+       mkdir -p debian/$(p_dev)/usr/share/doc/$(p_dev)
+       mkdir -p debian/$(p_progs)/usr/share/doc/$(p_progs)
+       ln -s $(p_lib) debian/$(p_dbg)/usr/share/doc/$(p_dbg)
+       mv debian/tmp/usr/share/doc/glite-lb-client-@MAJOR@.@MINOR@.@REVISION@/examples debian/$(p_dev)/usr/share/doc/$(p_dev)
+       mv debian/tmp/usr/share/doc/glite-lb-client-@MAJOR@.@MINOR@.@REVISION@/README-notify debian/$(p_progs)/usr/share/doc/$(p_progs)
+       rm -rf debian/tmp/usr/share/doc/glite-lb-client-@MAJOR@.@MINOR@.@REVISION@
 
 binary-indep:
 
 binary-arch: install
        dh_testdir
        dh_testroot
-       dh_installchangelogs
+       dh_installchangelogs project/ChangeLog
        dh_installdocs
        dh_installexamples
        dh_installman
@@ -57,7 +64,7 @@ binary-arch: install
        dh_installcron
        dh_install --fail-missing
        dh_link
-       dh_strip --dbg-package=glite-lb-client-dbg
+       dh_strip --dbg-package=$(p_dbg)
        dh_compress
        dh_fixperms
        dh_makeshlibs

diff --git a/org.glite.lb.client/project/glite-lb-client.spec b/org.glite.lb.client/project/glite-lb-client.spec
index 1d01e21..b866acc 100644 (file)
--- a/org.glite.lb.client/project/glite-lb-client.spec
+++ b/org.glite.lb.client/project/glite-lb-client.spec
@@ -65,6 +65,7 @@ make check
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+cp -p project/ChangeLog $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -rf {} \;
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -rf {} \;
 find $RPM_BUILD_ROOT -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
@@ -87,16 +88,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libglite_lb_clientpp.so.*
 /usr/share/doc/%{name}-%{version}/ChangeLog
 /usr/share/doc/%{name}-%{version}/LICENSE
-/usr/share/doc/%{name}-%{version}/README-notify
-/usr/share/doc/%{name}-%{version}/package.description
-/usr/share/doc/%{name}-%{version}/package.summary
 
 %files devel
 %defattr(-,root,root)
+%dir /usr/share/doc/%{name}-%{version}/examples/
 %dir /usr/share/emi/
 %dir /usr/share/emi/build/
 %dir /usr/share/emi/build/m4/
-%dir /usr/share/doc/%{name}-%{version}/examples/
 %dir %{_includedir}/glite/
 %dir %{_includedir}/glite/lb/
 %{_includedir}/glite/lb/*.h
@@ -104,10 +102,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libglite_lb_clientpp.so
 /usr/share/doc/%{name}-%{version}/examples/*
 /usr/share/emi/build/m4/glite_lb.m4
-/usr/share/man/man1/glite-lb-notify.1.gz
-/usr/share/man/man1/glite-lb-logevent.1.gz
-/usr/share/man/man8/glite-lb-dump.8.gz
-/usr/share/man/man8/glite-lb-load.8.gz
 
 %files progs
 %defattr(-,root,root)
@@ -117,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/glite-lb-notify
 %{_bindir}/glite-lb-register_sandbox
 %{_libdir}/glite-lb/examples/*
+/usr/share/doc/%{name}-%{version}/README-notify
+/usr/share/man/man1/glite-lb-notify.1.gz
+/usr/share/man/man1/glite-lb-logevent.1.gz
 
 
 %changelog

diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile
index 3e8fab7..3294cd5 100644 (file)
--- a/org.glite.lb.common/Makefile
+++ b/org.glite.lb.common/Makefile
@@ -247,7 +247,6 @@ install:
        mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
        ${INSTALL} -m 755 ${lib_LTLIBRARIES} ${DESTDIR}${PREFIX}${prefix}/${libdir}
        ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
-       ( cd ${top_srcdir}/project && ${INSTALL} -m 644 ChangeLog package.description package.summary ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} )
 #      cp -r C CPP ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
        mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix} ;
        (cd ${top_srcdir}/interface && ${INSTALL} -m 644 ${HDRS} ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix}) ;

diff --git a/org.glite.lb.common/project/debian.libglite-lb-common-dev.dirs b/org.glite.lb.common/project/debian.libglite-lb-common-dev.dirs
index bd4d272..bc8c4e4 100644 (file)
--- a/org.glite.lb.common/project/debian.libglite-lb-common-dev.dirs
+++ b/org.glite.lb.common/project/debian.libglite-lb-common-dev.dirs
@@ -1,3 +1,2 @@
+usr/include/glite
 usr/include/glite/lb
-usr/lib
-usr/share/doc/glite-lb-common

diff --git a/org.glite.lb.common/project/debian.libglite-lb-common-dev.install b/org.glite.lb.common/project/debian.libglite-lb-common-dev.install
index 3053c66..c8fd5bd 100644 (file)
--- a/org.glite.lb.common/project/debian.libglite-lb-common-dev.install
+++ b/org.glite.lb.common/project/debian.libglite-lb-common-dev.install
@@ -1,3 +1,3 @@
 usr/include/glite/lb/*.h
+usr/lib/lib*.a
 usr/lib/lib*.so
-usr/share/doc/glite-lb-common/*

diff --git a/org.glite.lb.common/project/debian.libglite-lb-common16.dirs b/org.glite.lb.common/project/debian.libglite-lb-common16.dirs
deleted file mode 100644 (file)
index 6845771..0000000
--- a/org.glite.lb.common/project/debian.libglite-lb-common16.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib

diff --git a/org.glite.lb.common/project/debian.rules b/org.glite.lb.common/project/debian.rules
index 6338732..97af587 100644 (file)
--- a/org.glite.lb.common/project/debian.rules
+++ b/org.glite.lb.common/project/debian.rules
@@ -3,6 +3,10 @@
 
 -include /usr/share/dpkg/buildflags.mk
 
+p_dbg=glite-lb-common-dbg
+p_lib=libglite-lb-common16
+p_dev=libglite-lb-common-dev
+
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
@@ -36,20 +40,20 @@ install: build-stamp
        dh_prep
        dh_installdirs
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-       rm -vf $(CURDIR)/debian/tmp/usr/lib/*.la
-       rm -vf $(CURDIR)/debian/tmp/usr/lib/*.a
-       find $(CURDIR)/debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
-       mv $(CURDIR)/debian/tmp/usr/share/doc/glite-lb-common-@MAJOR@.@MINOR@.@REVISION@ $(CURDIR)/debian/tmp/usr/share/doc/glite-lb-common
-       (cd $(CURDIR)/debian/tmp/usr/share/doc/glite-lb-common; \
-        rm -fv ChangeLog LICENSE; \
-        cat $(CURDIR)/project/ChangeLog | gzip -9 > changelog.gz)
+       rm -vf debian/tmp/usr/lib/*.la
+       find debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
+       rm -rf debian/tmp/usr/share
+       mkdir -p debian/$(p_dbg)/usr/share/doc
+       mkdir -p debian/$(p_dev)/usr/share/doc
+       ln -s $(p_lib) debian/$(p_dbg)/usr/share/doc/$(p_dbg)
+       ln -s $(p_lib) debian/$(p_dev)/usr/share/doc/$(p_dev)
 
 binary-indep:
 
 binary-arch: install
        dh_testdir
        dh_testroot
-       dh_installchangelogs
+       dh_installchangelogs project/ChangeLog
        dh_installdocs
        dh_installexamples
        dh_installman
@@ -57,7 +61,7 @@ binary-arch: install
        dh_installcron
        dh_install --fail-missing
        dh_link
-       dh_strip --dbg-package=glite-lb-common-dbg
+       dh_strip --dbg-package=$(p_dbg)
        dh_compress
        dh_fixperms
        dh_makeshlibs

diff --git a/org.glite.lb.common/project/glite-lb-common.spec b/org.glite.lb.common/project/glite-lb-common.spec
index 0ad9da8..a75ad2f 100644 (file)
--- a/org.glite.lb.common/project/glite-lb-common.spec
+++ b/org.glite.lb.common/project/glite-lb-common.spec
@@ -76,11 +76,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%dir /usr/share/doc/%{name}-%{version}/
-/usr/share/doc/%{name}-%{version}/LICENSE
-/usr/share/doc/%{name}-%{version}/ChangeLog
-/usr/share/doc/%{name}-%{version}/package.description
-/usr/share/doc/%{name}-%{version}/package.summary
+%doc LICENSE project/ChangeLog
 %{_libdir}/libglite_lb_common.so.*
 
 %files devel

diff --git a/org.glite.lb.doc/project/debian.glite-lb-doc.dirs b/org.glite.lb.doc/project/debian.glite-lb-doc.dirs
deleted file mode 100644 (file)
index 6c9585c..0000000
--- a/org.glite.lb.doc/project/debian.glite-lb-doc.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/doc/glite-lb-doc
-usr/share/doc/glite-lb-doc/examples

diff --git a/org.glite.lb.doc/project/debian.glite-lb-doc.install b/org.glite.lb.doc/project/debian.glite-lb-doc.install
deleted file mode 100644 (file)
index fc2b692..0000000
--- a/org.glite.lb.doc/project/debian.glite-lb-doc.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/doc/glite-lb-doc/*
-usr/share/doc/glite-lb-doc/examples/*

diff --git a/org.glite.lb.doc/project/debian.rules b/org.glite.lb.doc/project/debian.rules
index f516a3c..8d70c69 100644 (file)
--- a/org.glite.lb.doc/project/debian.rules
+++ b/org.glite.lb.doc/project/debian.rules
@@ -3,6 +3,8 @@
 
 -include /usr/share/dpkg/buildflags.mk
 
+p_base=glite-lb-doc
+
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
@@ -36,15 +38,14 @@ install: build-stamp
        dh_prep
        dh_installdirs
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-       mv $(CURDIR)/debian/tmp/usr/share/doc/glite-lb-doc-@MAJOR@.@MINOR@.@REVISION@ $(CURDIR)/debian/tmp/usr/share/doc/glite-lb-doc
-       (cd $(CURDIR)/debian/tmp/usr/share/doc/glite-lb-doc; \
-        rm -fv ChangeLog LICENSE; \
-        cat $(CURDIR)/project/ChangeLog | gzip -9 > changelog.gz)
+       mkdir -p debian/$(p_base)/usr/share/doc
+       mv debian/tmp/usr/share/doc/glite-lb-doc-@MAJOR@.@MINOR@.@REVISION@ debian/$(p_base)/usr/share/doc/$(p_base)
+       rm -f debian/$(p_base)/usr/share/doc/$(p_base)/LICENSE
 
 binary-indep: install
        dh_testdir
        dh_testroot
-       dh_installchangelogs
+       dh_installchangelogs project/ChangeLog
        dh_installdocs
        dh_installexamples
        dh_installman

diff --git a/org.glite.lb.emi-lb/project/debian.rules b/org.glite.lb.emi-lb/project/debian.rules
index 376f8c9..7291cde 100644 (file)
--- a/org.glite.lb.emi-lb/project/debian.rules
+++ b/org.glite.lb.emi-lb/project/debian.rules
@@ -37,7 +37,7 @@ install: build-stamp
 binary-indep: install
        dh_testdir
        dh_testroot
-       dh_installchangelogs
+       dh_installchangelogs project/ChangeLog
        dh_installdocs
        dh_installexamples
        dh_installman

diff --git a/org.glite.lb.harvester/project/debian.control b/org.glite.lb.harvester/project/debian.control
index 1b11da9..d1be2fe 100644 (file)
--- a/org.glite.lb.harvester/project/debian.control
+++ b/org.glite.lb.harvester/project/debian.control
@@ -12,7 +12,7 @@ DM-Upload-Allowed: yes
 Package: glite-lb-harvester
 Section: misc
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, glite-lbjp-common-log
 Description: @SUMMARY@
 @DEBIAN_DESCRIPTION@
 

diff --git a/org.glite.lb.harvester/project/debian.glite-lb-harvester.dirs b/org.glite.lb.harvester/project/debian.glite-lb-harvester.dirs
index 3aef430..7c8fce5 100644 (file)
--- a/org.glite.lb.harvester/project/debian.glite-lb-harvester.dirs
+++ b/org.glite.lb.harvester/project/debian.glite-lb-harvester.dirs
@@ -1,9 +1,4 @@
 etc/glite-lb
-etc/init.d
-usr/bin
-usr/lib
 usr/lib/glite-lb
 usr/lib/glite-lb/examples
 usr/share/glite
-usr/share/doc/glite-lb-harvester
-usr/share/man/man1

diff --git a/org.glite.lb.harvester/project/debian.glite-lb-harvester.install b/org.glite.lb.harvester/project/debian.glite-lb-harvester.install
index 1f83a23..6677285 100644 (file)
--- a/org.glite.lb.harvester/project/debian.glite-lb-harvester.install
+++ b/org.glite.lb.harvester/project/debian.glite-lb-harvester.install
@@ -1,6 +1,5 @@
 etc/init.d/glite-lb-harvester
 usr/bin/*
 usr/lib/glite-lb/examples/*
-usr/share/doc/glite-lb-harvester/*
 usr/share/glite/*
 usr/share/man/man1/*

diff --git a/org.glite.lb.harvester/project/debian.rules b/org.glite.lb.harvester/project/debian.rules
index 4d69100..0530274 100644 (file)
--- a/org.glite.lb.harvester/project/debian.rules
+++ b/org.glite.lb.harvester/project/debian.rules
@@ -3,6 +3,9 @@
 
 -include /usr/share/dpkg/buildflags.mk
 
+p_base=glite-lb-harvester
+p_dbg=glite-lb-harvester-dbg
+
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
@@ -36,17 +39,15 @@ install: build-stamp
        dh_prep
        dh_installdirs
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-       mv $(CURDIR)/debian/tmp/usr/share/doc/glite-lb-harvester-@MAJOR@.@MINOR@.@REVISION@ $(CURDIR)/debian/tmp/usr/share/doc/glite-lb-harvester
-       (cd $(CURDIR)/debian/tmp/usr/share/doc/glite-lb-harvester; \
-        rm -fv ChangeLog LICENSE; \
-        cat $(CURDIR)/project/ChangeLog | gzip -9 > changelog.gz)
+       mkdir -p debian/$(p_base)/usr/share/doc
+       mv debian/tmp/usr/share/doc/glite-lb-harvester-@MAJOR@.@MINOR@.@REVISION@ debian/$(p_base)/usr/share/doc/$(p_base)
 
 binary-indep:
 
 binary-arch: install
        dh_testdir
        dh_testroot
-       dh_installchangelogs
+       dh_installchangelogs project/ChangeLog
        dh_installdocs
        dh_installexamples
        dh_installman
@@ -55,7 +56,7 @@ binary-arch: install
        dh_installcron
        dh_install --fail-missing
        dh_link
-       dh_strip --dbg-package=glite-lb-harvester-dbg
+       dh_strip --dbg-package=$(p_dbg)
        dh_compress
        dh_fixperms
        dh_makeshlibs

diff --git a/org.glite.lb.logger-msg/Makefile b/org.glite.lb.logger-msg/Makefile
index 651b880..0679fa6 100644 (file)
--- a/org.glite.lb.logger-msg/Makefile
+++ b/org.glite.lb.logger-msg/Makefile
@@ -132,7 +132,6 @@ install:
        ${INSTALL} -m 644 ${top_srcdir}/config/msg.conf.example ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
        ${INSTALL} -m 755 ${PLUGIN_LIB} ${DESTDIR}${PREFIX}${prefix}/${libdir}
        ${INSTALL} -m 755 ${EXAMPLES} ${DESTDIR}${PREFIX}${prefix}/${libdir}/glite-lb/examples
-       ( cd ${top_srcdir}/project && ${INSTALL} -m 644 ChangeLog package.description package.summary ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} )
        ${INSTALL} -m 755 ${top_srcdir}/src/msg-brokers ${DESTDIR}${PREFIX}${prefix}/sbin/glite-lb-msg-brokers
        ${INSTALL} -m 755 msg-config.new ${DESTDIR}${PREFIX}${prefix}/sbin/glite-lb-msg-config
        ${INSTALL} -m 644 msg.cron.new ${DESTDIR}${PREFIX}${sysconfdir}/cron.d/glite-lb-logger-msg

diff --git a/org.glite.lb.logger-msg/project/debian.glite-lb-logger-msg.dirs b/org.glite.lb.logger-msg/project/debian.glite-lb-logger-msg.dirs
index 8cef7ee..6269b7b 100644 (file)
--- a/org.glite.lb.logger-msg/project/debian.glite-lb-logger-msg.dirs
+++ b/org.glite.lb.logger-msg/project/debian.glite-lb-logger-msg.dirs
@@ -1,5 +1,3 @@
 etc/glite-lb
 usr/lib/glite-lb
 usr/lib/glite-lb/examples
-usr/sbin
-usr/share/doc/glite-lb-logger-msg

diff --git a/org.glite.lb.logger-msg/project/debian.glite-lb-logger-msg.install b/org.glite.lb.logger-msg/project/debian.glite-lb-logger-msg.install
index 894a24b..345a6cf 100644 (file)
--- a/org.glite.lb.logger-msg/project/debian.glite-lb-logger-msg.install
+++ b/org.glite.lb.logger-msg/project/debian.glite-lb-logger-msg.install
@@ -2,4 +2,3 @@ etc/cron.d/*
 usr/lib/activemq_cpp_plugin.so*
 usr/lib/glite-lb/examples/*
 usr/sbin/glite-lb-msg-*
-usr/share/doc/glite-lb-logger-msg/*

diff --git a/org.glite.lb.logger-msg/project/debian.rules b/org.glite.lb.logger-msg/project/debian.rules
index d94ba19..c302707 100644 (file)
--- a/org.glite.lb.logger-msg/project/debian.rules
+++ b/org.glite.lb.logger-msg/project/debian.rules
@@ -3,6 +3,9 @@
 
 -include /usr/share/dpkg/buildflags.mk
 
+p_base=glite-lb-logger-msg
+p_dbg=glite-lb-logger-msg-dbg
+
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
@@ -36,20 +39,21 @@ install: build-stamp
        dh_prep
        dh_installdirs
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-       rm -vf $(CURDIR)/debian/tmp/usr/lib/*.la
-       rm -vf $(CURDIR)/debian/tmp/usr/lib/*.a
-       find $(CURDIR)/debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
-       mv $(CURDIR)/debian/tmp/usr/share/doc/glite-lb-logger-msg-@MAJOR@.@MINOR@.@REVISION@ $(CURDIR)/debian/tmp/usr/share/doc/glite-lb-logger-msg
-       (cd $(CURDIR)/debian/tmp/usr/share/doc/glite-lb-logger-msg; \
-        rm -fv ChangeLog LICENSE; \
-        cat $(CURDIR)/project/ChangeLog | gzip -9 > changelog.gz)
+       rm -vf debian/tmp/usr/lib/*.la
+       rm -vf debian/tmp/usr/lib/activemq_cpp_plugin.a
+       find debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
+       mkdir -p debian/$(p_base)/usr/share/doc
+       mkdir -p debian/$(p_dbg)/usr/share/doc
+       mv debian/tmp/usr/share/doc/glite-lb-logger-msg-@MAJOR@.@MINOR@.@REVISION@ debian/$(p_base)/usr/share/doc/$(p_base)
+       rm -f debian/$(p_base)/usr/share/doc/$(p_base)/LICENSE
+       ln -s $(p_base) debian/$(p_dbg)/usr/share/doc/$(p_dbg)
 
 binary-indep:
 
 binary-arch: install
        dh_testdir
        dh_testroot
-       dh_installchangelogs
+       dh_installchangelogs project/ChangeLog
        dh_installdocs
        dh_installexamples
        dh_installman
@@ -57,7 +61,7 @@ binary-arch: install
        dh_installcron
        dh_install --fail-missing
        dh_link
-       dh_strip --dbg-package=glite-lb-logger-msg-dbg
+       dh_strip --dbg-package=$(p_dbg)
        dh_compress
        dh_fixperms
        dh_makeshlibs

diff --git a/org.glite.lb.logger-msg/project/glite-lb-logger-msg.spec b/org.glite.lb.logger-msg/project/glite-lb-logger-msg.spec
index 52c10e0..88f2802 100644 (file)
--- a/org.glite.lb.logger-msg/project/glite-lb-logger-msg.spec
+++ b/org.glite.lb.logger-msg/project/glite-lb-logger-msg.spec
@@ -56,20 +56,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
+%doc LICENSE project/ChangeLog config/msg.conf.example
 %dir /etc/glite-lb/
 %dir /usr/%{_lib}/glite-lb/
 %dir /usr/%{_lib}/glite-lb/examples/
-%dir /usr/share/doc/%{name}-%{version}/
 /etc/cron.d/glite-lb-logger-msg
 %{_libdir}/activemq_cpp_plugin.so
 %{_libdir}/activemq_cpp_plugin.so.0
 %{_libdir}/activemq_cpp_plugin.so.0.0.0
 %{_libdir}/glite-lb/examples/glite-lb-cmsclient
-/usr/share/doc/%{name}-%{version}/ChangeLog
-/usr/share/doc/%{name}-%{version}/LICENSE
-/usr/share/doc/%{name}-%{version}/msg.conf.example
-/usr/share/doc/%{name}-%{version}/package.summary
-/usr/share/doc/%{name}-%{version}/package.description
 /usr/sbin/glite-lb-msg-*
 
 

diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile
index 14f8252..f6bb1ca 100644 (file)
--- a/org.glite.lb.logger/Makefile
+++ b/org.glite.lb.logger/Makefile
@@ -234,7 +234,6 @@ endif
        ${INSTALL} -m 755 startup ${DESTDIR}${PREFIX}${sysconfdir}/init.d/glite-lb-locallogger
        ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
        ( cd ${top_srcdir}/interface && ${INSTALL} -m 644 ${HDRS} ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix} )
-       ( cd ${top_srcdir}/project && ${INSTALL} -m 644 ChangeLog package.description package.summary ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} )
        ${INSTALL} -m 644 ${MAN_GZ} ${DESTDIR}${PREFIX}${prefix}/share/man/man8
 
 ${INTERLOG_NOTIF_OBJS}: %.notif.lo: %.c

diff --git a/org.glite.lb.logger/project/debian.control b/org.glite.lb.logger/project/debian.control
index ffb575d..4da8ce7 100644 (file)
--- a/org.glite.lb.logger/project/debian.control
+++ b/org.glite.lb.logger/project/debian.control
@@ -12,7 +12,7 @@ DM-Upload-Allowed: yes
 Package: glite-lb-logger
 Section: misc
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, glite-lbjp-common-log
 Description: @SUMMARY@
 @DEBIAN_DESCRIPTION@
 

diff --git a/org.glite.lb.logger/project/debian.glite-lb-logger-dev.dirs b/org.glite.lb.logger/project/debian.glite-lb-logger-dev.dirs
deleted file mode 100644 (file)
index bc8c4e4..0000000
--- a/org.glite.lb.logger/project/debian.glite-lb-logger-dev.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/include/glite
-usr/include/glite/lb

diff --git a/org.glite.lb.logger/project/debian.glite-lb-logger.dirs b/org.glite.lb.logger/project/debian.glite-lb-logger.dirs
deleted file mode 100644 (file)
index 20263a7..0000000
--- a/org.glite.lb.logger/project/debian.glite-lb-logger.dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-etc/init.d
-usr/bin
-usr/share/doc/glite-lb-logger
-usr/share/man/man8

diff --git a/org.glite.lb.logger/project/debian.glite-lb-logger.install b/org.glite.lb.logger/project/debian.glite-lb-logger.install
index 796a685..dc2cb58 100644 (file)
--- a/org.glite.lb.logger/project/debian.glite-lb-logger.install
+++ b/org.glite.lb.logger/project/debian.glite-lb-logger.install
@@ -1,4 +1,3 @@
 etc/init.d/*
 usr/bin/*
-usr/share/doc/glite-lb-logger/*
 usr/share/man/man8/*

diff --git a/org.glite.lb.logger/project/debian.rules b/org.glite.lb.logger/project/debian.rules
index 0cc1ad3..faaed0d 100644 (file)
--- a/org.glite.lb.logger/project/debian.rules
+++ b/org.glite.lb.logger/project/debian.rules
@@ -3,6 +3,10 @@
 
 -include /usr/share/dpkg/buildflags.mk
 
+p_base=glite-lb-logger
+p_dbg=glite-lb-logger-dbg
+p_dev=glite-lb-logger-dev
+
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
@@ -36,18 +40,19 @@ install: build-stamp
        dh_prep
        dh_installdirs
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-       find $(CURDIR)/debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
-       mv $(CURDIR)/debian/tmp/usr/share/doc/glite-lb-logger-@MAJOR@.@MINOR@.@REVISION@ $(CURDIR)/debian/tmp/usr/share/doc/glite-lb-logger
-       (cd $(CURDIR)/debian/tmp/usr/share/doc/glite-lb-logger; \
-        rm -fv ChangeLog LICENSE; \
-        cat $(CURDIR)/project/ChangeLog | gzip -9 > changelog.gz)
+       find debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
+       rm -rf debian/tmp/usr/share/doc
+       mkdir -p debian/$(p_dbg)/usr/share/doc
+       mkdir -p debian/$(p_dev)/usr/share/doc
+       ln -s $(p_base) debian/$(p_dbg)/usr/share/doc/$(p_dbg)
+       ln -s $(p_base) debian/$(p_dev)/usr/share/doc/$(p_dev)
 
 binary-indep:
 
 binary-arch: install
        dh_testdir
        dh_testroot
-       dh_installchangelogs
+       dh_installchangelogs project/ChangeLog
        dh_installdocs
        dh_installexamples
        dh_installman
@@ -56,7 +61,7 @@ binary-arch: install
        dh_installcron
        dh_install --fail-missing
        dh_link
-       dh_strip --dbg-package=glite-lb-logger-dbg
+       dh_strip --dbg-package=$(p_dbg)
        dh_compress
        dh_fixperms
        dh_makeshlibs

diff --git a/org.glite.lb.logger/project/glite-lb-logger.spec b/org.glite.lb.logger/project/glite-lb-logger.spec
index 94a8593..aa03bcd 100644 (file)
--- a/org.glite.lb.logger/project/glite-lb-logger.spec
+++ b/org.glite.lb.logger/project/glite-lb-logger.spec
@@ -94,15 +94,11 @@ fi
 
 %files
 %defattr(-,root,root)
-%dir /usr/share/doc/%{name}-%{version}/
+%doc LICENSE project/ChangeLog
 /etc/init.d/glite-lb-locallogger
 %{_bindir}/glite-lb-notif-interlogd
 %{_bindir}/glite-lb-interlogd
 %{_bindir}/glite-lb-logd
-/usr/share/doc/%{name}-%{version}/ChangeLog
-/usr/share/doc/%{name}-%{version}/LICENSE
-/usr/share/doc/%{name}-%{version}/package.description
-/usr/share/doc/%{name}-%{version}/package.summary
 /usr/share/man/man8/glite-lb-interlogd.8.gz
 /usr/share/man/man8/glite-lb-logd.8.gz
 

diff --git a/org.glite.lb.nagios/Makefile b/org.glite.lb.nagios/Makefile
index ed199bc..7f34b44 100644 (file)
--- a/org.glite.lb.nagios/Makefile
+++ b/org.glite.lb.nagios/Makefile
@@ -19,12 +19,10 @@ all:
 
 install:
        mkdir -p ${DESTDIR}${PREFIX}/var/lib/grid-monitoring/emi.lb
-       mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
        chmod 750 ${DESTDIR}${PREFIX}/var/lib/grid-monitoring/emi.lb
        -chown nagios:nagios ${DESTDIR}${PREFIX}/var/lib/grid-monitoring/emi.lb
        mkdir -p ${DESTDIR}${PREFIX}${prefix}/libexec/grid-monitoring/probes/emi.lb
        ${INSTALL} -m 0755 src/LB-probe ${DESTDIR}${PREFIX}${prefix}/libexec/grid-monitoring/probes/emi.lb
-       ( cd ${top_srcdir}/project && ${INSTALL} -m 644 ChangeLog package.description package.summary ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} )
 
 stage:
        $(MAKE) install PREFIX=${stagedir}

diff --git a/org.glite.lb.nagios/project/debian.emi-lb-nagios-plugins.dirs b/org.glite.lb.nagios/project/debian.emi-lb-nagios-plugins.dirs
index ef6a7fa..240a26d 100644 (file)
--- a/org.glite.lb.nagios/project/debian.emi-lb-nagios-plugins.dirs
+++ b/org.glite.lb.nagios/project/debian.emi-lb-nagios-plugins.dirs
@@ -1,4 +1,3 @@
-usr/share/doc/emi-lb-nagios-plugins
 usr/libexec/grid-monitoring
 usr/libexec/grid-monitoring/probes
 usr/libexec/grid-monitoring/probes/emi.lb

diff --git a/org.glite.lb.nagios/project/debian.emi-lb-nagios-plugins.install b/org.glite.lb.nagios/project/debian.emi-lb-nagios-plugins.install
index 909c0df..711f196 100644 (file)
--- a/org.glite.lb.nagios/project/debian.emi-lb-nagios-plugins.install
+++ b/org.glite.lb.nagios/project/debian.emi-lb-nagios-plugins.install
@@ -1,2 +1 @@
-usr/share/doc/emi-lb-nagios-plugins/*
 usr/libexec/grid-monitoring/probes/emi.lb/*

diff --git a/org.glite.lb.nagios/project/debian.rules b/org.glite.lb.nagios/project/debian.rules
index a92b20d..116240e 100644 (file)
--- a/org.glite.lb.nagios/project/debian.rules
+++ b/org.glite.lb.nagios/project/debian.rules
@@ -3,6 +3,8 @@
 
 -include /usr/share/dpkg/buildflags.mk
 
+p_base=emi-lb-nagios-plugins
+
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
@@ -36,15 +38,11 @@ install: build-stamp
        dh_prep
        dh_installdirs
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-       mv $(CURDIR)/debian/tmp/usr/share/doc/emi-lb-nagios-plugins-@MAJOR@.@MINOR@.@REVISION@ $(CURDIR)/debian/tmp/usr/share/doc/emi-lb-nagios-plugins
-       (cd $(CURDIR)/debian/tmp/usr/share/doc/emi-lb-nagios-plugins; \
-        rm -fv ChangeLog LICENSE; \
-        cat $(CURDIR)/project/ChangeLog | gzip -9 > changelog.gz)
 
 binary-indep: install
        dh_testdir
        dh_testroot
-       dh_installchangelogs
+       dh_installchangelogs project/ChangeLog
        dh_installdocs
        dh_installexamples
        dh_installman

diff --git a/org.glite.lb.nagios/project/emi-lb-nagios-plugins.spec b/org.glite.lb.nagios/project/emi-lb-nagios-plugins.spec
index 70567b8..ec0a4b0 100644 (file)
--- a/org.glite.lb.nagios/project/emi-lb-nagios-plugins.spec
+++ b/org.glite.lb.nagios/project/emi-lb-nagios-plugins.spec
@@ -51,16 +51,13 @@ exit 0
 
 %files
 %defattr(-,root,root)
-%dir /usr/share/doc/%{name}-%{version}/
+%doc project/ChangeLog
 %dir /usr/libexec/
 %dir /usr/libexec/grid-monitoring/
 %dir /usr/libexec/grid-monitoring/probes/
 %dir /usr/libexec/grid-monitoring/probes/emi.lb/
 %dir /var/lib/grid-monitoring/
 %dir /var/lib/grid-monitoring/emi.lb/
-/usr/share/doc/%{name}-%{version}/package.summary
-/usr/share/doc/%{name}-%{version}/ChangeLog
-/usr/share/doc/%{name}-%{version}/package.description
 /usr/libexec/grid-monitoring/probes/emi.lb/LB-probe
 
 

diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile
index 0214c1e..a9149c5 100644 (file)
--- a/org.glite.lb.server/Makefile
+++ b/org.glite.lb.server/Makefile
@@ -432,7 +432,6 @@ install:
        -mkdir -p ${DESTDIR}${PREFIX}${sysconfdir}/mysql/conf.d
        -mkdir -p ${DESTDIR}${PREFIX}${sysdefaultdir}
        ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
-       ( cd ${top_srcdir}/project && ${INSTALL} -m 644 ChangeLog package.description package.summary ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} )
        ${INSTALL} -m 644 ${MAN1_GZ} ${DESTDIR}${PREFIX}${prefix}/share/man/man1
        ${INSTALL} -m 644 ${MAN8_GZ} ${DESTDIR}${PREFIX}${prefix}/share/man/man8
        for p in bkserverd bkindex mon-db; do \

diff --git a/org.glite.lb.server/project/debian.control b/org.glite.lb.server/project/debian.control
index ddad50d..01bb5eb 100644 (file)
--- a/org.glite.lb.server/project/debian.control
+++ b/org.glite.lb.server/project/debian.control
@@ -18,7 +18,7 @@ DM-Upload-Allowed: yes
 Package: glite-lb-server
 Section: misc
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, mysql-server, glite-lb-client-progs, glite-lb-utils
+Depends: ${shlibs:Depends}, ${misc:Depends}, mysql-server, glite-lb-client-progs, glite-lb-utils, glite-lbjp-common-log
 Description: @SUMMARY@
 @DEBIAN_DESCRIPTION@
 

diff --git a/org.glite.lb.server/project/debian.glite-lb-server.dirs b/org.glite.lb.server/project/debian.glite-lb-server.dirs
index 1d42766..1b0aa7a 100644 (file)
--- a/org.glite.lb.server/project/debian.glite-lb-server.dirs
+++ b/org.glite.lb.server/project/debian.glite-lb-server.dirs
@@ -1,14 +1,2 @@
-etc/cron.d
-etc/default
 etc/glite-lb
-etc/init.d
-etc/logrotate.d
-etc/mysql
-etc/mysql/conf.d
-usr/bin
-usr/lib
-usr/sbin
 usr/share/glite
-usr/share/doc/glite-lb-server
-usr/share/man/man1
-usr/share/man/man8

diff --git a/org.glite.lb.server/project/debian.glite-lb-server.install b/org.glite.lb.server/project/debian.glite-lb-server.install
index 6878934..e4e8016 100644 (file)
--- a/org.glite.lb.server/project/debian.glite-lb-server.install
+++ b/org.glite.lb.server/project/debian.glite-lb-server.install
@@ -6,7 +6,6 @@ etc/logrotate.d/*
 etc/mysql/conf.d/*
 usr/bin/*
 usr/sbin/*
-usr/share/doc/glite-lb-server/*
 usr/share/glite/*
 usr/share/man/man1/*
 usr/share/man/man8/*

diff --git a/org.glite.lb.server/project/debian.rules b/org.glite.lb.server/project/debian.rules
index 9f41c23..ebd23fd 100644 (file)
--- a/org.glite.lb.server/project/debian.rules
+++ b/org.glite.lb.server/project/debian.rules
@@ -1,6 +1,9 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+b_base=glite-lb-server
+p_dbg=glite-lb-server-dbg
+
 -include /usr/share/dpkg/buildflags.mk
 
 # Uncomment this to turn on verbose mode.
@@ -36,22 +39,23 @@ install: build-stamp
        dh_prep
        dh_installdirs
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-       rm -vf $(CURDIR)/debian/tmp/usr/lib/*.la
-       rm -vf $(CURDIR)/debian/tmp/usr/lib/*.a
-       rm -vf $(CURDIR)/debian/tmp/usr/lib/modules/*.la
-       rm -vf $(CURDIR)/debian/tmp/usr/lib/modules/*.a
-       find $(CURDIR)/debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
-       mv $(CURDIR)/debian/tmp/usr/share/doc/glite-lb-server-@MAJOR@.@MINOR@.@REVISION@ $(CURDIR)/debian/tmp/usr/share/doc/glite-lb-server
-       (cd $(CURDIR)/debian/tmp/usr/share/doc/glite-lb-server; \
-        rm -fv ChangeLog LICENSE; \
-        cat $(CURDIR)/project/ChangeLog | gzip -9 > changelog.gz)
+       rm -vf debian/tmp/usr/lib/*.la
+       rm -vf debian/tmp/usr/lib/*.a
+       rm -vf debian/tmp/usr/lib/modules/*.la
+       rm -vf debian/tmp/usr/lib/modules/*.a
+       find debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
+       mkdir -p debian/$(p_base)/usr/share/doc
+       mv debian/tmp/usr/share/doc/glite-lb-server-@MAJOR@.@MINOR@.@REVISION@ debian/$(p_base)/usr/share/doc/$(p_base)
+       rm -f debian/$(p_base)/usr/share/doc/$(p_base)/LICENSE
+       mkdir -p debian/$(p_dbg)/usr/share/doc
+       ln -s $(p_base) debian/$(p_dbg)/usr/share/doc/$(p_dbg)
 
 binary-indep:
 
 binary-arch: install
        dh_testdir
        dh_testroot
-       dh_installchangelogs
+       dh_installchangelogs project/ChangeLog
        dh_installdocs
        dh_installexamples
        dh_installman
@@ -60,7 +64,7 @@ binary-arch: install
        dh_installcron
        dh_install --fail-missing
        dh_link
-       dh_strip --dbg-package=glite-lb-server-dbg
+       dh_strip --dbg-package=$(p_dbg)
        dh_compress
        dh_fixperms
        dh_makeshlibs

diff --git a/org.glite.lb.server/project/glite-lb-server.spec b/org.glite.lb.server/project/glite-lb-server.spec
index cc2b7ea..4a1d7d2 100644 (file)
--- a/org.glite.lb.server/project/glite-lb-server.spec
+++ b/org.glite.lb.server/project/glite-lb-server.spec
@@ -114,9 +114,9 @@ fi
 
 %files
 %defattr(-,root,root)
+%doc LICENSE project/ChangeLog config/glite-lb
 %dir /etc/cron.d/
 %dir /etc/glite-lb/
-%dir /usr/share/doc/%{name}-%{version}/
 %dir /usr/share/glite/
 %config(noreplace) /etc/logrotate.d/glite-lb-server
 %config(noreplace) /etc/mysql/conf.d/glite-lb-server.cnf
@@ -126,11 +126,6 @@ fi
 /etc/init.d/glite-lb-bkserverd
 %{_bindir}/*
 /usr/sbin/*
-/usr/share/doc/%{name}-%{version}/ChangeLog
-/usr/share/doc/%{name}-%{version}/LICENSE
-/usr/share/doc/%{name}-%{version}/glite-lb
-/usr/share/doc/%{name}-%{version}/package.description
-/usr/share/doc/%{name}-%{version}/package.summary
 /usr/share/glite/*
 /usr/share/man/man1/glite-lb-mon-db.1.gz
 /usr/share/man/man8/glite-lb-bkindex.8.gz

diff --git a/org.glite.lb.state-machine/project/debian.libglite-lb-state-machine-dev.dirs b/org.glite.lb.state-machine/project/debian.libglite-lb-state-machine-dev.dirs
index bdd8023..084f463 100644 (file)
--- a/org.glite.lb.state-machine/project/debian.libglite-lb-state-machine-dev.dirs
+++ b/org.glite.lb.state-machine/project/debian.libglite-lb-state-machine-dev.dirs
@@ -1,3 +1 @@
-usr/include/glite/lb
 usr/interface
-usr/lib

diff --git a/org.glite.lb.state-machine/project/debian.libglite-lb-state-machine-dev.install b/org.glite.lb.state-machine/project/debian.libglite-lb-state-machine-dev.install
index 83f2ea4..f784ee4 100644 (file)
--- a/org.glite.lb.state-machine/project/debian.libglite-lb-state-machine-dev.install
+++ b/org.glite.lb.state-machine/project/debian.libglite-lb-state-machine-dev.install
@@ -1,4 +1,5 @@
 usr/include/glite/lb/*.h
 usr/interface/*.xsd
+usr/lib/lib*.a
 usr/lib/lib*.so
-usr/lib/glite*.so
\ No newline at end of file
+usr/lib/glite*.so

diff --git a/org.glite.lb.state-machine/project/debian.libglite-lb-state-machine5.dirs b/org.glite.lb.state-machine/project/debian.libglite-lb-state-machine5.dirs
deleted file mode 100644 (file)
index 6845771..0000000
--- a/org.glite.lb.state-machine/project/debian.libglite-lb-state-machine5.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib

diff --git a/org.glite.lb.state-machine/project/debian.rules b/org.glite.lb.state-machine/project/debian.rules
index aef06e5..e1c5a02 100644 (file)
--- a/org.glite.lb.state-machine/project/debian.rules
+++ b/org.glite.lb.state-machine/project/debian.rules
@@ -3,6 +3,10 @@
 
 -include /usr/share/dpkg/buildflags.mk
 
+p_dbg=glite-lb-state-machine-dbg
+p_dev=libglite-lb-state-machine-dev
+p_lib=libglite-lb-state-machine5
+
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
@@ -36,16 +40,20 @@ install: build-stamp
        dh_prep
        dh_installdirs
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-       rm -vf $(CURDIR)/debian/tmp/usr/lib/*.la
-       rm -vf $(CURDIR)/debian/tmp/usr/lib/*.a
-       find $(CURDIR)/debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
+       rm -vf debian/tmp/usr/lib/*.la
+       rm -vf debian/tmp/usr/lib/glite*.a
+       find debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
+       mkdir -p debian/$(p_dbg)/usr/share/doc
+       mkdir -p debian/$(p_dev)/usr/share/doc
+       ln -s $(p_lib) debian/$(p_dbg)/usr/share/doc/$(p_dbg)
+       ln -s $(p_lib) debian/$(p_dev)/usr/share/doc/$(p_dev)
 
 binary-indep:
 
 binary-arch: install
        dh_testdir
        dh_testroot
-       dh_installchangelogs
+       dh_installchangelogs project/ChangeLog
        dh_installdocs
        dh_installexamples
        dh_installman
@@ -53,7 +61,7 @@ binary-arch: install
        dh_installcron
        dh_install --fail-missing
        dh_link
-       dh_strip --dbg-package=glite-lb-state-machine-dbg
+       dh_strip --dbg-package=$(p_dbg)
        dh_compress
        dh_fixperms
        dh_makeshlibs

diff --git a/org.glite.lb.types/project/debian.rules b/org.glite.lb.types/project/debian.rules
index 22f8801..5b481b7 100644 (file)
--- a/org.glite.lb.types/project/debian.rules
+++ b/org.glite.lb.types/project/debian.rules
@@ -40,7 +40,7 @@ install: build-stamp
 binary-indep: install
        dh_testdir
        dh_testroot
-       dh_installchangelogs
+       dh_installchangelogs project/ChangeLog
        dh_installdocs
        dh_installexamples
        dh_installman

diff --git a/org.glite.lb.utils/Makefile b/org.glite.lb.utils/Makefile
index 77e04ef..d95805d 100644 (file)
--- a/org.glite.lb.utils/Makefile
+++ b/org.glite.lb.utils/Makefile
@@ -49,7 +49,6 @@ LDFLAGS:=${LDFLAGS} -L${stagedir}${prefix}/${libdir}
 
 COMPILE:=libtool --mode=compile ${CC} ${CFLAGS}
 LINK:=libtool --mode=link ${CC} -rpath ${stagedir}${prefix}/${libdir}  ${LDFLAGS} 
-SOLINK:=libtool --mode=link ${CC} -module ${LDFLAGS} -rpath ${stagedir}${prefix}/${libdir}
 LINKXX:=libtool --mode=link ${CXX} ${LDFLAGS} 
 INSTALL:=libtool --mode=install install
 LINKXX:=libtool --mode=link  ${CXX} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS}
@@ -80,7 +79,7 @@ ALLUTILS:=${UTILS} mon dump_exporter state_history statistics
 STATISTICS_OBJS:=statistics.o process_attrs.o process_attrs2.o
 
 MAN_GZ:=glite-lb-mon.1.gz
-MAN8_GZ:=glite-lb-purge.8.gz
+MAN8_GZ:=glite-lb-dump.8.gz glite-lb-load.8.gz glite-lb-purge.8.gz
 MAN = $(MAN_GZ:.gz=)
 MAN8 = $(MAN8_GZ:.gz=)
 
@@ -117,12 +116,10 @@ stage: compile
 
 install:
        -mkdir -p ${DESTDIR}${PREFIX}${prefix}/bin 
-       -mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir}
        -mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
        -mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/man/man1
        -mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/man/man8
        ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
-       ( cd ${top_srcdir}/project && ${INSTALL} -m 644 ChangeLog package.description package.summary ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} )
        ${INSTALL} -m 644 ${top_srcdir}/doc/README* ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
        ${INSTALL} -m 644 ${MAN_GZ} ${DESTDIR}${PREFIX}${prefix}/share/man/man1
        ${INSTALL} -m 644 ${MAN8_GZ} ${DESTDIR}${PREFIX}${prefix}/share/man/man8

diff --git a/org.glite.lb.client/doc/glite-lb-dump.8 b/org.glite.lb.utils/doc/glite-lb-dump.8
similarity index 100%
rename from org.glite.lb.client/doc/glite-lb-dump.8
rename to org.glite.lb.utils/doc/glite-lb-dump.8

diff --git a/org.glite.lb.client/doc/glite-lb-load.8 b/org.glite.lb.utils/doc/glite-lb-load.8
similarity index 100%
rename from org.glite.lb.client/doc/glite-lb-load.8
rename to org.glite.lb.utils/doc/glite-lb-load.8

diff --git a/org.glite.lb.utils/project/debian.glite-lb-utils.dirs b/org.glite.lb.utils/project/debian.glite-lb-utils.dirs
deleted file mode 100644 (file)
index a9fb97f..0000000
--- a/org.glite.lb.utils/project/debian.glite-lb-utils.dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/bin
-usr/share/doc/glite-lb-utils
-usr/share/man/man1
-usr/share/man/man8

diff --git a/org.glite.lb.utils/project/debian.glite-lb-utils.install b/org.glite.lb.utils/project/debian.glite-lb-utils.install
index f8a4475..910d04b 100644 (file)
--- a/org.glite.lb.utils/project/debian.glite-lb-utils.install
+++ b/org.glite.lb.utils/project/debian.glite-lb-utils.install
@@ -1,4 +1,2 @@
 usr/bin/*
-usr/share/doc/glite-lb-utils/*
-usr/share/man/man1/*
-usr/share/man/man8/*
+usr/share/man/*/*

diff --git a/org.glite.lb.utils/project/debian.rules b/org.glite.lb.utils/project/debian.rules
index 330ec7c..47d4190 100644 (file)
--- a/org.glite.lb.utils/project/debian.rules
+++ b/org.glite.lb.utils/project/debian.rules
@@ -3,6 +3,9 @@
 
 -include /usr/share/dpkg/buildflags.mk
 
+p_base=glite-lb-utils
+p_dbg=glite-lb-utils-dbg
+
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
@@ -36,18 +39,19 @@ install: build-stamp
        dh_prep
        dh_installdirs
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-       find $(CURDIR)/debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
-       mv $(CURDIR)/debian/tmp/usr/share/doc/glite-lb-utils-@MAJOR@.@MINOR@.@REVISION@ $(CURDIR)/debian/tmp/usr/share/doc/glite-lb-utils
-       (cd $(CURDIR)/debian/tmp/usr/share/doc/glite-lb-utils; \
-        rm -fv ChangeLog LICENSE; \
-        cat $(CURDIR)/project/ChangeLog | gzip -9 > changelog.gz)
+       find debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
+       mkdir -p debian/$(p_base)/usr/share/doc
+       mkdir -p debian/$(p_dbg)/usr/share/doc
+       mv debian/tmp/usr/share/doc/glite-lb-utils-@MAJOR@.@MINOR@.@REVISION@ debian/$(p_base)/usr/share/doc/$(p_base)
+       rm -f debian/$(p_base)/usr/share/doc/$(p_base)/LICENSE
+       ln -s $(p_base) debian/$(p_dbg)/usr/share/doc/$(p_dbg)
 
 binary-indep:
 
 binary-arch: install
        dh_testdir
        dh_testroot
-       dh_installchangelogs
+       dh_installchangelogs project/ChangeLog
        dh_installdocs
        dh_installexamples
        dh_installman
@@ -55,7 +59,7 @@ binary-arch: install
        dh_installcron
        dh_install --fail-missing
        dh_link
-       dh_strip --dbg-package=glite-lb-utils-dbg
+       dh_strip --dbg-package=$(p_dbg)
        dh_compress
        dh_fixperms
        dh_makeshlibs

diff --git a/org.glite.lb.utils/project/glite-lb-utils.spec b/org.glite.lb.utils/project/glite-lb-utils.spec
index 889df31..0bb36c1 100644 (file)
--- a/org.glite.lb.utils/project/glite-lb-utils.spec
+++ b/org.glite.lb.utils/project/glite-lb-utils.spec
@@ -52,7 +52,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%dir /usr/share/doc/%{name}-%{version}/
+%doc LICENSE project/ChangeLog doc/README.LB-monitoring doc/README.LB-statistics
 %{_bindir}/glite-lb-bkpurge-offline
 %{_bindir}/glite-lb-dump
 %{_bindir}/glite-lb-dump_exporter
@@ -61,14 +61,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/glite-lb-purge
 %{_bindir}/glite-lb-state_history
 %{_bindir}/glite-lb-statistics
-/usr/share/doc/%{name}-%{version}/ChangeLog
-/usr/share/doc/%{name}-%{version}/LICENSE
-/usr/share/doc/%{name}-%{version}/package.description
-/usr/share/doc/%{name}-%{version}/package.summary
-/usr/share/doc/%{name}-%{version}/README.LB-monitoring
-/usr/share/doc/%{name}-%{version}/README.LB-statistics
-/usr/share/man/man1/glite-lb-mon.1.gz
-/usr/share/man/man8/glite-lb-purge.8.gz
+/usr/share/man/*/*.gz
 
 
 %changelog

diff --git a/org.glite.lb.ws-interface/Makefile b/org.glite.lb.ws-interface/Makefile
index e89d16d..af091e6 100644 (file)
--- a/org.glite.lb.ws-interface/Makefile
+++ b/org.glite.lb.ws-interface/Makefile
@@ -52,7 +52,6 @@ install:
        -mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
        -mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix}
        install -m 644 ${top_srcdir}/LICENSE ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
-       ( cd ${top_srcdir}/project && install -m 644 ChangeLog package.description package.summary ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} )
        -test -f LB.html && install -m 644 LB.html ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
 # install the generated stuff instead
 #      cd ${top_srcdir}/interface && install -m 644 ${WSDL} ${DESTDIR}${PREFIX}${prefix}/${STAGETO}

diff --git a/org.glite.lb.ws-interface/project/debian.glite-lb-ws-interface.dirs b/org.glite.lb.ws-interface/project/debian.glite-lb-ws-interface.dirs
index 6098c27..f78c2e7 100644 (file)
--- a/org.glite.lb.ws-interface/project/debian.glite-lb-ws-interface.dirs
+++ b/org.glite.lb.ws-interface/project/debian.glite-lb-ws-interface.dirs
@@ -1,3 +1,4 @@
+usr/include/glite
 usr/include/glite/lb
-usr/share/doc/glite-lb-ws-interface
+usr/share/wsdl
 usr/share/wsdl/glite-lb

diff --git a/org.glite.lb.ws-interface/project/debian.glite-lb-ws-interface.install b/org.glite.lb.ws-interface/project/debian.glite-lb-ws-interface.install
index c44a452..85e46e8 100644 (file)
--- a/org.glite.lb.ws-interface/project/debian.glite-lb-ws-interface.install
+++ b/org.glite.lb.ws-interface/project/debian.glite-lb-ws-interface.install
@@ -1,3 +1,2 @@
 usr/include/glite/lb/*.h
-usr/share/doc/glite-lb-ws-interface/*
 usr/share/wsdl/glite-lb/*

diff --git a/org.glite.lb.ws-interface/project/debian.rules b/org.glite.lb.ws-interface/project/debian.rules
index 345840f..d01fe5a 100644 (file)
--- a/org.glite.lb.ws-interface/project/debian.rules
+++ b/org.glite.lb.ws-interface/project/debian.rules
@@ -3,6 +3,8 @@
 
 -include /usr/share/dpkg/buildflags.mk
 
+p_base=glite-lb-ws-interface
+
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
@@ -36,15 +38,14 @@ install: build-stamp
        dh_prep
        dh_installdirs
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-       mv $(CURDIR)/debian/tmp/usr/share/doc/glite-lb-ws-interface-@MAJOR@.@MINOR@.@REVISION@ $(CURDIR)/debian/tmp/usr/share/doc/glite-lb-ws-interface
-       (cd $(CURDIR)/debian/tmp/usr/share/doc/glite-lb-ws-interface; \
-        rm -fv ChangeLog LICENSE; \
-        cat $(CURDIR)/project/ChangeLog | gzip -9 > changelog.gz)
+       #mkdir -p debian/$(p_base)/usr/share/doc/$(p_base)
+       #mv debian/tmp/usr/share/doc/glite-lb-ws-interface-*/*.html debian/$(p_base)/usr/share/doc/$(p_base)
+       rm -rf debian/tmp/usr/share/doc/glite-lb-ws-interface-@MAJOR@.@MINOR@.@REVISION@
 
 binary-indep: install
        dh_testdir
        dh_testroot
-       dh_installchangelogs
+       dh_installchangelogs project/ChangeLog
        dh_installdocs
        dh_installexamples
        dh_installman

diff --git a/org.glite.lb.ws-interface/project/glite-lb-ws-interface.spec b/org.glite.lb.ws-interface/project/glite-lb-ws-interface.spec
index fd7608b..b4d78f5 100644 (file)
--- a/org.glite.lb.ws-interface/project/glite-lb-ws-interface.spec
+++ b/org.glite.lb.ws-interface/project/glite-lb-ws-interface.spec
@@ -44,16 +44,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
+%doc LICENSE project/ChangeLog
 %dir %{_includedir}/glite/
 %dir %{_includedir}/glite/lb/
-%dir /usr/share/doc/%{name}-%{version}/
 %dir /usr/share/wsdl/
 %dir /usr/share/wsdl/glite-lb/
 %{_includedir}/glite/lb/ws_interface_version.h
-/usr/share/doc/%{name}-%{version}/LICENSE
-/usr/share/doc/%{name}-%{version}/ChangeLog
-/usr/share/doc/%{name}-%{version}/package.summary
-/usr/share/doc/%{name}-%{version}/package.description
 /usr/share/wsdl/glite-lb/LB.wsdl
 /usr/share/wsdl/glite-lb/glue2.xsd
 /usr/share/wsdl/glite-lb/lb4agu.wsdl

diff --git a/org.glite.lb.ws-test/project/debian.rules b/org.glite.lb.ws-test/project/debian.rules
index bd00cb0..bdc78b4 100644 (file)
--- a/org.glite.lb.ws-test/project/debian.rules
+++ b/org.glite.lb.ws-test/project/debian.rules
@@ -3,6 +3,9 @@
 
 -include /usr/share/dpkg/buildflags.mk
 
+p_base=glite-lb-ws-test
+p_dbg=glite-lb-ws-test-dbg
+
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
@@ -36,14 +39,16 @@ install: build-stamp
        dh_prep
        dh_installdirs
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-       find $(CURDIR)/debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
+       find debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
+       mkdir -p debian/$(p_dbg)/usr/share/doc
+       ln -s $(p_base) debian/$(p_dbg)/usr/share/doc/$(p_dbg)
 
 binary-indep:
 
 binary-arch: install
        dh_testdir
        dh_testroot
-       dh_installchangelogs
+       dh_installchangelogs project/ChangeLog
        dh_installdocs
        dh_installexamples
        dh_installman
@@ -51,7 +56,7 @@ binary-arch: install
        dh_installcron
        dh_install --fail-missing
        dh_link
-       dh_strip --dbg-package=glite-lb-ws-test-dbg
+       dh_strip --dbg-package=$(p_dbg)
        dh_compress
        dh_fixperms
        dh_makeshlibs

diff --git a/org.glite.lb.ws-test/project/glite-lb-ws-test.spec b/org.glite.lb.ws-test/project/glite-lb-ws-test.spec
index e0ce92a..17042f3 100644 (file)
--- a/org.glite.lb.ws-test/project/glite-lb-ws-test.spec
+++ b/org.glite.lb.ws-test/project/glite-lb-ws-test.spec
@@ -48,6 +48,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
+%doc project/ChangeLog
 %dir /usr/%{_lib}/glite-lb/
 %dir /usr/%{_lib}/glite-lb/examples/
 %{_libdir}/glite-lb/examples/glite-lb-ws_getversion

diff --git a/org.glite.lb.yaim/project/debian.rules b/org.glite.lb.yaim/project/debian.rules
index 73a9429..09ce10b 100644 (file)
--- a/org.glite.lb.yaim/project/debian.rules
+++ b/org.glite.lb.yaim/project/debian.rules
@@ -40,7 +40,7 @@ install: build-stamp
 binary-indep: install
        dh_testdir
        dh_testroot
-       dh_installchangelogs
+       dh_installchangelogs project/ChangeLog
        dh_installdocs
        dh_installexamples
        dh_installman

diff --git a/org.glite.lbjp-common.db/project/debian.libglite-lbjp-common-db-dev.dirs b/org.glite.lbjp-common.db/project/debian.libglite-lbjp-common-db-dev.dirs
index 0f15098..35cf47a 100644 (file)
--- a/org.glite.lbjp-common.db/project/debian.libglite-lbjp-common-db-dev.dirs
+++ b/org.glite.lbjp-common.db/project/debian.libglite-lbjp-common-db-dev.dirs
@@ -1,2 +1,2 @@
+usr/include/glite
 usr/include/glite/lbu
-usr/lib

diff --git a/org.glite.lbjp-common.db/project/debian.libglite-lbjp-common-db-dev.install b/org.glite.lbjp-common.db/project/debian.libglite-lbjp-common-db-dev.install
index 83f1c89..f782d93 100644 (file)
--- a/org.glite.lbjp-common.db/project/debian.libglite-lbjp-common-db-dev.install
+++ b/org.glite.lbjp-common.db/project/debian.libglite-lbjp-common-db-dev.install
@@ -1,2 +1,3 @@
 usr/include/glite/lbu/*.h
+usr/lib/lib*.a
 usr/lib/lib*.so

diff --git a/org.glite.lbjp-common.db/project/debian.libglite-lbu-db3.dirs b/org.glite.lbjp-common.db/project/debian.libglite-lbu-db3.dirs
deleted file mode 100644 (file)
index 6845771..0000000
--- a/org.glite.lbjp-common.db/project/debian.libglite-lbu-db3.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib

diff --git a/org.glite.lbjp-common.db/project/debian.rules b/org.glite.lbjp-common.db/project/debian.rules
index ee7d29c..3c6c658 100644 (file)
--- a/org.glite.lbjp-common.db/project/debian.rules
+++ b/org.glite.lbjp-common.db/project/debian.rules
@@ -3,6 +3,10 @@
 
 -include /usr/share/dpkg/buildflags.mk
 
+p_dbg=glite-lbjp-common-db-dbg
+p_dev=libglite-lbjp-common-db-dev
+p_lib=libglite-lbu-db3
+
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
@@ -37,17 +41,20 @@ install: build-stamp
        dh_prep
        dh_installdirs
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-       rm -rvf $(CURDIR)/debian/tmp/usr/share
-       rm -vf $(CURDIR)/debian/tmp/usr/lib/*.la
-       rm -vf $(CURDIR)/debian/tmp/usr/lib/*.a
-       find $(CURDIR)/debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
+       rm -vf debian/tmp/usr/lib/*.la
+       find debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
+       rm -rf debian/tmp/usr/share
+       mkdir -p debian/$(p_dev)/usr/share/doc
+       mkdir -p debian/$(p_dbg)/usr/share/doc
+       ln -s $(p_lib) debian/$(p_dev)/usr/share/doc/$(p_dev)
+       ln -s $(p_lib) debian/$(p_dbg)/usr/share/doc/$(p_dbg)
 
 binary-indep:
 
 binary-arch: install
        dh_testdir
        dh_testroot
-       dh_installchangelogs
+       dh_installchangelogs project/ChangeLog
        dh_installdocs
        dh_installexamples
        dh_installman
@@ -55,7 +62,7 @@ binary-arch: install
        dh_installcron
        dh_install --fail-missing
        dh_link
-       dh_strip --dbg-package=glite-lbjp-common-db-dbg
+       dh_strip --dbg-package=$(p_dbg)
        dh_compress
        dh_fixperms
        dh_makeshlibs

diff --git a/org.glite.lbjp-common.gsoap-plugin/project/debian.control b/org.glite.lbjp-common.gsoap-plugin/project/debian.control
index b5c1992..a2e4776 100644 (file)
--- a/org.glite.lbjp-common.gsoap-plugin/project/debian.control
+++ b/org.glite.lbjp-common.gsoap-plugin/project/debian.control
@@ -15,7 +15,7 @@ Homepage: @URL@
 DM-Upload-Allowed: yes
 @DEBIAN_VCS@
 
-Package: libglite-lbjp-common-gsoap-plugin
+Package: libglite-lbjp-common-gsoap-plugin9
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -26,7 +26,7 @@ Package: libglite-lbjp-common-gsoap-plugin-dev
 Section: libdevel
 Architecture: any
 Provides: glite-lbjp-common-gsoap-plugin, glite-security-gsoap-plugin
-Depends: libglite-lbjp-common-gsoap-plugin (= ${binary:Version}), libglite-lbjp-common-gss-dev, ${misc:Depends}
+Depends: libglite-lbjp-common-gsoap-plugin9 (= ${binary:Version}), libglite-lbjp-common-gss-dev, ${misc:Depends}
 Description: Development files for gLite gsoap-plugin
  This package contains development libraries and header files for gLite
  gsoap-plugin.
@@ -35,6 +35,6 @@ Package: glite-lbjp-common-gsoap-plugin-dbg
 Section: debug
 Architecture: any
 Priority: extra
-Depends: libglite-lbjp-common-gsoap-plugin (= ${binary:Version}), ${misc:Depends}
+Depends: libglite-lbjp-common-gsoap-plugin9 (= ${binary:Version}), ${misc:Depends}
 Description: gLite gsoap-plugin library debugging symbols
  This package contains debugging symbols for gLite gsoap-plugin library.

diff --git a/org.glite.lbjp-common.gsoap-plugin/project/debian.libglite-lbjp-common-gsoap-plugin-dev.dirs b/org.glite.lbjp-common.gsoap-plugin/project/debian.libglite-lbjp-common-gsoap-plugin-dev.dirs
deleted file mode 100644 (file)
index 8f62a5a..0000000
--- a/org.glite.lbjp-common.gsoap-plugin/project/debian.libglite-lbjp-common-gsoap-plugin-dev.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/include/glite/security
-usr/lib
-usr/lib/pkgconfig
\ No newline at end of file

diff --git a/org.glite.lbjp-common.gsoap-plugin/project/debian.libglite-lbjp-common-gsoap-plugin-dev.install b/org.glite.lbjp-common.gsoap-plugin/project/debian.libglite-lbjp-common-gsoap-plugin-dev.install
index 07e8c8a..fdd23fd 100644 (file)
--- a/org.glite.lbjp-common.gsoap-plugin/project/debian.libglite-lbjp-common-gsoap-plugin-dev.install
+++ b/org.glite.lbjp-common.gsoap-plugin/project/debian.libglite-lbjp-common-gsoap-plugin-dev.install
@@ -1,3 +1,4 @@
 usr/include/glite/security/*.h
+usr/lib/lib*.a
 usr/lib/lib*.so
 usr/lib/pkgconfig/*.pc

diff --git a/org.glite.lbjp-common.gsoap-plugin/project/debian.libglite-lbjp-common-gsoap-plugin.dirs b/org.glite.lbjp-common.gsoap-plugin/project/debian.libglite-lbjp-common-gsoap-plugin.dirs
deleted file mode 100644 (file)
index 6845771..0000000
--- a/org.glite.lbjp-common.gsoap-plugin/project/debian.libglite-lbjp-common-gsoap-plugin.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib

diff --git a/org.glite.lbjp-common.gsoap-plugin/project/debian.libglite-lbjp-common-gsoap-plugin.install b/org.glite.lbjp-common.gsoap-plugin/project/debian.libglite-lbjp-common-gsoap-plugin9.install
similarity index 100%
rename from org.glite.lbjp-common.gsoap-plugin/project/debian.libglite-lbjp-common-gsoap-plugin.install
rename to org.glite.lbjp-common.gsoap-plugin/project/debian.libglite-lbjp-common-gsoap-plugin9.install

diff --git a/org.glite.lbjp-common.gsoap-plugin/project/debian.rules b/org.glite.lbjp-common.gsoap-plugin/project/debian.rules
index 2a10688..0deeb1d 100644 (file)
--- a/org.glite.lbjp-common.gsoap-plugin/project/debian.rules
+++ b/org.glite.lbjp-common.gsoap-plugin/project/debian.rules
@@ -1,6 +1,10 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+p_dbg=glite-lbjp-common-gsoap-plugin-dbg
+p_dev=libglite-lbjp-common-gsoap-plugin-dev
+p_lib=libglite-lbjp-common-gsoap-plugin9
+
 -include /usr/share/dpkg/buildflags.mk
 
 # Uncomment this to turn on verbose mode.
@@ -36,17 +40,20 @@ install: build-stamp
        dh_prep
        dh_installdirs
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-       rm -rvf $(CURDIR)/debian/tmp/usr/share
-       rm -vf $(CURDIR)/debian/tmp/usr/lib/*.la
-       rm -vf $(CURDIR)/debian/tmp/usr/lib/*.a
-       find $(CURDIR)/debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
+       rm -vf debian/tmp/usr/lib/*.la
+       find debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
+       rm -rf debian/tmp/usr/share
+       mkdir -p debian/$(p_dbg)/usr/share/doc
+       mkdir -p debian/$(p_dev)/usr/share/doc
+       ln -s $(p_lib) debian/$(p_dbg)/usr/share/doc/$(p_dbg)
+       ln -s $(p_lib) debian/$(p_dev)/usr/share/doc/$(p_dev)
 
 binary-indep:
 
 binary-arch: install
        dh_testdir
        dh_testroot
-       dh_installchangelogs
+       dh_installchangelogs project/ChangeLog
        dh_installdocs
        dh_installexamples
        dh_installman
@@ -54,7 +61,7 @@ binary-arch: install
        dh_installcron
        dh_install --fail-missing
        dh_link
-       dh_strip --dbg-package=glite-lbjp-common-gsoap-plugin-dbg
+       dh_strip --dbg-package=$(p_dbg)
        dh_compress
        dh_fixperms
        dh_makeshlibs

diff --git a/org.glite.lbjp-common.gss/project/debian.control b/org.glite.lbjp-common.gss/project/debian.control
index 3cdbbed..4c16415 100644 (file)
--- a/org.glite.lbjp-common.gss/project/debian.control
+++ b/org.glite.lbjp-common.gss/project/debian.control
@@ -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~), libcppunit-dev, libc-ares2, libc-ares-dev, libglobus-gssapi-gsi-dev, libssl-dev, libtool, pkg-config
 Standards-Version: 3.9.1
 Section: libs
 Homepage: @URL@

diff --git a/org.glite.lbjp-common.gss/project/debian.libglite-lbjp-common-gss-dev.dirs b/org.glite.lbjp-common.gss/project/debian.libglite-lbjp-common-gss-dev.dirs
index 7afe4d3..7ee118e 100644 (file)
--- a/org.glite.lbjp-common.gss/project/debian.libglite-lbjp-common-gss-dev.dirs
+++ b/org.glite.lbjp-common.gss/project/debian.libglite-lbjp-common-gss-dev.dirs
@@ -1,2 +1,2 @@
-usr/lib
+usr/include/glite
 usr/include/glite/security

diff --git a/org.glite.lbjp-common.gss/project/debian.libglite-lbjp-common-gss-dev.install b/org.glite.lbjp-common.gss/project/debian.libglite-lbjp-common-gss-dev.install
index 07e8c8a..fdd23fd 100644 (file)
--- a/org.glite.lbjp-common.gss/project/debian.libglite-lbjp-common-gss-dev.install
+++ b/org.glite.lbjp-common.gss/project/debian.libglite-lbjp-common-gss-dev.install
@@ -1,3 +1,4 @@
 usr/include/glite/security/*.h
+usr/lib/lib*.a
 usr/lib/lib*.so
 usr/lib/pkgconfig/*.pc

diff --git a/org.glite.lbjp-common.gss/project/debian.libglite-security-gss9.dirs b/org.glite.lbjp-common.gss/project/debian.libglite-security-gss9.dirs
deleted file mode 100644 (file)
index 6845771..0000000
--- a/org.glite.lbjp-common.gss/project/debian.libglite-security-gss9.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib

diff --git a/org.glite.lbjp-common.gss/project/debian.rules b/org.glite.lbjp-common.gss/project/debian.rules
index 9e5d3ef..ff53043 100644 (file)
--- a/org.glite.lbjp-common.gss/project/debian.rules
+++ b/org.glite.lbjp-common.gss/project/debian.rules
@@ -3,6 +3,10 @@
 
 -include /usr/share/dpkg/buildflags.mk
 
+p_dbg=glite-lbjp-common-gss-dbg
+p_dev=libglite-lbjp-common-gss-dev
+p_lib=libglite-security-gss9
+
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
@@ -41,17 +45,19 @@ install: build-stamp
        dh_prep
        dh_installdirs
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-       rm -rvf $(CURDIR)/debian/tmp/usr/share
-       rm -vf $(CURDIR)/debian/tmp/usr/lib/*.la
-       rm -vf $(CURDIR)/debian/tmp/usr/lib/*.a
-       find $(CURDIR)/debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
+       rm -vf debian/tmp/usr/lib/*.la
+       rm -rf debian/tmp/usr/share
+       mkdir -p debian/$(p_dbg)/usr/share/doc
+       mkdir -p debian/$(p_dev)/usr/share/doc
+       ln -s $(p_lib) debian/$(p_dbg)/usr/share/doc/$(p_dbg)
+       ln -s $(p_lib) debian/$(p_dev)/usr/share/doc/$(p_dev)
 
 binary-indep:
 
 binary-arch: install
        dh_testdir
        dh_testroot
-       dh_installchangelogs
+       dh_installchangelogs project/ChangeLog
        dh_installdocs
        dh_installexamples
        dh_installman
@@ -59,7 +65,7 @@ binary-arch: install
        dh_installcron
        dh_install --fail-missing
        dh_link
-       dh_strip --dbg-package=glite-lbjp-common-gss-dbg
+       dh_strip --dbg-package=$(p_dbg)
        dh_compress
        dh_fixperms
        dh_makeshlibs

diff --git a/org.glite.lbjp-common.gss/project/doc/Makefile b/org.glite.lbjp-common.gss/project/doc/Makefile
index 7591a3e..d556fb8 100644 (file)
--- a/org.glite.lbjp-common.gss/project/doc/Makefile
+++ b/org.glite.lbjp-common.gss/project/doc/Makefile
@@ -1,3 +1,5 @@
 all:
        pdflatex lbjp-common-gss_FD.tex
 
+clean:
+       rm -fv *.aux *.log *.out lbjp-common-gss_FD.pdf *.toc

diff --git a/org.glite.lbjp-common.jp-interface/project/debian.libglite-jp-common2.dirs b/org.glite.lbjp-common.jp-interface/project/debian.libglite-jp-common2.dirs
deleted file mode 100644 (file)
index 6845771..0000000
--- a/org.glite.lbjp-common.jp-interface/project/debian.libglite-jp-common2.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib

diff --git a/org.glite.lbjp-common.jp-interface/project/debian.libglite-lbjp-common-jp-interface-dev.dirs b/org.glite.lbjp-common.jp-interface/project/debian.libglite-lbjp-common-jp-interface-dev.dirs
index c049a8b..3f7ff9f 100644 (file)
--- a/org.glite.lbjp-common.jp-interface/project/debian.libglite-lbjp-common-jp-interface-dev.dirs
+++ b/org.glite.lbjp-common.jp-interface/project/debian.libglite-lbjp-common-jp-interface-dev.dirs
@@ -1,2 +1 @@
 usr/include/glite/jp
-usr/lib

diff --git a/org.glite.lbjp-common.jp-interface/project/debian.libglite-lbjp-common-jp-interface-dev.install b/org.glite.lbjp-common.jp-interface/project/debian.libglite-lbjp-common-jp-interface-dev.install
index bbb1883..451cc06 100644 (file)
--- a/org.glite.lbjp-common.jp-interface/project/debian.libglite-lbjp-common-jp-interface-dev.install
+++ b/org.glite.lbjp-common.jp-interface/project/debian.libglite-lbjp-common-jp-interface-dev.install
@@ -1,2 +1,3 @@
 usr/include/glite/jp/*.h
+usr/lib/lib*.a
 usr/lib/lib*.so

diff --git a/org.glite.lbjp-common.jp-interface/project/debian.rules b/org.glite.lbjp-common.jp-interface/project/debian.rules
index f47530c..da5f512 100644 (file)
--- a/org.glite.lbjp-common.jp-interface/project/debian.rules
+++ b/org.glite.lbjp-common.jp-interface/project/debian.rules
@@ -3,6 +3,10 @@
 
 -include /usr/share/dpkg/buildflags.mk
 
+p_dbg=glite-lbjp-common-jp-interface-dbg
+p_dev=libglite-lbjp-common-jp-interface-dev
+p_lib=libglite-jp-common2
+
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
@@ -36,16 +40,19 @@ install: build-stamp
        dh_prep
        dh_installdirs
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-       rm -vf $(CURDIR)/debian/tmp/usr/lib/*.la
-       rm -vf $(CURDIR)/debian/tmp/usr/lib/*.a
-       find $(CURDIR)/debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
+       rm -vf debian/tmp/usr/lib/*.la
+       find debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
+       mkdir -p debian/$(p_dev)/usr/share/doc
+       mkdir -p debian/$(p_dbg)/usr/share/doc
+       ln -s $(p_lib) debian/$(p_dev)/usr/share/doc/$(p_dev)
+       ln -s $(p_lib) debian/$(p_dbg)/usr/share/doc/$(p_dbg)
 
 binary-indep:
 
 binary-arch: install
        dh_testdir
        dh_testroot
-       dh_installchangelogs
+       dh_installchangelogs project/ChangeLog
        dh_installdocs
        dh_installexamples
        dh_installman
@@ -53,7 +60,7 @@ binary-arch: install
        dh_installcron
        dh_install --fail-missing
        dh_link
-       dh_strip --dbg-package=glite-lbjp-common-jp-interface-dbg
+       dh_strip --dbg-package=$(p_dbg)
        dh_compress
        dh_fixperms
        dh_makeshlibs

diff --git a/org.glite.lbjp-common.log/project/debian.control b/org.glite.lbjp-common.log/project/debian.control
index bd0c669..3e0b60f 100644 (file)
--- a/org.glite.lbjp-common.log/project/debian.control
+++ b/org.glite.lbjp-common.log/project/debian.control
@@ -2,13 +2,21 @@ Source: glite-lbjp-common-log
 Priority: extra
 Maintainer: @MAINTAINER@
 Uploaders: @UPLOADERS@
-Build-Depends: debhelper (>= 7.0.50~), chrpath, libtool, liblog4c3, liblog4c-dev
+Build-Depends: debhelper (>= 7.0.50~), libtool, liblog4c-dev
 Standards-Version: 3.9.1
 Section: libs
 Homepage: @URL@
 DM-Upload-Allowed: yes
 @DEBIAN_VCS@
 
+Package: glite-lbjp-common-log
+Section: libs
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Common files for gLite L&B/JP common log module
+ This package provides log4c configuration file for gLite L&B/JP common log
+ module.
+
 Package: libglite-lbu-log1
 Section: libs
 Architecture: any

diff --git a/org.glite.lbjp-common.log/project/debian.glite-lbjp-common-log.dirs b/org.glite.lbjp-common.log/project/debian.glite-lbjp-common-log.dirs
new file mode 100644 (file)
index 0000000..9b2586c
--- /dev/null
+++ b/org.glite.lbjp-common.log/project/debian.glite-lbjp-common-log.dirs
@@ -0,0 +1 @@
+etc/glite-lb

diff --git a/org.glite.lbjp-common.log/project/debian.glite-lbjp-common-log.install b/org.glite.lbjp-common.log/project/debian.glite-lbjp-common-log.install
new file mode 100644 (file)
index 0000000..9d0e168
--- /dev/null
+++ b/org.glite.lbjp-common.log/project/debian.glite-lbjp-common-log.install
@@ -0,0 +1 @@
+etc/glite-lb/*

diff --git a/org.glite.lbjp-common.log/project/debian.libglite-lbjp-common-log-dev.dirs b/org.glite.lbjp-common.log/project/debian.libglite-lbjp-common-log-dev.dirs
index 0f15098..35cf47a 100644 (file)
--- a/org.glite.lbjp-common.log/project/debian.libglite-lbjp-common-log-dev.dirs
+++ b/org.glite.lbjp-common.log/project/debian.libglite-lbjp-common-log-dev.dirs
@@ -1,2 +1,2 @@
+usr/include/glite
 usr/include/glite/lbu
-usr/lib

diff --git a/org.glite.lbjp-common.log/project/debian.libglite-lbjp-common-log-dev.install b/org.glite.lbjp-common.log/project/debian.libglite-lbjp-common-log-dev.install
index 83f1c89..f782d93 100644 (file)
--- a/org.glite.lbjp-common.log/project/debian.libglite-lbjp-common-log-dev.install
+++ b/org.glite.lbjp-common.log/project/debian.libglite-lbjp-common-log-dev.install
@@ -1,2 +1,3 @@
 usr/include/glite/lbu/*.h
+usr/lib/lib*.a
 usr/lib/lib*.so

diff --git a/org.glite.lbjp-common.log/project/debian.libglite-lbu-log1.dirs b/org.glite.lbjp-common.log/project/debian.libglite-lbu-log1.dirs
deleted file mode 100644 (file)
index 79bb3e4..0000000
--- a/org.glite.lbjp-common.log/project/debian.libglite-lbu-log1.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-etc/glite-lb
-usr/lib
-usr/share/doc/glite-lbjp-common-log

diff --git a/org.glite.lbjp-common.log/project/debian.libglite-lbu-log1.install b/org.glite.lbjp-common.log/project/debian.libglite-lbu-log1.install
index 3379df3..d0dbfd1 100644 (file)
--- a/org.glite.lbjp-common.log/project/debian.libglite-lbu-log1.install
+++ b/org.glite.lbjp-common.log/project/debian.libglite-lbu-log1.install
@@ -1,3 +1 @@
-etc/glite-lb/*
 usr/lib/lib*.so.*
-usr/share/doc/glite-lbjp-common-log/*

diff --git a/org.glite.lbjp-common.log/project/debian.rules b/org.glite.lbjp-common.log/project/debian.rules
index 2a93c7e..415d449 100644 (file)
--- a/org.glite.lbjp-common.log/project/debian.rules
+++ b/org.glite.lbjp-common.log/project/debian.rules
@@ -3,6 +3,11 @@
 
 -include /usr/share/dpkg/buildflags.mk
 
+p_base=glite-lbjp-common-log
+p_dbg=glite-lbjp-common-log-dbg
+p_lib=libglite-lbu-log1
+p_dev=libglite-lbjp-common-log-dev
+
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
@@ -36,21 +41,21 @@ install: build-stamp
        dh_prep
        dh_installdirs
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-       rm -vf $(CURDIR)/debian/tmp/usr/share/doc/glite-lbjp-common-log*/LICENSE
-       rm -vf $(CURDIR)/debian/tmp/usr/lib/*.la
-       rm -vf $(CURDIR)/debian/tmp/usr/lib/*.a
-       find $(CURDIR)/debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
-       mv $(CURDIR)/debian/tmp/usr/share/doc/glite-lbjp-common-log-@MAJOR@.@MINOR@.@REVISION@ $(CURDIR)/debian/tmp/usr/share/doc/glite-lbjp-common-log
-       (cd $(CURDIR)/debian/tmp/usr/share/doc/glite-lbjp-common-log; \
-        rm -fv ChangeLog LICENSE; \
-        cat $(CURDIR)/project/ChangeLog | gzip -9 > changelog.gz)
+       rm -vf debian/tmp/usr/share/doc/glite-lbjp-common-log*/LICENSE
+       rm -vf debian/tmp/usr/lib/*.la
+       mkdir -p debian/$(p_dbg)/usr/share/doc
+       mkdir -p debian/$(p_dev)/usr/share/doc
+       mkdir -p debian/$(p_lib)/usr/share/doc
+       mv debian/tmp/usr/share/doc/glite-lbjp-common-log-@MAJOR@.@MINOR@.@REVISION@ debian/$(p_lib)/usr/share/doc/$(p_lib)
+       ln -s $(p_lib) debian/$(p_dbg)/usr/share/doc/$(p_dbg)
+       ln -s $(p_lib) debian/$(p_dev)/usr/share/doc/$(p_dev)
 
 binary-indep:
 
 binary-arch: install
        dh_testdir
        dh_testroot
-       dh_installchangelogs
+       dh_installchangelogs project/ChangeLog
        dh_installdocs
        dh_installexamples
        dh_installman
@@ -58,7 +63,7 @@ binary-arch: install
        dh_installcron
        dh_install --fail-missing
        dh_link
-       dh_strip --dbg-package=glite-lbjp-common-log-dbg
+       dh_strip --dbg-package=$(p_dbg)
        dh_compress
        dh_fixperms
        dh_makeshlibs

diff --git a/org.glite.lbjp-common.log/project/glite-lbjp-common-log.spec b/org.glite.lbjp-common.log/project/glite-lbjp-common-log.spec
index 07914df..b10bb2d 100644 (file)
--- a/org.glite.lbjp-common.log/project/glite-lbjp-common-log.spec
+++ b/org.glite.lbjp-common.log/project/glite-lbjp-common-log.spec
@@ -10,10 +10,8 @@ Vendor:         EMI
 Source:         http://eticssoft.web.cern.ch/eticssoft/repository/emi/emi.lbjp-common.log/%{version}/src/%{name}-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires:  chrpath
 BuildRequires:  libtool
 BuildRequires:  log4c-devel
-BuildRequires:  log4c
 
 
 %description
@@ -48,7 +46,6 @@ mkdir -p $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -rf {} \;
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -rf {} \;
-find $RPM_BUILD_ROOT -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
 
 %clean
 rm -rf $RPM_BUILD_ROOT

diff --git a/org.glite.lbjp-common.maildir/project/debian.control b/org.glite.lbjp-common.maildir/project/debian.control
index 0196c21..5144e20 100644 (file)
--- a/org.glite.lbjp-common.maildir/project/debian.control
+++ b/org.glite.lbjp-common.maildir/project/debian.control
@@ -2,7 +2,7 @@ Source: glite-lbjp-common-maildir
 Priority: extra
 Maintainer: @MAINTAINER@
 Uploaders: @UPLOADERS@
-Build-Depends: debhelper (>= 7.0.50~), chrpath, libtool
+Build-Depends: debhelper (>= 7.0.50~), libtool
 Standards-Version: 3.9.1
 Section: libs
 Homepage: @URL@

diff --git a/org.glite.lbjp-common.maildir/project/debian.libglite-lbjp-common-maildir-dev.dirs b/org.glite.lbjp-common.maildir/project/debian.libglite-lbjp-common-maildir-dev.dirs
index 0f15098..35cf47a 100644 (file)
--- a/org.glite.lbjp-common.maildir/project/debian.libglite-lbjp-common-maildir-dev.dirs
+++ b/org.glite.lbjp-common.maildir/project/debian.libglite-lbjp-common-maildir-dev.dirs
@@ -1,2 +1,2 @@
+usr/include/glite
 usr/include/glite/lbu
-usr/lib

diff --git a/org.glite.lbjp-common.maildir/project/debian.libglite-lbjp-common-maildir-dev.install b/org.glite.lbjp-common.maildir/project/debian.libglite-lbjp-common-maildir-dev.install
index 83f1c89..f782d93 100644 (file)
--- a/org.glite.lbjp-common.maildir/project/debian.libglite-lbjp-common-maildir-dev.install
+++ b/org.glite.lbjp-common.maildir/project/debian.libglite-lbjp-common-maildir-dev.install
@@ -1,2 +1,3 @@
 usr/include/glite/lbu/*.h
+usr/lib/lib*.a
 usr/lib/lib*.so

diff --git a/org.glite.lbjp-common.maildir/project/debian.libglite-lbu-maildir2.dirs b/org.glite.lbjp-common.maildir/project/debian.libglite-lbu-maildir2.dirs
deleted file mode 100644 (file)
index 6845771..0000000
--- a/org.glite.lbjp-common.maildir/project/debian.libglite-lbu-maildir2.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib

diff --git a/org.glite.lbjp-common.maildir/project/debian.rules b/org.glite.lbjp-common.maildir/project/debian.rules
index 2e2a61f..3837526 100644 (file)
--- a/org.glite.lbjp-common.maildir/project/debian.rules
+++ b/org.glite.lbjp-common.maildir/project/debian.rules
@@ -1,6 +1,10 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+p_dbg=glite-lbjp-common-maildir-dbg
+p_dev=libglite-lbjp-common-maildir-dev
+p_lib=libglite-lbu-maildir2
+
 -include /usr/share/dpkg/buildflags.mk
 
 # Uncomment this to turn on verbose mode.
@@ -36,17 +40,19 @@ install: build-stamp
        dh_prep
        dh_installdirs
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-       rm -rvf $(CURDIR)/debian/tmp/usr/share
-       rm -vf $(CURDIR)/debian/tmp/usr/lib/*.la
-       rm -vf $(CURDIR)/debian/tmp/usr/lib/*.a
-       find $(CURDIR)/debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
+       rm -rvf debian/tmp/usr/share
+       rm -vf debian/tmp/usr/lib/*.la
+       mkdir -p debian/$(p_dbg)/usr/share/doc
+       mkdir -p debian/$(p_dev)/usr/share/doc
+       ln -s $(p_lib) debian/$(p_dbg)/usr/share/doc/$(p_dbg)
+       ln -s $(p_lib) debian/$(p_dev)/usr/share/doc/$(p_dev)
 
 binary-indep:
 
 binary-arch: install
        dh_testdir
        dh_testroot
-       dh_installchangelogs
+       dh_installchangelogs project/ChangeLog
        dh_installdocs
        dh_installexamples
        dh_installman
@@ -54,7 +60,7 @@ binary-arch: install
        dh_installcron
        dh_install --fail-missing
        dh_link
-       dh_strip --dbg-package=glite-lbjp-common-maildir-dbg
+       dh_strip --dbg-package=$(p_dbg)
        dh_compress
        dh_fixperms
        dh_makeshlibs

diff --git a/org.glite.lbjp-common.server-bones/project/debian.libglite-lbjp-common-server-bones-dev.dirs b/org.glite.lbjp-common.server-bones/project/debian.libglite-lbjp-common-server-bones-dev.dirs
index 0f15098..35cf47a 100644 (file)
--- a/org.glite.lbjp-common.server-bones/project/debian.libglite-lbjp-common-server-bones-dev.dirs
+++ b/org.glite.lbjp-common.server-bones/project/debian.libglite-lbjp-common-server-bones-dev.dirs
@@ -1,2 +1,2 @@
+usr/include/glite
 usr/include/glite/lbu
-usr/lib

diff --git a/org.glite.lbjp-common.server-bones/project/debian.libglite-lbjp-common-server-bones-dev.install b/org.glite.lbjp-common.server-bones/project/debian.libglite-lbjp-common-server-bones-dev.install
index 83f1c89..f782d93 100644 (file)
--- a/org.glite.lbjp-common.server-bones/project/debian.libglite-lbjp-common-server-bones-dev.install
+++ b/org.glite.lbjp-common.server-bones/project/debian.libglite-lbjp-common-server-bones-dev.install
@@ -1,2 +1,3 @@
 usr/include/glite/lbu/*.h
+usr/lib/lib*.a
 usr/lib/lib*.so

diff --git a/org.glite.lbjp-common.server-bones/project/debian.libglite-lbu-server-bones2.dirs b/org.glite.lbjp-common.server-bones/project/debian.libglite-lbu-server-bones2.dirs
deleted file mode 100644 (file)
index 6845771..0000000
--- a/org.glite.lbjp-common.server-bones/project/debian.libglite-lbu-server-bones2.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib

diff --git a/org.glite.lbjp-common.server-bones/project/debian.rules b/org.glite.lbjp-common.server-bones/project/debian.rules
index d152814..aacefd6 100644 (file)
--- a/org.glite.lbjp-common.server-bones/project/debian.rules
+++ b/org.glite.lbjp-common.server-bones/project/debian.rules
@@ -3,6 +3,10 @@
 
 -include /usr/share/dpkg/buildflags.mk
 
+p_dbg=glite-lbjp-common-server-bones-dbg
+p_dev=libglite-lbjp-common-server-bones-dev
+p_lib=libglite-lbu-server-bones2
+
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
@@ -36,17 +40,20 @@ install: build-stamp
        dh_prep
        dh_installdirs
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-       rm -rvf $(CURDIR)/debian/tmp/usr/share
-       rm -vf $(CURDIR)/debian/tmp/usr/lib/*.la
-       rm -vf $(CURDIR)/debian/tmp/usr/lib/*.a
-       find $(CURDIR)/debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
+       rm -vf debian/tmp/usr/lib/*.la
+       find debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
+       rm -rvf debian/tmp/usr/share
+       mkdir -p debian/$(p_dbg)/usr/share/doc
+       mkdir -p debian/$(p_dev)/usr/share/doc
+       ln -s $(p_lib) debian/$(p_dbg)/usr/share/doc/$(p_dbg)
+       ln -s $(p_lib) debian/$(p_dev)/usr/share/doc/$(p_dev)
 
 binary-indep:
 
 binary-arch: install
        dh_testdir
        dh_testroot
-       dh_installchangelogs
+       dh_installchangelogs project/ChangeLog
        dh_installdocs
        dh_installexamples
        dh_installman
@@ -54,7 +61,7 @@ binary-arch: install
        dh_installcron
        dh_install --fail-missing
        dh_link
-       dh_strip --dbg-package=glite-lbjp-common-server-bones-dbg
+       dh_strip --dbg-package=$(p_dbg)
        dh_compress
        dh_fixperms
        dh_makeshlibs

diff --git a/org.glite.lbjp-common.trio/project/debian.control b/org.glite.lbjp-common.trio/project/debian.control
index c5ca40b..535cebe 100644 (file)
--- a/org.glite.lbjp-common.trio/project/debian.control
+++ b/org.glite.lbjp-common.trio/project/debian.control
@@ -2,7 +2,7 @@ Source: glite-lbjp-common-trio
 Priority: extra
 Maintainer: @MAINTAINER@
 Uploaders: @UPLOADERS@
-Build-Depends: debhelper (>= 7.0.50~), chrpath, libcppunit-dev, libtool, pkg-config
+Build-Depends: debhelper (>= 7.0.50~), libcppunit-dev, libtool, pkg-config
 Standards-Version: 3.9.1
 Section: libs
 Homepage: @URL@

diff --git a/org.glite.lbjp-common.trio/project/debian.libglite-lbjp-common-trio-dev.dirs b/org.glite.lbjp-common.trio/project/debian.libglite-lbjp-common-trio-dev.dirs
index 0f15098..2eeb8b4 100644 (file)
--- a/org.glite.lbjp-common.trio/project/debian.libglite-lbjp-common-trio-dev.dirs
+++ b/org.glite.lbjp-common.trio/project/debian.libglite-lbjp-common-trio-dev.dirs
@@ -1,2 +1 @@
 usr/include/glite/lbu
-usr/lib

diff --git a/org.glite.lbjp-common.trio/project/debian.libglite-lbjp-common-trio-dev.install b/org.glite.lbjp-common.trio/project/debian.libglite-lbjp-common-trio-dev.install
index 83f1c89..f782d93 100644 (file)
--- a/org.glite.lbjp-common.trio/project/debian.libglite-lbjp-common-trio-dev.install
+++ b/org.glite.lbjp-common.trio/project/debian.libglite-lbjp-common-trio-dev.install
@@ -1,2 +1,3 @@
 usr/include/glite/lbu/*.h
+usr/lib/lib*.a
 usr/lib/lib*.so

diff --git a/org.glite.lbjp-common.trio/project/debian.libglite-lbu-trio2.dirs b/org.glite.lbjp-common.trio/project/debian.libglite-lbu-trio2.dirs
deleted file mode 100644 (file)
index 6845771..0000000
--- a/org.glite.lbjp-common.trio/project/debian.libglite-lbu-trio2.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib

diff --git a/org.glite.lbjp-common.trio/project/debian.rules b/org.glite.lbjp-common.trio/project/debian.rules
index d18fee4..785f6e7 100644 (file)
--- a/org.glite.lbjp-common.trio/project/debian.rules
+++ b/org.glite.lbjp-common.trio/project/debian.rules
@@ -3,6 +3,10 @@
 
 -include /usr/share/dpkg/buildflags.mk
 
+p_dbg=glite-lbjp-common-trio-dbg
+p_dev=libglite-lbjp-common-trio-dev
+p_lib=libglite-lbu-trio2
+
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
@@ -36,17 +40,19 @@ install: build-stamp
        dh_prep
        dh_installdirs
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-       rm -rvf $(CURDIR)/debian/tmp/usr/share
-       rm -vf $(CURDIR)/debian/tmp/usr/lib/*.la
-       rm -vf $(CURDIR)/debian/tmp/usr/lib/*.a
-       find $(CURDIR)/debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
+       rm -vf debian/tmp/usr/lib/*.la
+       rm -rvf debian/tmp/usr/share
+       mkdir -p debian/$(p_dbg)/usr/share/doc
+       mkdir -p debian/$(p_dev)/usr/share/doc
+       ln -s $(p_lib) debian/$(p_dbg)/usr/share/doc/$(p_dbg)
+       ln -s $(p_lib) debian/$(p_dev)/usr/share/doc/$(p_dev)
 
 binary-indep:
 
 binary-arch: install
        dh_testdir
        dh_testroot
-       dh_installchangelogs
+       dh_installchangelogs project/ChangeLog
        dh_installdocs
        dh_installexamples
        dh_installman
@@ -54,7 +60,7 @@ binary-arch: install
        dh_installcron
        dh_install --fail-missing
        dh_link
-       dh_strip --dbg-package=glite-lbjp-common-trio-dbg
+       dh_strip --dbg-package=$(p_dbg)
        dh_compress
        dh_fixperms
        dh_makeshlibs

diff --git a/org.glite.px.emi-px/project/debian.rules b/org.glite.px.emi-px/project/debian.rules
index 9203d57..f7231d1 100644 (file)
--- a/org.glite.px.emi-px/project/debian.rules
+++ b/org.glite.px.emi-px/project/debian.rules
@@ -37,7 +37,7 @@ install: build-stamp
 binary-indep: install
        dh_testdir
        dh_testroot
-       dh_installchangelogs
+       dh_installchangelogs project/ChangeLog
        dh_installdocs
        dh_installexamples
        dh_installman

diff --git a/org.glite.px.myproxy-yaim/project/debian.rules b/org.glite.px.myproxy-yaim/project/debian.rules
index 8691103..2635646 100644 (file)
--- a/org.glite.px.myproxy-yaim/project/debian.rules
+++ b/org.glite.px.myproxy-yaim/project/debian.rules
@@ -40,7 +40,7 @@ install: build-stamp
 binary-indep: install
        dh_testdir
        dh_testroot
-       dh_installchangelogs
+       dh_installchangelogs project/ChangeLog
        dh_installdocs
        dh_installexamples
        dh_installman

diff --git a/org.glite.px.proxyrenewal/project/debian.glite-px-proxyrenewal-progs.dirs b/org.glite.px.proxyrenewal/project/debian.glite-px-proxyrenewal-progs.dirs
deleted file mode 100644 (file)
index 1e10499..0000000
--- a/org.glite.px.proxyrenewal/project/debian.glite-px-proxyrenewal-progs.dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-etc/init.d
-usr/bin
-usr/share/man/man1
-usr/share/man/man8

diff --git a/org.glite.px.proxyrenewal/project/debian.libglite-security-proxyrenewal-dev.dirs b/org.glite.px.proxyrenewal/project/debian.libglite-security-proxyrenewal-dev.dirs
index e6e3dae..85058a7 100644 (file)
--- a/org.glite.px.proxyrenewal/project/debian.libglite-security-proxyrenewal-dev.dirs
+++ b/org.glite.px.proxyrenewal/project/debian.libglite-security-proxyrenewal-dev.dirs
@@ -1,4 +1,3 @@
 usr/include/glite
 usr/include/glite/security
 usr/include/glite/security/proxyrenewal
-usr/lib

diff --git a/org.glite.px.proxyrenewal/project/debian.libglite-security-proxyrenewal-dev.install b/org.glite.px.proxyrenewal/project/debian.libglite-security-proxyrenewal-dev.install
index 835a22c..d11d1a7 100644 (file)
--- a/org.glite.px.proxyrenewal/project/debian.libglite-security-proxyrenewal-dev.install
+++ b/org.glite.px.proxyrenewal/project/debian.libglite-security-proxyrenewal-dev.install
@@ -1,2 +1,3 @@
 usr/include/glite/security/proxyrenewal/*.h
+usr/lib/lib*.a
 usr/lib/lib*.so

diff --git a/org.glite.px.proxyrenewal/project/debian.libglite-security-proxyrenewal1.dirs b/org.glite.px.proxyrenewal/project/debian.libglite-security-proxyrenewal1.dirs
deleted file mode 100644 (file)
index a919406..0000000
--- a/org.glite.px.proxyrenewal/project/debian.libglite-security-proxyrenewal1.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib
-usr/share/doc/glite-px-proxyrenewal

diff --git a/org.glite.px.proxyrenewal/project/debian.libglite-security-proxyrenewal1.install b/org.glite.px.proxyrenewal/project/debian.libglite-security-proxyrenewal1.install
index 379f7e0..d0dbfd1 100644 (file)
--- a/org.glite.px.proxyrenewal/project/debian.libglite-security-proxyrenewal1.install
+++ b/org.glite.px.proxyrenewal/project/debian.libglite-security-proxyrenewal1.install
@@ -1,2 +1 @@
 usr/lib/lib*.so.*
-usr/share/doc/glite-px-proxyrenewal/*

diff --git a/org.glite.px.proxyrenewal/project/debian.rules b/org.glite.px.proxyrenewal/project/debian.rules
index ba75d71..1f63623 100644 (file)
--- a/org.glite.px.proxyrenewal/project/debian.rules
+++ b/org.glite.px.proxyrenewal/project/debian.rules
@@ -3,6 +3,11 @@
 
 -include /usr/share/dpkg/buildflags.mk
 
+p_base=glite-px-proxyrenewal
+p_dbg=glite-px-proxyrenewal-dbg
+p_dev=libglite-security-proxyrenewal-dev
+p_lib=libglite-security-proxyrenewal1
+
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
@@ -36,20 +41,22 @@ install: build-stamp
        dh_prep
        dh_installdirs
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-       rm -vf $(CURDIR)/debian/tmp/usr/lib/*.la
-       rm -vf $(CURDIR)/debian/tmp/usr/lib/*.a
-       find $(CURDIR)/debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
-       mv $(CURDIR)/debian/tmp/usr/share/doc/glite-px-proxyrenewal-@MAJOR@.@MINOR@.@REVISION@ $(CURDIR)/debian/tmp/usr/share/doc/glite-px-proxyrenewal
-       (cd $(CURDIR)/debian/tmp/usr/share/doc/glite-px-proxyrenewal; \
-        rm -fv ChangeLog LICENSE; \
-        cat $(CURDIR)/project/ChangeLog | gzip -9 > changelog.gz)
+       rm -vf debian/tmp/usr/lib/*.la
+       find debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
+       rm -rf debian/tmp/usr/share/doc/glite-px-proxyrenewal-@MAJOR@.@MINOR@.@REVISION@
+       mkdir -p debian/$(p_base)/usr/share/doc
+       mkdir -p debian/$(p_dbg)/usr/share/doc
+       mkdir -p debian/$(p_dev)/usr/share/doc
+       ln -s $(p_lib) debian/$(p_base)/usr/share/doc/$(p_base)
+       ln -s $(p_lib) debian/$(p_dbg)/usr/share/doc/$(p_dbg)
+       ln -s $(p_lib) debian/$(p_dev)/usr/share/doc/$(p_dev)
 
 binary-indep:
 
 binary-arch: install
        dh_testdir
        dh_testroot
-       dh_installchangelogs
+       dh_installchangelogs project/ChangeLog
        dh_installdocs
        dh_installexamples
        dh_installman
@@ -58,7 +65,7 @@ binary-arch: install
        dh_installcron
        dh_install --fail-missing
        dh_link
-       dh_strip --dbg-package=glite-px-proxyrenewal-dbg
+       dh_strip --dbg-package=$(p_dbg)
        dh_compress
        dh_fixperms
        dh_makeshlibs