Final fix of upgrading on Debian from EMI-2 to EMI-3: split lb.state-machine plugin...

diff --git a/org.glite.lb.state-machine/project/debian.control b/org.glite.lb.state-machine/project/debian.control
index b8262ee..fe732f4 100644 (file)
--- a/org.glite.lb.state-machine/project/debian.control
+++ b/org.glite.lb.state-machine/project/debian.control
@@ -25,6 +25,13 @@ Description: Development files for gLite L&B state machine
  This package contains development libraries and header files for gLite L&B
  state machine.
 
+Package: glite-lb-state-machine-plugins
+Section: misc
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: L&B state machine plugins
+ This package contains L&B state machine plugins for Job Provenance.
+
 Package: glite-lb-state-machine-dbg
 Section: debug
 Architecture: any

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 f784ee4..4106b0f 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
@@ -2,4 +2,3 @@ usr/include/glite/lb/*.h
 usr/interface/*.xsd
 usr/lib/lib*.a
 usr/lib/lib*.so
-usr/lib/glite*.so

diff --git a/org.glite.lb.state-machine/project/debian.libglite-lb-state-machine5.install b/org.glite.lb.state-machine/project/debian.libglite-lb-state-machine5.install
index 30560ad..d0dbfd1 100644 (file)
--- a/org.glite.lb.state-machine/project/debian.libglite-lb-state-machine5.install
+++ b/org.glite.lb.state-machine/project/debian.libglite-lb-state-machine5.install
@@ -1,2 +1 @@
 usr/lib/lib*.so.*
-usr/lib/glite*.so.*

diff --git a/org.glite.lb.state-machine/project/debian.rules b/org.glite.lb.state-machine/project/debian.rules
index e1c5a02..350f7ee 100644 (file)
--- a/org.glite.lb.state-machine/project/debian.rules
+++ b/org.glite.lb.state-machine/project/debian.rules
@@ -6,6 +6,7 @@
 p_dbg=glite-lb-state-machine-dbg
 p_dev=libglite-lb-state-machine-dev
 p_lib=libglite-lb-state-machine5
+p_plugs=glite-lb-state-machine-plugins
 
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
@@ -45,8 +46,10 @@ install: build-stamp
        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
+       mkdir -p debian/$(p_plugs)/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)
+       ln -s $(p_lib) debian/$(p_plugs)/usr/share/doc/$(p_plugs)
 
 binary-indep:
 

diff --git a/org.glite.lb.state-machine/project/glite-lb-state-machine.spec b/org.glite.lb.state-machine/project/glite-lb-state-machine.spec
index 027fb15..f1ccd18 100644 (file)
--- a/org.glite.lb.state-machine/project/glite-lb-state-machine.spec
+++ b/org.glite.lb.state-machine/project/glite-lb-state-machine.spec
@@ -39,6 +39,14 @@ This package contains development libraries and header files for gLite L&B
 state machine.
 
 
+%package        plugins
+Summary:        L&B state machine plugins
+Group:          System Environment/Libraries
+
+%description    plugins
+This package contains L&B state machine plugins for Job Provenance.
+
+
 %prep
 %setup -q
 
@@ -75,18 +83,21 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc LICENSE project/ChangeLog
 %{_libdir}/libglite_lb_statemachine.so.*
-%{_libdir}/glite_lb_plugin.so.*
 
 %files devel
 %defattr(-,root,root)
 %dir %{_includedir}/glite/
 %dir %{_includedir}/glite/lb/
 %dir /usr/interface/
-%{_libdir}/glite_lb_plugin.so
 %{_libdir}/libglite_lb_statemachine.so
 %{_includedir}/glite/lb/*.h
 /usr/interface/*.xsd
 
+%files plugins
+%defattr(-,root,root)
+%{_libdir}/glite_lb_plugin.so
+%{_libdir}/glite_lb_plugin.so.*
+
 
 %changelog
 * @SPEC_DATE@ @MAINTAINER@ - @MAJOR@.@MINOR@.@REVISION@-@AGE@%{?dist}

diff --git a/org.glite.lbjp-common.gsoap-plugin/project/debian.control b/org.glite.lbjp-common.gsoap-plugin/project/debian.control
index a2e4776..b5c1992 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-plugin9
+Package: libglite-lbjp-common-gsoap-plugin
 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-plugin9 (= ${binary:Version}), libglite-lbjp-common-gss-dev, ${misc:Depends}
+Depends: libglite-lbjp-common-gsoap-plugin (= ${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-plugin9 (= ${binary:Version}), ${misc:Depends}
+Depends: libglite-lbjp-common-gsoap-plugin (= ${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-plugin9.install b/org.glite.lbjp-common.gsoap-plugin/project/debian.libglite-lbjp-common-gsoap-plugin.install
similarity index 100%
rename from org.glite.lbjp-common.gsoap-plugin/project/debian.libglite-lbjp-common-gsoap-plugin9.install
rename to org.glite.lbjp-common.gsoap-plugin/project/debian.libglite-lbjp-common-gsoap-plugin.install

diff --git a/org.glite.lbjp-common.gsoap-plugin/project/debian.rules b/org.glite.lbjp-common.gsoap-plugin/project/debian.rules
index c8c829d..8efd5f0 100644 (file)
--- a/org.glite.lbjp-common.gsoap-plugin/project/debian.rules
+++ b/org.glite.lbjp-common.gsoap-plugin/project/debian.rules
@@ -3,7 +3,7 @@
 
 p_dbg=glite-lbjp-common-gsoap-plugin-dbg
 p_dev=libglite-lbjp-common-gsoap-plugin-dev
-p_lib=libglite-lbjp-common-gsoap-plugin9
+p_lib=libglite-lbjp-common-gsoap-plugin
 
 -include /usr/share/dpkg/buildflags.mk