[SCM] root-system: CERN's ROOT Data Analysis Framework branch, master, updated. upstream/5.34.00_rc1-25-gbcd9604

Lifeng Sun lifongsun at gmail.com
Tue Jun 19 02:25:09 UTC 2012 

The following commit has been merged in the master branch:
commit 568653d85906293627f30c58b2eac82beee5dab5
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Tue Jun 19 08:59:22 2012 +0800

    Clean missed/obsoleted packages in build-dep.

diff --git a/debian/control b/debian/control
index 536c2ad..834a68f 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 (>= 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, 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-module-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, 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, 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-module-dev, libglobus-gsi-proxy-core-dev, libglobus-callout-dev, globus-proxy-utils,krb5-user|heimdal-clients, libmysqlclient-dev, libiodbc2-dev | unixodbc-dev,  libpq-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
diff --git a/debian/script/makebuilddepend.sh b/debian/script/makebuilddepend.sh
index 7aba978..cd683ae 100755
--- a/debian/script/makebuilddepend.sh
+++ b/debian/script/makebuilddepend.sh
@@ -301,12 +301,11 @@ for i in $* ; do
 	root-plugin-sql-oracle)   
 	    echo -n ", oracle-instantclient-devel"			;;
 	root-plugin-sql-mysql)	   
-	    echo -n ", libmysqlclient15-dev | libmysqlclient14-dev"
-	    echo -n "| libmysqlclient12-dev| libmysqlclient-dev"	;;
+	    echo -n ", libmysqlclient-dev"				;;
 	root-plugin-sql-odbc)	   	
 	    echo -n ", libiodbc2-dev | unixodbc-dev"			;;
 	root-plugin-sql-pgsql)	        
-	    echo -n ",  libpq-dev | postgresql-dev"			;;
+	    echo -n ",  libpq-dev"					;;
 	root-plugin-sql-maxdb)	   
 	    echo -n ", libsqlod75-dev [i386 ia64 amd64]"		;;
 	root-plugin-tree-treeviewer)					;;
diff --git a/debian/skel/control.in b/debian/skel/control.in
index e2b3367..8a286ea 100644
--- a/debian/skel/control.in
+++ b/debian/skel/control.in
@@ -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 at builddepends@
+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, libgraphviz-dev, libavahi-core-dev, libxft-dev at builddepends@
 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

-- 
root-system: CERN's ROOT Data Analysis Framework

More information about the debian-science-commits mailing list