Bug#613402: override: python-beautifulsoup:python
Package: ftp.debian.org Severity: normal Hi, python-beautifulsoup_3.2.0-1_all.deb: package says section is python, override says web. This package probably belongs in python, as it's a Python library, useful for parsing web pages. It is only of use to programmers, and as a dependency. SR -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#532140: ITP: python-eventlet -- high performance network library using coroutines
owner 532140 ! thanks Any update on this? Chris: I take it you never got a reply? Now that the freeze is over, and I've gone 6 months without a response, I'm hijacking this for DPMT. It's already packaged in Ubuntu, we can base our package on that. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#613101: [ubuntu-dev] Bug#613101: ubuntu-dev-tools: Better error message for recommended packages that aren't installed
Hi Nelson (2011.02.13_00:47:05_+0200)
I have fixed dgetlp, import-bug-from-debian, and suspicious-source.
Please let us know if there are more failures caused by not installed
recommends.
We now have warnings for all the Python modules in Recommends/Suggests,
but not the other packages, e.g. bzr, ca-certificates.
Those are harder to solve.
$ grab-merge
mkdir: missing operand
Try `mkdir --help' for more information.
Fixed in r1023.
$ pull-revu-source
Can't locate LWP/Simple.pm in @INC (@INC contains: /etc/perl
/usr/local/lib/perl/5.10.1 /usr/local/share/perl/5.10.1 /usr/lib/perl5
/usr/share/perl5 /usr/lib/perl/5.10 /usr/share/perl/5.10
/usr/local/lib/site_perl .) at /usr/bin/pull-revu-source line 24.
BEGIN failed--compilation aborted at /usr/bin/pull-revu-source line 24.
Fixed in r1025.
Maybe a help/example/synopsys here for ubuntu-iso?
It's not the only one. From ubuntutools/test/test_help.py:
BLACKLIST = {
'check-mir': 'No Help',
'check-symbols': 'No Help',
'edit-patch': 'No Help',
'get-build-deps': 'No Help, runs sudo',
'grep-merges': 'No Help',
'lp-project-upload': 'Returns non-zero after help. '
'Leaving u-d-t in LP: #524680',
'mk-sbuild': 'Fires up apt-get before showing help',
'pbuilder-dist-simple': 'No Help',
'setup-packaging-environment': 'Throws Error',
'submittodebian': 'No Help',
'ubuntu-iso': 'No Help',
}
SR
--
Stefano Rivera
http://tumbleweed.org.za/
H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#613114: grep-merges: UnicodeEncodeError: 'ascii' codec can't encode character
tag 613114 pending thanks UnicodeEncodeError: 'ascii' codec can't encode character u'\xef' in position 9: ordinal not in range(128) I'm making requestsync and grep-merges require a UTF-8 locale. It isn't a perfect solution, but it's at least straightforward. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#351589: python-beautifulsoup: include documentation from website
forwarded 351589 https://bugs.launchpad.net/beautifulsoup/+bug/478932 thanks Hi Corey (2006.02.06_00:11:30_+0200) it would be appreciated if the documentation (documentation, examples, faq) available on the beautifulsoup website (http://www.crummy.com/software/BeautifulSoup/) was included. Hi, I've just taken over maintenance of this package, and am cleaning up the bug pile :) I've requested that the upstream developer include the docs in future releases. If not or there's no response, this should still be doable by repacking the source ourselves. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#607864: python-beautifulsoup: Please provide debian/watch file to monitor upstream versions
Hi Olivier (2010.12.23_10:11:40_+0200) version=3 http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-([0-9.]+)\.tar\.gz There's no neat way to deal with the trees inside download, so I'll follow the new launchpad download area instead. https://launchpad.net/beautifulsoup/+download .*/BeautifulSoup-(.+)\.tar\.gz SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#505442: Tags containing tags named the same cause BeautifulStoneSoup problems
tag 505442 + upstream severity 505442 minor thanks BeautifulStoneSoup parses this as ... which is incorrect. Yes but BeautifulSoup doesn't claim to be an accurate XML parser. You'll have to tell it that module can be nested inside module.depends. According to its documentation: | The BeautifulSoup class is full of web-browser-like heuristics for | divining the intent of HTML authors. But XML doesn't have a fixed tag | set, so those heuristics don't apply. So BeautifulSoup doesn't do XML | very well. However, your example XML does appear to be parsed correctly by BeautifulSoup trunk. Example script attached. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 #!/usr/bin/env python import beautifulsoup soup = beautifulsoup.BeautifulStoneSoup( module rawnamefindmefollow/rawname nameFollow Me/name version2.5.1.7/version depends version2.5.0alpha1/version modulerecordings ge 3.3.8/module /depends locationrelease/2.5/findmefollow-2.5.1.7.tgz/location /module ) print soup.prettify()
Bug#434094: TypeError: cannot concatenate 'str' and 'NoneType' objects
tags 434094 + upstream moreinfo
thanks
The data processed should be http://www.cguelich.de/
Hi. I've taken over this package and am cleaning up its bugs.
I've tried all the URLs listed on this page, with the attached test
script, and none of them trigger this bug. I'm assuming it's due to
incorrect encoding detection, but it would help to have a test case.
I do see HTMLParseErrors, but those are due to the poor quality of
HTMLParser, used by BeatifulSoup 3.1. 3.0/3.2 doesn't have these issues.
It looks like other people have run into similar issues:
http://groups.google.com/group/beautifulsoup/search?q=concatenate+NoneType
SR
--
Stefano Rivera
http://tumbleweed.org.za/
H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127
#!/usr/bin/env python
import traceback
import urllib2
import BeautifulSoup
for url in ('http://www.vupp.cz/czvupp/', 'http://www.cguelich.de/',
'http://www.singular-tech.com/', 'http://www.presse-citron.net/',
'http://blogs.bnet.com/business-books/?p=327',
'http://peaceclub.de/2007/11/26/z-grabstein/'):
print url
try:
data = urllib2.urlopen(url).read()
BeautifulSoup.BeautifulSoup(data)
except Exception, e:
traceback.print_exc()
continue
Bug#564160: 3.2.0
Hi Olivier (2010.12.23_10:21:35_+0200) I think it would be good to have it packaged ASAP, and possibly included in squeeze... although the freeze rules may not allow it. I've taken over maintenance of this package now. I think it's too late to do something this drastic for squeeze, via squeeze-updates, but we can try. I haven't thought of any code that downgrading to 3.2 might break. Any ideas? SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#612267: mediawiki-extions-confirmedit: If this extension is installed no change to the Wiki at all could be saved.
forcemerge 612267 612227
tag 612267 + patch
thanks
Some sources on the net say, that this extension does not work in Mediawiki
1.15 and PHP 5.3.
While we will probably want to upload a new version of this package with
a newer ConfirmEdit, this bug affects stable, and so I propose this
minimal patch to fix it.
SR
--
Stefano Rivera
http://tumbleweed.org.za/
H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127
Description: PHP 5.3 compatibility fixes for ConfirmEdit.
Origin:
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/53461
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/55449
Bug-Debian: http://bugs.debian.org/612267
Bug-Wikimedia: https://bugzilla.wikimedia.org/show_bug.cgi?id=20383
Last-Update: 2011-02-14
--- a/dist/mediawiki-extensions-confirmedit/usr/share/mediawiki-extensions/confirmedit/ConfirmEdit_body.php
+++ b/dist/mediawiki-extensions-confirmedit/usr/share/mediawiki-extensions/confirmedit/ConfirmEdit_body.php
@@ -15,15 +15,15 @@
return $wgCaptcha;
}
- static function confirmEdit( $editPage, $newtext, $section ) {
+ static function confirmEdit( $editPage, $newtext, $section ) {
return self::getInstance()-confirmEdit( $editPage, $newtext, $section );
}
- static function confirmEditMerged( $editPage, $newtext ) {
+ static function confirmEditMerged( $editPage, $newtext ) {
return self::getInstance()-confirmEditMerged( $editPage, $newtext );
}
- static function confirmEditAPI( $editPage, $newtext, $resultArr ) {
+ static function confirmEditAPI( $editPage, $newtext, $resultArr ) {
return self::getInstance()-confirmEditAPI( $editPage, $newtext, $resultArr );
}
@@ -458,7 +458,7 @@
* Backend function for confirmEdit() and confirmEditAPI()
* @return bool false if the CAPTCHA is rejected, true otherwise
*/
- private function doConfirmEdit( $editPage, $newtext, $section, $merged = false ) {
+ private function doConfirmEdit( $editPage, $newtext, $section, $merged = false ) {
if( $this-shouldCheck( $editPage, $newtext, $section, $merged ) ) {
if( $this-passCaptcha() ) {
return true;
@@ -479,7 +479,7 @@
* @param bool $merged
* @return bool true to continue saving, false to abort and show a captcha form
*/
- function confirmEdit( $editPage, $newtext, $section, $merged = false ) {
+ function confirmEdit( $editPage, $newtext, $section, $merged = false ) {
if( defined('MW_API') ) {
# API mode
# The CAPTCHA was already checked and approved
@@ -497,12 +497,12 @@
* @param EditPage $editPage
* @param string $newtext
*/
- function confirmEditMerged( $editPage, $newtext ) {
+ function confirmEditMerged( $editPage, $newtext ) {
return $this-confirmEdit( $editPage, $newtext, false, true );
}
- function confirmEditAPI( $editPage, $newtext, $resultArr) {
+ function confirmEditAPI( $editPage, $newtext, $resultArr) {
if( !$this-doConfirmEdit( $editPage, $newtext, false, false ) ) {
$this-addCaptchaAPI($resultArr);
return false;
Bug#610624: [Build-common-hackers] Bug#610624: cdbs: Multiple regressions in python-autotools.mk
Hi Emilio (2011.01.22_18:46:34_+0200) Ah right. So your patch is correct. However this will make DEB_MAKE_DESTDIRSKEL non-overridable when using python-autotools.mk. Can it not be overriden after the includes? SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#610624: [Build-common-hackers] Bug#610624: cdbs: Multiple regressions in python-autotools.mk
Hi Emilio (2011.01.21_23:16:46_+0200) # Install all flavors on top of each other by default -DEB_MAKE_DESTDIRSKEL ?= $(cdbs_curdestdir) +DEB_MAKE_DESTDIRSKEL = $(cdbs_curdestdir) Not so sure about this one though. What is setting DEB_MAKE_DESTDIRSKEL ? Nothing in CDBS sets it AFAICS. 1/class/makefile-vars.mk.in 57:DEB_MAKE_DESTDIRSKEL ?= $(cdbs_curdestdir)/@FLAVOR@ An example of a package broken in Debian would be nice, so we can reproduce it. Take pywebkitgtk and build it on sid with only cdbs from experimental, everything else from sid. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#610624: cdbs: Multiple regressions in python-autotools.mk
Package: cdbs
Version: 0.4.91
Severity: normal
Tags: patch
There are two regressions in python-autotools.mk, first appearing in
0.4.90.
This is an example with pywebkitgtk on natty (sorry can't think of any
good examples that'll build on experimental)
First issue, missing quote:
| cd debian/build/2.6 CFLAGS=-g -O2 -g -O2 CXXFLAGS=-g -O2 -g -O2
| CPPFLAGS= LDFLAGS=-Wl,-Bsymbolic-functions PYTHON=python2.6
| /tmp/buildd/pywebkitgtk-1.1.8/./configure --build=x86_64-linux-gnu
| --prefix=/usr --includedir=\${prefix}/include
| --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info
| --sysconfdir=/etc --localstatedir=/var
| --libexecdir=\${prefix}/lib/pywebkitgtk --disable-maintainer-mode
| --disable-dependency-tracking --disable-silent-rules
| /bin/sh: Syntax error: Unterminated quoted string
And, incorrect (it shouldn't be flavoured) DESTDIR:
| GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 /usr/bin/make -C
| debian/build/2.6 install
| DESTDIR=/tmp/buildd/pywebkitgtk-1.1.8/debian/tmp//2.6
Patch attached.
Related Ubuntu Bug: https://launchpad.net/bugs/705426
SR
-- System Information:
Debian Release: 6.0
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-5-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_ZA.UTF-8, LC_CTYPE=en_ZA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff --git a/1/class/python-autotools.mk.in b/1/class/python-autotools.mk.in
index a6249ae..6446864 100644
--- a/1/class/python-autotools.mk.in
+++ b/1/class/python-autotools.mk.in
@@ -39,9 +39,9 @@ CDBS_BUILD_DEPENDS_class_python-autotools_python ?= $(cdbs_python_builddeps)
CDBS_BUILD_DEPENDS += , $(CDBS_BUILD_DEPENDS_class_python-autotools_python)
# FIXME: Restructure to allow early override
-DEB_CONFIGURE_SCRIPT_ENV += PYTHON=$(or $(python$(cdbs_python$(cdbs_curpythonstem)_nondefault_version):%=python%),$(call cdbs_python_binary,python$(if $(cdbs_make_flavors),$(cdbs_make_curflavor
+DEB_CONFIGURE_SCRIPT_ENV += PYTHON=$(or $(python$(cdbs_python$(cdbs_curpythonstem)_nondefault_version):%=python%),$(call cdbs_python_binary,python$(if $(cdbs_make_flavors),$(cdbs_make_curflavor
# Install all flavors on top of each other by default
-DEB_MAKE_DESTDIRSKEL ?= $(cdbs_curdestdir)
+DEB_MAKE_DESTDIRSKEL = $(cdbs_curdestdir)
endif
Bug#609882: libc6: No such file or directory error when attempting to execute LSB executable without lsb-core
reassign 609882 bash
thanks
It looks like the commmand-not-found handler won't work here:
$ function command_not_found_handle { echo handled; }
$ export PATH=.:$PATH
$ lmutilfoo
handled
$ lmutil
bash: ./lmutil: No such file or directory
The program is there, on the path, but the interpretor required doesn't exist.
Yes, ld-linux doesn't seem to be involved:
$ strace -e execve -f sh -c ./lmutil
execve(/bin/sh, [sh, -c, ./lmutil], [/* 55 vars */]) = 0
Process 14084 attached
[pid 14084] execve(./lmutil, [./lmutil], [/* 55 vars */]) = -1 ENOENT (No
such file or directory)
sh: ./lmutil: not found
Process 14084 detached
--- SIGCHLD (Child exited) @ 0 (0) ---
It's rare for ELFs to require missing interpretors, so this is rather a special
case...
shell_execve (execute_cmd.c) does check for missing interpretors for
scripts (with shebangs) but not for ELFs
$ cat testscript
#!/bin/foobarbaz
$ chmod +x testscript
$ testscript
bash: ./testscript: /bin/foobarbaz: bad interpreter: No such file or directory
Now, *that* gives a more useful error, maybe something to aim for.
SR
--
Stefano Rivera
http://tumbleweed.org.za/
H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#609874: FTBFS with ld --as-needed
Package: src:elmerfem
Version: 5.5.0.svn.4897.dfsg-1
Severity: normal
Tags: patch
User: debian-...@lists.debian.org
Usertags: ld-as-needed
I hope this is the last gold related fix. Ubuntu passes --as-needed to
ld, in preparation for binutils-gold, and this causes a problem with the
order the Python libraries are linked in.
Patch attached.
SR
-- System Information:
Debian Release: squeeze/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-5-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_ZA.UTF-8, LC_CTYPE=en_ZA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Description: Fix failure to build with ld --as-needed, as linking order matters.
Author: Stefano Rivera stef...@rivera.za.net
Last-Update: 2011-01-13
--- a/ElmerGUI/Application/Application.pro
+++ b/ElmerGUI/Application/Application.pro
@@ -107,7 +107,7 @@
contains(DEFINES, EG_PYTHONQT) {
INCLUDEPATH += $${PY_INCLUDEPATH} ../PythonQt/src
LIBPATH += $${PY_LIBPATH} ../PythonQt/lib
- LIBS += $${PY_LIBS} -lPythonQt
+ LIBS += -lPythonQt $${PY_LIBS}
}
#--
Bug#609197: python-magics++: Missing dependency on python-support
Package: python-magics++
Severity: minor
Tags: patch
Hi, python-magics++ depends on python and python-numpy directly,
instead of using ${python:Depends}.
Practically, this isn't a serious issue, as python-numpy depends on
python-support, and even without that, there's a very high chance that
python-support is already installed on any system this would be used on.
However, it is still a policy violation and a bad practice.
${python:Depends} will expand to the python versions this package
supports, as well as the necessary dependency on python-support.
I suggest:
| - Depends: libmagplus3 ( = ${binary:Version} ), ${misc:Depends},
${shlibs:Depends}, python, python-numpy
| + Depends: libmagplus3 ( = ${binary:Version} ), ${misc:Depends},
${shlibs:Depends}, ${python:Depends}, python-numpy
When(?) this package transitions to dh_python2 it'll expand to the
equivalent dependencies. (dh_python2 also has ${python:Breaks} which can
use specify supported pythons as a Breaks instead of versioned Depends).
SR
-- System Information:
Debian Release: squeeze/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-5-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_ZA.UTF-8, LC_CTYPE=en_ZA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#608689: RM: pytris -- security issues; abandoned upstream
Package: pytris Version: 0.98+nmu1 Severity: grave Tags: security Justification: user security hole The setgid wrapper for this game makes no attempt at security. It can trivially be used to execute code as group games, which can be used to exploit other players of the game via the score file. It could be fixed - the security team suggests dropping the shared score file, and thus the wrapper. However, this package has not seen a maintainer upload in years, and is stated as being unmaintained by the author, on his website: http://korpus.juls.savba.sk/~garabik/software/ I believe the best solution is removal, from unstable, squeeze, and lenny. Radovan, are you OK with reassigning this to ftp.debian.org? SR -- System Information: Debian Release: squeeze/sid APT prefers testing APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 2.6.32-5-amd64 (SMP w/8 CPU cores) Locale: LANG=en_ZA.UTF-8, LC_CTYPE=en_ZA.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages pytris depends on: ii python 2.6.6-3+squeeze4 interactive high-level object-orie pytris recommends no packages. pytris suggests no packages. -- no debconf information -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#608561: pu: package pytris/0.98+lenny1
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: pu
Hi,
pytris in stable doesn't run. It imports a stdlib library that was
renamed in Python 2.5, which is the default Python in lenny.
There has been a fix in testing and unstable for the last six months.
Is this upload acceptable for s-p-u?
SR
-- System Information:
Debian Release: squeeze/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-5-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_ZA.UTF-8, LC_CTYPE=en_ZA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru pytris-0.98/debian/changelog pytris-0.98+lenny1/debian/changelog
--- pytris-0.98/debian/changelog2006-04-06 20:50:35.0 +0200
+++ pytris-0.98+lenny1/debian/changelog 2011-01-01 15:31:26.0 +0200
@@ -1,3 +1,11 @@
+pytris (0.98+lenny1) stable; urgency=low
+
+ * Non-maintainer upload.
+ * Support Python 2.6 (whrandom - random) (closes: #588716).
+ * Fix TypeError upon exit (closes: #589097)
+
+ -- Stefano Rivera stef...@rivera.za.net Sat, 01 Jan 2011 15:30:35 +0200
+
pytris (0.98) unstable; urgency=low
* added back forgotten manpage (closes: #360757)
diff -Nru pytris-0.98/pytris.py pytris-0.98+lenny1/pytris.py
--- pytris-0.98/pytris.py 2006-04-06 20:24:38.0 +0200
+++ pytris-0.98+lenny1/pytris.py2010-07-15 00:03:33.0 +0200
@@ -2,7 +2,7 @@
#from ncurses.curses import *
from curses import *
-import time, traceback, whrandom, copy, socket, sys, getopt
+import time, traceback, random, copy, socket, sys, getopt
import string, pickle, os, pwd
def make_tensor(*args):
@@ -241,10 +241,6 @@
display.stdscr.noutrefresh()
doupdate()
-def __del__(self):
-echo()
-nl()
-curs_set(1)
@@ -547,12 +543,12 @@
)
self.masks = masks[t]
-self.rpool = map(lambda x, self=self:whrandom.choice(self.masks),
(globalvar.next+1)*[None]) # pool of pieces
+self.rpool = map(lambda x, self=self:random.choice(self.masks),
(globalvar.next+1)*[None]) # pool of pieces
def getpiece(self):
p = self.rpool[0]
del self.rpool[0]
-self.rpool.append(whrandom.choice(self.masks))
+self.rpool.append(random.choice(self.masks))
return p
@@ -787,8 +783,8 @@
act as robot
tickv = 1
r = 1
-kpr = ord(whrandom.choice(('u', 'i', 'o')))
-if whrandom.random()0.3:
+kpr = ord(random.choice(('u', 'i', 'o')))
+if random.random()0.3:
kpr = -1
if kpr == ord('u'):
a.left()
@@ -1095,5 +1091,11 @@
finscore(0)
finalwait()
+def restore_screen():
+echo()
+nl()
+curs_set(1)
+
wrapper(disp)
+restore_screen()
Bug#608561: pu: package pytris/0.98+lenny1
+ * Support Python 2.6 (whrandom - random) (closes: #588716). Pretend that says Python 2.5 (typo) Some explanation: whrandom was deprecated since 2.1, and finally removed in 2.5. It was replaced by random. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#606533: unblock: postgrey/1.32-6
I still see no sign of this. It looks like the tarball you have in your pristine-tar branch doesn't match the one in the archive. $ sha256sum postgrey_1.32.orig.tar.gz 3ff87912668ab8dc1f4b3847203a13338a0f9b79a53a099a44b7b42c13cfa5dc postgrey_1.32.orig.tar.gz != Checksums-Sha256: b460939018b98763c74f4d3272104adb85f321bcfd9c866daff73e4e061feb24 35486 postgrey_1.32.orig.tar.gz Contents is the same, though. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#606857: vmtk: Depends on hard-coded Python version
Hi Johannes (2010.12.15_11:51:04_+0200) Well, I thought that it was only necessary to build vmtk against the same version of Python as in the vtk package and since that package uses XS-Python-Version: current I ended up with 2.6 since the current keyword has been deprecated. Aah, that sounds pretty reasonable, except that 2.7 is current in Ubuntu. As I understand it, current is deprecated because we'd like to build for all supported versions. Unless vtk can be built with all supported versions, it may be best to use pyversions -d instead of hardcoding a value in XS-P-V. OK, I must have missed that part of the Debian Python Policy. It's not really spelled out :) SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#606883: python-drizzle: Explicitly depends on Python 2.6
Hi Monty (2010.12.13_04:59:51_+0200)
In any case- if you can upload to debian for me, that'd be swell. (And
then I'm going to go back and re-org upstream code so that this all
works better - this was definitely caused by a baroque source code
arrangement, actually)
Hi, I'm afraid I'm not a DD (in the NM process...) so I can't upload to
Debian for you. I can upload it to Ubuntu, but so can you :)
This package has DPMT in uploaders, so you should easily be able to find
a sponsor there (assuming your previous sponsor isn't available).
However, DPMT packages usually live in DPMT svn, so you may need to
rehome your packaging there to get DPMT sponsors to look at it.
If I can offer some review:
1. No need to BD on python-support any more, you are using dh_python2.
2. pycompat is deprecated and serves no purpose.
3. Instead of using pyversions, use X-Python-Version and
X-Python3-Version (requires a build-dep on python-all )= 2.6.5-13~)
4. Instead of py[3]versions -sv, use -rv, which is the intersection
between supported and requested versions.
6. You can do dh $@ --with python2,python3
7. When you have muliple shell commands in a make rule line, you should
start it with set -e, otherwise build failures will be ignored
8. When you use uscan in rules, you should use --noconf, and --destdir
should be .
10. It looks like the test suite needs a drizzle server. I don't know
how you can get that to work sanely :/
Also, instead of overriding dh_build there, you should probably do
dh_auto_build, and check for nocheck in DEB_BULID_OPTIONS.
Then run the test suite on every build{,3}vers{,-dbg}.
11. lib/drizzle/libdrizzle.py seems to get modified during build.
12. I can't see setuptools being used, don't know why it's in BD.
13. It can build for Python 2.5 (dunno if it'll pass tests) if you
import future with_statement in setup.py.
14. Can I suggest the following alternative to your
dh_build, dh_install and dh_installdeb:
|override_dh_auto_build:
| set -e; \
| for i in $(buildvers) $(build3vers); do \
| python$$i setup.py build; \
| python$$i-dbg setup.py build; \
| done
|
|override_dh_auto_install:
| set -e; \
| for i in $(buildvers); do \
| python$$i setup.py install --skip-build --root
$(CURDIR)/debian/python-drizzle --install-layout=deb; \
| python$$i-dbg setup.py install --skip-build --root
$(CURDIR)/debian/python-drizzle --install-layout=deb; \
| done
| set -e; \
| for i in $(build3vers); do \
| python$$i setup.py install --skip-build --root
$(CURDIR)/debian/python3-drizzle --install-layout=deb; \
| python$$i-dbg setup.py install --skip-build --root
$(CURDIR)/debian/python3-drizzle --install-layout=deb; \
| done
|
|override_dh_strip:
|ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
| dh_strip -ppython-drizzle --dbg-package=python-drizzle-dbg
| dh_strip -ppython3-drizzle --dbg-package=python3-drizzle-dbg
|endif
|
|override_dh_installdocs:
| dh_installdocs -ppython-drizzle -ppython-drizzle-dbg
--link-doc=python-drizzle
| dh_installdocs -ppython3-drizzle -ppython3-drizzle-dbg
--link-doc=python3-drizzle
SR
--
Stefano Rivera
http://tumbleweed.org.za/
H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#606857: vmtk: Depends on hard-coded Python version
Package: vmtk Version: 0.9.0-1 Severity: normal Tags: patch Is there any reason that this package states XS-Python-Version: 2.6 ? XS-Python-Version is supposed to state the versions of python that the source supports. Then pysupport will allow it to work with the intersection of distro-supported and package-supported Python versions. Does it not support 2.7? Does it not support 2.5? As far as I can tell, the upstream code-base supports = 2.3 [0] [0]: http://www.vmtk.org/Main/Installation So I suggest: XS-Python-Version: = 2.3 Thanks, SR -- System Information: Debian Release: squeeze/sid APT prefers testing APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 2.6.32-5-amd64 (SMP w/8 CPU cores) Locale: LANG=en_ZA.UTF-8, LC_CTYPE=en_ZA.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#606860: gns3: Hardcoded Python 2.6 dependancy
Package: gns3 Version: 0.7.2-1 Severity: normal Tags: patch gns3 hard-codes a dependency on Python 2.6, rather than building with the build-time default Python version. pyversions should state the python versions supported by the codebase (in this case 2.5-, according to README). I assume this is a result of http://bugs.debian.org/573583, but it seems like an over-the-top response. In Ubuntu, we've re-hard-coded gns3 to support 2.7 only, but I recommend the following patch: diff -u gns3-0.7.2/debian/control gns3-0.7.2/debian/control --- gns3-0.7.2/debian/control +++ gns3-0.7.2/debian/control @@ -4,7 +4,7 @@ Maintainer: Erik Wenzel e...@debian.org Homepage: http://www.gns3.net/ Vcs-Browser: http://gpl.code.de/gitweb?p=gns3.git;a=summary -Build-Depends: python2.6, python-support, cdbs (= 0.4.43), debhelper (= 5.0.37.2), python-qt4-dev (=4.3) +Build-Depends: python, python-support, cdbs (= 0.4.43), debhelper (= 5.0.37.2), python-qt4-dev (=4.3) Standards-Version: 3.9.0 Package: gns3 diff -u gns3-0.7.2/debian/pyversions gns3-0.7.2/debian/pyversions --- gns3-0.7.2/debian/pyversions +++ gns3-0.7.2/debian/pyversions @@ -1 +1 @@ -2.6 +2.5- Thanks, SR -- System Information: Debian Release: squeeze/sid APT prefers testing APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 2.6.32-5-amd64 (SMP w/8 CPU cores) Locale: LANG=en_ZA.UTF-8, LC_CTYPE=en_ZA.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#606883: python-drizzle: Explicitly depends on Python 2.6
Package: python-drizzle Version: 0.08.2-1 Severity: normal Tags: patch Hi, python-drizzle has 2.6 in pyversions, when this should list the range of supported versions, preferably open-ended. This means that python-drizzle won't build for python2.7, should it be available. I suggest (assuming 2.6 is the first supported version by the upstream code): 2.6- SR -- System Information: Debian Release: squeeze/sid APT prefers testing APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 2.6.32-5-amd64 (SMP w/8 CPU cores) Locale: LANG=en_ZA.UTF-8, LC_CTYPE=en_ZA.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#605848: drupal6: install.php expects sites/default/default.settings.php to exist
Package: drupal6 Version: 6.18-1 Severity: minor Running /install.php to set up a new Drupal6 site attempts to read sites/default/default.settings.php before writing the configuration file. One can't get past the DB setup page, and no error is displayed to the user. Apache logs the following: [Fri Dec 03 23:38:27 2010] [error] [client 41.185.111.214] PHP Warning: fopen(./sites/default/default.settings.php): failed to open stream: No such file or directory in /usr/share/drupal6/includes/install.inc on line 188, referer: http://test.vhost/install.php?profile=defaultlocale=en Creating that file does the trick: zcat /usr/share/doc/drupal6/examples/default.settings.php.gz /etc/drupal/6/sites/default/default.settings.php SR -- System Information: Debian Release: squeeze/sid APT prefers testing APT policy: (500, 'testing') Architecture: amd64 (x86_64) Kernel: Linux 2.6.32-5-amd64 (SMP w/8 CPU cores) Locale: LANG=en_ZA.utf8, LC_CTYPE=en_ZA.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages drupal6 depends on: ii apache2 2.2.16-4Apache HTTP Server metapackage ii apache2-mpm-prefork [htt 2.2.16-4Apache HTTP Server - traditional n ii curl 7.21.0-1Get a file from an HTTP, HTTPS or ii dbconfig-common 1.8.46 common framework for packaging dat ii debconf [debconf-2.0]1.5.36 Debian configuration management sy ii mysql-client-5.1 [virtua 5.1.49-2MySQL database client binaries ii php5 5.3.3-4 server-side, HTML-embedded scripti ii php5-gd 5.3.3-4 GD module for php5 ii php5-mysql 5.3.3-4 MySQL module for php5 ii php5-pgsql 5.3.3-4 PostgreSQL module for php5 ii postfix [mail-transport- 2.7.1-1 High-performance mail transport ag ii postgresql-client-8.4 [p 8.4.5-0squeeze2 front-end programs for PostgreSQL ii wwwconfig-common 0.2.1 Debian web auto configuration Versions of packages drupal6 recommends: ii mysql-server 5.1.49-2 MySQL database server (metapackage ii mysql-server-5.1 [mysql-serve 5.1.49-2 MySQL database server binaries and drupal6 suggests no packages. -- Configuration Files: /etc/drupal/6/apache.conf changed [not included] -- debconf information: drupal6/pgsql/manualconf: drupal6/mysql/method: unix socket drupal6/pgsql/authmethod-user: drupal6/purge: false drupal6/remove-error: abort drupal6/dbconfig-upgrade: true drupal6/pgsql/admin-user: postgres drupal6/install-error: abort drupal6/dbconfig-remove: drupal6/db/dbname: drupal6 drupal6/pgsql/changeconf: false drupal6/internal/skip-preseed: true drupal6/pgsql/method: unix socket drupal6/missing-db-package-error: abort drupal6/upgrade-error: abort drupal6/remote/host: drupal6/db/basepath: drupal6/passwords-do-not-match: drupal6/internal/reconfiguring: false drupal6/pgsql/no-empty-passwords: drupal6/db/app-user: drupal6 drupal6/database-type: drupal6/upgrade-backup: true drupal6/dbconfig-reinstall: false drupal6/mysql/admin-user: root drupal6/pgsql/authmethod-admin: ident drupal6/remote/newhost: * drupal6/dbconfig-install: false drupal6/remote/port: -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#605660: qemu-user-static: qemu-debootstrap doesn't parse --keyring correctly
reassign 605660 qemu-user-static,pbuilder found 605660 pbuilder/0.198 user ubuntu-de...@lists.ubuntu.com usertag 605660 + ubuntu-patch natty thanks This has been fixed in Ubuntu by changing the default options pbuilder passes rather than make qemu-debootstrap understand all debootstrap's parameters: https://bugs.launchpad.net/ubuntu/+source/pbuilder/+bug/671126 --- old/pbuilderrc +++ new/pbuilderrc @@ -77,7 +77,7 @@ # Set the debootstrap variant to 'buildd' type. DEBOOTSTRAPOPTS=( '--variant=buildd' -'--keyring' '/usr/share/keyrings/ubuntu-archive-keyring.gpg' +'--keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg' ) # or unset it to make it not a buildd type. # unset DEBOOTSTRAPOPTS SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#605660: qemu-user-static: qemu-debootstrap doesn't parse --keyring correctly
Package: qemu-user-static Severity: normal Tags: experimental patch pbuilder passes arguments to qemu-debootstrap which it doesn't parse correctly: | # pbuilder --create --distribution sid --debootstrapopts --arch=armel --debootstrap qemu-debootstrap |... | I: running qemu-debootstrap | /usr/bin/qemu-debootstrap | I: Running command: debootstrap --arch armel --foreign --include=apt --variant=buildd --keyring /usr/share/keyrings/debian-archive-keyring.gpg sid . http://cdn.debian.net/debian |... | I: Running command: chroot sid /debootstrap/debootstrap --second-stage | chroot: failed to run command `/debootstrap/debootstrap': No such file or directory | E: qemu-debootstrap failed | W: Aborting with an error The bug is qemu-debootstrap can parse --keyring=foo but not --keyring foo. It shifts all the arguments up by one, and thinks sid is the target, rather than the distribution. Patch attached. SR -- System Information: Debian Release: squeeze/sid APT prefers testing APT policy: (500, 'testing') Architecture: amd64 (x86_64) Kernel: Linux 2.6.32-5-amd64 (SMP w/8 CPU cores) Locale: LANG=en_ZA.utf8, LC_CTYPE=en_ZA.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash --- old/qemu-debootstrap +++ new/qemu-debootstrap @@ -90,6 +90,14 @@ die option %s requires an argument $1 fi ;; + --keyring) +if [ $# -ge 2 -a -n $2 ]; then +opts=$opts $(escape $1) $(escape $2) +shift 2 +else +die option %s requires an argument $1 +fi + ;; --*) opts=$opts $(escape $1) shift @@ -157,6 +165,6 @@ eval run debootstrap --arch $deb_arch --foreign $opts $args mkdir -p $target/usr/bin -cp $(which qemu-$qemu_arch-static) $target/usr/bin +run cp $(which qemu-$qemu_arch-static) $target/usr/bin run chroot $target /debootstrap/debootstrap --second-stage
Bug#575582: openssh-server: privsep directory disappeared on upgrade
found 575582 1:5.1p1-5 severity 575582 serious affects 575582 upgrade-reports thanks I just ran into this on a remote upgrade. I was upgrading a (fortunately not too remote) machine using ssh + screen from my laptop. When I switched wifi AP and tried to reattach my screen, I couldn't: | $ ssh dreamcoat -t screen -DR | ssh_exchange_identification: Connection closed by remote host And in auth.log: | sshd[16271]: fatal: Missing privilege separation directory: /var/run/sshd I had to reattach from a VT and continue the upgrade there, until it got to openssh-server's postinst and I could ssh in again. There were pending debconf questions, I couldn't simply wait for it to start working again. I can easily reproduce this in a minimal VM with openssh-server installed. The problem seems to be that /var/run/sshd is removed on unpacking but only recreated in postinst. One cannot ssh in to the machine in-between. I consider this to be release-critical and am bumping the bug appropriately. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#604045: python-aalib: not importable with python2.7
severity 604045 wishlist thanks Hi Jakub (2010.11.19_18:42:44_+0200) After 0.1.1-1 - 0.2-1 upgrade I can no longer import aalib with python2.7: Notabug. Piotr uploaded to unstable (by mistake?) instead of experimental, as I requested. Thus it was built for python 2.5 and 2.6 only. I'll do an upload when 2.7 enters unstable. If you want this working sooner, I can prod him to do a no-change upload to experimental. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#575581: Raising RC
severity 575581 serious thanks Raising to RC, this broke an upgrade for me. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#575581: lenny-squeeze upgrade issue
severity 575581 important
tags 575581 -patch
severity 594451 serious
tags 594451 +patch
thanks
Russell's report, bug 575581, says:
Program version 4.7 doesn't match environment version 4.6
The error I saw (and Johan's patch addresses), bug 594451, is:
Program version 4.7 doesn't match environment version 4.8
I think 575581 is an old issue that has been superseded by 594451.
Thus reverting the severity of 575581, and bumping 594451, as it affects
lenny-squeeze upgrades. Not merging these bugs as they are reporting
different symptoms.
Johan's patch needs work, it checks for the existence of db4.7_upgrade
and then calls db4.8_upgrade.
However, I prefer Stephen's approach, as upgrading the DB in preinst
does appear unnecessary (and is certainly currently broken). Can anyone
who knows a little more about libberkeleydb-perl confirm that?
Patch for 594451 attached.
SR
--
Stefano Rivera
http://tumbleweed.org.za/
H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127
diff -u postgrey-1.32/debian/control postgrey-1.32/debian/control
--- postgrey-1.32/debian/control
+++ postgrey-1.32/debian/control
@@ -14,7 +14,7 @@
Package: postgrey
Architecture: all
Depends: adduser, debconf, libberkeleydb-perl (= 0.39-1), libnet-dns-perl,
- libnet-server-perl (= 0.87), perl, ucf (= 0.28), db4.7-util, ${misc:Depends}
+ libnet-server-perl (= 0.87), perl, ucf (= 0.28), ${misc:Depends}
Conflicts: libsys-syslog-perl ( 0.21)
Recommends: libdigest-sha1-perl, libnet-rblclient-perl, libparse-syslog-perl,
postfix | exim4
reverted:
--- postgrey-1.32/debian/preinst
+++ postgrey-1.32.orig/debian/preinst
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# summary of how this script can be called:
-#* new-preinst `install'
-#* new-preinst `install' old-version
-#* new-preinst `upgrade' old-version
-#* old-preinst `abort-upgrade' new-version
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case $1 in
-install)
-;;
-
-upgrade)
-set +e
-OLDVERSION=$2
-DBDIR=/var/lib/postgrey
-dpkg --compare-versions $OLDVERSION lt 1.32-1
-if [ $? -eq 0 ]; then
-set -e
-if [ -d $DBDIR -a -f /usr/bin/db4.7_upgrade ]; then
-if [ -f $DBDIR/postgrey.db ]; then
-db4.7_upgrade -h $DBDIR postgrey.db
-fi
-if [ -f $DBDIR/postgrey_clients.db ]; then
-db4.7_upgrade -h $DBDIR postgrey_clients.db
-fi
-fi
-fi
-;;
-
-abort-upgrade)
-;;
-
-*)
-echo preinst called with unknown argument \`$1' 2
-exit 1
-;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff -u postgrey-1.32/debian/changelog postgrey-1.32/debian/changelog
--- postgrey-1.32/debian/changelog
+++ postgrey-1.32/debian/changelog
@@ -1,3 +1,9 @@
+postgrey (1.32-5.1) unstable; urgency=low
+
+ * Drop preinst and thus dependency on dbutil-4.7. (Closes: #594451)
+
+ -- Stefano Rivera stef...@rivera.za.net Tue, 16 Nov 2010 14:26:45 +0200
+
postgrey (1.32-5) unstable; urgency=low
[ Antonio Radici ]
Bug#564978: elmerfem: ftbfs with gcc-4.5
tags 564978 + patch thanks I just got this package to build with gcc 4.5 for Ubuntu, the fix was relatively simple (and a definite bug in the source). Attached. SR Description: Fix FTBFS with GCC 4.5, passing non-POD data to printf. Author: Stefano Rivera stef...@rivera.za.net Bug-Debian: http://bugs.debian.org/564978 Last-Update: 2010-11-08 --- a/ElmerGUI/PythonQt/src/PythonQtImporter.cpp +++ b/ElmerGUI/PythonQt/src/PythonQtImporter.cpp @@ -233,7 +233,7 @@ Py_DECREF(code); if (Py_VerboseFlag) PySys_WriteStderr(import %s # loaded from %s\n, - fullname, modpath); + fullname, (char*)modpath.toLatin1().data()); return mod; error: Py_DECREF(code);
Bug#602835: elmerfem: more binutils-gold issues
Package: elmerfem
Version: FTBFS with binutils-gold
Severity: minor
Tags: patch
User: peter.fritzs...@gmx.de
Usertags: no-add-needed
Hi, looks like there are still some binutils-gold issues remaining,
causing FTBFS on Ubuntu natty, e.g.
g++ -g -O2 -I/tmp/buildd/elmerfem-5.5.0.svn.4716.dfsg/debian/tmp/usr/include
-I/usr/include/freetype2 -fPIC -I/usr/include -pthread -pthread
-I/usr/include/tk8.5 -I/usr/include/tc
l8.5 -Wl,-Bsymbolic-functions -o ElmerFront ecif_body2D.o ecif_body3D.o
ecif_body.o ecif_bodyElement1D.o ecif_bodyElement2D.o ecif_bodyElement3D.o
ecif_bodyElement.o ecif_bodyElem
entGroup.o ecif_bodyElementLoop.o ecif_bodyForce.o ecif_bodyLayer.o
ecif_bodyParameter.o ecif_boundaryCondition.o ecif_boundaryParameter.o
ecif_boundbox.o ecif_calculator.o ecif_co
nstant.o ecif_const.o ecif_control.o ecif_coordinate.o ecif_datafile.o
ecif_def_trx.o ecif_equation.o ecif_equationVariables.o ecif_func.o
ecif_geometry.o ecif_gridH.o ecif_gridPar
ameter.o ecif_initialCondition.o ecif_inputAbaqus.o ecif_input.o
ecif_inputEgf.o ecif_inputElmer.o ecif_inputEmf.o ecif_inputFidap.o
ecif_inputFront.o ecif_inputIdeas.o ecif_inputI
deasWF.o ecif_inputIges.o ecif_inputThetis.o ecif_main.o ecif_material.o
ecif_mesh.o ecif_model_aux.o ecif_model.o ecif_modelMeshManager.o
ecif_modelObject.o ecif_modelOutputManage
r.o ecif_modelParameter.o ecif_nurbs.o ecif_parameter.o ecif_parameterField.o
ecif_process.o ecif_renderer.o ecif_renderer_OGL.o ecif_simulationParameter.o
ecif_solverControl.o eci
f_solver.o ecif_timer.o ecif_timestep.o ecif_userinterface_TCL.o frontlib.o
ecif_userSettings.o -ldl -lstdc++ -lm
-L/tmp/buildd/elmerfem-5.5.0.svn.4716.dfsg/debian/tmp/usr/lib -L/
usr/lib -lmatc -leioc -ldl -lstdc++ -lm
-L/tmp/buildd/elmerfem-5.5.0.svn.4716.dfsg/debian/tmp/usr/lib -L/usr/lib -lGL
-lm -lGLU -lGL -lm -L/usr/lib -ltk8.5 -ltcl8.5
/usr/bin/ld: ecif_renderer_OGL.o: undefined reference to symbol
'XSetStandardProperties'
/usr/bin/ld: note: 'XSetStandardProperties' is defined in DSO
/usr/lib64/libX11.so.6 so try adding it to the linker command line
/usr/lib64/libX11.so.6: could not read symbols: Invalid operation
collect2: ld returned 1 exit status
Patch attached.
SR
-- System Information:
Debian Release: squeeze/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-5-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_ZA.UTF-8, LC_CTYPE=en_ZA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Description: Explicitly link to all required libraries for binutils-gold.
Author: Stefano Rivera stef...@rivera.za.net
Last-Update: 2010-11-08
--- a/front/configure.in
+++ b/front/configure.in
@@ -45,6 +45,7 @@
AC_CHECK_LIB(stdc++, main)
AC_CHECK_LIB(dl, main)
+AC_CHECK_LIB(X11, XGetErrorText)
LIBS=$LIBS $MATC_LIBS $EIOC_LIBS $LIBS $GL_LIBS $GLU_LIBS $TCLTK_LIBS
ACX_PLATFORM_DEFS
--- a/post/configure.in
+++ b/post/configure.in
@@ -50,6 +50,7 @@
sinclude(acx_gl.m4)
ACX_CHECK_GL
ACX_CHECK_GLU
+AC_CHECK_LIB(X11, XGetErrorText)
ACX_TCLTK([],[AC_MSG_ERROR([Tcl/tk not found, use TCLTK_LIBS environment variable or --with-tcltk=-L/path/to/ -ltcl8.4 -ltk8.4 to point to it's location.])])
CPPFLAGS=$CPPFLAGS $TCLTK_INCLUDE
--- a/ElmerGUI/ElmerGUI.pri
+++ b/ElmerGUI/ElmerGUI.pri
@@ -77,9 +77,21 @@
unix {
VTK_INCLUDEPATH = /usr/include/vtk-5.4
VTK_LIBPATH = /usr/lib
- VTK_LIBS = -lvtkHybrid \
- -lvtkWidgets \
- -lQVTK
+ VTK_LIBS = -lQVTK \
+ -lvtkCommon \
+ -lvtkDICOMParser \
+ -lvtkFiltering \
+ -lvtkGenericFiltering \
+ -lvtkGraphics \
+ -lvtkHybrid \
+ -lvtkIO \
+ -lvtkImaging \
+ -lvtkInfovis \
+ -lvtkNetCDF \
+ -lvtkRendering \
+ -lvtkViews \
+ -lvtkVolumeRendering \
+ -lvtkWidgets
}
win32 {
@@ -129,7 +141,23 @@
unix {
OCC_INCLUDEPATH = /usr/include/opencascade
OCC_LIBPATH = /usr/lib
- OCC_LIBS = -lTKBRep -lTKSTL -lTKSTEP -lTKIGES
+ OCC_LIBS = -lTKSTL \
+ -lTKBRep \
+ -lTKernel \
+ -lTKG2d \
+ -lTKG3d \
+ -lTKGeomAlgo \
+ -lTKGeomBase \
+ -lTKMath \
+ -lTKMesh \
+ -lTKShHealing \
+ -lTKSTEP \
+ -lTKSTEP209 \
+ -lTKSTEPAttr \
+ -lTKSTEPBase \
+ -lTKIGES \
+ -lTKTopAlgo \
+ -lTKXSBase
}
win32 {
Bug#585142: twisted: Leaves dropin.cache lying around in python2.4/site-packages
Hi Matthias (2010.10.25_18:52:56_+0200) $ find /usr/lib/python2.4/site-packages/twisted/ | wc -l 452 that's expected, part of the package. Err? No it isn't. It was a python-central post-install symlink farm in lenny, replaced with a dh_python2 in-package farm in squeeze. This old 2.4 farm should have been cleaned up on upgrade. $ dpkg -L python-twisted-core | grep 2.4 $ aptitude search '~c' $ aptitude search '~i~n2\.4' $ is the cache file still found? No. I think you can close this bug. However I find the above problem a little more serious. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#585142: twisted: Leaves dropin.cache lying around in python2.4/site-packages
Hi Matthias (2010.07.26_14:00:42_+0200) 10.0.0 had them, 10.1.0 doesn't. 10.0.0 was wrong. The dropin.cache files are in the symlink farm in 10.1.0-3. For now, please re-install python-twisted-core 10.1.0-2, which should remove the cache file. I know, not a perfect solution. Just re-tested this, now the entire symlink farm for 2.4 remains: $ find /usr/lib/python2.4/site-packages/twisted/ | wc -l 452 SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#556752: FTBFS with binutils-gold
tags 556752 + patch found 556752 1.4.0-2 thanks The workaround we applied in Ubuntu is attached. It has been fixed upstream in SVN. 1.5.0 will carry the fix. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 diff -u chocolate-doom-1.4.0/debian/rules chocolate-doom-1.4.0/debian/rules --- chocolate-doom-1.4.0/debian/rules +++ chocolate-doom-1.4.0/debian/rules @@ -15,6 +15,9 @@ CFLAGS += -O2 endif +LDFLAGS += -lm +export LDFLAGS + config.status: configure dh_testdir
Bug#544132: A more general fix
unarchive 544132
reopen 544132
found 544132 1:2.4.6
thanks
This is still an issue with other Ubuntu-like archives, i.e.
archive.canonical.com, which I mirror internally for bandwidth-saving
reasons.
I'm using this hacky patch, but a more general solution would be great:
--
|--- old/debmirror2010-04-11 20:32:07.0 +0200
|+++ new/debmirror2010-10-19 12:10:48.0 +0200
|@@ -1906,7 +1906,7 @@
|
| if ($origin eq none) {
| $codename = $dist_raw;
|- } elsif ($origin eq Ubuntu) {
|+ } elsif ($origin eq Ubuntu || $origin eq Canonical) {
| if ($suite) {
| say(Ubuntu Release file: using Suite ($suite).);
| $codename = $suite;
--
SR
--
Stefano Rivera
http://tumbleweed.org.za/
H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#600505: AttributeError: UnitDisplayDatabasePlugin instance has no attribute 'db'
Hi Christian (2010.10.18_13:10:35_+0200) This bug was against gourmet 0.15.2 now we have 0.15.6 and this bug has been fixed. Search for 'Ignoring sqlalchemy problem' in the source code. I see that, but that's not the patch that I attached. Is it a fix for the same bug, because from a quick glance, it doesn't appear to be? The LP comment I linked to includes a pile of bugs (which makes tracking nice and easy :/ ) SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#600505: AttributeError: UnitDisplayDatabasePlugin instance has no attribute 'db'
Package: gourmet Version: 0.15.6-1 Severity: normal Tags: patch upstream User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu natty ubuntu-patch Forwarded: https://sourceforge.net/tracker/?func=detailaid=3089267group_id=108118atid=649654 Hi, Ubuntu has been carrying the following patch to gourmet in response to [0]. It looks like it was forwarded in Bug #530841, but you probably missed it. I've forwarded it upstream. [0]: https://bugs.launchpad.net/ubuntu/+source/gourmet/+bug/431806/comments/24 SR -- System Information: Debian Release: squeeze/sid APT prefers testing APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 2.6.32-5-amd64 (SMP w/8 CPU cores) Locale: LANG=en_ZA.UTF-8, LC_CTYPE=en_ZA.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 Description: don't remove a non-active plugin or an entry from a non-existent database Forwarded: https://sourceforge.net/tracker/?func=detailaid=3089267group_id=108118atid=649654 Bug-Ubuntu: https://launchpad.net/bugs/431806 Author: Jamie Strandboge ja...@ubuntu.com Last-Update: 2010-10-17 --- a/src/lib/plugin_loader.py +++ b/src/lib/plugin_loader.py @@ -174,7 +174,8 @@ for plugin in plugin_set.plugins: if self.instantiated_plugins.has_key(plugin): self.instantiated_plugins[plugin].remove() -self.active_plugins.remove(plugin) +if plugin in self.active_plugins: +self.active_plugins.remove(plugin) def get_instantiated_plugin (self, plugin): if self.instantiated_plugins.has_key(plugin): --- a/src/lib/plugin.py +++ b/src/lib/plugin.py @@ -243,7 +243,8 @@ self.active = True def remove (self): -self.db.remove_hook(plugin_loader.POST,'setup_tables',self.create_tables) +if hasattr(self, db): +self.db.remove_hook(plugin_loader.POST,'setup_tables',self.create_tables) self.active = False def create_tables (self):
Bug#586838: Looks fixed
This looks like it was fixed by both binnmu and 1.5.4.cvs.20100912-1 SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#586849: Looks fixed
This looks like it was fixed by both binnmu and 1.5.4.cvs.20100912-1 SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#600015: Confirmed and fixed
tags 600015 + patch thanks I can reproduce this, the problem isn't with pngs but with cur and ico files. Patch attached. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 === modified file 'gextractwinicons' --- old/gextractwinicons 2010-10-17 19:42:28 + +++ new/gextractwinicons 2010-10-17 19:43:12 + @@ -312,7 +312,7 @@ def on_btnSaveResources_clicked(widget, for iter in modelResources: tmpFile = os.path.join(tempdir, '%s_%s_%s_%s.%s' % ( os.path.basename(btnFilePath.get_filename()), - iter[1], iter[3], iter[4], iter[1] == '12' and 'cur' or 'ico' + iter[1], iter[3], iter[4], iter[1] == 12 and 'cur' or 'ico' )) if iter[0]: # Copy ico/cur file
Bug#410130: Patch
tags 410130 + patch thanks Patch attached. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 --- old/src/ConfigDatabase.cpp +++ new/src/ConfigDatabase.cpp @@ -270,7 +270,7 @@ // Strip the config:// part if presents. std::string params( uri ); -unsigned int i = params.find(config://); +std::string::size_type i = params.find(config://); if( i != std::string::npos) params.erase(i, strlen(config://) );
Bug#511547: installation fails
Package: yiff-server Version: 2.14.5-7 Severity: normal Hi, I can also confirm this, and there are a bunch of users on Ubuntu who are suffering from it: http://launchpad.net/bugs/560703 I think that if a service is known to fail to start for some portion of users, the failure shouldn't abort the installation script, I suggest the attached patch as a workaround. The problem is that yiff won't start if the user already has /dev/dsp open: # yiff --foreground /etc/yiff/yiffrc /dev/dsp: Cannot open for playing. SR -- System Information: Debian Release: squeeze/sid APT prefers testing APT policy: (990, 'testing'), (500, 'testing-proposed-updates'), (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 2.6.32-5-amd64 (SMP w/2 CPU cores) Locale: LANG=en_ZA.UTF-8, LC_CTYPE=en_ZA.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages yiff-server depends on: ii adduser 3.112 add and remove users and groups ii debconf [debconf-2.0] 1.5.35 Debian configuration management sy ii libc6 2.11.2-6 Embedded GNU C Library: Shared lib ii liby2-14 2.14.5-7 Y Sound Server Library yiff-server recommends no packages. yiff-server suggests no packages. -- debconf information: yiff-server/mixer: false diff -u yiff-2.14.5/debian/rules yiff-2.14.5/debian/rules --- yiff-2.14.5/debian/rules +++ yiff-2.14.5/debian/rules @@ -88,7 +88,7 @@ dh_installdebconf dh_installdocs dh_installmenu - dh_installinit + dh_installinit --error-handler=true dh_installman dh_installchangelogs dh_link
Bug#597180: A Patch
severity 597180 important tags 597180 + patch thanks Justification: Policy 4.6, Squeeze RC Policy 4 Here is a debdiff that will catch future manpage build failures (the policy issue), and add the necessary Build-Depends. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 diff -Nru valgrind-3.6.0~svn11254/autom4te.cache/output.0 valgrind-3.6.0~svn11254.1/autom4te.cache/output.0 diff -Nru valgrind-3.6.0~svn11254/autom4te.cache/output.1 valgrind-3.6.0~svn11254.1/autom4te.cache/output.1 diff -Nru valgrind-3.6.0~svn11254/autom4te.cache/requests valgrind-3.6.0~svn11254.1/autom4te.cache/requests diff -Nru valgrind-3.6.0~svn11254/autom4te.cache/traces.0 valgrind-3.6.0~svn11254.1/autom4te.cache/traces.0 diff -Nru valgrind-3.6.0~svn11254/autom4te.cache/traces.1 valgrind-3.6.0~svn11254.1/autom4te.cache/traces.1 diff -Nru valgrind-3.6.0~svn11254/debian/changelog valgrind-3.6.0~svn11254.1/debian/changelog --- valgrind-3.6.0~svn11254/debian/changelog2010-10-05 01:09:59.0 +0200 +++ valgrind-3.6.0~svn11254.1/debian/changelog 2010-10-05 00:50:48.0 +0200 @@ -1,3 +1,11 @@ +valgrind (1:3.6.0~svn11254.1) unstable; urgency=low + + * Non-maintainer upload. + * Build-Depend on docbook-xml (Closes: #597180) + * Detect errors while building manpages. + + -- Stefano Rivera stef...@rivera.za.net Tue, 05 Oct 2010 00:49:02 +0200 + valgrind (1:3.6.0~svn11254) unstable; urgency=low * New SVN snapshot. diff -Nru valgrind-3.6.0~svn11254/debian/control valgrind-3.6.0~svn11254.1/debian/control --- valgrind-3.6.0~svn11254/debian/control 2010-10-05 01:09:59.0 +0200 +++ valgrind-3.6.0~svn11254.1/debian/control2010-10-05 00:48:51.0 +0200 @@ -2,7 +2,7 @@ Section: devel Priority: optional Maintainer: Andrés Roldán arol...@debian.org -Build-Depends: debhelper ( 3.0.0), libc6-dev ( 2.3.0), autotools-dev, dpatch ( 2.0.0), gdb, gcc-multilib [amd64], libc6-dev-i386 ( 2.3.0) [amd64], docbook, docbook-xsl, xsltproc +Build-Depends: debhelper ( 3.0.0), libc6-dev ( 2.3.0), autotools-dev, dpatch ( 2.0.0), gdb, gcc-multilib [amd64], libc6-dev-i386 ( 2.3.0) [amd64], docbook, docbook-xml, docbook-xsl, xsltproc Standards-Version: 3.7.3.0 Package: valgrind diff -Nru valgrind-3.6.0~svn11254/debian/patches/00list valgrind-3.6.0~svn11254.1/debian/patches/00list --- valgrind-3.6.0~svn11254/debian/patches/00list 2010-10-05 01:09:59.0 +0200 +++ valgrind-3.6.0~svn11254.1/debian/patches/00list 2010-10-05 00:56:15.0 +0200 @@ -2,3 +2,4 @@ #01_pcm-ioctl 01_more-vg-n-segments 02_version +03_catch-doc-bulid-failures diff -Nru valgrind-3.6.0~svn11254/debian/patches/03_catch-doc-bulid-failures.dpatch valgrind-3.6.0~svn11254.1/debian/patches/03_catch-doc-bulid-failures.dpatch --- valgrind-3.6.0~svn11254/debian/patches/03_catch-doc-bulid-failures.dpatch 1970-01-01 02:00:00.0 +0200 +++ valgrind-3.6.0~svn11254.1/debian/patches/03_catch-doc-bulid-failures.dpatch 2010-10-05 01:02:38.0 +0200 @@ -0,0 +1,81 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_catch-doc-bulid-failures.dpatch by Stefano Rivera stef...@rivera.za.net +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Detect failure in doc building (Closes: #597180) + +...@dpatch@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.0~svn11254.1~/docs/Makefile.am valgrind-3.6.0~svn11254.1/docs/Makefile.am +--- valgrind-3.6.0~svn11254.1~/docs/Makefile.am2010-08-09 16:11:17.0 +0200 valgrind-3.6.0~svn11254.1/docs/Makefile.am 2010-10-05 01:00:49.268280973 +0200 +@@ -125,6 +125,7 @@ + + # the valgrind manpages + man-pages: ++ set -e; \ + for x in $(XSL_MAN_STYLES) ; do \ + if test -f $$x; then \ + echo Using manpage stylesheet: $$x; \ +@@ -176,10 +177,12 @@ + # be the one to handle the else/endif parts, not GNU make + # as we intend. + install-data-hook: ++ set -e; \ + if test -r html ; then \ + mkdir -p $(DESTDIR)$(datadir)/doc/valgrind; \ + cp -r html $(DESTDIR)$(datadir)/doc/valgrind; \ + fi ++ set -e; \ + for f in *.1 ; do \ + if test -r $$f ; then \ + mkdir -p $(DESTDIR)$(mandir)/man1; \ +@@ -187,10 +190,12 @@ + fi \ + done + ifeq ($(BUILD_ALL_DOCS),yes) ++ set -e; \ + if test -r index.pdf ; then \ + mkdir -p $(DESTDIR)$(datadir)/doc/valgrind; \ + cp index.pdf $(DESTDIR)$(datadir)/doc/valgrind/valgrind_manual.pdf; \ + fi ++ set -e; \ + if test -r index.ps ; then \ + mkdir -p $(DESTDIR)$(datadir)/doc/valgrind; \ + cp index.ps $(DESTDIR)$(datadir)/doc/valgrind/valgrind_manual.ps; \ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch
Bug#598990: RM: re2 -- ROM; NPOASR; moved to experimental, pending upstream ABI stability
Package: ftp.debian.org Severity: normal re2 will live as a static-only library in experimental until upstream decides that stable ABIs are nice to have. Removed from squeeze due to Bug #591935 (on this topic). Thanks, SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 signature.asc Description: Digital signature
Bug#598520: python-scipy: scipy.weave.inline compilation fails with gcc 4.4
Package: python-scipy
Version: 0.7.2+dfsg1-1
Severity: normal
Tags: upstream
Bug #455661 applies to scipy too, thanks to an embedded blitz.
Test case from the Ubuntu bug (LP: #302649) attached, together with full
output.
| In file included from
/usr/lib/python2.6/dist-packages/scipy/weave/blitz/blitz/applics.h:394,
| from
/usr/lib/python2.6/dist-packages/scipy/weave/blitz/blitz/vecexpr.h:26,
| from
/usr/lib/python2.6/dist-packages/scipy/weave/blitz/blitz/vecpick.cc:16,
| from
/usr/lib/python2.6/dist-packages/scipy/weave/blitz/blitz/vecpick.h:287,
| from
/usr/lib/python2.6/dist-packages/scipy/weave/blitz/blitz/vector.h:443,
| from
/usr/lib/python2.6/dist-packages/scipy/weave/blitz/blitz/tinyvec.h:424,
| from
/usr/lib/python2.6/dist-packages/scipy/weave/blitz/blitz/array-impl.h:38,
| from
/usr/lib/python2.6/dist-packages/scipy/weave/blitz/blitz/array.h:26,
| from
/home/stefanor/.python26_compiled/sc_3ec397f0c53c3b3e50e2375deba7b7ed2.cpp:11:
| /usr/lib/python2.6/dist-packages/scipy/weave/blitz/blitz/mathfunc.h: In
static member function ‘static long int blitz::_bz_abslong int::apply(long
int)’:
| /usr/lib/python2.6/dist-packages/scipy/weave/blitz/blitz/mathfunc.h:45:
error: ‘labs’ is not a member of ‘std’
etc.
SR
-- System Information:
Debian Release: squeeze/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-5-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_ZA.UTF-8, LC_CTYPE=en_ZA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages python-scipy depends on:
ii libamd2.2.0 1:3.4.0-2 approximate minimum degree orderin
ii libblas3gf [libblas.so.3gf] 1.2-7 Basic Linear Algebra Reference imp
ii libc62.11.2-5Embedded GNU C Library: Shared lib
ii libgcc1 1:4.4.4-8 GCC support library
ii libgfortran3 4.4.4-8 Runtime library for GNU Fortran ap
ii liblapack3gf [liblapack.so.3 3.2.1-8 library of linear algebra routines
ii libstdc++6 4.4.4-8 The GNU Standard C++ Library v3
ii libumfpack5.4.0 1:3.4.0-2 sparse LU factorization library
ii python 2.6.5-13interactive high-level object-orie
ii python-central 0.6.16+nmu1 register and build utility for Pyt
ii python-numpy 1:1.4.1-4 Numerical Python adds a fast array
Versions of packages python-scipy recommends:
ii g++ [c++-compiler]4:4.4.4-2 The GNU C++ compiler
ii g++-4.4 [c++-compiler]4.4.4-8The GNU C++ compiler
Versions of packages python-scipy suggests:
pn python-profiler none (no description available)
-- no debconf information
--
Stefano Rivera
http://tumbleweed.org.za/
H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127
import scipy
import scipy.weave
import scipy.weave.converters
foo = scipy.zeros((10,10), dtype=scipy.uint8)
code = \
int x, y;
for (x = 0; x 10; x++)
{
for (y = 0; y 10; y++)
{
foo(x, y) += 1;
}
}
scipy.weave.inline(code, ['foo'], type_converters=scipy.weave.converters.blitz)
print foo
In file included from
/usr/lib/python2.6/dist-packages/scipy/weave/blitz/blitz/applics.h:394,
from
/usr/lib/python2.6/dist-packages/scipy/weave/blitz/blitz/vecexpr.h:26,
from
/usr/lib/python2.6/dist-packages/scipy/weave/blitz/blitz/vecpick.cc:16,
from
/usr/lib/python2.6/dist-packages/scipy/weave/blitz/blitz/vecpick.h:287,
from
/usr/lib/python2.6/dist-packages/scipy/weave/blitz/blitz/vector.h:443,
from
/usr/lib/python2.6/dist-packages/scipy/weave/blitz/blitz/tinyvec.h:424,
from
/usr/lib/python2.6/dist-packages/scipy/weave/blitz/blitz/array-impl.h:38,
from
/usr/lib/python2.6/dist-packages/scipy/weave/blitz/blitz/array.h:26,
from
/home/stefanor/.python26_compiled/sc_3ec397f0c53c3b3e50e2375deba7b7ed2.cpp:11:
/usr/lib/python2.6/dist-packages/scipy/weave/blitz/blitz/mathfunc.h: In static
member function ‘static long int blitz::_bz_abslong int::apply(long int)’:
/usr/lib/python2.6/dist-packages/scipy/weave/blitz/blitz/mathfunc.h:45: error:
‘labs’ is not a member of ‘std’
In file included from
/usr/lib/python2.6/dist-packages/scipy/weave/blitz/blitz/array/funcs.h:23,
from
/usr/lib/python2.6/dist-packages/scipy/weave/blitz/blitz/array/newet.h:23,
from
/usr/lib/python2.6/dist-packages/scipy/weave/blitz/blitz/array/et.h:21,
from
/usr/lib/python2.6/dist-packages/scipy/weave/blitz/blitz/array-impl.h:2509,
from
/usr/lib/python2.6/dist-packages/scipy/weave/blitz/blitz/array.h
Bug#598520: Patch from Ubuntu
tags 598520 patch
thanks
Patch adapted from the Ubuntu patch attached.
SR
--
Stefano Rivera
http://tumbleweed.org.za/
H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127
diff -Nru python-scipy-0.7.2+dfsg1/debian/changelog
python-scipy-0.7.2+dfsg1/debian/changelog
--- python-scipy-0.7.2+dfsg1/debian/changelog 2010-07-31 00:35:56.0
+0200
+++ python-scipy-0.7.2+dfsg1/debian/changelog 2010-09-29 19:08:07.0
+0200
@@ -1,3 +1,15 @@
+python-scipy (0.7.2+dfsg1-2) UNRELEASED; urgency=low
+
+ [ Luca Falavigna ]
+ * Remove myself from Uploaders.
+
+ [ Stefano Rivera ]
+ * Team Upload
+ * debian/patches/blitz++.patch: Fix scipy.weave.inline compilations. Thanks
+to Sameer Morar (Closes: #598520, LP: #302649)
+
+ -- Debian Python Modules Team python-modules-t...@lists.alioth.debian.org
Wed, 29 Sep 2010 15:22:10 +0200
+
python-scipy (0.7.2+dfsg1-1) unstable; urgency=low
* Release with a new source tarball with missing cython source files
diff -Nru python-scipy-0.7.2+dfsg1/debian/control
python-scipy-0.7.2+dfsg1/debian/control
--- python-scipy-0.7.2+dfsg1/debian/control 2010-07-30 23:29:44.0
+0200
+++ python-scipy-0.7.2+dfsg1/debian/control 2010-07-31 12:46:30.0
+0200
@@ -2,7 +2,7 @@
Section: python
Priority: extra
Maintainer: Debian Python Modules Team
python-modules-t...@lists.alioth.debian.org
-Uploaders: Alexandre Fayolle afayo...@debian.org, Ondrej Certik
ond...@certik.cz, David Cournapeau courn...@gmail.com, Luca Falavigna
dktrkr...@debian.org, Varun Hiremath va...@debian.org
+Uploaders: Alexandre Fayolle afayo...@debian.org, Ondrej Certik
ond...@certik.cz, David Cournapeau courn...@gmail.com, Varun Hiremath
va...@debian.org
Build-Depends: debhelper (= 7.0.50~), python-all-dev (= 2.5.4-1~),
python-all-dbg (= 2.5.4-1~), python-central (= 0.6.7),
python-numpy (= 1:1.4.1-4~), python-numpy-dbg (= 1:1.2.0),
diff -Nru python-scipy-0.7.2+dfsg1/debian/patches/blitz++.patch
python-scipy-0.7.2+dfsg1/debian/patches/blitz++.patch
--- python-scipy-0.7.2+dfsg1/debian/patches/blitz++.patch 1970-01-01
02:00:00.0 +0200
+++ python-scipy-0.7.2+dfsg1/debian/patches/blitz++.patch 2010-09-29
19:09:02.0 +0200
@@ -0,0 +1,45 @@
+Description: Fixes scipy.weave.inline compalition with g++ 4.3 and upwards
+Author: Sameer Morar smo...@gmail.com
+Forwarded: http://projects.scipy.org/scipy/scipy/ticket/739
+Bug-Debian: http://bugs.debian.org/598520
+Bug-Ubuntu: https://launchpad.net/bugs/302649
+
+Index: python-scipy-0.7.2/scipy/weave/blitz/blitz/blitz.h
+===
+--- python-scipy-0.7.2.orig/scipy/weave/blitz/blitz/blitz.h2010-09-29
13:17:01.539914362 +0200
python-scipy-0.7.2/scipy/weave/blitz/blitz/blitz.h 2010-09-29
13:17:02.091914362 +0200
+@@ -65,6 +65,8 @@
+
+ #define BZ_THROW // Needed in blitz/numinquire.h
+
++#include cstdlib
++
+ BZ_NAMESPACE(blitz)
+
+ #ifdef BZ_HAVE_STD
+Index: python-scipy-0.7.2/scipy/weave/blitz/blitz/mathfunc.h
+===
+--- python-scipy-0.7.2.orig/scipy/weave/blitz/blitz/mathfunc.h 2010-09-29
13:17:01.507914362 +0200
python-scipy-0.7.2/scipy/weave/blitz/blitz/mathfunc.h 2010-09-29
13:17:02.099914362 +0200
+@@ -12,6 +12,8 @@
+ #include blitz/prettyprint.h
+ #endif
+
++#include cstdlib
++
+ BZ_NAMESPACE(blitz)
+
+ // abs(P_numtype1)Absolute value
+Index: python-scipy-0.7.2/scipy/weave/blitz/blitz/prettyprint.h
+===
+--- python-scipy-0.7.2.orig/scipy/weave/blitz/blitz/prettyprint.h
2010-09-29 13:20:04.091914362 +0200
python-scipy-0.7.2/scipy/weave/blitz/blitz/prettyprint.h 2010-09-29
13:18:19.611914362 +0200
+@@ -22,6 +22,8 @@
+ #ifndef BZ_PRETTYPRINT_H
+ #define BZ_PRETTYPRINT_H
+
++#include cstdlib
++
+ BZ_NAMESPACE(blitz)
+
+ class prettyPrintFormat {
diff -Nru python-scipy-0.7.2+dfsg1/debian/patches/series
python-scipy-0.7.2+dfsg1/debian/patches/series
--- python-scipy-0.7.2+dfsg1/debian/patches/series 2010-06-07
14:51:28.0 +0200
+++ python-scipy-0.7.2+dfsg1/debian/patches/series 2010-09-29
15:22:29.0 +0200
@@ -1,2 +1,3 @@
restore_sys_argv.patch
string_exception.patch
+blitz++.patch
Bug#597262: Complete patch
Dann's patch appears to be incomplete. I applied this patch in Ubuntu.
NMUable debdiff attached.
SR
--
Stefano Rivera
http://tumbleweed.org.za/
H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127
diff -Nru bip-0.8.6/debian/changelog bip-0.8.6/debian/changelog
--- bip-0.8.6/debian/changelog 2010-09-12 18:58:56.0 +0200
+++ bip-0.8.6/debian/changelog 2010-09-26 17:51:41.0 +0200
@@ -1,3 +1,12 @@
+bip (0.8.6-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Patch armel-rename-user: sys/user.h on armel has a conflicting definition
+of 'struct user'. Rename bip's structure to avoid the conflict.
+Thanks to Dann Frazier (Closes: #597262)
+
+ -- Stefano Rivera stef...@rivera.za.net Sun, 26 Sep 2010 17:50:42 +0200
+
bip (0.8.6-1) unstable; urgency=low
* New upstream release (Closes: #595409).
diff -Nru bip-0.8.6/debian/patches/armel-rename-user
bip-0.8.6/debian/patches/armel-rename-user
--- bip-0.8.6/debian/patches/armel-rename-user 1970-01-01 02:00:00.0
+0200
+++ bip-0.8.6/debian/patches/armel-rename-user 2010-09-26 17:24:09.0
+0200
@@ -0,0 +1,203 @@
+Description: sys/user.h on armel has a conflicting definition of 'struct user'.
+ This patch renames bip's structure to avoid the conflict.
+Author: dann frazier da...@debian.org, Stefano Rivera stef...@rivera.za.net
+Origin: http://bugs.debian.org/597262
+Bug-Debian: http://bugs.debian.org/597262
+--- a/src/irc.h
b/src/irc.h
+@@ -58,7 +58,7 @@
+ #define IRC_TYPE_LOGING_CLIENT (2)
+ #define IRC_TYPE_TRUST_CLIENT (3)
+
+-struct user {
++struct bipuser {
+ /** client connection static data **/
+
+ char *name;
+@@ -139,7 +139,7 @@
+ hash_t chan_infos; /* channels we want */
+ list_t chan_infos_order;/* for order only */
+
+- struct user *user;
++ struct bipuser *user;
+
+ /** server connection static data **/
+ /* server list */
+--- a/src/log.c
b/src/log.c
+@@ -1195,7 +1195,7 @@
+ }
+ }
+
+-log_t *log_new(struct user *user, const char *network)
++log_t *log_new(struct bipuser *user, const char *network)
+ {
+ log_t *logdata;
+
+--- a/src/log.h
b/src/log.h
+@@ -59,10 +59,10 @@
+ int backlogging;
+ int lastfile_seeked;
+
+- struct user *user;
++ struct bipuser *user;
+ } log_t;
+
+-log_t *log_new(struct user *user, const char *network);
++log_t *log_new(struct bipuser *user, const char *network);
+ void logdata_free(log_t *logdata);
+
+ void log_join(log_t *logdata, const char *ircmask, const char *channel);
+--- a/src/bip.c
b/src/bip.c
+@@ -56,7 +56,7 @@
+ void conf_die(bip_t *bip, char *fmt, ...);
+ static char *get_tuple_pvalue(list_t *tuple_l, int lex);
+ void bip_notify(struct link_client *ic, char *fmt, ...);
+-void adm_list_connections(struct link_client *ic, struct user *bu);
++void adm_list_connections(struct link_client *ic, struct bipuser *bu);
+ void free_conf(list_t *l);
+
+ #ifdef HAVE_OIDENTD
+@@ -386,7 +386,7 @@
+
+ void adm_bip_delconn(bip_t *bip, struct link_client *ic, const char
*conn_name)
+ {
+- struct user *user = LINK(ic)-user;
++ struct bipuser *user = LINK(ic)-user;
+ struct link *l;
+
+ if (!(l = hash_get(user-connections, conn_name))) {
+@@ -401,7 +401,7 @@
+ void adm_bip_addconn(bip_t *bip, struct link_client *ic, const char
*conn_name,
+ const char *network_name)
+ {
+- struct user *user = LINK(ic)-user;
++ struct bipuser *user = LINK(ic)-user;
+ struct network *network;
+
+ /* check name uniqueness */
+@@ -452,7 +452,7 @@
+ bip_notify(ic, connection added, you should soon be able to connect);
+ }
+
+-static int add_connection(bip_t *bip, struct user *user, list_t *data)
++static int add_connection(bip_t *bip, struct bipuser *user, list_t *data)
+ {
+ struct tuple *t, *t2;
+ struct link *l;
+@@ -663,7 +663,7 @@
+ {
+ int r;
+ struct tuple *t;
+- struct user *u;
++ struct bipuser *u;
+ char *name = get_tuple_pvalue(data, LEX_NAME);
+ list_t connection_list, *cl;
+
+@@ -675,7 +675,7 @@
+ }
+ u = hash_get(bip-users, name);
+ if (!u) {
+- u = bip_calloc(sizeof(struct user), 1);
++ u = bip_calloc(sizeof(struct bipuser), 1);
+ hash_insert(bip-users, name, u);
+ hash_init(u-connections, HASH_NOCASE);
+ u-admin = 0;
+@@ -809,7 +809,7 @@
+ {
+ /* nick username realname or default_{nick,username,realname} in user */
+ hash_iterator_t it, sit, cit;
+- struct user *user;
++ struct bipuser *user;
+ struct link *link;
+ struct chan_info *ci;
+ int r = 1;
+@@ -881,10 +881,10 @@
+ ((struct link *)list_it_item(lit))-in_use = 0;
+ for (hash_it_init(bip-users, hit); hash_it_item(hit);
+ hash_it_next(hit))
+- ((struct user *)hash_it_item(hit))-in_use = 0
Bug#502457: Properly packaged
Hi Andrew (2010.09.15_14:10:17_+0200) I do not think that the CG toolkit is a dependency on any package and It's a build-dep of ogre-contrib. considering how it has been packaged previously I doubt it would effect anything by updating the package at the last minute. Yes, but when the final freeze was announced (with outdated requirements for Universe) I uploaded it to Ubuntu. We're stuck with it for a while now :) SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#596606: Sponsorship for darcs NMU
(I'm not on this list, so please CC me) Can anyone sponsor an NMU for me? http://bugs.debian.org/596606 The patch is pretty trivial and the issue appears to have been already dealt with uptream (someone is keeping an eye on BTS or Launchpad). Trent has stated in the bug that he's on vacation and will accept an NMU. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#502457: Properly packaged
Apologies to the rest of you, Nigel and I have kind of taken over this bug, I think *is* relevant to the bug, so I'm continuing the discussion here. Hi Nigel (2010.09.13_02:53:42_+0200) I understand that general reasoning, but when we're still seeing significant Linux traffic for Cg 2.0 --- it means that many many users are effectively unsupportable by both Nvidia and Debian. That is true. As a non-free package Debian can offer little support (and makes this clear in README.Debian) There are lots of known and resolved bugs in Cg 2.0, it's obsolete. I don't know how the release team usually handles binary-only packages, with regards to freeze exceptions (squeeze is frozen) and stable-proposed-updates (the way we get bugfixes to users). Such things are normally reviewed by looking at the size and complexity of diffs. Maybe someone who knows could tell you. If the current maintainers aren't being proactive enough about these things, (it's probably because they are too busy with other packages), I suggest you involve you prod them or get involved yourself. I'll look into backports, but from a support perspective it seems more complicated and costly than handing out the current .deb, as we've just stared doing. Yes, however Linux distribution users are more likely to install things from their distro repositories than random websites. Something from your distro is probably less likely to break your system and is probably easier to get working. Plus you get updates without having to worry. This is an important concern, re security. Wearing my Debian User hat, I'm always very skeptical of commercial APT repositories / debs. I use the occasional bit of proprietary software, but I prefer to get it via a repository I trust. It does seem a bit of a double standard that security updates for open source can be cherry-picked into the mainline, whereas closed source with security updates (and new features) can't go out to real-world users. They (probably, I'm no expert on Debian non-free) can, someone just needs to make it happen. In the absence of diffs, changelogs will have to suffice. New features are usually not desirable for security updates, but non-free doesn't come with support, so we can take more risks. If the only way to get a security update is to get new features too, so be it. (Ubuntu now takes this approach with Firefox.) As to Ubuntu, are you aware of Canonical's partner repository [1]? Canonical allows third parties to get their proprietary applications included in the partner repository. I don't know how much of this is your own personal initiative and how much is Nvidia's desire to reach out to Linux users, but that is another possible option. [1]: http://www.canonical.com/engineering-services/certification/application-packaging Our build directly packages .tgz, .rpm or .deb for Linux. It was necessary to patch dpkg-deb to make this work without fakeroot on RedHat. We specifically want to ship the same binaries for _all_ Linux distributions, rather than worry about bugs that could be per-distribution, due to a compiler bug, or whatever. Thanks for that clarification. That means that it doesn't really make any difference whether we build from debs or tarballs, it's the same binary objects, just rearranged differently. 271 warnings regarding windows-devel-file-in-package (MS DevStudio projects) Yeah, I thought those weren't relevant for Debian, so I removed them (the DirectX stuff too). 414 warnings regarding manpage-in-wrong-directory (manCg, manCgFX, etc) Debian Policy 12.1. I moved them into man3, with named 3Cg etc. 9 warnings regarding image-file-in-usr-lib (image files for examples) Examples should really go in /usr/share/doc/$package/examples. Looking into the implications of versioned soname is on my to-do list That definitely requires package splitting, but would probably make your users (people who distribute Cg-linked applications) lives a little easier. I guess it's all good in the sense that these new packages are being consistent with the existing Debian ones, and we can be confident of these being upgradable to the Nvidia ones. But, I'll check and keep an eye on things, anyway. Thanks. Can it handle a user upgrading to it from the current Debian version? Yes, the idea is if/when Debian/etc is lagging, our package will always be installable. I meant technically. I had to add a call to get nvidia-cg-toolkit-installer to remove any existing non-package-maintained-stuff in preinst. But, I have limited discretionary cycles... Yeah, so do we all :/ (I should really spend more cycles on working on my MSc...) It's great to actually see someone from a commercial player like Nvidia engaging with Community distributions, I hope we can do something that works well for everyone. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ
Bug#502457: Properly packaged
Hi, although I'm not a Cg user myself, I stumbled across this bug on Launchpad, and decided to do something about it (it's causing some FTBFSs in Ubuntu). I have what I believe is a reasonable solution to this, which is a total rework of the package using Nvidia's tarballs in a multiple orig.tar.gz source format 3.0 (quilt) package. http://people.ubuntu.com/~stefanor/tmp/nvidia-cg-toolkit_3.0.0007-0ubuntu1.dsc Fredrico: I'd like to be able to sync this package from Debian instead of directly uploading to Ubuntu, but with the 10.10 release less than a month away I probably can't wait long enough. However, if you do have any input / review I'd welcome it, so we can minimise future pain. Does this look good to you? The documentation should be split out into a -doc package, as it weighs several MiB. However, I didn't want to do something like that in Ubuntu, I'd rather it happened in Debian first. Nigel: It is recommended that Ubuntu incorporate or adapt these as a replacement. I'm afraid that [Debian and] Ubuntu can't redistribute your debs, our infrastructure requires us to build our own debs. We can include your pre-built binaries in them (as I'm doing), although this obviously means the package ends up in non-free. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#502457: Properly packaged
for a speedy squeeze release too. SR BTW: Your filename version number scheme is not particularly amenable to machine comparison. 3.0.0007 is way preferable to 3.0_July2010. -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#596606: darcs: Fails to build without network connectivity
Package: darcs Version: 2.4.4-2 Severity: serious Justification: fails to build from source One of the tests run during build (external.sh) appears to require network connectivity. Chain OUTPUT (policy ACCEPT 8085 packets, 4256K bytes) pkts bytes target prot opt in out source destination 4 260 REJECT all -- * * 0.0.0.0/00.0.0.0/0 owner UID match 1234 reject-with icmp-port-unreachable I'll attach a debdiff as soon as I have a bug number. SR -- System Information: Debian Release: squeeze/sid APT prefers testing APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 2.6.32-5-amd64 (SMP w/8 CPU cores) Locale: LANG=en_ZA.UTF-8, LC_CTYPE=en_ZA.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages darcs depends on: ii libc6 2.11.2-2 Embedded GNU C Library: Shared lib ii libcurl3-gnutls 7.21.0-1 Multi-protocol file transfer libra ii libffi5 3.0.9-2 Foreign Function Interface library ii libgmp3c2 2:4.3.2+dfsg-1 Multiprecision arithmetic library ii libncurses5 5.7+20100313-2 shared libraries for terminal hand ii zlib1g 1:1.2.3.4.dfsg-3 compression library - runtime Versions of packages darcs recommends: ii postfix [mail-transport-agent 2.7.1-1High-performance mail transport ag darcs suggests no packages. -- no debconf information -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 signature.asc Description: Digital signature
Bug#596606: darcs: Fails to build without network connectivity
tags 596606 + patch thanks I'll attach a debdiff as soon as I have a bug number. Attached. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 diff -Nru darcs-2.4.4/debian/changelog darcs-2.4.4/debian/changelog --- darcs-2.4.4/debian/changelog2010-07-11 08:22:54.0 +0200 +++ darcs-2.4.4/debian/changelog2010-09-12 22:18:10.0 +0200 @@ -1,3 +1,10 @@ +darcs (2.4.4-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Disable external.sh test (requires network connectivity). Closes: #596606 + + -- Stefano Rivera stef...@rivera.za.net Sun, 12 Sep 2010 22:17:36 +0200 + darcs (2.4.4-2) unstable; urgency=low * Blindly apply Joachim's HPPA workaround (Closes: #588222). diff -Nru darcs-2.4.4/debian/patches/series darcs-2.4.4/debian/patches/series --- darcs-2.4.4/debian/patches/series 2010-07-11 08:22:11.0 +0200 +++ darcs-2.4.4/debian/patches/series 2010-09-12 21:33:19.0 +0200 @@ -2,3 +2,4 @@ no-libHSdarcs no-hspwd use-sensible-editor +skip-external.sh-test diff -Nru darcs-2.4.4/debian/patches/skip-external.sh-test darcs-2.4.4/debian/patches/skip-external.sh-test --- darcs-2.4.4/debian/patches/skip-external.sh-test1970-01-01 02:00:00.0 +0200 +++ darcs-2.4.4/debian/patches/skip-external.sh-test2010-09-12 22:17:05.0 +0200 @@ -0,0 +1,17 @@ +Description: Disable external.sh test. It requires network access (even though + it appears to try hard to avoid this). +Author: Stefano Rivera stef...@rivera.za.net +Bug-Ubuntu: http://launchpad.net/bugs/636603 +Bug-Debian: http://bugs.debian.org/596606 +Last-Update: 2010-09-12 +--- a/tests/external.sh b/tests/external.sh +@@ -1,5 +1,8 @@ + #!/usr/bin/env bash + ++# Skip: Requires network connectivity ++exit 200 ++ + # Some tests for launching external commands + + . lib
Bug#594357: bzr-stats: Completely unusable: Doesn't register commands
Package: bzr-stats Version: 0.0.1~bzr40-1 Severity: grave Tags: upstream Justification: renders package unusable Upstream+Ubuntu Bug: http://launchpad.net/bugs/623981 $ bzr plugins | grep stat $ bzr committer-statistics bzr: ERROR: unknown command committer-statistics Basically, installing the package has zero effect. It doesn't register with bzr. SR -- System Information: Debian Release: squeeze/sid APT prefers testing APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 2.6.32-5-amd64 (SMP w/2 CPU cores) Locale: LANG=en_ZA.UTF-8, LC_CTYPE=en_ZA.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages bzr-stats depends on: ii bzr 2.1.2-1easy to use distributed version co ii python2.6.5-13 interactive high-level object-orie ii python-central0.6.16 register and build utility for Pyt bzr-stats recommends no packages. bzr-stats suggests no packages. -- no debconf information -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#594357: bzr-stats: Completely unusable: Doesn't register commands
tags 594357 +patch thanks Patch attached. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 diff -Nru bzr-stats-0.0.1~bzr40/debian/changelog bzr-stats-0.0.1~bzr40/debian/changelog --- bzr-stats-0.0.1~bzr40/debian/changelog 2010-08-25 17:23:50.0 +0200 +++ bzr-stats-0.0.1~bzr40/debian/changelog 2010-08-25 17:22:38.0 +0200 @@ -1,3 +1,10 @@ +bzr-stats (0.0.1~bzr40-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Register plugin and commands with bzr. (Closes #594357) + + -- Stefano Rivera stef...@rivera.za.net Wed, 25 Aug 2010 17:20:29 +0200 + bzr-stats (0.0.1~bzr40-1) unstable; urgency=low * New upstream snapshot. diff -Nru bzr-stats-0.0.1~bzr40/debian/patches/register-commands bzr-stats-0.0.1~bzr40/debian/patches/register-commands --- bzr-stats-0.0.1~bzr40/debian/patches/register-commands 1970-01-01 02:00:00.0 +0200 +++ bzr-stats-0.0.1~bzr40/debian/patches/register-commands 2010-08-25 17:22:38.0 +0200 @@ -0,0 +1,18 @@ +Description: Register commands with bzrlib +Author: Stefano Rivera stef...@rivera.za.net +Forwarded: http://code.launchpad.net/~stefanor/bzr-stats/register-623981/+merge/33639 +Bug-Ubuntu: http://launchpad.net/bugs/623981 +Bug-Debian: http://bugs.debian.org/594357 +Last-Update: 2010-08-25 +--- /dev/null b/__init__.py +@@ -0,0 +1,9 @@ ++Statistics plugin for Bazaar ++This is a simple plugin for Bazaar that can list the contributors to a branch ++and what they worked on. ++ ++from bzrlib.commands import plugin_cmds ++version_info = (0, 0, 1, 'bzr', 40) ++plugin_cmds.register_lazy(cmd_committer_statistics, [], bzrlib.plugins.stats.cmds) ++plugin_cmds.register_lazy(cmd_ancestor_growth, [], bzrlib.plugins.stats.cmds) ++plugin_cmds.register_lazy(cmd_credits, [], bzrlib.plugins.stats.cmds) diff -Nru bzr-stats-0.0.1~bzr40/debian/patches/series bzr-stats-0.0.1~bzr40/debian/patches/series --- bzr-stats-0.0.1~bzr40/debian/patches/series 1970-01-01 02:00:00.0 +0200 +++ bzr-stats-0.0.1~bzr40/debian/patches/series 2010-08-25 17:22:38.0 +0200 @@ -0,0 +1 @@ +register-commands
Bug#593204: texlive-extra: install info pages
Package: texlive-extra Version: 2009-9 Severity: wishlist Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu maverick ubuntu-patch *** /tmp/tmpkSwvbN In Ubuntu, we've applied the attached patch to achieve the following: * Install latex2man, eplain info pages. We thought you might be interested in doing the same. -- System Information: Debian Release: squeeze/sid APT prefers testing APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 2.6.32-5-amd64 (SMP w/2 CPU cores) Locale: LANG=en_ZA.UTF-8, LC_CTYPE=en_ZA.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash In Ubuntu, we've applied the attached patch to achieve the following: * Merge with Debian test; remaining Ubuntu changes: - debian/control: Drop texpower from Recommends to Suggests. It is in universe, and drags in context and xpdf. - debian/control: drop texlive-extra-utils new Recommends of xindy to Suggests, to avoid pulling clisp into main. - debian/control: Drop purifyeps from texlive-extra-utils' Recommends to Suggests; purifyeps and a bunch of dependencies are in universe. - Install latex2man, eplain info pages. We thought you might be interested in doing the same.
Bug#593204: Acknowledgement (texlive-extra: install info pages)
Erk, that wasn't a patch. /me slaps submittodebian SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 only in patch2: unchanged: --- texlive-extra-2009.orig/debian/texlive-formats-extra.info +++ texlive-extra-2009/debian/texlive-formats-extra.info @@ -0,0 +1 @@ +texmf/doc/info/eplain.info only in patch2: unchanged: --- texlive-extra-2009.orig/debian/texlive-extra-utils.info +++ texlive-extra-2009/debian/texlive-extra-utils.info @@ -0,0 +1 @@ +texmf/doc/info/latex2man.info
Bug#593238: ia32-libs: Please wrap long lines in debian/control
Package: ia32-libs Version: 20090808 Severity: wishlist This package includes some incredibly long lines in debian/control (Conflicts, Replaces). If those lines were wrapped, it'd be easier to read debdiffs involving this package (an issue in Ubuntu). Thanks, SR -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#591935: re2: Upstream hasn't committed to a stable ABI yet
Package: re2 Severity: serious Tags: squeeze Justification: Policy 8.1 The upstream for this package hasn't committed to a stable ABI (or made a release) yet. The ABI we are currently shipping is already broken by the current upstream trunk. As this library has no reverse-dependencies, it should be removed from testing. (It probably shouldn't have been uploaded to unstable yet in the first place) SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 signature.asc Description: Digital signature
Bug#587191: Still an issue
reopen 587191 =
found 587191 4.2-build2003-1
thanks
Looks like this is still an issue.
Patch attached,
SR
--
Stefano Rivera
http://tumbleweed.org.za/
H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127
--- oss4-4.2-build2003/debian/oss4-dkms.dkms.in
+++ oss4-4.2-build2003/debian/oss4-dkms.dkms.in
@@ -97,7 +97,7 @@
DEST_MODULE_LOCATION[30]=/updates/dkms/
DEST_MODULE_LOCATION[31]=/updates/dkms/
AUTOINSTALL=yes
-MAKE[0]=cp /lib/modules/${kernelver}/source/include/linux/limits.h ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/core \
+MAKE[0]=cp /lib/modules/${kernelver}/build/include/linux/limits.h ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/core \
make -C ${kernel_source_dir} SUBDIRS=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/core modules \
make -C ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/drivers osscore_symbols.inc \
make -C ${kernel_source_dir} SUBDIRS=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/drivers modules
Bug#585142: twisted: Leaves dropin.cache lying around in python2.4/site-packages
Hi Matthias (2010.07.22_16:49:37_+0200) Obviously point 2 above is no longer applicable, given the switch to dh_python2 (which I wasn't aware of at the time). dh_python2 *does* make these files less of an issue in the future. Or it would if they were included in the package, with the symlink farm. 10.0.0 had them, 10.1.0 doesn't. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#585142: twisted: Leaves dropin.cache lying around in python2.4/site-packages
Hi Matthias (2010.07.21_15:29:09_+0200) Obviously point 2 above is no longer applicable, given the switch to dh_python2 (which I wasn't aware of at the time). dh_python2 *does* make these files less of an issue in the future. why would this help? if you look at python-twisted-conch, there is nothing hardcoded in the postinst. There's nothing in postinst, but it has to activate twisted-plugins-cache. However, I guess that's already deployed, no reason to change it now. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#589545: ITP: xdot -- interactive viewer for Graphviz dot files
Package: wnpp Severity: wishlist Owner: Stefano Rivera stef...@rivera.za.net * Package name: xdot Version : 0.4 Upstream Author : Jose Fonseca jose.r.fons...@gmail.com * URL : http://code.google.com/p/jrfonseca/wiki/XDot * License : LGPL-3+ Programming Lang: Python Description : interactive viewer for Graphviz dot files xdot is an interactive viewer for graphs written in Graphviz's dot language. It uses internally the graphviz's xdot output format as an intermediate format, and PyGTK and Cairo for rendering. xdot can be used either as a standalone application from command line, or as a library embedded in your python application. Features: * Since it doesn't use bitmaps it is fast and has a small memory footprint. * Arbitrary zoom. * Keyboard/mouse navigation. * Supports events on the nodes with URLs. * Animated jumping between nodes. * Highlights node/edge under mouse. I intend to package this under the Debian Python Applications Team. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 signature.asc Description: Digital signature
Bug#589394: ITP: munkres -- munkres algorithm for the Assignment Problem
Package: wnpp Severity: wishlist Owner: Stefano Rivera stef...@rivera.za.net * Package name: munkres Version : 1.0.5.4 Upstream Author : Brian Clapper b...@clapper.org * URL : http://bmc.github.com/munkres/ * License : BSD Programming Lang: Python Description : munkres algorithm for the Assignment Problem The Munkres module provides an implementation of the Munkres algorithm (also called the Hungarian algorithm or the Kuhn-Munkres algorithm), useful for solving the Assignment Problem. I intend to package this under the Debian Python Modules Team. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 signature.asc Description: Digital signature
Bug#589396: ITP: beets -- music tagger and library organizer
Package: wnpp Severity: wishlist Owner: Stefano Rivera stef...@rivera.za.net * Package name: beets Version : 1.0b2-1 Upstream Author : Adrian Sampson adr...@radbox.org * URL : http://beets.radbox.org/ * License : MIT Programming Lang: Python Description : music tagger and library organizer Beets is a media library management system for obsessive-compulsive music geeks. The purpose of beets is to get your music collection right once and for all. It catalogs your collection, automatically improving its metadata as it goes using the MusicBrainz database. It then provides a set of tools for manipulating and accessing your music. Beets also includes a music player that implements the MPD protocol, so you can play music in your beets library using any MPD client. I intend to package this under the Debian Python Apps Team. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 signature.asc Description: Digital signature
Bug#532140: ITP: python-eventlet -- high performance network library using coroutines
Any update on this? Chris: I take it you never got a reply? I have no personal need for this, but it's a dependency for beets (ITP Bug #589396). I have an initial package: https://code.launchpad.net/~stefanor/+junk/eventlet although the test suite isn't passing, it works for my needs. Can we get this packaged (under the Debian Python Modules Team, for example?) SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 signature.asc Description: Digital signature
Bug#588932: python-musicbrainz2: Newer version available
Package: python-musicbrainz2
Version: 0.6.0-2
Severity: minor
Tags: patch
There's 0.7.2 available upstream. In fact Ubuntu is already shipping it.
It builds fine for me, although the ctypes dependency should be
python-version-dependant, see attached patch.
SR
-- System Information:
Debian Release: squeeze/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-5-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_ZA.UTF-8, LC_CTYPE=en_ZA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages python-musicbrainz2 depends on:
ii libdiscid00.2.2-1Library for creating MusicBrainz D
ii python [python-ctypes]2.6.5-5An interactive high-level object-o
ii python-support1.0.9 automated rebuilding support for P
python-musicbrainz2 recommends no packages.
Versions of packages python-musicbrainz2 suggests:
pn python-musicbrainz2-doc none (no description available)
-- no debconf information
=== modified file 'debian/control'
--- debian/control 2008-11-02 14:45:15 +
+++ debian/control 2010-07-13 13:51:40 +
@@ -11,7 +11,7 @@ Vcs-Bzr: http://bzr.oxygene.sk/debian/py
Package: python-musicbrainz2
Section: python
Architecture: all
-Depends: ${python:Depends}, libdiscid0, python-ctypes (= 0.9.6)
+Depends: ${python:Depends}, libdiscid0, python (= 2.5) | python-ctypes (= 0.9.6)
Provides: ${python:Provides}
Suggests: python-musicbrainz2-doc
Description: An interface to the MusicBrainz XML web service
Bug#588855: python-pyfiglet: DeprecationWarning in Python 2.6
Package: python-pyfiglet Version: 0.4+dfsg-1 Severity: minor Package emits a deprecation warning under Python 2.6: $ pyfiglet hello /usr/lib/pymodules/python2.6/pyfiglet.py:193: DeprecationWarning: object.__init__() takes no parameters str.__init__(self, *args, **kwargs) ╻ ╻┏━╸╻ ╻ ┏━┓ ┣━┫┣╸ ┃ ┃ ┃ ┃ ╹ ╹┗━╸┗━╸┗━╸┗━┛ SR -- System Information: Debian Release: squeeze/sid APT prefers testing APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 2.6.32-5-amd64 (SMP w/8 CPU cores) Locale: LANG=en_ZA.UTF-8, LC_CTYPE=en_ZA.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages python-pyfiglet depends on: ii python2.6.5-5An interactive high-level object-o ii python-support1.0.9 automated rebuilding support for P Versions of packages python-pyfiglet recommends: ii toilet-fonts 0.2-1 collection of TOIlet fonts Versions of packages python-pyfiglet suggests: pn figletnone (no description available) -- no debconf information -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 signature.asc Description: Digital signature
Bug#588716: pytris: Pytris is incompatible with python = 2.5 due to dependancy on whrandom
Package: pytris
Version: 0.98
Severity: grave
Tags: patch
Justification: renders package unusable
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu maverick ubuntu-patch
Hi, pytris completely fails to start on a system with Python = 2.5.
An Ubuntu developer has produced a patch for this (attached).
Additionally, please note that your package doesn't use a python helper
system, as recommended by the Python policy. I suggest python-support
or the brand new dh_python2. If you want any help with that, please pop
into #debian-python on OFTC or ask in debian-pyt...@l.d.o
SR
--
Stefano Rivera
http://tumbleweed.org.za/
H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127
--- usr/games/pytris.py 2006-04-06 23:16:47.0 +0200
+++ usr/games/pytris.py 2009-03-26 21:25:16.0 +0100
@@ -2,7 +2,7 @@
#from ncurses.curses import *
from curses import *
-import time, traceback, whrandom, copy, socket, sys, getopt
+import time, traceback, random, copy, socket, sys, getopt
import string, pickle, os, pwd
def make_tensor(*args):
@@ -547,12 +547,12 @@
)
self.masks = masks[t]
-self.rpool = map(lambda x, self=self:whrandom.choice(self.masks), (globalvar.next+1)*[None]) # pool of pieces
+self.rpool = map(lambda x, self=self:random.choice(self.masks), (globalvar.next+1)*[None]) # pool of pieces
def getpiece(self):
p = self.rpool[0]
del self.rpool[0]
-self.rpool.append(whrandom.choice(self.masks))
+self.rpool.append(random.choice(self.masks))
return p
@@ -787,8 +787,8 @@
act as robot
tickv = 1
r = 1
-kpr = ord(whrandom.choice(('u', 'i', 'o')))
-if whrandom.random()0.3:
+kpr = ord(random.choice(('u', 'i', 'o')))
+if random.random()0.3:
kpr = -1
if kpr == ord('u'):
a.left()
signature.asc
Description: Digital signature
Bug#588112: libaio: Porting improvements from Ubuntu
Package: libaio
Version: 0.3.107-7
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu maverick ubuntu-patch
*** /tmp/tmp2LpteU
In Ubuntu, we've applied the attached patch to achieve the following:
- Set package priority to optional.
- debian/patches/90_ppc-name-clashing.patch: Avoid name clashing.
- debian/patches/91_ubuntu_arches.patch: More Ubuntu arches support.
We thought you might be interested in some of these patches.
Personally, I can't comment much on the contents (we've been carrying
them for a while).
SR
--
Stefano Rivera
http://tumbleweed.org.za/
H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127
diff -u libaio-0.3.107/debian/control libaio-0.3.107/debian/control
--- libaio-0.3.107/debian/control
+++ libaio-0.3.107/debian/control
@@ -1,6 +1,6 @@
Source: libaio
Maintainer: Guillem Jover guil...@debian.org
-Priority: extra
+Priority: optional
Section: libs
Vcs-Browser: http://git.hadrons.org/?p=debian/pkgs/libaio.git
Vcs-Git: git://git.hadrons.org/git/debian/pkgs/libaio.git
diff -u libaio-0.3.107/debian/changelog libaio-0.3.107/debian/changelog
diff -u libaio-0.3.107/debian/patches/series libaio-0.3.107/debian/patches/series
--- libaio-0.3.107/debian/patches/series
+++ libaio-0.3.107/debian/patches/series
@@ -5,0 +6,2 @@
+90_ppc-name-clashing.patch
+91_ubuntu_arches.patch
only in patch2:
unchanged:
--- libaio-0.3.107.orig/debian/patches/91_ubuntu_arches.patch
+++ libaio-0.3.107/debian/patches/91_ubuntu_arches.patch
@@ -0,0 +1,141 @@
+--- a/src/libaio.h
b/src/libaio.h
+@@ -57,11 +57,13 @@
+ #define PADDED(x, y) x, y
+ #define PADDEDptr(x, y) x
+ #define PADDEDul(x, y) unsigned long x
+-#elif defined(__powerpc64__) /* big endian, 64 bits */
++#elif defined(__powerpc64__) || \
++ (defined(__sparc__) defined(__arch64__)) || \
++ (defined(__hppa__) defined(__arch64__)) /* big endian, 64 bits */
+ #define PADDED(x, y) unsigned y; x
+ #define PADDEDptr(x,y) x
+ #define PADDEDul(x, y) unsigned long x
+-#elif defined(__PPC__) /* big endian, 32 bits */
++#elif defined(__PPC__) || defined(__sparc__) || defined(__hppa__) /* big endian, 32 bits */
+ #define PADDED(x, y) unsigned y; x
+ #define PADDEDptr(x, y) unsigned y; x
+ #define PADDEDul(x, y) unsigned y; unsigned long x
+--- a/src/Makefile
b/src/Makefile
+@@ -5,7 +5,7 @@
+ libdevdir=$(prefix)/lib
+
+ ARCH := $(shell uname -m | sed -e s/i.86/i386/)
+-CFLAGS := -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC
++CFLAGS := -Wall -I. -g -fomit-frame-pointer -O2 -fPIC
+ SO_CFLAGS=-shared $(CFLAGS)
+ L_CFLAGS=$(CFLAGS)
+ LINK_FLAGS := -lgcc
+--- a/src/syscall.h
b/src/syscall.h
+@@ -26,6 +26,8 @@
+ #include syscall-arm.h
+ #elif defined(__m68k__)
+ #include syscall-m68k.h
++#elif defined(__sparc__) defined(__arch64__)
++#include syscall-sparc64.h
+ #elif defined(__sparc__)
+ #include syscall-sparc.h
+ #elif defined(__hppa__)
+--- /dev/null
b/src/syscall-sparc64.h
+@@ -0,0 +1,98 @@
++#define __NR_io_setup 268
++#define __NR_io_destroy 269
++#define __NR_io_submit 270
++#define __NR_io_cancel 271
++#define __NR_io_getevents 272
++
++#define io_syscall1(type,fname,sname,type1,arg1) \
++type fname(type1 arg1) \
++{ \
++ unsigned long __res; \
++ register unsigned long __g1 __asm__(g1) = __NR_##sname; \
++ register unsigned long __o0 __asm__(o0) = (unsigned long) arg1; \
++ __asm__ __volatile__(t 0x6d\n\t \
++ sub %%g0, %%o0, %0\n\t \
++ movcc %%xcc, %%o0, %0\n \
++ 1: \
++ : =r (__res), =r (__o0) \
++ : 1 (__o0), r (__g1) \
++ : cc); \
++ return (type) __res; \
++}
++
++#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \
++type fname(type1 arg1, type2 arg2) \
++{ \
++ unsigned long __res; \
++ register unsigned long __g1 __asm__(g1) = __NR_##sname; \
++ register unsigned long __o0 __asm__(o0) = (unsigned long) arg1; \
++ register unsigned long __o1 __asm__(o1) = (unsigned long) arg2; \
++ __asm__ __volatile__(t 0x6d\n\t \
++ sub %%g0, %%o0, %0\n\t \
++ movcc %%xcc, %%o0, %0\n \
++ 1: \
++ : =r (__res), =r (__o0) \
++ : 1 (__o0), r (__o1), r (__g1) \
++ : cc); \
++ return (type) __res; \
++}
++
++#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \
++type fname(type1 arg1, type2 arg2, type3 arg3) \
++{ \
++ unsigned long __res; \
++ register unsigned long __g1 __asm__(g1) = __NR_##sname; \
++ register unsigned long __o0 __asm__(o0) = (unsigned long) arg1; \
++ register unsigned long __o1 __asm__(o1) = (unsigned long) arg2; \
++ register unsigned long __o2 __asm__(o2) = (unsigned long) arg3; \
++ __asm__ __volatile__(t 0x6d\n\t \
++ sub %%g0, %%o0, %0\n\t \
++ movcc %%xcc, %%o0, %0\n \
++ 1: \
++ : =r (__res), =r (__o0) \
++ : 1
Bug#587373: [Build-common-hackers] Bug#587373: cdbs: python-distutils.mk: Installs scripts with a versioned shebang
tag 587373 - patch thanks Would you happen to know if that option is new or we can safely use this also for e.g. backports? I don't know. I need to do some more historical research. Would it perhaps be better to always pass this option, also for specific versions of Python? The problem isn't with versions of python, but the different libraries that setup.py may be using. It looks like I need to do some more testing, I've found some packages that would FTBFS with this. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#587342: vtun: Support tmpfs for /var/lock
Hi Martín (2010.06.29_06:01:00_+0200) I' m not too sure about the gcc patch. It doesn't seem to do anything useful, and I don't see any gcc warnings when compiling main... What was the rationale for this? I don't know why Ubuntu's gcc is spewing out more warnings, but it is: gcc -Wall -g -O2 -I/usr/include/lzo -I/usr/include/openssl -I/usr/include/openssl -I/usr/include/openssl -I/usr/include/openssl -DVTUN_CONFIG_FILE=\/etc/vtund.conf\ -DVTUN_PID_DIR=\/var/run\ -DVTUN_STAT_DIR=\/var/log/vtund\ -DVTUN_LOCK_DIR=\/var/lock/vtund\ -c main.c main.c: In function ‘main’: main.c:194: warning: ignoring return value of ‘dup’, declared with attribute warn_unused_result main.c:195: warning: ignoring return value of ‘dup’, declared with attribute warn_unused_result main.c:196: warning: ignoring return value of ‘dup’, declared with attribute warn_unused_result main.c:201: warning: ignoring return value of ‘chdir’, declared with attribute warn_unused_result etc. However, that patch has no benefit and just hides warnings. We should be able to drop it in Ubuntu now that we have no need to fork the packaging any more. Thanks for the quick response, SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 signature.asc Description: Digital signature
Bug#571408: microcode.ctl: Patch from Ubuntu
tags 571408 patch user ubuntu-de...@lists.ubuntu.com usertags 571408 maverick ubuntu-patch thanks *** /tmp/tmpgh8363 In Ubuntu, we've applied the attached patch to achieve the following: [ Daniel J Blueman ] * Rewrote update-intel-microcode script to robustly parse and download updated microcode correctly (LP: #569488) [ Stefano Rivera ] * update-intel-microcode: Do not eval() code from the Internet, and use Python's built in tarfile library rather than a temporary directory. * debian/microcode.ctl.init: Depend on $remote_fs. We thought you might be interested in doing the same. I made the change depend on Python 2.6, as that's currently the ubuntu default version in sid (still finishing up the transition). You could add 2.5 support with the following: Depends: python, python (= 2.6) | python-simplejson and: -import json +try: +import json +except ImportError: +improt simplejson as json SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 diff -u microcode.ctl-1.17/debian/update-intel-microcode microcode.ctl-1.17/debian/update-intel-microcode --- microcode.ctl-1.17/debian/update-intel-microcode +++ microcode.ctl-1.17/debian/update-intel-microcode @@ -1,75 +1,55 @@ -#!/bin/sh -# Copyright (c) 2008 by Giacomo A. Catenazzi c...@debian.org -# This file is licensed with GPL version 2 (or at your option any later versions) -# For the full license, see http://fsf.org - -set -e - -# This script will download and update the Intel microcode - -# Check wget -if ! which wget /dev/null 2 /dev/null; then -echo wget not found. Please install wget 12 -exit 1 -fi -if ! grep -sq GenuineIntel /proc/cpuinfo; then -echo microcode.ctl: Yet we provide only microcodes for Intel processors 12 -echo Your CPU seems not an Intel processor 12 -exit 1 -fi - -REMOTE_RSS='http://feeds.downloadcenter.intel.com/rss/?p=483lang=eng' -REMOTE_DATA=$(wget -t 2 -T 20 -nv -q -O - $REMOTE_RSS | perl -pe 's|^.+?IntelDC:TypeFirmware/IntelDC:TypeIntelDC:Version(20[0-9]*)/IntelDC:VersionIntelDC:Statuslatest/IntelDC:Status.+?IntelDC:FileURL([^]*\1[^]*)/IntelDC:FileURL.*$|\1 \2\n|' - || echo 'ERROR') -if [ 0$REMOTE_DATA = 0 -o 0$REMOTE_DATA = 0ERROR ] ; then -echo Error: could not find remote data in $REMOTE_RSS 12 -echo ...exiting 12 -exit 1 -fi -REMOTE_FILE=$(echo $REMOTE_DATA | sed -ne 's#^\(.*\) \(http://.*\)$#\2#p' -) -REMOTE_DATE=$(echo $REMOTE_DATA | sed -ne 's#^\(.*\) \(http://.*\)$#\1#p' -) - -LOCAL_DIR=/usr/share/misc -LOCAL_FILE=$LOCAL_DIR/intel-microcode.dat - -if [ -f $LOCAL_FILE ] ; then -LOCAL_DATE=$(sed -ne 's#^/\*\(.*\)\*/.*$#\1#p' $LOCAL_FILE | head -n 1 | date +%Y%m%d -f - ) -echo Local version: $LOCAL_DATE -echo Remote version: $REMOTE_DATE - -if [ 0$REMOTE_DATE = 0 ] ; then - echo could not extract the actual data of remote microcode - exit 1 -elif [ 0$REMOTE_DATE -le 0$LOCAL_DATE ] ; then - echo No need to download a new microcode 12 - exit 0 -fi -else -echo Local version: (none) -echo Remote version: $REMOTE_DATE -fi - -echo Downloading a new version of microcode. - -case $REMOTE_FILE in -*.tgz | *.tar.gz ) FILTER= tar xzOf - ;; -*.dat.gz ) FILTER= gzip -cd ;; -* ) FILTER= cat - ;; -esac - - -if wget -t 2 -T 20 -nv -q -O - $REMOTE_FILE | $FILTER $LOCAL_FILE.tmp ; then -mv $LOCAL_FILE.tmp $LOCAL_FILE -echo microcode downloaded sucessfully 12 -else -echo Error on downloading the microcode. 12 -echo Install microcode manually. (See /usr/share/doc/microcode.ctl/README.Debian) 12 -exit 1 -fi - -# load the new microcode - - -if [ -$1 != --no-reload ] ; then -/etc/init.d/microcode.ctl reload -fi +#!/usr/bin/python +# download latest Intel processor microcode +# (c) 2010: Daniel J Blueman, Stefano Rivera +# GPL v3 license [http://fsf.org/] + +import json +import os +from StringIO import StringIO +import sys +import tarfile +import urllib2 + +url = 'http://downloadcenter.intel.com/JSONDataProvider.aspx?DownloadType=FirmwareProductFamily=ProcessorsProductLine=DesktopProductProduct=Intel%C2%AE%20Core%E2%84%A2%20i7%20ProcessorsortDir=descendingHits=10lang=engpg=1refresh=filtersdataType=jsontype=GET' +try: + data = urllib2.urlopen(url).read() +except urllib2.HTTPError, e: + print 'failed to download microcode index - %s' % e.code + sys.exit(1) +except urllib2.URLError, e: + print 'failed to download microcode index - %s' % e.reason + sys.exit(1) + +results = json.loads(data)['results'] + +# check for numerically highest date +newest = sorted(results, key=lambda x: x['version'])[-1] + +srcurl = 'http://downloadmirror.intel.com/%s/eng/microcode-%s.tgz' % (newest['title']['downloadid'], newest['version']) + +try: + src = urllib2.urlopen(srcurl) +except urllib2.HTTPError, e: + print 'failed to download microcode from %s - %s' % (srcurl, e.code) + sys.exit(1) +except urllib2.URLError, e: + print 'failed to download microcode from %s - %s' % (srcurl
Bug#587219: from python 2.5 to python2.6
user debian-pyt...@lists.debian.org
usertags python2.6
thanks
With that (poorly formed) patch, linkchecker{-gui} still depends on
python2.5 due to shebangs.
Here's an improved patch (with some clean improvements thrown in).
SR
--
Stefano Rivera
http://tumbleweed.org.za/
H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127
--- linkchecker-5.2.orig/debian/linkchecker.install
+++ linkchecker-5.2/debian/linkchecker.install
@@ -3,14 +3,14 @@
usr/share/man/man5/linkcheckerrc.5
usr/share/man/de/man1/linkchecker.1
usr/share/man/de/man5/linkcheckerrc.5
-usr/lib/python2.5/site-packages/_LinkChecker_configdata.py
-usr/lib/python2.5/site-packages/linkcheck/*.py
-usr/lib/python2.5/site-packages/linkcheck/HtmlParser
-usr/lib/python2.5/site-packages/linkcheck/cache
-usr/lib/python2.5/site-packages/linkcheck/checker
-usr/lib/python2.5/site-packages/linkcheck/configuration
-usr/lib/python2.5/site-packages/linkcheck/director
-usr/lib/python2.5/site-packages/linkcheck/dns
-usr/lib/python2.5/site-packages/linkcheck/htmlutil
-usr/lib/python2.5/site-packages/linkcheck/logger
-usr/lib/python2.5/site-packages/linkcheck/network
+usr/lib/python*/*-packages/_LinkChecker_configdata.py
+usr/lib/python*/*-packages/linkcheck/*.py
+usr/lib/python*/*-packages/linkcheck/HtmlParser
+usr/lib/python*/*-packages/linkcheck/cache
+usr/lib/python*/*-packages/linkcheck/checker
+usr/lib/python*/*-packages/linkcheck/configuration
+usr/lib/python*/*-packages/linkcheck/director
+usr/lib/python*/*-packages/linkcheck/dns
+usr/lib/python*/*-packages/linkcheck/htmlutil
+usr/lib/python*/*-packages/linkcheck/logger
+usr/lib/python*/*-packages/linkcheck/network
only in patch2:
unchanged:
--- linkchecker-5.2.orig/debian/rules
+++ linkchecker-5.2/debian/rules
@@ -42,3 +42,10 @@
install -m 644 build/share/locale/de/LC_MESSAGES/LinkChecker.mo $(LOCALE)/de/LC_MESSAGES/
# apache configuration
install -m 644 config/linkchecker.apache2.conf $(ETC)/apache2/conf.d/linkchecker
+
+clean::
+ rm -f doc/html/*.qch doc/html/*.qhc
+ rm -f _LinkChecker_configdata.py
+
+common-binary-arch::
+ sed -i '1s,#!/usr/bin/python2\..,#!/usr/bin/python,' $(CURDIR)/debian/tmp/usr/bin/*
only in patch2:
unchanged:
--- linkchecker-5.2.orig/debian/linkchecker-gui.install
+++ linkchecker-5.2/debian/linkchecker-gui.install
@@ -1,5 +1,5 @@
usr/bin/linkchecker-gui
-usr/lib/python2.5/site-packages/linkcheck/gui
+usr/lib/python*/*-packages/linkcheck/gui
usr/share/man/man1/linkchecker-gui.1
usr/share/man/de/man1/linkchecker-gui.1
usr/share/linkchecker/lccollection.qhc
signature.asc
Description: Digital signature
Bug#587322: python-amara: Depends on python2.5 unecessarily
Package: python-amara
Version: 1.2a2-1
Severity: minor
Tags: patch
User: debian-pyt...@lists.debian.org
Usertags: python2.6
I don't see why python-amara needs to Depend on python2.5, here's a
patch to build with python-all, instead (and fix up clean).
SR
--
Stefano Rivera
http://tumbleweed.org.za/
H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127
diff -u amara-1.2a2/debian/changelog amara-1.2a2/debian/changelog
--- amara-1.2a2/debian/changelog
+++ amara-1.2a2/debian/changelog
@@ -1,3 +1,9 @@
+amara (1.2a2-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+
+ -- Stefano Rivera stef...@rivera.za.net Sun, 27 Jun 2010 15:37:36 +0200
+
amara (1.2a2-1) unstable; urgency=low
* Initial release
diff -u amara-1.2a2/debian/control amara-1.2a2/debian/control
--- amara-1.2a2/debian/control
+++ amara-1.2a2/debian/control
@@ -3,12 +3,12 @@
Priority: extra
Maintainer: David Villa Alises david.vi...@uclm.es
Build-Depends: cdbs, debhelper (= 5), python-support (= 0.5.3),
- python, python-4suite-xml, python2.5
+ python-all, python-4suite-xml
Standards-Version: 3.7.3
Package: python-amara
Architecture: all
-Depends: ${python:Depends}, python2.5, python-dateutil, python-4suite-xml
+Depends: ${python:Depends}, python-dateutil, python-4suite-xml
Description: Amara is a pythonic XML toolkit
Amara XML toolkit is an open-source collection of Python tools for
XML processing, not just tools that happen to be written in Python,
diff -u amara-1.2a2/debian/rules amara-1.2a2/debian/rules
--- amara-1.2a2/debian/rules
+++ amara-1.2a2/debian/rules
@@ -13,0 +14 @@
+ $(RM) -rf *.egg-info
signature.asc
Description: Digital signature
Bug#582061: python-support: README says you don't need XS-P-V, without clarifying that you need XS-P-V *or* pyversions.
Hi Piotr (2010.06.27_15:38:46_+0200) isn't that enough? Could you propose a better text? I'd make both of those clearer that they apply to all Python versions that may be found on the machine we're installing on, not just present at build time. e.g. --- If your package will work with all versions of Python in all current supported releases, you don't need X[BS]-Python-Version fields or debian/pyversions. *** You *never* need debian/pycompat. You don't need to call *** *** dh_python after dh_pysupport. Just remove all of these.*** --- and --- If the module doesn't work with all python versions that may be installed, you should setup a debian/pyversions file or XS-Python-Version. If the package needs python = 2.3, pyversions will look like : 2.3- --- SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 signature.asc Description: Digital signature
Bug#587326: src:deejayd: Unnecessarily depends on build time default python version
Package: src:deejayd Version: 0.9.0-2 Severity: minor Tags: patch User: debian-pyt...@lists.debian.org Usertag: python2.6 Hi, the binary packages in deejayd that provide python scripts have versioned shebangs, causing a dependency on the build time python version. This patch addresses the issue. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 diff -u deejayd-0.9.0/debian/rules deejayd-0.9.0/debian/rules --- deejayd-0.9.0/debian/rules +++ deejayd-0.9.0/debian/rules @@ -34,6 +34,9 @@ # Removing jquery embedded copy, see debian/deejayd-webui.links rm $(CURDIR)/debian/tmp/usr/share/deejayd/htdocs/js/lib/jquery.js + # Unversion python scripts + sed -i '1s,#!/usr/bin/python2\..,#!/usr/bin/python,' $(CURDIR)/debian/tmp/usr/bin/* + dh_install --sourcedir=$(CURDIR)/debian/tmp dh_installdirs diff -u deejayd-0.9.0/debian/changelog deejayd-0.9.0/debian/changelog signature.asc Description: Digital signature
Bug#587334: disk-manager: Depends on python2.5 unnecessarily
Package: disk-manager Version: 1.0.1-4.2 Severity: important Tags: patch User: debian-pyt...@lists.debian.org Usertag: python2.6 Hi, disk-manager provides python scripts have python2.5 shebangs, causing a dependency on it. Here is a minimal patch to addresses the issue. While I was here, I couldn't help noticing that it install modules in the public python namespace, but no other package needs them. They can be installed in /usr/share/disk-manager instead. The second patch addresses that too, if you are interested. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 diff -u disk-manager-1.0.1/debian/rules disk-manager-1.0.1/debian/rules --- disk-manager-1.0.1/debian/rules +++ disk-manager-1.0.1/debian/rules @@ -8,7 +8,9 @@ build: build-stamp build-stamp: $(QUILT_STAMPFN) - dh build + dh build --before dh_auto_configure + PYTHON=/usr/bin/python dh_auto_configure + dh build --after dh_auto_configure touch $@ clean: unpatch diff -u disk-manager-1.0.1/debian/control disk-manager-1.0.1/debian/control --- disk-manager-1.0.1/debian/control +++ disk-manager-1.0.1/debian/control @@ -2,7 +2,7 @@ Section: admin Priority: optional Maintainer: David Paleino d.pale...@gmail.com -Build-Depends: debhelper (= 7), quilt +Build-Depends: debhelper (= 7.0.50~), quilt (= 0.46-7~) Build-Depends-Indep: autotools-dev, python-support (= 0.5.3), libxml-parser-perl, python-gtk2 Standards-Version: 3.8.1 diff -u disk-manager-1.0.1/debian/rules disk-manager-1.0.1/debian/rules --- disk-manager-1.0.1/debian/rules +++ disk-manager-1.0.1/debian/rules @@ -3,28 +3,17 @@ - # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -include /usr/share/quilt/quilt.make +PYDIR=/usr/share/disk-manager -build: build-stamp -build-stamp: $(QUILT_STAMPFN) - dh build - touch $@ +%: + dh $@ --with quilt -clean: unpatch - dh $@ +override_dh_auto_configure: + PYTHON=/usr/bin/python dh_auto_configure -install: install-stamp -install-stamp: build - dh install --until dh_auto_install +override_dh_auto_install: + dh_auto_install -- pyexecdir=$(PYDIR) find $(CURDIR)/debian/disk-manager -name *.pyc -or -name *.pyo | xargs rm - dh install --after dh_auto_install - touch $@ - -binary-arch: - -binary-indep: build install - dh $@ -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +override_dh_pysupport: + dh_pysupport $(PYDIR) diff -u disk-manager-1.0.1/debian/patches/series disk-manager-1.0.1/debian/patches/series --- disk-manager-1.0.1/debian/patches/series +++ disk-manager-1.0.1/debian/patches/series @@ -5,0 +6 @@ +06-private-pythonlib.patch only in patch2: unchanged: --- disk-manager-1.0.1.orig/debian/patches/06-private-pythonlib.patch +++ disk-manager-1.0.1/debian/patches/06-private-pythonlib.patch @@ -0,0 +1,40 @@ +Description: We use a private Python module directory, patch it into sys.path + at the start of the binaries. +Author: Stefano Rivera stef...@rivera.za.net +Last-Update: 2010-06-27 +--- a/disk-manager-root.in b/disk-manager-root.in +@@ -26,15 +26,7 @@ + import gettext + from subprocess import * + +-# Hack to make sure that path is set correctly when installation is in /usr/local +-if /usr/local in sys.argv[0] : +-for path in sys.path : +-if /usr/lib/python in path : +-local_path = path.replace(/usr, /usr/local) +-if not local_path in sys.path : +-sys.path.append(path.replace(/usr, /usr/local)) +-if not /usr/local/bin in os.environ[PATH] : +-os.environ[PATH] += :/usr/local/bin ++sys.path.insert(0, '/usr/share/disk-manager') + + from DiskManager.Fstab.FstabDialogs import dialog + from DiskManager.config import * +--- a/disk-manager.in b/disk-manager.in +@@ -29,13 +29,7 @@ + + import gtk + +-# Hack to make sure that path is set correctly when installation is in /usr/local +-if /usr/local in sys.argv[0] : +-for path in sys.path : +-if /usr/lib/python in path : +-local_path = path.replace(/usr, /usr/local) +-if not local_path in sys.path : +-sys.path.append(path.replace(/usr, /usr/local)) ++sys.path.insert(0, '/usr/share/disk-manager') + + from DiskManager.DiskManager import * + from DiskManager.Config import Config signature.asc Description: Digital signature
Bug#587342: vtun: Support tmpfs for /var/lock
Package: vtun
Version: 3.0.2-2.1
Severity: serious
Tags: patch
Justification: Policy 9.3.2
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu maverick ubuntu-patch
Hi, in Ubuntu, we've applied the attached patch to achieve the following:
* Merge from debian unstable (LP: #598053), remaining changes:
- Clean up debian directory.
- debian/control:
+ Added ${misc:Depends}.
- debian/patches/07-fix-gcc-warnings.patch: Fix gcc warnings.
- debian/rules: Dont start vtun when there is nothing to start.
(LP: #420545)
- debian/init.d:
+ implemented status.
+ Create /var/lock/vtund directory. (LP: #571415)
* Dropped changes:
- Clean up debian directory: broken comment, it does not explain what
has been clean.
We thought you may be interested. Some of those issues are pretty
small, and the gcc-warnings patch looks just hides bugs, but the init
script status feature would probably be useful to Debian.
In particular, the /var/lock on tmpfs fix should be applied in Debian.
SR
-- System Information:
Debian Release: squeeze/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-5-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_ZA.UTF-8, LC_CTYPE=en_ZA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
--
Stefano Rivera
http://tumbleweed.org.za/
H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127
diff -u vtun-3.0.2/debian/control vtun-3.0.2/debian/control
--- vtun-3.0.2/debian/control
+++ vtun-3.0.2/debian/control
@@ -10,7 +11,7 @@
Package: vtun
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: virtual tunnel over TCP/IP networks
VTun is the easiest way to create virtual tunnels over TCP/IP networks
with traffic shaping and compression.
diff -u vtun-3.0.2/debian/init.d vtun-3.0.2/debian/init.d
--- vtun-3.0.2/debian/init.d
+++ vtun-3.0.2/debian/init.d
@@ -28,6 +28,8 @@
. /etc/default/$NAME
fi
+mkdir -p /var/lock/vtund
+
case $1 in
start)
if [ -f /etc/vtund-start.conf ]; then
@@ -73,6 +75,13 @@
rm -f $i
done
;;
+status)
+for i in 0 1 2 3 4 5 6 7 8 9; do
+eval name=\$CLIENT${i}_NAME
+eval host=\$CLIENT${i}_HOST
+status_of_proc -p $PIDPREFIX.$name-$host.pid $DAEMON vtund e$
+done
+;;
reload|force-reload)
echo Reloading vtund.;
for i in $PIDPREFIX*.pid; do
@@ -86,7 +95,7 @@
$0 start
;;
*)
-echo Usage: $0 {start|stop|restart|reload|force-reload} 2
+echo Usage: $0 {start|stop|restart|reload|status|force-reload} 2
exit 1
;;
esac
diff -u vtun-3.0.2/debian/rules vtun-3.0.2/debian/rules
--- vtun-3.0.2/debian/rules
+++ vtun-3.0.2/debian/rules
@@ -78,7 +78,7 @@
dh_installexamples
dh_install
dh_installlogrotate
- dh_installinit --no-restart-on-upgrade
+ dh_installinit --no-start
dh_installman
dh_link
dh_strip
diff -u vtun-3.0.2/debian/patches/series vtun-3.0.2/debian/patches/series
--- vtun-3.0.2/debian/patches/series
+++ vtun-3.0.2/debian/patches/series
@@ -7,0 +8 @@
+07-fix-gcc-warnings.patch
only in patch2:
unchanged:
--- vtun-3.0.2.orig/debian/patches/07-fix-gcc-warnings.patch
+++ vtun-3.0.2/debian/patches/07-fix-gcc-warnings.patch
@@ -0,0 +1,57 @@
+diff -Naurp vtun-3.0.2.orig/main.c vtun-3.0.2/main.c
+--- vtun-3.0.2.orig/main.c 2008-01-07 17:35:53.0 -0500
vtun-3.0.2/main.c 2009-08-14 13:00:19.0 -0400
+@@ -53,6 +53,7 @@ extern char *optarg;
+ int main(int argc, char *argv[], char *env[])
+ {
+ int svr, daemon, sock, dofork, fd, opt;
++ int ret;
+ struct vtun_host *host = NULL;
+ struct sigaction sa;
+ char *hst;
+@@ -175,14 +176,14 @@ int main(int argc, char *argv[], char *e
+
+ /* Direct stdin,stdout,stderr to '/dev/null' */
+ fd = open(/dev/null, O_RDWR);
+- close(0); dup(fd);
+- close(1); dup(fd);
+-close(2); dup(fd);
++ close(0); ret = dup(fd);
++ close(1); ret = dup(fd);
++close(2); ret = dup(fd);
+ close(fd);
+
+ setsid();
+
+- chdir(/);
++ ret = chdir(/);
+ }
+
+ if(svr){
+diff -Naurp vtun-3.0.2.orig/tunnel.c vtun-3.0.2/tunnel.c
+--- vtun-3.0.2.orig/tunnel.c 2008-01-07 17:36:03.0 -0500
vtun-3.0.2/tunnel.c 2009-08-14 13:02:23.0 -0400
+@@ -71,6 +71,7 @@ int (*proto_read)(int fd, char *buf);
+ int tunnel(struct vtun_host *host)
+ {
+ int null_fd, pid, opt;
++ int ret;
+ int fd[2]={-1, -1};
+ char dev[VTUN_DEV_LEN]=;
+ int interface_already_open = 0;
+@@ -168,12 +169,12 @@ int tunnel(struct vtun_host *host)
+ case VTUN_PIPE:
+ null_fd = open(/dev/null, O_RDWR);
+ close(fd[0]);
+- close(0); dup(fd[1]);
+- close(1); dup(fd[1]);
++ close(0); ret = dup(fd[1]);
++ close(1); ret = dup(fd[1]);
+ close(fd[1
Bug#587342: More Ubuntu changes
Sorry, that was premature, have an additional patch. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 diff -u vtun-3.0.2/debian/copyright vtun-3.0.2/debian/copyright --- vtun-3.0.2/debian/copyright +++ vtun-3.0.2/debian/copyright @@ -23,6 +23,18 @@ along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + In addition, as a special exception, the copyright holders give permission + to link the code of portions of this program with the OpenSSL library under + certain conditions as described in each individual source file, and + distribute linked combinations including the two. + + You must obey the GNU General Public License in all respects for all of the + code used other than OpenSSL. If you modify file(s) with this exception, you + may extend this exception to your version of the file(s), but you are not + obligated to do so. If you do not wish to do so, delete this exception + statement from your version. If you delete this exception statement from all + source files in the program, then also delete it here. + On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. diff -u vtun-3.0.2/debian/init.d vtun-3.0.2/debian/init.d --- vtun-3.0.2/debian/init.d +++ vtun-3.0.2/debian/init.d @@ -28,6 +28,8 @@ . /etc/default/$NAME fi +mkdir -p /var/run/vtund /var/lock/vtund + case $1 in start) if [ -f /etc/vtund-start.conf ]; then diff -u vtun-3.0.2/debian/rules vtun-3.0.2/debian/rules --- vtun-3.0.2/debian/rules +++ vtun-3.0.2/debian/rules @@ -57,6 +57,8 @@ dh_installdirs $(MAKE) DESTDIR=$(CURDIR)/debian/vtun install + # Created in initscript: + rm -rf $(CURDIR)/debian/vtun/var/lock $(CURDIR)/debian/vtun/var/run #install -m 755 vtund $(CURDIR)/debian/vtun/usr/sbin/ # Those are then installed by dh_installexamples mkdir $(CURDIR)/debian/tmp
Bug#583787: src:frei0r: Patch attached
Hi The patch I linked to previously is about to vanish, as we are going to sync frei0r to the latest Debian version. Instead, here's a permanent copy. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 diff -pruN 1.1.22git20090409-2/COPYING.LIB 1.1.22git20090409+repack-0ubuntu3/COPYING.LIB --- 1.1.22git20090409-2/COPYING.LIB 1970-01-01 01:00:00.0 +0100 +++ 1.1.22git20090409+repack-0ubuntu3/COPYING.LIB 2009-04-17 15:48:17.0 +0100 @@ -0,0 +1,510 @@ + + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + +Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations +below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the Lesser General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less
Bug#587362: python-dulwich: python2.5 shebang
Package: python-dulwich Version: 0.6.0-4 Severity: important Tags: patch User: debian-pyt...@lists.debian.org Usertag: python2.6 Hi, python-dulwhich provides python scripts with versioned shebangs, causing a dependency on the build time python version. This patch addresses the issue (as well as a cleanup issue). BTW you also have an unnecessary auto-generated quilt patch. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 diff -Nru dulwich-0.6.0/debian/rules dulwich-0.6.0/debian/rules --- dulwich-0.6.0/debian/rules 2010-05-30 19:44:46.0 +0200 +++ dulwich-0.6.0/debian/rules 2010-06-27 22:41:39.0 +0200 @@ -5,13 +5,16 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/python-distutils.mk +DEB_PYTHON_BUILD_ARGS += --executable=/usr/bin/python + ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) common-build-arch common-build-indep:: debian/stamp-check debian/stamp-check: $(MAKE) check touch $@ +endif clean:: rm -f debian/stamp-check rm -f dulwich/*.so -endif + rm -rf *.egg-info signature.asc Description: Digital signature
Bug#587373: cdbs: python-distutils.mk: Installs scripts with a versioned shebang
Package: cdbs Version: 0.4.87 Severity: normal Tags: patch Hi, as part of the Python 2.6 transition, I've been digging through the packages that depend on python2.5. An awful lot of them do so because they install scripts with a shebang of the form: | #!/usr/bin/python2.5 dh works around this by building with the versioned python interpretors first, and then the default /usr/bin/python http://git.debian.org/?p=debhelper/debhelper.git;a=blob;f=Debian/Debhelper/Buildsystem/python_distutils.pm#l111 However distutils provides a way to force a particular shebang: --executable Here's a patch to pass that (by default) when building. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 diff --git a/1/class/python-distutils.mk.in b/1/class/python-distutils.mk.in index 267afaf..8ba232d 100644 --- a/1/class/python-distutils.mk.in +++ b/1/class/python-distutils.mk.in @@ -26,7 +26,7 @@ include $(_cdbs_class_path)/python-module.mk$(_cdbs_makefile_suffix) DEB_PYTHON_SETUP_CMD ?= setup.py DEB_PYTHON_CLEAN_ARGS ?= -a -DEB_PYTHON_BUILD_ARGS ?= --build-base=$(CURDIR)/$(DEB_BUILDDIR)/build +DEB_PYTHON_BUILD_ARGS ?= --build-base=$(CURDIR)/$(DEB_BUILDDIR)/build $(if $(cdbs_python_nondefault_version),,--executable=/usr/bin/python) DEB_PYTHON_INSTALL_ARGS_ALL ?= --prefix=/usr --no-compile -O0 # DEB_PYTHON_MODULE_PACKAGE is deprecated. signature.asc Description: Digital signature
Bug#586937: python-buffy: Patch to build against default python version (and move Buffy.py out of the darkness)
tags 586937 patch thanks Here's a patch that works around the issue. The problem is the configure script that only checks for python 2.4 and 2.5 Another problem is that Buffy isn't importable, as it's in a python-buffy directory under pyshared, this fixes that too. SR diff -Nru libbuffy-bindings-0.10/debian/changelog libbuffy-bindings-0.10+nmu1/debian/changelog --- libbuffy-bindings-0.10/debian/changelog 2010-03-05 18:54:09.0 +0200 +++ libbuffy-bindings-0.10+nmu1/debian/changelog 2010-06-26 17:09:33.0 +0200 @@ -1,3 +1,9 @@ +libbuffy-bindings (0.10+nmu1) unstable; urgency=low + + * Non-maintainer upload. + + -- Stefano Rivera stef...@rivera.za.net Sat, 26 Jun 2010 16:07:44 +0200 + libbuffy-bindings (0.10) unstable; urgency=low * Ported to libbuffy 1.4 diff -Nru libbuffy-bindings-0.10/debian/control libbuffy-bindings-0.10+nmu1/debian/control --- libbuffy-bindings-0.10/debian/control 2010-03-05 18:54:09.0 +0200 +++ libbuffy-bindings-0.10+nmu1/debian/control 2010-06-26 17:09:33.0 +0200 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Enrico Zini enr...@debian.org Uploaders: martin f krafft madd...@debian.org -Build-Depends: cdbs, debhelper (= 7), dh-buildinfo, libbuffy-dev (= 1.4), libbuffy-dev ( 2.0), swig, perl (= 5.6.0-16), python, python-all-dev (= 2.3.5-11), python-central (= 0.5.6), pkg-config, libtool, ruby1.8-dev, ruby, libwibble-dev (= 0.1.15), libwibble-dev ( 0.2), libglib2.0-dev, zlib1g-dev +Build-Depends: cdbs, debhelper (= 7), dh-buildinfo, libbuffy-dev (= 1.4), libbuffy-dev ( 2.0), swig, perl (= 5.6.0-16), python, python-dev (= 2.3.5-11), python-central (= 0.5.6), pkg-config, libtool, ruby1.8-dev, ruby, libwibble-dev (= 0.1.15), libwibble-dev ( 0.2), libglib2.0-dev, zlib1g-dev Standards-Version: 3.8.4.0 XS-Python-Version: = 2.3 Vcs-Git: git://git.debian.org/git/buffy/bindings.git diff -Nru libbuffy-bindings-0.10/debian/libbuffy-perl.debhelper.log libbuffy-bindings-0.10+nmu1/debian/libbuffy-perl.debhelper.log --- libbuffy-bindings-0.10/debian/libbuffy-perl.debhelper.log 2010-03-05 18:55:13.0 +0200 +++ libbuffy-bindings-0.10+nmu1/debian/libbuffy-perl.debhelper.log 1970-01-01 02:00:00.0 +0200 @@ -1,2 +0,0 @@ -dh_prep -dh_prep diff -Nru libbuffy-bindings-0.10/debian/libbuffy-ruby.debhelper.log libbuffy-bindings-0.10+nmu1/debian/libbuffy-ruby.debhelper.log --- libbuffy-bindings-0.10/debian/libbuffy-ruby.debhelper.log 2010-03-05 18:55:13.0 +0200 +++ libbuffy-bindings-0.10+nmu1/debian/libbuffy-ruby.debhelper.log 1970-01-01 02:00:00.0 +0200 @@ -1,2 +0,0 @@ -dh_prep -dh_prep diff -Nru libbuffy-bindings-0.10/debian/python-buffy.debhelper.log libbuffy-bindings-0.10+nmu1/debian/python-buffy.debhelper.log --- libbuffy-bindings-0.10/debian/python-buffy.debhelper.log 2010-03-05 18:55:13.0 +0200 +++ libbuffy-bindings-0.10+nmu1/debian/python-buffy.debhelper.log 1970-01-01 02:00:00.0 +0200 @@ -1,2 +0,0 @@ -dh_prep -dh_prep diff -Nru libbuffy-bindings-0.10/debian/python-buffy.install libbuffy-bindings-0.10+nmu1/debian/python-buffy.install --- libbuffy-bindings-0.10/debian/python-buffy.install 2010-03-05 18:54:09.0 +0200 +++ libbuffy-bindings-0.10+nmu1/debian/python-buffy.install 2010-06-26 17:14:59.0 +0200 @@ -1 +1,2 @@ -debian/tmp/usr/lib/python* +debian/tmp/usr/lib/python2.*/*-packages/_Buffy.so* +debian/tmp/usr/lib/python2.*/*-packages/Buffy.py diff -Nru libbuffy-bindings-0.10/debian/rules libbuffy-bindings-0.10+nmu1/debian/rules --- libbuffy-bindings-0.10/debian/rules 2010-03-05 18:54:09.0 +0200 +++ libbuffy-bindings-0.10+nmu1/debian/rules 2010-06-26 17:12:05.0 +0200 @@ -37,7 +37,8 @@ build-stamp: configure # Build cd perl make all OPTIMIZE=$(CXXFLAGS) - cd python make all + cd python make all PYTHON_CFLAGS=$(shell python-config --cflags) \ + PYTHON_LIBS=$(shell python-config --libs) cd ruby make all # Test test $(DO_TEST) = true (cd tests ./test.pl) @@ -55,9 +56,10 @@ -cd ruby make clean rm -f perl/Makefile.old rm -f ruby/Makefile - rm -f build-stamp config-stamp + rm -f build-stamp config-stamp install-stamp # dh_prep + rm -f debian/*.debhelper.log install: install-stamp install-stamp: @@ -68,6 +70,7 @@ # Install cd perl make install DESTDIR=$(DEB_INSTALL_PREFIX) cd python make install DESTDIR=$(DEB_INSTALL_PREFIX) + cd debian/tmp/usr/lib/python2.*/*-packages/buffy-python mv Buffy.py .. cd ruby make install DESTDIR=$(DEB_INSTALL_PREFIX) mv debian/tmp/usr/local/lib/site_ruby debian/tmp/usr/lib/ruby #
Bug#586937: python-buffy: Patch to build against default python version (and move Buffy.py out of the darkness)
Hi Debian (2010.06.26_18:24:50_+0200) dh_prep + rm -f debian/*.debhelper.log Err, I got scared off by the size of the diff it produced, but those two really should be a dh_clean -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#586937: python-buffy: Patch to build against all supported Python versions
I taught myself some autotools and created a much better patch.
SR
diff -Nru libbuffy-bindings-0.10/debian/control libbuffy-bindings-0.10+nmu1/debian/control
--- libbuffy-bindings-0.10/debian/control 2010-03-05 18:54:09.0 +0200
+++ libbuffy-bindings-0.10+nmu1/debian/control 2010-06-27 00:44:27.0 +0200
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Enrico Zini enr...@debian.org
Uploaders: martin f krafft madd...@debian.org
-Build-Depends: cdbs, debhelper (= 7), dh-buildinfo, libbuffy-dev (= 1.4), libbuffy-dev ( 2.0), swig, perl (= 5.6.0-16), python, python-all-dev (= 2.3.5-11), python-central (= 0.5.6), pkg-config, libtool, ruby1.8-dev, ruby, libwibble-dev (= 0.1.15), libwibble-dev ( 0.2), libglib2.0-dev, zlib1g-dev
+Build-Depends: cdbs, debhelper (= 7), dh-buildinfo, libbuffy-dev (= 1.4), libbuffy-dev ( 2.0), swig, perl (= 5.6.0-16), python-all, python-all-dev (= 2.3.5-11), python-central (= 0.5.6), pkg-config, libtool, ruby1.8-dev, ruby, libwibble-dev (= 0.1.15), libwibble-dev ( 0.2), libglib2.0-dev, zlib1g-dev
Standards-Version: 3.8.4.0
XS-Python-Version: = 2.3
Vcs-Git: git://git.debian.org/git/buffy/bindings.git
diff -Nru libbuffy-bindings-0.10/debian/python-buffy.install libbuffy-bindings-0.10+nmu1/debian/python-buffy.install
--- libbuffy-bindings-0.10/debian/python-buffy.install 2010-03-05 18:54:09.0 +0200
+++ libbuffy-bindings-0.10+nmu1/debian/python-buffy.install 2010-06-27 00:44:27.0 +0200
@@ -1 +1,2 @@
-debian/tmp/usr/lib/python*
+debian/tmp/usr/lib/python2.*/*-packages/_Buffy.so*
+debian/tmp/usr/lib/python2.*/*-packages/Buffy.py
diff -Nru libbuffy-bindings-0.10/debian/rules libbuffy-bindings-0.10+nmu1/debian/rules
--- libbuffy-bindings-0.10/debian/rules 2010-03-05 18:54:09.0 +0200
+++ libbuffy-bindings-0.10+nmu1/debian/rules 2010-06-27 01:01:05.0 +0200
@@ -22,13 +22,19 @@
CXXFLAGS += -O2
endif
+export PYVERS=$(shell pyversions -vr)
+
configure: config-stamp
config-stamp:
dh_testdir
# Configure
cd perl perl Makefile.PL PREFIX=/usr INSTALLDIRS=vendor
- cd python CXXFLAGS=$(CXXFLAGS) ./configure --prefix=/usr
cd ruby ruby extconf.rb
+ set -e; for pyver in $$PYVERS; do \
+ mkdir build-py$$pyver; \
+ (cd build-py$$pyver; \
+ PYTHON=python$$pyver CXXFLAGS=$(CXXFLAGS) ../python/configure --prefix=/usr); \
+ done
#
touch $@
@@ -37,12 +43,18 @@
build-stamp: configure
# Build
cd perl make all OPTIMIZE=$(CXXFLAGS)
- cd python make all
cd ruby make all
+ set -e; for pyver in $$PYVERS; do \
+ (cd build-py$$pyver; \
+ PYTHON=python$$pyver make all); \
+ done
# Test
test $(DO_TEST) = true (cd tests ./test.pl)
- test $(DO_TEST) = true (cd tests ./test.py)
test $(DO_TEST) = true (cd tests ./test.rb)
+ set -e; cd tests; for pyver in $$PYVERS; do \
+ echo Testing Python $$pyver:; \
+ PYTHONPATH=../build-py$$pyver:../build-py$$pyver/.libs python$$pyver test.py; \
+ done
#
touch $@
@@ -55,9 +67,10 @@
-cd ruby make clean
rm -f perl/Makefile.old
rm -f ruby/Makefile
- rm -f build-stamp config-stamp
+ rm -f python/*.pyc
+ rm -rf build-py*
#
- dh_prep
+ dh_clean
install: install-stamp
install-stamp:
@@ -67,14 +80,20 @@
dh_installdirs -i -s
# Install
cd perl make install DESTDIR=$(DEB_INSTALL_PREFIX)
- cd python make install DESTDIR=$(DEB_INSTALL_PREFIX)
cd ruby make install DESTDIR=$(DEB_INSTALL_PREFIX)
mv debian/tmp/usr/local/lib/site_ruby debian/tmp/usr/lib/ruby
+ set -e; for pyver in $$PYVERS; do \
+ (cd build-py$$pyver; \
+ make install DESTDIR=$(DEB_INSTALL_PREFIX)); \
+ (cd debian/tmp/usr/lib/python$$pyver/*-packages; \
+ mv buffy-python/Buffy.py .; \
+ mv _Buffy.so.0.0.0 _Buffy.so; \
+ rm _Buffy.so.*); \
+ done
#
dh_install -i -s
touch $@
-
# Must not depend on anything. This is to be called by
# binary-arch/binary-indep
# in another 'make' thread.
diff -Nru libbuffy-bindings-0.10/python/configure libbuffy-bindings-0.10+nmu1/python/configure
--- libbuffy-bindings-0.10/python/configure 2010-03-05 18:54:35.0 +0200
+++ libbuffy-bindings-0.10+nmu1/python/configure 2010-06-27 01:00:04.0 +0200
@@ -14855,18 +14863,15 @@
-for pyver in 2.5 2.4 2.3 2.2
-do
- PYCONF=python${pyver}-config
- if which $PYCONF /dev/null
- then
- PYTHON_CFLAGS=`$PYCONF --cflags`
- PYTHON_LIBS=`$PYCONF --libs`
+PYCONF=${PYTHON}-config
+PYTHON_CFLAGS=`$PYCONF --cflags`
+PYTHON_LIBS=`$PYCONF --libs`
+
+
+
+
- break
- fi
-done
diff -Nru libbuffy-bindings-0.10/python/configure.ac libbuffy-bindings-0.10+nmu1/python/configure.ac
--- libbuffy-bindings-0.10/python/configure.ac 2010-03-05 18:54:09.0 +0200
+++ libbuffy-bindings-0.10+nmu1/python/configure.ac 2010-06-27 00:44:27.0 +0200
@@ -17,18 +17,11 @@
dnl Python build system
AM_PATH_PYTHON
-for pyver in 2.5 2.4 2.3 2.2
-do
- PYCONF=python${pyver}-config
- if which $PYCONF /dev/null
- then
- PYTHON_CFLAGS=`$PYCONF --cflags`
- PYTHON_LIBS=`$PYCONF --libs`
- AC_SUBST([PYTHON_CFLAGS])
-
Bug#587191: oss4: Patch to use build symlink instead of source symlink
Package: oss4
Version: None
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu maverick ubuntu-patch
I don't know the policies here, but in Ubuntu, we needed to apply tho
following patch for oss4 to build. It appears that Ubuntu doesn't have
/lib/modules/`uname -r`/build symlinks.
*** /tmp/tmpuzeKti
In Ubuntu, we've applied the attached patch to achieve the following:
* debian/{dkms/dkms.conf.template,m-a/rules}:
s/source/build/ in Kernel headers paths.
Thanks to Jason Scurfu and Niall Creech (LP: #519577)
We thought you might be interested in supporting such situations, as
many other DKMS using packages don't require this modification.
-- System Information:
Debian Release: squeeze/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-5-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_ZA.UTF-8, LC_CTYPE=en_ZA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u oss4-4.2-build2002/debian/changelog oss4-4.2-build2002/debian/changelog
diff -u oss4-4.2-build2002/debian/oss4-dkms.dkms.in oss4-4.2-build2002/debian/oss4-dkms.dkms.in
--- oss4-4.2-build2002/debian/oss4-dkms.dkms.in
+++ oss4-4.2-build2002/debian/oss4-dkms.dkms.in
@@ -97,7 +97,7 @@
DEST_MODULE_LOCATION[30]=/updates/dkms/
DEST_MODULE_LOCATION[31]=/updates/dkms/
AUTOINSTALL=yes
-MAKE[0]=cp /lib/modules/${kernelver}/source/include/linux/limits.h ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/core \
+MAKE[0]=cp /lib/modules/${kernelver}/build/include/linux/limits.h ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/core \
make -C ${kernel_source_dir} SUBDIRS=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/core modules \
make -C ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/drivers osscore_symbols.inc \
make -C ${kernel_source_dir} SUBDIRS=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/drivers modules
diff -u oss4-4.2-build2002/debian/m-a/rules oss4-4.2-build2002/debian/m-a/rules
--- oss4-4.2-build2002/debian/m-a/rules
+++ oss4-4.2-build2002/debian/m-a/rules
@@ -48,7 +48,7 @@
dh_installdirs lib/modules/$(KVERS)/kernel/oss4
# This is Bad(tm) but necessary since linux-headers = 2.6.29
- cp /lib/modules/$(KVERS)/source/include/linux/limits.h $(PWD)/core
+ cp /lib/modules/$(KVERS)/build/include/linux/limits.h $(PWD)/core
# Build the modules
$(MAKE) -C $(KSRC) M=$(PWD)/core modules
Bug#587004: src:urlgrabber: Incorrect Vcs headers
Package: src:urlgrabber Version: 3.9.1-1 Severity: minor debian/control contains |Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/urlgrabber/trunk/ |Vcs-Svn: svn://svn.debian.org/python-modules/packages/urlgrabber/trunk/ Yet the package doesn't seem to be maintained in SVN. 3.9.1-1 is not there. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 signature.asc Description: Digital signature
Bug#587006: python-urlgrabber: Runs with, and unnecessarily depends on python2.5
Package: python-urlgrabber Version: 3.9.1-1 Severity: important Tags: patch User: debian-pyt...@lists.debian.org Usertags: python2.6 python-urlgrabber has the following depends, yet it shouldn't actually need to depend on python2.5, as it's 2.6 compatible. | Depends: python-support (= 0.90.0), python2.5 The cause of that is: | $ head -n1 /usr/bin/urlgrabber | #!/usr/bin/python2.5 -t The cause of *that* is: | for py in $(PYVERS); do \ | $$py setup.py install --prefix=/usr --root=$(CURDIR)/debian/python-urlgrabber; \ | done If you only install with the default version, you won't have this problem. You could also rewrite the shebang with sed. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 --- urlgrabber-3.9.1/debian/rules 2010-06-23 00:37:33.0 +0200 +++ urlgrabber-3.9.1/debian/rules 2010-06-24 15:45:36.0 +0200 @@ -46,9 +46,7 @@ dh_prep dh_installdirs # Add here commands to install the package into debian/urlgrabber. - for py in $(PYVERS); do \ - $$py setup.py install --prefix=/usr --root=$(CURDIR)/debian/python-urlgrabber; \ - done + python setup.py install --prefix=/usr --root=$(CURDIR)/debian/python-urlgrabber # remove unneeded documents installed by setup.py -rm -rf $(CURDIR)/debian/python-urlgrabber/usr/share/doc/urlgrabber-3* signature.asc Description: Digital signature
Bug#586464: Patch
tags 586464 patch thanks So, the cause of this is upstream using relative imports incorrectly. I have no idea why this worked in the past (and still works on Ubuntu). SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 signature.asc Description: Digital signature
Bug#586464: Patch
Really attached this time
SR
--
Stefano Rivera
http://tumbleweed.org.za/
H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127
Description: Remove incorrect relative import syntax and replace with absolute
imports.
Author: Stefano Rivera stef...@rivera.za.net
Last-Update: 2010-06-23
Bug-Debian: http://bugs.debian.org/586464
diff -Nur -x '*.orig' -x '*~' hamster-applet-2.30.1//src/hamster/widgets/activityentry.py hamster-applet-2.30.1.new//src/hamster/widgets/activityentry.py
--- hamster-applet-2.30.1//src/hamster/widgets/activityentry.py 2010-06-23 17:15:09.0 +0200
+++ hamster-applet-2.30.1.new//src/hamster/widgets/activityentry.py 2010-06-23 17:16:33.0 +0200
@@ -20,10 +20,10 @@
import gtk, gobject
import datetime as dt
-from .hamster.configuration import runtime
+from hamster.configuration import runtime
-from .hamster import stuff
-from .hamster.stuff import format_duration
+from hamster import stuff
+from hamster.stuff import format_duration
class ActivityEntry(gtk.Entry):
__gsignals__ = {
diff -Nur -x '*.orig' -x '*~' hamster-applet-2.30.1//src/hamster/widgets/dateinput.py hamster-applet-2.30.1.new//src/hamster/widgets/dateinput.py
--- hamster-applet-2.30.1//src/hamster/widgets/dateinput.py 2010-06-23 17:15:09.0 +0200
+++ hamster-applet-2.30.1.new//src/hamster/widgets/dateinput.py 2010-06-23 17:16:33.0 +0200
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU General Public License
# along with Project Hamster. If not, see http://www.gnu.org/licenses/.
-from .hamster.stuff import format_duration
+from hamster.stuff import format_duration
import gtk
import datetime as dt
import calendar
diff -Nur -x '*.orig' -x '*~' hamster-applet-2.30.1//src/hamster/widgets/dayline.py hamster-applet-2.30.1.new//src/hamster/widgets/dayline.py
--- hamster-applet-2.30.1//src/hamster/widgets/dayline.py 2010-06-23 17:15:09.0 +0200
+++ hamster-applet-2.30.1.new//src/hamster/widgets/dayline.py 2010-06-23 17:16:33.0 +0200
@@ -20,8 +20,8 @@
import gtk
import gobject
-from .hamster import stuff
-from .hamster import graphics
+from hamster import stuff
+from hamster import graphics
import time
import datetime as dt
diff -Nur -x '*.orig' -x '*~' hamster-applet-2.30.1//src/hamster/widgets/facttree.py hamster-applet-2.30.1.new//src/hamster/widgets/facttree.py
--- hamster-applet-2.30.1//src/hamster/widgets/facttree.py 2010-06-23 17:15:09.0 +0200
+++ hamster-applet-2.30.1.new//src/hamster/widgets/facttree.py 2010-06-23 17:16:33.0 +0200
@@ -20,8 +20,8 @@
import gtk, gobject
import datetime as dt
-from .hamster import stuff
-from .hamster.stuff import format_duration, format_activity
+from hamster import stuff
+from hamster.stuff import format_duration, format_activity
from tags import Tag
import pango
diff -Nur -x '*.orig' -x '*~' hamster-applet-2.30.1//src/hamster/widgets/tags.py hamster-applet-2.30.1.new//src/hamster/widgets/tags.py
--- hamster-applet-2.30.1//src/hamster/widgets/tags.py 2010-06-23 17:15:09.0 +0200
+++ hamster-applet-2.30.1.new//src/hamster/widgets/tags.py 2010-06-23 17:16:33.0 +0200
@@ -21,9 +21,9 @@
import pango, cairo
from math import pi
-from .hamster import graphics
+from hamster import graphics
-from .hamster.configuration import runtime
+from hamster.configuration import runtime
class TagsEntry(gtk.Entry):
__gsignals__ = {
diff -Nur -x '*.orig' -x '*~' hamster-applet-2.30.1//src/hamster/widgets/timechart.py hamster-applet-2.30.1.new//src/hamster/widgets/timechart.py
--- hamster-applet-2.30.1//src/hamster/widgets/timechart.py 2010-06-23 17:15:09.0 +0200
+++ hamster-applet-2.30.1.new//src/hamster/widgets/timechart.py 2010-06-23 17:16:33.0 +0200
@@ -20,7 +20,7 @@
import os # for locale
import gtk, pango
-from .hamster import graphics
+from hamster import graphics
import time, datetime as dt
import calendar
diff -Nur -x '*.orig' -x '*~' hamster-applet-2.30.1//src/hamster/widgets/timeinput.py hamster-applet-2.30.1.new//src/hamster/widgets/timeinput.py
--- hamster-applet-2.30.1//src/hamster/widgets/timeinput.py 2010-06-23 17:15:09.0 +0200
+++ hamster-applet-2.30.1.new//src/hamster/widgets/timeinput.py 2010-06-23 17:16:33.0 +0200
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU General Public License
# along with Project Hamster. If not, see http://www.gnu.org/licenses/.
-from .hamster.stuff import format_duration
+from hamster.stuff import format_duration
import gtk
import datetime as dt
import calendar
signature.asc
Description: Digital signature
Bug#586317: No-change upload required
A no-change upload should do the trick here. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 signature.asc Description: Digital signature
Bug#539096: elmerfem: diff for NMU version 5.5.0.svn.4458.dfsg-2.1
Dear maintainer,
I've prepared an NMU for elmerfem (versioned as 5.5.0.svn.4458.dfsg-2.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
The patch is a corrected version of my previous one, building against
the current default python version.
Regards.
diff -Nru elmerfem-5.5.0.svn.4458.dfsg/debian/changelog elmerfem-5.5.0.svn.4458.dfsg/debian/changelog
--- elmerfem-5.5.0.svn.4458.dfsg/debian/changelog 2010-05-05 14:44:19.0 +0200
+++ elmerfem-5.5.0.svn.4458.dfsg/debian/changelog 2010-06-21 16:29:24.0 +0200
@@ -1,3 +1,11 @@
+elmerfem (5.5.0.svn.4458.dfsg-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Build ElmerGUI against the current default Python version
+(Closes: #539096)
+
+ -- Stefano Rivera stef...@rivera.za.net Fri, 18 Jun 2010 17:25:04 +0200
+
elmerfem (5.5.0.svn.4458.dfsg-2) unstable; urgency=low
* Make sure patches apply before building (closes: #580207).
diff -Nru elmerfem-5.5.0.svn.4458.dfsg/debian/patches/ElmerGUI-config.patch elmerfem-5.5.0.svn.4458.dfsg/debian/patches/ElmerGUI-config.patch
--- elmerfem-5.5.0.svn.4458.dfsg/debian/patches/ElmerGUI-config.patch 2010-05-04 22:34:36.0 +0200
+++ elmerfem-5.5.0.svn.4458.dfsg/debian/patches/ElmerGUI-config.patch 2010-06-21 16:29:24.0 +0200
@@ -1,8 +1,8 @@
Have ElmerGUI use PythonQt, update VTK version, and specify OCC includes and
libs correctly.
-
elmerfem-5.5.0.svn.4041.dfsg/ElmerGUI/ElmerGUI.pri~ 2009-03-17 15:12:17.0 -0400
-+++ elmerfem-5.5.0.svn.4041.dfsg/ElmerGUI/ElmerGUI.pri 2009-03-17 15:22:37.0 -0400
+Build against Debian's default Python version.
+--- a/ElmerGUI/ElmerGUI.pri
b/ElmerGUI/ElmerGUI.pri
@@ -11,7 +11,7 @@
DEFINES += EG_VTK # Use VTK for postprocessing?
DEFINES += EG_MATC # Use MATC for internal operations in postprocessing?
@@ -12,6 +12,18 @@
#--
# 64 bit system?
+@@ -36,9 +36,9 @@
+ # Python library:
+ #--
+ unix {
+- PY_INCLUDEPATH = /usr/include/python2.5
++ PY_INCLUDEPATH = /usr/include/$$(DEB_PY_VERSION)
+PY_LIBPATH = /usr/lib
+- PY_LIBS = -lpython2.5
++ PY_LIBS = -l$$(DEB_PY_VERSION)
+ }
+
+ win32 {
@@ -75,7 +75,7 @@
# VTK library:
#--
diff -Nru elmerfem-5.5.0.svn.4458.dfsg/debian/rules elmerfem-5.5.0.svn.4458.dfsg/debian/rules
--- elmerfem-5.5.0.svn.4458.dfsg/debian/rules 2010-05-05 14:42:08.0 +0200
+++ elmerfem-5.5.0.svn.4458.dfsg/debian/rules 2010-06-21 16:29:24.0 +0200
@@ -118,7 +118,12 @@
make -C $$elmermodule install DESTDIR=$(CURDIR)/debian/tmp; \
done
echo; echo BUILDING ELMER MODULE ElmerGUI; echo
- (cd ElmerGUI ELMER_HOME=/usr ELMERGUI_HOME=/usr/share/ElmerGUI qmake ELMER_HOME=/usr ELMERGUI_HOME=/usr/share/ElmerGUI make)
+ (set -e; cd ElmerGUI; \
+ export DEB_PY_VERSION=$(shell pyversions -d); \
+ export ELMER_HOME=/usr; \
+ export ELMERGUI_HOME=/usr/share/ElmerGUI; \
+ qmake; \
+ make)
(cd ElmerGUIlogger ELMER_HOME=/usr ELMERGUI_HOME=/usr/share/ElmerGUI qmake -project ELMER_HOME=/usr ELMERGUI_HOME=/usr/share/ElmerGUI qmake ELMER_HOME=/usr ELMERGUI_HOME=/usr/share/ElmerGUI make)
echo; echo INSTALLING ELMER MODULE ElmerGUI; echo
make -C ElmerGUI install ELMER_HOME=/usr ELMERGUI_HOME=/usr/share/ElmerGUI INSTALL_ROOT=$(CURDIR)/debian/tmp
Bug#586563: Ubuntu changes to maxima-emacs installation
Package: maxima-emacs
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu maverick ubuntu-patch
Version: 5.21.1-1
Severity: minor
Tags: patch
In Ubuntu, we've applied the attached patch to achieve the following:
- debian/maxima-emacs.emacsen-install:
+ Install symlinks for source files rather than copying them. This
makes find-function work.
+ Install symlink for *.lisp so that we don't need to add
/usr/share/emacs/site-lisp/maxima to load-path.
- debian/maxima-emacs.emacsen-startup:
+ Remove use of /usr/share/emacs/site-lisp/maxima, since this
causes load-path shadows and is not needed anymore.
- Comment out backward-delete-char-untabify in maxima.el.
We thought you might be interested in doing the same.
These changes originated (a while ago) in this report:
https://bugs.launchpad.net/ubuntu/+source/maxima/+bug/124415
SR
PS: I can't comment on the content of this patch as I didn't author it
and am not an emacs user.
--
Stefano Rivera
http://tumbleweed.org.za/
H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127
diff -u maxima-5.21.1/debian/maxima-emacs.emacsen-startup maxima-5.21.1/debian/maxima-emacs.emacsen-startup
--- maxima-5.21.1/debian/maxima-emacs.emacsen-startup
+++ maxima-5.21.1/debian/maxima-emacs.emacsen-startup
@@ -25,11 +25,6 @@
(autoload 'maxima maxima t)
-
-; For emaxima.lisp to be found and tex update mode to be enabled.
-;
-(debian-pkg-add-load-path-item /usr/share/emacs/site-lisp/maxima)
-;
(autoload 'emaxima-mode emaxima t)
(autoload 'imaxima imaxima t)
diff -u maxima-5.21.1/debian/changelog maxima-5.21.1/debian/changelog
diff -u maxima-5.21.1/debian/maxima-emacs.emacsen-install maxima-5.21.1/debian/maxima-emacs.emacsen-install
--- maxima-5.21.1/debian/maxima-emacs.emacsen-install
+++ maxima-5.21.1/debian/maxima-emacs.emacsen-install
@@ -34,12 +34,12 @@
cd ${ELDIR}
FILES=`echo *.el`
-cp ${FILES} ${ELCDIR}
cd ${ELCDIR}
+ln -sf ${ELDIR}/*.el ${ELDIR}/*.lisp .
cat EOF path.el
(setq load-path (cons . load-path) byte-compile-warnings nil)
EOF
${FLAVOR} ${FLAGS} ${FILES}
-rm -f *.el path.el
+rm -f path.el
exit 0
only in patch2:
unchanged:
--- maxima-5.21.1.orig/interfaces/emacs/emaxima/maxima.el
+++ maxima-5.21.1/interfaces/emacs/emaxima/maxima.el
@@ -2494,7 +2494,7 @@
(define-key map \C-c\) 'maxima-check-parens)
(define-key map [(control c) (control \))] 'maxima-check-form-parens)
;(define-key map \C-cC-\) 'maxima-check-form-parens)
-(define-key map \177 'backward-delete-char-untabify)
+;(define-key map \177 'backward-delete-char-untabify)
(setq maxima-mode-map map)))
Menu
@@ -3321,7 +3321,7 @@
(define-key inferior-maxima-mode-map [(meta control tab)]
'inferior-maxima-input-complete)
(define-key inferior-maxima-mode-map \e\t 'inferior-maxima-complete)
-(define-key inferior-maxima-mode-map \177 'backward-delete-char-untabify)
+;(define-key inferior-maxima-mode-map \177 'backward-delete-char-untabify)
(define-key inferior-maxima-mode-map \C-c\C-k 'maxima-stop)
(define-key inferior-maxima-mode-map \C-c\C-d maxima-help-map)
signature.asc
Description: Digital signature
Bug#586545: Nonet patch
tag 586545 patch thanks I can't reproduce those failures, but I can see network traffic originating from xsltproc. Here's a patch to run xsltproc with --nonet. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 --- xchat-gnome-0.26.1.orig/debian/patches/12_nonet-xsltproc.patch +++ xchat-gnome-0.26.1/debian/patches/12_nonet-xsltproc.patch @@ -0,0 +1,27 @@ +Description: Disable network accesses in xsltproc. Fixes FTBFS on + network-disabled buildds. +Author: Stefano Rivera stef...@rivera.za.net +Bug-Debian: http://bugs.debian.org/586545 +Last-Update: 2010-06-20 +diff -Nur -x '*.orig' -x '*~' xchat-gnome-0.26.1//gnome-doc-utils.make xchat-gnome-0.26.1.new//gnome-doc-utils.make +--- xchat-gnome-0.26.1//gnome-doc-utils.make 2009-01-16 14:14:33.0 +0200 xchat-gnome-0.26.1.new//gnome-doc-utils.make 2010-06-20 22:42:59.271399201 +0200 +@@ -142,6 +142,7 @@ + ## @@ Rules for OMF Files + + db2omf_args = \ ++ --nonet \ + --stringparam db2omf.basename $(DOC_MODULE)\ + --stringparam db2omf.format $(3) \ + --stringparam db2omf.dtd \ +diff -Nur -x '*.orig' -x '*~' xchat-gnome-0.26.1//help/Makefile.in xchat-gnome-0.26.1.new//help/Makefile.in +--- xchat-gnome-0.26.1//help/Makefile.in 2009-04-12 19:48:01.0 +0200 xchat-gnome-0.26.1.new//help/Makefile.in 2010-06-20 22:42:25.211170923 +0200 +@@ -287,6 +287,7 @@ + + + db2omf_args = \ ++ --nonet \ + --stringparam db2omf.basename $(DOC_MODULE)\ + --stringparam db2omf.format $(3) \ + --stringparam db2omf.dtd \ signature.asc Description: Digital signature
Bug#586538: No easy solution except a 0.4.0 upload
awn-extras-applets is at 0.3.x, awn is at 0.4.0. There are big API differences. Instead of attempting this rebuild, 0.4.0 should be uploaded to unstable. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 signature.asc Description: Digital signature
