THRIFT-1141 Include C (glib) library in default Debian package,
fix libthrift.jar location, updated changelog file
git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1091569 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/contrib/debian/changelog b/contrib/debian/changelog
index 7d8fc81..61bdf27 100644
--- a/contrib/debian/changelog
+++ b/contrib/debian/changelog
@@ -1,3 +1,9 @@
+thrift (0.7.0-dev1) stable; urgency=low
+ * added glib
+ * fix location of libthrift.jar
+
+ -- Roger Meier <roger@apache.org> Tue, 12 Apr 2011 21:41:18 +0200
+
thrift (0.6.0-dev1) stable; urgency=low
* update version field
diff --git a/contrib/debian/control b/contrib/debian/control
index 2632c08..01afe33 100644
--- a/contrib/debian/control
+++ b/contrib/debian/control
@@ -132,7 +132,7 @@
Package: libthrift-dev
Architecture: any
Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libthrift0
+Depends: ${shlibs:Depends}, ${misc:Depends}, libthrift0, libglib2.0-dev
Description: Thrift C++ library (development headers)
Thrift is a software framework for scalable cross-language services
development. It combines a software stack with a code generation engine to
diff --git a/contrib/debian/rules b/contrib/debian/rules
index 17c8e9a..1eef26e 100755
--- a/contrib/debian/rules
+++ b/contrib/debian/rules
@@ -23,7 +23,7 @@
dh_testdir
# Add here commands to configure the package.
if [ -f bootstrap.sh ]; then $(CURDIR)/bootstrap.sh; fi
- $(CURDIR)/configure --prefix=/usr
+ $(CURDIR)/configure --prefix=/usr --with-c_glib
touch configure-stamp
@@ -42,6 +42,9 @@
# Compile C++ library
$(MAKE) -C $(CURDIR)/lib/cpp
+ # Compile C (glib) library
+ $(MAKE) -C $(CURDIR)/lib/c_glib
+
# Python library
cd $(CURDIR)/lib/py && \
for py in $(PYVERS); do \
@@ -105,7 +108,7 @@
# Java
mkdir -p $(CURDIR)/debian/libthrift-java/usr/share/java/ && \
- cp $(CURDIR)/lib/java/libthrift.jar \
+ cp $(CURDIR)/lib/java/build/libthrift*.jar \
$(CURDIR)/debian/libthrift-java/usr/share/java/
# Erlang
@@ -163,10 +166,12 @@
cd $(CURDIR)/lib/php && \
$(MAKE) DESTDIR=$(CURDIR)/debian/php5-thrift install
- #cpp
+ # C++ and C (glib)
mkdir -p $(CURDIR)/debian/tmp; \
cd $(CURDIR)/lib/cpp && \
make DESTDIR=$(CURDIR)/debian/tmp install
+ cd $(CURDIR)/lib/c_glib && \
+ make DESTDIR=$(CURDIR)/debian/tmp install
dh_install --sourcedir=debian/tmp -s