Author: roger
Date: Tue Apr 12 20:36:12 2011
New Revision: 1091569
URL: http://svn.apache.org/viewvc?rev=1091569&view=rev
Log:
THRIFT-1141 Include C (glib) library in default Debian package,
fix libthrift.jar location, updated changelog file
Modified:
thrift/trunk/contrib/debian/changelog
thrift/trunk/contrib/debian/control
thrift/trunk/contrib/debian/rules
Modified: thrift/trunk/contrib/debian/changelog
URL:
http://svn.apache.org/viewvc/thrift/trunk/contrib/debian/changelog?rev=1091569&r1=1091568&r2=1091569&view=diff
==============================================================================
--- thrift/trunk/contrib/debian/changelog (original)
+++ thrift/trunk/contrib/debian/changelog Tue Apr 12 20:36:12 2011
@@ -1,3 +1,9 @@
+thrift (0.7.0-dev1) stable; urgency=low
+ * added glib
+ * fix location of libthrift.jar
+
+ -- Roger Meier <[email protected]> Tue, 12 Apr 2011 21:41:18 +0200
+
thrift (0.6.0-dev1) stable; urgency=low
* update version field
Modified: thrift/trunk/contrib/debian/control
URL:
http://svn.apache.org/viewvc/thrift/trunk/contrib/debian/control?rev=1091569&r1=1091568&r2=1091569&view=diff
==============================================================================
--- thrift/trunk/contrib/debian/control (original)
+++ thrift/trunk/contrib/debian/control Tue Apr 12 20:36:12 2011
@@ -132,7 +132,7 @@ Description: Thrift C++ library
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
Modified: thrift/trunk/contrib/debian/rules
URL:
http://svn.apache.org/viewvc/thrift/trunk/contrib/debian/rules?rev=1091569&r1=1091568&r2=1091569&view=diff
==============================================================================
--- thrift/trunk/contrib/debian/rules (original)
+++ thrift/trunk/contrib/debian/rules Tue Apr 12 20:36:12 2011
@@ -23,7 +23,7 @@ configure-stamp:
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 @@ build-arch-stamp: configure-stamp
# 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 @@ install-indep:
# 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 @@ install-arch:
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
