[SCM] root-system: CERN's ROOT Data Analysis Framework branch, master, updated. upstream/5.34.00_rc1-3-g381e634
Lifeng Sun
lifongsun at gmail.com
Mon Jun 4 08:41:05 UTC 2012
The following commit has been merged in the master branch:
commit 381e634e232ca4bd22f60c962ed64270702e3d8e
Author: Lifeng Sun <lifongsun at gmail.com>
Date: Mon Jun 4 15:20:42 2012 +0800
Build with ruby-1.9.1.
diff --git a/debian/control b/debian/control
index ddd7847..cfb6631 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
Uploaders: Lifeng Sun <lifongsun at gmail.com>
DM-Upload-Allowed: yes
Homepage: http://root.cern.ch
-Build-Depends: debhelper (>= 5.0.37.2), lsb-release, autotools-dev, po-debconf, libssl-dev, comerr-dev, libxpm-dev, libltdl-dev, x11proto-xext-dev, libxext-dev, libfreetype6-dev, libpcre3-dev, zlib1g-dev | libz-dev, python-dev (>= 2.1), graphviz, ttf-freefont, libncurses5-dev | libcurses-dev, libgraphviz-dev, libavahi-core-dev, libxft-dev, python-support (>= 0.3), ruby (>= 1.8), ruby1.8-dev | ruby-dev (>= 1.8), libglu1-mesa-dev| xlibmesa-glu-dev | libglu-dev, libglew1.5-dev | libglew-dev, libftgl-dev | ftgl-dev, libgl2ps-dev, libxml2-dev, libgsl0-dev, libavahi-compat-libdnssd-dev, libldap2-dev | libldap-dev, libxmlrpc-c3-dev | libxmlrpc-c-dev | libxmlrpc-core-c3-dev, libcurl4-gnutls-dev | libcurl4-openssl-dev | libcurl-dev, libjpeg-dev, libpng12-dev, libtiff4-dev, libgif-dev, libxinerama-dev, libfftw3-dev | fftw3-dev, libpythia8-dev, libglobus-gss-assist-dev, libglobus-gssapi-gsi-dev, libglobus-gsi-credential-dev, libglobus-common-dev, libglobus-gsi-callback-dev, libglobus-gsi-sysconfig-dev, libglobus-gssapi-gsi-dev, libglobus-gsi-callback-dev, libglobus-gsi-cert-utils-dev, libglobus-openssl-dev, libglobus-gsi-proxy-core-dev, libglobus-callout-dev, globus-proxy-utils,krb5-user|heimdal-clients, libmysqlclient15-dev | libmysqlclient14-dev| libmysqlclient12-dev| libmysqlclient-dev, libiodbc2-dev | unixodbc-dev, libpq-dev | postgresql-dev, gfortran|fortran-compiler, libqt4-dev (>= 4.3.0) | libqt3-mt-dev (>= 3.3.0), qt4-dev-tools (>= 4.3.0) | qt3-dev-tools (>= 3.3.0), libqt4-opengl-dev, libkrb5-dev|heimdal-dev
+Build-Depends: debhelper (>= 5.0.37.2), lsb-release, autotools-dev, po-debconf, libssl-dev, comerr-dev, libxpm-dev, libltdl-dev, x11proto-xext-dev, libxext-dev, libfreetype6-dev, libpcre3-dev, zlib1g-dev | libz-dev, python-dev (>= 2.1), graphviz, ttf-freefont, libncurses5-dev | libcurses-dev, libgraphviz-dev, libavahi-core-dev, libxft-dev, python-support (>= 0.3), ruby (>= 4.9), ruby1.9.1-dev | ruby-dev (>= 4.9), libglu1-mesa-dev| xlibmesa-glu-dev | libglu-dev, libglew1.5-dev | libglew-dev, libftgl-dev | ftgl-dev, libgl2ps-dev, libxml2-dev, libgsl0-dev, libavahi-compat-libdnssd-dev, libldap2-dev | libldap-dev, libxmlrpc-c3-dev | libxmlrpc-c-dev | libxmlrpc-core-c3-dev, libcurl4-gnutls-dev | libcurl4-openssl-dev | libcurl-dev, libjpeg-dev, libpng12-dev, libtiff4-dev, libgif-dev, libxinerama-dev, libfftw3-dev | fftw3-dev, libpythia8-dev, libglobus-gss-assist-dev, libglobus-gssapi-gsi-dev, libglobus-gsi-credential-dev, libglobus-common-dev, libglobus-gsi-callback-dev, libglobus-gsi-sysconfig-dev, libglobus-gssapi-gsi-dev, libglobus-gsi-callback-dev, libglobus-gsi-cert-utils-dev, libglobus-openssl-dev, libglobus-gsi-proxy-core-dev, libglobus-callout-dev, globus-proxy-utils,krb5-user|heimdal-clients, libmysqlclient15-dev | libmysqlclient14-dev| libmysqlclient12-dev| libmysqlclient-dev, libiodbc2-dev | unixodbc-dev, libpq-dev | postgresql-dev, gfortran|fortran-compiler, libqt4-dev (>= 4.3.0) | libqt3-mt-dev (>= 3.3.0), qt4-dev-tools (>= 4.3.0) | qt3-dev-tools (>= 3.3.0), libqt4-opengl-dev, libkrb5-dev|heimdal-dev
Standards-Version: 3.9.3
Vcs-Git: git://git.debian.org/git/debian-science/packages/root-system.git
Vcs-Browser: http://git.debian.org/?p=debian-science/packages/root-system.git
@@ -90,7 +90,7 @@ Description: Ruby extension for ROOT - run-time library
Package: libroot-bindings-ruby-dev
Architecture: any
Section: libdevel
-Depends: libroot-bindings-ruby5.34 (= ${binary:Version}), libroot-core-dev, ruby1.8-dev | ruby-dev (>= 1.8), ${misc:Depends}
+Depends: libroot-bindings-ruby5.34 (= ${binary:Version}), libroot-core-dev, ruby1.9.1-dev | ruby-dev (>= 4.9), ${misc:Depends}
Breaks: libroot-ruby (<< 5.19.01-1)
Replaces: libroot-ruby
Description: Ruby extension for ROOT - development headers
diff --git a/debian/control.in b/debian/control.in
index f0b151c..e2b3367 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,7 +1,9 @@
Source: root-system
Section: science
Priority: optional
-Maintainer: Lifeng Sun <lifongsun at gmail.com>
+Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
+Uploaders: Lifeng Sun <lifongsun at gmail.com>
+DM-Upload-Allowed: yes
Homepage: http://root.cern.ch
Build-Depends: debhelper (>= 5.0.37.2), lsb-release, autotools-dev, po-debconf, libssl-dev, comerr-dev, libxpm-dev, libltdl-dev, x11proto-xext-dev, libxext-dev, libfreetype6-dev, libpcre3-dev, zlib1g-dev | libz-dev, python-dev (>= 2.1), graphviz, ttf-freefont, libncurses5-dev | libcurses-dev, libgraphviz-dev, libavahi-core-dev, libxft-dev at builddepends@
Standards-Version: 3.9.3
diff --git a/debian/patches/73-ruby-1.9.1.patch b/debian/patches/73-ruby-1.9.1.patch
new file mode 100644
index 0000000..466780d
--- /dev/null
+++ b/debian/patches/73-ruby-1.9.1.patch
@@ -0,0 +1,54 @@
+--- a/build/package/common/libroot-bindings-ruby.control
++++ b/build/package/common/libroot-bindings-ruby.control
+@@ -15,7 +15,7 @@
+ Package: libroot-bindings-ruby-dev
+ Architecture: any
+ Section: libdevel
+-Depends: libroot-bindings-ruby at libvers@ (= ${binary:Version}), libroot-core-dev, ruby1.8-dev | ruby-dev (>= 1.8), ${misc:Depends}
++Depends: libroot-bindings-ruby at libvers@ (= ${binary:Version}), libroot-core-dev, ruby1.9.1-dev | ruby-dev (>= 4.9), ${misc:Depends}
+ Breaks: libroot-ruby (<< 5.19.01-1)
+ Replaces: libroot-ruby
+ Description: Ruby extension for ROOT - development headers
+--- a/build/package/lib/makebuilddepend.sh
++++ b/build/package/lib/makebuilddepend.sh
+@@ -11,8 +11,8 @@
+ libroot-bindings-python)
+ echo "BuildRequires: python-devel >= 2.1" ;;
+ libroot-bindings-ruby)
+- echo "BuildRequires: ruby-devel >= 1.8"
+- echo "BuildRequires: ruby >= 1.8" ;;
++ echo "BuildRequires: ruby-devel >= 1.9.1"
++ echo "BuildRequires: ruby >= 1.9.1" ;;
+ libroot-core) ;;
+ libroot-geom) ;;
+ libroot-graf2d-gpad) ;;
+@@ -187,7 +187,7 @@
+ libroot-bindings-python)
+ echo -n ", python-support (>= 0.3)" ;;
+ libroot-bindings-ruby)
+- echo -n ", ruby (>= 1.8), ruby1.8-dev | ruby-dev (>= 1.8)" ;;
++ echo -n ", ruby (>= 4.9), ruby1.9.1-dev | ruby-dev (>= 4.9)" ;;
+ libroot-core) ;;
+ libroot-geom) ;;
+ libroot-graf2d-gpad) ;;
+--- a/bindings/ruby/Module.mk
++++ b/bindings/ruby/Module.mk
+@@ -87,5 +87,5 @@
+ distclean:: distclean-$(MODNAME)
+
+ ##### extra rules ######
+-$(RUBYROOTO): CXXFLAGS += $(RUBYINCDIR:%=-I%) -Iinclude/cint
+-$(RUBY64O): CFLAGS += $(RUBYINCDIR:%=-I%)
++$(RUBYROOTO): CXXFLAGS += $(RUBYINCDIR:%=-I%) -I$(RUBYARCHINC) -Iinclude/cint
++$(RUBY64O): CFLAGS += $(RUBYINCDIR:%=-I%) -I$(RUBYARCHINC)
+--- a/configure
++++ b/configure
+@@ -4233,7 +4233,7 @@
+ test "x$enable_shared" = "xno" ; then
+ check_library_options="libruby-static libruby1.8-static libruby1.9-static"
+ else
+- check_library_options="libruby libruby1.8 libruby18 libruby1.9 libruby19"
++ check_library_options="libruby-1.9.1"
+ fi
+ check_library "$check_library_options" \
+ "$enable_shared" "$rubylibdir" \
diff --git a/debian/patches/series b/debian/patches/series
index f343105..d5532ec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -66,3 +66,4 @@
70-ignore-macosx-headers.patch
71-remove-root-plugin-proof-xproof.patch
72-rpath-ldflag.patch
+73-ruby-1.9.1.patch
diff --git a/debian/rules b/debian/rules
index ab38366..ade3471 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,8 +22,9 @@ LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
EXTRA_CFLAGS := $(CFLAGS)
EXTRA_CXXFLAGS := $(CXXFLAGS)
EXTRA_LDFLAGS := -Wl,-rpath,$(PREFIX)/lib/root/ $(LDFLAGS)
+RUBYARCHINC := $(shell find /usr/include/ruby-1.9.1 -name config.h | xargs dirname | xargs dirname)
-export CPPFLAGS EXTRA_CFLAGS EXTRA_CXXFLAGS EXTRA_LDFLAGS
+export CPPFLAGS EXTRA_CFLAGS EXTRA_CXXFLAGS EXTRA_LDFLAGS RUBYARCHINC
ifeq ($(DEB_HOST_ARCH_CPU),powerpc)
PLATFORM = linux
@@ -105,6 +106,7 @@ CONFOPTIONS :=--enable-bonjour \
--with-globus=/usr \
--with-globus-incdir=/usr/include/globus \
--with-globus-libdir=/usr/lib \
+ --with-ruby-incdir=/usr/include/ruby-1.9.1 \
--with-pythia8-incdir=/usr/include/pythia8 \
$(UNUR) \
$(XRD) \
--
root-system: CERN's ROOT Data Analysis Framework
More information about the debian-science-commits
mailing list