diff --git a/build/package_configs/ubuntu1404/liberty/contrail_server_manager_packages.cfg b/build/package_configs/ubuntu1404/liberty/contrail_server_manager_packages.cfg deleted file mode 100644 index 515e38aca..000000000 --- a/build/package_configs/ubuntu1404/liberty/contrail_server_manager_packages.cfg +++ /dev/null @@ -1,76 +0,0 @@ -# **************************************************************** -# CAUTION: ANY CHANGES TO DEFAULT APPLIES TO ALL SECTIONS -# IF NOT OVERWRITTEN LOCALLY -# **************************************************************** -# Usage: -# [build target name] -# pkgs = # list of packages generated by the make target -# -# pkg_pattern = # pattern to match packages. would be used -# # packager to pick packages from given directory -# -# builtloc = # location where packages are copied after built -# -# makeloc = # location where make command has to issued -# # these path are taken relative to git local repo -# ***************************************************************** - -[DEFAULT] -pkgs = -pkg_pattern = {pkg}_[0-9]*.deb -builtloc = build/debian/ -target = %(__name__)s -makeloc = -package_type = contrail-server-manager-installer - -[python-contrail] -pkgs = python-contrail -makeloc = tools/packaging/common/debian -target = contrail -builtloc = build/packages - -[contrail-server-manager-monitoring] -pkgs = contrail-server-manager-monitoring -makeloc = tools/packaging/common/debian -target = contrail-server-manager-monitoring-deb - -[contrail-server-manager-installer] -pkgs = contrail-server-manager-installer -makeloc = tools/packaging/common/debian -target = contrail-server-manager-installer-deb - -[contrail-server-manager] -pkgs = contrail-server-manager -makeloc = tools/packaging/common/debian -target = contrail-server-manager-deb - -[contrail-server-manager-lite] -pkgs = contrail-server-manager-lite -makeloc = tools/packaging/common/debian -target = contrail-server-manager-lite-deb - -[contrail-server-manager-client] -pkgs = contrail-server-manager-client -makeloc = tools/packaging/common/debian -target = contrail-server-manager-client-deb - -[contrail-server-manager-cliff-client] -pkgs = contrail-server-manager-cliff-client -makeloc = tools/packaging/common/debian -target = contrail-server-manager-cliff-client-deb - -[contrail-web-core] -pkgs = contrail-web-core -makeloc = tools/packaging/common/debian -target = contrail-web-core-deb - -[contrail-web-server-manager] -pkgs = contrail-web-server-manager -makeloc = tools/packaging/common/debian -target = contrail-web-server-manager-deb - -[contrail-server-manager-default-target] -pkgs = -makeloc = tools/packaging/common/debian/ -target = server-manager-all -builtloc = build/debian/ diff --git a/build/package_configs/ubuntu1404/liberty/depends_contrail_dependent_packages.cfg b/build/package_configs/ubuntu1404/liberty/depends_contrail_dependent_packages.cfg index 22fdad0be..e801f762e 100644 --- a/build/package_configs/ubuntu1404/liberty/depends_contrail_dependent_packages.cfg +++ b/build/package_configs/ubuntu1404/liberty/depends_contrail_dependent_packages.cfg @@ -88,6 +88,11 @@ file = crash_7.0.3-3ubuntu4.4_amd64.deb md5 = 41f05464997fe498fdabc96691143b4d source = repo:trusty-updates/main +[crudini] +file = crudini_0.3-1_amd64.deb +md5 = 53f6b8981076afc2fe5f545a87426cdd +source = repo:trusty/main + [default-jre-headless_2:1.7-51] file = default-jre-headless_2%%3a1.7-51_amd64.deb md5 = 82babba8748dca94fddb6449c2e0c38e @@ -953,3 +958,7 @@ file = zookeeper_3.4.5+dfsg-1_all.deb md5 = 59083991e535cb097e9db55714b78589 source = repo:trusty/universe +[libzookeeper-mt2_3.4.5+dfsg-1] +file = libzookeeper-mt2_3.4.5+dfsg-1_amd64.deb +md5 = 45430fcb0a6ef134390339c3d577e700 +source = repo:trusty diff --git a/build/package_configs/ubuntu1404/liberty/depends_contrail_openstack_packages.cfg b/build/package_configs/ubuntu1404/liberty/depends_contrail_openstack_packages.cfg index 16f905fb3..fb83993b3 100644 --- a/build/package_configs/ubuntu1404/liberty/depends_contrail_openstack_packages.cfg +++ b/build/package_configs/ubuntu1404/liberty/depends_contrail_openstack_packages.cfg @@ -78,6 +78,46 @@ file = barbican-worker_1%%3a1.0.0-0ubuntu1.1~cloud0_all.deb md5 = ea2dc3f8821b7c39aac13cd13613d810 source = repo:trusty-updates-liberty/main/ +[ceilometer-agent-central_1:5.0.2-0ubuntu1~cloud0] +file = ceilometer-agent-central_1%%3a5.0.2-0ubuntu1~cloud0_all.deb +md5 = d3d6094ebf76c4e7312a80a818a8f435 +source = repo:trusty-updates-liberty/main/ + +[ceilometer-agent-compute_1:5.0.2-0ubuntu1~cloud0] +file = ceilometer-agent-compute_1%%3a5.0.2-0ubuntu1~cloud0_all.deb +md5 = 250d76c1775e2e6f5fdbe47362580ff7 +source = repo:trusty-updates-liberty/main/ + +[ceilometer-agent-notification_1:5.0.2-0ubuntu1~cloud0] +file = ceilometer-agent-notification_1%%3a5.0.2-0ubuntu1~cloud0_all.deb +md5 = 2014fe5efd1015f4af7dd02d6e94b15d +source = repo:trusty-updates-liberty/main/ + +[ceilometer-alarm-evaluator_1:5.0.2-0ubuntu1~cloud0] +file = ceilometer-alarm-evaluator_1%%3a5.0.2-0ubuntu1~cloud0_all.deb +md5 = 5c78c397ae644bb4bdd4780c7f175d40 +source = repo:trusty-updates-liberty/main/ + +[ceilometer-alarm-notifier_1:5.0.2-0ubuntu1~cloud0] +file = ceilometer-alarm-notifier_1%%3a5.0.2-0ubuntu1~cloud0_all.deb +md5 = d2fd6bf77ac4141a4c9dddb95d01c866 +source = repo:trusty-updates-liberty/main/ + +[ceilometer-api_1:5.0.2-0ubuntu1~cloud0] +file = ceilometer-api_1%%3a5.0.2-0ubuntu1~cloud0_all.deb +md5 = 557a4df0be7753696f4ea9c16357b0d1 +source = repo:trusty-updates-liberty/main/ + +[ceilometer-collector_1:5.0.2-0ubuntu1~cloud0] +file = ceilometer-collector_1%%3a5.0.2-0ubuntu1~cloud0_all.deb +md5 = e12b733cbfc9bea4c90aa31cb99456a9 +source = repo:trusty-updates-liberty/main/ + +[ceilometer-common_1:5.0.2-0ubuntu1~cloud0] +file = ceilometer-common_1%%3a5.0.2-0ubuntu1~cloud0_all.deb +md5 = 24baa6f5e4b49292a8f9a4b999ed6c72 +source = repo:trusty-updates-liberty/main/ + [cinder-api_2:7.0.0-0ubuntu1.15.10.1~cloud0] file = cinder-api_2%%3a7.0.0-0ubuntu1.15.10.1~cloud0_all.deb md5 = f76cd9a601ce363ebf1687646b743726 @@ -343,6 +383,21 @@ file = libgfortran3_4.8.4-2ubuntu1~14.04_amd64.deb md5 = f6f64296b26d38c70df45eebe341289e source = repo:trusty-updates/main +[libgoogle-perftools4_2.4-0ubuntu4~cloud0] +file = libgoogle-perftools4_2.4-0ubuntu4~cloud0_amd64.deb +md5 = c4ed29534b90e4a81ffd8dc8744a1d4e +source = repo:trusty-updates-liberty/main/ + +[libtcmalloc-minimal4_2.4-0ubuntu4~cloud0] +file = libtcmalloc-minimal4_2.4-0ubuntu4~cloud0_amd64.deb +md5 = 20ebfba23702b1011fe484d04bc174c8 +source = repo:trusty-updates-liberty/main/ + +[libunwind8_1.1-2.2ubuntu3] +file = libunwind8_1.1-2.2ubuntu3_amd64.deb +md5 = d568b4e19959271d3f8470ff28c223f1 +source = repo:trusty/main + [libgssglue1_0.4-2ubuntu1] file = libgssglue1_0.4-2ubuntu1_amd64.deb md5 = 08250dff6de699fceff270123f609b49 @@ -398,6 +453,11 @@ file = libodbc1_2.2.14p2-5ubuntu5_amd64.deb md5 = 433e8b9f8a79a80052db69ed4f02fe53 source = repo:trusty/main +[libpcrecpp0_1:8.31-2ubuntu2.1] +file = libpcrecpp0_1%%3a8.31-2ubuntu2.1_amd64.deb +md5 = c84471d56a86d876578ed2698b13bb8f +source = repo:trusty-updates-liberty/main/ + [libpgm-5.1-0_5.1.118-1~dfsg-0.1ubuntu3] file = libpgm-5.1-0_5.1.118-1~dfsg-0.1ubuntu3_amd64.deb md5 = dd0286ad741615a8e31d60efe224d110 @@ -423,6 +483,16 @@ file = libpython2.7_2.7.6-8ubuntu0.2_amd64.deb md5 = e52bac5d993bf5c8c60ef92b9e392603 source = repo:trusty-security/main +[libsmi2ldbl_0.4.8+dfsg2-8ubuntu2] +file = libsmi2ldbl_0.4.8+dfsg2-8ubuntu2_amd64.deb +md5 = 13e50b16c61aad665ee4db241a6cf908 +source = repo:trusty-updates-liberty/main/ + +[libsnappy1_1.1.0-1ubuntu1] +file = libsnappy1_1.1.0-1ubuntu1_amd64.deb +md5 = 6e75ed3aa224013957954c6671bead67 +source = repo:trusty-updates-liberty/main/ + [libssl0.9.8_0.9.8o-7ubuntu3.2.14.04.1] file = libssl0.9.8_0.9.8o-7ubuntu3.2.14.04.1_amd64.deb md5 = 67303b5e19bf90c0538564669685483e @@ -438,6 +508,11 @@ file = libtirpc1_0.2.2-5ubuntu2_amd64.deb md5 = acc1c8e0345c8c3e53ba94a59a4729d8 source = repo:trusty/main +[libv8-3.14.5_3.14.5.8-5ubuntu2] +file = libv8-3.14.5_3.14.5.8-5ubuntu2_amd64.deb +md5 = 3937ddaf045f8c5606b6c505bf0779f8 +source = repo:trusty-updates-liberty/main/ + [libxmlsec1-openssl_1.2.18-2ubuntu1] file = libxmlsec1-openssl_1.2.18-2ubuntu1_amd64.deb md5 = b389871df7c5c1bfab522ab1769a983c @@ -458,6 +533,16 @@ file = memcached_1.4.14-0ubuntu9_amd64.deb md5 = 29893483844957ac4c33097d0c0108a6 source = repo:trusty/main +[mongodb-clients_1:2.4.9-1ubuntu2] +file = mongodb-clients_1%%3a2.4.9-1ubuntu2_amd64.deb +md5 = dfabd631c87d7001cfefba7087a38458 +source = repo:trusty-updates-liberty/main/ + +[mongodb-server_1:2.4.9-1ubuntu2] +file = mongodb-server_1%%3a2.4.9-1ubuntu2_amd64.deb +md5 = ae7913b7d32766b9743d22a957f44c45 +source = repo:trusty-updates-liberty/main/ + [mysql-client-5.5_5.5.47-0ubuntu0.14.04.1] file = mysql-client-5.5_5.5.47-0ubuntu0.14.04.1_amd64.deb md5 = c9628bdd19abae613490651e6a00f6ad @@ -593,6 +678,16 @@ file = python-barbicanclient_3.3.0-2~cloud0_all.deb md5 = 6a64332f8133b3387f9a9d0b83fb061d source = repo:trusty-updates-liberty/main +[python-bson-ext_3.0.3-1~cloud0] +file = python-bson-ext_3.0.3-1~cloud0_amd64.deb +md5 = e6f647e79e718e30e4bef438a1dce7f9 +source = repo:trusty-updates-liberty/main/ + +[python-bson_3.0.3-1~cloud0] +file = python-bson_3.0.3-1~cloud0_amd64.deb +md5 = eda2a62d4f94619b8ffbac45fcf377a2 +source = repo:trusty-updates-liberty/main/ + [python-cachetools_1.0.3-1~cloud0] file = python-cachetools_1.0.3-1~cloud0_all.deb md5 = 7fd8b5a42a3a997887a4c9faa172af57 @@ -603,6 +698,11 @@ file = python-castellan_0.2.1-0ubuntu1~cloud0_all.deb md5 = 2fde90c917e01f16977f1436ce334c60 source = repo:trusty-updates-liberty/main +[python-ceilometer_1:5.0.2-0ubuntu1~cloud0] +file = python-ceilometer_1%%3a5.0.2-0ubuntu1~cloud0_all.deb +md5 = 73812e2d52c3f4eec1a92bf1f08a480a +source = repo:trusty-updates-liberty/main/ + [python-ceilometerclient_1.5.0-1~cloud0] file = python-ceilometerclient_1.5.0-1~cloud0_all.deb md5 = 67590bfe834d4ab532d736fdb2603222 @@ -798,6 +898,11 @@ file = python-glanceclient_1%%3a1.1.0-0ubuntu1~cloud0_all.deb md5 = 9ed4c8dd2ed9419113d3b0a1da08ced9 source = repo:trusty-updates-liberty/main +[python-gridfs_3.0.3-1~cloud0] +file = python-gridfs_3.0.3-1~cloud0_all.deb +md5 = aa677188877b70e26f01107b59b8bb06 +source = repo:trusty-updates-liberty/main/ + [python-heat_1:5.0.0-0ubuntu1~cloud0] file = python-heat_1%%3a5.0.0-0ubuntu1~cloud0_all.deb md5 = 86226d02a1705e894858205b61c03178 @@ -853,11 +958,26 @@ file = python-jsonpatch_1.3-4_all.deb md5 = d1521e9621c4c751d164a6d979705a12 source = repo:trusty/main +[python-jsonpath-rw-ext_0.1.7-1~cloud0] +file = python-jsonpath-rw-ext_0.1.7-1~cloud0_all.deb +md5 = dc5dbae84391b6b3ac6fec600d235971 +source = repo:trusty-updates-liberty/main/ + +[python-jsonpath-rw_1.2.0-1build1] +file = python-jsonpath-rw_1.2.0-1build1_all.deb +md5 = 7e40b1562d3f18032e6236b1ada10cb6 +source = repo:trusty-updates-liberty/main/ + [python-jsonschema_2.4.0-1~cloud0] file = python-jsonschema_2.4.0-1~cloud0_all.deb md5 = 113b1fcc5dc6562a65c4c7a6eed1f221 source = repo:trusty-updates-liberty/main +[python-kazoo_2.2.1-1ubuntu1~cloud0] +file = python-kazoo_2.2.1-1ubuntu1~cloud0_all.deb +md5 = 7d06d4b92fd53797d9b6adf443bdbb6a +source = repo:trusty-updates-liberty/main/ + [python-keyring_3.5-1] file = python-keyring_3.5-1_all.deb md5 = 33e304163689ded4658db93ffe62be55 @@ -1174,6 +1294,26 @@ file = python-pycparser_2.10+dfsg-1ubuntu2_all.deb md5 = 1766f7c2db0611cf118f2f1c1dfeff2d source = repo:trusty/universe +[python-pyinotify_0.9.4-1build1] +file = python-pyinotify_0.9.4-1build1_all.deb +md5 = e8769aea55a94fe0562f7c5fc160f883 +source = repo:trusty-updates-liberty/main/ + +[python-pymemcache_1.3.2-1ubuntu1~cloud0] +file = python-pymemcache_1.3.2-1ubuntu1~cloud0_all.deb +md5 = 9cdecd311aeca5f5a9de800df9fd9119 +source = repo:trusty-updates-liberty/main/ + +[python-pymongo-ext_3.0.3-1~cloud0] +file = python-pymongo-ext_3.0.3-1~cloud0_amd64.deb +md5 = c141ea7760d153b826a69249ff06b69f +source = repo:trusty-updates-liberty/main/ + +[python-pymongo_3.0.3-1~cloud0] +file = python-pymongo_3.0.3-1~cloud0_amd64.deb +md5 = df7ed1b94310692d44d020fdee617717 +source = repo:trusty-updates-liberty/main/ + [python-pymysql_0.6.2-2~cloud0] file = python-pymysql_0.6.2-2~cloud0_all.deb md5 = 21b56bb533deabc1eb2c73065f37d2c2 @@ -1194,6 +1334,21 @@ file = python-pysaml2_2.4.0-0ubuntu2~cloud0_all.deb md5 = 7e53c6dba090d0f73b4fe47a82a68c1e source = repo:trusty-updates-liberty/main +[python-pysnmp4-apps_0.3.2-1] +file = python-pysnmp4-apps_0.3.2-1_all.deb +md5 = f2fc5a8741cc9a4c8bdae969929bfc5a +source = repo:trusty-updates-liberty/main/ + +[python-pysnmp4-mibs_0.1.3-1] +file = python-pysnmp4-mibs_0.1.3-1_all.deb +md5 = a09eef881df5cc7bcaa07273dce27695 +source = repo:trusty-updates-liberty/main/ + +[python-pysnmp4_4.2.5-1] +file = python-pysnmp4_4.2.5-1_all.deb +md5 = 395c65aa72adea6bdbb71294f4cde922 +source = repo:trusty-updates-liberty/main/ + [python-pysqlite2_2.6.3-3] file = python-pysqlite2_2.6.3-3_amd64.deb md5 = 5e0688b6bfc28aa090be45c538e037a5 @@ -1324,6 +1479,11 @@ file = python-testtools_1.4.0-0ubuntu2~cloud0_all.deb md5 = 3ae8777731033edef21395c807236fcc source = repo:trusty-updates-liberty/main +[python-tooz_1.21.0-1ubuntu1~cloud0] +file = python-tooz_1.21.0-1ubuntu1~cloud0_all.deb +md5 = eedabd838bc9d52a68c32e281b7f6a28 +source = repo:trusty-updates-liberty/main/ + [python-traceback2_1.4.0-3~cloud0] file = python-traceback2_1.4.0-3~cloud0_all.deb md5 = 1e0324342f4b6a091ca92162d9c492b5 @@ -1339,6 +1499,51 @@ file = python-tz_2014.10~dfsg1-0ubuntu2~cloud0_all.deb md5 = 6034dbb020acb120aad38b478fb22808 source = repo:trusty-updates-liberty/main +[python-twisted-conch_1:13.2.0-1ubuntu1] +file = python-twisted-conch_1%%3a13.2.0-1ubuntu1_all.deb +md5 = b56ec1fca44c035778c468c934dad468 +source = repo:trusty-updates-liberty/main/ + +[python-twisted-lore_13.2.0-1ubuntu1] +file = python-twisted-lore_13.2.0-1ubuntu1_all.deb +md5 = fe1fb2faf26113f56cfe3f08c1409d24 +source = repo:trusty-updates-liberty/main/ + +[python-twisted-mail_13.2.0-1ubuntu1] +file = python-twisted-mail_13.2.0-1ubuntu1_all.deb +md5 = 418831134dcef7e7cc5eb89a8e6072c3 +source = repo:trusty-updates-liberty/main/ + +[python-twisted-names_13.2.0-1ubuntu1] +file = python-twisted-names_13.2.0-1ubuntu1_all.deb +md5 = e90b94dc1d359145a935fc5185e6a927 +source = repo:trusty-updates-liberty/main/ + +[python-twisted-news_13.2.0-1ubuntu1] +file = python-twisted-news_13.2.0-1ubuntu1_all.deb +md5 = f902221c471866d3b669fdfc7003e8e3 +source = repo:trusty-updates-liberty/main/ + +[python-twisted-runner_13.2.0-1ubuntu1] +file = python-twisted-runner_13.2.0-1ubuntu1_amd64.deb +md5 = 17b308323ceae618c2c45a98ab202fb5 +source = repo:trusty-updates-liberty/main/ + +[python-twisted-web_13.2.0-1ubuntu1] +file = python-twisted-web_13.2.0-1ubuntu1_all.deb +md5 = 5143e752b56f1e0d31a4d544506af263 +source = repo:trusty-updates-liberty/main/ + +[python-twisted-words_13.2.0-1ubuntu1] +file = python-twisted-words_13.2.0-1ubuntu1_all.deb +md5 = 63af9f9ccdbcce16975d9704a89d9746 +source = repo:trusty-updates-liberty/main/ + +[python-twisted_13.2.0-1ubuntu1] +file = python-twisted_13.2.0-1ubuntu1_all.deb +md5 = 95d58118ed009eb63f45615787cb8375 +source = repo:trusty-updates-liberty/main/ + [python-unicodecsv_0.13.0-2~cloud0] file = python-unicodecsv_0.13.0-2~cloud0_all.deb md5 = bcc01d0bbdb454cbc56500e301ccdf23 @@ -1364,6 +1569,11 @@ file = python-webob_1.4.1-1~cloud0_all.deb md5 = d4cbd14e72516ef8ead0e41d2dd7376b source = repo:trusty-updates-liberty/main +[python-werkzeug_0.9.4+dfsg-1.1ubuntu2] +file = python-werkzeug_0.9.4+dfsg-1.1ubuntu2_all.deb +md5 = 0b840568dce7365757d1146c8570466c +source = repo:trusty-updates-liberty/main/ + [python-wrapt_1.8.0-5build1~cloud0] file = python-wrapt_1.8.0-5build1~cloud0_amd64.deb md5 = f46cde2d53b8e42b1ec2cb2aee6f44aa @@ -1379,6 +1589,11 @@ file = python-zaqarclient_0.2.0-1~cloud0_all.deb md5 = ecc0210d3b33c213e21ae336de16ca18 source = repo:trusty-updates-liberty/main +[python-zake_0.1.6-1~cloud0] +file = python-zake_0.1.6-1~cloud0_all.deb +md5 = c4cd5d66fb9dd2e39d42d8cc3f9110cc +source = repo:trusty-updates-liberty/main/ + [python2.7-minimal_2.7.6-8ubuntu0.2] file = python2.7-minimal_2.7.6-8ubuntu0.2_amd64.deb md5 = cb8b7f9637e05f64482f6657ef4df02f @@ -1399,6 +1614,11 @@ file = ssl-cert_1.0.33_all.deb md5 = bb2d2f616d7b4da9b76caa98002657eb source = repo:trusty/main +[smitools_0.4.8+dfsg2-8ubuntu2] +file = smitools_0.4.8+dfsg2-8ubuntu2_amd64.deb +md5 = 275282c46c804b85014f83eb482711a2 +source = repo:trusty-updates-liberty/main/ + [uwsgi-core_1.9.17.1-5build5] file = uwsgi-core_1.9.17.1-5build5_amd64.deb md5 = dc03207b7b8a0d25bed1658b4b0df940 diff --git a/build/package_configs/ubuntu1404/liberty/depends_contrail_thirdparty_packages.cfg b/build/package_configs/ubuntu1404/liberty/depends_contrail_thirdparty_packages.cfg index 0e5f9eb32..0ed861097 100644 --- a/build/package_configs/ubuntu1404/liberty/depends_contrail_thirdparty_packages.cfg +++ b/build/package_configs/ubuntu1404/liberty/depends_contrail_thirdparty_packages.cfg @@ -100,10 +100,6 @@ source = repo:contrail-thirdparty [python-kafka_1.0.1-0contrail0] file = python-kafka_1.0.1-0contrail0_amd64.deb md5 = e8e1d6233260caa5d4478c639b04afcd - -[python-kazoo_1.3.1-1contrail2] -file = python-kazoo_1.3.1-1contrail2_all.deb -md5 = 1160ffdc6faa72bfb6f027f5e7b18bb1 source = repo:contrail-thirdparty [python-lxml_3.3.1-1contrail1] diff --git a/build/package_configs/ubuntu1404/liberty/depends_server_manager_packages.cfg b/build/package_configs/ubuntu1404/liberty/depends_server_manager_packages.cfg deleted file mode 100644 index 86d211a31..000000000 --- a/build/package_configs/ubuntu1404/liberty/depends_server_manager_packages.cfg +++ /dev/null @@ -1,81 +0,0 @@ -# **************************************************************** -# CAUTION: ANY CHANGES TO DEFAULT APPLIES TO ALL SECTIONS -# IF NOT OVERWRITTEN LOCALLY -# **************************************************************** -# Usage: -# [package name] -# file = # name of the package -# location = # location where the package file is available -# md5 = # md5 check sum of the package file -# -# ***************************************************************** - -[DEFAULT] -md5 = -file = -location = -package_type = contrail-server-manager-installer - -[server-mgr-python-gevent_1.0-1ubuntu1] -file = python-gevent_1.0-1ubuntu1_amd64.deb -md5 = 7a0e277b556505bd5d663986ba8df167 - -[server-mgr-python-geventhttpclient] -file = python-geventhttpclient_1.1.0-1contrail1_amd64.deb -md5 = 1a00d30b23e355a014e90b75243f3227 - -[server-mgr-python-thrift_0.9.0-1build1] -file = python-thrift_0.9.0-1build1_amd64.deb -md5 = 8c575c6f55b81fb07c8b03c14c2be2fb - -[server-mgr-python-urllib3] -file = python-urllib3_1.7.1-1ubuntu4_all.deb -md5 = 333c6809153491d85dfce3723c5ae2e7 - -[server-mgr-python-certifi] -file = python-certifi_1.0.1-1contrail1_all.deb -md5 = 46ab19b4096c653c10854f5c5e735f1c - -[server-mgr-python-backports.ssl-match-hostname] -file = python-backports.ssl-match-hostname_3.4.0.2-1contrail1_all.deb -md5 = 243c920a5c91d12801c525f3dcd2a6d1 - -[server-mgr-python-bottle_0.12.0-1] -file = python-bottle_0.12.0-1_all.deb -md5 = 1a4e42bfa1b06f6ec20c39f5b493f3d6 - -[server-mgr-python-pycassa] -file = python-pycassa_1.11.0-1contrail2_all.deb -md5 = 251c53af490a46086da56c9286b403e2 - -[server-mgr-python-requests] -file = python-requests_2.3.0-1~cloud0_all.deb -md5 = 3087f6d1f64a607ef0c843c24ddec390 - -[server-mgr-python-six] -file = python-six_1.9.0-1~cloud0_all.deb -md5 = 582061ba13a122242fc4507cddabd2f6 - -[server-mgr-python-greenlet_0.4.2-1build1] -file = python-greenlet_0.4.2-1build1_amd64.deb -md5 = 6bf204746bad67ae81d81229dfebe3b3 - -[server-mgr-nodejs] -file = nodejs_0.10.35-1contrail1_amd64.deb -md5 = fbbf1969783bc15291039263bc88bb39 - -[server-mgr-supervisor] -file = supervisor_3.0r1-1_all.deb -md5 = 368bfa94087bdc5eca01eae1ecc87335 - -[server-mgr-python-kazoo] -file = python-kazoo_1.3.1-1contrail2_all.deb -md5 = 1160ffdc6faa72bfb6f027f5e7b18bb1 - -[server-mgr-python-consistent-hash] -file = python-consistent-hash_1.0-0contrail1_amd64.deb -md5 = 6ba90f706ec78584adb3a15657f290e3 - -[server-mgr-python-xmltodict] -file = python-xmltodict_0.9.0-1contrail1_all.deb -md5 = 49ad578daa539e8965bbcaaac9a8045e diff --git a/common/debian/Makefile b/common/debian/Makefile index d766301f3..ac5a6f71e 100644 --- a/common/debian/Makefile +++ b/common/debian/Makefile @@ -382,9 +382,6 @@ contrail-fabric-utils-clean: rm -rf ${BUILDDIR} rm -rf ${TGZ_FILE} -contrail-test-deb: - (mkdir -p $(SB_TOP)/build/tools/; cd ${SB_TOP}/third_party/; tar -cvzf $(SB_TOP)/build/tools/contrail-test-$(VERSION)~$(CONTRAIL_SKU).tgz contrail-test) - @echo "Wrote: $(SB_TOP)/build/tools/contrail-test-$(VERSION)~$(CONTRAIL_SKU).tgz" contrail-test-deb: (mkdir -p $(SB_TOP)/build/tools/; cd ${SB_TOP}/third_party/; tar -cvzf $(SB_TOP)/build/tools/contrail-test-$(VERSION)~$(CONTRAIL_SKU).tgz contrail-test) @echo "Wrote: $(SB_TOP)/build/tools/contrail-test-$(VERSION)~$(CONTRAIL_SKU).tgz" diff --git a/common/debian/contrail-openstack-config/debian/control.liberty.in b/common/debian/contrail-openstack-config/debian/control.liberty.in index 44b8f11c7..a11eab5ae 100644 --- a/common/debian/contrail-openstack-config/debian/control.liberty.in +++ b/common/debian/contrail-openstack-config/debian/control.liberty.in @@ -3,30 +3,32 @@ Maintainer: rrugge Section: misc Priority: optional Standards-Version: 1.0 -Build-Depends: +Build-Depends: Package: contrail-openstack-config Architecture: all -Depends: contrail-nodemgr (>= 3.0.0.0-5156), - contrail-lib (>= 3.0.0.0-5156), - contrail-config (>= 3.0.0.0-5156), - contrail-f5 (>= 3.0.0.0-5156), - neutron-plugin-contrail (>= 3.0.0.0-5156), - contrail-setup (>= 3.0.0.0-5156), - contrail-utils (>= 3.0.0.0-5156), - contrail-config-openstack (>= 3.0.0.0-5156), - supervisor, - neutron-server, - python-neutron-lbaas, - python-novaclient, - python-keystoneclient, - haproxy (>=1.5.4-1ppa1~precise), - euca2ools, - rabbitmq-server, - python-qpid, - python-iniparse, - python-bottle, - ifmap-server, - ifmap-python-client, - keepalived (>=1.2.13-1) | keepalived (>=1.2.13-0~276~ubuntu14.04.1) +Maintainer: rrugge +Depends: + supervisor, + contrail-nodemgr, + contrail-lib, + contrail-config, + contrail-f5, + neutron-plugin-contrail, + neutron-server, + python-neutron-lbaas, + python-novaclient, + python-keystoneclient, + contrail-setup, + contrail-utils, + haproxy (>=1.5.4-1ppa1~precise), + euca2ools, + rabbitmq-server, + python-qpid, + python-iniparse, + python-bottle, + ifmap-server, + ifmap-python-client, + contrail-config-openstack, + keepalived (>=1.2.13-1) | keepalived (>=1.2.13-0~276~ubuntu14.04.1) Description: Contrail Openstack Config composite debian package diff --git a/openstack/debian/openstack-python-neutronclient/liberty/debian/changelog.in b/openstack/debian/openstack-python-neutronclient/liberty/debian/changelog.in index aeabc6b39..06afde76b 100644 --- a/openstack/debian/openstack-python-neutronclient/liberty/debian/changelog.in +++ b/openstack/debian/openstack-python-neutronclient/liberty/debian/changelog.in @@ -1,255 +1,117 @@ -python-neutronclient (1:2.3.11-0ubuntu1~cloud0.3contrail) trusty-liberty; urgency=medium +python-neutronclient (1:3.1.0-0ubuntu1~cloud0.2contrail) trusty-liberty; urgency=medium - * cherry-pick lbaasv2 specific fixes from upstream neutronclient - * Closes-Bugs: 1430541, 1426246, 1426253 - * Partially-Implements: lbaas-ssl-termination - * commit-ids: aa0c39fe2d2b1cd6d83987644928fe5c8811789e - * 6e4841359d50c31bffea00b74269e94a05e2442a - * 4e98615d1612f011041be011f411e5115a269f8b + * Added 2contrail for contrail openstack python-neutronclient - -- -- Atul Moghe Wed, 20 Jan 2016 16:33:40 -0400 + -- Atul Moghe Thu, 28 Jan 2016 18:26:34 +0000 -python-neutronclient (1:2.3.11-0ubuntu1~cloud0.2contrail) trusty-liberty; urgency=medium - - * Added 2contrail for contrail pacakge - - -- -- Atul Moghe Tue, 12 May 2015 16:33:40 -0400 - -python-neutronclient (1:2.3.11-0ubuntu1~cloud0) trusty-liberty; urgency=medium +python-neutronclient (1:3.1.0-0ubuntu1~cloud0) trusty-liberty; urgency=medium * New upstream release for the Ubuntu Cloud Archive. - -- Openstack Ubuntu Testing Bot Thu, 19 Mar 2015 11:12:57 +0000 - -python-neutronclient (1:2.3.11-0ubuntu1) vivid; urgency=medium - - * New upstream release. - * debian/control: Update dependencies. - - -- Chuck Short Thu, 12 Mar 2015 11:22:08 -0400 + -- Openstack Ubuntu Testing Bot Fri, 25 Sep 2015 18:26:34 +0000 -python-neutronclient (1:2.3.9-0ubuntu1) vivid; urgency=medium +python-neutronclient (1:3.1.0-0ubuntu1) wily; urgency=medium * New upstream release. - * Open up for vivid. - * debian/control: - - Update bzr branches. - - Add python-requests-mock as a build dependency. + * d/control: Align dependencies with upstream. + * d/control: Bump minimum version of python-pbr to 1.8. - -- Chuck Short Wed, 12 Nov 2014 10:00:53 -0500 + -- Corey Bryant Thu, 24 Sep 2015 11:54:09 -0400 -python-neutronclient (1:2.3.8-0ubuntu1) utopic; urgency=medium +python-neutronclient (1:2.6.0-1) experimental; urgency=medium - * New upstream release. + * Team upload. + * New upstream release: + - d/control: Align dependencies and versions with upstream. + * Bump epoch inline with Ubuntu to support resync. + * Introduce DEP-8 tests from Ubuntu. - -- Chuck Short Thu, 18 Sep 2014 09:52:19 -0400 + -- James Page Tue, 23 Jun 2015 12:08:44 +0100 -python-neutronclient (1:2.3.7-0ubuntu1) utopic; urgency=medium +python-neutronclient (2.4.0-1) unstable; urgency=medium * New upstream release. - * debian/control: Add python-httpretty and python-oslosphinx. - * debian/control: Add python-requests-mock, python-testscenarios, - python-prettytable, python-oslotest - - -- Chuck Short Mon, 08 Sep 2014 08:51:07 -0400 - -python-neutronclient (1:2.3.5-0ubuntu1) utopic; urgency=medium - - [ Corey Bryant ] - * debian/control: Set minimum version for python-prettytable dependency - (LP: #1292661). - - [ Chuck Short ] - * debian/control: Open up juno release - * debian/control: - - Dropped python-d2to1, python-httplib2, python-prettytable, - python-nose, and python-pyparsing dependencies. - - Added python-requests, python-netaddr dependencies - - Added python-keystoneclient. - - Add python-mox3. - - Add python-hacking - - [ Liam Young ] - * debian/control: - - Merged in deps from requirements.txt - - Added httplib2 & python-mox back as src dep as 2.3.5 unit tests depend on it - * New upstream release. - - -- Chuck Short Thu, 24 Jul 2014 13:07:16 -0400 - -python-neutronclient (1:2.3.4-0ubuntu1) trusty; urgency=medium + * Uploading to unstable. + * Fixed (build-)depends for this release. - * New upstream point release: - - [02baef4] Fix get_auth_info() for pre-authenticated clients - (LP: #1280941). + -- Thomas Goirand Mon, 16 Mar 2015 18:16:10 +0100 - -- James Page Thu, 13 Mar 2014 11:02:06 +0000 +python-neutronclient (2.3.6-2) unstable; urgency=medium -python-neutronclient (1:2.3.3-0ubuntu1) trusty; urgency=medium - - * New upstream release. + * Increased version of (build-)depends for cliff and six. - -- Chuck Short Tue, 21 Jan 2014 11:34:34 -0500 + -- Thomas Goirand Tue, 23 Sep 2014 15:19:10 +0800 -python-neutronclient (1:2.3.1-0ubuntu1) trusty; urgency=low +python-neutronclient (2.3.6-1) unstable; urgency=medium * New upstream release. - * debian/control: open icehouse release. + * New (build-)depends for this release (python-mox3, python-oslotest) - -- Chuck Short Thu, 14 Nov 2013 14:00:50 -0500 + -- Mehdi Abaakouk Fri, 22 Aug 2014 15:43:56 +0200 -python-neutronclient (1:2.3.0-0ubuntu1) saucy; urgency=low +python-neutronclient (2.3.5-1) unstable; urgency=medium * New upstream release. - * debian/control: Add python-six as a build dependency. - * debian/control: Add python-babel as a build dependency. + * New (build-)depends for this release. - -- Chuck Short Fri, 06 Sep 2013 16:33:40 -0400 + -- Thomas Goirand Mon, 28 Jul 2014 18:52:08 +0800 -python-neutronclient (1:2.2.4-0ubuntu2) saucy; urgency=low +python-neutronclient (2.3.4-2) unstable; urgency=low - * d/tests: Update tests for quantum->neutron rename. + * This version of neutronclient needs python-httplib2 >= 0.7.5. Fixed the + (build-)depends accordingly. Also fixed more (build-)depends versions. + (Closes: #744129) + * Runs testr/subunit correctly. - -- James Page Thu, 18 Jul 2013 17:45:25 +0100 + -- Thomas Goirand Fri, 11 Apr 2014 13:24:11 +0800 -python-neutronclient (1:2.2.4-0ubuntu1) saucy; urgency=low +python-neutronclient (2.3.4-1) unstable; urgency=medium - [ Chuck Short ] - * Renamed to python-neutronclient. - + Updated debian/control to rename python-quantumclient to - python-neutronclient. - + Updated debian/copyright. - + debian/control: Add Breaks/Replaces python-quantumclient and - transitional package. - * debian/rules, debian/control: Run testsuite with testrepository. - * debian/control: Add python-pbr and python-d2to1. - * debian/docs: Renamed README to README.rst. - * debian/copyright: Cleaned up, fix lintian warnings. - * debian/control: Dropped quantum-client. - - [ Adam Gandelman ] - * debian/control: Bump python-cliff min. requirement to 1.3.2 as per - tools/pip-requires. - * debian/control: Set version minimum 1.5.6 on python-pyparsing depends. - - [ Yolanda Robla ] - * debian/tests: added autopkg tests - - [ James Page ] * New upstream release. - * d/control: Update VCS fields for new branch locations. - * d/install: Enable bash completion for neutron command. - * d/rules: Execute tests in parallel. - * d/control: Drop BD on pep8, no longer required. - - -- James Page Thu, 18 Jul 2013 17:20:32 +0100 - -python-quantumclient (1:2.2.0-0ubuntu1) raring; urgency=low - - [ Adam Gandelman ] - * debian/control: Set version minimum for python-cliff (>= 1.3.1). + * Removed fixed-get_auth_info-for-pre-authenticated-clients.patch applied + upstream. - [ James Page ] - * New upstream point release to support OpenStack Grizzly. - - -- James Page Fri, 15 Mar 2013 09:15:00 +0000 - -python-quantumclient (1:2.1.2-0ubuntu1) raring; urgency=low - - [ Adam Gandelman ] - * debian/control: Drop 'Provides: ${python:Provides}'. - - [ Chuck Short ] - * New upstream release. - * debian/control: Add python-testtools and python-fixtures as build - deps. - * debian/patches/override_cliff_version.patch: Dropped, no longer needed. - * debian/control: Add python-iso8601 build-depends. + -- Thomas Goirand Fri, 07 Mar 2014 15:57:07 +0800 - -- Chuck Short Thu, 07 Mar 2013 11:14:49 -0600 +python-neutronclient (2.3.3-3) unstable; urgency=medium -python-quantumclient (1:2.1-0ubuntu1) quantal; urgency=low - - [ Adam Gandelman ] - * debian/control: Add python-pyparsing. - * debain/patches/override_cliff_version.patch: Remove version constraint - on cliff >= 1.2.1 (Ubuntu 12.10 is shipping 1.1.2). - - [ Soren Hansen ] - * Update debian/watch to account for symbolically named tarballs and - use newer URL. - * Fix Launchpad URLs in debian/watch. - * Add cliff-tablib build-dependency to fix test suite failure. - - [ Chuck Short ] - * New upstream release - * debian/watch: Add pypi sources as well - - -- Chuck Short Tue, 18 Sep 2012 18:59:16 -0500 - -python-quantumclient (1:2.0-0ubuntu2) quantal; urgency=low - - * debian/control: Set Provides: ${python:Provides}. (LP: #1042468) - * debian/control: Update maintainer, add missing Depends. - - -- Adam Gandelman Mon, 27 Aug 2012 15:53:54 -0700 - -python-quantumclient (1:2.0-0ubuntu1) quantal; urgency=low - - * New upstream version. - * debian/control: Update build dependencies. - * debian/rules: Enable testsuite. - - -- Chuck Short Thu, 16 Aug 2012 12:45:43 -0500 - -python-quantumclient (1:0.1.0.1-0ubuntu1) quantal; urgency=low - - * New upstream release. - * debian/watch: Updateed - - -- Chuck Short Fri, 06 Jul 2012 12:50:42 -0400 - -python-quantumclient (2012.1-0ubuntu1) precise; urgency=low - - * New upstream release. - - -- Chuck Short Thu, 05 Apr 2012 11:12:30 -0400 - -python-quantumclient (2012.1~rc2-0ubuntu1) precise; urgency=low - - * New upstream release. + * Added fixed-get_auth_info-for-pre-authenticated-clients.patch. - -- Chuck Short Tue, 03 Apr 2012 20:47:00 -0400 + -- Thomas Goirand Wed, 19 Feb 2014 22:37:12 +0800 -python-quantumclient (2012.1~rc1-0ubuntu2) precise; urgency=low +python-neutronclient (2.3.3-2) unstable; urgency=medium - * debian/patches/fix-namespace.patch: Fix namespace conflict. + * Removes the man page thing which doesn't build in Wheezy. - -- Chuck Short Thu, 22 Mar 2012 11:15:53 -0400 + -- Thomas Goirand Tue, 28 Jan 2014 09:34:45 +0000 -python-quantumclient (2012.1~rc1-0ubuntu1) precise; urgency=low +python-neutronclient (2.3.3-1) unstable; urgency=medium * New upstream release. - * Dropped quantum-common stuff since it conflicts with quantum - proper. + * Added --slowest --testr-args='--subunit ' when calling testr. + * Standard-Version: is now 3.9.5. + * Adds the generation of the python-neutronclient man page. - -- Chuck Short Tue, 20 Mar 2012 13:39:58 -0400 + -- Thomas Goirand Tue, 28 Jan 2014 17:04:05 +0800 -python-quantumclient (2012.1~rc1~20120315.22-0ubuntu1) precise; urgency=low +python-neutronclient (2.3.0-1) unstable; urgency=low * New upstream release. - * debian/watch: Fix typos - -- Adam Gandelman Fri, 16 Mar 2012 12:00:02 -0700 + -- Thomas Goirand Thu, 12 Sep 2013 11:20:06 +0800 -python-quantumclient (2012.1~e3~20120125.r8-0ubuntu2) precise; urgency=low +python-neutronclient (2.2.4-2) unstable; urgency=low - * Fix lintian errors. + * Added missing python-pbr build-depends. + * Cleans python_neutronclient.egg-info (package can build twice). + * Fixed debian/copyright (added missing holders). - -- Chuck Short Wed, 01 Feb 2012 10:48:03 -0500 + -- Thomas Goirand Thu, 25 Jul 2013 17:46:57 +0800 -python-quantumclient (2012.1~e3~20120125.r8-0ubuntu1) precise; urgency=low +python-neutronclient (2.2.4-1) unstable; urgency=low * Initial release. + * Note that this is a rename of Quantum into Neutron because of a trademark + problem. - -- Chuck Short Wed, 01 Feb 2012 10:20:24 -0500 + -- Thomas Goirand Sat, 20 Jul 2013 20:21:03 +0800 diff --git a/openstack/debian/openstack-python-neutronclient/liberty/debian/compat b/openstack/debian/openstack-python-neutronclient/liberty/debian/compat index 45a4fb75d..ec635144f 100644 --- a/openstack/debian/openstack-python-neutronclient/liberty/debian/compat +++ b/openstack/debian/openstack-python-neutronclient/liberty/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/openstack/debian/openstack-python-neutronclient/liberty/debian/control b/openstack/debian/openstack-python-neutronclient/liberty/debian/control index a10411adb..b1015e874 100644 --- a/openstack/debian/openstack-python-neutronclient/liberty/debian/control +++ b/openstack/debian/openstack-python-neutronclient/liberty/debian/control @@ -1,78 +1,65 @@ Source: python-neutronclient Section: python -Priority: extra -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Chuck Short -Build-Depends: - cliff-tablib, - debhelper (>= 8.0.0), - python-all (>= 2.6.6-3~), - python-babel (>= 1.3), - python-cliff (>= 1.7.0), - python-fixtures, - python-hacking, - python-httpretty, - python-httplib2, - python-iso8601 (>= 0.1.9), - python-keystoneclient (>= 0.9.0), - python-mox3, - python-mock, - python-oslosphinx, - python-oslotest, - python-oslo.i18n (>= 1.3.0), - python-oslo.serialization (>= 1.2.0), - python-oslo.utils (>= 1.2.0), - python-keystoneclient (>= 1.1.0), - python-oslosphinx, - python-oslotest, - python-netaddr (>= 0.7.6), - python-pbr (>= 0.6), - python-prettytable, - python-pyparsing (>= 1.5.6), - python-requests (>= 1.1), - python-requests-mock, - python-sphinx, - python-tempest-lib, - python-simplejson (>= 2.0.9), - python-six (>= 1.9.0), - python-testtools, - python-testscenarios, - testrepository -Standards-Version: 3.9.4 -X-Python-Version: >= 2.6 -Homepage: http://launchpad.net/python-quantumclient -Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/python-neutronclient/liberty/files -Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/python-neutronclient/liberty +Priority: optional +Maintainer: PKG OpenStack +Uploaders: Thomas Goirand +Build-Depends: debhelper (>= 9), + dh-python, + openstack-pkg-tools, + python-all, + python-pbr (>= 1.8), + python-setuptools, + python-sphinx, +Build-Depends-Indep: cliff-tablib (>= 1.0), + python-babel (>= 1.3), + python-cliff (>= 1.14.0), + python-coverage (>= 3.6), + python-fixtures (>= 1.3.1), + python-hacking, + python-iso8601 (>= 0.1.9), + python-keystoneclient (>= 1:1.6.0), + python-mock (>= 1.2), + python-mox3 (>= 0.7.0), + python-oslo.i18n (>= 1.5.0), + python-oslo.serialization (>= 1.4.0), + python-oslo.utils (>= 2.0.0), + python-oslosphinx (>= 2.5.0), + python-oslotest (>= 1.10.0), + python-requests (>= 2.5.2), + python-requests-mock (>= 0.6.0), + python-simplejson (>= 2.2.0), + python-six (>= 1.9.0), + python-tempest-lib (>= 0.8.0), + python-testtools (>= 1.4.0), + subunit (>= 0.0.18), + testrepository (>= 0.0.18), +Standards-Version: 3.9.6 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-neutronclient.git;a=summary +Vcs-Git: git://anonscm.debian.org/openstack/python-neutronclient.git +Homepage: http://launchpad.net/python-neutronclient XS-Testsuite: autopkgtest Package: python-neutronclient Architecture: all -Breaks: python-quantumclient ( << 1:2.2.4-0ubuntu1~ ) -Replaces: python-quantumclient ( << 1:2.2.4-0ubuntu1~ ) -Depends: - python-cliff (>= 1.7.0), - python-iso8601 (>= 0.1.9), - python-keystoneclient (>= 1.1.0), - python-netaddr (>= 0.7.12), - python-requests (>= 1.1), - python-simplejson, - python-six (>= 1.9.0), - python-babel, - python-oslo.i18n, - python-oslo.serialization, - python-oslo.utils, - python-babel, - ${misc:Depends}, - ${python:Depends}, - ${shlibs:Depends} -Description: client - Neutron is a virtual network service for Openstack - Neutron is a virtual network service for Openstack, and a part of - Netstack. Just like OpenStack Nova provides an API to dynamically - request and configure virtual servers, Neutron provides an API to - dynamically request and configure virtual networks. These networks - connect "interfaces" from other OpenStack services (e.g., virtual NICs - from Nova VMs). The Neutron API supports extensions to provide - advanced network capabilities (e.g., QoS, ACLs, network monitoring, - etc.) +Replaces: python-quantumclient, quantum-client +Provides: python-quantumclient +Breaks: python-quantumclient +Depends: python-babel (>= 1.3), + python-cliff (>= 1.14.0), + python-iso8601 (>= 0.1.9), + python-keystoneclient (>= 1:1.6.0), + python-oslo.i18n (>= 1.5.0), + python-oslo.serialization (>= 1.4.0), + python-oslo.utils (>= 2.0.0), + python-requests (>= 2.5.2), + python-simplejson (>= 2.2.0), + python-six (>= 1.9.0), + ${misc:Depends}, + ${python:Depends}, +Description: client API library for Neutron + Neutron provides an API to dynamically request and configure virtual networks. + These networks connect "interfaces" from other OpenStack services (e.g., vNICs + from Nova VMs). The Neutron API supports extensions to provide advanced network + capabilities (e.g., QoS, ACLs, network monitoring, etc). . - This package provides the neutron client. + This package provides the client agent. diff --git a/openstack/debian/openstack-python-neutronclient/liberty/debian/copyright b/openstack/debian/openstack-python-neutronclient/liberty/debian/copyright index b58cbbacf..3ca1dbc5d 100644 --- a/openstack/debian/openstack-python-neutronclient/liberty/debian/copyright +++ b/openstack/debian/openstack-python-neutronclient/liberty/debian/copyright @@ -1,4 +1,4 @@ -Format: http://dep.debian.net/deps/dep5 +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: python-neutronclient Source: http://github.com/openstack/python-neutronclient @@ -7,6 +7,22 @@ Copyright: 2011 Citrix Systems 2011, Nicira Networks, Inc. 2010 OpenStack, LLC 2001-2010 Twisted Matrix Laboratories. + 2012-2013, OpenStack Foundation + 2011-2013, United States Government + 2011-2013, Administrator of the NASA + 2011-2013, Justin Santa Barbara + 2011-2013, Red Hat, Inc. + 2011-2013, Mirantis Inc. + 2011-2013, Hewlett-Packard Development Company, L.P. + 2011-2013, NEC Corporation + 2011-2013, Yahoo! Inc. +License: Apache-2.0 + +Files: debian/* +Copyright: 2012 Ghe Rivero + 2012-2013, Thomas Goirand +License: Apache-2.0 + License: Apache-2.0 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,22 +38,3 @@ License: Apache-2.0 . On Debian systems, the complete text of the Apache version 2.0 license can be found in "/usr/share/common-licenses/Apache-2.0". - -Files: debian/* -Copyright: 2012 Chuck Short -License: GPL-2+ - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see - . - On Debian systems, the complete text of the GNU General - Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". diff --git a/openstack/debian/openstack-python-neutronclient/liberty/debian/docs b/openstack/debian/openstack-python-neutronclient/liberty/debian/docs deleted file mode 100644 index a1320b1b4..000000000 --- a/openstack/debian/openstack-python-neutronclient/liberty/debian/docs +++ /dev/null @@ -1 +0,0 @@ -README.rst diff --git a/openstack/debian/openstack-python-neutronclient/liberty/debian/install b/openstack/debian/openstack-python-neutronclient/liberty/debian/install index 6cfe3eb25..1df8958c1 100644 --- a/openstack/debian/openstack-python-neutronclient/liberty/debian/install +++ b/openstack/debian/openstack-python-neutronclient/liberty/debian/install @@ -1,2 +1 @@ -tools/neutron.bash_completion etc/bash_completion.d/ -usr/lib/python* +tools/neutron.bash_completion /etc/bash_completion.d diff --git a/openstack/debian/openstack-python-neutronclient/liberty/debian/pydist-overrides b/openstack/debian/openstack-python-neutronclient/liberty/debian/pydist-overrides new file mode 100644 index 000000000..be3176b15 --- /dev/null +++ b/openstack/debian/openstack-python-neutronclient/liberty/debian/pydist-overrides @@ -0,0 +1,2 @@ +netaddr_ python-netaddr + diff --git a/openstack/debian/openstack-python-neutronclient/liberty/debian/watch b/openstack/debian/openstack-python-neutronclient/liberty/debian/watch index c421945ef..79b9d7b61 100644 --- a/openstack/debian/openstack-python-neutronclient/liberty/debian/watch +++ b/openstack/debian/openstack-python-neutronclient/liberty/debian/watch @@ -1,4 +1,5 @@ version=3 -opts="uversionmangle=s/%7E/~/" https://launchpad.net/python-neutronclient/+download https://launchpad.net/python-neutronclient/.*/.*/.*/python-neutronclient-(.*)\.tar\.gz -http://tarballs.openstack.org/python-neutronclient/ python-neutronclient-(\d.*).tar.gz -http://pypi.python.org/packages/source/p/python-neutronclient/python-neutronclient-(\d.*).tar.gz +# Since we use EPOC, and we want to move away 2012.x, we use +# uversionmangle... +opts="uversionmangle=s/^2012/0.0./" \ +https://github.com/openstack/python-neutronclient/tags .*/(\d[\d\.]+)\.tar\.gz