[SCM] root-system: CERN's ROOT Data Analysis Framework branch, master, updated. upstream/5.34.00_rc1-13-g5157e06
Lifeng Sun
lifongsun at gmail.com
Thu Jun 14 13:01:22 UTC 2012
The following commit has been merged in the master branch:
commit 160cd50832910cc11e87b55480d33ea2142dcb2f
Author: Lifeng Sun <lifongsun at gmail.com>
Date: Thu Jun 14 13:13:55 2012 +0800
Support multiarch.
diff --git a/debian/changelog b/debian/changelog
index 2e6bea3..16548d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ root-system (5.34.00~rc1-2) UNRELEASED; urgency=low
* root-system-rootd: ship /var/spool/rootd/* as empty directories.
(Closes: #677053)
* Support kFreeBSD.
+ * Support Multiarch.
- -- Lifeng Sun <lifongsun at gmail.com> Tue, 12 Jun 2012 23:22:43 +0800
+ -- Lifeng Sun <lifongsun at gmail.com> Thu, 14 Jun 2012 20:53:57 +0800
root-system (5.34.00~rc1-1) unstable; urgency=low
diff --git a/debian/root-system-bin.overrides b/debian/root-system-bin.overrides
deleted file mode 100644
index cd44699..0000000
--- a/debian/root-system-bin.overrides
+++ /dev/null
@@ -1 +0,0 @@
-package-contains-empty-directory usr/lib/root/
diff --git a/debian/root-system-proofd.overrides b/debian/root-system-proofd.overrides
deleted file mode 100644
index cd44699..0000000
--- a/debian/root-system-proofd.overrides
+++ /dev/null
@@ -1 +0,0 @@
-package-contains-empty-directory usr/lib/root/
diff --git a/debian/root-system-rootd.overrides b/debian/root-system-rootd.overrides
deleted file mode 100644
index cd44699..0000000
--- a/debian/root-system-rootd.overrides
+++ /dev/null
@@ -1 +0,0 @@
-package-contains-empty-directory usr/lib/root/
diff --git a/debian/rules b/debian/rules
index 5b5f22f..32557f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,8 @@ export DH_VERBOSE=1
PREFIX = /usr
SYSCONFDIR = /etc
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -21,10 +23,10 @@ LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
EXTRA_CFLAGS := $(CFLAGS)
EXTRA_CXXFLAGS := $(CXXFLAGS)
-EXTRA_LDFLAGS := -Wl,-rpath,$(PREFIX)/lib/root/ $(LDFLAGS)
+EXTRA_LDFLAGS := $(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 RUBYARCHINC
+export CPPFLAGS EXTRA_CFLAGS EXTRA_CXXFLAGS EXTRA_LDFLAGS RUBYARCHINC DEB_HOST_MULTIARCH
ifeq ($(DEB_HOST_ARCH_CPU),powerpc)
PLATFORM = linux
@@ -52,7 +54,7 @@ XRD = --disable-xrootd
DTMP = debian/tmp
PKGDOCDIR = $(PREFIX)/share/doc/root
-CINTDIR = $(PREFIX)/lib/root/$(SOVERS)
+CINTDIR = $(PREFIX)/lib/$(DEB_HOST_MULTIARCH)/root$(SOVERS)
ICONTHEME = $(PREFIX)/share/icons/hicolor/48x48
CONFOPTIONS :=--enable-bonjour \
--enable-cintex \
@@ -284,6 +286,7 @@ debian/%:debian/skel/%.in debian/rules
-e 's, at pkgdocdir@,$(PKGDOCDIR),g' \
-e 's, at rubyarchdir@,$(RUBYARCHDIR),g' \
-e 's, at pythondir@,$(PYTHONDIR),g' \
+ -e 's, at multiarch@,$(DEB_HOST_MULTIARCH),g' \
-e 's, at libvers@,$(SOVERS),g' < $< > $@
debian/control:debian/skel/control.in debian/rules
@@ -389,7 +392,7 @@ config.status: configure
--cintincdir=$(CINTDIR) \
--etcdir=$(SYSCONFDIR)/root \
--with-sys-iconpath=$(PREFIX)/share/pixmaps \
- --libdir=$(PREFIX)/lib/root/$(SOVERS) \
+ --libdir=$(CINTDIR) \
$(CONFOPTIONS)
touch math/unuran/src/headers.d
touch configure-stamp
@@ -575,7 +578,7 @@ install-arch: build-arch
dh_prep -s -X$(DTMP)
# Need to clean this, because we don't want to use the
# symblic links made later on.
- rm -rf $(DTMP)$(PREFIX)/lib/root
+ rm -rf $(DTMP)$(CINTDIR)
dh_installdirs -s
# Add here commands to install the arch part of the package into
@@ -597,14 +600,14 @@ install-arch: build-arch
#cp build/package/debian/application-x-root.png \
# $(DTMP)$(ICONTHEME)/mimetypes/application-x-root.png
- #library path patch
+ #library path patch
#mkdir -p $(DTMP)/etc/ld.so.conf.d
#cp debian/root.conf $(DTMP)/etc/ld.so.conf.d
- # Make root-config output '/usr/lib/root' instead of
- # '/usr/lib/root/<version>'
- sed 's,$(PREFIX)/lib/root/$(SOVERS),$(PREFIX)/lib/root,' \
- < $(DTMP)$(PREFIX)/bin/root-config > root-config.tmp
+ # Make root-config output '/usr/lib/$(DEB_HOST_MULTIARCH)' instead of
+ # '/usr/lib/$(DEB_HOST_MULTIARCH)/root<version>'
+ sed 's,$(CINTDIR),$(PREFIX)/lib/$(DEB_HOST_MULTIARCH),' \
+ < $(DTMP)$(PREFIX)/bin/root-config > root-config.tmp
mv root-config.tmp $(DTMP)$(PREFIX)/bin/root-config
# Make default ZIP mode be new library (system library),
@@ -613,9 +616,9 @@ install-arch: build-arch
# and set start-up url of TBrowser embedded HTML renderer to
# be local install of documentation
sed -e 's,Root\.ZipMode:.*,Root.ZipMode: 1,' \
- -e 's,\(.*\.DynamicPath:.*\):$(PREFIX)/lib/root[^:]*\(.*\),\1\2,' \
+ -e 's,\(.*\.DynamicPath:.*\):$(PREFIX)/lib/$(DEB_HOST_MULTIARCH)/root[^:]*\(.*\),\1\2,' \
-e 's,\(Browser.StartUrl: *\).*,\1http://localhost/doc/root/html/index.html,'\
- < $(DTMP)$(SYSCONFDIR)/root/system.rootrc > rootrc.tmp
+ < $(DTMP)$(SYSCONFDIR)/root/system.rootrc > rootrc.tmp
mv rootrc.tmp $(DTMP)$(SYSCONFDIR)/root/system.rootrc
# Rename proofserv in /usr/bin to end in `.bin' and make wrapper
@@ -688,12 +691,12 @@ install-arch: build-arch
-perm 755 -and -not -type d | xargs chmod a-x
-chmod a+x $(DTMP)$(CINTDIR)/cint/lib/pthread/setup
-chmod a+x $(DTMP)$(CINTDIR)/cint/lib/WildCard/setup
- -chmod a-x $(DTMP)$(PREFIX)/lib/root/$(SOVERS)/*.py
+ -chmod a-x $(DTMP)$(CINTDIR)/*.py
-chmod a-x $(DTMP)$(SYSCONFDIR)/root/html/*
- # -chmod a+x $(DTMP)$(PREFIX)/lib/root/$(SOVERS)/GDMLROOT.py
+ # -chmod a+x $(DTMP)$(CINTDIR)/GDMLROOT.py
# Remove she-bang line from a python scripts
- -for i in $(DTMP)$(PREFIX)/lib/root/$(SOVERS)/*.py ; do \
+ -for i in $(DTMP)$(CINTDIR)/*.py ; do \
sed -e 's,#!/usr/bin/env python[0-9.]*,#,' \
-e 's,#!/usr/bin/python[0-9.]*,#,' \
< $$i > $$i.tmp ; \
@@ -701,7 +704,7 @@ install-arch: build-arch
done
# Make file lists
- mkdir -p $(DTMP)$(PREFIX)/lib/root
+ mkdir -p $(DTMP)$(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
./debian/rules pkglists
# --sourcedir=$(DTMP) $(SPKGOPTS)
@@ -742,12 +745,12 @@ install-arch: build-arch
-X$(SYSCONFDIR)/root/system.rootrc \
-X$(SYSCONFDIR)/root/system.rootauthrc \
-X$(SYSCONFDIR)/root/system.rootdaemonrc \
- -X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a \
- -X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc \
- -X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo \
- -X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc \
- -X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo \
- -X$(PREFIX)/lib/root/$(SOVERS)/cint7 \
+ -X$(CINTDIR)/libAfterImage.a \
+ -X$(CINTDIR)/PyCintex.pyc \
+ -X$(CINTDIR)/PyCintex.pyo \
+ -X$(CINTDIR)/ROOT.pyc \
+ -X$(CINTDIR)/ROOT.pyo \
+ -X$(CINTDIR)/cint7 \
-X$(PREFIX)/include/root/Minuit2
# $(foreach i, \
# $(wildcard $(DTMP)/$(PREFIX)/lib/root/lib*.so.$(SOVERS)), \
@@ -761,19 +764,6 @@ install-arch: build-arch
cp $$i debian/$$b/usr/share/lintian/overrides/$$b ; \
done
- # Install Lintian overrides: call to ldconfig
- for i in $(filter libroot%$(SOVERS), $(SPKGLIST)) ; do \
- t=debian/$$i/usr/share/lintian/overrides/ ; \
- mkdir -p $$t ; \
- echo "$$i: postinst-has-useless-call-to-ldconfig" >> $$t/$$i; \
- echo "$$i: postrm-has-useless-call-to-ldconfig" >> $$t/$$i; \
- done
-
- # try to fix lintian's rpath error.
- for i in bin rootd proofd ; do \
- mkdir -p debian/root-system-$$i/usr/lib/root/ ; \
- done
-
mkdir -p debian/root-system-rootd/var/spool/rootd/tmp
mkdir -p debian/root-system-rootd/var/spool/rootd/pub
@@ -833,9 +823,9 @@ ifeq ($(HAVEPYTHON), libroot-bindings-python)
echo "$(PYVER)-" > debian/pyversions
endif
dh_pysupport -plibroot-bindings-python-dev
- # $(PREFIX)/lib/root/$(SOVERS) $(PREFIX)/lib/root
+ # $(CINTDIR) $(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
dh_pysupport -plibroot-core-dev \
- $(PREFIX)/lib/root/$(SOVERS)/python/genreflex
+ $(CINTDIR)/python/genreflex
ifeq ($(HAVEPYTHON), libroot-bindings-python)
# dh_pysupport will only write this field if the package is
# named something like 'python-*', so we make it ourselves.
@@ -843,11 +833,11 @@ ifeq ($(HAVEPYTHON), libroot-bindings-python)
endif
dh_makeshlibs -V \
$(patsubst %, -p%, $(filter libroot%$(SOVERS),$(SPKGLIST)))
- dh_makeshlibs -V -n \
+ dh_makeshlibs -V \
$(patsubst %, -p%, $(filter root-plugin%,$(SPKGLIST)))
dh_installdeb -s
dh_shlibdeps -s $(SPKGLIST:%=-L%) \
- -l$(shell echo $(SPKGLIST:%=$(CURDIR)/debian/%$(PREFIX)/lib/root/$(SOVERS)) | tr ' ' ':') -- --warnings=1
+ -l$(shell echo $(SPKGLIST:%=$(CURDIR)/debian/%$(CINTDIR)/) | tr ' ' ':') -- --warnings=1
dh_gencontrol -s
dh_md5sums -s
dh_builddeb -s
diff --git a/debian/script/makelist b/debian/script/makelist
index 3ab6b1c..4183280 100755
--- a/debian/script/makelist
+++ b/debian/script/makelist
@@ -2,7 +2,7 @@
#
#
# Normal variables derived from passed variables
-LPATH := $(PREFIX)/lib/root
+LPATH := $(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
IPATH := $(PREFIX)/include/root
BPATH := $(PREFIX)/bin
MPATH := $(PREFIX)/share/man/man1
@@ -10,7 +10,7 @@ SOEXT := so
MAJOR := $(shell echo $(VERSION) | tr '.' ' ' | cut -f1 -d' ')
MINOR := $(shell echo $(VERSION) | tr '.' ' ' | cut -f2 -d' ')
SOVER := $(MAJOR).$(MINOR)
-RLIBD := $(PREFIX)/lib/root
+RLIBD := $(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
# Put all library files into version-specific lists
ifneq ($(LIB),$(DEV))
@@ -47,35 +47,35 @@ ifneq ($(DEV),)
PKGHDRS := $(shell echo $(ALLHDRS) | sed -e 's,[^ ]*inc/,include/,g' -e 's,include/,usr/include/root/,g')
endif
-# If we have a Library, then we get the list of libraries
+# If we have a Library, then we get the list of libraries
ifneq ($(LIB),)
-# if the development package and the library package is not the same,
-# we need to append the soversion to the library directory
+# if the development package and the library package is not the same,
+# we need to append the soversion to the library directory
ifneq ($(LIB),$(DEV))
-PKGLIBS := $(ALLLIBS:$(RLIBD)/%=$(RLIBD)/$(SOVER)/%.$(SOVER)) \
- $(ALLLIBS:$(RLIBD)/%=$(RLIBD)/$(SOVER)/%.$(MAJOR)) \
- $(ALLLIBS:$(RLIBD)/%=$(RLIBD)/$(SOVER)/%) \
- $(ALLLIBS:$(RLIBD)/%=$(RLIBD)/%.$(SOVER)) \
- $(DICTLIBS:$(RLIBD)/%=$(RLIBD)/$(SOVER)/%.$(SOVER)) \
- $(DICTLIBS:$(RLIBD)/%=$(RLIBD)/$(SOVER)/%.$(MAJOR)) \
- $(DICTLIBS:$(RLIBD)/%=$(RLIBD)/$(SOVER)/%)
-DEVLIBS := $(ALLLIBS)
+PKGLIBS := $(ALLLIBS:$(RLIBD)/%=$(RLIBD)/root$(SOVER)/%.$(SOVER)) \
+ $(ALLLIBS:$(RLIBD)/%=$(RLIBD)/root$(SOVER)/%.$(MAJOR)) \
+ $(ALLLIBS:$(RLIBD)/%=$(RLIBD)/root$(SOVER)/%) \
+ $(ALLLIBS:$(RLIBD)/%=$(RLIBD)/%.$(SOVER)) \
+ $(DICTLIBS:$(RLIBD)/%=$(RLIBD)/root$(SOVER)/%.$(SOVER)) \
+ $(DICTLIBS:$(RLIBD)/%=$(RLIBD)/root$(SOVER)/%.$(MAJOR)) \
+ $(DICTLIBS:$(RLIBD)/%=$(RLIBD)/root$(SOVER)/%)
+DEVLIBS := $(ALLLIBS)
else # ! $(LIB) = $(DEV)
# If the development and library package is the same (plugins), then we need
-# only add the soversion to the library directory
-PKGLIBS := $(ALLLIBS:$(RLIBD)/%=$(RLIBD)/$(SOVER)/%.$(SOVER)) \
- $(ALLLIBS:$(RLIBD)/%=$(RLIBD)/$(SOVER)/%.$(MAJOR)) \
- $(ALLLIBS:$(RLIBD)/%=$(RLIBD)/$(SOVER)/%) \
+# only add the soversion to the library directory
+PKGLIBS := $(ALLLIBS:$(RLIBD)/%=$(RLIBD)/root$(SOVER)/%.$(SOVER)) \
+ $(ALLLIBS:$(RLIBD)/%=$(RLIBD)/root$(SOVER)/%.$(MAJOR)) \
+ $(ALLLIBS:$(RLIBD)/%=$(RLIBD)/root$(SOVER)/%) \
$(ALLLIBS:$(RLIBD)/%=$(RLIBD)/%.$(SOVER))
endif # $(LIB) = $(DEV)
endif # $(LIB)
-ifneq ($(NOMAP),1)
+ifneq ($(NOMAP),1)
#NOXRD := $(filter-out $(LIBPATH)/libXrd%, $(ALLLIBS))
-#PKGLIBS := $(PKGLIBS) $(NOXRD:$(RLIBD)/%.so=$(RLIBD)/$(SOVER)/%.rootmap)
-PKGLIBS := $(PKGLIBS) $(ALLMAPS:$(RLIBD)/%=$(RLIBD)/$(SOVER)/%)
+#PKGLIBS := $(PKGLIBS) $(NOXRD:$(RLIBD)/%.so=$(RLIBD)/root$(SOVER)/%.rootmap)
+PKGLIBS := $(PKGLIBS) $(ALLMAPS:$(RLIBD)/%=$(RLIBD)/root$(SOVER)/%)
endif
-# The rule to make library lists
+# The rule to make library lists
liblist:
ifneq ($(LIB),)
@for f in $(PKGLIBS) ; do echo $$f ; done >> $(OUT)/$(SLIB).install
@@ -83,13 +83,13 @@ ifneq ($(LIB), $(DEV))
@(cd $(BUILD)/$(RLIBD) && \
for i in $(ALLLIBS) ; do \
b=`basename $$i` ; \
- ln -fs $(SOVER)/$$b . ; \
- ln -fs $(SOVER)/$$b.$(SOVER) . ; done)
+ ln -fs root$(SOVER)/$$b . ; \
+ ln -fs root$(SOVER)/$$b.$(SOVER) . ; done)
else # $(LIB) = $(DEV)
@(cd $(BUILD)/$(RLIBD) && \
for i in $(ALLLIBS) ; do \
b=`basename $$i` ; \
- ln -fs $(SOVER)/$$b.$(SOVER) . ; done)
+ ln -fs root$(SOVER)/$$b.$(SOVER) . ; done)
endif # $(LIB) = $(DEV)
endif # $(LIB)
diff --git a/debian/script/makelists.sh b/debian/script/makelists.sh
index b0467b1..990c099 100755
--- a/debian/script/makelists.sh
+++ b/debian/script/makelists.sh
@@ -76,15 +76,15 @@ for d in $l ; do
build) continue ;;
core/winnt) continue ;;
core/newdelete) set_lib_names $base "" root-system-bin
- extra="ALLMAPS=${prefix}/lib/root/libCore.rootmap ";;
+ extra="ALLMAPS=${prefix}/lib/$DEB_HOST_MULTIARCH/libCore.rootmap ";;
core/rint) set_lib_names $base "" root-system-bin ;;
core/thread) set_lib_names $base "" root-system-bin ;;
core/*) set_lib_names $base "" root-system-bin
- extra="ALLMAPS=${prefix}/lib/root/libCore.rootmap "
- extra="$extra ALLLIBS=${prefix}/lib/root/libCore.so" ;;
+ extra="ALLMAPS=${prefix}/lib/$DEB_HOST_MULTIARCH/libCore.rootmap "
+ extra="$extra ALLLIBS=${prefix}/lib/$DEB_HOST_MULTIARCH/libCore.so" ;;
cint/cint) set_lib_names core "" root-system-bin
- extra="ALLLIBS=${prefix}/lib/root/libCint.so" ;;
- # extra="NOMAP=1 ALLLIBS=${prefix}/lib/root/libCint.so"
+ extra="ALLLIBS=${prefix}/lib/$DEB_HOST_MULTIARCH/libCint.so" ;;
+ # extra="NOMAP=1 ALLLIBS=${prefix}/lib/$DEB_HOST_MULTIARCH/libCint.so"
cint/cintex) case `uname -m` in
i*86 | x86_64)
set_lib_names core "" root-system-bin ;;
@@ -92,7 +92,7 @@ for d in $l ; do
continue ;;
esac ;;
cint/reflex) set_lib_names core "" libroot-core-dev
- extra="REFLEXLIB=${prefix}/lib/root/libReflex.so" ;;
+ extra="REFLEXLIB=${prefix}/lib/$DEB_HOST_MULTIARCH/libReflex.so" ;;
cint/cling) continue ;;
cint/*) set_lib_names core "" root-system-bin ;;
geom/geom) set_lib_names $base "" ;;
diff --git a/debian/skel/libroot-bindings-python-dev.install.in b/debian/skel/libroot-bindings-python-dev.install.in
index 425632c..404679f 100644
--- a/debian/skel/libroot-bindings-python-dev.install.in
+++ b/debian/skel/libroot-bindings-python-dev.install.in
@@ -1,3 +1,3 @@
- at prefix@/lib/root/@version@/ROOT.py
- at prefix@/lib/root/@version@/PyCintex.py
+ at prefix@/lib/*/root at version@/ROOT.py
+ at prefix@/lib/*/root at version@/PyCintex.py
diff --git a/debian/skel/libroot-bindings-python-dev.links.in b/debian/skel/libroot-bindings-python-dev.links.in
index e58dbf1..eecbeaf 100644
--- a/debian/skel/libroot-bindings-python-dev.links.in
+++ b/debian/skel/libroot-bindings-python-dev.links.in
@@ -1 +1 @@
- at prefix@/lib/root/@libvers@/ROOT.py /usr/share/python-support/root/ROOT.py
+ at prefix@/lib/@multiarch@/root at libvers@/ROOT.py /usr/share/python-support/root/ROOT.py
diff --git a/debian/skel/libroot-bindings-python.control b/debian/skel/libroot-bindings-python.control
index e1c9e46..59bca4a 100644
--- a/debian/skel/libroot-bindings-python.control
+++ b/debian/skel/libroot-bindings-python.control
@@ -1,6 +1,8 @@
Package: libroot-bindings-python at libvers@
Architecture: any
Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}
Replaces: root-plugin-python (<< 5.09.01-1)
Description: Python extension for ROOT - runtime libraries
diff --git a/debian/skel/libroot-bindings-ruby-dev.links.in b/debian/skel/libroot-bindings-ruby-dev.links.in
index 77430f3..6f9eaee 100644
--- a/debian/skel/libroot-bindings-ruby-dev.links.in
+++ b/debian/skel/libroot-bindings-ruby-dev.links.in
@@ -1 +1 @@
-usr/lib/root/libRuby.so @rubyarchdir@/libRuby.so
+ at prefix@/lib/@multiarch@/root at libvers@/libRuby.so @rubyarchdir@/libRuby.so
diff --git a/debian/skel/libroot-bindings-ruby.control b/debian/skel/libroot-bindings-ruby.control
index 4499ae6..5e6c692 100644
--- a/debian/skel/libroot-bindings-ruby.control
+++ b/debian/skel/libroot-bindings-ruby.control
@@ -1,6 +1,8 @@
Package: libroot-bindings-ruby at libvers@
Architecture: any
Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: root-plugin-ruby (<< 5.09.01-1)
Description: Ruby extension for ROOT - run-time library
diff --git a/debian/skel/libroot-core-dev.install.in b/debian/skel/libroot-core-dev.install.in
index c795f03..933eeb6 100644
--- a/debian/skel/libroot-core-dev.install.in
+++ b/debian/skel/libroot-core-dev.install.in
@@ -3,8 +3,8 @@
@prefix@/include/root/compiledata.h
@prefix@/include/root/rmain.cxx
@prefix@/include/root/RConfigure.h
- at prefix@/lib/root/@version@/python
-# @prefix@/lib/root/@version@/PyCintex.py*
+ at prefix@/lib/*/root at version@/python
+# @prefix@/lib/*/root at version@/PyCintex.py*
@prefix@/bin/genreflex
@prefix@/bin/genreflex-rootcint
@prefix@/bin/rootcint
diff --git a/debian/skel/libroot-core.control b/debian/skel/libroot-core.control
index c2f28cc..a0222d1 100644
--- a/debian/skel/libroot-core.control
+++ b/debian/skel/libroot-core.control
@@ -1,6 +1,8 @@
Package: libroot-core at libvers@
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: root-system-common, ${shlibs:Depends}, ${misc:Depends}
Recommends: root-system-bin, libroot-core-dev
Provides: libroot-core
diff --git a/debian/skel/libroot-core.install.in b/debian/skel/libroot-core.install.in
index 9b94d16..91fe616 100644
--- a/debian/skel/libroot-core.install.in
+++ b/debian/skel/libroot-core.install.in
@@ -1 +1 @@
- at prefix@/lib/root/@version@/cint
+ at prefix@/lib/*/root at version@/cint
diff --git a/debian/skel/libroot-geom.control b/debian/skel/libroot-geom.control
index ef35ce6..935527d 100644
--- a/debian/skel/libroot-geom.control
+++ b/debian/skel/libroot-geom.control
@@ -1,6 +1,8 @@
Package: libroot-geom at libvers@
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: libroot-graf3d-gl at libvers@ (>= ${binary:Version}), root-plugin-geom-gdml, root-plugin-geom-geombuilder, root-plugin-geom-geompainter
Description: Geometry library for ROOT - run-time library
diff --git a/debian/skel/libroot-graf2d-gpad.control b/debian/skel/libroot-graf2d-gpad.control
index d436db1..384e50f 100644
--- a/debian/skel/libroot-graf2d-gpad.control
+++ b/debian/skel/libroot-graf2d-gpad.control
@@ -1,6 +1,8 @@
Package: libroot-graf2d-gpad at libvers@
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Canvas and pad library for ROOT - run-time library
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/libroot-graf2d-graf.control b/debian/skel/libroot-graf2d-graf.control
index d8137f1..ce182ed 100644
--- a/debian/skel/libroot-graf2d-graf.control
+++ b/debian/skel/libroot-graf2d-graf.control
@@ -1,6 +1,8 @@
Package: libroot-graf2d-graf at libvers@
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Graph library for ROOT
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/libroot-graf2d-postscript.control b/debian/skel/libroot-graf2d-postscript.control
index 8fa3f3f..a28c72e 100644
--- a/debian/skel/libroot-graf2d-postscript.control
+++ b/debian/skel/libroot-graf2d-postscript.control
@@ -1,5 +1,7 @@
Package: libroot-graf2d-postscript at libvers@
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Postscript/PDF renderer library for ROOT
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/libroot-graf3d-eve.control b/debian/skel/libroot-graf3d-eve.control
index f533ae7..8040b24 100644
--- a/debian/skel/libroot-graf3d-eve.control
+++ b/debian/skel/libroot-graf3d-eve.control
@@ -1,6 +1,8 @@
Package: libroot-graf3d-eve at libvers@
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Breaks: root-plugin-gl (<= 5.19.01-1)
Replaces: root-plugin-gl (<= 5.19.01-1)
diff --git a/debian/skel/libroot-graf3d-g3d.control b/debian/skel/libroot-graf3d-g3d.control
index d38b16f..196c8b8 100644
--- a/debian/skel/libroot-graf3d-g3d.control
+++ b/debian/skel/libroot-graf3d-g3d.control
@@ -1,6 +1,8 @@
Package: libroot-graf3d-g3d at libvers@
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: libroot-graf3d-gl at libvers@ (>= ${binary:Version})
Suggests: libroot-geom at libvers@
diff --git a/debian/skel/libroot-graf3d-gl.control b/debian/skel/libroot-graf3d-gl.control
index ed8595a..d440d4d 100644
--- a/debian/skel/libroot-graf3d-gl.control
+++ b/debian/skel/libroot-graf3d-gl.control
@@ -1,6 +1,8 @@
Package: libroot-graf3d-gl at libvers@
Architecture: any
Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Breaks: root-plugin-graf3d-gl (<< 5.19.00-1)
Replaces: root-plugin-graf3d-gl (<< 5.19.00-1)
diff --git a/debian/skel/libroot-gui-ged.control b/debian/skel/libroot-gui-ged.control
index 507098b..c099734 100644
--- a/debian/skel/libroot-gui-ged.control
+++ b/debian/skel/libroot-gui-ged.control
@@ -1,5 +1,8 @@
Package: libroot-gui-ged at libvers@
+Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: GUI element for editing various ROOT objecs
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/libroot-gui.control b/debian/skel/libroot-gui.control
index bf82936..81cc38f 100644
--- a/debian/skel/libroot-gui.control
+++ b/debian/skel/libroot-gui.control
@@ -1,6 +1,8 @@
Package: libroot-gui at libvers@
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Breaks: libroot (<< 5.19.01-1)
Recommends: root-plugin-gui-guibuilder
diff --git a/debian/skel/libroot-hist-spectrum.control b/debian/skel/libroot-hist-spectrum.control
index 63caa2d..4cc87f2 100644
--- a/debian/skel/libroot-hist-spectrum.control
+++ b/debian/skel/libroot-hist-spectrum.control
@@ -1,6 +1,8 @@
Package: libroot-hist-spectrum at libvers@
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Spectra analysis library for ROOT
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/libroot-hist.control b/debian/skel/libroot-hist.control
index 53957fd..16bdace 100644
--- a/debian/skel/libroot-hist.control
+++ b/debian/skel/libroot-hist.control
@@ -1,6 +1,8 @@
Package: libroot-hist at libvers@
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: root-plugin-hist-histpainter
Description: Histogram library for ROOT - run-time library
diff --git a/debian/skel/libroot-html.control b/debian/skel/libroot-html.control
index 9844982..a69877d 100644
--- a/debian/skel/libroot-html.control
+++ b/debian/skel/libroot-html.control
@@ -1,6 +1,8 @@
Package: libroot-html at libvers@
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Html documentation generator for ROOT - runtime library
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/libroot-io-xmlparser.control b/debian/skel/libroot-io-xmlparser.control
index a36ffa2..b4ddb31 100644
--- a/debian/skel/libroot-io-xmlparser.control
+++ b/debian/skel/libroot-io-xmlparser.control
@@ -1,6 +1,8 @@
Package: libroot-io-xmlparser at libvers@
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: XML parser of ROOT objects - runtime library
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/libroot-io.control b/debian/skel/libroot-io.control
index 1750dec..18a88e8 100644
--- a/debian/skel/libroot-io.control
+++ b/debian/skel/libroot-io.control
@@ -1,6 +1,8 @@
Package: libroot-io at libvers@
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Input/output of ROOT objects - runtime library
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/libroot-ldap.control b/debian/skel/libroot-ldap.control
index c87ff2f..0f591e7 100644
--- a/debian/skel/libroot-ldap.control
+++ b/debian/skel/libroot-ldap.control
@@ -1,6 +1,8 @@
Package: libroot-ldap at libvers@
Architecture: any
Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Provides: libroot-ldap, root-plugin-ldap
Replaces: root-plugin-ldap (<< 5.09.01-1)
diff --git a/debian/skel/libroot-math-foam.control b/debian/skel/libroot-math-foam.control
index 9819a2a..2864126 100644
--- a/debian/skel/libroot-math-foam.control
+++ b/debian/skel/libroot-math-foam.control
@@ -1,6 +1,8 @@
Package: libroot-math-foam at libvers@
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Compact Version of Cellular Event Generator
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/libroot-math-genvector.control b/debian/skel/libroot-math-genvector.control
index a5d3323..62bebb3 100644
--- a/debian/skel/libroot-math-genvector.control
+++ b/debian/skel/libroot-math-genvector.control
@@ -1,6 +1,8 @@
Package: libroot-math-genvector at libvers@
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Generalized vector library for ROOT
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/libroot-math-mathcore.control b/debian/skel/libroot-math-mathcore.control
index f2bf09d..d148de8 100644
--- a/debian/skel/libroot-math-mathcore.control
+++ b/debian/skel/libroot-math-mathcore.control
@@ -1,6 +1,8 @@
Package: libroot-math-mathcore at libvers@
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Core mathemathics library for ROOT
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/libroot-math-mathmore.control b/debian/skel/libroot-math-mathmore.control
index 4b06011..7fc23d9 100644
--- a/debian/skel/libroot-math-mathmore.control
+++ b/debian/skel/libroot-math-mathmore.control
@@ -1,6 +1,8 @@
Package: libroot-math-mathmore at libvers@
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: GSL interface library for ROOT
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/libroot-math-matrix.control b/debian/skel/libroot-math-matrix.control
index a7f5477..5031288 100644
--- a/debian/skel/libroot-math-matrix.control
+++ b/debian/skel/libroot-math-matrix.control
@@ -1,6 +1,8 @@
Package: libroot-math-matrix at libvers@
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Matrix library for ROOT
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/libroot-math-minuit.control b/debian/skel/libroot-math-minuit.control
index 588a20f..70aad28 100644
--- a/debian/skel/libroot-math-minuit.control
+++ b/debian/skel/libroot-math-minuit.control
@@ -1,6 +1,8 @@
Package: libroot-math-minuit at libvers@
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: root-plugin-minuit (<< 5.09.01-7)
Provides: libroot-math-minuit
diff --git a/debian/skel/libroot-math-mlp.control b/debian/skel/libroot-math-mlp.control
index c4a325f..33ddf4b 100644
--- a/debian/skel/libroot-math-mlp.control
+++ b/debian/skel/libroot-math-mlp.control
@@ -1,6 +1,8 @@
Package: libroot-math-mlp at libvers@
Architecture: any
Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: root-plugin-mlp (<< 5.09.01-1)
Description: Multi layer perceptron extension for ROOT - run-time libraries
diff --git a/debian/skel/libroot-math-physics.control b/debian/skel/libroot-math-physics.control
index 742560b..6256c01 100644
--- a/debian/skel/libroot-math-physics.control
+++ b/debian/skel/libroot-math-physics.control
@@ -1,6 +1,8 @@
Package: libroot-math-physics at libvers@
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Physics library for ROOT
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/libroot-math-quadp.control b/debian/skel/libroot-math-quadp.control
index a3a2a3e..04cc0b2 100644
--- a/debian/skel/libroot-math-quadp.control
+++ b/debian/skel/libroot-math-quadp.control
@@ -1,6 +1,8 @@
Package: libroot-math-quadp at libvers@
Architecture: any
Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: root-plugin-quadp (<< 5.09.01-1)
Description: QuadP extension for ROOT - run-time libraries
diff --git a/debian/skel/libroot-math-smatrix.control b/debian/skel/libroot-math-smatrix.control
index d8d56c6..b69c6f9 100644
--- a/debian/skel/libroot-math-smatrix.control
+++ b/debian/skel/libroot-math-smatrix.control
@@ -1,6 +1,8 @@
Package: libroot-math-smatrix at libvers@
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Sparse matrix library for ROOT
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/libroot-math-splot.control b/debian/skel/libroot-math-splot.control
index eaaf349..20cddff 100644
--- a/debian/skel/libroot-math-splot.control
+++ b/debian/skel/libroot-math-splot.control
@@ -1,6 +1,8 @@
Package: libroot-math-splot at libvers@
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Splot library for ROOT
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/libroot-math-unuran.control b/debian/skel/libroot-math-unuran.control
index 5864b35..d112db1 100644
--- a/debian/skel/libroot-math-unuran.control
+++ b/debian/skel/libroot-math-unuran.control
@@ -1,6 +1,8 @@
Package: libroot-math-unuran at libvers@
Architecture: any
Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Homepage: http://statistik.wu-wien.ac.at/unuran/
Description: Random number generator library
diff --git a/debian/skel/libroot-misc-memstat.control b/debian/skel/libroot-misc-memstat.control
index 00e8b56..04a6aea 100644
--- a/debian/skel/libroot-misc-memstat.control
+++ b/debian/skel/libroot-misc-memstat.control
@@ -1,6 +1,8 @@
Package: libroot-misc-memstat at libvers@
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Memory statistics tool for use with ROOT
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/libroot-misc-minicern.control b/debian/skel/libroot-misc-minicern.control
index fbf6a01..5f43f53 100644
--- a/debian/skel/libroot-misc-minicern.control
+++ b/debian/skel/libroot-misc-minicern.control
@@ -1,6 +1,8 @@
Package: libroot-misc-minicern at libvers@
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Small version of CERNLIB for use with ROOT
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/libroot-misc-table.control b/debian/skel/libroot-misc-table.control
index 6386971..b55e6e6 100644
--- a/debian/skel/libroot-misc-table.control
+++ b/debian/skel/libroot-misc-table.control
@@ -1,6 +1,8 @@
Package: libroot-misc-table at libvers@
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Table library for ROOT
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/libroot-montecarlo-eg.control b/debian/skel/libroot-montecarlo-eg.control
index 017d723..9240e7f 100644
--- a/debian/skel/libroot-montecarlo-eg.control
+++ b/debian/skel/libroot-montecarlo-eg.control
@@ -1,6 +1,8 @@
Package: libroot-montecarlo-eg at libvers@
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Event generator library for ROOT
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/libroot-montecarlo-g4root.control b/debian/skel/libroot-montecarlo-g4root.control
index 3fe07ca..ec54686 100644
--- a/debian/skel/libroot-montecarlo-g4root.control
+++ b/debian/skel/libroot-montecarlo-g4root.control
@@ -1,6 +1,8 @@
Package: libroot-montecarlo-g4root at libvers@
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Geant4 interface library for ROOT
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/libroot-montecarlo-vmc.control b/debian/skel/libroot-montecarlo-vmc.control
index a924942..9d4f1a3 100644
--- a/debian/skel/libroot-montecarlo-vmc.control
+++ b/debian/skel/libroot-montecarlo-vmc.control
@@ -1,6 +1,8 @@
Package: libroot-montecarlo-vmc at libvers@
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: root-vmc
Description: Virtual Monte-Carlo library for ROOT
diff --git a/debian/skel/libroot-net-auth.control b/debian/skel/libroot-net-auth.control
index 9586497..168551f 100644
--- a/debian/skel/libroot-net-auth.control
+++ b/debian/skel/libroot-net-auth.control
@@ -1,6 +1,8 @@
Package: libroot-net-auth at libvers@
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Provides: root-authentication
Description: Authentication extension for ROOT
diff --git a/debian/skel/libroot-net-bonjour.control b/debian/skel/libroot-net-bonjour.control
index 62cd352..2285cbf 100644
--- a/debian/skel/libroot-net-bonjour.control
+++ b/debian/skel/libroot-net-bonjour.control
@@ -1,6 +1,8 @@
Package: libroot-net-bonjour at libvers@
Architecture: any
Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Zeroconf extension for ROOT - run-time libraries
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/libroot-net-ldap.control b/debian/skel/libroot-net-ldap.control
index ccb3df0..e89e4fd 100644
--- a/debian/skel/libroot-net-ldap.control
+++ b/debian/skel/libroot-net-ldap.control
@@ -1,6 +1,8 @@
Package: libroot-net-ldap at libvers@
Architecture: any
Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: root-plugin-ldap (<< 5.09.01-1)
Description: LDAP extension for ROOT
diff --git a/debian/skel/libroot-net.control b/debian/skel/libroot-net.control
index 9c22ec0..7e88b6e 100644
--- a/debian/skel/libroot-net.control
+++ b/debian/skel/libroot-net.control
@@ -1,6 +1,8 @@
Package: libroot-net at libvers@
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Net library for ROOT
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/libroot-proof-clarens.control b/debian/skel/libroot-proof-clarens.control
index 3d862b4..ff16966 100644
--- a/debian/skel/libroot-proof-clarens.control
+++ b/debian/skel/libroot-proof-clarens.control
@@ -1,6 +1,8 @@
Package: libroot-proof-clarens at libvers@
Architecture: any
Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: root-plugin-clarens (<< 5.09.01-1)
Homepage: http://clarens.sourceforge.net
diff --git a/debian/skel/libroot-proof-proofplayer.control b/debian/skel/libroot-proof-proofplayer.control
index 9a7fe47..9ef8d4b 100644
--- a/debian/skel/libroot-proof-proofplayer.control
+++ b/debian/skel/libroot-proof-proofplayer.control
@@ -1,6 +1,8 @@
Package: libroot-proof-proofplayer at libvers@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Suggests: root-plugin-net-netx, root-plugin-proof-xproof
Replaces: root-plugin-proof-proofplayer (<< 5.23.05-1)
Breaks: root-plugin-proof-proofplayer (<< 5.23.05-1)
diff --git a/debian/skel/libroot-proof.control b/debian/skel/libroot-proof.control
index 8b18833..e6024ee 100644
--- a/debian/skel/libroot-proof.control
+++ b/debian/skel/libroot-proof.control
@@ -1,6 +1,8 @@
Package: libroot-proof at libvers@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Suggests: root-plugin-net-netx, root-plugin-proof-xproof
Description: PROOF library for ROOT
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/libroot-roofit.control b/debian/skel/libroot-roofit.control
index e15ccf0..cb9d412 100644
--- a/debian/skel/libroot-roofit.control
+++ b/debian/skel/libroot-roofit.control
@@ -1,6 +1,8 @@
Package: libroot-roofit at libvers@
Architecture: any
Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, libroot-math-minuit at libvers@ | root-fitter, ${misc:Depends}
Homepage: http://roofit.sourceforge.net/
Replaces: root-plugin-roofit (<< 5.09.01-1)
diff --git a/debian/skel/libroot-static.install.in b/debian/skel/libroot-static.install.in
index 7f57c81..251e338 100644
--- a/debian/skel/libroot-static.install.in
+++ b/debian/skel/libroot-static.install.in
@@ -1,4 +1,4 @@
- at prefix@/lib/root/@version@/libRoot.a
+ at prefix@/lib/*/root at version@/libRoot.a
@prefix@/bin/roota
@prefix@/bin/proofserva
@prefix@/share/man/man1/roota.1*
diff --git a/debian/skel/libroot-tmva.control b/debian/skel/libroot-tmva.control
index 682b037..c862790 100644
--- a/debian/skel/libroot-tmva.control
+++ b/debian/skel/libroot-tmva.control
@@ -1,6 +1,8 @@
Package: libroot-tmva at libvers@
Architecture: any
Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Homepage: http://tmva.sourceforge.net
Description: Toolkit for multivariate data analysis
diff --git a/debian/skel/libroot-tree-treeplayer.control b/debian/skel/libroot-tree-treeplayer.control
index df393c0..a1d28cd 100644
--- a/debian/skel/libroot-tree-treeplayer.control
+++ b/debian/skel/libroot-tree-treeplayer.control
@@ -1,5 +1,8 @@
Package: libroot-tree-treeplayer at libvers@
+Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Library to loop over a ROOT tree
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/libroot-tree.control b/debian/skel/libroot-tree.control
index 8c17a27..15fad66 100644
--- a/debian/skel/libroot-tree.control
+++ b/debian/skel/libroot-tree.control
@@ -1,6 +1,8 @@
Package: libroot-tree at libvers@
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: libroot-tree-treeplayer at libvers@ | root-plugin-tree-treeviewer
Description: Tree library for ROOT
diff --git a/debian/skel/root-plugin-asimage.control b/debian/skel/root-plugin-asimage.control
index 4a2160b..85f09a6 100644
--- a/debian/skel/root-plugin-asimage.control
+++ b/debian/skel/root-plugin-asimage.control
@@ -1,5 +1,7 @@
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
diff --git a/debian/skel/root-plugin-geom-gdml.control b/debian/skel/root-plugin-geom-gdml.control
index 7a3548c..633629f 100644
--- a/debian/skel/root-plugin-geom-gdml.control
+++ b/debian/skel/root-plugin-geom-gdml.control
@@ -1,5 +1,7 @@
Package: root-plugin-geom-gdml
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Breaks: libroot-dev (<< 5.19.01-1)
Replaces: libroot-dev
Depends: ${shlibs:Depends}, python-support, ${python:Depends}, libroot-geom-dev, ${misc:Depends}
diff --git a/debian/skel/root-plugin-geom-gdml.install.in b/debian/skel/root-plugin-geom-gdml.install.in
index f4b544f..c66671c 100644
--- a/debian/skel/root-plugin-geom-gdml.install.in
+++ b/debian/skel/root-plugin-geom-gdml.install.in
@@ -1,2 +1,2 @@
- at prefix@/lib/root/@version@/ROOTwriter.py
- at prefix@/lib/root/@version@/writer.py
+ at prefix@/lib/*/root at version@/ROOTwriter.py
+ at prefix@/lib/*/root at version@/writer.py
diff --git a/debian/skel/root-plugin-geom-gdml.links.in b/debian/skel/root-plugin-geom-gdml.links.in
index cfdc3ad..35132a2 100644
--- a/debian/skel/root-plugin-geom-gdml.links.in
+++ b/debian/skel/root-plugin-geom-gdml.links.in
@@ -1,2 +1,2 @@
- at prefix@/lib/root/@libvers@/ROOTwriter.py /usr/share/python-support/root/ROOTwriter.py
- at prefix@/lib/root/@libvers@/writer.py /usr/share/python-support/root/writer.py
+ at prefix@/lib/@multiarch@/root at libvers@/ROOTwriter.py /usr/share/python-support/root/ROOTwriter.py
+ at prefix@/lib/@multiarch@/root at libvers@/writer.py /usr/share/python-support/root/writer.py
diff --git a/debian/skel/root-plugin-geom-geombuilder.control b/debian/skel/root-plugin-geom-geombuilder.control
index 2a0c41d..2e0c9bb 100644
--- a/debian/skel/root-plugin-geom-geombuilder.control
+++ b/debian/skel/root-plugin-geom-geombuilder.control
@@ -1,5 +1,7 @@
Package: root-plugin-geom-geombuilder
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Breaks: libroot-dev (<< 5.19.01-1)
Replaces: libroot-dev
Depends: ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/skel/root-plugin-geom-geompainter.control b/debian/skel/root-plugin-geom-geompainter.control
index 0266f7f..3c4fbbc 100644
--- a/debian/skel/root-plugin-geom-geompainter.control
+++ b/debian/skel/root-plugin-geom-geompainter.control
@@ -1,5 +1,7 @@
Package: root-plugin-geom-geompainter
Architecture: any
+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}
diff --git a/debian/skel/root-plugin-graf2d-asimage.control b/debian/skel/root-plugin-graf2d-asimage.control
index e26b9c2..f83a417 100644
--- a/debian/skel/root-plugin-graf2d-asimage.control
+++ b/debian/skel/root-plugin-graf2d-asimage.control
@@ -1,5 +1,7 @@
Package: root-plugin-graf2d-asimage
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: AfterImage plugin for ROOT
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/root-plugin-graf2d-qt.control b/debian/skel/root-plugin-graf2d-qt.control
index 12fa28b..7e6d16f 100644
--- a/debian/skel/root-plugin-graf2d-qt.control
+++ b/debian/skel/root-plugin-graf2d-qt.control
@@ -1,5 +1,7 @@
Package: root-plugin-graf2d-qt
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Graf2d Qt plugin for ROOT
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/root-plugin-graf2d-x11.control b/debian/skel/root-plugin-graf2d-x11.control
index aca6848..613f6cc 100644
--- a/debian/skel/root-plugin-graf2d-x11.control
+++ b/debian/skel/root-plugin-graf2d-x11.control
@@ -1,5 +1,7 @@
Package: root-plugin-graf2d-x11
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Replaces: libroot-dev
Breaks: libroot-dev (<< 5.19.01-1)
Provides: root-system-display
diff --git a/debian/skel/root-plugin-graf3d-x3d.control b/debian/skel/root-plugin-graf3d-x3d.control
index 632603c..4f74d9b 100644
--- a/debian/skel/root-plugin-graf3d-x3d.control
+++ b/debian/skel/root-plugin-graf3d-x3d.control
@@ -1,5 +1,7 @@
Package: root-plugin-graf3d-x3d
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Breaks: libroot-dev (<< 5.19.01-1)
Replaces: libroot-dev
Depends: ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/skel/root-plugin-gui-fitpanel.control b/debian/skel/root-plugin-gui-fitpanel.control
index 470245c..26b8636 100644
--- a/debian/skel/root-plugin-gui-fitpanel.control
+++ b/debian/skel/root-plugin-gui-fitpanel.control
@@ -1,5 +1,7 @@
Package: root-plugin-gui-fitpanel
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Breaks: libroot-dev (<< 5.19.01-1)
Replaces: libroot-dev
Depends: ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/skel/root-plugin-gui-guibuilder.control b/debian/skel/root-plugin-gui-guibuilder.control
index 6e8c2a8..af9358b 100644
--- a/debian/skel/root-plugin-gui-guibuilder.control
+++ b/debian/skel/root-plugin-gui-guibuilder.control
@@ -1,5 +1,7 @@
Package: root-plugin-gui-guibuilder
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Breaks: libroot-dev (<< 5.19.01-1)
Replaces: libroot-dev
Depends: ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/skel/root-plugin-gui-qt.control b/debian/skel/root-plugin-gui-qt.control
index 595dafc..23f1ce0 100644
--- a/debian/skel/root-plugin-gui-qt.control
+++ b/debian/skel/root-plugin-gui-qt.control
@@ -1,5 +1,7 @@
Package: root-plugin-gui-qt
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Qt plugin for ROOT
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/root-plugin-gui-sessionviewer.control b/debian/skel/root-plugin-gui-sessionviewer.control
index a1c0689..25eb1b6 100644
--- a/debian/skel/root-plugin-gui-sessionviewer.control
+++ b/debian/skel/root-plugin-gui-sessionviewer.control
@@ -1,5 +1,7 @@
Package: root-plugin-gui-sessionviewer
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Breaks: libroot-dev (<< 5.19.01-1)
Replaces: libroot-dev
Depends: ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/skel/root-plugin-hist-hbook.control b/debian/skel/root-plugin-hist-hbook.control
index 326206e..873a7e0 100644
--- a/debian/skel/root-plugin-hist-hbook.control
+++ b/debian/skel/root-plugin-hist-hbook.control
@@ -1,5 +1,7 @@
Package: root-plugin-hist-hbook
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: root-plugin-hbook
Replaces: root-plugin-hbook (<< 5.19.01-1)
diff --git a/debian/skel/root-plugin-hist-histpainter.control b/debian/skel/root-plugin-hist-histpainter.control
index 5448f0b..8a13345 100644
--- a/debian/skel/root-plugin-hist-histpainter.control
+++ b/debian/skel/root-plugin-hist-histpainter.control
@@ -1,5 +1,7 @@
Package: root-plugin-hist-histpainter
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Replaces: libroot-dev
Breaks: libroot-dev (<< 5.19.01-1)
Depends: ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/skel/root-plugin-hist-spectrumpainter.control b/debian/skel/root-plugin-hist-spectrumpainter.control
index 64f72d6..05c7e94 100644
--- a/debian/skel/root-plugin-hist-spectrumpainter.control
+++ b/debian/skel/root-plugin-hist-spectrumpainter.control
@@ -1,5 +1,7 @@
Package: root-plugin-hist-spectrumpainter
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: libroot-dev
Breaks: libroot-dev (<< 5.19.01-1)
diff --git a/debian/skel/root-plugin-io-castor.control b/debian/skel/root-plugin-io-castor.control
index 8a694a1..92bc68a 100644
--- a/debian/skel/root-plugin-io-castor.control
+++ b/debian/skel/root-plugin-io-castor.control
@@ -1,5 +1,7 @@
Package: root-plugin-io-castor
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Homepage: http://savannah.cern.ch/projects/castor/
Description: CASTOR plugin for ROOT
diff --git a/debian/skel/root-plugin-io-chirp.control b/debian/skel/root-plugin-io-chirp.control
index aa36c2f..b865901 100644
--- a/debian/skel/root-plugin-io-chirp.control
+++ b/debian/skel/root-plugin-io-chirp.control
@@ -1,5 +1,7 @@
Package: root-plugin-io-chirp
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Homepage: http://www.cs.wisc.edu/condor/chirp/
Description: Chirp plugin for ROOT
diff --git a/debian/skel/root-plugin-io-dcache.control b/debian/skel/root-plugin-io-dcache.control
index 5788005..6e5f934 100644
--- a/debian/skel/root-plugin-io-dcache.control
+++ b/debian/skel/root-plugin-io-dcache.control
@@ -1,5 +1,7 @@
Package: root-plugin-io-dcache
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, libdcap1, ${misc:Depends}
Homepage: http://www.dcache.org
Description: dCache plugin for ROOT
diff --git a/debian/skel/root-plugin-io-gfal.control b/debian/skel/root-plugin-io-gfal.control
index 0587697..7db0db4 100644
--- a/debian/skel/root-plugin-io-gfal.control
+++ b/debian/skel/root-plugin-io-gfal.control
@@ -1,5 +1,7 @@
Package: root-plugin-io-gfal
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: GFal plugin for ROOT
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/root-plugin-io-sql.control b/debian/skel/root-plugin-io-sql.control
index 49d05ed..3417df2 100644
--- a/debian/skel/root-plugin-io-sql.control
+++ b/debian/skel/root-plugin-io-sql.control
@@ -1,5 +1,7 @@
Package: root-plugin-io-sql
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: root-db-client | root-plugin-io-mysql
Description: SQL plugin for ROOT
diff --git a/debian/skel/root-plugin-io-xml.control b/debian/skel/root-plugin-io-xml.control
index ab626d7..ab7d3f5 100644
--- a/debian/skel/root-plugin-io-xml.control
+++ b/debian/skel/root-plugin-io-xml.control
@@ -1,5 +1,7 @@
Package: root-plugin-io-xml
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: XML reader plugin for ROOT
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/root-plugin-math-fftw3.control b/debian/skel/root-plugin-math-fftw3.control
index ce77540..50ce83d 100644
--- a/debian/skel/root-plugin-math-fftw3.control
+++ b/debian/skel/root-plugin-math-fftw3.control
@@ -1,5 +1,7 @@
Package: root-plugin-math-fftw3
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Homepage: http://fftw.org/
Description: FFTw plugin for ROOT
diff --git a/debian/skel/root-plugin-math-fumili.control b/debian/skel/root-plugin-math-fumili.control
index e432c9e..6a22b1a 100644
--- a/debian/skel/root-plugin-math-fumili.control
+++ b/debian/skel/root-plugin-math-fumili.control
@@ -1,5 +1,7 @@
Package: root-plugin-math-fumili
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Provides: root-fitter
Description: Fumili plugin for ROOT
diff --git a/debian/skel/root-plugin-math-minuit2.control b/debian/skel/root-plugin-math-minuit2.control
index 1d914fd..32effd0 100644
--- a/debian/skel/root-plugin-math-minuit2.control
+++ b/debian/skel/root-plugin-math-minuit2.control
@@ -1,5 +1,7 @@
Package: root-plugin-math-minuit2
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Provides: root-fitter
Description: Minuit version 2 plugin for ROOT
diff --git a/debian/skel/root-plugin-montecarlo-pythia5.control b/debian/skel/root-plugin-montecarlo-pythia5.control
index 45aa010..38bf18a 100644
--- a/debian/skel/root-plugin-montecarlo-pythia5.control
+++ b/debian/skel/root-plugin-montecarlo-pythia5.control
@@ -1,5 +1,7 @@
Package: root-plugin-montecarlo-pythia5
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Pythia version 5 plugin for ROOT
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/root-plugin-montecarlo-pythia6.control b/debian/skel/root-plugin-montecarlo-pythia6.control
index 516c710..9d66d54 100644
--- a/debian/skel/root-plugin-montecarlo-pythia6.control
+++ b/debian/skel/root-plugin-montecarlo-pythia6.control
@@ -1,5 +1,7 @@
Package: root-plugin-montecarlo-pythia6
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Pythia version 6 plugin for ROOT
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/root-plugin-montecarlo-pythia8.control b/debian/skel/root-plugin-montecarlo-pythia8.control
index 0c63064..78c5fb7 100644
--- a/debian/skel/root-plugin-montecarlo-pythia8.control
+++ b/debian/skel/root-plugin-montecarlo-pythia8.control
@@ -1,5 +1,7 @@
Package: root-plugin-montecarlo-pythia8
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Pythia version 8 plugin for ROOT
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/root-plugin-net-alien.control b/debian/skel/root-plugin-net-alien.control
index 46dacca..9609d35 100644
--- a/debian/skel/root-plugin-net-alien.control
+++ b/debian/skel/root-plugin-net-alien.control
@@ -1,5 +1,7 @@
Package: root-plugin-net-alien
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Homepage: http://alien.cern.ch
Description: AliEn plugin for ROOT
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/root-plugin-net-glite.control b/debian/skel/root-plugin-net-glite.control
index 6c57f81..88a338b 100644
--- a/debian/skel/root-plugin-net-glite.control
+++ b/debian/skel/root-plugin-net-glite.control
@@ -1,5 +1,7 @@
Package: root-plugin-net-glite
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Description: Glite 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/root-plugin-net-globus.control b/debian/skel/root-plugin-net-globus.control
index 5db84a6..c56b074 100644
--- a/debian/skel/root-plugin-net-globus.control
+++ b/debian/skel/root-plugin-net-globus.control
@@ -1,5 +1,7 @@
Package: root-plugin-net-globus
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: globus-proxy-utils, ${shlibs:Depends}, ${misc:Depends}
Homepage: http://www.globus.org
Description: Globus plugin for ROOT
diff --git a/debian/skel/root-plugin-net-krb5.control b/debian/skel/root-plugin-net-krb5.control
index c1192fe..7d6de04 100644
--- a/debian/skel/root-plugin-net-krb5.control
+++ b/debian/skel/root-plugin-net-krb5.control
@@ -1,5 +1,7 @@
Package: root-plugin-net-krb5
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, krb5-user | heimdal-clients, ${misc:Depends}
Description: Kerberos (version 5) plugin for ROOT
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/root-plugin-net-monalisa.control b/debian/skel/root-plugin-net-monalisa.control
index 43edb3c..981fce4 100644
--- a/debian/skel/root-plugin-net-monalisa.control
+++ b/debian/skel/root-plugin-net-monalisa.control
@@ -1,5 +1,7 @@
Package: root-plugin-net-monalisa
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Homepage: http://monalisa.cacr.caltech.edu
Description: Monalisa plugin for ROOT
The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/root-plugin-net-netx.control b/debian/skel/root-plugin-net-netx.control
index 509735e..3f6a56d 100644
--- a/debian/skel/root-plugin-net-netx.control
+++ b/debian/skel/root-plugin-net-netx.control
@@ -1,5 +1,7 @@
Package: root-plugin-net-netx
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: root-plugin-net-xrootd
Description: NetX plugin for ROOT
diff --git a/debian/skel/root-plugin-net-srp.control b/debian/skel/root-plugin-net-srp.control
index ce9a8d4..e3d852f 100644
--- a/debian/skel/root-plugin-net-srp.control
+++ b/debian/skel/root-plugin-net-srp.control
@@ -1,5 +1,7 @@
Package: root-plugin-net-srp
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Homepage: http://srp.stanford.edu
Description: SRP plugin for ROOT
diff --git a/debian/skel/root-plugin-proof-peac.control b/debian/skel/root-plugin-proof-peac.control
index d370d0a..4c508d7 100644
--- a/debian/skel/root-plugin-proof-peac.control
+++ b/debian/skel/root-plugin-proof-peac.control
@@ -1,5 +1,7 @@
Package: root-plugin-proof-peac
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Homepage: http://physics.ucsd.edu/~schsu/project/peac.html
Description: PEAC plugin for ROOT - run-time libraries
diff --git a/debian/skel/root-plugin-proof-proofplayer.control b/debian/skel/root-plugin-proof-proofplayer.control
index 9e7c2a3..ceffc85 100644
--- a/debian/skel/root-plugin-proof-proofplayer.control
+++ b/debian/skel/root-plugin-proof-proofplayer.control
@@ -1,5 +1,7 @@
Package: libroot-proof-proofplayer at libvers@
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: root-plugin-net-netx, root-plugin-proof-xproof
Replaces: root-plugin-proof-proofplayer (< 5.23.05-1)
diff --git a/debian/skel/root-plugin-proof-xproof.control b/debian/skel/root-plugin-proof-xproof.control
index 17f5f2f..aa34239 100644
--- a/debian/skel/root-plugin-proof-xproof.control
+++ b/debian/skel/root-plugin-proof-xproof.control
@@ -1,5 +1,7 @@
Package: root-plugin-proof-xproof
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: root-plugin-net-netx
Replaces: root-proofd
diff --git a/debian/skel/root-plugin-proof.control b/debian/skel/root-plugin-proof.control
index cb0a28c..ea2a399 100644
--- a/debian/skel/root-plugin-proof.control
+++ b/debian/skel/root-plugin-proof.control
@@ -1,5 +1,7 @@
Package: root-plugin-proof
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: root-plugin-netx, root-plugin-xproof
Description: PROOF plugin for ROOT
diff --git a/debian/skel/root-plugin-sql-maxdb.control b/debian/skel/root-plugin-sql-maxdb.control
index c5fe0eb..9ecac00 100644
--- a/debian/skel/root-plugin-sql-maxdb.control
+++ b/debian/skel/root-plugin-sql-maxdb.control
@@ -1,5 +1,7 @@
Package: root-plugin-sql-maxdb
Architecture: i386 ia64 amd64
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Provides: root-db-client
Homepage: http://www.mysql.com/products/maxdb
diff --git a/debian/skel/root-plugin-sql-mysql.control b/debian/skel/root-plugin-sql-mysql.control
index 5f6f97f..cdd5ddd 100644
--- a/debian/skel/root-plugin-sql-mysql.control
+++ b/debian/skel/root-plugin-sql-mysql.control
@@ -1,5 +1,7 @@
Package: root-plugin-sql-mysql
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Provides: root-db-client
Description: MySQL client plugin for ROOT
diff --git a/debian/skel/root-plugin-sql-odbc.control b/debian/skel/root-plugin-sql-odbc.control
index 055e778..5e3831b 100644
--- a/debian/skel/root-plugin-sql-odbc.control
+++ b/debian/skel/root-plugin-sql-odbc.control
@@ -1,5 +1,7 @@
Package: root-plugin-sql-odbc
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Provides: root-db-client
Homepage: http://unixodbc.org or http://iodbc.org
diff --git a/debian/skel/root-plugin-sql-oracle.control b/debian/skel/root-plugin-sql-oracle.control
index 2942d6b..d7b30b9 100644
--- a/debian/skel/root-plugin-sql-oracle.control
+++ b/debian/skel/root-plugin-sql-oracle.control
@@ -1,5 +1,7 @@
Package: root-plugin-sql-oracle
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: oracle-instantclient-basic, ${shlibs:Depends}, ${misc:Depends}
Provides: root-db-client
Description: Oracle client plugin for ROOT
diff --git a/debian/skel/root-plugin-sql-pgsql.control b/debian/skel/root-plugin-sql-pgsql.control
index dfbadb1..77b6da5 100644
--- a/debian/skel/root-plugin-sql-pgsql.control
+++ b/debian/skel/root-plugin-sql-pgsql.control
@@ -1,5 +1,7 @@
Package: root-plugin-sql-pgsql
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Provides: root-db-client
Description: PostgreSQL client plugin for ROOT
diff --git a/debian/skel/root-plugin-tree-treeplayer.control b/debian/skel/root-plugin-tree-treeplayer.control
index cb3c3ef..c8209c0 100644
--- a/debian/skel/root-plugin-tree-treeplayer.control
+++ b/debian/skel/root-plugin-tree-treeplayer.control
@@ -1,5 +1,7 @@
Package: root-plugin-tree-treeplayer
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Breaks: libroot-dev (<< 5.19.01-1)
Replaces: libroot-dev
Depends: ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/skel/root-plugin-tree-treeviewer.control b/debian/skel/root-plugin-tree-treeviewer.control
index 6f540cb..06b0ed7 100644
--- a/debian/skel/root-plugin-tree-treeviewer.control
+++ b/debian/skel/root-plugin-tree-treeviewer.control
@@ -1,5 +1,7 @@
Package: root-plugin-tree-treeviewer
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Breaks: libroot-dev (<< 5.19.01-1)
Replaces: libroot-dev
Depends: ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/skel/root-system-common.links.in b/debian/skel/root-system-common.links.in
index 9dad568..8484fb7 100644
--- a/debian/skel/root-system-common.links.in
+++ b/debian/skel/root-system-common.links.in
@@ -1,13 +1,13 @@
-usr/share/fonts/truetype/freefont/FreeMono.ttf @prefix@/share/root/fonts/FreeMono.ttf
-usr/share/fonts/truetype/freefont/FreeMonoBold.ttf @prefix@/share/root/fonts/FreeMonoBold.ttf
-usr/share/fonts/truetype/freefont/FreeMonoOblique.ttf @prefix@/share/root/fonts/FreeMonoOblique.ttf
-usr/share/fonts/truetype/freefont/FreeMonoBoldOblique.ttf @prefix@/share/root/fonts/FreeMonoBoldOblique.ttf
-usr/share/fonts/truetype/freefont/FreeSans.ttf @prefix@/share/root/fonts/FreeSans.ttf
-usr/share/fonts/truetype/freefont/FreeSansBold.ttf @prefix@/share/root/fonts/FreeSansBold.ttf
-usr/share/fonts/truetype/freefont/FreeSansOblique.ttf @prefix@/share/root/fonts/FreeSansOblique.ttf
-usr/share/fonts/truetype/freefont/FreeSansBoldOblique.ttf @prefix@/share/root/fonts/FreeSansBoldOblique.ttf
-usr/share/fonts/truetype/freefont/FreeSerif.ttf @prefix@/share/root/fonts/FreeSerif.ttf
-usr/share/fonts/truetype/freefont/FreeSerifBold.ttf @prefix@/share/root/fonts/FreeSerifBold.ttf
-usr/share/fonts/truetype/freefont/FreeSerifItalic.ttf @prefix@/share/root/fonts/FreeSerifItalic.ttf
-usr/share/fonts/truetype/freefont/FreeSerifBoldItalic.ttf @prefix@/share/root/fonts/FreeSerifBoldItalic.ttf
-usr/share/fonts/truetype/openoffice/opens___.ttf @prefix@/share/root/fonts/opens___.ttf
+ at prefix@/share/fonts/truetype/freefont/FreeMono.ttf @prefix@/share/root/fonts/FreeMono.ttf
+ at prefix@/share/fonts/truetype/freefont/FreeMonoBold.ttf @prefix@/share/root/fonts/FreeMonoBold.ttf
+ at prefix@/share/fonts/truetype/freefont/FreeMonoOblique.ttf @prefix@/share/root/fonts/FreeMonoOblique.ttf
+ at prefix@/share/fonts/truetype/freefont/FreeMonoBoldOblique.ttf @prefix@/share/root/fonts/FreeMonoBoldOblique.ttf
+ at prefix@/share/fonts/truetype/freefont/FreeSans.ttf @prefix@/share/root/fonts/FreeSans.ttf
+ at prefix@/share/fonts/truetype/freefont/FreeSansBold.ttf @prefix@/share/root/fonts/FreeSansBold.ttf
+ at prefix@/share/fonts/truetype/freefont/FreeSansOblique.ttf @prefix@/share/root/fonts/FreeSansOblique.ttf
+ at prefix@/share/fonts/truetype/freefont/FreeSansBoldOblique.ttf @prefix@/share/root/fonts/FreeSansBoldOblique.ttf
+ at prefix@/share/fonts/truetype/freefont/FreeSerif.ttf @prefix@/share/root/fonts/FreeSerif.ttf
+ at prefix@/share/fonts/truetype/freefont/FreeSerifBold.ttf @prefix@/share/root/fonts/FreeSerifBold.ttf
+ at prefix@/share/fonts/truetype/freefont/FreeSerifItalic.ttf @prefix@/share/root/fonts/FreeSerifItalic.ttf
+ at prefix@/share/fonts/truetype/freefont/FreeSerifBoldItalic.ttf @prefix@/share/root/fonts/FreeSerifBoldItalic.ttf
+ at prefix@/share/fonts/truetype/openoffice/opens___.ttf @prefix@/share/root/fonts/opens___.ttf
--
root-system: CERN's ROOT Data Analysis Framework
More information about the debian-science-commits
mailing list