Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package root-system.
It contains one important fix regarding to the python binding
interfaces. The failure to import python module (#698452) I would
consider RC.
The complete changelog is
root-system (5.34.00-2) unstable; urgency=low
* Python binding: move Python runtime files from
libroot-bindings-python-dev to libroot-bindings-python$ver.
(Closes: #698452)
* libroot-graf2d-graf{5.34,-dev}: fix typo in package description.
Thanks to Davide Prina.
* libroot-graf2d-gpad{5.34,-dev}: remove duplicated paragraphs in
package description. Thanks to Davide Prina.
* Add Dutch translation. Thanks to Vincent Zweije.
* libroot-geom-dev: fix multi-arch support.
* Fix FTBFS with eglibc-2.17. (Closes: #701415)
-- Lifeng Sun <lifong...@gmail.com> Sat, 14 Jul 2012 20:56:35 +0800
Diff between 5.34.00-1 and 5.34.00-2 attached.
Thanks,
Lifeng
--
diff --git a/debian/changelog b/debian/changelog
index 87ce116..2b50644 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+root-system (5.34.00-2) unstable; urgency=low
+
+ * Python binding: move Python runtime files from
+ libroot-bindings-python-dev to libroot-bindings-python$ver.
+ (Closes: #698452)
+ * libroot-graf2d-graf{5.34,-dev}: fix typo in package description.
+ Thanks to Davide Prina.
+ * libroot-graf2d-gpad{5.34,-dev}: remove duplicated paragraphs in
+ package description. Thanks to Davide Prina.
+ * Add Dutch translation. Thanks to Vincent Zweije.
+ * libroot-geom-dev: fix multi-arch support.
+ * Fix FTBFS with eglibc-2.17. (Closes: #701415)
+
+ -- Lifeng Sun <lifong...@gmail.com> Sat, 14 Jul 2012 20:56:35 +0800
+
root-system (5.34.00-1) unstable; urgency=low
* New upstream version.
diff --git a/debian/control b/debian/control
index 200c693..e382a5b 100644
--- a/debian/control
+++ b/debian/control
@@ -51,7 +51,9 @@ Section: libs
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}
+Provides: ${python:Provides}
Replaces: root-plugin-python (<< 5.09.01-1)
+Breaks: libroot-bindings-python-dev (<< 5.34.00-2)
Description: Python extension for ROOT - runtime libraries
The ROOT system provides a set of OO frameworks with all the
functionality needed to handle and analyze large amounts of data
@@ -64,7 +66,6 @@ Package: libroot-bindings-python-dev
Architecture: any
Section: libdevel
Depends: libroot-bindings-python5.34 (= ${binary:Version}), libroot-core-dev, python-dev (>= 2.1), ${python:Depends}, ${misc:Depends}
-Provides: ${python:Provides}
Replaces: libroot-python-dev
Breaks: libroot-python-dev (<< 5.19.01-1)
Description: Python extension for ROOT - development files
@@ -472,7 +473,7 @@ 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}
+Depends: ${shlibs:Depends}, python-support, ${python:Depends}, ${misc:Depends}
Description: GDML import/export module for ROOT geometries
The ROOT system provides a set of OO frameworks with all the
functionality needed to handle and analyze large amounts of data
@@ -659,8 +660,6 @@ Description: Geometry library for ROOT - run-time library
Package: libroot-geom-dev
Architecture: any
-Multi-Arch: foreign
-Pre-Depends: ${misc:Pre-Depends}
Section: libdevel
Depends: libroot-geom5.34 (= ${binary:Version}), libroot-math-mathcore-dev, ${misc:Depends}
Recommends: libroot-graf3d-gl-dev
@@ -685,10 +684,6 @@ Description: Canvas and pad library for ROOT - run-time library
functionality needed to handle and analyze large amounts of data
efficiently.
.
- 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 a library for canvas and pad manipulations.
Package: libroot-graf2d-gpad-dev
@@ -702,10 +697,6 @@ Description: Canvas and pad library for ROOT - development files
functionality needed to handle and analyze large amounts of data
efficiently.
.
- 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 development files of a library for canvas and pad
manipulations.
@@ -715,7 +706,7 @@ Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Graph library for ROOT
+Description: Graf library 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.
@@ -728,7 +719,7 @@ Section: libdevel
Depends: libroot-graf2d-graf5.34 (= ${binary:Version}), libroot-hist-dev, ${misc:Depends}
Replaces: libroot-dev
Breaks: libroot-dev (<< 5.19.01-1)
-Description: Graph library for ROOT - development files
+Description: Graf library for ROOT - development files
The ROOT system provides a set of OO frameworks with all the
functionality needed to handle and analyze large amounts of data
efficiently.
diff --git a/debian/patches/06-fix-fchmod-for-glibc-2.17.patch b/debian/patches/06-fix-fchmod-for-glibc-2.17.patch
new file mode 100644
index 0000000..eb1f76b
--- /dev/null
+++ b/debian/patches/06-fix-fchmod-for-glibc-2.17.patch
@@ -0,0 +1,11 @@
+--- a/build/rmkdepend/main.c
++++ b/build/rmkdepend/main.c
+@@ -60,7 +60,7 @@
+ # endif
+ # elif defined(__CYGWIN__)
+ extern int fchmod(int, mode_t);
+-#else
++# elif !defined(__GLIBC__) || __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 16)
+ extern int fchmod(int, int);
+ # endif
+ #endif
diff --git a/debian/patches/07-include-resource.h.patch b/debian/patches/07-include-resource.h.patch
new file mode 100644
index 0000000..690bd8d
--- /dev/null
+++ b/debian/patches/07-include-resource.h.patch
@@ -0,0 +1,12 @@
+--- a/core/unix/src/TUnixSystem.cxx
++++ b/core/unix/src/TUnixSystem.cxx
+@@ -4919,8 +4919,8 @@
+
+ //---- System, CPU and Memory info ---------------------------------------------
+
+-#if defined(R__MACOSX)
+ #include <sys/resource.h>
++#if defined(R__MACOSX)
+ #include <mach/mach.h>
+ #include <mach/mach_error.h>
+
diff --git a/debian/patches/series b/debian/patches/series
index dccc588..1419a3e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,8 @@
03-build-libroot-bonjour-package.patch
04-build-libroot-html-package.patch
05-rename-package-libroot-proof-proofplayer.patch
+06-fix-fchmod-for-glibc-2.17.patch
+07-include-resource.h.patch
15-enable-extra-ldflags.patch
19-remove-embedded-library-gl2ps.patch
21-fix-manpage-hyphen.patch
diff --git a/debian/po/nl.po b/debian/po/nl.po
new file mode 100644
index 0000000..a8d7e83
--- /dev/null
+++ b/debian/po/nl.po
@@ -0,0 +1,120 @@
+# Dutch root-system po-debconf translation,
+# Copyright (C) 2012 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the root-system package.
+# Vincent Zweije <vinc...@zweije.nl>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: root-system 5.34.00-1\n"
+"Report-Msgid-Bugs-To: root-sys...@packages.debian.org\n"
+"POT-Creation-Date: 2009-02-15 12:03+0100\n"
+"PO-Revision-Date: 2012-10-14 14:44+0000\n"
+"Last-Translator: Vincent Zweije <vinc...@zweije.nl>\n"
+"Language-Team: Debian-Dutch <debian-l10n-du...@lists.debian.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../ttf-root-installer.templates:2001
+msgid "Non-free fonts"
+msgstr "Niet-vrije fonts"
+
+#. Type: note
+#. Description
+#: ../ttf-root-installer.templates:2001
+msgid ""
+"The fonts provided in this package were provided by Microsoft \"in the "
+"interest of cross-platform compatibility\". This is no longer the case, but "
+"they are still available from third parties."
+msgstr ""
+"De fonts waarin dit pakket voorziet waren beschikbaar gesteld door Microsoft "
+"\"in the interest of cross-platform compatibilty\", maar dit is nu niet "
+"langer zo. Ze zijn echter nog steeds beschikbaar via derde partijen."
+
+#. Type: note
+#. Description
+#: ../ttf-root-installer.templates:2001
+msgid ""
+"You are free to download these fonts and use them for your own purposes, but "
+"you have no permission to redistribute them in modified form, including "
+"changes to the file name or packaging format."
+msgstr ""
+"U mag deze fonts downloaden en voor uw eigen doeleinden gebruiken, maar u "
+"mag ze niet verder verspreiden in gewijzigde vorm, met inbegrip van "
+"wijzigingen aan de bestandsnaam of het pakketformaat."
+
+#. Type: string
+#. Description
+#: ../ttf-root-installer.templates:3001
+msgid "Directory holding Microsoft fonts (if already downloaded):"
+msgstr "Map met Microsoft fonts (indien reeds gedownload):"
+
+#. Type: string
+#. Description
+#: ../ttf-root-installer.templates:3001
+msgid ""
+"If you have already downloaded Microsoft's TrueType Core Fonts from the ROOT "
+"FTP server (ftp://root.cern.ch/root/ttf/ttf_fonts.tar.gz), please enter the "
+"name of the directory which contains the archive."
+msgstr ""
+"Indien u Microsofts TrueType Core Fonts al heeft gedownload van de ROOT FTP "
+"server (ftp://root.cern.ch/root/ttf/ttf_fonts.tar.gz), geef dan hier de naam "
+"van de map waar het bestand zich bevindt."
+
+#. Type: string
+#. Description
+#: ../ttf-root-installer.templates:3001
+msgid ""
+"If you haven't yet downloaded these fonts, leave this blank and the fonts "
+"will be downloaded automatically. The download size is approximately 1.6 MB."
+msgstr ""
+"Indien u deze fonts nog niet heeft gedownload, laat dit dan leeg; de fonts "
+"worden dan automatisch gedownload. De grootte van de download is ongeveer "
+"1,6 MB."
+
+#. Type: string
+#. Description
+#: ../ttf-root-installer.templates:3001
+msgid ""
+"If you are not connected to the Internet or do not wish to download these "
+"fonts now, enter \"none\" to abort."
+msgstr ""
+"Indien u niet bent verbonden met Internet, of wanneer u deze fonts nu niet "
+"wilt downloaden, voer dan \"none\" in om te stoppen."
+
+#. Type: error
+#. Description
+#: ../ttf-root-installer.templates:4001
+msgid "Font files not found"
+msgstr "Fontbestanden niet gevonden"
+
+#. Type: error
+#. Description
+#: ../ttf-root-installer.templates:4001
+msgid ""
+"The directory you entered either does not exist, or does not contain the "
+"Microsoft TrueType Core Fonts for ROOT."
+msgstr ""
+"De map die u heeft ingevoerd bestaat niet, of bevat niet de Microsoft "
+"TrueType Core Fonts voor ROOT."
+
+#. Type: string
+#. Description
+#: ../ttf-root-installer.templates:5001
+msgid "Archive files to (optional):"
+msgstr "Bestanden archiveren naar (optioneel):"
+
+#. Type: string
+#. Description
+#: ../ttf-root-installer.templates:5001
+msgid ""
+"If you would like to keep a permanent archive of the compressed Microsoft "
+"Core fonts, please enter the directory where you'd like them stored. If you "
+"leave this blank, the files will be deleted after installation."
+msgstr ""
+"Als u de Microsoft Core fonts wilt bewaren in gecomprimeerde vorm, voer dan "
+"de map in waar u ze wilt neerzetten. Als u dit leeg laat worden de bestanden "
+"na installatie verwijderd."
diff --git a/debian/rules b/debian/rules
index e167e60..b4a957f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -526,6 +526,8 @@ pkglists:
rm -rf debian/*.files debian/*.install
./debian/script/makelists.sh debian debian/tmp \
$(VERSION) $(PREFIX) $(SYSCONFDIR) $(PKGDOCDIR)
+ mv debian/libroot-bindings-python.links \
+ debian/libroot-bindings-python$(SOVERS).links
# @for i in debian/libroot* ; do \
# if test -d $$i ; then continue ; fi ; \
# case $$i in \
@@ -712,7 +714,7 @@ install-arch: build-arch
case `uname -m` in \
i*86 | x86_64) ;; \
*) sed -i -e '/PyCintex/d' \
- debian/libroot-bindings-python-dev.install;; \
+ debian/libroot-bindings-python$(SOVERS).install;; \
esac
dh_install -s \
@@ -821,14 +823,14 @@ ifeq ($(HAVEPYTHON), libroot-bindings-python)
# system compiling.
echo "$(PYVER)-" > debian/pyversions
endif
- dh_pysupport -plibroot-bindings-python-dev
+ dh_pysupport -plibroot-bindings-python$(SOVERS)
# $(CINTDIR) $(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
dh_pysupport -plibroot-core-dev \
$(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.
- echo "python:Provides=python$(PYVER)-pyroot" >> debian/libroot-bindings-python-dev.substvars
+ echo "python:Provides=python$(PYVER)-pyroot" >> debian/libroot-bindings-python$(SOVERS).substvars
endif
dh_makeshlibs -V \
$(patsubst %, -p%, $(filter libroot%$(SOVERS),$(SPKGLIST)))
diff --git a/debian/skel/libroot-bindings-python-dev.install.in b/debian/skel/libroot-bindings-python-dev.install.in
deleted file mode 100644
index 404679f..0000000
--- a/debian/skel/libroot-bindings-python-dev.install.in
+++ /dev/null
@@ -1,3 +0,0 @@
-@prefix@/lib/*/root@version@/ROOT.py
-@prefix@/lib/*/root@version@/PyCintex.py
-
diff --git a/debian/skel/libroot-bindings-python-dev.links.in b/debian/skel/libroot-bindings-python-dev.links.in
deleted file mode 100644
index 3f6a5ac..0000000
--- a/debian/skel/libroot-bindings-python-dev.links.in
+++ /dev/null
@@ -1,2 +0,0 @@
-@prefix@/lib/@multiarch@/root@libvers@/ROOT.py /usr/share/python-support/root/ROOT.py
-@prefix@/lib/@multiarch@/libPyROOT.so /usr/lib/python@pyver@/dist-packages/libPyROOT.so
diff --git a/debian/skel/libroot-bindings-python.control b/debian/skel/libroot-bindings-python.control
index 59bca4a..05b8fb9 100644
--- a/debian/skel/libroot-bindings-python.control
+++ b/debian/skel/libroot-bindings-python.control
@@ -4,7 +4,9 @@ Section: libs
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}
+Provides: ${python:Provides}
Replaces: root-plugin-python (<< 5.09.01-1)
+Breaks: libroot-bindings-python-dev (<< 5.34.00-2)
Description: Python extension for ROOT - runtime libraries
The ROOT system provides a set of OO frameworks with all the
functionality needed to handle and analyze large amounts of data
@@ -17,7 +19,6 @@ Package: libroot-bindings-python-dev
Architecture: any
Section: libdevel
Depends: libroot-bindings-python@libvers@ (= ${binary:Version}), libroot-core-dev, python-dev (>= 2.1), ${python:Depends}, ${misc:Depends}
-Provides: ${python:Provides}
Replaces: libroot-python-dev
Breaks: libroot-python-dev (<< 5.19.01-1)
Description: Python extension for ROOT - development files
diff --git a/debian/skel/libroot-bindings-python.install.in b/debian/skel/libroot-bindings-python.install.in
new file mode 100644
index 0000000..354bc98
--- /dev/null
+++ b/debian/skel/libroot-bindings-python.install.in
@@ -0,0 +1,2 @@
+@prefix@/lib/*/root@version@/ROOT.py
+@prefix@/lib/*/root@version@/PyCintex.py
diff --git a/debian/skel/libroot-bindings-python.links.in b/debian/skel/libroot-bindings-python.links.in
new file mode 100644
index 0000000..af95c6f
--- /dev/null
+++ b/debian/skel/libroot-bindings-python.links.in
@@ -0,0 +1,2 @@
+@prefix@/lib/@multiarch@/root@libvers@/libPyROOT.so /usr/lib/python@pyver@/dist-packages/libPyROOT.so
+@prefix@/lib/@multiarch@/root@libvers@/ROOT.py /usr/share/python-support/root/ROOT.py
diff --git a/debian/skel/libroot-geom.control b/debian/skel/libroot-geom.control
index e13edc2..935527d 100644
--- a/debian/skel/libroot-geom.control
+++ b/debian/skel/libroot-geom.control
@@ -14,8 +14,6 @@ Description: Geometry library for ROOT - run-time library
Package: libroot-geom-dev
Architecture: any
-Multi-Arch: foreign
-Pre-Depends: ${misc:Pre-Depends}
Section: libdevel
Depends: libroot-geom@libvers@ (= ${binary:Version}), libroot-math-mathcore-dev, ${misc:Depends}
Recommends: libroot-graf3d-gl-dev
diff --git a/debian/skel/libroot-graf2d-gpad.control b/debian/skel/libroot-graf2d-gpad.control
index 384e50f..b79a866 100644
--- a/debian/skel/libroot-graf2d-gpad.control
+++ b/debian/skel/libroot-graf2d-gpad.control
@@ -9,10 +9,6 @@ Description: Canvas and pad library for ROOT - run-time library
functionality needed to handle and analyze large amounts of data
efficiently.
.
- 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 a library for canvas and pad manipulations.
Package: libroot-graf2d-gpad-dev
@@ -26,10 +22,6 @@ Description: Canvas and pad library for ROOT - development files
functionality needed to handle and analyze large amounts of data
efficiently.
.
- 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 development files of a library for canvas and pad
manipulations.
diff --git a/debian/skel/libroot-graf2d-graf.control b/debian/skel/libroot-graf2d-graf.control
index ce182ed..0d60ee5 100644
--- a/debian/skel/libroot-graf2d-graf.control
+++ b/debian/skel/libroot-graf2d-graf.control
@@ -4,7 +4,7 @@ Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Graph library for ROOT
+Description: Graf library 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.
@@ -17,7 +17,7 @@ Section: libdevel
Depends: libroot-graf2d-graf@libvers@ (= ${binary:Version}), libroot-hist-dev, ${misc:Depends}
Replaces: libroot-dev
Breaks: libroot-dev (<< 5.19.01-1)
-Description: Graph library for ROOT - development files
+Description: Graf library for ROOT - development files
The ROOT system provides a set of OO frameworks with all the
functionality needed to handle and analyze large amounts of data
efficiently.
diff --git a/debian/skel/root-plugin-geom-gdml.control b/debian/skel/root-plugin-geom-gdml.control
index 633629f..09afb41 100644
--- a/debian/skel/root-plugin-geom-gdml.control
+++ b/debian/skel/root-plugin-geom-gdml.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}, python-support, ${python:Depends}, libroot-geom-dev, ${misc:Depends}
+Depends: ${shlibs:Depends}, python-support, ${python:Depends}, ${misc:Depends}
Description: GDML import/export module for ROOT geometries
The ROOT system provides a set of OO frameworks with all the
functionality needed to handle and analyze large amounts of data
signature.asc
Description: Digital signature
