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

Lifeng Sun lifongsun at gmail.com
Thu Jun 21 09:56:30 UTC 2012 

The following commit has been merged in the master branch:
commit 885f840b4130ea186fa08ceef63dc3adcd9a543c
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Tue Jun 19 23:23:16 2012 +0800

    Remove duplicated packages in build-dep and depends fields.

diff --git a/debian/control b/debian/control
index 778f822..f371e82 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, 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
+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-gsi-credential-dev, libglobus-common-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
@@ -1664,7 +1664,7 @@ Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Breaks: libroot-dev (<< 5.19.01-1)
 Replaces: libroot-dev
-Depends: ${shlibs:Depends}, ${misc:Depends} , ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Geometry painter plugin for ROOT
  The ROOT system provides a set of OO frameworks with all the
  functionality needed to handle and analyze large amounts of data
@@ -1996,7 +1996,7 @@ Description: Common files for ROOT
 Package: ttf-root-installer
 Architecture: all
 Section: contrib/fonts
-Depends: ${misc:Depends}, wget (>= 1.9.1-4), xfonts-utils, debconf (>= 1.2.0), ${misc:Depends}
+Depends: ${misc:Depends}, wget (>= 1.9.1-4), xfonts-utils, debconf (>= 1.2.0)
 Provides: root-ttf
 Conflicts: ttf-root
 Description: True type fonts for ROOT - installer package
diff --git a/debian/script/makebuilddepend.sh b/debian/script/makebuilddepend.sh
index cd683ae..361af1f 100755
--- a/debian/script/makebuilddepend.sh
+++ b/debian/script/makebuilddepend.sh
@@ -276,10 +276,8 @@ for i in $* ; do
 	root-plugin-net-alien)	   	echo -n ", libgapiui-dev" 	;;
 	root-plugin-net-globus)   	
 	    echo -n ", libglobus-gss-assist-dev"
-            echo -n ", libglobus-gssapi-gsi-dev"
             echo -n ", libglobus-gsi-credential-dev"
             echo -n ", libglobus-common-dev"
-            echo -n ", libglobus-gsi-callback-dev"
             echo -n ", libglobus-gsi-sysconfig-dev"
             echo -n ", libglobus-gssapi-gsi-dev"
             echo -n ", libglobus-gsi-callback-dev"
diff --git a/debian/skel/root-plugin-geom-geompainter.control b/debian/skel/root-plugin-geom-geompainter.control
index 3c4fbbc..b3a553b 100644
--- a/debian/skel/root-plugin-geom-geompainter.control
+++ b/debian/skel/root-plugin-geom-geompainter.control
@@ -4,7 +4,7 @@ Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Breaks: libroot-dev (<< 5.19.01-1)
 Replaces: libroot-dev
-Depends: ${shlibs:Depends}, ${misc:Depends} , ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Geometry painter plugin for ROOT
  The ROOT system provides a set of OO frameworks with all the
  functionality needed to handle and analyze large amounts of data
diff --git a/debian/skel/ttf-root-installer.control b/debian/skel/ttf-root-installer.control
index 0eabe28..f72d405 100644
--- a/debian/skel/ttf-root-installer.control
+++ b/debian/skel/ttf-root-installer.control
@@ -1,7 +1,7 @@
 Package: ttf-root-installer
 Architecture: all
 Section: contrib/fonts
-Depends: ${misc:Depends}, wget (>= 1.9.1-4), xfonts-utils, debconf (>= 1.2.0), ${misc:Depends}
+Depends: ${misc:Depends}, wget (>= 1.9.1-4), xfonts-utils, debconf (>= 1.2.0)
 Provides: root-ttf
 Conflicts: ttf-root
 Description: True type fonts for ROOT - installer package

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

More information about the debian-science-commits mailing list