From 96a0f4e53fa98f33365e9b220d20a51cc311f2af Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Tue, 17 Apr 2012 16:08:32 +0000 Subject: [PATCH] Fix build of Debian packages. --- org.glite.jobid.api-cpp/project/debian.control | 2 +- org.glite.lb.emi-lb/project/debian.control | 2 +- org.glite.lb.logger-msg/project/debian.control | 5 ++--- org.glite.lb.logger-msg/project/debian.glite-lb-logger-msg.dirs | 1 - org.glite.lb.logger-msg/project/debian.glite-lb-logger-msg.install | 1 - org.glite.lb.server/project/debian.control | 2 +- org.glite.lbjp-common.gss/project/debian.control | 2 +- 7 files changed, 6 insertions(+), 9 deletions(-) diff --git a/org.glite.jobid.api-cpp/project/debian.control b/org.glite.jobid.api-cpp/project/debian.control index 8289177..4d4c2be 100644 --- a/org.glite.jobid.api-cpp/project/debian.control +++ b/org.glite.jobid.api-cpp/project/debian.control @@ -12,7 +12,7 @@ DM-Upload-Allowed: yes Package: libglite-jobid-api-cpp-dev Section: libdevel Architecture: any -Depends: libglite-jobid-api-c, ${misc:Depends} +Depends: libglite-jobid2, ${misc:Depends} Provides: glite-jobid-api-cpp Description: @SUMMARY@ @DEBIAN_DESCRIPTION@ diff --git a/org.glite.lb.emi-lb/project/debian.control b/org.glite.lb.emi-lb/project/debian.control index fb0a29f..0cc7819 100644 --- a/org.glite.lb.emi-lb/project/debian.control +++ b/org.glite.lb.emi-lb/project/debian.control @@ -13,6 +13,6 @@ Package: emi-lb Section: net Architecture: any Depends: ${misc:Depends}, bdii, emi-version, fetch-crl, glite-lb-client-java, glite-lb-client-progs, glite-lb-doc, glite-lb-harvester, glite-lb-logger, glite-lb-logger-msg, glite-lb-server, glite-lb-utils, glite-lb-ws-test, glite-lb-yaim, glue-schema -#TODO: glue-service-provider/glite-info-provider-service +Recommends: glite-info-provider-service Description: @SUMMARY@ @DEBIAN_DESCRIPTION@ diff --git a/org.glite.lb.logger-msg/project/debian.control b/org.glite.lb.logger-msg/project/debian.control index f94b617..aff179e 100644 --- a/org.glite.lb.logger-msg/project/debian.control +++ b/org.glite.lb.logger-msg/project/debian.control @@ -2,8 +2,7 @@ Source: glite-lb-logger-msg Priority: extra Maintainer: @MAINTAINER@ Uploaders: @UPLOADERS@ -Build-Depends: debhelper (>= 7.0.50~), chrpath, glite-lb-logger-dev, libcppunit-dev, libglite-lbjp-common-log-dev, libglite-lbjp-common-trio-dev, libtool -#TODO: activemq-cpp-library +Build-Depends: debhelper (>= 7.0.50~), activemq-cpp-dev, chrpath, glite-lb-logger-dev, libcppunit-dev, libglite-lbjp-common-log-dev, libglite-lbjp-common-trio-dev, libtool Standards-Version: 3.9.1 Section: misc Homepage: @URL@ @@ -13,7 +12,7 @@ DM-Upload-Allowed: yes Package: glite-lb-logger-msg Section: misc Architecture: any -Depends: glite-lb-logger (= ${binary:Version}), ${misc:Depends} +Depends: glite-lb-logger, ${misc:Depends} Description: @SUMMARY@ @DEBIAN_DESCRIPTION@ 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 2e877df..8cef7ee 100644 --- 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 @@ -3,4 +3,3 @@ usr/lib/glite-lb usr/lib/glite-lb/examples usr/sbin usr/share/doc/glite-lb-logger-msg -usr/share/glite-lb 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 385c77b..b7eb97b 100644 --- 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 @@ -4,4 +4,3 @@ usr/lib/activemq_cpp_plugin.so* usr/lib/glite-lb/examples/* usr/sbin/glite-lb-msg-* usr/share/doc/glite-lb-logger-msg/* -usr/share/glite-lb/* diff --git a/org.glite.lb.server/project/debian.control b/org.glite.lb.server/project/debian.control index a90a3cc..6ec6c7a 100644 --- a/org.glite.lb.server/project/debian.control +++ b/org.glite.lb.server/project/debian.control @@ -2,7 +2,7 @@ Source: glite-lb-server Priority: extra Maintainer: @MAINTAINER@ Uploaders: @UPLOADERS@ -Build-Depends: debhelper (>= 7.0.50~), bison, chrpath, flex, glite-lb-types, glite-lb-ws-interface, gsoap, libc-ares-dev, libc-ares2, libclassad-dev, libclassad1, libcppunit-dev, libexpat1, libexpat1-dev, libglobus-gssapi-gsi-dev, libglite-jobid-api-c-dev, libglite-lb-common-dev, libglite-lb-state-machine-dev, libglite-lbjp-common-db-dev, libglite-lbjp-common-gss-dev, libglite-lbjp-common-gsoap-plugin-dev, libglite-lbjp-common-log-dev, libglite-lbjp-common-maildir-dev, libglite-lbjp-common-server-bones-dev, libglite-lbjp-common-trio-dev, libgridsite-dev, libtool, libxml2, libxml2-dev, libvomsapi1, voms-dev +Build-Depends: debhelper (>= 7.0.50~), bison, chrpath, flex, glite-lb-types, glite-lb-ws-interface, gsoap, libc-ares-dev, libc-ares2, libclassad-dev, libclassad1, libcppunit-dev, libexpat1, libexpat1-dev, libglobus-gssapi-gsi-dev, libglite-jobid-api-c-dev, libglite-lb-common-dev, libglite-lb-state-machine-dev, libglite-lbjp-common-db-dev, libglite-lbjp-common-gss-dev, libglite-lbjp-common-gsoap-plugin-dev, libglite-lbjp-common-log-dev, libglite-lbjp-common-maildir-dev, libglite-lbjp-common-server-bones-dev, libglite-lbjp-common-trio-dev, libgridsite-dev, libtool, libxml2, libxml2-dev, voms-dev #TODO: lcas Standards-Version: 3.9.1 Section: misc diff --git a/org.glite.lbjp-common.gss/project/debian.control b/org.glite.lbjp-common.gss/project/debian.control index 3a537bb..7609a4e 100644 --- a/org.glite.lbjp-common.gss/project/debian.control +++ b/org.glite.lbjp-common.gss/project/debian.control @@ -20,7 +20,7 @@ Package: libglite-lbjp-common-gss-dev Section: libdevel Architecture: any Provides: glite-lbjp-common-gss -Depends: libglite-security-gss9 (= ${binary:Version}), ${misc:Depends}, libglobus-gssapi-gsi-de, pkg-config +Depends: libglite-security-gss9 (= ${binary:Version}), ${misc:Depends}, libglobus-gssapi-gsi-dev, pkg-config Description: Development files for gLite L&B/JP common gss library This package contains development libraries and header files for gLite gss library. -- 1.8.2.3