Commit 0145c293 authored by Aleksandr Konstantinov's avatar Aleksandr Konstantinov
Browse files

Merge branch 'master' into dev-controldir

parents 72619d51 c747caec
...@@ -3,18 +3,77 @@ Section: net ...@@ -3,18 +3,77 @@ Section: net
Priority: optional Priority: optional
Maintainer: Mattias Ellert <mattias.ellert@physics.uu.se> Maintainer: Mattias Ellert <mattias.ellert@physics.uu.se>
Uploaders: Anders Waananen <waananen@nbi.dk> Uploaders: Anders Waananen <waananen@nbi.dk>
Build-Depends: debhelper (>= 9), dh-autoreconf, autopoint, libxml2-dev (>= 2.4.0), libssl-dev, libglibmm-2.4-dev, libltdl-dev, libldap2-dev, uuid-dev, libcppunit-dev, pkg-config, libdb++-dev, libxmlsec1-dev (>= 1.2.4), libglobus-common-dev, libglobus-gssapi-gsi-dev, libglobus-ftp-client-dev, libglobus-ftp-control-dev, dh-python | python-support, openssl, swig, libnss3-dev, pylint, libjson-xs-perl, libxml-simple-perl, libdbi-perl, libsqlite3-dev (>= 3.6), libldns-dev, libinline-python-perl | dpkg (<< 1.18), python-dev | libinline-python-perl (>= 0.56-2~), python-twisted | libinline-python-perl (>= 0.56-2~), python-openssl | libinline-python-perl (>= 0.56-2~), python3-dev | libinline-python-perl (<< 0.56-2~) | dpkg (<< 1.18), python3-twisted | libinline-python-perl (<< 0.56-2~) | dpkg (<< 1.18), python3-openssl | libinline-python-perl (<< 0.56-2~) | dpkg (<< 1.18) Build-Depends:
debhelper (>= 9),
dh-autoreconf,
autopoint,
dh-python | python-support,
dh-systemd | debhelper (>= 9.20160709) | debhelper (<< 9.20130630),
libxml2-dev (>= 2.4.0),
libssl-dev,
libglibmm-2.4-dev,
libltdl-dev,
libldap2-dev,
uuid-dev,
libcppunit-dev,
pkg-config,
libdb++-dev,
libxmlsec1-dev (>= 1.2.4),
libglobus-common-dev,
libglobus-gssapi-gsi-dev,
libglobus-ftp-client-dev,
libglobus-ftp-control-dev,
openssl,
swig,
libnss3-dev,
pylint,
libjson-xs-perl,
libxml-simple-perl,
libdbi-perl,
libsqlite3-dev (>= 3.6),
libldns-dev,
libsystemd-dev [linux-any] | debhelper (<< 9.20150101) [linux-any],
libinline-python-perl | dpkg (<< 1.18),
python-dev | libinline-python-perl (>= 0.56-2~),
python-twisted | libinline-python-perl (>= 0.56-2~),
python-openssl | libinline-python-perl (>= 0.56-2~),
python3-dev | libinline-python-perl (<< 0.56-2~) | dpkg (<< 1.18),
python3-twisted | libinline-python-perl (<< 0.56-2~) | dpkg (<< 1.18),
python3-openssl | libinline-python-perl (<< 0.56-2~) | dpkg (<< 1.18)
XS-Python-Version: current XS-Python-Version: current
Standards-Version: 4.0.0 Standards-Version: 4.4.1
Homepage: http://www.nordugrid.org Homepage: http://www.nordugrid.org
Package: libarccommon3 Package: libarccommon3
Replaces: nordugrid-arc-hed (<< 1.0.1~rc2~), nordugrid-arc-arex (<< 2.0.1~), libarccommon0, libarccommon1, libarccommon2 Replaces:
Conflicts: nordugrid-arc-chelonia (<< 2.0.0~), nordugrid-arc-hopi (<< 2.0.0~), nordugrid-arc-isis (<< 2.0.0~), nordugrid-arc-janitor (<< 2.0.0~), nordugrid-arc-doxygen (<< 4.0.0~), nordugrid-arc-arcproxyalt (<< 6.0.0~), nordugrid-arc-java (<< 6.0.0~), nordugrid-arc-egiis (<< 6.0.0~) nordugrid-arc-hed (<< 1.0.1~rc2~),
Breaks: nordugrid-arc-hed (<< 1.0.1~rc2~), nordugrid-arc-arex (<< 2.0.1~), libarccommon0, libarccommon1, libarccommon2 nordugrid-arc-arex (<< 2.0.1~),
libarccommon0,
libarccommon1,
libarccommon2
Conflicts:
nordugrid-arc-chelonia (<< 2.0.0~),
nordugrid-arc-hopi (<< 2.0.0~),
nordugrid-arc-isis (<< 2.0.0~),
nordugrid-arc-janitor (<< 2.0.0~),
nordugrid-arc-doxygen (<< 4.0.0~),
nordugrid-arc-arcproxyalt (<< 6.0.0~),
nordugrid-arc-java (<< 6.0.0~),
nordugrid-arc-egiis (<< 6.0.0~)
Breaks:
nordugrid-arc-hed (<< 1.0.1~rc2~),
nordugrid-arc-arex (<< 2.0.1~),
libarccommon0,
libarccommon1,
libarccommon2
Architecture: any Architecture: any
Section: libs Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, ${python3:Depends}, openssl Depends:
${shlibs:Depends},
${misc:Depends},
${python:Depends},
${python3:Depends},
openssl
XB-Python-Version: ${python:Versions} XB-Python-Version: ${python:Versions}
Description: Advanced Resource Connector Middleware Description: Advanced Resource Connector Middleware
NorduGrid is a collaboration aiming at development, maintenance and NorduGrid is a collaboration aiming at development, maintenance and
...@@ -29,7 +88,11 @@ Description: Advanced Resource Connector Middleware ...@@ -29,7 +88,11 @@ Description: Advanced Resource Connector Middleware
Package: nordugrid-arc-client Package: nordugrid-arc-client
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libarccommon3 (= ${binary:Version}), nordugrid-arc-plugins-needed (= ${binary:Version}) Depends:
${shlibs:Depends},
${misc:Depends},
libarccommon3 (= ${binary:Version}),
nordugrid-arc-plugins-needed (= ${binary:Version})
Description: ARC command line clients Description: ARC command line clients
NorduGrid is a collaboration aiming at development, maintenance and NorduGrid is a collaboration aiming at development, maintenance and
support of the middleware, known as the Advanced Resource support of the middleware, known as the Advanced Resource
...@@ -40,11 +103,18 @@ Description: ARC command line clients ...@@ -40,11 +103,18 @@ Description: ARC command line clients
datatransfers. datatransfers.
Package: nordugrid-arc-hed Package: nordugrid-arc-hed
Replaces: nordugrid-arc-client (<< 1.0.1~rc2~) Replaces:
Breaks: nordugrid-arc-client (<< 1.0.1~rc2~) nordugrid-arc-client (<< 1.0.1~rc2~)
Breaks:
nordugrid-arc-client (<< 1.0.1~rc2~)
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libarccommon3 (= ${binary:Version}), lsb-base (>= 3.0-6) Depends:
Recommends: nordugrid-arc-python (= ${binary:Version}) ${shlibs:Depends},
${misc:Depends},
libarccommon3 (= ${binary:Version}),
lsb-base (>= 3.0-6)
Recommends:
nordugrid-arc-python (= ${binary:Version})
Description: ARC Hosting Environment Daemon Description: ARC Hosting Environment Daemon
NorduGrid is a collaboration aiming at development, maintenance and NorduGrid is a collaboration aiming at development, maintenance and
support of the middleware, known as the Advanced Resource support of the middleware, known as the Advanced Resource
...@@ -55,7 +125,12 @@ Description: ARC Hosting Environment Daemon ...@@ -55,7 +125,12 @@ Description: ARC Hosting Environment Daemon
Package: nordugrid-arc-gridftpd Package: nordugrid-arc-gridftpd
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libarccommon3 (= ${binary:Version}), nordugrid-arc-plugins-globus (= ${binary:Version}), lsb-base (>= 3.0-6) Depends:
${shlibs:Depends},
${misc:Depends},
libarccommon3 (= ${binary:Version}),
nordugrid-arc-plugins-globus (= ${binary:Version}),
lsb-base (>= 3.0-6)
Description: ARC GridFTP server Description: ARC GridFTP server
NorduGrid is a collaboration aiming at development, maintenance and NorduGrid is a collaboration aiming at development, maintenance and
support of the middleware, known as the Advanced Resource support of the middleware, known as the Advanced Resource
...@@ -67,7 +142,13 @@ Description: ARC GridFTP server ...@@ -67,7 +142,13 @@ Description: ARC GridFTP server
Package: nordugrid-arc-datadelivery-service Package: nordugrid-arc-datadelivery-service
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libarccommon3 (= ${binary:Version}), nordugrid-arc-hed (= ${binary:Version}), nordugrid-arc-plugins-needed (= ${binary:Version}), lsb-base (>= 3.0-6) Depends:
${shlibs:Depends},
${misc:Depends},
libarccommon3 (= ${binary:Version}),
nordugrid-arc-hed (= ${binary:Version}),
nordugrid-arc-plugins-needed (= ${binary:Version}),
lsb-base (>= 3.0-6)
Description: ARC data delivery service Description: ARC data delivery service
NorduGrid is a collaboration aiming at development, maintenance and NorduGrid is a collaboration aiming at development, maintenance and
support of the middleware, known as the Advanced Resource support of the middleware, known as the Advanced Resource
...@@ -76,11 +157,24 @@ Description: ARC data delivery service ...@@ -76,11 +157,24 @@ Description: ARC data delivery service
This package contains the ARC data delivery service. This package contains the ARC data delivery service.
Package: nordugrid-arc-infosys-ldap Package: nordugrid-arc-infosys-ldap
Provides: nordugrid-arc-ldap-infosys, nordugrid-arc-aris Provides:
Replaces: nordugrid-arc-ldap-infosys (<< 6.0.0~), nordugrid-arc-aris (<< 6.0.0~), nordugrid-arc-ldap-egiis (<< 6.0.0~) nordugrid-arc-ldap-infosys,
Conflicts: nordugrid-arc-ldap-infosys (<< 6.0.0~), nordugrid-arc-aris (<< 6.0.0~), nordugrid-arc-ldap-egiis (<< 6.0.0~) nordugrid-arc-aris
Replaces:
nordugrid-arc-ldap-infosys (<< 6.0.0~),
nordugrid-arc-aris (<< 6.0.0~),
nordugrid-arc-ldap-egiis (<< 6.0.0~)
Conflicts:
nordugrid-arc-ldap-infosys (<< 6.0.0~),
nordugrid-arc-aris (<< 6.0.0~),
nordugrid-arc-ldap-egiis (<< 6.0.0~)
Architecture: all Architecture: all
Depends: ${misc:Depends}, ${perl:Depends}, slapd, bdii, lsb-base (>= 3.0-6) Depends:
${misc:Depends},
${perl:Depends},
slapd,
bdii,
lsb-base (>= 3.0-6)
Description: ARC LDAP-based information services Description: ARC LDAP-based information services
NorduGrid is a collaboration aiming at development, maintenance and NorduGrid is a collaboration aiming at development, maintenance and
support of the middleware, known as the Advanced Resource support of the middleware, known as the Advanced Resource
...@@ -92,10 +186,18 @@ Description: ARC LDAP-based information services ...@@ -92,10 +186,18 @@ Description: ARC LDAP-based information services
another package, the nordugrid-arc-arex. another package, the nordugrid-arc-arex.
Package: nordugrid-arc-monitor Package: nordugrid-arc-monitor
Replaces: nordugrid-arc-ldap-monitor (<< 6.0.0~), nordugrid-arc-ws-monitor (<< 6.0.0~) Replaces:
Conflicts: nordugrid-arc-ldap-monitor (<< 6.0.0~), nordugrid-arc-ws-monitor (<< 6.0.0~) nordugrid-arc-ldap-monitor (<< 6.0.0~),
nordugrid-arc-ws-monitor (<< 6.0.0~)
Conflicts:
nordugrid-arc-ldap-monitor (<< 6.0.0~),
nordugrid-arc-ws-monitor (<< 6.0.0~)
Architecture: all Architecture: all
Depends: ${misc:Depends}, php-common | php5-common, php-ldap | php5-ldap, php-gd | php5-gd Depends:
${misc:Depends},
php-common | php5-common,
php-ldap | php5-ldap,
php-gd | php5-gd
Description: ARC LDAP monitor web application Description: ARC LDAP monitor web application
NorduGrid is a collaboration aiming at development, maintenance and NorduGrid is a collaboration aiming at development, maintenance and
support of the middleware, known as the Advanced Resource support of the middleware, known as the Advanced Resource
...@@ -106,12 +208,35 @@ Description: ARC LDAP monitor web application ...@@ -106,12 +208,35 @@ Description: ARC LDAP monitor web application
system and visualizes it. system and visualizes it.
Package: nordugrid-arc-arex Package: nordugrid-arc-arex
Provides: nordugrid-arc-cache-service, nordugrid-arc-candypond Provides:
Replaces: nordugrid-arc-cache-service (<< 6.0.0~), nordugrid-arc-candypond (<< 6.0.0~), nordugrid-arc-aris (<< 6.0.0~), nordugrid-arc-infosys-ldap (<< 6.3.0~) nordugrid-arc-cache-service,
Conflicts: nordugrid-arc-cache-service (<< 6.0.0~), nordugrid-arc-candypond (<< 6.0.0~) nordugrid-arc-candypond
Breaks: nordugrid-arc-aris (<< 6.0.0~), nordugrid-arc-infosys-ldap (<< 6.3.0~) Replaces:
nordugrid-arc-cache-service (<< 6.0.0~),
nordugrid-arc-candypond (<< 6.0.0~),
nordugrid-arc-aris (<< 6.0.0~),
nordugrid-arc-infosys-ldap (<< 6.3.0~),
nordugrid-arc-python (<< 6.4.0~)
Conflicts:
nordugrid-arc-cache-service (<< 6.0.0~),
nordugrid-arc-candypond (<< 6.0.0~)
Breaks:
nordugrid-arc-aris (<< 6.0.0~),
nordugrid-arc-infosys-ldap (<< 6.3.0~)
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, ${python:Depends}, ${python3:Depends}, libarccommon3 (= ${binary:Version}), nordugrid-arc-hed (= ${binary:Version}), nordugrid-arc-plugins-needed (= ${binary:Version}), nordugrid-arc-python (= ${binary:Version}), libjson-xs-perl, libxml-simple-perl, ${pydeps:Depends}, lsb-base (>= 3.0-6) Depends:
${shlibs:Depends},
${misc:Depends},
${perl:Depends},
${python:Depends},
${python3:Depends},
libarccommon3 (= ${binary:Version}),
nordugrid-arc-hed (= ${binary:Version}),
nordugrid-arc-plugins-needed (= ${binary:Version}),
libjson-xs-perl,
libxml-simple-perl,
${pydeps:Depends},
lsb-base (>= 3.0-6)
XB-Python-Version: ${python:Versions} XB-Python-Version: ${python:Versions}
Description: ARC Resource-coupled EXecution service Description: ARC Resource-coupled EXecution service
NorduGrid is a collaboration aiming at development, maintenance and NorduGrid is a collaboration aiming at development, maintenance and
...@@ -127,10 +252,18 @@ Description: ARC Resource-coupled EXecution service ...@@ -127,10 +252,18 @@ Description: ARC Resource-coupled EXecution service
publishing. publishing.
Package: nordugrid-arc-arex-python-lrms Package: nordugrid-arc-arex-python-lrms
Replaces: nordugrid-arc-arex (<< 6.0.0~) Replaces:
Breaks: nordugrid-arc-arex (<< 6.0.0~) nordugrid-arc-arex (<< 6.0.0~)
Breaks:
nordugrid-arc-arex (<< 6.0.0~)
Architecture: any Architecture: any
Depends: ${misc:Depends}, ${python:Depends}, ${python3:Depends}, libinline-python-perl, nordugrid-arc-arex (= ${binary:Version}) Depends:
${misc:Depends},
${python:Depends},
${python3:Depends},
libinline-python-perl,
nordugrid-arc-arex (= ${binary:Version}),
nordugrid-arc-python (= ${binary:Version})
XB-Python-Version: ${python:Versions} XB-Python-Version: ${python:Versions}
Description: ARC Resource-coupled EXecution service - Python LRMS backends Description: ARC Resource-coupled EXecution service - Python LRMS backends
NorduGrid is a collaboration aiming at development, maintenance and NorduGrid is a collaboration aiming at development, maintenance and
...@@ -143,7 +276,10 @@ Description: ARC Resource-coupled EXecution service - Python LRMS backends ...@@ -143,7 +276,10 @@ Description: ARC Resource-coupled EXecution service - Python LRMS backends
Package: nordugrid-arc-plugins-needed Package: nordugrid-arc-plugins-needed
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libarccommon3 (= ${binary:Version}) Depends:
${shlibs:Depends},
${misc:Depends},
libarccommon3 (= ${binary:Version})
Description: ARC base plugins Description: ARC base plugins
NorduGrid is a collaboration aiming at development, maintenance and NorduGrid is a collaboration aiming at development, maintenance and
support of the middleware, known as the Advanced Resource support of the middleware, known as the Advanced Resource
...@@ -153,10 +289,15 @@ Description: ARC base plugins ...@@ -153,10 +289,15 @@ Description: ARC base plugins
and Data Manager Components (DMCs). and Data Manager Components (DMCs).
Package: nordugrid-arc-plugins-globus Package: nordugrid-arc-plugins-globus
Replaces: nordugrid-arc-plugins-needed (<< 1.0.1-2~) Replaces:
Breaks: nordugrid-arc-plugins-needed (<< 1.0.1-2~) nordugrid-arc-plugins-needed (<< 1.0.1-2~)
Breaks:
nordugrid-arc-plugins-needed (<< 1.0.1-2~)
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libarccommon3 (= ${binary:Version}) Depends:
${shlibs:Depends},
${misc:Depends},
libarccommon3 (= ${binary:Version})
Description: ARC Globus plugins Description: ARC Globus plugins
NorduGrid is a collaboration aiming at development, maintenance and NorduGrid is a collaboration aiming at development, maintenance and
support of the middleware, known as the Advanced Resource support of the middleware, known as the Advanced Resource
...@@ -167,7 +308,11 @@ Description: ARC Globus plugins ...@@ -167,7 +308,11 @@ Description: ARC Globus plugins
Package: nordugrid-arc-plugins-internal Package: nordugrid-arc-plugins-internal
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libarccommon3 (= ${binary:Version}), nordugrid-arc-arex (= ${binary:Version}) Depends:
${shlibs:Depends},
${misc:Depends},
libarccommon3 (= ${binary:Version}),
nordugrid-arc-arex (= ${binary:Version})
Description: ARC internal plugin Description: ARC internal plugin
NorduGrid is a collaboration aiming at development, maintenance and NorduGrid is a collaboration aiming at development, maintenance and
support of the middleware, known as the Advanced Resource support of the middleware, known as the Advanced Resource
...@@ -178,7 +323,11 @@ Description: ARC internal plugin ...@@ -178,7 +323,11 @@ Description: ARC internal plugin
Package: nordugrid-arc-plugins-arcrest Package: nordugrid-arc-plugins-arcrest
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libarccommon3 (= ${binary:Version}), nordugrid-arc-arex (= ${binary:Version}) Depends:
${shlibs:Depends},
${misc:Depends},
libarccommon3 (= ${binary:Version}),
nordugrid-arc-arex (= ${binary:Version})
Description: ARC REST plugin Description: ARC REST plugin
NorduGrid is a collaboration aiming at development, maintenance and NorduGrid is a collaboration aiming at development, maintenance and
support of the middleware, known as the Advanced Resource support of the middleware, known as the Advanced Resource
...@@ -188,7 +337,11 @@ Description: ARC REST plugin ...@@ -188,7 +337,11 @@ Description: ARC REST plugin
Package: nordugrid-arc-acix-core Package: nordugrid-arc-acix-core
Architecture: all Architecture: all
Depends: ${misc:Depends}, ${python:Depends}, ${python3:Depends}, ${pydeps:Depends} Depends:
${misc:Depends},
${python:Depends},
${python3:Depends},
${pydeps:Depends}
XB-Python-Version: ${python:Versions} XB-Python-Version: ${python:Versions}
Description: ARC cache index - core components Description: ARC cache index - core components
NorduGrid is a collaboration aiming at development, maintenance and NorduGrid is a collaboration aiming at development, maintenance and
...@@ -198,11 +351,20 @@ Description: ARC cache index - core components ...@@ -198,11 +351,20 @@ Description: ARC cache index - core components
Core components of the ARC Cache Index (ACIX). Core components of the ARC Cache Index (ACIX).
Package: nordugrid-arc-acix-scanner Package: nordugrid-arc-acix-scanner
Provides: nordugrid-arc-acix-cache Provides:
Replaces: nordugrid-arc-acix-cache (<< 6.0.0~) nordugrid-arc-acix-cache
Conflicts: nordugrid-arc-acix-cache (<< 6.0.0~) Replaces:
nordugrid-arc-acix-cache (<< 6.0.0~)
Conflicts:
nordugrid-arc-acix-cache (<< 6.0.0~)
Architecture: all Architecture: all
Depends: ${misc:Depends}, ${python:Depends}, ${python3:Depends}, libarccommon3 (>= ${source:Version}), nordugrid-arc-acix-core (= ${source:Version}), lsb-base (>= 3.0-6) Depends:
${misc:Depends},
${python:Depends},
${python3:Depends},
libarccommon3 (>= ${source:Version}),
nordugrid-arc-acix-core (= ${source:Version}),
lsb-base (>= 3.0-6)
XB-Python-Version: ${python:Versions} XB-Python-Version: ${python:Versions}
Description: ARC cache index - scanner server Description: ARC cache index - scanner server
NorduGrid is a collaboration aiming at development, maintenance and NorduGrid is a collaboration aiming at development, maintenance and
...@@ -215,7 +377,13 @@ Description: ARC cache index - scanner server ...@@ -215,7 +377,13 @@ Description: ARC cache index - scanner server
Package: nordugrid-arc-acix-index Package: nordugrid-arc-acix-index
Architecture: all Architecture: all
Depends: ${misc:Depends}, ${python:Depends}, ${python3:Depends}, libarccommon3 (>= ${source:Version}), nordugrid-arc-acix-core (= ${source:Version}), lsb-base (>= 3.0-6) Depends:
${misc:Depends},
${python:Depends},
${python3:Depends},
libarccommon3 (>= ${source:Version}),
nordugrid-arc-acix-core (= ${source:Version}),
lsb-base (>= 3.0-6)
XB-Python-Version: ${python:Versions} XB-Python-Version: ${python:Versions}
Description: ARC cache index - index server Description: ARC cache index - index server
NorduGrid is a collaboration aiming at development, maintenance and NorduGrid is a collaboration aiming at development, maintenance and
...@@ -230,7 +398,13 @@ Description: ARC cache index - index server ...@@ -230,7 +398,13 @@ Description: ARC cache index - index server
Package: nordugrid-arc-dev Package: nordugrid-arc-dev
Architecture: any Architecture: any
Section: libdevel Section: libdevel
Depends: ${shlibs:Depends}, ${misc:Depends}, libarccommon3 (= ${binary:Version}), libxml2-dev (>= 2.4.0), libssl-dev, libglibmm-2.4-dev Depends:
${shlibs:Depends},
${misc:Depends},
libarccommon3 (= ${binary:Version}),
libxml2-dev (>= 2.4.0),
libssl-dev,
libglibmm-2.4-dev
Description: ARC development files Description: ARC development files
NorduGrid is a collaboration aiming at development, maintenance and NorduGrid is a collaboration aiming at development, maintenance and
support of the middleware, known as the Advanced Resource support of the middleware, known as the Advanced Resource
...@@ -241,7 +415,12 @@ Description: ARC development files ...@@ -241,7 +415,12 @@ Description: ARC development files
Package: nordugrid-arc-python Package: nordugrid-arc-python
Architecture: any Architecture: any
Section: python Section: python
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, ${python3:Depends}, libarccommon3 (= ${binary:Version}) Depends:
${shlibs:Depends},
${misc:Depends},
${python:Depends},
${python3:Depends},
libarccommon3 (= ${binary:Version})
XB-Python-Version: ${python:Versions} XB-Python-Version: ${python:Versions}
Description: ARC Python wrapper Description: ARC Python wrapper
NorduGrid is a collaboration aiming at development, maintenance and NorduGrid is a collaboration aiming at development, maintenance and
...@@ -251,13 +430,24 @@ Description: ARC Python wrapper ...@@ -251,13 +430,24 @@ Description: ARC Python wrapper
Python bindings for ARC. Python bindings for ARC.
Package: nordugrid-arc-nordugridmap Package: nordugrid-arc-nordugridmap
Provides: nordugrid-arc-gridmap-utils Provides:
Replaces: nordugrid-arc-gridmap-utils (<< 6.0.0~) nordugrid-arc-gridmap-utils
Conflicts: nordugrid-arc-gridmap-utils (<< 6.0.0~) Replaces:
nordugrid-arc-gridmap-utils (<< 6.0.0~)
Conflicts:
nordugrid-arc-gridmap-utils (<< 6.0.0~)
Architecture: all Architecture: all
Depends: libnet-ldap-perl, libxml-dom-perl, libcrypt-ssleay-perl, libsoap-lite-perl, libcrypt-openssl-x509-perl, ${perl:Depends}, ${misc:Depends} Depends:
Recommends: cron libnet-ldap-perl,
Description: The nordugridmap tool libxml-dom-perl,
libcrypt-ssleay-perl,
libsoap-lite-perl,
libcrypt-openssl-x509-perl,
${perl:Depends},
${misc:Depends}
Recommends:
cron
Description: ARC's nordugridmap tool
NorduGrid is a collaboration aiming at development, maintenance and NorduGrid is a collaboration aiming at development, maintenance and
support of the middleware, known as the Advanced Resource support of the middleware, known as the Advanced Resource
Connector (ARC). Connector (ARC).
...@@ -266,11 +456,18 @@ Description: The nordugridmap tool ...@@ -266,11 +456,18 @@ Description: The nordugridmap tool
files. files.
Package: nordugrid-arc-test-utils Package: nordugrid-arc-test-utils
Provides: nordugrid-arc-misc-utils Provides:
Replaces: nordugrid-arc-misc-utils (<< 6.0.0~) nordugrid-arc-misc-utils
Conflicts: nordugrid-arc-misc-utils (<< 6.0.0~) Replaces:
nordugrid-arc-misc-utils (<< 6.0.0~)
Conflicts:
nordugrid-arc-misc-utils (<< 6.0.0~)
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libarccommon3 (= ${binary:Version}), nordugrid-arc-plugins-needed (= ${binary:Version}) Depends:
${shlibs:Depends},
${misc:Depends},
libarccommon3 (= ${binary:Version}),
nordugrid-arc-plugins-needed (= ${binary:Version})
Description: ARC test tools Description: ARC test tools
NorduGrid is a collaboration aiming at development, maintenance and NorduGrid is a collaboration aiming at development, maintenance and
support of the middleware, known as the Advanced Resource support of the middleware, known as the Advanced Resource
...@@ -282,7 +479,11 @@ Description: ARC test tools ...@@ -282,7 +479,11 @@ Description: ARC test tools
Package: nordugrid-arc-archery-manage Package: nordugrid-arc-archery-manage
Architecture: all Architecture: all
Depends: ${misc:Depends}, ${python:Depends}, ${python3:Depends}, ${pydeps:Depends} Depends:
${misc:Depends},
${python:Depends},
${python3:Depends},
${pydeps:Depends}
Description: ARCHERY administration tool Description: ARCHERY administration tool
NorduGrid is a collaboration aiming at development, maintenance and NorduGrid is a collaboration aiming at development, maintenance and
support of the middleware, known as the Advanced Resource support of the middleware, known as the Advanced Resource
...@@ -293,7 +494,9 @@ Description: ARCHERY administration tool ...@@ -293,7 +494,9 @@ Description: ARCHERY administration tool
Package: nordugrid-arc-wn Package: nordugrid-arc-wn
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends} Depends:
${shlibs:Depends},
${misc:Depends}
Description: ARC optional worker nodes components Description: ARC optional worker nodes components
NorduGrid is a collaboration aiming at development, maintenance and NorduGrid is a collaboration aiming at development, maintenance and
support of the middleware, known as the Advanced Resource support of the middleware, known as the Advanced Resource
......
...@@ -6,5 +6,6 @@ set -e ...@@ -6,5 +6,6 @@ set -e
if [ "$1" = "remove" ] ; then if [ "$1" = "remove" ] ; then
arcctl test-ca cleanup arcctl test-ca cleanup
rmdir /etc/grid-security/certificates 2>/dev/null || :
rmdir /etc/grid-security 2>/dev/null || :
fi fi
#!/usr/bin/make -f #!/usr/bin/make -f
-include /usr/share/dpkg/buildflags.mk
# Filter out -Wl,-Bsymbolic-functions from default Ubuntu LDFLAGS # Filter out -Wl,-Bsymbolic-functions from default Ubuntu LDFLAGS
COMMA = , export DEB_LDFLAGS_MAINT_STRIP=-Wl,-Bsymbolic-functions
LDFLAGS := $(filter-out -Wl$(COMMA)-Bsymbolic-functions,$(LDFLAGS))
ifeq ($(shell pkg-config --atleast-version 2.6 sigc++-2.0 && echo 1),1) ifeq ($(shell pkg-config --atleast-version 2.6 sigc++-2.0 && echo 1),1)
ifeq ($(shell echo __GNUC__ | gcc -E - | tail -1),5) ifeq ($(shell echo __GNUC__ | gcc -E - | tail -1),5)
# Workaround for too new libsigc++/glibmm, too old gcc combination # Workaround for too new libsigc++/glibmm, too old gcc combination
CXXFLAGS += -std=c++11 export DEB_CXXFLAGS_MAINT_APPEND=-std=c++11
endif endif
endif endif
...@@ -25,54 +22,44 @@ else ...@@ -25,54 +22,44 @@ else
PYVER = 2 PYVER = 2
endif endif
configure: configure-stamp ifeq ($(shell type dh_systemd_enable > /dev/null 2> /dev/null && echo 1),1)
WSD = --with systemd
else
WSD =
endif
configure-stamp: ifeq ($(shell test -r /usr/include/systemd/sd-daemon.h && echo 1),1)
dh_testdir ifeq ($(DEB_HOST_ARCH_OS),linux)
SYSTEMD = yes
else
SYSTEMD = no
endif
else
SYSTEMD = no
endif
%:
dh $@ --with autoreconf --with python$(PYVER) $(WSD) $(N)
override_dh_auto_configure:
if [ ! -f po/POTFILES.in.save ] ; then \ if [ ! -f po/POTFILES.in.save ] ; then \
cp -p po/POTFILES.in po/POTFILES.in.save ; \ cp -p po/POTFILES.in po/POTFILES.in.save ; \
fi fi
dh_autoreconf LDFLAGS="$(LDFLAGS) -Wl,-z,defs" \
dh_auto_configure -- \
CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS) -Wl,-z,defs" \
./configure --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
--libexecdir='$${prefix}/lib' \
--sysconfdir=/etc \
--localstatedir=/var \
--mandir='$${datadir}/man' \
--infodir='$${datadir}/info' \
--disable-doc \ --disable-doc \
--docdir='$${datadir}/doc/nordugrid-arc' \ --libdir=/usr/lib \