diff -Nru openstack-pkg-tools-12/debian/changelog openstack-pkg-tools-8ubuntu1/debian/changelog --- openstack-pkg-tools-12/debian/changelog 2014-06-04 15:50:53.000000000 +0000 +++ openstack-pkg-tools-8ubuntu1/debian/changelog 2014-07-17 16:39:57.000000000 +0000 @@ -1,29 +1,8 @@ -openstack-pkg-tools (12) unstable; urgency=medium +openstack-pkg-tools (8ubuntu1) precise; urgency=low - * Now setting-up database with ALTER DATABASE to use UTF8 instead of the dbc - thing which didn't work. + * No-change backport to precise - -- Thomas Goirand Tue, 03 Jun 2014 14:48:40 +0800 - -openstack-pkg-tools (11) unstable; urgency=medium - - * Really fix dbc_{pg,my}sql_createdb_encoding="UTF8". - - -- Thomas Goirand Tue, 03 Jun 2014 01:30:50 +0800 - -openstack-pkg-tools (10) unstable; urgency=medium - - * Now using dbc_{pg,my}sql_createdb_encoding="UTF8" when creating dbs. - * Standards-Version: is now 3.9.5. - - -- Thomas Goirand Wed, 02 Apr 2014 22:10:33 +0800 - -openstack-pkg-tools (9) unstable; urgency=medium - - * Fixed keystone endpoint registration for the new keystone command line - syntax. - - -- Thomas Goirand Fri, 14 Feb 2014 17:20:34 +0000 + -- Lars Butler (larsbutler) Thu, 17 Jul 2014 16:39:24 +0000 openstack-pkg-tools (8) unstable; urgency=low @@ -78,7 +57,7 @@ [ James Page ] * Fixup handling of d/*.upstart.in to fix build failures - downstream in Ubuntu. + downstream in Ubuntu. -- Thomas Goirand Sat, 02 Feb 2013 11:30:43 +0000 diff -Nru openstack-pkg-tools-12/debian/control openstack-pkg-tools-8ubuntu1/debian/control --- openstack-pkg-tools-12/debian/control 2014-06-04 15:50:53.000000000 +0000 +++ openstack-pkg-tools-8ubuntu1/debian/control 2013-09-25 07:59:34.000000000 +0000 @@ -7,7 +7,7 @@ Ghe Rivero , Mehdi Abaakouk Build-Depends: debhelper (>= 9) -Standards-Version: 3.9.5 +Standards-Version: 3.9.4 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/openstack-pkg-tools.git;a=summary Vcs-Git: git://anonscm.debian.org/openstack/openstack-pkg-tools.git diff -Nru openstack-pkg-tools-12/pkgos_func openstack-pkg-tools-8ubuntu1/pkgos_func --- openstack-pkg-tools-12/pkgos_func 2014-06-04 15:50:53.000000000 +0000 +++ openstack-pkg-tools-8ubuntu1/pkgos_func 2013-09-25 07:59:34.000000000 +0000 @@ -321,36 +321,11 @@ fi dbc_authmethod_user="password" fi - dbc_mysql_createdb_encoding="UTF8" - dbc_pgsql_createdb_encoding="UTF8" echo "PKG-Openstack now calling: dbc_go "${DPKG_MAINTSCRIPT_PACKAGE} $@ dbc_go "${DPKG_MAINTSCRIPT_PACKAGE}" $@ fi } -# Perform a MySQL query in a safe way (eg: no password or queries in the command line) -pkgos_mysql_query () { - local MYSQL_Q_TMP MYSQL_P_TMP MYSQL_DBUSER MYSQL_DBPASS MYSQL_DBHOST MYSQL_DBPORT MYSQL_DBNAME MYSQL_QUERY MY_PORT - MYSQL_DBUSER=${1} - MYSQL_DBPASS=${2} - MYSQL_DBHOST=${3} - MYSQL_DBPORT=${4} - MYSQL_DBNAME=${5} - MYSQL_QUERY=${6} - - MYSQL_P_TMP=`mktemp -t OpenStack-mysql-statement.XXXXXXXXXX` - MYSQL_Q_TMP=`mktemp -t OpenStack-mysql-statement.XXXXXXXXXX` - echo "[client] -password=${MYSQL_DBPASS}" >${MYSQL_P_TMP} - echo ${MYSQL_QUERY} >${MYSQL_Q_TMP} - if [ -n "${MYSQL_DBPORT}" ] ; then - MY_PORT="--port=${MYSQL_DBPORT}" - fi - mysql --defaults-file=${MYSQL_P_TMP} -h${MYSQL_DBHOST} ${MY_PORT} -u${MYSQL_DBUSER} -D${MYSQL_DBNAME} < ${MYSQL_Q_TMP} - rm -f ${MYSQL_Q_TMP} ${MYSQL_P_TMP} -} - - # Read values configured by dbconfig-common, # and set a connection directive accordingly # in a configuration file @@ -392,8 +367,6 @@ if [ "$RET" = "true" ] && [ -r /usr/share/dbconfig-common/dpkg/postinst ] ; then . /usr/share/dbconfig-common/dpkg/postinst dbc_dbfile_owner="${SUITE}:${SUITE}" - dbc_mysql_createdb_encoding="UTF8" - dbc_pgsql_createdb_encoding="UTF8" dbc_go "${DPKG_MAINTSCRIPT_PACKAGE}" $@ if [ "$dbc_install" = "true" ] ; then case "$dbc_dbtype" in @@ -402,9 +375,6 @@ dbport=:$dbc_dbport fi SQL_CONNECTION="mysql://$dbc_dbuser:$dbc_dbpass@${dbc_dbserver:-localhost}$dbport/$dbc_dbname" - # Set the DB as UTF8 - Q="ALTER DATABASE ${dbc_dbname} CHARACTER SET utf8 COLLATE utf8_unicode_ci" - pkgos_mysql_query ${dbc_dbuser} ${dbc_dbpass} ${dbc_dbserver:-localhost} "${dbport}" ${dbc_dbname} "${Q}" ;; postgresql*|pgsql) if [ -n "$dbc_dbport" ] ; then @@ -626,9 +596,9 @@ if [ -n "${KEYSTONE_ENDPOINT_IP}" ] && [ -n "${PKG_ENDPOINT_IP}" ] && [ -n "${REGION_NAME}" ] && [ -n "${AUTH_TOKEN}" ] ; then echo "Registering service and endpoints for ${SERVICE_NAME} at http://${PKG_ENDPOINT_IP}:${SERVICE_PORT}${SERVICE_URL}" - PKG_SERVICE_ID=$(pkgos_get_id keystone --os-token ${AUTH_TOKEN} --os-endpoint http://${KEYSTONE_ENDPOINT_IP}:35357/v2.0/ service-create \ + PKG_SERVICE_ID=$(pkgos_get_id keystone --token ${AUTH_TOKEN} --endpoint http://${KEYSTONE_ENDPOINT_IP}:35357/v2.0/ service-create \ --name=${SERVICE_NAME} --type=${SERVICE_TYPE} --description="${SERVICE_DESC}") - PKG_ENDPOINT_ID=$(pkgos_get_id keystone --os-token ${AUTH_TOKEN} --os-endpoint http://${KEYSTONE_ENDPOINT_IP}:35357/v2.0/ endpoint-create \ + PKG_ENDPOINT_ID=$(pkgos_get_id keystone --token ${AUTH_TOKEN} --endpoint http://${KEYSTONE_ENDPOINT_IP}:35357/v2.0/ endpoint-create \ --region "${REGION_NAME}" --service_id=${PKG_SERVICE_ID} \ --publicurl=http://${PKG_ENDPOINT_IP}:${SERVICE_PORT}${SERVICE_URL} \ --internalurl=http://${PKG_ENDPOINT_IP}:${SERVICE_PORT}${SERVICE_URL} \ diff -Nru openstack-pkg-tools-12/pkgos.make openstack-pkg-tools-8ubuntu1/pkgos.make --- openstack-pkg-tools-12/pkgos.make 2014-06-04 15:50:53.000000000 +0000 +++ openstack-pkg-tools-8ubuntu1/pkgos.make 2013-09-25 07:59:34.000000000 +0000 @@ -30,7 +30,7 @@ git log --format='%aN <%aE>' | awk '{arr[$$0]++} END{for (i in arr){print arr[i], i;}}' | sort -rn | cut -d' ' -f2- gen-upstream-changelog: - git checkout master || git checkout upstream/master + git checkout master git reset --hard $(GIT_TAG) git log >$(CURDIR)/../CHANGELOG git checkout debian/$(DEBFLAVOR) @@ -53,7 +53,7 @@ git fetch upstream gen-orig-xz: - git tag -v $(GIT_TAG) || true + git show $(GIT_TAG) | cat if [ ! -f ../$(DEBPKGNAME)_$(VERSION).orig.tar.xz ] ; then \ git archive --prefix=$(DEBPKGNAME)-$(VERSION)/ $(GIT_TAG) | xz >../$(DEBPKGNAME)_$(VERSION).orig.tar.xz ; \ fi