[SCM] Apache ZooKeeper branch, master, updated. debian/3.3.4+dfsg1-1-1-g4b07e84
James Page
james.page at canonical.com
Mon Dec 12 13:23:48 UTC 2011
The following commit has been merged in the master branch:
commit 4b07e84c788721a6aa22aa523b6185196bea14a6
Author: James Page <james.page at canonical.com>
Date: Mon Dec 12 13:23:37 2011 +0000
Added new libzookeeper-st{2,-dev} packages (Closes: #650938) and renamed libzookeeper{2,-dev} -> libzookeeper-mt{2,-dev}.
* Added new libzookeeper-st{2,-dev} packages (Closes: #650938) and
renamed libzookeeper{2,-dev} -> libzookeeper-mt{2,-dev}.
* Added transitional package libzookeeper2 -> libzookeeper-mt2.
* Convert libzookeeper-{st,mt}2 for MultiArch support.
* Really close RFH (Closes: #579791).
diff --git a/debian/ant.properties b/debian/ant.properties
index 7a98845..cf69e84 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -1,5 +1,5 @@
contrib.dir=debian
-version=3.3.3
+version=3.3.4
jar.name=zookeeper.jar
final.name=zookeeper
user.name=Debian
diff --git a/debian/changelog b/debian/changelog
index a068e0b..06dbec8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+zookeeper (3.3.4+dfsg1-2) UNRELEASED; urgency=low
+
+ * Added new libzookeeper-st{2,-dev} packages (Closes: #650938) and
+ renamed libzookeeper{2,-dev} -> libzookeeper-mt{2,-dev}.
+ * Added transitional package libzookeeper2 -> libzookeeper-mt2.
+ * Convert libzookeeper-{st,mt}2 for MultiArch support.
+ * Really close RFH (Closes: #579791).
+
+ -- James Page <james.page at ubuntu.com> Mon, 12 Dec 2011 12:53:48 +0000
+
zookeeper (3.3.4+dfsg1-1) unstable; urgency=low
[ James Page ]
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 915cc9c..017d916 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
ant-optional,
autoconf,
automake,
- debhelper (>= 8.9.7),
+ debhelper (>= 8.9.7~),
default-jdk (>= 1:1.6),
default-jdk-doc,
help2man,
@@ -41,7 +41,7 @@ Depends:
libnetty-java,
libxerces2-java,
${misc:Depends}
-Description: Core Java libraries for zookeeper
+Description: Core Java libraries for zookeeper
ZooKeeper is a centralized, reliable, service for maintaining configuration
information, naming, providing distributed synchronization, and group
services. All of these kinds of services are used in some form or another by
@@ -68,8 +68,8 @@ Description: High-performance coordination service for distributed applications
Package: zookeeperd
Architecture: all
-Depends: ${zookeeperd-deps}, zookeeper (= ${binary:Version}), ${misc:Depends}
-Description: Init control scripts for zookeeper
+Depends: zookeeper (= ${binary:Version}), ${misc:Depends}, ${zookeeperd-deps}
+Description: Init control scripts for zookeeper
ZooKeeper is a centralized, reliable, service for maintaining configuration
information, naming, providing distributed synchronization, and group
services. All of these kinds of services are used in some form or another by
@@ -88,34 +88,87 @@ Description: API Documentation for zookeeper
services. All of these kinds of services are used in some form or another by
distributed applications.
-Package: libzookeeper2
+Package: libzookeeper-mt2
+Architecture: any
+Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Multi threaded C bindings for zookeeper
+ ZooKeeper is a centralized, reliable, service for maintaining configuration
+ information, naming, providing distributed synchronization, and group
+ services. All of these kinds of services are used in some form or another by
+ distributed applications.
+ .
+ This package contains the multi-threaded libraries for the C bindings.
+
+Package: libzookeeper-st2
Architecture: any
Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: C bindings for zookeeper
+Description: Single threaded C bindings for zookeeper
+ ZooKeeper is a centralized, reliable, service for maintaining configuration
+ information, naming, providing distributed synchronization, and group
+ services. All of these kinds of services are used in some form or another by
+ distributed applications.
+ .
+ This package contains the single-threaded libraries for the C bindings.
+
+Package: libzookeeper2
+Architecture: any
+Priority: extra
+Section: oldlibs
+Depends: libzookeeper-mt2 (= ${binary:Version}), ${misc:Depends}
+Description: C bindings for zookeeper - transitional package
+ ZooKeeper is a centralized, reliable, service for maintaining configuration
+ information, naming, providing distributed synchronization, and group
+ services. All of these kinds of services are used in some form or another by
+ distributed applications.
+ .
+ Transitional package for renaming of libzookeeper2 -> libzookeeper-mt2.
+
+Package: libzookeeper-mt-dev
+Architecture: any
+Section: libdevel
+Replaces: libzookeeper-dev
+Provides: libzookeeper-dev
+Depends:
+ libzookeeper-mt2 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Conflicts: libzookeeper-dev
+Description: Development files for multi threaded zookeeper C bindings
ZooKeeper is a centralized, reliable, service for maintaining configuration
information, naming, providing distributed synchronization, and group
services. All of these kinds of services are used in some form or another by
distributed applications.
.
- This package contains the runtime files for the C bindings.
+ This package contains the development files for the multi threaded C bindings.
-Package: libzookeeper-dev
+Package: libzookeeper-st-dev
Architecture: any
Section: libdevel
-Depends: libzookeeper2 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Description: Development files for zookeeper C bindings
+Replaces: libzookeeper-dev
+Provides: libzookeeper-dev
+Depends:
+ libzookeeper-st2 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Conflicts: libzookeeper-dev
+Description: Development files for single threaded zookeeper C bindings
ZooKeeper is a centralized, reliable, service for maintaining configuration
information, naming, providing distributed synchronization, and group
services. All of these kinds of services are used in some form or another by
distributed applications.
.
- This package contains the development files for the C bindings.
+ This package contains the development files for the single threaded C bindings.
Package: zookeeper-bin
Architecture: any
Section: misc
-Depends: libzookeeper2 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: libzookeeper-mt2 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Description: Command line utilities for zookeeper
ZooKeeper is a centralized, reliable, service for maintaining configuration
information, naming, providing distributed synchronization, and group
@@ -131,7 +184,7 @@ Architecture: any
Section: python
XB-Python-Version: ${python:Versions}
Depends:
- libzookeeper2 (= ${binary:Version}),
+ libzookeeper-mt2 (= ${binary:Version}),
${misc:Depends},
${python:Depends},
${shlibs:Depends}
diff --git a/debian/libzookeeper-dev.install b/debian/libzookeeper-dev.install
deleted file mode 100644
index 26996e5..0000000
--- a/debian/libzookeeper-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/usr/include usr
-debian/tmp/usr/lib/libzookeeper_mt.a usr/lib
-debian/tmp/usr/lib/libzookeeper_mt.so usr/lib
diff --git a/debian/libzookeeper-mt-dev.install.in b/debian/libzookeeper-mt-dev.install.in
new file mode 100644
index 0000000..48310e3
--- /dev/null
+++ b/debian/libzookeeper-mt-dev.install.in
@@ -0,0 +1,3 @@
+/usr/include
+/usr/lib/*/*_mt.a /usr/lib/__ARCH__
+/usr/lib/*/*_mt.so /usr/lib/__ARCH__
diff --git a/debian/libzookeeper-mt2.install.in b/debian/libzookeeper-mt2.install.in
new file mode 100644
index 0000000..66b9b03
--- /dev/null
+++ b/debian/libzookeeper-mt2.install.in
@@ -0,0 +1 @@
+/usr/lib/*/*_mt.so.* /usr/lib/__ARCH__
diff --git a/debian/libzookeeper-mt2.shlibs b/debian/libzookeeper-mt2.shlibs
new file mode 100644
index 0000000..3e855d3
--- /dev/null
+++ b/debian/libzookeeper-mt2.shlibs
@@ -0,0 +1 @@
+libzookeeper_mt 2 libzookeeper-mt2
diff --git a/debian/libzookeeper-st-dev.install.in b/debian/libzookeeper-st-dev.install.in
new file mode 100644
index 0000000..f3fdc71
--- /dev/null
+++ b/debian/libzookeeper-st-dev.install.in
@@ -0,0 +1,3 @@
+/usr/include
+/usr/lib/*/*_st.a /usr/lib/__ARCH__
+/usr/lib/*/*_st.so /usr/lib/__ARCH__
diff --git a/debian/libzookeeper-st2.install.in b/debian/libzookeeper-st2.install.in
new file mode 100644
index 0000000..69a47a9
--- /dev/null
+++ b/debian/libzookeeper-st2.install.in
@@ -0,0 +1 @@
+/usr/lib/*/*_st.so.* /usr/lib/__ARCH__
diff --git a/debian/libzookeeper-st2.shlibs b/debian/libzookeeper-st2.shlibs
new file mode 100644
index 0000000..dede0bc
--- /dev/null
+++ b/debian/libzookeeper-st2.shlibs
@@ -0,0 +1 @@
+libzookeeper_st 2 libzookeeper-st2
diff --git a/debian/libzookeeper2.install b/debian/libzookeeper2.install
deleted file mode 100644
index bedfdeb..0000000
--- a/debian/libzookeeper2.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libzookeeper_mt.so.* usr/lib
diff --git a/debian/libzookeeper2.shlibs b/debian/libzookeeper2.shlibs
deleted file mode 100644
index 5b26ec2..0000000
--- a/debian/libzookeeper2.shlibs
+++ /dev/null
@@ -1 +0,0 @@
-libzookeeper_mt 2 libzookeeper2
diff --git a/debian/rules b/debian/rules
index 93c56a6..6698959 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,7 @@ export JAVA_HOME=/usr/lib/jvm/default-java
PYVERS := $(shell pyversions -vr)
DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p')
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
%:
dh $@ --with javahelper --with python2
@@ -18,7 +19,7 @@ override_dh_auto_build:
# Compile C library
cd src/c && autoreconf -i
- cd src/c && ./configure --prefix=/usr
+ cd src/c && ./configure --prefix=/usr --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
$(MAKE) -C src/c
# Compile contribs - bookkeeper
@@ -33,7 +34,7 @@ override_dh_auto_build:
done
# Compile zktreeutil and generate man page
- cd src/contrib/zktreeutil && autoreconf -if && ./configure && make
+ cd src/contrib/zktreeutil && autoreconf -if && ./configure --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) && make
LD_LIBRARY_PATH=src/c/.libs help2man -N --version-string=0.0 src/contrib/zktreeutil/src/zktreeutil >zktreeutil.man
override_dh_install:
@@ -43,6 +44,12 @@ override_dh_install:
python$$pv src/python/setup.py build --build-base=$(CURDIR)/build \
install --root=$(CURDIR)/debian/tmp --install-layout=deb ;\
done
+ # Generate install files for Multiarch capability
+ for install in libzookeeper-mt2 libzookeeper-st2 \
+ libzookeeper-st-dev libzookeeper-mt-dev; do \
+ sed -e 's/__ARCH__/$(DEB_HOST_MULTIARCH)/g' debian/$$install.install.in \
+ > debian/$$install.install; \
+ done
dh_install
#ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
@@ -68,6 +75,11 @@ override_dh_clean:
--exclude=src/reciped
jh_clean
rm -rf debian/*.upstart
+ # Clean generated install files
+ for install in libzookeeper-mt2 libzookeeper-st2 \
+ libzookeeper-st-dev libzookeeper-mt-dev; do \
+ [ ! -f debian/$$install.install ] || rm debian/$$install.install; \
+ done
# the original build.xml deletes too much
override_dh_auto_clean:
@@ -108,8 +120,11 @@ ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
override_dh_installdocs:
dh_installdocs --link-doc=libzookeeper-java \
-plibzookeeper-java -pzookeeper -pzookeeperd -plibzookeeper-java-doc
- dh_installdocs --link-doc=libzookeeper2 \
- -plibzookeeper2 -plibzookeeper-dev -pzookeeper-bin -ppython-zookeeper
+ dh_installdocs --link-doc=libzookeeper-mt2 \
+ -plibzookeeper-mt2 -plibzookeeper-mt-dev -pzookeeper-bin \
+ -ppython-zookeeper
+ dh_installdocs --link-doc=libzookeeper-st2 \
+ -plibzookeeper-st2 -plibzookeeper-st-dev
endif
# Install init script for Debian and upstart for Ubuntu
--
Apache ZooKeeper
More information about the pkg-java-commits
mailing list