--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: unblock: taurus/3.0.0-2
- From: Picca Frédéric-Emmanuel <picca@debian.org>
- Date: Fri, 18 Jan 2013 23:32:27 +0100
- Message-id: <20130118223227.21760.40641.reportbug@mordor>
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package taurus
the package 3.0.0-2 was not yet uploaded to unstable.
first I would like to know if this is ok for you before uploading to unstable.
This upload should fix 2 bugs, an FTBFS and an important one which render the
package almost unusable.
1) FTBFS due to inkscape (whcih was not available when I uploaded taurus for
the first time)
2) re-activate all the icones of taurus.
thanks
Frederic
unblock taurus/3.0.0-2
diff -Nru taurus-3.0.0/debian/changelog taurus-3.0.0/debian/changelog
--- taurus-3.0.0/debian/changelog 2012-05-01 20:52:58.000000000 +0200
+++ taurus-3.0.0/debian/changelog 2013-01-18 23:17:33.000000000 +0100
@@ -1,3 +1,12 @@
+taurus (3.0.0-2) unstable; urgency=low
+
+ * Fix FTBFS with inkscape (Closes: #698462)
+ - 0002-upstream-fix-for-the-FTBFS-due-to-image-conversion.patch
+ * All icons are now available (Closes: #698464)
+ - 0003-upstream-fix-tango-icon-resources.patch
+
+ -- Picca Frédéric-Emmanuel <picca@debian.org> Fri, 18 Jan 2013 21:50:25
+0100
+
taurus (3.0.0-1) unstable; urgency=low
* Initial release (Closes: #614247)
diff -Nru taurus-3.0.0/debian/rules taurus-3.0.0/debian/rules
--- taurus-3.0.0/debian/rules 2012-05-06 13:45:13.000000000 +0200
+++ taurus-3.0.0/debian/rules 2013-01-18 21:46:33.000000000 +0100
@@ -12,7 +12,7 @@
override_dh_auto_build:
dh_auto_build -- --no-doc
- python setup.py build_doc --use-inkscape
+ python setup.py build_doc --external-img-tools
override_dh_auto_install:
dh_auto_install -- --skip-build --no-doc
@@ -21,4 +21,4 @@
%:
dh $@ --with python2 $(WITH_SPHINXDOC)
-.PHONY: get-orig-source
\ Pas de fin de ligne à la fin du fichier
+.PHONY: get-orig-source
-- System Information:
Debian Release: 7.0
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1,
'experimental')
Architecture: i386 (i686)
Kernel: Linux 3.2.0-4-486
--- End Message ---
--- Begin Message ---
On 2013-01-23 06:50, PICCA Frédéric-Emmanuel wrote:
uploaded.
Some additional changes seem to have crept in:
patches/0001-forwarded-add-no-doc-option.patch
| 57 +++
patches/forwarded-add-no-doc-option
| 69 ---
Looks like this was meant to be just a rename, yet:
==========
--- a/taurus-3.0.0/debian/patches/forwarded-add-no-doc-option
2012-05-06 11:45:13.000000000 +0000
+++
b/taurus-3.0.0/debian/patches/0001-forwarded-add-no-doc-option.patch
2013-01-22 22:52:55.000000000 +0000
@@ -1,28 +1,16 @@
-Description: add the no-doc option to the install target
- To build the doc only once during the build process. It is necessary
- to allow not to run the install_html rule. this is the purpose of
this
- patch
- .
- taurus (3.0.0-1) unstable; urgency=low
- .
- * Initial release (Closes: #614247)
- * Thanks to Justin B Rye for package description review
-Author: Picca Frédéric-Emmanuel <picca@debian.org>
----
-The information above should follow the Patch Tagging Guidelines,
please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format.
Here
-are templates for supplementary fields that you might want to add:
+From: Debian Science Maintainers
+ <debian-science-maintainers@lists.alioth.debian.org>
+Date: Wed, 16 Jan 2013 17:03:02 +0100
+Subject: forwarded-add-no-doc-option
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
+---
+ setup.py | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
---- taurus-3.0.0.orig/setup.py
-+++ taurus-3.0.0/setup.py
+diff --git a/setup.py b/setup.py
+index d64b7ee..c3afb89 100644
+--- a/setup.py
++++ b/setup.py
@@ -473,12 +473,14 @@ class install(dftinstall):
user_options = list(dftinstall.user_options)
==========
So fortunately harmless meta-data in this case.
You also did not mention the change in build-dependencies, either in
your diff or in the changelog:
==========
--- taurus-3.0.0/debian/control 2012-05-06 11:45:13.000000000 +0000
+++ taurus-3.0.0/debian/control 2013-01-16 20:23:10.000000000 +0000
@@ -5,6 +5,7 @@
Priority: extra
Build-Depends: debhelper (>= 8),
graphviz,
+ imagemagick,
inkscape,
libqt4-dev,
pymca,
==========
It's not worth another upload to add this to the changelog, but please
be more careful in preparing debdiffs/changelogs for unblocks in future.
Unblocked.
Thanks,
--
Jonathan Wiltshire jmw@debian.org
Debian Developer http://people.debian.org/~jmw
4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC 74C3 5394 479D D352 4C51
--- End Message ---