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

[Lifeng Sun]

The following commit has been merged in the master branch:
commit 4f7fde3969e1c7f0da854a32117052134cfde263
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Wed Jun 27 09:44:32 2012 +0800

    disable builtin libAfterImage.

diff --git a/debian/changelog b/debian/changelog
index 87ce116..eb60c17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+root-system (5.34.00-2) UNRELEASED; urgency=low
+
+  * Disable builtin lzma and libAfterImage.
+  * TODO: error-handling in postinst script of ttf-root-installer.
+
+ -- Lifeng Sun <lifongsun at gmail.com>  Wed, 27 Jun 2012 09:45:01 +0800
+
 root-system (5.34.00-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/control b/debian/control
index de08848..4c79181 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, liblzma-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
+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, liblzma-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, libafterimage-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
diff --git a/debian/script/makebuilddepend.sh b/debian/script/makebuilddepend.sh
index 361af1f..78bff4b 100755
--- a/debian/script/makebuilddepend.sh
+++ b/debian/script/makebuilddepend.sh
@@ -249,7 +249,7 @@ for i in $* ; do
 # Input the build dependencies of the libafterimage-dev package
 	root-plugin-graf2d-asimage)  
 	    echo -n ", libjpeg-dev, libpng12-dev, libtiff4-dev"
-            echo -n ", libgif-dev, libxinerama-dev";;
+	    echo -n ", libafterimage-dev, libgif-dev, libxinerama-dev"  ;;
 	root-plugin-graf2d-qt)	      need_qt=1		  	        ;;
 	root-plugin-graf2d-gviz)					;;
 	root-plugin-graf3d-x3d)        					;;
diff --git a/debian/skel/root-plugin-asimage.control b/debian/skel/root-plugin-asimage.control
deleted file mode 100644
index 85f09a6..0000000
--- a/debian/skel/root-plugin-asimage.control
+++ /dev/null
@@ -1,14 +0,0 @@
-Package: root-plugin-asimage
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: AfterImage plug-in for ROOT
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
- efficiently. 
- .
- This package contains the AfterImage plug-in for ROOT, which allows
- you to store output graphics in many formats, including JPEG, PNG,
- SVG, etc.
-

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