Bug#1025561: packages with dependencies on transitional policykit-1 package

[Michael Terry]

Good news! You can simply drop the Depends entirely for Deja Dup. It used to 
used pkexec, but no longer user policykit at all, since version 42.0 I believe.

Bug#1011355: deja-dup: Deja Dup's Google support will break in September 2022 for versions < 43.3

[Michael Terry]

Package: deja-dup
Version: 42.7-1
Severity: important
X-Debbugs-Cc: m...@mterry.name

Dear Maintainer,

I'm the upstream maintainer of Deja Dup. Google will be removing
a particular oauth workflow that Deja Dup uses in September.

This means that any new authentications for users trying to connect Deja
Dup to their Google account will fail after that date (existing users that
have already authenticated themselves will continue to work).

If possible, updating to 43.3 will fix this. Debian has already updated
the sid version to 43.3. But for older releases like bullseye (which is on
42.7), I recommend a backported patch.

Here's a wiki page for more information about the issue, including
backported patches for older versions like 42.7:
https://wiki.gnome.org/Apps/DejaDup/GoogleAuthChange2022

-- System Information:
Debian Release: bookworm/sid
  APT prefers jammy-updates
  APT policy: (500, 'jammy-updates'), (500, 'jammy-security'), (500, 'jammy'), 
(100, 'jammy-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.17.5-76051705-generic (SMP w/8 CPU threads; PREEMPT)
Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US:en
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Versions of packages deja-dup depends on:
ii  dconf-gsettings-backend [gsettings-backend]  0.40.0-3
ii  duplicity0.8.21-1build1
ii  libatk1.0-0  2.36.0-3build1
ii  libc62.35-0ubuntu3
ii  libgdk-pixbuf-2.0-0  2.42.8+dfsg-1
ii  libglib2.0-0 2.72.1-1
ii  libgpg-error01.43-3
ii  libgtk-3-0   3.24.33-1ubuntu1
ii  libhandy-1-0 1.6.1-1
ii  libjson-glib-1.0-0   1.6.6-1build1
ii  libpackagekit-glib2-18   1.2.5-2ubuntu2
ii  libsecret-1-00.20.5-2
ii  libsoup2.4-1 2.74.2-3

Versions of packages deja-dup recommends:
ii  gvfs-backends  1.48.1-4
ii  packagekit 1.2.5-2ubuntu2
ii  policykit-10.105-33

Versions of packages deja-dup suggests:
pn  python3-pydrive  

Bug#944512: duplicity: shouldn't be able to create a backup chain with two different passwords

[Michael Terry]

On Wed, Nov 13, 2019, at 03:19, Alexander Zangerl wrote:
> On Tue, 12 Nov 2019 17:10:40 -0500, "Michael Terry" writes:
> >I could throw you a patch tomorrow. And it could have the benefit of
> >being upstreamable too.
> 
> that sounds very good; thanks for your time!

OK, attached is a patch that I also gave upstream, but no reply there yet 
(https://code.launchpad.net/~mterry/duplicity/resume-encrypt-no-pass/+merge/375468)

It should be able to replace 01-reverify.=== modified file 'duplicity/dup_main.py'
--- duplicity/dup_main.py	2019-09-22 23:44:56 +
+++ duplicity/dup_main.py	2019-11-13 04:19:44 +
@@ -153,14 +153,14 @@
 # there is no sign_key and there are recipients
 elif (action == u"full" and
   (globals.gpg_profile.recipients or globals.gpg_profile.hidden_recipients) and not
-  globals.gpg_profile.sign_key and not globals.restart):
+  globals.gpg_profile.sign_key):
 return u""
 
 # for an inc backup, we don't need a password if
 # there is no sign_key and there are recipients
 elif (action == u"inc" and
   (globals.gpg_profile.recipients or globals.gpg_profile.hidden_recipients) and not
-  globals.gpg_profile.sign_key and not globals.restart):
+  globals.gpg_profile.sign_key):
 return u""
 
 # Finally, ask the user for the passphrase
@@ -346,6 +346,13 @@
 from encrypted to non in the middle of a backup chain), so we check
 that the vol1 filename on the server matches the settings of this run.
 """
+if ((globals.gpg_profile.recipients or globals.gpg_profile.hidden_recipients) and
+not globals.gpg_profile.sign_key):
+# When using gpg encryption without a signing key, we skip this validation
+# step to ensure that we can still backup without needing the secret key
+# on the machine.
+return
+
 vol1_filename = file_naming.get(backup_type, 1,
 encrypted=globals.encryption,
 gzipped=globals.compression)

=== modified file 'testing/functional/test_restart.py'
--- testing/functional/test_restart.py	2019-09-26 14:58:52 +
+++ testing/functional/test_restart.py	2019-11-13 04:19:44 +
@@ -79,6 +79,22 @@
 self.backup(u"full", u"testfiles/largefiles")
 self.verify(u"testfiles/largefiles")
 
+def test_restart_encrypt_without_password(self):
+u"""
+Test that we can successfully restart a encrypt-key-only backup without
+providing a password for it. (Normally, we'd need to decrypt the first
+volume, but there is special code to skip that with an encrypt key.)
+"""
+self.set_environ(u'PASSPHRASE', None)
+self.set_environ(u'SIGN_PASSPHRASE', None)
+self.make_largefiles()
+enc_opts = [u"--encrypt-key", self.encrypt_key1]
+self.backup(u"full", u"testfiles/largefiles", options=enc_opts, fail=2)
+self.backup(u"full", u"testfiles/largefiles", options=enc_opts)
+
+self.set_environ(u'PASSPHRASE', self.sign_passphrase)
+self.verify(u"testfiles/largefiles")
+
 def test_restart_sign_and_encrypt(self):
 u"""
 Test restarting a backup using same key for sign and encrypt

Bug#944512: duplicity: shouldn't be able to create a backup chain with two different passwords

[Michael Terry]

On Tue, Nov 12, 2019, at 17:04, Alexander Zangerl wrote:
> On Tue, 12 Nov 2019 07:46:37 -0500, "Michael Terry" writes:
> >Wait, you mean that you want to back up without even needing the
> >passphrase for the secret gpg key?
> 
> that's precisely it.
> 
> the secret key isn't even present on the machines that the backup runs on,
> just the public key. gpg (on duplicity's behalf) encrypts the data
> to and for the public key in question and thus performs a non-reversible 
> one-way
> transformation as far as that backup machine is concerned.

OK got it. Duplicity might try to decrypt metadata still, if its cache gets 
blown away. But I get the use case.

I don’t suppose you’d object to an update to the patch that at least makes it 
conditional to gpg key scenarios? Disabling the verification check is dangerous 
for other use cases.

I could throw you a patch tomorrow. And it could have the benefit of being 
upstreamable too.

Thanks!

Bug#944512: duplicity: shouldn't be able to create a backup chain with two different passwords

[Michael Terry]

On Tue, Nov 12, 2019, at 07:39, Michael Terry wrote:
> On Tue, Nov 12, 2019, at 04:54, Alexander Zangerl wrote:
>> >test the gpg encryption key issue (this one needs you to specify both
>> >KEY and PASSPHRASE environment variables -- your gpg key id and
>> >passphrase respectively).
>> 
>> your scenario doesn't cover the case i'm trying to keep working, ie. an
>> gpg-encrypted but not signed backup where duplicity just has a key to
>> encrypt to and does not know any passphrases by design. given that that
>> setup is one of the few relatively safe ones i certainly don't want to
>> break that.

Wait, you mean that you want to back up without even needing the passphrase for 
the secret gpg key?

Bug#944512: duplicity: shouldn't be able to create a backup chain with two different passwords

[Michael Terry]

On Tue, Nov 12, 2019, at 04:54, Alexander Zangerl wrote:
> >test the gpg encryption key issue (this one needs you to specify both
> >KEY and PASSPHRASE environment variables -- your gpg key id and
> >passphrase respectively).
> 
> your scenario doesn't cover the case i'm trying to keep working, ie. an
> gpg-encrypted but not signed backup where duplicity just has a key to
> encrypt to and does not know any passphrases by design. given that that
> setup is one of the few relatively safe ones i certainly don't want to
> break that.

I believe that is the scenario tested in the gpgkey.sh script.

I totally get not wanting to introduce a regression. And admittedly, I’m not as 
familiar with the gpg-key flow. But other folks upstream are, and I hope that 
they wouldn’t have let it stay broken.

Bug#944512: duplicity: shouldn't be able to create a backup chain with two different passwords

[Michael Terry]

Package: duplicity
Version: 0.8.04-2ubuntu1
Severity: normal

Dear Maintainer,

Many years ago, duplicity had a bug that allowed you to resume a backup with a 
different
password than the one with which you started the backup. This left your backup 
chain
in an unrecoverable state, since duplicity doesn't know how to restore from a 
chain like
that.

It was fixed upstream. But the fix didn't properly handle using a gpg 
encryption key
(rather than a symmetric password). So Debian added the patch 01-reverify that 
disabled
the fix upstream.

But then duplicity fixed the issue with gpg encryption keys and Debian never 
dropped its
patch. Which left the original password-swap bug in place.

Can Debian drop 01-reverify please? I've attached two scripts that demonstrate 
each bug
and you can test that both work after dropping the patch.

You can run switchpass.sh to test the original password-swap bug. And run 
gpgkey.sh to
test the gpg encryption key issue (this one needs you to specify both KEY and 
PASSPHRASE
environment variables -- your gpg key id and passphrase respectively).

Both should report "Everything worked!" at the end if the bugs are fixed.
Or "Bug exists! :(" if the bug is present.

Upstream password-swap bug: https://bugs.launchpad.net/duplicity/+bug/878964
Upstream gpg-key bug: https://bugs.launchpad.net/duplicity/+bug/946988

Thanks!

-- System Information:
Debian Release: buster/sid
  APT prefers eoan-updates
  APT policy: (500, 'eoan-updates'), (500, 'eoan-security'), (500, 'eoan')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.3.0-19-generic (SMP w/4 CPU cores)
Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Versions of packages duplicity depends on:
ii  gnupg  2.2.12-1ubuntu3
ii  gnupg1 1.4.23-1
ii  libc6  2.30-0ubuntu2
ii  librsync2  2.0.2-1ubuntu1
ii  python33.7.5-1
ii  python3-fasteners  0.12.0-5
ii  python3-future 0.16.0-1
ii  python3-lockfile   1:0.12.2-2ubuntu1

Versions of packages duplicity recommends:
ii  python3-oauthlib  2.1.0-1
ii  python3-paramiko  2.6.0-1
ii  python3-pexpect   4.6.0-1
ii  python3-urllib3   1.24.1-1ubuntu1
ii  rsync 3.1.3-6

Versions of packages duplicity suggests:
pn  lftp 
pn  ncftp
ii  par2 0.8.0-1
pn  python3-boto 
ii  python3-pip  18.1-5
pn  python3-swiftclient  
pn  tahoe-lafs   

-- no debconf information
#!/bin/sh

rm -rf /tmp/dupbadpass /tmp/dupbadrestore

echo "Making first, interrupted backup"
PASSPHRASE=testpass duplicity /usr/bin file:///tmp/dupbadpass --name dupbadpass 
--volsize 1 --fail-on-volume 2 --verbosity 1

echo "Finishing that backup with the wrong password"
PASSPHRASE=badpass duplicity /usr/bin file:///tmp/dupbadpass --name dupbadpass 
--volsize 1 --fail-on-volume 3 --verbosity 1

echo -n "Now, is vol1 encrypted with right pass?  "
if gpg --decrypt --passphrase testpass --pinentry-mode=loopback 
/tmp/dupbadpass/duplicity-full*.vol1.difftar.gpg >/dev/null 2>&1; then
  echo "Yes!"
else
  echo "Nope...? Something is deeply wrong"
fi

echo -n "And vol3 with the wrong one?  "
if [ -z "$(ls /tmp/dupbadpass/duplicity-full*.vol3.difftar.gpg 2>/dev/null)" ]; 
then
  echo "No vol3 exists"
  echo "Everything worked!"
elif gpg --decrypt --passphrase badpass --pinentry-mode=loopback 
/tmp/dupbadpass/duplicity-full*.vol3.difftar.gpg >/dev/null 2>&1; then
  echo "Yes!"
  echo "Bug exists! :("
else
  echo "Nope...? Something is deeply wrong"
fi


#!/bin/sh

killall gpg-agent
rm -rf ~/.cache/duplicity/dupbadpass /tmp/dupbadpass /tmp/dupbadrestore

echo "Making first, interrupted backup"
duplicity /usr/bin file:///tmp/dupbadpass --name dupbadpass --volsize 1 
--fail-on-volume 2 --encrypt-key $KEY

echo "Finishing that backup"
duplicity /usr/bin file:///tmp/dupbadpass --name dupbadpass --volsize 1 
--fail-on-volume 3 --encrypt-key $KEY

if [ -n "$(ls /tmp/dupbadpass/duplicity-full*.vol3.difftar.gpg 2>/dev/null)" ]; 
then
  echo "Everything worked!"
else
  echo "Bug exists! :("
fi

Bug#944510: deja-dup: Cannot back up to Google Drive (no pydrive packaged)

[Michael Terry]

Package: deja-dup
Version: 40.1-4
Severity: normal

Dear Maintainer,

I'm the upstream maintainer of deja-dup. I noticed that due to the absence of
pydrive in Debian (RFP: https://bugs.debian.org/922076), deja-dup's default
backend (Google Drive) does not work at all.

Ideally, pydrive would be packaged and -Dpydrive_pkgs=python3-pydrive would be
specified. But until that happens, I'd appreciate Google Drive being disabled.

Better to not provide a broken option (especially a default!). Less bug reports
for me, anyway.

I've attached a patch to do disable it from the UI.


-- System Information:
Debian Release: buster/sid
  APT prefers eoan-updates
  APT policy: (500, 'eoan-updates'), (500, 'eoan-security'), (500, 'eoan')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.3.0-19-generic (SMP w/4 CPU cores)
Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Versions of packages deja-dup depends on:
ii  dconf-gsettings-backend [gsettings-backend]  0.34.0-1
ii  duplicity0.8.04-2ubuntu1
ii  libatk1.0-0  2.34.0-1
ii  libc62.30-0ubuntu2
ii  libglib2.0-0 2.62.1-1
ii  libgoa-1.0-0b3.34.0-1ubuntu1
ii  libgpg-error01.36-7
ii  libgtk-3-0   3.24.12-1ubuntu1
ii  libjson-glib-1.0-0   1.4.4-2
ii  libnautilus-extension1a  1:3.34.1-1ubuntu1
ii  libpackagekit-glib2-18   1.1.12-5ubuntu4
ii  libpango-1.0-0   1.42.4-7
ii  libsecret-1-00.18.8-2
ii  libsoup2.4-1 2.68.2-0ubuntu1

Versions of packages deja-dup recommends:
ii  gvfs-backends  1.42.1-1ubuntu1
ii  packagekit 1.1.12-5ubuntu4
ii  policykit-10.105-26ubuntu1

Versions of packages deja-dup suggests:
pn  python3-boto 
pn  python3-cloudfiles   
pn  python3-swiftclient  
diff --git a/deja-dup/widgets/ConfigLocation.vala 
b/deja-dup/widgets/ConfigLocation.vala
index a3313af9..ff67cba8 100644
--- a/deja-dup/widgets/ConfigLocation.vala
+++ b/deja-dup/widgets/ConfigLocation.vala
@@ -192,7 +192,7 @@ public class ConfigLocation : ConfigWidget
  new ConfigLocationS3(label_sizes, all_settings[S3_ROOT])) 
|
 insert_cloud("gcs", _("Google Cloud Storage"), show_deprecated, 
"deja-dup-cloud",
  new ConfigLocationGCS(label_sizes, 
all_settings[GCS_ROOT])) |
-insert_cloud("google", _("Google Drive"), true, 
"deja-dup-google-drive",
+insert_cloud("google", _("Google Drive"), false, 
"deja-dup-google-drive",
  new ConfigLocationGoogle(label_sizes, 
all_settings[GOOGLE_ROOT])) |
 insert_cloud("rackspace", _("Rackspace Cloud Files"), show_deprecated, 
"deja-dup-cloud",
  new ConfigLocationRackspace(label_sizes, 
all_settings[RACKSPACE_ROOT])) |
diff --git a/libdeja/BackendAuto.vala b/libdeja/BackendAuto.vala
index 588622a0..e15e2cb1 100644
--- a/libdeja/BackendAuto.vala
+++ b/libdeja/BackendAuto.vala
@@ -55,7 +55,7 @@ public class BackendAuto : Backend
 // 3) Google Drive via GNOME Online Accounts
 // 4) Google Drive (relying on packagekit support to install dependencies)
 var settings = get_settings();
-settings.set_string(BACKEND_KEY, "google");
+settings.set_string(BACKEND_KEY, "local");
   }
 }
 

Bug#861703: duplicity: please run tests during build

[Michael Terry]

Thanks for accepting most of these changes, and additionally improving
them.  :)

A comment below about a couple of the patches.

On Thu, Aug 24, 2017, at 09:09, Alexander Zangerl wrote:
> >It's just something we've also done since maybe trusty because
> >upstream fixed the issues those patches solve.
> 
> i disagree with that claim: the relevant lauchpad bugs are still
> open, and i don't see any fixes in the code.

01-reverify is associated with Debian bug 659009 and Launchpad bug
946988.  The LP bug has been fixed for a long time.

02-unicode is associated with Debian bug 682837 and Launchpad bug
1030199 (dup of catch-all bug 1050509).

I recently added a comment to that bug explaining the current situation.
 This patch is a risk/reward calculation of how much you value duplicity
strings being in the user's language vs how much you think duplicity has
fixed its unicode issues.  I lean toward translated strings (and we've
been running that way in Ubuntu for years), but I understand if you
prefer to be more careful.

Thanks,
-mt

Bug#861703: duplicity: please run tests during build

[Michael Terry]

Package: duplicity
Version: 0.7.11-1
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu artful ubuntu-patch

Dear Maintainer,

For many cycles in Ubuntu (since precise), we've been running the duplicity
test suite and at least one simple dep8 test.  For some reason, I've never
sent the debdiff to do so your way.  Here it is, please consider it for
Debian too.

We do skip some tests.  Those are the ones that we've found unreliable
for various architectures over the years.

This debdiff also disables the 01-reverify and 02-unicode patches.  This is
unrelated to the above test running.  It's just something we've also done
since maybe trusty because upstream fixed the issues those patches solve.
Feel free to not include those bits; I just figured while sending the other,
I might as well include this too.

Applying this debdiff will reduce Ubuntu's delta to just main/universe
considerations (we drop some Recommends to Suggests) and the occasional
cherry pick patch.

Thanks for considering the patch.


-- System Information:
Debian Release: stretch/sid
  APT prefers xenial-updates
  APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500, 
'xenial'), (100, 'xenial-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.4.0-72-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru duplicity-0.7.11/debian/control duplicity-0.7.11/debian/control
--- duplicity-0.7.11/debian/control	2017-01-25 22:48:47.0 -0500
+++ duplicity-0.7.11/debian/control	2017-05-02 17:26:28.0 -0400
@@ -2,7 +2,7 @@
 Section: utils
 Priority: optional
 Maintainer: Alexander Zangerl <a...@debian.org>
-Build-Depends: debhelper (>= 8.0.0), librsync-dev (>=0.9.6), python-dev (>= 2.6.6-3), dh-python, python-setuptools
+Build-Depends: debhelper (>= 8.0.0), librsync-dev (>=0.9.6), python-dev (>= 2.6.6-3), dh-python, python-setuptools, rdiff, gnupg, par2, python-lockfile (>> 0.9), python-mock, python-pexpect
 Standards-Version: 3.9.8
 X-Python-Version: >= 2.5
 Homepage: http://duplicity.nongnu.org/
diff -Nru duplicity-0.7.11/debian/patches/series duplicity-0.7.11/debian/patches/series
--- duplicity-0.7.11/debian/patches/series	2016-08-25 22:13:13.0 -0400
+++ duplicity-0.7.11/debian/patches/series	2017-05-02 16:49:10.0 -0400
@@ -1,4 +1,3 @@
-01-reverify
-02-unicode
 03-manpage
 04-passphrase-prompt
+skip-some-tests.patch
diff -Nru duplicity-0.7.11/debian/patches/skip-some-tests.patch duplicity-0.7.11/debian/patches/skip-some-tests.patch
--- duplicity-0.7.11/debian/patches/skip-some-tests.patch	1969-12-31 19:00:00.0 -0500
+++ duplicity-0.7.11/debian/patches/skip-some-tests.patch	2017-04-27 09:55:45.0 -0400
@@ -0,0 +1,35 @@
+Author: Michael Terry <mte...@ubuntu.com>
+Subject: Disable some tests for being flaky
+
+Index: duplicity-0.7.11-1ubuntu1/testing/functional/test_restart.py
+===
+--- duplicity-0.7.11-1ubuntu1.orig/testing/functional/test_restart.py	2017-04-27 09:31:41.654332654 -0400
 duplicity-0.7.11-1ubuntu1/testing/functional/test_restart.py	2017-04-27 09:31:41.650332602 -0400
+@@ -111,6 +111,7 @@
+ # there should be 2 differences found, one missing file, one mtime change
+ # self.verify("testfiles/largefiles")
+ 
++@unittest.skip("Flaky test because it relies on knowing how many volumes the source files will be split into")
+ def test_last_file_missing_at_end(self):
+ """
+ Test restart when the last file being backed up is missing on restart.
+Index: duplicity-0.7.11-1ubuntu1/testing/unit/test_gpg.py
+===
+--- duplicity-0.7.11-1ubuntu1.orig/testing/unit/test_gpg.py	2017-04-27 09:31:41.654332654 -0400
 duplicity-0.7.11-1ubuntu1/testing/unit/test_gpg.py	2017-04-27 09:31:41.650332602 -0400
+@@ -129,6 +129,7 @@
+ sig = decrypted_file.get_signature()
+ assert sig == self.sign_key, sig[-8:]
+ 
++@unittest.skip("Flaky test because it relies on compressed size of random bytes")
+ def test_GPGWriteFile(self):
+ """Test GPGWriteFile"""
+ size = 400 * 1000
+@@ -144,6 +145,7 @@
+  profile, size=size)
+ # print os.stat("testfiles/output/gpgwrite.gpg").st_size
+ 
++@unittest.skip("Flaky test because it relies on compressed size of random bytes")
+ def test_GzipWriteFile(self):
+ """Test GzipWriteFile"""
+ size = 400 * 1000
diff -Nru duplicity-0.7.11/debian/rules duplicity-0.7.11/debian/rules
--- duplicity-0.7.11/debian/rules	2016-09-24 23:59:11.0 -0400
+++ duplicity-0

Bug#845248: gdk-pixbuf: OOM during CVE-2015-4491/original test

[Michael Terry]

Package: gdk-pixbuf
Version: 2.36.0-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu zesty ubuntu-patch

Dear Maintainer,

In Ubuntu, we only have one small delta with Debian: unsetting MALLOC_PERTURB_ 
for the /pixbuf/cve-2015-4491/original test.  It caused OOM failures on our 
builders.

I see that you already have 01-disable-oom-test.patch for FreeBSD.  I'm not 
sure what architectures we hit the OOM with.  But the attached patch was our 
solution.  Can't hurt, might help with other non-FreeBSD architectures.

Patch originally by Dimitri John Ledkov (xnox).  Thanks for considering it.


-- System Information:
Debian Release: stretch/sid
  APT prefers xenial-updates
  APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500, 
'xenial'), (100, 'xenial-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.4.0-47-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru gdk-pixbuf-2.36.0/debian/patches/series gdk-pixbuf-2.36.0/debian/patches/series
--- gdk-pixbuf-2.36.0/debian/patches/series	2016-09-13 10:04:26.0 -0400
+++ gdk-pixbuf-2.36.0/debian/patches/series	2016-11-21 12:19:03.0 -0500
@@ -1 +1,2 @@
 01-disable-oom-test.patch
+skip-perturb-for-cve-2015-4491-original-test.patch
diff -Nru gdk-pixbuf-2.36.0/debian/patches/skip-perturb-for-cve-2015-4491-original-test.patch gdk-pixbuf-2.36.0/debian/patches/skip-perturb-for-cve-2015-4491-original-test.patch
--- gdk-pixbuf-2.36.0/debian/patches/skip-perturb-for-cve-2015-4491-original-test.patch	1969-12-31 19:00:00.0 -0500
+++ gdk-pixbuf-2.36.0/debian/patches/skip-perturb-for-cve-2015-4491-original-test.patch	2016-11-21 12:19:03.0 -0500
@@ -0,0 +1,39 @@
+Description: Unset MALLOC_PERTURB_ for the /pixbuf/cve-2015-4491/original
+ as it fails with OOM, or gets OOM killed.
+Author: Dimitri John Ledkov 
+
+--- a/tests/cve-2015-4491.c
 b/tests/cve-2015-4491.c
+@@ -18,6 +18,8 @@
+  * Author: Benjamin Otte
+  */
+ 
++#include 
++
+ #include 
+ 
+ #include "test-common.h"
+@@ -28,11 +30,23 @@
+   GdkPixbuf* buf;
+   int size = 32;
+   GError* err = NULL;
++  gint64 perturbv = 0;
++  
++  const gchar * perturb = NULL;
++  perturb = g_getenv("MALLOC_PERTURB_");
++  if (perturb != NULL) {
++	  perturbv = g_ascii_strtoll (perturb, NULL, 0);
++	  mallopt(M_PERTURB, 0);
++  }
+ 
+   buf = gdk_pixbuf_new_from_resource_at_scale ("/test/resource/cve-2015-4491.bmp", size, size, FALSE, );
+   if (skip_if_insufficient_memory ())
+ return;
+ 
++  if (perturbv > 0) {
++	  mallopt(M_PERTURB, perturbv);
++  }
++
+   g_assert_no_error (err);
+ 
+   g_object_unref (buf);

Bug#824060: lcms2: simplify endian check

[Michael Terry]

Package: lcms2
Version: 2.7-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu yakkety ubuntu-patch

Dear Maintainer,

Ubuntu only has one delta from the lcms2 Debian package, which is a patch to
simplify the endian check.  I didn't write the patch, so I'm not sure
exactly the pain point that led to it.  But it presumably helps avoid some
issues with flaky endian tests.

And thus, I assume it's also useful to Debian.  I noticed the delta when
updating the package and am now passing the patch on to you.

Thanks for considering it!


-- System Information:
Debian Release: stretch/sid
  APT prefers xenial-updates
  APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500, 'xenial')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.4.0-22-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL 
set to C.UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru lcms2-2.7/debian/patches/byte-order.patch lcms2-2.7/debian/patches/byte-order.patch
--- lcms2-2.7/debian/patches/byte-order.patch	1969-12-31 19:00:00.0 -0500
+++ lcms2-2.7/debian/patches/byte-order.patch	2016-05-11 14:03:15.0 -0400
@@ -0,0 +1,53 @@
+Description: Replace arch-specific tests with __BYTE_ORDER test.
+Author: Adam Conrad 
+
+Index: lcms2-2.7-1ubuntu1/include/lcms2.h
+===
+--- lcms2-2.7-1ubuntu1.orig/include/lcms2.h
 lcms2-2.7-1ubuntu1/include/lcms2.h
+@@ -173,42 +173,9 @@ typedef int  cmsBool;
+ #  define CMS_IS_WINDOWS_ 1
+ #endif
+ 
+-// Try to detect big endian platforms. This list can be endless, so only some checks are performed over here.
+-// you can pass this toggle to the compiler by using -DCMS_USE_BIG_ENDIAN or something similar
+-
+-#if defined(__sgi__) || defined(__sgi) || defined(sparc)
+-#   define CMS_USE_BIG_ENDIAN  1
+-#endif
+-
+-#if defined(__s390__) || defined(__s390x__)
+-#   define CMS_USE_BIG_ENDIAN   1
+-#endif
+-
+-
+-#if defined(__powerpc__) || defined(__ppc__) || defined(TARGET_CPU_PPC)
+-#  if __powerpc__ || __ppc__ || TARGET_CPU_PPC
+-#   define CMS_USE_BIG_ENDIAN   1
+-#   if defined (__GNUC__) && defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__)
+-#   if __BYTE_ORDER__  == __ORDER_LITTLE_ENDIAN__
+-// Don't use big endian for PowerPC little endian mode
+-#undef CMS_USE_BIG_ENDIAN
+-#   endif
+-# endif
+-#   endif
+-#endif
+-
+-#ifdef macintosh
+-# ifdef __BIG_ENDIAN__
+-#   define CMS_USE_BIG_ENDIAN  1
+-# endif
+-# ifdef __LITTLE_ENDIAN__
+-#   undef CMS_USE_BIG_ENDIAN
+-# endif
+-#endif
+-
+-// WORDS_BIGENDIAN takes precedence
+-#if defined(_HOST_BIG_ENDIAN) || defined(__BIG_ENDIAN__) || defined(WORDS_BIGENDIAN)
+-#   define CMS_USE_BIG_ENDIAN  1
++#include 
++#if __BYTE_ORDER == __BIG_ENDIAN
++# define CMS_USE_BIG_ENDIAN 1
+ #endif
+ 
+ 
diff -Nru lcms2-2.7/debian/patches/series lcms2-2.7/debian/patches/series
--- lcms2-2.7/debian/patches/series	2016-04-18 09:53:25.0 -0400
+++ lcms2-2.7/debian/patches/series	2016-05-11 13:59:34.0 -0400
@@ -2,3 +2,4 @@
 prepare-for-libtoolizing.patch
 fix-unaligned-access.patch
 dont-write-uninitialized-memory-for-color-strings.patch
+byte-order.patch

Bug#808776: texlive-pictures: please drop prerex from Recommends to Suggests

[Michael Terry]

Package: texlive-base
Version: 2015.20151116-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu xenial ubuntu-patch

Dear Maintainer,

Currently, texlive-pictures Recommends prerex.  Which itself Recommends
vprerex.  When Recommends are installed by default (as they are in Ubuntu),
that's a heavyweight Recommend for something that doesn't seem to fit the
definition of a Recommend ("packages that would be found together with this
one in all but unusual installations").

In Ubuntu, the attached patch to drop prerex to a Suggests is our only delta
with texlive-base.  I'd love to get back in sync.  And I think this change
makes sense for Debian too.

Thanks for considering the patch.


-- System Information:
Debian Release: stretch/sid
  APT prefers xenial-updates
  APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500, 'xenial')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.3.0-2-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages tex-common depends on:
ii  dpkg  1.18.3ubuntu1
ii  ucf   3.0031

Versions of packages tex-common suggests:
ii  debhelper  9.20151126ubuntu1

Versions of packages texlive-base is related to:
ii  tex-common6.04
ii  texlive-binaries  2015.20150524.37493-7build4
diff -Nru texlive-base-2015.20151116/debian/control texlive-base-2015.20151116/debian/control
--- texlive-base-2015.20151116/debian/control	2015-11-16 07:32:45.0 -0500
+++ texlive-base-2015.20151116/debian/control	2015-12-22 13:52:40.0 -0500
@@ -385,9 +385,9 @@
 Architecture: all
 Multi-Arch: foreign
 Depends: texlive-base (>= 2015), texlive-latex-recommended (>= 2015), texlive-base (>= 2015), ${misc:Depends}, texlive-binaries (>= 2015.20150524), python
-Recommends: texlive-pictures-doc, tk, prerex, ruby | ruby-interpreter
+Recommends: texlive-pictures-doc, tk, ruby | ruby-interpreter
 Provides: pgf
-Suggests: texlive-latex-extra, libtcltk-ruby, dot2tex
+Suggests: texlive-latex-extra, libtcltk-ruby, dot2tex, prerex
 Breaks: texlive-music (<< 2015.20150625), texlive-base (<< 2015)
 Description: TeX Live: Graphics, pictures, diagrams
  Including TikZ, pict, etc., but MetaPost and PStricks are separate.

Bug#808676: libgdiplus: Add powerpc architecture

[Michael Terry]

Package: libgdiplus
Version: 4.2-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu xenial ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to add powerpc back to the
architecture list.  It was dropped in 4.2-1.  But it compiles fine in Ubuntu.
Was there a reason for it being dropped?

Thanks for considering the patch.


-- System Information:
Debian Release: stretch/sid
  APT prefers xenial-updates
  APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500, 'xenial')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.3.0-2-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru libgdiplus-4.2/debian/control libgdiplus-4.2/debian/control
--- libgdiplus-4.2/debian/control	2015-12-20 12:36:43.0 -0500
+++ libgdiplus-4.2/debian/control	2015-12-21 13:40:36.0 -0500
@@ -25,7 +25,7 @@
 
 
 Package: libgdiplus
-Architecture: amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x arm64
+Architecture: amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 ppc64el s390x arm64
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: interface library for System.Drawing of Mono
  This package contains a GDI+ API compatible implementation needed by the

Bug#798858: Not yet fixed

[Michael Terry]

This does not appear to be fixed, even with mathgl 2.3.3+svn1216-1.

-- 
-mt

Bug#730206: libtag1c2a: SIGSEG while reading some flac tags

[Michael Terry]

Package: taglib
Version: 1.9.1-2.4
Followup-For: Bug #730206
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu wily ubuntu-patch

Dear Maintainer,

In Ubuntu, we've applied the upstream patch.  Please consider this debdiff
for Debian too.


-- System Information:
Debian Release: jessie/sid
  APT prefers wily-updates
  APT policy: (500, 'wily-updates'), (500, 'wily-security'), (500, 'wily')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.2.0-11-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru taglib-1.9.1/debian/patches/fix-memcpy.patch taglib-1.9.1/debian/patches/fix-memcpy.patch
--- taglib-1.9.1/debian/patches/fix-memcpy.patch	1969-12-31 19:00:00.0 -0500
+++ taglib-1.9.1/debian/patches/fix-memcpy.patch	2015-10-14 16:27:59.0 -0400
@@ -0,0 +1,128 @@
+From 4a7d31c87bf41c1de21cb725176d5b34c2a95720 Mon Sep 17 00:00:00 2001
+From: Tsuda Kageyu 
+Date: Thu, 14 Nov 2013 14:05:32 +0900
+Subject: [PATCH] Rewrote ByteVector::replace() simpler
+
+---
+ taglib/toolkit/tbytevector.cpp | 77 +++---
+ tests/test_bytevector.cpp  |  5 +++
+ 2 files changed, 33 insertions(+), 49 deletions(-)
+
+diff --git a/taglib/toolkit/tbytevector.cpp b/taglib/toolkit/tbytevector.cpp
+index b658246..566a20f 100644
+--- a/taglib/toolkit/tbytevector.cpp
 b/taglib/toolkit/tbytevector.cpp
+@@ -31,6 +31,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include 
+ #include 
+@@ -508,62 +509,40 @@ ByteVector ::replace(const ByteVector , const ByteVector 
+   if(pattern.size() == 0 || pattern.size() > size())
+ return *this;
+ 
+-  const uint withSize = with.size();
+-  const uint patternSize = pattern.size();
+-  int offset = 0;
++  const size_t withSize= with.size();
++  const size_t patternSize = pattern.size();
++  const ptrdiff_t diff = withSize - patternSize;
++  
++  size_t offset = 0;
++  while (true)
++  {
++offset = find(pattern, offset);
++if(offset == static_cast(-1)) // Use npos in taglib2.
++  break;
+ 
+-  if(withSize == patternSize) {
+-// I think this case might be common enough to optimize it
+ detach();
+-offset = find(pattern);
+-while(offset >= 0) {
+-  ::memcpy(data() + offset, with.data(), withSize);
+-  offset = find(pattern, offset + withSize);
+-}
+-return *this;
+-  }
+ 
+-  // calculate new size:
+-  uint newSize = 0;
+-  for(;;) {
+-int next = find(pattern, offset);
+-if(next < 0) {
+-  if(offset == 0)
+-// pattern not found, do nothing:
+-return *this;
+-  newSize += size() - offset;
+-  break;
++if(diff < 0) {
++  ::memmove(
++data() + offset + withSize, 
++data() + offset + patternSize, 
++size() - offset - patternSize);
++  resize(size() + diff);
+ }
+-newSize += (next - offset) + withSize;
+-offset = next + patternSize;
+-  }
+-
+-  // new private data of appropriate size:
+-  ByteVectorPrivate *newData = new ByteVectorPrivate(newSize, 0);
+-  char *target = DATA(newData);
+-  const char *source = data();
+-
+-  // copy modified data into new private data:
+-  offset = 0;
+-  for(;;) {
+-int next = find(pattern, offset);
+-if(next < 0) {
+-  ::memcpy(target, source + offset, size() - offset);
+-  break;
++else if(diff > 0) {
++  resize(size() + diff);
++  ::memmove(
++data() + offset + withSize, 
++data() + offset + patternSize, 
++size() - diff - offset - patternSize);
+ }
+-int chunkSize = next - offset;
+-::memcpy(target, source + offset, chunkSize);
+-target += chunkSize;
+-::memcpy(target, with.data(), withSize);
+-target += withSize;
+-offset += chunkSize + patternSize;
+-  }
+ 
+-  // replace private data:
+-  if(d->deref())
+-delete d;
++::memcpy(data() + offset, with.data(), with.size());
+ 
+-  d = newData;
++offset += withSize;
++if(offset > size() - patternSize)
++  break;
++  }
+ 
+   return *this;
+ }
+diff --git a/tests/test_bytevector.cpp b/tests/test_bytevector.cpp
+index 9efd23a..eca74f8 100644
+--- a/tests/test_bytevector.cpp
 b/tests/test_bytevector.cpp
+@@ -239,6 +239,11 @@ class TestByteVector : public CppUnit::TestFixture
+   a.replace(ByteVector("ab"), ByteVector());
+   CPPUNIT_ASSERT_EQUAL(ByteVector("cdf"), a);
+ }
++{
++  ByteVector a("abcdabf");
++  a.replace(ByteVector("bf"), ByteVector("x"));
++  CPPUNIT_ASSERT_EQUAL(ByteVector("abcdax"), a);
++}
+   }
+ 
+ };
diff -Nru taglib-1.9.1/debian/patches/series taglib-1.9.1/debian/patches/series
--- taglib-1.9.1/debian/patches/series	2013-11-04 05:33:31.0 -0500
+++ taglib-1.9.1/debian/patches/series	2015-10-14 16:27:59.0 -0400
@@ -1 +1,2 @@
 multiarch.diff
+fix-memcpy.patch

Bug#799198: etherape: typo in protocol TCP-UNKNOwN

[Michael Terry]

Package: etherape
Version: 0.9.13-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu wily ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch (by Yerenkov Scott) was applied to fix a typo
that prevents setting color codes for the TCP-UNKNOWN protocol.

Thanks for considering the patch.


-- System Information:
Debian Release: jessie/sid
  APT prefers wily-updates
  APT policy: (500, 'wily-updates'), (500, 'wily-security'), (500, 'wily')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.2.0-7-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru etherape-0.9.13/debian/patches/fix-typo.patch etherape-0.9.13/debian/patches/fix-typo.patch
--- etherape-0.9.13/debian/patches/fix-typo.patch	1969-12-31 19:00:00.0 -0500
+++ etherape-0.9.13/debian/patches/fix-typo.patch	2015-09-16 13:24:02.0 -0400
@@ -0,0 +1,13 @@
+Index: etherape-0.9.13/src/decode_proto.c
+===
+--- etherape-0.9.13.orig/src/decode_proto.c
 etherape-0.9.13/src/decode_proto.c
+@@ -1293,7 +1293,7 @@ get_tcp (decode_proto_t *dp)
+   if (!src_service && !dst_service)
+ {
+   if (pref.group_unk)
+-decode_proto_add(dp, "TCP-UNKNOwN");
++decode_proto_add(dp, "TCP-UNKNOWN");
+   else
+ {
+   if (chosen_port == src_port)
diff -Nru etherape-0.9.13/debian/patches/series etherape-0.9.13/debian/patches/series
--- etherape-0.9.13/debian/patches/series	1969-12-31 19:00:00.0 -0500
+++ etherape-0.9.13/debian/patches/series	2015-09-16 13:23:48.0 -0400
@@ -0,0 +1 @@
+fix-typo.patch

Bug#799200: network-manager-strongswan: configuration GUI broken

[Michael Terry]

Package: network-manager-strongswan
Version: 1.3.0-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu wily ubuntu-patch

Steps to reproduce:
1) Run gnome-control-center and click Network.
2) Click the + icon to add a connection
3) Click VPN
4) Click IPsec/IKEv2 (strongswan)

Expected results:
A configuration window opens with settings for an IKEv2 VPN.

Actual results:
A configuration window opens, but all of the strongswan-specific settings are 
missing. If gnome-control-center is started from the console, this error is 
printed:
(gnome-control-center.real:24177): Gtk-CRITICAL **: gtk_box_pack: assertion 
'gtk_widget_get_parent (child) == NULL' failed

In Ubuntu, the attached patch by Michal Bruncko was applied to fix it.  Thanks
for considering the patch.

-- System Information:
Debian Release: jessie/sid
  APT prefers wily-updates
  APT policy: (500, 'wily-updates'), (500, 'wily-security'), (500, 'wily')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.2.0-7-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru network-manager-strongswan-1.3.0/debian/patches/fix-vbox-parent.patch network-manager-strongswan-1.3.0/debian/patches/fix-vbox-parent.patch
--- network-manager-strongswan-1.3.0/debian/patches/fix-vbox-parent.patch	1969-12-31 19:00:00.0 -0500
+++ network-manager-strongswan-1.3.0/debian/patches/fix-vbox-parent.patch	2015-09-16 14:21:28.0 -0400
@@ -0,0 +1,22 @@
+Index: network-manager-strongswan-1.3.0/properties/nm-strongswan-dialog.ui
+===
+--- network-manager-strongswan-1.3.0.orig/properties/nm-strongswan-dialog.ui
 network-manager-strongswan-1.3.0/properties/nm-strongswan-dialog.ui
+@@ -1,10 +1,6 @@
+ 
+ 
+   
+-  
+-False
+-window1
+-
+   
+ True
+ False
+@@ -374,6 +370,4 @@
+   
+ 
+   
+-
+-  
+ 
diff -Nru network-manager-strongswan-1.3.0/debian/patches/series network-manager-strongswan-1.3.0/debian/patches/series
--- network-manager-strongswan-1.3.0/debian/patches/series	2015-02-04 13:21:59.0 -0500
+++ network-manager-strongswan-1.3.0/debian/patches/series	2015-09-16 14:20:51.0 -0400
@@ -1,2 +1,3 @@
 nm-strongswan-service.name.diff
 allow_deprecated_keyring_functions.diff
+fix-vbox-parent.patch

Bug#797586: ninja-build: Run tests during build

[Michael Terry]

Package: ninja-build
Version: 1.3.4-1.1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu wily ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to run ninja's test suite during
build.  Thanks for considering it.


-- System Information:
Debian Release: jessie/sid
  APT prefers wily-updates
  APT policy: (500, 'wily-updates'), (500, 'wily-security'), (500, 'wily')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.1.0-3-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru ninja-build-1.3.4/debian/rules ninja-build-1.3.4/debian/rules
--- ninja-build-1.3.4/debian/rules	2013-07-18 04:06:47.0 -0400
+++ ninja-build-1.3.4/debian/rules	2014-05-27 11:22:32.0 -0400
@@ -26,6 +26,9 @@
 	rm -f build.ninja
 	rm -rf build
 
+override_dh_auto_test:
+	sh -c "ulimit -n 2000 && ./ninja_test"
+
 override_dh_install-arch:
 	dh_install
 	mv debian/ninja-build/etc/bash_completion.d/bash-completion \

Bug#795889: python-linecache2: Run unit tests during build

[Michael Terry]

Package: python-linecache2
Version: 1.0.0-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu wily ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied by James Hunt to run the unit
tests during build.  It seems like a good idea, so I'm passing the patch
on to you.  Thanks for your consideration!

-- System Information:
Debian Release: jessie/sid
  APT prefers wily-updates
  APT policy: (500, 'wily-updates'), (500, 'wily-security'), (500, 'wily')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.1.0-2-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru python-linecache2-1.0.0/debian/control python-linecache2-1.0.0/debian/control
--- python-linecache2-1.0.0/debian/control	2015-07-08 09:25:25.0 -0400
+++ python-linecache2-1.0.0/debian/control	2015-08-17 13:49:57.0 -0400
@@ -15,6 +15,7 @@
 Build-Depends-Indep: python-fixtures,
  python-unittest2,
  python3-fixtures,
+ python3-unittest2,
 Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-linecache2.git
 Vcs-Git: git://anonscm.debian.org/openstack/python-linecache2.git
diff -Nru python-linecache2-1.0.0/debian/rules python-linecache2-1.0.0/debian/rules
--- python-linecache2-1.0.0/debian/rules	2015-07-08 09:25:25.0 -0400
+++ python-linecache2-1.0.0/debian/rules	2015-08-04 06:30:22.0 -0400
@@ -32,6 +32,16 @@
 	dh_clean -O--buildsystem=python_distutils
 	rm -rf build
 
+override_dh_auto_test:
+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+	@echo === Running tests
+	set -ex  for i in $(PYTHONS) $(PYTHON3S) ; do \
+		PYMAJOR=`echo $$i | cut -d'.' -f1` ; \
+		echo === Testing with python$$i (python$$PYMAJOR) ; \
+		PYTHON=python$$i python$$PYMAJOR-unit2; \
+	done
+endif
+
 # Commands not to run
 override_dh_installcatalogs:
 override_dh_installemacsen override_dh_installifupdown:

Bug#795891: python-traceback2: Run unit tests during build

[Michael Terry]

Package: python-traceback2
Version: 1.4.0-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu wily ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied by James Page to run the unit
tests during build.  It seemed like a good idea, so I'm passing it on to
you.  Thanks for your consideration.

-- System Information:
Debian Release: jessie/sid
  APT prefers wily-updates
  APT policy: (500, 'wily-updates'), (500, 'wily-security'), (500, 'wily')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.1.0-2-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru python-traceback2-1.4.0/debian/control python-traceback2-1.4.0/debian/control
--- python-traceback2-1.4.0/debian/control	2015-07-08 09:29:18.0 -0400
+++ python-traceback2-1.4.0/debian/control	2015-08-17 14:00:47.0 -0400
@@ -14,8 +14,16 @@
python3-setuptools,
 Build-Depends-Indep: python-contextlib2,
  python-fixtures,
+ python-linecache2,
+ python-six,
  python-testtools,
  python-unittest2,
+ python3-contextlib2,
+ python3-fixtures,
+ python3-linecache2,
+ python3-six,
+ python3-testtools,
+ python3-unittest2,
 Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-traceback2.git
 Vcs-Git: git://anonscm.debian.org/openstack/python-traceback2.git
diff -Nru python-traceback2-1.4.0/debian/patches/fix-encoding.patch python-traceback2-1.4.0/debian/patches/fix-encoding.patch
--- python-traceback2-1.4.0/debian/patches/fix-encoding.patch	1969-12-31 19:00:00.0 -0500
+++ python-traceback2-1.4.0/debian/patches/fix-encoding.patch	2015-08-04 06:28:52.0 -0400
@@ -0,0 +1,23 @@
+Description: Skip test_format_unicode_filename under py3
+Author: James Page james.p...@ubuntu.com
+Forwarded: https://github.com/testing-cabal/traceback2/pull/6
+
+--- a/traceback2/tests/test_traceback.py
 b/traceback2/tests/test_traceback.py
+@@ -607,6 +607,7 @@ class TestStack(unittest.TestCase):
+ ['  File foo.py, line 1, in fred\nline\n'],
+ s.format())
+ 
++@unittest.skipUnless(sys.version_info[0]  3, Applies to 2.x only.)
+ @unittest.skipIf(sys.getfilesystemencoding()=='ANSI_X3.4-1968',
+  'Requires non-ascii fs encoding')
+ def test_format_unicode_filename(self):
+@@ -651,7 +652,7 @@ class TestStack(unittest.TestCase):
+ traceback.walk_stack(None), capture_locals=True, limit=1)
+ s = some_inner(3, 4)
+ self.assertEqual(
+-['  File ' + FNAME + ', line 651, '
++['  File ' + FNAME + ', line 652, '
+  'in some_inner\n'
+  'traceback.walk_stack(None), capture_locals=True, limit=1)\n'
+  'a = 1\n'
diff -Nru python-traceback2-1.4.0/debian/patches/series python-traceback2-1.4.0/debian/patches/series
--- python-traceback2-1.4.0/debian/patches/series	1969-12-31 19:00:00.0 -0500
+++ python-traceback2-1.4.0/debian/patches/series	2015-08-04 06:13:54.0 -0400
@@ -0,0 +1 @@
+fix-encoding.patch
diff -Nru python-traceback2-1.4.0/debian/rules python-traceback2-1.4.0/debian/rules
--- python-traceback2-1.4.0/debian/rules	2015-07-08 09:29:18.0 -0400
+++ python-traceback2-1.4.0/debian/rules	2015-08-04 06:17:08.0 -0400
@@ -28,7 +28,18 @@
 
 override_dh_clean:
 	dh_clean -O--buildsystem=python_distutils
-	rm -rf build
+	rm -rf build .testrepository
+
+override_dh_auto_test:
+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+	@echo === Running tests
+	set -ex  for i in $(PYTHONS) $(PYTHON3S) ; do \
+		PYMAJOR=`echo $$i | cut -d'.' -f1` ; \
+		echo === Testing with python$$i (python$$PYMAJOR) ; \
+		PYTHON=python$$i python$$PYMAJOR-unit2; \
+	done
+endif
+
 
 # Commands not to run
 override_dh_installcatalogs:

Bug#795488: kadu: FTBFS with gcc5

[Michael Terry]

Package: kadu
Version: 1.3-2
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu wily ubuntu-patch

Dear Maintainer,

Currently, kadu FTBFS with gcc5 with an error like:

plugins/jabber_protocol/3rdparty/libiris/src/xmpp/base64/base64.cpp:65:2: 
error: narrowing conversion of '-1' from 'int' to 'char' inside { } 
[-Wnarrowing]

I've applied the attached patch in Ubuntu to fix this error.  Thanks for 
considering it for Debian.

-- System Information:
Debian Release: jessie/sid
  APT prefers wily-updates
  APT policy: (500, 'wily-updates'), (500, 'wily-security'), (500, 'wily')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.1.0-2-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru kadu-1.3/debian/patches/gcc5.patch kadu-1.3/debian/patches/gcc5.patch
--- kadu-1.3/debian/patches/gcc5.patch	1969-12-31 19:00:00.0 -0500
+++ kadu-1.3/debian/patches/gcc5.patch	2015-08-14 10:29:54.0 -0400
@@ -0,0 +1,13 @@
+Index: kadu-1.3/plugins/jabber_protocol/3rdparty/libiris/src/xmpp/base64/base64.cpp
+===
+--- kadu-1.3.orig/plugins/jabber_protocol/3rdparty/libiris/src/xmpp/base64/base64.cpp
 kadu-1.3/plugins/jabber_protocol/3rdparty/libiris/src/xmpp/base64/base64.cpp
+@@ -45,7 +45,7 @@ QByteArray Base64::decode(const QString
+ 	// 64 specifies eof
+ 	// everything else specifies data
+ 
+-	char tbl[] = {
++	signed char tbl[] = {
+ 		-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
+ 		-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
+ 		-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-1,-1,-1,63,
diff -Nru kadu-1.3/debian/patches/series kadu-1.3/debian/patches/series
--- kadu-1.3/debian/patches/series	2015-07-08 14:32:40.0 -0400
+++ kadu-1.3/debian/patches/series	2015-08-14 10:59:46.0 -0400
@@ -1,3 +1,4 @@
 01-external-themes.patch
 02-about-dialog.patch
 03-cmake-fix.patch
+gcc5.patch

Bug#795525: pcl: FTBFS with gcc5

[Michael Terry]

Package: pcl
Version: 1.7.2-8
Severity: important
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu wily ubuntu-patch

Due to an incompatibility between Qt4 and boost+gcc5 [1], pcl fails to
build from source.  Attached is a patch I've applied in Ubuntu to fix this
(it's not the prettiest patch, I generated parts of it by script).  Thanks
for your consideration!

[1] https://bugreports.qt.io/browse/QTBUG-22829

-- 
-mt
Index: pcl-1.7.2/tools/boost.h
===
--- pcl-1.7.2.orig/tools/boost.h
+++ pcl-1.7.2/tools/boost.h
@@ -46,16 +46,38 @@
 #endif
 
 // Marking all Boost headers as system headers to remove warnings
+#ifndef Q_MOC_RUN
 #include boost/random.hpp
+#endif
+#ifndef Q_MOC_RUN
 #include boost/random/normal_distribution.hpp
+#endif
+#ifndef Q_MOC_RUN
 #include boost/thread/thread.hpp
+#endif
+#ifndef Q_MOC_RUN
 #include boost/lexical_cast.hpp
+#endif
+#ifndef Q_MOC_RUN
 #include boost/make_shared.hpp
+#endif
+#ifndef Q_MOC_RUN
 #include boost/date_time/gregorian/gregorian_types.hpp
+#endif
+#ifndef Q_MOC_RUN
 #include boost/date_time/posix_time/posix_time.hpp
+#endif
+#ifndef Q_MOC_RUN
 #include boost/date_time/posix_time/posix_time_types.hpp
+#endif
+#ifndef Q_MOC_RUN
 #include boost/thread/thread.hpp
+#endif
+#ifndef Q_MOC_RUN
 //#include boost/uuid/uuid.hpp
+#endif
+#ifndef Q_MOC_RUN
 //#include boost/uuid/uuid_generators.hpp
+#endif
 
 #endif// PCL_TOOLS_BOOST_H_
Index: pcl-1.7.2/common/include/pcl/PCLHeader.h
===
--- pcl-1.7.2.orig/common/include/pcl/PCLHeader.h
+++ pcl-1.7.2/common/include/pcl/PCLHeader.h
@@ -7,7 +7,9 @@
 
 #include string
 #include vector
+#ifndef Q_MOC_RUN
 #include boost/shared_ptr.hpp
+#endif
 #include pcl/pcl_macros.h
 #include ostream
 
Index: pcl-1.7.2/common/include/pcl/PCLPointCloud2.h
===
--- pcl-1.7.2.orig/common/include/pcl/PCLPointCloud2.h
+++ pcl-1.7.2/common/include/pcl/PCLPointCloud2.h
@@ -8,7 +8,9 @@
 #include string
 #include vector
 #include ostream
+#ifndef Q_MOC_RUN
 #include boost/detail/endian.hpp
+#endif
 
 // Include the correct Header path here
 #include pcl/PCLHeader.h
Index: pcl-1.7.2/common/include/pcl/PCLPointField.h
===
--- pcl-1.7.2.orig/common/include/pcl/PCLPointField.h
+++ pcl-1.7.2/common/include/pcl/PCLPointField.h
@@ -8,7 +8,9 @@
 #include string
 #include vector
 #include ostream
+#ifndef Q_MOC_RUN
 #include boost/shared_ptr.hpp
+#endif
 #include pcl/pcl_macros.h
 
 namespace pcl
Index: pcl-1.7.2/common/include/pcl/common/boost.h
===
--- pcl-1.7.2.orig/common/include/pcl/common/boost.h
+++ pcl-1.7.2/common/include/pcl/common/boost.h
@@ -44,17 +44,41 @@
 #endif
 
 // Marking all Boost headers as system headers to remove warnings
+#ifndef Q_MOC_RUN
 #include boost/fusion/sequence/intrinsic/at_key.hpp
+#endif
+#ifndef Q_MOC_RUN
 #include boost/shared_ptr.hpp
+#endif
+#ifndef Q_MOC_RUN
 #include boost/make_shared.hpp
+#endif
+#ifndef Q_MOC_RUN
 #include boost/mpl/size.hpp
+#endif
+#ifndef Q_MOC_RUN
 #include boost/date_time/posix_time/posix_time.hpp
+#endif
+#ifndef Q_MOC_RUN
 #include boost/function.hpp
+#endif
+#ifndef Q_MOC_RUN
 //#include boost/timer.hpp
+#endif
+#ifndef Q_MOC_RUN
 #include boost/thread.hpp
+#endif
+#ifndef Q_MOC_RUN
 #include boost/thread/condition.hpp
+#endif
+#ifndef Q_MOC_RUN
 #include boost/signals2.hpp
+#endif
+#ifndef Q_MOC_RUN
 #include boost/signals2/slot.hpp
+#endif
+#ifndef Q_MOC_RUN
 #include boost/algorithm/string.hpp
+#endif
 
 #endif// PCL_COMMON_BOOST_H_
Index: pcl-1.7.2/common/include/pcl/common/gaussian.h
===
--- pcl-1.7.2.orig/common/include/pcl/common/gaussian.h
+++ pcl-1.7.2/common/include/pcl/common/gaussian.h
@@ -43,7 +43,9 @@
 #include sstream
 #include pcl/common/eigen.h
 #include pcl/point_cloud.h
+#ifndef Q_MOC_RUN
 #include boost/function.hpp
+#endif
 
 namespace pcl
 {
Index: pcl-1.7.2/common/include/pcl/common/random.h
===
--- pcl-1.7.2.orig/common/include/pcl/common/random.h
+++ pcl-1.7.2/common/include/pcl/common/random.h
@@ -44,11 +44,21 @@
 #pragma GCC system_header 
 #endif
 
+#ifndef Q_MOC_RUN
 #include boost/random/uniform_real.hpp
+#endif
+#ifndef Q_MOC_RUN
 #include boost/random/uniform_int.hpp
+#endif
+#ifndef Q_MOC_RUN
 #include boost/random/variate_generator.hpp
+#endif
+#ifndef Q_MOC_RUN
 #include boost/random/normal_distribution.hpp
+#endif
+#ifndef Q_MOC_RUN
 #include boost/random/mersenne_twister.hpp
+#endif
 #include pcl/pcl_macros.h
 
 namespace pcl 
Index: pcl-1.7.2/common/include/pcl/common/time.h
===
--- pcl-1.7.2.orig/common/include/pcl/common/time.h
+++ 

Bug#785485: Proposed patch

[Michael Terry]

This is because gtkmathview is including C++ files inside an extern C
block.  I've applied the attached patch in Ubuntu, which fixes this.
Thanks for considering it for Debian!

-- 
-mt
Index: gtkmathview-0.8.0/src/widget/gtkmathview_common.h
===
--- gtkmathview-0.8.0.orig/src/widget/gtkmathview_common.h
+++ gtkmathview-0.8.0/src/widget/gtkmathview_common.h
@@ -22,6 +22,17 @@
 
 #include gtk/gtkwidget.h
 
+/* Include these outside the extern c bit */
+#if GTKMATHVIEW_USES_CUSTOM_READER
+#include c_customXmlReader.h
+#elif GTKMATHVIEW_USES_LIBXML2_READER
+#include libxml/xmlreader.h
+#elif GTKMATHVIEW_USES_LIBXML2
+#include libxml/tree.h
+#elif GTKMATHVIEW_USES_GMETADOM
+#include gdome.h
+#endif
+
 #ifdef __cplusplus
 extern C {
 #endif /* __cplusplus */
@@ -45,23 +56,19 @@ extern C {
   typedef void* GtkMathViewReaderData;
 
 #if GTKMATHVIEW_USES_CUSTOM_READER
-#include c_customXmlReader.h
 #define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##custom_reader
   typedef void* GtkMathViewModelId;
   typedef const char*   GtkMathViewModelString;
 #elif GTKMATHVIEW_USES_LIBXML2_READER
-#include libxml/xmlreader.h
 #define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##libxml2_reader
   typedef void* GtkMathViewModelId;
   typedef const xmlChar*GtkMathViewModelString;
 #elif GTKMATHVIEW_USES_LIBXML2
-#include libxml/tree.h
 #define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##libxml2
   typedef xmlElement*   GtkMathViewModelId;
   typedef xmlDoc*   GtkMathViewModelDocument;
   typedef const xmlChar*GtkMathViewModelString;
 #elif GTKMATHVIEW_USES_GMETADOM
-#include gdome.h
 #define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##gmetadom
   typedef GdomeElement* GtkMathViewModelId;
   typedef GdomeDocument*GtkMathViewModelDocument;

Bug#791778: Proposed Patch

[Michael Terry]

The attached patch updates the code to work with ruby2.2.  I've applied it
in Ubuntu.  Thanks for considering it for Debian!

-- 
-mt
Index: ruby-kyotocabinet-1.32/extconf.rb
===
--- ruby-kyotocabinet-1.32.orig/extconf.rb
+++ ruby-kyotocabinet-1.32/extconf.rb
@@ -1,4 +1,5 @@
 require mkmf
+require rbconfig
 
 File::unlink(Makefile) if (File::exist?(Makefile))
 dir_config('kyotocabinet')
@@ -7,7 +8,7 @@ kclibs = `pkg-config --libs-only-l kyoto
 kccflags = `pkg-config --cflags kyotocabinet`.chomp
 kcldflags = `pkg-config --libs-only-L kyotocabinet`.chomp
 
-Config::CONFIG[CPP] = g++ -E
+RbConfig::CONFIG[CPP] = g++ -E
 $CFLAGS = -I. #{kccflags} -Wall #{$CFLAGS} -O2
 $LDFLAGS = #{$LDFLAGS} -L. #{kcldflags}
 $libs = #{$libs} #{kclibs}
Index: ruby-kyotocabinet-1.32/test.rb
===
--- ruby-kyotocabinet-1.32.orig/test.rb
+++ ruby-kyotocabinet-1.32/test.rb
@@ -40,7 +40,7 @@ if (ruby + /libruby-?(\d+.\d+(.\d+)?)\
 end if File.exists? kyotocabinet.so
 
 system(rm -rf casket*)
-rubycmd = Config::CONFIG[bindir] + / + RbConfig::CONFIG['ruby_install_name']
+rubycmd = RbConfig::CONFIG[bindir] + / + RbConfig::CONFIG['ruby_install_name']
 all = confs.size * formats.size
 cnt = 0
 oknum = 0
Index: ruby-kyotocabinet-1.32/kyotocabinet.cc
===
--- ruby-kyotocabinet-1.32.orig/kyotocabinet.cc
+++ ruby-kyotocabinet-1.32/kyotocabinet.cc
@@ -20,6 +20,7 @@ namespace kc = kyotocabinet;
 extern C {
 
 #include ruby.h
+#include ruby/thread.h
 
 #if RUBY_VM = 1
 #define _KC_YARV_
@@ -599,16 +600,16 @@ class NativeFunction {
   virtual void operate() = 0;
   static void execute(NativeFunction* func) {
 #if defined(_KC_YARV_)
-rb_thread_blocking_region(execute_impl, func, RUBY_UBF_IO, NULL);
+rb_thread_call_without_gvl(execute_impl, func, RUBY_UBF_IO, NULL);
 #else
 func-operate();
 #endif
   }
  private:
-  static VALUE execute_impl(void* ptr) {
+  static void *execute_impl(void* ptr) {
 NativeFunction* func = (NativeFunction*)ptr;
 func-operate();
-return Qnil;
+return NULL;
   }
 };
 

Bug#795239: Proposed patch

[Michael Terry]

Here's a debdiff that transitions to a v5 library and also fixes the ftbfs
due to a boost check (credit for that fix from doko).

-- 
-mt


libmems.gcc5.debdiff
Description: Binary data

Bug#795320: qbittorrent: ftbfs with gcc5+boost

[Michael Terry]

Package: qbittorrent
Version: 3.1.11-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu wily ubuntu-patch

Dear Maintainer,

Due to an incompatibility between Qt4 and boost (with gcc5), qbittorrent
fails to build from source with gcc5.

https://bugreports.qt.io/browse/QTBUG-22829

I've applied the attached patch in Ubuntu to work around this.
Thanks for considering it!

-- System Information:
Debian Release: jessie/sid
  APT prefers wily-updates
  APT policy: (500, 'wily-updates'), (500, 'wily-security'), (500, 'wily')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.1.0-2-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru qbittorrent-3.1.11/debian/patches/gcc5.patch qbittorrent-3.1.11/debian/patches/gcc5.patch
--- qbittorrent-3.1.11/debian/patches/gcc5.patch	1969-12-31 19:00:00.0 -0500
+++ qbittorrent-3.1.11/debian/patches/gcc5.patch	2015-08-12 17:57:52.0 -0400
@@ -0,0 +1,196 @@
+Index: qbittorrent-3.1.11/src/about_imp.h
+===
+--- qbittorrent-3.1.11.orig/src/about_imp.h
 qbittorrent-3.1.11/src/about_imp.h
+@@ -35,7 +35,9 @@
+ #include QFile
+ #include QtGlobal
+ #include libtorrent/version.hpp
++#ifndef Q_MOC_RUN
+ #include boost/version.hpp
++#endif
+ 
+ class about : public QDialog, private Ui::AboutDlg{
+   Q_OBJECT
+Index: qbittorrent-3.1.11/src/properties/peeraddition.h
+===
+--- qbittorrent-3.1.11.orig/src/properties/peeraddition.h
 qbittorrent-3.1.11/src/properties/peeraddition.h
+@@ -35,15 +35,21 @@
+ #include QRegExp
+ #include QMessageBox
+ #include QHostAddress
++#ifndef Q_MOC_RUN
+ #include ui_peer.h
+ #include libtorrent/session.hpp
++#endif
+ 
++#ifndef Q_MOC_RUN
+ #include boost/version.hpp
++#endif
+ #if BOOST_VERSION  103500
+ #include libtorrent/asio/ip/tcp.hpp
+ #else
++#ifndef Q_MOC_RUN
+ #include boost/asio/ip/tcp.hpp
+ #endif
++#endif
+ 
+ class PeerAdditionDlg: public QDialog, private Ui::addPeerDialog {
+   Q_OBJECT
+Index: qbittorrent-3.1.11/src/properties/peerlistwidget.h
+===
+--- qbittorrent-3.1.11.orig/src/properties/peerlistwidget.h
 qbittorrent-3.1.11/src/properties/peerlistwidget.h
+@@ -50,12 +50,16 @@ class QStandardItem;
+ class QStandardItemModel;
+ QT_END_NAMESPACE
+ 
++#ifndef Q_MOC_RUN
+ #include boost/version.hpp
++#endif
+ #if BOOST_VERSION  103500
+ #include libtorrent/asio/ip/tcp.hpp
+ #else
++#ifndef Q_MOC_RUN
+ #include boost/asio/ip/tcp.hpp
+ #endif
++#endif
+ 
+ class PeerListWidget : public QTreeView {
+   Q_OBJECT
+Index: qbittorrent-3.1.11/src/reverseresolution.h
+===
+--- qbittorrent-3.1.11.orig/src/reverseresolution.h
 qbittorrent-3.1.11/src/reverseresolution.h
+@@ -37,12 +37,16 @@
+ #include QHostInfo
+ #include misc.h
+ 
++#ifndef Q_MOC_RUN
+ #include boost/version.hpp
++#endif
+ #if BOOST_VERSION  103500
+ #include libtorrent/asio/ip/tcp.hpp
+ #else
++#ifndef Q_MOC_RUN
+ #include boost/asio/ip/tcp.hpp
+ #endif
++#endif
+ 
+ const int CACHE_SIZE = 500;
+ 
+Index: qbittorrent-3.1.11/src/stacktrace_win_dlg.h
+===
+--- qbittorrent-3.1.11.orig/src/stacktrace_win_dlg.h
 qbittorrent-3.1.11/src/stacktrace_win_dlg.h
+@@ -3,7 +3,9 @@
+ 
+ #include QTextStream
+ #include QClipboard
++#ifndef Q_MOC_RUN
+ #include boost/version.hpp
++#endif
+ #include libtorrent/version.hpp
+ #include ui_stacktrace_win_dlg.h
+ 
+Index: qbittorrent-3.1.11/src/main.cpp
+===
+--- qbittorrent-3.1.11.orig/src/main.cpp
 qbittorrent-3.1.11/src/main.cpp
+@@ -33,6 +33,8 @@
+ #include QFile
+ #include QLibraryInfo
+ 
++#ifndef Q_MOC_RUN
++
+ #ifndef DISABLE_GUI
+ #if defined(QBT_STATIC_QT)
+ #include QtPlugin
+@@ -75,6 +77,8 @@ Q_IMPORT_PLUGIN(qico)
+ #include misc.h
+ #include preferences.h
+ 
++#endif // Q_MOC_RUN
++
+ #if defined(Q_OS_WIN)  !defined(QBT_HAS_GETCURRENTPID)
+ #error You seem to have updated QtSingleApplication without porting our custom QtSingleApplication::getRunningPid() function. Please see previous version to understate how it works.
+ #endif
+Index: qbittorrent-3.1.11/src/qtlibtorrent/qbtsession.h
+===
+--- qbittorrent-3.1.11.orig/src/qtlibtorrent/qbtsession.h
 qbittorrent-3.1.11/src/qtlibtorrent/qbtsession.h
+@@ -43,6 +43,7 @@
+ #include QTimer
+ #include QNetworkCookie
+ 
++#ifndef Q_MOC_RUN
+ #include libtorrent/version.hpp
+ #include libtorrent/session.hpp
+ #include libtorrent/ip_filter.hpp
+@@ -51,6 +52,7 @@
+ #include qtorrenthandle.h
+ #include trackerinfos.h
+ #include misc.h
++#endif
+ 
+ 

Bug#795299: gccxml: Error in new GCC 5 wrapper program

[Michael Terry]

Package: gccxml
Version: 0.9.0+git20140716-5
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu wily ubuntu-patch

Dear Maintainer,

The new debian/castxml-wrapper.py file has an error in its use of os.execv.

The 'args' argument's first element should be the program name.  It will be
ignored and castxml will not see the first argument with the way it's
written now.

I've applied the attached patch in Ubuntu.  Thanks for considering it.


-- System Information:
Debian Release: jessie/sid
  APT prefers wily-updates
  APT policy: (500, 'wily-updates'), (500, 'wily-security'), (500, 'wily')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.1.0-2-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru gccxml-0.9.0+git20140716/debian/castxml-wrapper.py gccxml-0.9.0+git20140716/debian/castxml-wrapper.py
--- gccxml-0.9.0+git20140716/debian/castxml-wrapper.py	2015-08-07 00:34:53.0 -0400
+++ gccxml-0.9.0+git20140716/debian/castxml-wrapper.py	2015-08-12 14:21:15.0 -0400
@@ -108,4 +108,4 @@
 
 print(castxml_cmd)
 sys.stdout.flush()
-os.execv(castxml_cmd[0], castxml_cmd[1:])
+os.execv(castxml_cmd[0], castxml_cmd)

Bug#795212: zipios++: Handle gcc5 transition by renaming library package to libzipios++0v5

[Michael Terry]

Package: zipios++
Version: 0.1.5.9+cvs.2007.04.28-5.1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu wily ubuntu-patch

Dear Maintainer,

Per the gcc5 transition (https://wiki.debian.org/GCC5), zipios++'s ABI has
changed when built with gcc5.  This requires a rename, and Debian is using
v5 instead of the old c2a suffix.  The attached patch was applied in Ubuntu
to do this.

Thanks for considering the patch.


-- System Information:
Debian Release: jessie/sid
  APT prefers wily-updates
  APT policy: (500, 'wily-updates'), (500, 'wily-security'), (500, 'wily')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.1.0-2-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -u zipios++-0.1.5.9+cvs.2007.04.28/debian/control zipios++-0.1.5.9+cvs.2007.04.28/debian/control
--- zipios++-0.1.5.9+cvs.2007.04.28/debian/control
+++ zipios++-0.1.5.9+cvs.2007.04.28/debian/control
@@ -8,7 +8,7 @@
 Package: libzipios++-dev
 Section: libdevel
 Architecture: any
-Depends: libzipios++0c2a (= ${binary:Version}), libz-dev
+Depends: libzipios++0v5 (= ${binary:Version}), libz-dev
 Description: a small C++ library for reading zip files (development)
  Zipios++ is a java.util.zip-like C++ library for reading and writing Zip
  files. Access to individual entries is provided through standard C++
@@ -17,12 +17,12 @@
  .
  This package contains files needed for development with zipios++.
 
-Package: libzipios++0c2a
+Package: libzipios++0v5
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: libzipios++0c102, libzipios++0
-Replaces: libzipios++0c102, libzipios++0
+Conflicts: libzipios++0c2a, libzipios++0c102, libzipios++0
+Replaces: libzipios++0c2a, libzipios++0c102, libzipios++0
 Description: a small C++ library for reading zip files (library)
  Zipios++ is a java.util.zip-like C++ library for reading and writing Zip
  files. Access to individual entries is provided through standard C++
reverted:
--- zipios++-0.1.5.9+cvs.2007.04.28/debian/libzipios++0c2a.dirs
+++ zipios++-0.1.5.9+cvs.2007.04.28.orig/debian/libzipios++0c2a.dirs
@@ -1 +0,0 @@
-usr/lib
reverted:
--- zipios++-0.1.5.9+cvs.2007.04.28/debian/libzipios++0c2a.files
+++ zipios++-0.1.5.9+cvs.2007.04.28.orig/debian/libzipios++0c2a.files
@@ -1 +0,0 @@
-usr/lib/lib*.so.*
only in patch2:
unchanged:
--- zipios++-0.1.5.9+cvs.2007.04.28.orig/debian/libzipios++0v5.dirs
+++ zipios++-0.1.5.9+cvs.2007.04.28/debian/libzipios++0v5.dirs
@@ -0,0 +1 @@
+usr/lib
only in patch2:
unchanged:
--- zipios++-0.1.5.9+cvs.2007.04.28.orig/debian/libzipios++0v5.files
+++ zipios++-0.1.5.9+cvs.2007.04.28/debian/libzipios++0v5.files
@@ -0,0 +1 @@
+usr/lib/lib*.so.*

Bug#795069: Proposed Patch

[Michael Terry]

This is due to an incompatibility between Qt4 and boost+gcc5 [1].  I've
applied the attached patch in Ubuntu, which works around this.  Thanks for
considering it for Debian!

[1] https://bugreports.qt.io/browse/QTBUG-22829

-- 
-mt


gcc5.debdiff
Description: Binary data

Bug#787881: Try again

[Michael Terry]

I believe this was due to a temporary mismatch in Debian, between valac and
gtk3.

Valac 0.28 generates some code that requires gtk 3.16, which only went into
unstable on 6/14.  (that build log shows undefined symbols that were only
introduced in gtk 3.16, not a valac error)

I (the maintainer of deja-dup) can compile just fine with both valac 0.28
and gtk 3.16.  Try to build deja-dup again?

-mt

Bug#788858: libjsoncpp: Parse doubles more correctly

[Michael Terry]

Package: libjsoncpp
Version: 0.10.2-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu wily ubuntu-patch

Dear Maintainer,

In a unity scope used in Ubuntu, we noticed a locale oddity where a price
of 2.99 was shown as 2,00 in a Spanish locale.

It got traced to libjsoncpp and the attached patch to use stringstream for
doubles.

Thanks for considering the patch.  (Which is the only remaining delta for
Ubuntu)


-- System Information:
Debian Release: jessie/sid
  APT prefers wily-updates
  APT policy: (500, 'wily-updates'), (500, 'wily-security'), (500, 'wily'), 
(500, 'vivid')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.19.0-20-generic (SMP w/4 CPU cores)
Locale: LANG=en_US, LC_CTYPE=en_US (charmap=UTF-8) (ignored: LC_ALL set to 
en_US.UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru libjsoncpp-0.10.2/debian/patches/fix-double-parsing.patch libjsoncpp-0.10.2/debian/patches/fix-double-parsing.patch
--- libjsoncpp-0.10.2/debian/patches/fix-double-parsing.patch	1969-12-31 19:00:00.0 -0500
+++ libjsoncpp-0.10.2/debian/patches/fix-double-parsing.patch	2015-06-15 12:27:51.0 -0400
@@ -0,0 +1,46 @@
+Description: Use stringstream to convert real numbers from strings.
+Author: Rodney Dawes rodney.da...@canonical.com
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1368420
+
+=== modified file 'src/lib_json/json_reader.cpp'
+Index: libjsoncpp-0.10.2-3ubuntu1/src/lib_json/json_reader.cpp
+===
+--- libjsoncpp-0.10.2-3ubuntu1.orig/src/lib_json/json_reader.cpp
 libjsoncpp-0.10.2-3ubuntu1/src/lib_json/json_reader.cpp
+@@ -561,33 +561,11 @@ bool Reader::decodeDouble(Token token)
+ 
+ bool Reader::decodeDouble(Token token, Value decoded) {
+   double value = 0;
+-  const int bufferSize = 32;
+-  int count;
+-  int length = int(token.end_ - token.start_);
+ 
+-  // Sanity check to avoid buffer overflow exploits.
+-  if (length  0) {
+-return addError(Unable to parse token length, token);
+-  }
++  std::string buffer( token.start_, token.end_ );
++  std::istringstream is(buffer);
+ 
+-  // Avoid using a string constant for the format control string given to
+-  // sscanf, as this can cause hard to debug crashes on OS X. See here for more
+-  // info:
+-  //
+-  // http://developer.apple.com/library/mac/#DOCUMENTATION/DeveloperTools/gcc-4.0.1/gcc/Incompatibilities.html
+-  char format[] = %lf;
+-
+-  if (length = bufferSize) {
+-Char buffer[bufferSize + 1];
+-memcpy(buffer, token.start_, length);
+-buffer[length] = 0;
+-count = sscanf(buffer, format, value);
+-  } else {
+-std::string buffer(token.start_, token.end_);
+-count = sscanf(buffer.c_str(), format, value);
+-  }
+-
+-  if (count != 1)
++  if (!(is  value))
+ return addError(' + std::string(token.start_, token.end_) +
+ ' is not a number.,
+ token);
diff -Nru libjsoncpp-0.10.2/debian/patches/series libjsoncpp-0.10.2/debian/patches/series
--- libjsoncpp-0.10.2/debian/patches/series	2015-06-12 05:51:38.0 -0400
+++ libjsoncpp-0.10.2/debian/patches/series	2015-06-15 12:29:06.0 -0400
@@ -1,4 +1,5 @@
 0004-fix-include-path.patch
 0001-multiarch-path-support.patch
 0003-fix-arm.patch
+fix-double-parsing.patch
 

Bug#757817: gcovr: Fix parsing of --root option

[Michael Terry]

Package: gcovr
Version: 3.1-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu utopic ubuntu-patch

Dear Maintainer,

In gcovr 3.1, the --root option is broken.  It's parsed as an array of 
characters, instead of a string.  So for --root=/foo/bar, it looks in / and 
then f and so on.

This is fixed in 3.2 or by the attached patch, applied in Ubuntu.

Thanks!

-- System Information:
Debian Release: jessie/sid
  APT prefers utopic-updates
  APT policy: (500, 'utopic-updates'), (500, 'utopic-security'), (500, 'utopic')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-6-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru gcovr-3.1/debian/changelog gcovr-3.1/debian/changelog
diff -Nru gcovr-3.1/debian/patches/fix-root-arg.patch gcovr-3.1/debian/patches/fix-root-arg.patch
--- gcovr-3.1/debian/patches/fix-root-arg.patch	1969-12-31 19:00:00.0 -0500
+++ gcovr-3.1/debian/patches/fix-root-arg.patch	2014-08-11 10:28:47.0 -0400
@@ -0,0 +1,13 @@
+Index: gcovr-3.1/scripts/gcovr
+===
+--- gcovr-3.1.orig/scripts/gcovr
 gcovr-3.1/scripts/gcovr
+@@ -1825,7 +1825,7 @@ if len(args) == 1:
+ if options.root is None:
+ datafiles = get_datafiles([.], options)
+ else:
+-datafiles = get_datafiles(options.root, options)
++datafiles = get_datafiles([options.root], options)
+ else:
+ datafiles = get_datafiles(args[1:], options)
+ #
diff -Nru gcovr-3.1/debian/patches/series gcovr-3.1/debian/patches/series
--- gcovr-3.1/debian/patches/series	1969-12-31 19:00:00.0 -0500
+++ gcovr-3.1/debian/patches/series	2014-08-11 10:28:38.0 -0400
@@ -0,0 +1 @@
+fix-root-arg.patch

Bug#731962: libarchive: dep8 test fails

[Michael Terry]

Package: libarchive
Version: 3.1.2-7
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

In Ubuntu, I noticed that the minitar dep8 test was failing for libarchive.  
Upon investigation, it was failing because file now returns 'application/gzip' 
instead of 'application/x-gzip' for .gz files.  I'm *assuming* this isn't an 
Ubuntu-only behavior change, so I'm forwarding this patch on to you.  If 
Debian's file still returns x-gzip, kindly close this bug as is.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers trusty-updates
  APT policy: (500, 'trusty-updates'), (500, 'trusty-security'), (500, 'trusty')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.12.0-5-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru libarchive-3.1.2/debian/changelog libarchive-3.1.2/debian/changelog
diff -Nru libarchive-3.1.2/debian/tests/minitar libarchive-3.1.2/debian/tests/minitar
--- libarchive-3.1.2/debian/tests/minitar	2013-05-25 16:06:45.0 -0400
+++ libarchive-3.1.2/debian/tests/minitar	2013-12-11 11:32:58.0 -0500
@@ -21,7 +21,7 @@
 echo Testing mime type of foo.tar...
 test $(file -b --mime-type foo.tar) = application/x-tar
 echo Testing mime type of foo.tar.gz...
-test $(file -b --mime-type foo.tar.gz) = application/x-gzip
+test $(file -b --mime-type foo.tar.gz) = application/gzip
 echo Testing mime type of foo.tar.bz2...
 test $(file -b --mime-type foo.tar.bz2) = application/x-bzip2
 

Bug#730214: apt: Fix MinAgeSec typo

[Michael Terry]

Package: apt
Version: 0.9.9.1
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to fix a typo in the cron.daily 
script.  Apparently in the past, the MinAgeSec variable was renamed to just 
MinAge, but a couple debug echos didn't follow the change.  Patch by TJ Guthrie.

Thanks for considering it.


-- System Information:
Debian Release: wheezy/sid
  APT prefers trusty-updates
  APT policy: (500, 'trusty-updates'), (500, 'trusty-security'), (500, 'trusty')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.12.0-2-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru apt-0.9.9.1~ubuntu4/debian/apt.cron.daily apt-0.9.9.1~ubuntu5/debian/apt.cron.daily
--- apt-0.9.9.1~ubuntu4/debian/apt.cron.daily	2013-07-10 11:04:41.0 -0400
+++ apt-0.9.9.1~ubuntu5/debian/apt.cron.daily	2013-11-22 12:04:15.0 -0500
@@ -197,11 +197,11 @@
 		delta=$(($now-$ctime))
 		fi
 		if [ $delta -le $MinAge ]; then
-		debug_echo skip remove by archive size:  $file, delta=$delta  $MinAgeSec
+		debug_echo skip remove by archive size:  $file, delta=$delta  $MinAge
 		break
 		else
 		# delete oldest file
-		debug_echo remove by archive size: $file, delta=$delta = $MinAgeSec (sec), size=$size = $MaxSize
+		debug_echo remove by archive size: $file, delta=$delta = $MinAge (sec), size=$size = $MaxSize
 		rm -f $file
 		fi
 	fi

Bug#728218: nagios-nrpe: Enable hardening

[Michael Terry]

Package: nagios-nrpe
Version: 2.13-3.1
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to enable hardening support.  Thanks 
for considering it.


-- System Information:
Debian Release: wheezy/sid
  APT prefers trusty-updates
  APT policy: (500, 'trusty-updates'), (500, 'trusty-security'), (500, 'trusty')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.11.0-12-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u nagios-nrpe-2.13/debian/changelog nagios-nrpe-2.13/debian/changelog
diff -u nagios-nrpe-2.13/debian/control nagios-nrpe-2.13/debian/control
--- nagios-nrpe-2.13/debian/control
+++ nagios-nrpe-2.13/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Nagios Maintainer Group pkg-nagios-de...@lists.alioth.debian.org
 Uploaders: sean finney sean...@debian.org, Jason Thomas ja...@debian.org, Alexander Wirt formo...@debian.org
-Build-Depends: debhelper (= 9), openssl, dpatch (= 2.0.32~), libssl-dev, libwrap0-dev, autotools-dev (= 20100122.1)
+Build-Depends: debhelper (= 9), openssl, dpatch (= 2.0.32~), libssl-dev, libwrap0-dev, autotools-dev (= 20100122.1), hardening-includes
 Standards-Version: 3.9.3
 
 Package: nagios-nrpe-server
diff -u nagios-nrpe-2.13/debian/rules nagios-nrpe-2.13/debian/rules
--- nagios-nrpe-2.13/debian/rules
+++ nagios-nrpe-2.13/debian/rules
@@ -6,11 +6,16 @@
 # Include dpatch stuff.
 include /usr/share/dpatch/dpatch.make
 
+include /usr/share/hardening-includes/hardening.make
+CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(HARDENING_CFLAGS)
+CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(HARDENING_CFLAGS)
+LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) $(HARDENING_LDFLAGS)
+
 %:
 	dh $@ --with dpatch,autotools_dev
 
 override_dh_auto_configure:
-	./configure \
+	CFLAGS=$(CFLAGS) CXXFLAGS=$(CXXFLAGS) LDFLAGS=$(LDFLAGS) ./configure \
 		--prefix=/usr \
 		--enable-ssl \
 		--with-ssl-lib=/usr/lib/$(DEB_HOST_MULTIARCH) \

Bug#723755: blinker: Please enable tests during build

[Michael Terry]

Package: blinker
Version: 1.2.dfsg1-1
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu saucy ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to run the tests during package 
build.  Thanks for considering it.


-- System Information:
Debian Release: wheezy/sid
  APT prefers saucy-updates
  APT policy: (500, 'saucy-updates'), (500, 'saucy-security'), (500, 'saucy')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.11.0-7-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru blinker-1.2.dfsg1/debian/changelog blinker-1.2.dfsg1/debian/changelog
diff -Nru blinker-1.2.dfsg1/debian/control blinker-1.2.dfsg1/debian/control
--- blinker-1.2.dfsg1/debian/control	2013-04-15 05:26:01.0 -0400
+++ blinker-1.2.dfsg1/debian/control	2013-09-19 11:35:16.0 -0400
@@ -2,7 +2,7 @@
 Maintainer: Ondřej Surý ond...@debian.org
 Section: python
 Priority: optional
-Build-Depends: python-all (= 2.6.6-3), debhelper (= 7)
+Build-Depends: python-all (= 2.6.6-3), debhelper (= 7), python-nose
 Standards-Version: 3.9.4
 
 Package: python-blinker
diff -Nru blinker-1.2.dfsg1/debian/rules blinker-1.2.dfsg1/debian/rules
--- blinker-1.2.dfsg1/debian/rules	2013-04-15 05:26:01.0 -0400
+++ blinker-1.2.dfsg1/debian/rules	2013-09-19 11:31:08.0 -0400
@@ -6,4 +6,5 @@
 %:
 	dh $@ --with python2 --buildsystem=python_distutils
 
-
+override_dh_auto_test:
+	nosetests

Bug#722718: qtsvg-opensource-src: Please enable tests

[Michael Terry]

Package: qtsvg-opensource-src
Version: 5.0.2-3
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu saucy ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to build and run tests during package 
build.  Thanks for considering it.


-- System Information:
Debian Release: wheezy/sid
  APT prefers saucy-updates
  APT policy: (500, 'saucy-updates'), (500, 'saucy-security'), (500, 'saucy')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.11.0-7-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru qtsvg-opensource-src-5.0.2/debian/changelog qtsvg-opensource-src-5.0.2/debian/changelog
diff -Nru qtsvg-opensource-src-5.0.2/debian/control qtsvg-opensource-src-5.0.2/debian/control
--- qtsvg-opensource-src-5.0.2/debian/control	2013-06-20 18:20:30.0 -0400
+++ qtsvg-opensource-src-5.0.2/debian/control	2013-09-13 12:37:53.0 -0400
@@ -9,12 +9,14 @@
Lisandro Damián Nicanor Pérez Meyer lisan...@debian.org,
Felix Geyer fge...@debian.org,
Timo Jyrinki t...@debian.org
-Build-Depends: debhelper (= 9),
+Build-Depends: dbus,
+   debhelper (= 9),
qtbase5-dev (= 5.0.2~),
qtbase5-private-dev (= 5.0.2~),
libqt5opengl5-dev (= 5.0.2~),
zlib1g-dev,
pkg-kde-tools,
+   xvfb,
 Build-Depends-Indep: libqt5sql5-sqlite,
  qttools5-dev-tools (= 5.0.2~)
 Standards-Version: 3.9.4
diff -Nru qtsvg-opensource-src-5.0.2/debian/rules qtsvg-opensource-src-5.0.2/debian/rules
--- qtsvg-opensource-src-5.0.2/debian/rules	2013-06-09 13:20:57.0 -0400
+++ qtsvg-opensource-src-5.0.2/debian/rules	2013-09-13 12:16:55.0 -0400
@@ -12,11 +12,14 @@
 	dh $@ --parallel --with pkgkde_symbolshelper --dbg-package=qtsvg5-dbg
 
 override_dh_auto_configure:
-	qmake 
+	qmake QT_BUILD_PARTS+=tests
 
 override_dh_auto_build-indep:
 	dh_auto_build -Smakefile -- docs
 
+override_dh_auto_test:
+	xvfb-run -a make check QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib
+
 override_dh_auto_install-arch:
 	dh_auto_install
 

Bug#722723: qtgraphicaleffects-opensource-src: Please enable tests

[Michael Terry]

Package: qtgraphicaleffects-opensource-src
Version: 5.0.2-2
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu saucy ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to run tests during package build.  
Thanks for considering it.


-- System Information:
Debian Release: wheezy/sid
  APT prefers saucy-updates
  APT policy: (500, 'saucy-updates'), (500, 'saucy-security'), (500, 'saucy')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.11.0-7-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru qtgraphicaleffects-opensource-src-5.0.2/debian/changelog qtgraphicaleffects-opensource-src-5.0.2/debian/changelog
diff -Nru qtgraphicaleffects-opensource-src-5.0.2/debian/control qtgraphicaleffects-opensource-src-5.0.2/debian/control
--- qtgraphicaleffects-opensource-src-5.0.2/debian/control	2013-07-30 09:09:43.0 -0400
+++ qtgraphicaleffects-opensource-src-5.0.2/debian/control	2013-09-13 13:20:48.0 -0400
@@ -1,19 +1,21 @@
 Source: qtgraphicaleffects-opensource-src
 Section: libs
 Priority: optional
-Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
-XSBC-Original-Maintainer: Debian Qt/KDE Maintainers debian-qt-...@lists.debian.org
+Maintainer: Debian Qt/KDE Maintainers debian-qt-...@lists.debian.org
 Uploaders: Fathi Boudra f...@debian.org,
Modestas Vainius mo...@debian.org,
Sune Vuorela deb...@pusling.com,
Pino Toscano p...@debian.org,
Lisandro Damián Nicanor Pérez Meyer lisan...@debian.org,
Timo Jyrinki t...@debian.org
-Build-Depends: debhelper (= 9),
+Build-Depends: dbus,
+   debhelper (= 9),
dpkg-dev (= 1.16.1),
pkg-kde-tools,
qtbase5-private-dev (= 5.0.2),
qtdeclarative5-private-dev (= 5.0.2),
+   qtdeclarative5-qtquick2-plugin,
+   xvfb,
 Build-Depends-Indep: libqt5sql5-sqlite,
  qttools5-dev-tools (= 5.0.2~)
 Standards-Version: 3.9.4
diff -Nru qtgraphicaleffects-opensource-src-5.0.2/debian/rules qtgraphicaleffects-opensource-src-5.0.2/debian/rules
--- qtgraphicaleffects-opensource-src-5.0.2/debian/rules	2013-07-30 09:09:43.0 -0400
+++ qtgraphicaleffects-opensource-src-5.0.2/debian/rules	2013-09-13 13:00:57.0 -0400
@@ -12,11 +12,14 @@
 	dh $@ --parallel
 
 override_dh_auto_configure:
-	qmake
+	qmake QT_BUILD_PARTS+=tests
 
 override_dh_auto_build-indep:
 	dh_auto_build -Smakefile -- docs
 
+override_dh_auto_test:
+	xvfb-run -a make check QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib
+
 override_dh_auto_install-indep:
 	make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
 

Bug#719148: debhelper: cmake.pm should define CMAKE_INSTALL_SYSCONFDIR

[Michael Terry]

And also should probably define the following too:

CMAKE_INSTALL_LOCALSTATEDIR=/var

-mt


On Thu, Aug 8, 2013 at 3:23 PM, Michael Terry mte...@ubuntu.com wrote:

 Package: debhelper
 Version: 9.20130630
 Severity: normal
 Tags: patch
 User: ubuntu-de...@lists.ubuntu.com
 Usertags: origin-ubuntu saucy ubuntu-patch

 Dear Maintainer,

 Using the current cmake.pm file, CMAKE_INSTALL_SYSCONFDIR is defined as
 /usr/etc when building.  Much like autoconf.pm, we need to have 
 cmake.pmspecifically define CMAKE_INSTALL_SYSCONFDIR to /etc.

 Here's a trivial patch to do so.  Thanks for considering it.


 -- System Information:
 Debian Release: wheezy/sid
   APT prefers saucy-updates
   APT policy: (500, 'saucy-updates'), (500, 'saucy-security'), (500,
 'saucy')
 Architecture: amd64 (x86_64)
 Foreign Architectures: i386

 Kernel: Linux 3.10.0-6-generic (SMP w/4 CPU cores)
 Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
 Shell: /bin/sh linked to /bin/dash




-- 
-mt

Bug#719148: debhelper: cmake.pm should define CMAKE_INSTALL_SYSCONFDIR

[Michael Terry]

Package: debhelper
Version: 9.20130630
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu saucy ubuntu-patch

Dear Maintainer,

Using the current cmake.pm file, CMAKE_INSTALL_SYSCONFDIR is defined as 
/usr/etc when building.  Much like autoconf.pm, we need to have cmake.pm 
specifically define CMAKE_INSTALL_SYSCONFDIR to /etc.

Here's a trivial patch to do so.  Thanks for considering it.


-- System Information:
Debian Release: wheezy/sid
  APT prefers saucy-updates
  APT policy: (500, 'saucy-updates'), (500, 'saucy-security'), (500, 'saucy')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.10.0-6-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru debhelper-9.20130630ubuntu1/debian/changelog debhelper-9.20130630ubuntu2/debian/changelog
diff -Nru debhelper-9.20130630ubuntu1/debian/control debhelper-9.20130630ubuntu2/debian/control
--- debhelper-9.20130630ubuntu1/debian/control	2013-07-01 06:20:09.0 -0400
+++ debhelper-9.20130630ubuntu2/debian/control	2013-08-08 15:19:32.0 -0400
@@ -1,8 +1,7 @@
 Source: debhelper
 Section: devel
 Priority: optional
-Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
-XSBC-Original-Maintainer: Joey Hess jo...@debian.org
+Maintainer: Joey Hess jo...@debian.org
 Build-Depends: po4a (= 0.24)
 Standards-Version: 3.9.4
 Vcs-Git: git://git.debian.org/git/debhelper/debhelper.git
diff -Nru debhelper-9.20130630ubuntu1/Debian/Debhelper/Buildsystem/cmake.pm debhelper-9.20130630ubuntu2/Debian/Debhelper/Buildsystem/cmake.pm
--- debhelper-9.20130630ubuntu1/Debian/Debhelper/Buildsystem/cmake.pm	2013-05-25 11:33:37.0 -0400
+++ debhelper-9.20130630ubuntu2/Debian/Debhelper/Buildsystem/cmake.pm	2013-08-08 15:16:33.0 -0400
@@ -42,6 +42,7 @@
 
 	# Standard set of cmake flags
 	push @flags, -DCMAKE_INSTALL_PREFIX=/usr;
+	push @flags, -DCMAKE_INSTALL_SYSCONFDIR=/etc;
 	push @flags, -DCMAKE_VERBOSE_MAKEFILE=ON;
 	push @flags, -DCMAKE_BUILD_TYPE=RelWithDebInfo;
 

Bug#711078: python-tidylib: Enable tests during build

[Michael Terry]

Package: python-tidylib
Version: 0.2.1~dfsg-2
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu saucy ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to run upstream tests at build time.  
Thanks for considering it!

One thing to note is that the upstream test threadsafety.py does not seem to 
actually return an error code if it fails.  But the others do.

-- System Information:
Debian Release: wheezy/sid
  APT prefers saucy-updates
  APT policy: (500, 'saucy-updates'), (500, 'saucy-security'), (500, 'saucy')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.9.0-2-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru python-tidylib-0.2.1~dfsg/debian/changelog python-tidylib-0.2.1~dfsg/debian/changelog
diff -Nru python-tidylib-0.2.1~dfsg/debian/rules python-tidylib-0.2.1~dfsg/debian/rules
--- python-tidylib-0.2.1~dfsg/debian/rules	2011-04-30 17:14:28.0 -0400
+++ python-tidylib-0.2.1~dfsg/debian/rules	2013-06-04 09:31:40.0 -0400
@@ -19,3 +19,5 @@
 	find docs -name *.pyc -exec rm -rf {} +
 	dh_auto_clean
 
+override_dh_auto_test:
+	set -ex; for i in `ls tests/*.py` ; do PYTHONPATH=$(CURDIR) python $${i} ; done

Bug#711078: One more detail

[Michael Terry]

And you have to add a libtidy-0.99-0 Build-Depend too, for the tests when
they run.

Bug#704676: liblangtag: Please add a symbols or shlibs file

[Michael Terry]

Package: liblangtag
Severity: normal
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring

Dear Maintainer,

As recommended by the Debian Policy Manual, library packages should have either 
a symbols or shlibs file to maintain correct reverse dependency versioning.  
Please consider adding one.  Thanks!

-- System Information:
Debian Release: wheezy/sid
  APT prefers raring-updates
  APT policy: (500, 'raring-updates'), (500, 'raring-security'), (500, 'raring')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.8.0-16-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.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#704676: liblangtag: Please add a symbols or shlibs file

[Michael Terry]

On 04/04/2013 09:34 AM, Rene Engelhard wrote:
 Why should I add no-ops?

 It does not need a shlibs file as it would contain
 liblangtag 1 liblangtag1 anyway and thus it's a no-op. (0.4.0 was
 the first upload ever to Debian).
 Similar for .symbols, but that one could be added somewhen, yes,
 though it would not contain *any* version info yet either.

 So why on earth do you think it would make sense to add one
 *right now*?

I didn't mean to impart a sense of urgency.  Sure, if you added it right
now, all the symbols would be marked as 0.4, but that's not harmful. 
(Though, it would guard against maintainer error, if some patch modified
the symbols list accidentally.)

You sound like you intend to add a symbols file once it is useful, so
consider this a reminder bug for it.

-mt


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#699444: google-glog: FTBFS: make[3]: *** [signalhandler_unittest_sh] Error 1

[Michael Terry]

Package: google-glog
Version: 0.3.2-4
Followup-For: Bug #699444
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to fix the signalhandler test failure 
on non-i386/-amd64 machines.  Thanks for considering it.

(it's also failing on armhf for us, and the upstream bug suggests the test only 
works on i386 and amd64: 
http://code.google.com/p/google-glog/issues/detail?id=140)

-- System Information:
Debian Release: wheezy/sid
  APT prefers raring-updates
  APT policy: (500, 'raring-updates'), (500, 'raring-security'), (500, 'raring')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.8.0-11-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru google-glog-0.3.2/debian/changelog google-glog-0.3.2/debian/changelog
diff -Nru google-glog-0.3.2/debian/patches/20120617_fix_test_on_ppc.diff google-glog-0.3.2/debian/patches/20120617_fix_test_on_ppc.diff
--- google-glog-0.3.2/debian/patches/20120617_fix_test_on_ppc.diff	2012-10-13 08:37:04.0 -0400
+++ google-glog-0.3.2/debian/patches/20120617_fix_test_on_ppc.diff	1969-12-31 19:00:00.0 -0500
@@ -1,13 +0,0 @@
-Index: pkg-google-glog/src/signalhandler_unittest.sh
-===
 pkg-google-glog.orig/src/signalhandler_unittest.sh	2012-06-17 21:48:33.0 +0900
-+++ pkg-google-glog/src/signalhandler_unittest.sh	2012-06-17 22:40:23.0 +0900
-@@ -67,7 +67,7 @@
- 
- # The PC cannot be obtained in signal handlers on PowerPC correctly.
- # We just skip the test for PowerPC.
--if [ x`uname -p` = xpowerpc ]; then
-+if [ x`uname -m` = xppc ]; then
-   echo PASS (We don't test the signal handler on PowerPC.)
-   exit 0
- fi
diff -Nru google-glog-0.3.2/debian/patches/20130313_fix_test_on_ports.diff google-glog-0.3.2/debian/patches/20130313_fix_test_on_ports.diff
--- google-glog-0.3.2/debian/patches/20130313_fix_test_on_ports.diff	1969-12-31 19:00:00.0 -0500
+++ google-glog-0.3.2/debian/patches/20130313_fix_test_on_ports.diff	2013-03-13 14:07:14.0 -0400
@@ -0,0 +1,19 @@
+Index: google-glog-0.3.2/src/signalhandler_unittest.sh
+===
+--- google-glog-0.3.2.orig/src/signalhandler_unittest.sh	2013-03-13 13:49:37.820188111 -0400
 google-glog-0.3.2/src/signalhandler_unittest.sh	2013-03-13 14:07:11.980204520 -0400
+@@ -65,10 +65,10 @@
+   exit 0
+ fi
+ 
+-# The PC cannot be obtained in signal handlers on PowerPC correctly.
+-# We just skip the test for PowerPC.
+-if [ x`uname -p` = xpowerpc ]; then
+-  echo PASS (We don't test the signal handler on PowerPC.)
++# This test only works correctly on i386 and amd64.
++# We just skip the test when not on those platforms.
++if [ x`uname -m` != xx86_64 -a x`uname -m` != xi686 ]; then
++  echo PASS (We only test the signal handler on i386 or amd64.)
+   exit 0
+ fi
+ 
diff -Nru google-glog-0.3.2/debian/patches/series google-glog-0.3.2/debian/patches/series
--- google-glog-0.3.2/debian/patches/series	2012-10-13 08:37:04.0 -0400
+++ google-glog-0.3.2/debian/patches/series	2013-03-13 13:49:13.0 -0400
@@ -1,3 +1,3 @@
 20120617_fix_for_hurd.diff
-20120617_fix_test_on_ppc.diff
 20120621_errnos.diff
+20130313_fix_test_on_ports.diff

Bug#702443: python-json-patch: Enable test suite during build

[Michael Terry]

Package: python-json-patch
Version: 0.12-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to run the test suite during build.

Thanks for considering it.


-- System Information:
Debian Release: wheezy/sid
  APT prefers raring-updates
  APT policy: (500, 'raring-updates'), (500, 'raring-security'), (500, 'raring')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.8.0-10-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru python-json-patch-0.12/debian/changelog python-json-patch-0.12/debian/changelog
diff -Nru python-json-patch-0.12/debian/rules python-json-patch-0.12/debian/rules
--- python-json-patch-0.12/debian/rules	2013-02-01 00:06:09.0 -0500
+++ python-json-patch-0.12/debian/rules	2013-03-07 11:46:25.0 -0500
@@ -8,3 +8,6 @@
 
 %:
 	dh $@  --with python2
+
+override_dh_auto_test:
+	PYTHONPATH=$(CURDIR) python tests.py

Bug#702292: python-json-pointer: Run tests during build

[Michael Terry]

Package: python-json-pointer
Version: 0.6-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to run tests during build.  Thanks 
for considering it.


-- System Information:
Debian Release: wheezy/sid
  APT prefers raring-updates
  APT policy: (500, 'raring-updates'), (500, 'raring-security'), (500, 'raring')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.8.0-9-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru python-json-pointer-0.6/debian/changelog python-json-pointer-0.6/debian/changelog
diff -Nru python-json-pointer-0.6/debian/rules python-json-pointer-0.6/debian/rules
--- python-json-pointer-0.6/debian/rules	2013-02-01 00:09:03.0 -0500
+++ python-json-pointer-0.6/debian/rules	2013-03-04 15:18:02.0 -0500
@@ -8,3 +8,6 @@
 
 %:
 	dh $@  --with python2
+
+override_dh_auto_test:
+	./tests.py

Bug#701655: libmagickcore-dev: Depend on liblcms2-dev, not liblcms-dev

[Michael Terry]

Package: imagemagick
Version: 8:6.7.7.10-5
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to fix libmagickcore-dev's
incorrect Depends on liblcms-dev.  That package is a virtual provided only
by liblcms1-dev.  But imagemagick is built against liblcms2-dev (as you
can see in the Build-Depends).

This patch fixes the discrepency.  It was written by Philip Muškovac.
Thanks for considering it.


-- System Information:
Debian Release: wheezy/sid
  APT prefers raring-updates
  APT policy: (500, 'raring-updates'), (500, 'raring-security'), (500, 'raring')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.8.0-6-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru imagemagick-6.7.7.10/debian/control imagemagick-6.7.7.10/debian/control
--- imagemagick-6.7.7.10/debian/control	2013-01-22 22:43:04.0 -0500
+++ imagemagick-6.7.7.10/debian/control	2013-02-25 14:42:39.0 -0500
@@ -110,7 +110,7 @@
 Depends: libmagickcore5 (= ${binary:Version}),
  libmagickcore5-extra (= ${binary:Version}), libbz2-dev, libdjvulibre-dev,
  libexif-dev, libfreetype6-dev, libgraphviz-dev, libjasper-dev, libjpeg-dev,
- liblcms-dev, liblqr-1-0-dev, libltdl-dev, libopenexr-dev, libpng-dev,
+ liblcms2-dev, liblqr-1-0-dev, libltdl-dev, libopenexr-dev, libpng-dev,
  librsvg2-dev, libtiff5-dev, libwmf-dev, libx11-dev, libxext-dev, libxml2-dev,
  libxt-dev, zlib1g-dev, 
  ${misc:Depends},

Bug#701080: xcb-util-image: Please run tests during build

[Michael Terry]

Package: xcb-util-image
Version: 0.3.9-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to run tests during build (well,
right now only one, but that's more than zero!).

Thanks for considering it.


-- System Information:
Debian Release: wheezy/sid
  APT prefers raring-updates
  APT policy: (500, 'raring-updates'), (500, 'raring-security'), (500, 'raring')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.8.0-6-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru xcb-util-image-0.3.9/debian/changelog xcb-util-image-0.3.9/debian/changelog
diff -Nru xcb-util-image-0.3.9/debian/rules xcb-util-image-0.3.9/debian/rules
--- xcb-util-image-0.3.9/debian/rules	2012-06-08 05:50:42.0 +
+++ xcb-util-image-0.3.9/debian/rules	2013-02-21 11:21:35.0 +
@@ -7,6 +7,7 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 DEB_DH_MAKESHLIBS_ARGS=-V
+DEB_MAKE_CHECK_TARGET = check
 
 ORIG_MAJOR=$(shell git describe upstream | cut -d- -f1)
 ORIG_GIT=$(shell git describe upstream | cut -d- -f2)

Bug#700339: sparsehash: Run tests during build

[Michael Terry]

Package: sparsehash
Version: 1.10-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to run the test suite as part
of the build.  Thanks for considering it.


-- System Information:
Debian Release: wheezy/sid
  APT prefers raring-updates
  APT policy: (500, 'raring-updates'), (500, 'raring-security'), (500, 'raring')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.8.0-5-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru sparsehash-1.10/debian/changelog sparsehash-1.10/debian/changelog
diff -Nru sparsehash-1.10/debian/rules sparsehash-1.10/debian/rules
--- sparsehash-1.10/debian/rules	2011-05-17 15:30:46.0 -0400
+++ sparsehash-1.10/debian/rules	2013-02-11 14:21:04.0 -0500
@@ -10,6 +10,7 @@
 	dh_testdir
 	./configure --prefix=/usr
 	$(MAKE)
+	$(MAKE) check
 	touch build-stamp
 
 clean:

Bug#698990: zsnes: Fix build when _FORTIFY_SOURCE is defined

[Michael Terry]

Package: zsnes
Version: 1.510+bz2-5
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,

In Ubuntu, we define _FORTIFY_SOURCE which causes a build problem with
zsnes.  To work around this, I've added the attached patch to undefine
_FORTIFY_SOURCES in generated code.

This is the last diff Ubuntu has with Debian, and it would be nice to be
able to drop it.

Patch by Hans de Goede.  Thanks for considering it.


-- System Information:
Debian Release: wheezy/sid
  APT prefers raring-updates
  APT policy: (500, 'raring-updates'), (500, 'raring-security'), (500, 'raring')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.8.0-1-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru zsnes-1.510+bz2/debian/changelog zsnes-1.510+bz2/debian/changelog
diff -Nru zsnes-1.510+bz2/debian/patches/disable-fortify-source.patch zsnes-1.510+bz2/debian/patches/disable-fortify-source.patch
--- zsnes-1.510+bz2/debian/patches/disable-fortify-source.patch	1969-12-31 19:00:00.0 -0500
+++ zsnes-1.510+bz2/debian/patches/disable-fortify-source.patch	2013-01-25 18:15:06.0 -0500
@@ -0,0 +1,17 @@
+Description: Fix FTBFS when _FORTIFY_SOURCE is defined
+Author: Hans de Goede j.w.r.dego...@gmail.com
+Origin: http://lists.rpmfusion.org/pipermail/rpmfusion-developers/2011-September/010127.html
+Bug-Ubuntu: https://launchpad.net/bugs/250425
+
+Index: zsnes-1.510+bz2-5ubuntu1/src/parsegen.cpp
+===
+--- zsnes-1.510+bz2-5ubuntu1.orig/src/parsegen.cpp	2013-01-25 17:04:06.607723248 -0500
 zsnes-1.510+bz2-5ubuntu1/src/parsegen.cpp	2013-01-25 17:56:47.535582069 -0500
+@@ -656,6 +656,7 @@
+ Config file handler generated by Nach's Config file handler creator.\n
+ */\n
+ \n
++#undef _FORTIFY_SOURCE\n
+ #include stdio.h\n
+ #include stdlib.h\n
+ #include ctype.h\n
diff -Nru zsnes-1.510+bz2/debian/patches/series zsnes-1.510+bz2/debian/patches/series
--- zsnes-1.510+bz2/debian/patches/series	2012-11-05 16:23:54.0 -0500
+++ zsnes-1.510+bz2/debian/patches/series	2013-01-25 17:56:19.0 -0500
@@ -12,3 +12,4 @@
 0012-Fix-build-with-gcc-4.7.patch
 0013-Fix-sound-with-libao.patch
 0014-Initialize-driver_format.matrix-with-NULL.patch
+disable-fortify-source.patch

Bug#677225: liblockfile: Patch from Ubuntu

[Michael Terry]

Package: liblockfile
Version: 1.09-5
Followup-For: Bug #677225
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to fix a couple buffer overflows
when building strings:

- Protect against overflows caused by large PID numbers (this bug)
  https://bugs.launchpad.net/ubuntu/+source/liblockfile/+bug/1011477

- Protect against overflows caused by long hostnames (no Debian bug for this)
  https://bugs.launchpad.net/ubuntu/+source/liblockfile/+bug/941968

Patch by Tyler Hicks.  Thanks for considering it.


-- System Information:
Debian Release: wheezy/sid
  APT prefers raring-updates
  APT policy: (500, 'raring-updates'), (500, 'raring-security'), (500, 'raring')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.8.0-1-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru liblockfile-1.09/debian/changelog liblockfile-1.09/debian/changelog
diff -Nru liblockfile-1.09/debian/patches/fix-buffer-overflows.patch liblockfile-1.09/debian/patches/fix-buffer-overflows.patch
--- liblockfile-1.09/debian/patches/fix-buffer-overflows.patch	1969-12-31 19:00:00.0 -0500
+++ liblockfile-1.09/debian/patches/fix-buffer-overflows.patch	2013-01-24 15:35:09.0 -0500
@@ -0,0 +1,113 @@
+Description: Fix buffer overflows when building strings
+ The first occurs in lockfile_create_save_tmplock() when building the
+ filename for the temporary lock file. The p buffer may not be large enough to
+ hold large pid numbers or long hostnames. This issue is fixed by using
+ snprintf(), rather than sprintf(), and adding appropriate field widths to the
+ conversion string. Long hostnames will be truncated to fit in the remainder of
+ the buffer length.
+ .
+ The second occurs in lockfile_create_save_tmplock() when buf is not long
+ enough to store large pid numbers. This issue is fixed by using snprintf().
+ Also, the length of buf is increased to 40, which is enough to hold a 128 bit
+ signed int. This will be sufficient for holding pid values for quite some time
+ into the future.
+ .
+ Additionally, the sprintf() in do_extern() is changed to snprintf() for
+ general security hardening. An overflow of buf is not currently possible.
+Bug-Debian: http://bugs.debian.org/677225
+Bug-Ubuntu: https://launchpad.net/bugs/941968
+Bug-Ubuntu: https://launchpad.net/bugs/1011477
+Author: Tyler Hicks tyhi...@canonical.com
+Index: liblockfile-1.09/lockfile.c
+===
+--- liblockfile-1.09.orig/lockfile.c	2013-01-09 10:54:49.948588615 -0800
 liblockfile-1.09/lockfile.c	2013-01-09 12:19:07.328708811 -0800
+@@ -158,7 +158,7 @@
+ 	if ((pid = fork())  0)
+ 		return L_ERROR;
+ 	if (pid == 0) {
+-		sprintf(buf, %d, retries % 1000);
++		snprintf(buf, sizeof(buf), %d, retries % 1000);
+ 		execl(LOCKPROG, LOCKPROG, opt, -r, buf, -q,
+ 			(flags  L_PID) ? -p : -N, lockfile, NULL);
+ 		_exit(L_ERROR);
+@@ -185,6 +185,14 @@
+ 
+ #endif
+ 
++#define TMPLOCKSTR		.lk
++#define TMPLOCKSTRSZ		strlen(TMPLOCKSTR)
++#define TMPLOCKPIDSZ		5
++#define TMPLOCKTIMESZ		1
++#define TMPLOCKSYSNAMESZ	23
++#define TMPLOCKFILENAMESZ	(TMPLOCKSTRSZ + TMPLOCKPIDSZ + \
++ TMPLOCKTIMESZ + TMPLOCKSYSNAMESZ)
++
+ /*
+  *	Create a lockfile.
+  */
+@@ -196,7 +204,7 @@
+ {
+ 	struct stat	st, st1;
+ 	char		sysname[256];
+-	char		buf[8];
++	char		buf[40];
+ 	char		*p;
+ 	int		sleeptime = 0;
+ 	int		statfailed = 0;
+@@ -209,13 +217,13 @@
+ 	/*
+ 	 *	Safety measure.
+ 	 */
+-	if (strlen(lockfile) + 32  MAXPATHLEN) {
++	if (strlen(lockfile) + TMPLOCKFILENAMESZ  MAXPATHLEN) {
+ 		errno = ENAMETOOLONG;
+ 		return L_ERROR;
+ 	}
+ #endif
+ 
+-	if (strlen(lockfile) + 32 + 1  tmplocksz) {
++	if (strlen(lockfile) + TMPLOCKFILENAMESZ + 1  tmplocksz) {
+ 		errno = EINVAL;
+ 		return L_ERROR;
+ 	}
+@@ -233,14 +241,16 @@
+ 		return L_ERROR;
+ 	if ((p = strchr(sysname, '.')) != NULL)
+ 		*p = 0;
+-	/* strcpy is safe: length-check above, limited at sprintf below */
++	/* strcpy is safe: length-check above, limited at snprintf below */
+ 	strcpy(tmplock, lockfile);
+ 	if ((p = strrchr(tmplock, '/')) == NULL)
+ 		p = tmplock;
+ 	else
+ 		p++;
+-	sprintf(p, .lk%05d%x%s,
+-		(int)getpid(), (int)time(NULL)  15, sysname);
++	snprintf(p, TMPLOCKFILENAMESZ, %s%0*d%0*x%s, TMPLOCKSTR,
++		 TMPLOCKPIDSZ, (int)getpid(),
++		 TMPLOCKTIMESZ, (int)time(NULL)  15,
++		 sysname);
+ 	i = umask(022);
+ 	fd = open(tmplock, O_WRONLY|O_CREAT|O_EXCL, 0644);
+ 	e = errno;
+@@ -251,8 +261,8 @@
+ 		return L_TMPLOCK;
+ 	}
+ 	if (flags  (L_PID | L_PPID)) {
+-		sprintf(buf, %d\n,
+-			(flags  L_PID) ? (int)getpid() : (int)getppid());
++		snprintf(buf, sizeof(buf), %d\n,
++			 (flags  L_PID) ? (int)getpid() : (int)getppid());
+ 		p = buf;
+ 		len = strlen(buf);
+ 	} else {
+@@ -363,7 +373,7 @@
+ 	char *tmplock;
+ 	int l, r, e;
+ 
+-	l = strlen(lockfile)+32+1;
++	l = 

Bug#695283: libformula-java: Use ${java:Depends}

[Michael Terry]

Package: libformula
Version: 1.1.7.dfsg-2
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,

libformula-java currently hardcodes its dependency on libjcommon-java.  But
ideally it would use ${java:Depends} to be safer and future-proof.

I tested with this, and you'd lose the versioned part of the dependency
(= 1.0.10-1), but that is satisfied by even oldstable.  So no great loss.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers raring-updates
  APT policy: (500, 'raring-updates'), (500, 'raring-security'), (500, 'raring')
Architecture: i386 (i686)

Kernel: Linux 3.7.0-4-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u libformula-1.1.7.dfsg/debian/control libformula-1.1.7.dfsg/debian/control
--- libformula-1.1.7.dfsg/debian/control
+++ libformula-1.1.7.dfsg/debian/control
@@ -10,7 +10,7 @@
 
 Package: libformula-java
 Architecture: all
-Depends: libjcommon-java (= 1.0.10-1),
+Depends: ${java:Depends},
  ${misc:Depends}
 Suggests: libformula-java-doc
 Description: Excel(tm) style formula expressions library

Bug#695173: gdisk: Please run test suite during build

[Michael Terry]

Package: gdisk
Version: 0.8.5-1
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to run the test suite during
package build.  (Patch by James Hunt.)

Thanks for considering it!


-- System Information:
Debian Release: wheezy/sid
  APT prefers raring-updates
  APT policy: (500, 'raring-updates'), (500, 'raring-security'), (500, 'raring')
Architecture: i386 (i686)

Kernel: Linux 3.7.0-4-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru gdisk-0.8.5/debian/changelog gdisk-0.8.5/debian/changelog
diff -Nru gdisk-0.8.5/debian/rules gdisk-0.8.5/debian/rules
--- gdisk-0.8.5/debian/rules	2012-06-16 13:09:52.0 -0400
+++ gdisk-0.8.5/debian/rules	2012-12-04 07:05:39.0 -0500
@@ -13,5 +13,8 @@
 	# install index page for doc-base
 	install -D debian/index.html $(CURDIR)/debian/gdisk/usr/share/doc/gdisk/index.html
 
+override_dh_auto_test:
+	./gdisk_test.sh
+
 %:
 	dh $@

Bug#695173: Hold on

[Michael Terry]

I may have been hasty.  This patch doesn't actually fail the build if 
the test suite fails.  So while it's useful for logs, not very useful 
for preventing bad releases.


Let me circle back with James Hunt.

-mt


--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#692785: zsh: '.zprofice' typo in zshrc

[Michael Terry]

Package: zsh
Version: 5.0.0-2
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,

Ubuntu user Logan Rosen provided the attached patch to fix a typo in
debian/zshrc.  .zprofice should be .zprofile.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers raring-updates
  APT policy: (500, 'raring-updates'), (500, 'raring-security'), (500, 'raring')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-18-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru zsh-5.0.0/debian/zshrc zsh-5.0.0/debian/zshrc
--- zsh-5.0.0/debian/zshrc	2012-09-16 04:23:03.0 -0400
+++ zsh-5.0.0/debian/zshrc	2012-11-08 15:01:42.0 -0500
@@ -99,7 +99,7 @@
 
 # If you don't want compinit called here, place the line
 # skip_global_compinit=1
-# in your $ZDOTDIR/.zshenv or $ZDOTDIR/.zprofice
+# in your $ZDOTDIR/.zshenv or $ZDOTDIR/.zprofile
 if [[ -z $skip_global_compinit ]]; then
   autoload -U compinit
   compinit

Bug#683450: freecol: Please (Build-)Depend on default-jdk/-jre

[Michael Terry]

Package: freecol
Version: 0.10.5+dfsg-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

In Ubuntu, we've switched default-jdk/-jre to openjdk-7.  This has
revealed some bugs in packages with mismatched build dependencies.  For
example, freecol build-depends on ant and openjdk-6-jdk.  ant in turn
Depends on default-jre-headless, which on Ubuntu points the default java
at openjdk.  So it doesn't find openjdk-6-jdk's javac.

I believe it's recommended to use default-jdk/default-jre in general to
avoid hard coding which jdk is being used.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-6-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru freecol-0.10.5+dfsg/debian/changelog freecol-0.10.5+dfsg/debian/changelog
diff -Nru freecol-0.10.5+dfsg/debian/control freecol-0.10.5+dfsg/debian/control
--- freecol-0.10.5+dfsg/debian/control	2012-03-05 18:09:54.0 -0500
+++ freecol-0.10.5+dfsg/debian/control	2012-07-31 17:14:43.0 -0400
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
 Uploaders: Vincent Fourmond fourm...@debian.org
-Build-Depends: debhelper (= 5), ant, openjdk-6-jdk, cdbs
+Build-Depends: debhelper (= 5), ant, default-jdk, cdbs
 Build-Depends-Indep:
  tex4ht, texlive-binaries | texlive-base-bin, ant-optional,
  texlive-latex-recommended, libcommons-cli-java, libmiglayout-java,
@@ -15,7 +15,7 @@
 
 Package: freecol
 Architecture: all
-Depends: openjdk-6-jre | java6-runtime,
+Depends: default-jre | java6-runtime,
  java-wrappers (= 0.1.13), ${misc:Depends}, ${java:Depends},
  fonts-liberation (= 1.07.0-2~)
 Description: open source remake of the old Colonization

Bug#683457: php-config: Build-Depend on php-xml-parser

[Michael Terry]

Package: php-config
Version: 1.10.12-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

In Ubuntu, php-config was FTBFS because one of its tests expects
php-xml-parser to be installed.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-6-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru php-config-1.10.12/debian/changelog php-config-1.10.12/debian/changelog
diff -Nru php-config-1.10.12/debian/control php-config-1.10.12/debian/control
--- php-config-1.10.12/debian/control	2012-05-25 02:55:06.0 -0400
+++ php-config-1.10.12/debian/control	2012-07-31 18:01:30.0 -0400
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: PKG-PHP PEAR team pkg-php-p...@lists.alioth.debian.org
 Uploaders: Thomas Goirand z...@debian.org
-Build-Depends: debhelper (= 8), pkg-php-tools, phpunit (= 3.6)
+Build-Depends: debhelper (= 8), pkg-php-tools, php-xml-parser, phpunit (= 3.6)
 Build-Depends-Indep: php-pear
 Standards-Version: 3.9.3
 Vcs-Browser: http://git.debian.org/?p=pkg-php/php-config.git

Bug#683282: 0ad: Restrict list of Architectures

[Michael Terry]

Package: 0ad
Version: 0~r11863-2
Severity: minor
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal

Dear Maintainer,

0ad requires libnvtt-dev, which is only available on amd64, i386, and powerpc.
But 0ad doesn't look like it supports powerpc either.  The arch detection
only looks for amd64 else fallsback to i386.  And I don't see a powerpc entry
in source/lib/sysdep/arch.

So the Architecture line should probably be restricted to just amd64 and
i386.  Thanks!

-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-6-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.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#683287: sbuild: will not install a missing build-dep in some cases

[Michael Terry]

Package: sbuild
Version: 0.63.1-1ubuntu1
Severity: normal
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal

Dear Maintainer,

Consider the case of libio-socket-ip-perl in quantal as of this writing. It has 
a dependency like libsocket-perl (= 1.97) | perl (= 5.15.6). 
libsocket-perl's current version is 2.002-1 (which is fine). Perl's current 
version is 5.14.2-12 (which does not satisfy the check).

So sbuild correctly reports:

libsocket-perl: missing
perl: non-matching version installed (5.14.2-12 ! = 5.15.6)

And then does not try to install libsocket-perl. Which I think is a clear bug? 
The build fails because it is dep waiting on libsocket-perl, despite it 
actually being available.

It seems that sbuild's dependency checker stops if part of an or-clause is 
already installed, regardless of whether it actually satisfies the 
requirements. I'd argue it should take that into account and attempt to install 
another part of the or-clause.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-6-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages sbuild depends on:
ii  adduser 3.113+nmu1ubuntu1
ii  apt-utils   0.9.7.1ubuntu1
ii  libsbuild-perl  0.63.1-1ubuntu1
ii  perl5.14.2-12
ii  perl-modules5.14.2-12

Versions of packages sbuild recommends:
ii  debootstrap  1.0.41ubuntu1
ii  fakeroot 1.18.4-2

Versions of packages sbuild suggests:
pn  deborphan  none
ii  wget   1.13.4-3ubuntu1

-- 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#683287: [buildd-tools-devel] Bug#683287: sbuild: will not install a missing build-dep in some cases

[Michael Terry]

Aha, after some digging, I realized that Launchpad uses a forked copy 
of sbuild 
(https://code.launchpad.net/~canonical-launchpad-branches/launchpad-buildd/trunk).


So it's not clear if this affects Debian's sbuild.  Feel free to close.

-mt

On Mon 30 Jul 2012 12:38:16 EDT, Roger Leigh wrote:

On Mon, Jul 30, 2012 at 10:50:35AM -0400, Michael Terry wrote:

Consider the case of libio-socket-ip-perl in quantal as of this writing. It
has a dependency like libsocket-perl (= 1.97) | perl (= 5.15.6).
libsocket-perl's current version is 2.002-1 (which is fine). Perl's current
version is 5.14.2-12 (which does not satisfy the check).

So sbuild correctly reports:

libsocket-perl: missing
perl: non-matching version installed (5.14.2-12 ! = 5.15.6)

And then does not try to install libsocket-perl. Which I think is a clear
bug? The build fails because it is dep waiting on libsocket-perl, despite it
actually being available.

It seems that sbuild's dependency checker stops if part of an or-clause is
already installed, regardless of whether it actually satisfies the
requirements. I'd argue it should take that into account and attempt to
install another part of the or-clause.


Which dependency solver were you using?  I'm assuming it wasn't
internal, which should be removed in this version.

I think you're probably running afoul of the RESOLVE_ALTERNATIVES
setting, which for the apt resolver default to 0.  That is, all
alternative build dependencies will be stripped out.  You should
be able to confirm this by looking at the dependencies in the
dependency package--they should be printed as part of the build
log.  You should see the filtered dependencies as having all the
alternatives removed.

On the Debian buildds, RESOLVE_ALTERNATIVES is always 0, except
for the experimental and backports buildds which use aptitude and
are out of necessity more flexible, but less reproducible.  For
all stable/testing/unstable builds, alternative build dependencies
are not allowed.  I'm not sure what Ubuntu buildds do.

I hope that helps explain things.  If my assuption is wrong, I'll
be happy to look at it further.


Regards,
Roger




--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#682983: fortune-mod: FTBFS on most architectures, missing recode

[Michael Terry]

Package: fortune-mod
Version: 1:1.99.1-5
Severity: serious
Tags: patch
Justification: 4
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

fortune-mod fails to build on most architectures right now, because the build
uses the 'recode' executable, but it is only marked as Build-Depends-Indep.

Here's a patch from Ubuntu that fixes the FTBFS by moving recode to be a
normal Build-Depend.  Thanks for considering it.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-6-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru fortune-mod-1.99.1/debian/changelog fortune-mod-1.99.1/debian/changelog
diff -Nru fortune-mod-1.99.1/debian/control fortune-mod-1.99.1/debian/control
--- fortune-mod-1.99.1/debian/control	2012-07-07 12:45:13.0 -0400
+++ fortune-mod-1.99.1/debian/control	2012-07-27 13:15:09.0 -0400
@@ -4,8 +4,7 @@
 Maintainer: Debian QA Group packa...@qa.debian.org
 Standards-Version: 3.9.3
 Build-Depends: debhelper (= 9), dpkg-dev (= 1.16.1),
- librecode-dev
-Build-Depends-Indep: recode
+ librecode-dev, recode
 
 Package: fortune-mod
 Architecture: any

Bug#682873: ykclient: Don't require Internet for tests

[Michael Terry]

Package: ykclient
Version: 2.8-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

I believe it is Debian policy to not have builds require Internet access.
It seems like several ports are failing due to ykclient's tests as well as
all of Ubuntu's buildds.  Attached is a patch to disable the tests that
need Internet while leaving the rest alone.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-6-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u ykclient-2.8/debian/rules ykclient-2.8/debian/rules
--- ykclient-2.8/debian/rules
+++ ykclient-2.8/debian/rules
@@ -20 +20,2 @@
-#override_dh_auto_test:
+override_dh_auto_test:
+	dh_auto_test -- CFLAGS=-DTEST_WITHOUT_INTERNET 
diff -u ykclient-2.8/debian/changelog ykclient-2.8/debian/changelog

Bug#682639: tunnelx: FTBFS: xargs: /usr/lib/jvm/default-java/bin/javac: No such file or directory

[Michael Terry]

Package: tunnelx
Version: 20110801-4
Followup-For: Bug #682639
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

This patch should fix it.  /usr/lib/jvm/default-java is provided by
default-jre-headless.  Which is Depended on by default-jre, which is
Depended on by default-jdk.  So if you switch the hard-coded Depend on
openjdk-6-jdk to default-jdk, you should be fine.  Built for me.

Alternatively, I suppose you could change from the default-java symlink
to hard-coding openjdk-6 in debian/rules too.  But this way seems nicer,
since the package doesn't seem to require openjdk-6(?).

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-6-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u tunnelx-20110801/debian/changelog tunnelx-20110801/debian/changelog
diff -u tunnelx-20110801/debian/control tunnelx-20110801/debian/control
--- tunnelx-20110801/debian/control
+++ tunnelx-20110801/debian/control
@@ -2,7 +2,7 @@
 Section: science
 Priority: extra
 Maintainer: Wookey woo...@debian.org
-Build-Depends-Indep: debhelper (= 7.0.50~), javahelper (= 0.31), openjdk-6-jdk, libjava3d-java, docbook-to-man
+Build-Depends-Indep: debhelper (= 7.0.50~), javahelper (= 0.31), default-jdk, libjava3d-java, docbook-to-man
 Standards-Version: 3.9.3
 Homepage: http://www.freesteel.co.uk/wiki/index.php/Tunnel
 Vcs-Browser: http://tunnelx.hg.sourceforge.net:8000/hgroot/tunnelx/tunnelx 

Bug#682805: insighttoolkit: sanity check yields false negatives

[Michael Terry]

Package: insighttoolkit
Version: 3.20.1+git20120521-1
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

In sanity checks made by the nrrd utility code, don't bother
testing signal NaN clases, because GCC does not guarantee to
preserve signal-ness across float conversions (and doesn't on i386).

This is contributing to a FTBFS in plastimatch.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-6-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru insighttoolkit-3.20.1+git20120521/debian/patches/series insighttoolkit-3.20.1+git20120521/debian/patches/series
--- insighttoolkit-3.20.1+git20120521/debian/patches/series	2012-07-24 14:51:59.0 -0400
+++ insighttoolkit-3.20.1+git20120521/debian/patches/series	2012-07-25 14:06:35.0 -0400
@@ -14,3 +14,4 @@
 ITKNrrdIOmath.patch
 gcc-4.7.patch
 tiff5.patch
+snan-sanity.patch
diff -Nru insighttoolkit-3.20.1+git20120521/debian/patches/snan-sanity.patch insighttoolkit-3.20.1+git20120521/debian/patches/snan-sanity.patch
--- insighttoolkit-3.20.1+git20120521/debian/patches/snan-sanity.patch	1969-12-31 19:00:00.0 -0500
+++ insighttoolkit-3.20.1+git20120521/debian/patches/snan-sanity.patch	2012-07-25 14:07:58.0 -0400
@@ -0,0 +1,17 @@
+Index: insighttoolkit-3.20.1+git20120521/Utilities/NrrdIO/sane.c
+===
+--- insighttoolkit-3.20.1+git20120521.orig/Utilities/NrrdIO/sane.c	2012-05-03 12:11:41.0 -0400
 insighttoolkit-3.20.1+git20120521/Utilities/NrrdIO/sane.c	2012-07-25 14:07:50.984048478 -0400
+@@ -112,7 +112,11 @@
+ #if defined(__APPLE__) || ( defined(_MSC_VER)  _MSC_VER = 1400 ) 
+  /* don't compare airFP_SNAN */
+ #else
+-  airFP_SNAN == airFPClass_f(AIR_SNAN) 
++ /* we don't bother checking for 
++airFP_SNAN == airFPClass_f(AIR_SNAN) because
++the signal-ness of the NaN is not preserved in
++float conversion */
++ /*  airFP_SNAN == airFPClass_f(AIR_SNAN) */
+ #endif
+   airFP_QNAN == airFPClass_d(AIR_NAN)
+   airFP_QNAN == airFPClass_d(AIR_QNAN) )) {

Bug#682809: plastimatch: Consider using unversioned libtiff-dev instead of libtiff4-dev

[Michael Terry]

Package: plastimatch
Version: 1.5.11+dfsg0-1
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

It makes libtiff transitions (like the upcoming libtiff5 one) easier if
the unversioned virtual package libtiff-dev is used instead of libtiff4-dev.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-6-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru plastimatch-1.5.11+dfsg0/debian/control plastimatch-1.5.11+dfsg0/debian/control
--- plastimatch-1.5.11+dfsg0/debian/control	2012-06-13 22:06:29.0 -0400
+++ plastimatch-1.5.11+dfsg0/debian/control	2012-07-25 16:41:19.0 -0400
@@ -11,7 +11,7 @@
   libgdcm2-dev, 
   libinsighttoolkit3-dev (= 3.20.0-15), 
   libpng-dev, 
-  libtiff4-dev, 
+  libtiff-dev, 
   uuid-dev, 
   zlib1g-dev
 Standards-Version: 3.9.3

Bug#682714: vmtk: Please use unversioned libtiff-dev rather than libtiff4-dev

[Michael Terry]

Package: vmtk
Version: 1.0.1-1
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

It makes libtiff transitions (like the upcoming libtiff5 one) easier if
the unversioned virtual package libtiff-dev is used instead of libtiff4-dev.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-5-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru vmtk-1.0.1/debian/changelog vmtk-1.0.1/debian/changelog
diff -Nru vmtk-1.0.1/debian/control vmtk-1.0.1/debian/control
--- vmtk-1.0.1/debian/control	2012-06-10 03:40:28.0 -0400
+++ vmtk-1.0.1/debian/control	2012-07-24 17:09:11.0 -0400
@@ -6,7 +6,7 @@
 Uploaders: Johannes Ring joha...@simula.no
 Build-Depends: cdbs (= 0.4.49), debhelper (= 7), cmake,
  python-support (= 0.6.4), python-dev, libvtk5-dev, python-vtk,
- libinsighttoolkit3-dev | libinsighttoolkit-dev, libjpeg-dev, libtiff4-dev,
+ libinsighttoolkit3-dev | libinsighttoolkit-dev, libjpeg-dev, libtiff-dev,
  libfreetype6-dev, libxext-dev, libpng-dev, libexpat1-dev, uuid-dev,
  libgdcm2-dev, libvtkgdcm2-dev, libopenjpeg-dev, libssl-dev, libvtk5-qt4-dev,
  libvtk-java

Bug#682238: opencv: Please Depend on unversioned libtiff-dev instead of libtiff4-dev

[Michael Terry]

You're right, I realized that right after I sent it in.  But the patch 
is still fine, without the version check, as long as you're willing to 
drop that.

-mt

On Mon 23 Jul 2012 05:44:30 EDT, Julien Cristau wrote:

On Fri, Jul 20, 2012 at 11:20:24 -0400, Michael Terry wrote:


diff -Nru opencv-2.3.1/debian/changelog opencv-2.3.1/debian/changelog
diff -Nru opencv-2.3.1/debian/control opencv-2.3.1/debian/control
--- opencv-2.3.1/debian/control 2012-06-27 22:36:53.0 -0400
+++ opencv-2.3.1/debian/control 2012-07-20 11:17:10.0 -0400
@@ -9,7 +9,7 @@
   libjasper-dev (= 1.900.1),
   libjpeg-dev,
   libpng-dev,
- libtiff4-dev (= 3.9.4),
+ libtiff-dev (= 3.9.4),
   libopenexr-dev (= 1.4.0),
   libraw1394-dev [linux-any],
   libdc1394-22-dev [linux-any],
@@ -478,7 +478,7 @@
libjasper-dev (= 1.900.1),
libjpeg-dev,
libpng12-dev,
-   libtiff4-dev (= 3.9.4),
+   libtiff-dev (= 3.9.4),
libopenexr-dev (= 1.4.0),
libraw1394-dev [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386],
libdc1394-22-dev [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386],


This patch is broken.  Versioned dependencies on virtual packages can't
work.

Cheers,
Julien



--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#682238: opencv: Please Depend on unversioned libtiff-dev instead of libtiff4-dev

[Michael Terry]

Package: opencv
Version: 2.3.1-11
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

It makes libtiff transitions (like the upcoming libtiff5 one) easier if the
unversioned virtual package libtiff-dev is used instead of libtiff4-dev.

Attached is a patch by Rohan Garg rohang...@kubuntu.org.  Thanks for
considering it.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-5-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru opencv-2.3.1/debian/changelog opencv-2.3.1/debian/changelog
diff -Nru opencv-2.3.1/debian/control opencv-2.3.1/debian/control
--- opencv-2.3.1/debian/control	2012-06-27 22:36:53.0 -0400
+++ opencv-2.3.1/debian/control	2012-07-20 11:17:10.0 -0400
@@ -9,7 +9,7 @@
  libjasper-dev (= 1.900.1),
  libjpeg-dev,
  libpng-dev,
- libtiff4-dev (= 3.9.4),
+ libtiff-dev (= 3.9.4),
  libopenexr-dev (= 1.4.0),
  libraw1394-dev [linux-any],
  libdc1394-22-dev [linux-any],
@@ -478,7 +478,7 @@
 		libjasper-dev (= 1.900.1),
 		libjpeg-dev,
 		libpng12-dev,
-		libtiff4-dev (= 3.9.4),
+		libtiff-dev (= 3.9.4),
 		libopenexr-dev (= 1.4.0),
 		libraw1394-dev [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386],
 		libdc1394-22-dev [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386],

Bug#682275: libimobiledevice: Adapt to libusbmuxd API changes

[Michael Terry]

Package: libimobiledevice
Version: 1.1.1-4
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

With the latest libusbmuxd, libimobiledevice FTBFS.  They renamed parts of
their API.  The attached patch, adapted from upstream git, deals with that.

Alternatively, updating to at least 1.1.3 would do it.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-5-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru libimobiledevice-1.1.1/debian/changelog libimobiledevice-1.1.1/debian/changelog
diff -Nru libimobiledevice-1.1.1/debian/patches/07_git_libusbmuxd_api.patch libimobiledevice-1.1.1/debian/patches/07_git_libusbmuxd_api.patch
--- libimobiledevice-1.1.1/debian/patches/07_git_libusbmuxd_api.patch	1969-12-31 19:00:00.0 -0500
+++ libimobiledevice-1.1.1/debian/patches/07_git_libusbmuxd_api.patch	2012-07-20 17:36:27.0 -0400
@@ -0,0 +1,54 @@
+From 0f5d47beb4a278d3eb25aadff9abfdac80d525c2 Mon Sep 17 00:00:00 2001
+From: Martin Szulecki
+Date: Sat, 07 Apr 2012 23:42:07 +
+Subject: idevice: Bump libusbmuxd dependency to 1.0.8 and adopt idevice.c to API changes
+
+---
+Index: libimobiledevice-1.1.1/configure.ac
+===
+--- libimobiledevice-1.1.1.orig/configure.ac	2012-07-20 12:12:57.0 -0400
 libimobiledevice-1.1.1/configure.ac	2012-07-20 17:09:30.226564699 -0400
+@@ -26,7 +26,7 @@
+ AC_PROG_LIBTOOL
+ 
+ # Checks for libraries.
+-PKG_CHECK_MODULES(libusbmuxd, libusbmuxd = 0.1.4)
++PKG_CHECK_MODULES(libusbmuxd, libusbmuxd = 1.0.8)
+ PKG_CHECK_MODULES(libglib2, glib-2.0 = 2.14.1)
+ PKG_CHECK_MODULES(libgthread2, gthread-2.0 = 2.14.1)
+ PKG_CHECK_MODULES(libgnutls, gnutls = 1.6.3 )
+Index: libimobiledevice-1.1.1/src/idevice.c
+===
+--- libimobiledevice-1.1.1.orig/src/idevice.c	2011-04-25 04:40:06.0 -0400
 libimobiledevice-1.1.1/src/idevice.c	2012-07-20 17:35:56.558614368 -0400
+@@ -37,7 +37,7 @@
+ 	idevice_event_t ev;
+ 
+ 	ev.event = event-event;
+-	ev.uuid = event-device.uuid;
++	ev.uuid = event-device.udid;
+ 	ev.conn_type = CONNECTION_USBMUXD;
+ 
+ 	if (event_cb) {
+@@ -110,7 +110,7 @@
+ 
+ 	for (i = 0; dev_list[i].handle  0; i++) {
+ 		newlist = realloc(*devices, sizeof(char*) * (newcount+1));
+-		newlist[newcount++] = strdup(dev_list[i].uuid);
++		newlist[newcount++] = strdup(dev_list[i].udid);
+ 		*devices = newlist;
+ 	}
+ 	usbmuxd_device_list_free(dev_list);
+@@ -158,10 +158,10 @@
+ idevice_error_t idevice_new(idevice_t * device, const char *uuid)
+ {
+ 	usbmuxd_device_info_t muxdev;
+-	int res = usbmuxd_get_device_by_uuid(uuid, muxdev);
++	int res = usbmuxd_get_device_by_udid(uuid, muxdev);
+ 	if (res  0) {
+ 		idevice_t phone = (idevice_t) malloc(sizeof(struct idevice_private));
+-		phone-uuid = strdup(muxdev.uuid);
++		phone-uuid = strdup(muxdev.udid);
+ 		phone-conn_type = CONNECTION_USBMUXD;
+ 		phone-conn_data = (void*)(long)muxdev.handle;
+ 		*device = phone;
diff -Nru libimobiledevice-1.1.1/debian/patches/series libimobiledevice-1.1.1/debian/patches/series
--- libimobiledevice-1.1.1/debian/patches/series	2012-03-18 11:26:17.0 -0400
+++ libimobiledevice-1.1.1/debian/patches/series	2012-07-20 17:09:57.0 -0400
@@ -5,3 +5,4 @@
 04_libplist_DSO_linking.patch
 05_remove_gcry_need.patch
 06_git_ios5_handle_error.patch
+07_git_libusbmuxd_api.patch

Bug#677210: python-magics++: broken symlinks: /usr/lib/python*/*-packages/Magics/_Magics.so.0

[Michael Terry]

Package: magics++
Version: 2.14.11-4
Followup-For: Bug #677210
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

I've applied this patch in Ubuntu (where the symlinks were also causing
dh_python2 to crash and thus cause a FTBFS).

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-4-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru magics++-2.14.11/debian/changelog magics++-2.14.11/debian/changelog
diff -Nru magics++-2.14.11/debian/rules magics++-2.14.11/debian/rules
--- magics++-2.14.11/debian/rules	2012-05-23 04:08:44.0 -0400
+++ magics++-2.14.11/debian/rules	2012-07-19 14:39:55.0 -0400
@@ -64,6 +64,7 @@
 	$(MAKE) -C tools prefix=$(shell pwd)/debian/tmp/usr install
 	cp tools/mapgen_clip debian/tmp/usr/bin
 	find debian -name '*.la' -delete
+	find debian -name '_Magics.so.0' -delete  # Bogus symlinks
 	dh_python2 
 	dh_numpy -p python-magics++
 	# remove fonts that are present in dejavu-ttf

Bug#682176: devil: Depend on unversioned libtiff-dev instead of libtiff4-dev

[Michael Terry]

Package: devil
Version: 1.7.8-6.1
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

It makes it easier to handle libtiff transitions (like the upcoming libtiff5
one) if the unversioned -dev package is used instead of libtiff4-dev.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-4-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u devil-1.7.8/debian/control devil-1.7.8/debian/control
--- devil-1.7.8/debian/control
+++ devil-1.7.8/debian/control
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Bradley Smith bradsm...@debian.org
-Build-Depends: debhelper (= 7), libpng12-dev, zlib1g-dev, libjpeg-dev, libtiff4-dev, libmng-dev, liblcms1-dev, freeglut3-dev, libgl1-mesa-dev | libgl-dev, libsdl1.2-dev, liballegro4.2-dev, quilt
+Build-Depends: debhelper (= 7), libpng12-dev, zlib1g-dev, libjpeg-dev, libtiff-dev, libmng-dev, liblcms1-dev, freeglut3-dev, libgl1-mesa-dev | libgl-dev, libsdl1.2-dev, liballegro4.2-dev, quilt
 Standards-Version: 3.8.3
 Homepage: http://openil.sourceforge.net/
 Vcs-Git: http://git.brad-smith.co.uk/git/debian/pkg-devil.git
@@ -27,7 +27,7 @@
 Package: libdevil-dev
 Section: libdevel
 Architecture: any
-Depends: libdevil1c2 (= ${binary:Version}), libtiff4-dev, liblcms1-dev, ${misc:Depends}
+Depends: libdevil1c2 (= ${binary:Version}), libtiff-dev, liblcms1-dev, ${misc:Depends}
 Description: Cross-platform image loading and manipulation toolkit
  Developer's Image Library (DevIL) is a programmer's toolkit which can
  load, save and convert a wide variety of image formats.  It also offers

Bug#681900: sampleicc: Use unversioned libtiff-dev instead of libtiff4-dev

[Michael Terry]

Package: sampleicc
Version: 1.6.4-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

It makes it easier to do libtiff transitions (like the upcoming libtiff5 one)
if the unversioned virtual libtiff-dev is used.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-4-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru sampleicc-1.6.4/debian/changelog sampleicc-1.6.4/debian/changelog
diff -Nru sampleicc-1.6.4/debian/control sampleicc-1.6.4/debian/control
--- sampleicc-1.6.4/debian/control	2011-12-24 09:35:22.0 -0500
+++ sampleicc-1.6.4/debian/control	2012-07-17 11:37:18.0 -0400
@@ -1,7 +1,7 @@
 Source: sampleicc
 Priority: optional
 Maintainer: Rene Engelhard r...@debian.org
-Build-Depends: debhelper (= 8.0.0), autotools-dev, libtiff4-dev
+Build-Depends: debhelper (= 8.0.0), autotools-dev, libtiff-dev
 Standards-Version: 3.9.2
 Section: libs
 Homepage: http://sampleicc.sourceforge.net

Bug#681904: lcms2: Use unversioned libtiff-dev instead of libtiff4-dev

[Michael Terry]

Package: lcms2
Version: 2.2+git20110628-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

It makes libtiff transitions (like the upcoming libtiff5 one) easier if
the unversioned virtual libtiff-dev is used instead of libtiff4-dev.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-4-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru lcms2-2.2+git20110628/debian/changelog lcms2-2.2+git20110628/debian/changelog
diff -Nru lcms2-2.2+git20110628/debian/control lcms2-2.2+git20110628/debian/control
--- lcms2-2.2+git20110628/debian/control	2011-08-28 07:42:58.0 -0400
+++ lcms2-2.2+git20110628/debian/control	2012-07-17 11:56:58.0 -0400
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Oleksandr Moskalenko ma...@debian.org
-Build-Depends: debhelper (= 7.0.50~), autotools-dev, libjpeg-dev, libtiff4-dev, zlib1g-dev, quilt
+Build-Depends: debhelper (= 7.0.50~), autotools-dev, libjpeg-dev, libtiff-dev, zlib1g-dev, quilt
 Standards-Version: 3.9.2
 Homepage: http://www.littlecms.com/
 #Vcs-Git: git://git.debian.org/collab-maint/liblcms2.git

Bug#681913: lcms: Depend on unversioned libtiff-dev instead of libtiff4-dev

[Michael Terry]

Package: lcms
Version: 1.19.dfsg-1.1
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

It makes it easier for libtiff transitions, like the upcoming libtiff5 one,
if the unversioned virtual libtiff-dev is used instead of libtiff4-dev.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-4-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u lcms-1.19.dfsg/debian/control lcms-1.19.dfsg/debian/control
--- lcms-1.19.dfsg/debian/control
+++ lcms-1.19.dfsg/debian/control
@@ -1,7 +1,7 @@
 Section: libs
 Priority: optional
 Maintainer: Oleksandr Moskalenko ma...@debian.org
-Build-Depends: debhelper ( 8.1.3), libtiff4-dev, libjpeg-dev, zlib1g-dev, python-all-dev (= 2.3.5-11), swig
+Build-Depends: debhelper ( 8.1.3), libtiff-dev, libjpeg-dev, zlib1g-dev, python-all-dev (= 2.3.5-11), swig
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/lcms/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/lcms/trunk/?op=log

Bug#681914: djvulibre: Support libtiff5-dev

[Michael Terry]

Package: djvulibre
Version: 3.5.25.3-1
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

libtiff5-dev is available, and will be the default post-wheezy.  Here's a
patch to prefer it.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-4-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru djvulibre-3.5.25.3/debian/changelog djvulibre-3.5.25.3/debian/changelog
diff -Nru djvulibre-3.5.25.3/debian/control djvulibre-3.5.25.3/debian/control
--- djvulibre-3.5.25.3/debian/control	2012-06-17 06:23:06.0 -0400
+++ djvulibre-3.5.25.3/debian/control	2012-07-17 14:07:59.0 -0400
@@ -7,7 +7,7 @@
 	   debhelper (= 9),
 	   libglib2.0-dev,
 	   libjpeg-dev,
-	   libtiff4-dev | libtiff3g-dev | libtiff-dev,
+	   libtiff5-dev | libtiff4-dev | libtiff3g-dev | libtiff-dev,
 	   librsvg2-bin | imagemagick
 Vcs-Git: git://git.debian.org/git/collab-maint/djvulibre.git
 Vcs-Browser: http://git.debian.org/?p=collab-maint/djvulibre.git

Bug#681821: libdmtx: Depend on libtiff-dev, not libtiff4-dev

[Michael Terry]

Package: libdmtx
Version: 0.7.2-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

It makes libtiff transitions (like the upcoming libtiff5 one) easier if
packages depend on libtiff-dev instead of the versioned libtiff4-dev.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-4-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru libdmtx-0.7.2/debian/changelog libdmtx-0.7.2/debian/changelog
diff -Nru libdmtx-0.7.2/debian/control libdmtx-0.7.2/debian/control
--- libdmtx-0.7.2/debian/control	2012-03-05 21:05:51.0 -0500
+++ libdmtx-0.7.2/debian/control	2012-07-16 16:18:51.0 -0400
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Roberto Lumbreras ro...@debian.org
 Build-Depends: cdbs (=0.4.93~), debhelper (= 8.1.3), autotools-dev, libpng-dev,
- libtiff4-dev, pkg-config, libmagickwand-dev
+ libtiff-dev, pkg-config, libmagickwand-dev
 Standards-Version: 3.9.3
 Homepage: http://www.libdmtx.org
 

Bug#681824: pfstools: Build-Depend on libtiff-dev, not libtiff4-dev

[Michael Terry]

Package: pfstools
Version: 1.8.5-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

It makes libtiff transitions, like the upcoming libtiff5 one, easier if an
unversioned libtiff-dev is used instead of libtiff4-dev.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-4-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru pfstools-1.8.5/debian/changelog pfstools-1.8.5/debian/changelog
diff -Nru pfstools-1.8.5/debian/control pfstools-1.8.5/debian/control
--- pfstools-1.8.5/debian/control	2012-06-30 07:27:14.0 -0400
+++ pfstools-1.8.5/debian/control	2012-07-16 16:50:42.0 -0400
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian PhotoTools Maintainers pkg-phototools-de...@lists.alioth.debian.org
 Uploaders: Sebastian Harl tok...@debian.org
-Build-Depends: debhelper (= 5), dpkg-dev (= 1.14.6), gfortran, autotools-dev, libqt4-dev, libmagick++-dev | libmagick++9-dev, libtiff4-dev, libopenexr-dev, libnetpbm10-dev, liboctave-dev, texlive-latex-base, freeglut3-dev
+Build-Depends: debhelper (= 5), dpkg-dev (= 1.14.6), gfortran, autotools-dev, libqt4-dev, libmagick++-dev | libmagick++9-dev, libtiff-dev, libopenexr-dev, libnetpbm10-dev, liboctave-dev, texlive-latex-base, freeglut3-dev
 Standards-Version: 3.9.3
 Homepage: http://pfstools.sourceforge.net/
 Vcs-Git: git://git.debian.org/git/pkg-phototools/pfstools.git

Bug#681356: npm: Add build-essential as a Recommends

[Michael Terry]

Package: npm
Version: 1.1.4~dfsg-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

In Ubuntu, we had a request to add build-essential as a npm Recommends
because it is often needed when you use npm install (e.g for npm
install in the root directory when you npm-install(ed) express)  Here's
the patch that resulted.

(Ubuntu bug https://bugs.launchpad.net/ubuntu/+source/npm/+bug/981213)

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-4-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru npm-1.1.4~dfsg/debian/changelog npm-1.1.4~dfsg/debian/changelog
diff -Nru npm-1.1.4~dfsg/debian/control npm-1.1.4~dfsg/debian/control
--- npm-1.1.4~dfsg/debian/control	2012-04-07 04:17:24.0 -0400
+++ npm-1.1.4~dfsg/debian/control	2012-07-12 11:28:58.0 -0400
@@ -33,6 +33,7 @@
  node-tar,
  node-which,
  ${misc:Depends}
+Recommends: build-essential
 Description: package manager for Node.js
  Node.js is an event-based server-side javascript engine.
  .
diff -Nru npm-1.1.4~dfsg/debian/control.in npm-1.1.4~dfsg/debian/control.in
--- npm-1.1.4~dfsg/debian/control.in	2012-04-07 03:42:14.0 -0400
+++ npm-1.1.4~dfsg/debian/control.in	2012-07-12 11:28:58.0 -0400
@@ -31,6 +31,7 @@
  node-tar,
  node-which,
  ${misc:Depends}
+Recommends: build-essential
 Description: package manager for Node.js
  Node.js is an event-based server-side javascript engine.
  .

Bug#681126: [Pkg-gmagick-im-team] Bug#681126: imagemagick: Use built convert instead of graphicmagick's

[Michael Terry]

On 11/07/12 09:26, roucaries bastien wrote:

On Tue, Jul 10, 2012 at 10:01 PM, Michael Terry
michael.te...@canonical.com wrote:

Package: imagemagick
Version: 8:6.7.7.10-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

I noticed that you use graphicmagick's compat package to generate an xpm
out of the svg images.  You comment that you couldn't get the delegates
to be found.  For me, defining MAGICK_CODER_MODULE_PATH fixed that, so
that the graphicmagick build dependency can be dropped.

Thanks for considering the patch.

Too late for next stable.

Have you tried on pbuilder chroot ?

If yes, will consider this patch for next revision.


Yes, it works both locally in a pbuilder and on Ubuntu's buildd.


BTW if you maintain imagemagick for ubuntu, I plan to drop external
svg support like in ubuntu, and to try to have a non X imagemagick.


I don't maintain it per se, just making some changes.

-mt



--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#681252: netscript-2.4: Don't depend on dhcp3-client

[Michael Terry]

Package: netscript-2.4
Version: 5.2.9
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

dhcp3-client is an obsolete transition package that is no longer in the
archive.  Here's a patch to switch to the replacement package
sc-dhcp-client.  Patch by Andy Whitcroft.  Thanks for considering it.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-4-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru netscript-2.4-5.2.9ubuntu1/debian/control netscript-2.4-5.2.9ubuntu2/debian/control
--- netscript-2.4-5.2.9ubuntu1/debian/control	2012-04-04 20:56:08.0 -0400
+++ netscript-2.4-5.2.9ubuntu2/debian/control	2012-07-11 13:53:55.0 -0400
@@ -7,13 +7,13 @@
 
 Package: netscript-2.4
 Architecture: all
-Depends: iproute (= 20001007), bridge-utils (= 0.9.3), iptables, netbase, bash (= 2.03), dhcp-client | dhcp3-client, ${misc:Depends}
+Depends: iproute (= 20001007), bridge-utils (= 0.9.3), iptables, netbase, bash (= 2.03), dhcp-client | isc-dhcp-client, ${misc:Depends}
 Provides: netscript, ifupdown
 Conflicts: netscript, netscript-2.2, ifupdown
 Replaces: netscript, ifupdown
@@ -40,7 +40,7 @@
 
 Package: netscript-2.4-upstart
 Architecture: all
-Depends: iproute (= 20001007), bridge-utils (= 0.9.3), iptables | iptables-router (= 1.2.3), netbase, bash (= 2.03), dhcp-client | dhcp3-client, upstart, ${misc:Depends}
+Depends: iproute (= 20001007), bridge-utils (= 0.9.3), iptables | iptables-router (= 1.2.3), netbase, bash (= 2.03), dhcp-client | isc-dhcp-client, upstart, ${misc:Depends}
 Provides: netscript, ifupdown
 Conflicts: netscript, netscript-2.2, ifupdown
 Replaces: netscript, netscript-2.4, ifupdown

Bug#681257: python-gevent: Enable test suite

[Michael Terry]

Package: python-gevent
Severity: minor
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal

Dear Maintainer,

I was looking at python-gevent recently and noticed it seems to have a bit of
a test suite in greentest/.  It would be nice to enable them if possible.

I got as far as something along the following lines:

cd greentest  PYTHONPATH=../debian/tmp/usr/lib/python2.7/dist-packages/:. 
./testrunner.py --no-db

But that still had various failures.  Maybe the test suite is just busted,
but I didn't have the expertise with the code to determine that.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-4-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.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#681077: libvigraimpex: Build-Depend on libtiff5-dev

[Michael Terry]

Package: libvigraimpex
Version: 1.7.1+dfsg1-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

libtiff5 is now available (source tiff), and it would be nice if libvigraimpex
used that instead of libtiff4 (source tiff3).  The attached patch makes the
change.  Thanks for considering it.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-3-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru libvigraimpex-1.7.1+dfsg1/debian/control libvigraimpex-1.7.1+dfsg1/debian/control
--- libvigraimpex-1.7.1+dfsg1/debian/control	2012-06-14 18:06:08.0 -0400
+++ libvigraimpex-1.7.1+dfsg1/debian/control	2012-07-10 09:14:40.0 -0400
@ -4,7 +4,7 @@
 Maintainer: Debian QA Group packa...@qa.debian.org
 Build-Depends: dpkg-dev (= 1.15.3~), debhelper (= 7.0.50~),
   cmake,
-  libfftw3-dev, libpng-dev, libjpeg-dev, libtiff4-dev,
+  libfftw3-dev, libpng-dev, libjpeg-dev, libtiff5-dev,
   python-all-dev, python-numpy, libboost-python-dev, python-nose
 Build-Depends-Indep:
   python, python-sphinx, doxygen, texlive-latex-base, ghostscript
@@ -18,7 +18,7 @@
 Architecture: any
 Depends: ${misc:Depends}, ${python:Depends},
   libvigraimpex3 (= ${binary:Version}),
-  libfftw3-dev, libpng12-dev, libjpeg-dev, libtiff4-dev
+  libfftw3-dev, libpng12-dev, libjpeg-dev, libtiff5-dev
 Suggests: libvigraimpex-doc
 Description: development files for the C++ computer vision library
  Vision with Generic Algorithms (VIGRA) is a computer vision library

Bug#681079: sane-backends: Build-Depend on libtiff5-dev

[Michael Terry]

Package: sane-backends
Version: 1.0.22-7
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

libtiff5 is now available (source tiff), and it would be nice if sane-backends
used that instead of libtiff4 (source tiff3).  The attached patch makes the
change.  Thanks for considering it.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-3-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru sane-backends-1.0.22/debian/control sane-backends-1.0.22/debian/control
--- sane-backends-1.0.22/debian/control	2011-12-04 23:22:04.0 -0500
+++ sane-backends-1.0.22/debian/control	2012-07-10 09:18:48.0 -0400
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Julien BLACHE jbla...@debian.org
 Standards-Version: 3.9.2
-Build-Depends: debhelper (= 8.1.3), po-debconf, libv4l-dev [linux-any], libgphoto2-2-dev, libltdl3-dev, libjpeg-dev, libtiff4-dev, libusb-dev (= 2:0.1.10a-9) [!hurd-i386], libieee1284-3-dev (= 0.2.10-5) [!hurd-i386], libcam-dev [kfreebsd-any], libavahi-client-dev (= 0.6.4), gettext, texlive, texlive-latex-extra, autotools-dev, pkg-config, chrpath, xutils-dev
+Build-Depends: debhelper (= 8.1.3), po-debconf, libv4l-dev [linux-any], libgphoto2-2-dev, libltdl3-dev, libjpeg-dev, libtiff5-dev, libusb-dev (= 2:0.1.10a-9) [!hurd-i386], libieee1284-3-dev (= 0.2.10-5) [!hurd-i386], libcam-dev [kfreebsd-any], libavahi-client-dev (= 0.6.4), gettext, texlive, texlive-latex-extra, autotools-dev, pkg-config, chrpath, xutils-dev
 Homepage: http://www.sane-project.org
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/sane-backends/ubuntu
 
@@ -76,7 +76,7 @@
 Package: libsane-dev
 Section: libdevel
 Architecture: any
-Depends: libsane (= ${binary:Version}), libjpeg-dev, libtiff4-dev, libusb-dev (= 1:0.1.6a-1) [!hurd-i386], libieee1284-3-dev (= 0.2.10-5) [!hurd-i386], libcam-dev [kfreebsd-any], libgphoto2-2-dev, libv4l-dev [linux-any], libavahi-client-dev, pkg-config, ${misc:Depends}
+Depends: libsane (= ${binary:Version}), libjpeg-dev, libtiff5-dev, libusb-dev (= 1:0.1.6a-1) [!hurd-i386], libieee1284-3-dev (= 0.2.10-5) [!hurd-i386], libcam-dev [kfreebsd-any], libgphoto2-2-dev, libv4l-dev [linux-any], libavahi-client-dev, pkg-config, ${misc:Depends}
 Suggests: libsane-extras-dev (= 1.0.22.1)
 Replaces: libsane-extras-dev ( 1.0.18.14)
 Description: API development library for scanners [development files]

Bug#681081: poppler: Build-Depend on libtiff5-dev

[Michael Terry]

Package: poppler
Version: 0.20.1-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

libtiff5 is now available (source tiff), and it would be nice if poppler
used that instead of libtiff4 (source tiff3).  The attached patch makes the
change.  Thanks for considering it.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-3-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru poppler-0.20.1/debian/control poppler-0.20.1/debian/control
--- poppler-0.20.1/debian/control	2012-06-21 23:19:48.0 -0400
+++ poppler-0.20.1/debian/control	2012-07-10 09:48:49.0 -0400
@@ -16,7 +16,7 @@
libcairo2-dev (= 1.10.0),
libjpeg-dev,
libpng-dev,
-   libtiff-dev,
+   libtiff5-dev,
liblcms2-dev,
libfreetype6-dev,
gtk-doc-tools (= 1.14),
@@ -63,7 +63,7 @@
 Suggests: libfreetype6-dev,
   libopenjpeg-dev,
   libpng-dev,
-  libtiff-dev
+  libtiff5-dev
 Description: PDF rendering library -- private development files
  Poppler is a PDF rendering library based on Xpdf PDF viewer.
  .

Bug#681081: poppler: Build-Depend on libtiff5-dev

[Michael Terry]

On Tue 10 Jul 2012 10:18:16 EDT, Pino Toscano wrote:

What's the rationale for deviating from the default tiff currently used
in Debian?


Hi!  In Ubuntu, the rush is just so that we could drop libtiff4 from 
main for 12.10.  That is, it's worth the temporary delta for packages 
in main, in order to avoid having two libtiffs in main.


I just assumed Debian packages wouldn't mind the upgrade either, hence 
throwing the patch over.  But if you've got your own migration path in 
order already, we can just sync up after 12.10.  Thanks!


-mt



--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#681111: imagemagick: Use fftw3-dev, not fftw-dev

[Michael Terry]

Package: imagemagick
Version: 8:6.7.7.10-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

The fftw-dev package refers to fftw2, which is an unmaintained version of
the fftw project.  fftw3-dev is the modern version, and the only one that
imagemagick even checks for.  If you check your build logs, you'll see that
imagemagick did not find fftw3 and so didn't enable fftw support.

Here's a patch to use fftw3-dev instead.  Thanks for considering it.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-3-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru imagemagick-6.7.7.10/debian/control imagemagick-6.7.7.10/debian/control
--- imagemagick-6.7.7.10/debian/control	2012-07-10 11:21:04.0 -0400
+++ imagemagick-6.7.7.10/debian/control	2012-07-10 13:35:32.0 -0400
@@ -9,7 +9,7 @@
  Vincent Fourmond fourm...@debian.org
 Standards-Version: 3.9.3
 Build-Depends: chrpath, debhelper (= 9~), ghostscript, libbz2-dev,
- libdjvulibre-dev, libexif-dev, fftw-dev, libfreetype6-dev, 
+ libdjvulibre-dev, libexif-dev, fftw3-dev, libfreetype6-dev, 
 # libgraphviz-dev, incompatible license against fftw
  libjasper-dev, libjpeg-dev, liblcms2-dev, liblqr-1-0-dev, libltdl-dev,
  libopenexr-dev, libperl-dev, libpng-dev, librsvg2-dev, libtiff5-dev,

Bug#681126: imagemagick: Use built convert instead of graphicmagick's

[Michael Terry]

Package: imagemagick
Version: 8:6.7.7.10-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

I noticed that you use graphicmagick's compat package to generate an xpm
out of the svg images.  You comment that you couldn't get the delegates
to be found.  For me, defining MAGICK_CODER_MODULE_PATH fixed that, so
that the graphicmagick build dependency can be dropped.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-3-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru imagemagick-6.7.7.10/debian/changelog imagemagick-6.7.7.10/debian/changelog
diff -Nru imagemagick-6.7.7.10/debian/control imagemagick-6.7.7.10/debian/control
--- imagemagick-6.7.7.10/debian/control	2012-07-10 13:36:09.0 -0400
+++ imagemagick-6.7.7.10/debian/control	2012-07-10 15:55:47.0 -0400
@@ -14,8 +14,7 @@
  libjasper-dev, libjpeg-dev, liblcms2-dev, liblqr-1-0-dev, libltdl-dev,
  libopenexr-dev, libperl-dev, libpng-dev, librsvg2-dev, libtiff5-dev,
  libwmf-dev, libx11-dev, libxext-dev, libxml2-dev, libxt-dev, pkg-config,
- zlib1g-dev, liblzma-dev, libpango1.0-dev, librsvg2-bin,
- graphicsmagick-imagemagick-compat
+ zlib1g-dev, liblzma-dev, libpango1.0-dev, librsvg2-bin
 Vcs-Browser: http://git.debian.org/?p=collab-maint/imagemagick.git
 Vcs-Git: git://git.debian.org/collab-maint/imagemagick.git
 Homepage: http://www.imagemagick.org/
diff -Nru imagemagick-6.7.7.10/debian/rules imagemagick-6.7.7.10/debian/rules
--- imagemagick-6.7.7.10/debian/rules	2012-07-10 11:20:42.0 -0400
+++ imagemagick-6.7.7.10/debian/rules	2012-07-10 15:02:06.0 -0400
@@ -27,10 +27,10 @@
 # This is very hackish, but should do the trick. For some reason, the
 # libtools wrapper scripts don't work.
 # And for some reasons, the delegates are missing here.
-# CONVERT = MAGICK_CONFIGURE_PATH=./config LD_LIBRARY_PATH=$(CURDIR)/magick/.libs:$(CURDIR)/wand/.libs $(CURDIR)/utilities/.libs/convert
+CONVERT = MAGICK_CONFIGURE_PATH=./config LD_LIBRARY_PATH=$(CURDIR)/magick/.libs:$(CURDIR)/wand/.libs MAGICK_CODER_MODULE_PATH=$(CURDIR)/coders/.libs $(CURDIR)/utilities/.libs/convert
 
 # ARGH, we use graphicsmagick convert to avoid painful circular dependencies...
-CONVERT = /usr/bin/convert
+# CONVERT = /usr/bin/convert
 
 build: build-stamp
 build-stamp: $(QUILT_STAMPFN)

Bug#680969: madwimax: Don't depend on obsolete dhcp3-client

[Michael Terry]

Package: madwimax
Version: 0.1.1-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

The transitional package dhcp3-client has been dropped from the archive in
favor of isc-dhcp-client.  The attached patch, written by Andy Whitcroft,
fixes madwimax's dependency.  Thanks for considering it.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-3-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u madwimax-0.1.1/debian/control madwimax-0.1.1/debian/control
--- madwimax-0.1.1/debian/control
+++ madwimax-0.1.1/debian/control
@@ -11,7 +11,7 @@
 Package: madwimax
 Architecture: any
 Depends: ${shlibs:Depends}
-Recommends: dhcp3-client | dhcp-client
+Recommends: isc-dhcp-client | dhcp-client
 Description: user-space driver for mWiMAX equipment based on Samsung CMC-730
  madwimax is an experimental reverse-engineered Linux driver for
  mobile WiMAX (802.16e) devices based on Samsung CMC-730 chip. These
diff -u madwimax-0.1.1/debian/changelog madwimax-0.1.1/debian/changelog

Bug#680976: wicd: Don't depend on obsolete dhcp3-client

[Michael Terry]

Package: wicd
Version: 1.7.2.4-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

The transitional package dhcp3-client has been dropped from the archive in
favor of isc-dhcp-client.  The attached patch, written by Andy Whitcroft,
fixes madwimax's dependency.  Thanks for considering it.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-3-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru wicd-1.7.2.4/debian/changelog wicd-1.7.2.4/debian/changelog
diff -Nru wicd-1.7.2.4/debian/control wicd-1.7.2.4/debian/control
--- wicd-1.7.2.4/debian/control	2012-05-04 04:22:54.0 -0400
+++ wicd-1.7.2.4/debian/control	2012-07-09 13:24:25.0 -0400
@@ -47,7 +47,7 @@
  , dbus
  , wpasupplicant
  , wireless-tools
- , dhcpcd | dhcp3-client | pump | udhcpc
+ , dhcpcd | isc-dhcp-client | pump | udhcpc
  , net-tools | ethtool
  , net-tools | iproute
  , adduser

Bug#680980: wifi-radar: Don't depend on obsolete dhcp3-client

[Michael Terry]

Package: wifi-radar
Version: 2.0.s08+dfsg-1.1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

The transitional package dhcp3-client has been dropped from the archive in
favor of isc-dhcp-client.  The attached patch, written by Andy Whitcroft,
fixes madwimax's dependency.  Thanks for considering it.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-3-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru wifi-radar-2.0.s08+dfsg/debian/changelog wifi-radar-2.0.s08+dfsg/debian/changelog
diff -Nru wifi-radar-2.0.s08+dfsg/debian/control wifi-radar-2.0.s08+dfsg/debian/control
--- wifi-radar-2.0.s08+dfsg/debian/control	2011-02-11 10:27:55.0 -0500
+++ wifi-radar-2.0.s08+dfsg/debian/control	2012-07-09 13:35:35.0 -0400
@@ -8,7 +8,7 @@
 
 Package: wifi-radar
 Architecture: all
-Depends: ${misc:Depends}, python, python-gtk2 (= 2.0), dhcp3-client | dhcp-client, wireless-tools, menu
+Depends: ${misc:Depends}, python, python-gtk2 (= 2.0), isc-dhcp-client | dhcp-client, wireless-tools, menu
 Recommends: wpasupplicant
 Description: graphical utility for managing Wi-Fi profiles
  WiFi Radar enables you to scan for available wireless networks and create

Bug#681009: netpbm-free: Build-Depend on libtiff5-dev

[Michael Terry]

Package: netpbm-free
Version: 2:10.0-15
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

libtiff5 is now available (source tiff), and it would be nice if netpbm-free
used that instead of libtiff4 (source tiff3).  The attached patch makes the
change.  Thanks for considering it.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-3-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u netpbm-free-10.0/debian/changelog netpbm-free-10.0/debian/changelog
diff -u netpbm-free-10.0/debian/control netpbm-free-10.0/debian/control
--- netpbm-free-10.0/debian/control
+++ netpbm-free-10.0/debian/control
@@ -4,7 +4,7 @@
 Maintainer: Andreas Barth a...@not.so.argh.org
 Uploaders: Steve McIntyre 93...@debian.org
 Standards-Version: 3.8.4
-Build-Depends: libtiff-dev, libjpeg-dev, debhelper (= 7), libpng12-dev, zlib1g-dev, flex, quilt
+Build-Depends: libtiff5-dev, libjpeg-dev, debhelper (= 7), libpng12-dev, zlib1g-dev, flex, quilt
 Homepage: http://netpbm.alioth.debian.org
 Vcs-Browser: http://git.debian.org/?p=collab-maint/netpbm-free.git
 Vcs-Cvs: :pserver:anonym...@cvs.alioth.debian.org:/cvsroot/netpbm

Bug#680425: libzerg-perl: Build-Depend on libzerg0-dev

[Michael Terry]

Package: libzerg-perl
Version: 1.0.4-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

I was looking at the NBS archive report in Ubuntu, and noticed that
libzerg-perl depended on libzerg-dev, which is a package that no longer
exists.  It got renamed to libzerg0-dev.  Please consider the attached
patch to fix this.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-3-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru libzerg-perl-1.0.4/debian/changelog libzerg-perl-1.0.4/debian/changelog
diff -Nru libzerg-perl-1.0.4/debian/control libzerg-perl-1.0.4/debian/control
--- libzerg-perl-1.0.4/debian/control	2011-09-16 08:27:29.0 -0400
+++ libzerg-perl-1.0.4/debian/control	2012-07-05 15:01:34.0 -0400
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian Med Packaging Team debian-med-packag...@lists.alioth.debian.org
 Uploaders: Laszlo Kajan lka...@rostlab.org
-Build-Depends: cdbs, debhelper (= 7.0.50~), libzerg-dev
+Build-Depends: cdbs, debhelper (= 7.0.50~), libzerg0-dev
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/rostlab/libzerg-perl/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/rostlab/libzerg-perl/trunk/

Bug#680441: quesoglc: Build-Depend on libglewmx-dev

[Michael Terry]

Package: quesoglc
Version: 0.7.2-5
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

Reviewing the Ubuntu NBS report, I noticed that quesoglc depends on
libglewmx1.6-dev, which no longer exists.  It has been replaced by the
unversioned libglewmx-dev package for 1.7 and above.

In Ubuntu, I've applied the attached patch to fix this, and it seems to work
fine.  Thanks for considering it.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-3-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru quesoglc-0.7.2/debian/changelog quesoglc-0.7.2/debian/changelog
diff -Nru quesoglc-0.7.2/debian/control quesoglc-0.7.2/debian/control
--- quesoglc-0.7.2/debian/control	2011-08-15 13:10:32.0 -0400
+++ quesoglc-0.7.2/debian/control	2012-07-05 16:56:57.0 -0400
@@ -10,7 +10,7 @@
  libfontconfig1-dev,
  libgl1-mesa-dev | libgl-dev,
  libglu1-mesa-dev | libglu-dev,
- libglewmx1.6-dev | libglewmx1.5-dev (= 1.5.1-4),
+ libglewmx-dev | libglewmx1.6-dev | libglewmx1.5-dev (= 1.5.1-4),
  dh-autoreconf
 Standards-Version: 3.9.2
 Homepage: http://quesoglc.sourceforge.net/

Bug#680444: libinfinity: Fix typo Recommends on old libinfgtk-0.5-0

[Michael Terry]

Package: libinfinity
Version: 0.5.2-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

When libinfinity was ported to gtk3, debian/control renamed the libinfgtk
package to libinfgtk3.  But once reference was missed, and now the -dbg
package Recommends a package that doesn't exist.  I wrote a patch for
Ubuntu to fix it.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-3-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru libinfinity-0.5.2/debian/changelog libinfinity-0.5.2/debian/changelog
diff -Nru libinfinity-0.5.2/debian/control libinfinity-0.5.2/debian/control
--- libinfinity-0.5.2/debian/control	2012-06-02 17:36:41.0 -0400
+++ libinfinity-0.5.2/debian/control	2012-07-05 17:22:49.0 -0400
@@ -42,7 +42,7 @@
 Architecture: any
 Pre-Depends: dpkg (= 1.15.6)
 Depends: ${misc:Depends}, libinfinity-0.5-0 (= ${binary:Version})
-Recommends: libinfgtk-0.5-0 (= ${binary:Version}), infinoted-0.5 (= ${binary:Version})
+Recommends: libinfgtk3-0.5-0 (= ${binary:Version}), infinoted-0.5 (= ${binary:Version})
 Description: infinote-based collaborative editing - debugging symbols
  libinfinity is library to build collaborative text editors. Changes
  to the text buffers are synced to all other clients over a central server.

Bug#679992: liblinear: Merely Suggest libsvm-tools

[Michael Terry]

Package: liblinear
Version: 1.8+dfsg-1
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

I was reviewing liblinear for inclusion in Ubuntu main (since nmap now
Depends on it).  And I noticed that it Recommends libsvm-tools.  For Ubuntu,
I'm dropping this to a Suggests to avoid having to promote libsvm to main
as well and because I think it is slightly more appropriate.

The only references I could see to the tools were in the man pages as
commands that one might be interested in if you were using this package.
Which sounds exactly like Suggests.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-2-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru liblinear-1.8+dfsg/debian/changelog liblinear-1.8+dfsg/debian/changelog
diff -Nru liblinear-1.8+dfsg/debian/control liblinear-1.8+dfsg/debian/control
--- liblinear-1.8+dfsg/debian/control	2011-04-11 13:27:57.0 -0400
+++ liblinear-1.8+dfsg/debian/control	2012-07-02 16:34:34.0 -0400
@@ -73,7 +73,7 @@
 ${shlibs:Depends},
 ${misc:Depends},
 liblinear1 (= ${binary:Version})
-Recommends:
+Suggests:
 libsvm-tools
 Description: Standalone applications for LIBLINEAR
  LIBLINEAR is a library for learning linear classifiers for large scale

Bug#679993: liblinear: Use dh_python2

[Michael Terry]

Package: liblinear
Version: 1.8+dfsg-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

When reviewing liblinear for inclusion in Ubuntu main (nmap now Depends on
it), I noticed that it still used python-support.

Here's a patch to convert to the now-recommended dh_python2.  Thanks for
considering it.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.5.0-2-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru liblinear-1.8+dfsg/debian/control liblinear-1.8+dfsg/debian/control
--- liblinear-1.8+dfsg/debian/control	2011-04-11 13:27:57.0 -0400
+++ liblinear-1.8+dfsg/debian/control	2012-07-02 16:47:29.0 -0400
@@ -4,13 +4,14 @@
 Uploaders: Chen-Tse Tsai ctse.t...@gmail.com
 Build-Depends:
 debhelper (= 7.0.50~),
-python-support (= 0.90),
+python-all (= 2.6.6-3~),
 libblas-dev
 Standards-Version: 3.9.2
 Section: libs
 Homepage: http://www.csie.ntu.edu.tw/~cjlin/liblinear/
 Vcs-Git: git://scm.kvr.at/git/pkg-liblinear.git
 Vcs-Browser: http://scm.kvr.at/git/?p=pkg-liblinear.git;a=summary
+X-Python-Version: = 2.5
 
 Package: liblinear-dev
 Section: libdevel
diff -Nru liblinear-1.8+dfsg/debian/pyversions liblinear-1.8+dfsg/debian/pyversions
--- liblinear-1.8+dfsg/debian/pyversions	2011-04-11 13:27:57.0 -0400
+++ liblinear-1.8+dfsg/debian/pyversions	1969-12-31 19:00:00.0 -0500
@@ -1 +0,0 @@
-2.5-
diff -Nru liblinear-1.8+dfsg/debian/rules liblinear-1.8+dfsg/debian/rules
--- liblinear-1.8+dfsg/debian/rules	2011-04-11 13:27:57.0 -0400
+++ liblinear-1.8+dfsg/debian/rules	2012-07-02 16:13:59.0 -0400
@@ -29,7 +29,7 @@
 
 
 %:
-	dh $@ 
+	dh $@ --with=python2
 
 
 # Help out backporters on platforms not supporting c++ tags in symbols files

Bug#678398: codespeak-lib: Enable test suite (as DEP-8 tests)

[Michael Terry]

Package: codespeak-lib
Version: 1.4.8-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

This package has many tests (over 300) and it would be nice to be able to
enable the test suite.  But unfortunately, there is a circular dependency
with python-pytest.

However, using DEP-8, we can avoid that circular dependency by just running
the tests after build/install.

Here's a patch I just added in Ubuntu to enable DEP-8 tests.  Thanks for
considering it!


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.4.0-5-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru codespeak-lib-1.4.8/debian/changelog codespeak-lib-1.4.8/debian/changelog
diff -Nru codespeak-lib-1.4.8/debian/control codespeak-lib-1.4.8/debian/control
--- codespeak-lib-1.4.8/debian/control	2012-05-27 17:01:24.0 -0400
+++ codespeak-lib-1.4.8/debian/control	2012-06-21 09:07:14.0 -0400
@@ -5,6 +5,7 @@
 Build-Depends: debhelper (= 7.0.50~), python-all (= 2.6.6-3~), python3-all (= 3.1.2-6~), python-setuptools, python3-setuptools
 Standards-Version: 3.9.2
 Homepage: http://codespeak.net/py/
+XS-Testsuite: autopkgtest
 XS-Python-Version: = 2.5
 X-Python3-Version:  3.3
 Vcs-Git: git://github.com/lamby/pkg-codespeak-lib.git
diff -Nru codespeak-lib-1.4.8/debian/tests/control codespeak-lib-1.4.8/debian/tests/control
--- codespeak-lib-1.4.8/debian/tests/control	1969-12-31 19:00:00.0 -0500
+++ codespeak-lib-1.4.8/debian/tests/control	2012-06-21 08:54:27.0 -0400
@@ -0,0 +1,2 @@
+Tests: unit
+Depends: python-py, python-pytest, python3-py, python3-pytest
diff -Nru codespeak-lib-1.4.8/debian/tests/unit codespeak-lib-1.4.8/debian/tests/unit
--- codespeak-lib-1.4.8/debian/tests/unit	1969-12-31 19:00:00.0 -0500
+++ codespeak-lib-1.4.8/debian/tests/unit	2012-06-21 09:02:02.0 -0400
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+# enter testing directory so that we don't accidentally find 'py' directory
+# but instead use the system py module.
+cd testing
+python -m pytest .
+python3 -m pytest .

Bug#676922: jackd2: Please use dh_python2

[Michael Terry]

Package: jackd2
Version: 1.9.8~dfsg.4+20120529git007cdc37-1testing1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

Since dh_python2 is the recommended python helper, Ubuntu has patched jackd2
to use it.  I've attached our trivial patch to make the switch.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: i386 (i686)

Kernel: Linux 3.4.0-5-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru jackd2-1.9.8~dfsg.4+20120529git007cdc37/debian/control jackd2-1.9.8~dfsg.4+20120529git007cdc37/debian/control
--- jackd2-1.9.8~dfsg.4+20120529git007cdc37/debian/control	2012-05-29 16:12:20.0 -0400
+++ jackd2-1.9.8~dfsg.4+20120529git007cdc37/debian/control	2012-06-10 10:44:16.0 -0400
@@ -7,8 +7,7 @@
  cdbs (= 0.4.93~),
  debhelper (= 8.1.3),
  d-shlibs,
- python,
- python-support,
+ python (= 2.6.6-3~),
  libsamplerate-dev,
  libasound2-dev (= 1.0.18) [linux-any],
  libdbus-1-dev,
diff -Nru jackd2-1.9.8~dfsg.4+20120529git007cdc37/debian/control.in jackd2-1.9.8~dfsg.4+20120529git007cdc37/debian/control.in
--- jackd2-1.9.8~dfsg.4+20120529git007cdc37/debian/control.in	2012-05-29 16:12:20.0 -0400
+++ jackd2-1.9.8~dfsg.4+20120529git007cdc37/debian/control.in	2012-06-10 10:44:24.0 -0400
@@ -5,8 +5,7 @@
 Uploaders: Adrian Knoth a...@drcomp.erfurt.thur.de, Jonas Smedegaard d...@jones.dk, Reinhard Tartler siret...@tauware.de
 Build-Depends: @cdbs@,
  d-shlibs,
- python,
- python-support,
+ python (= 2.6.6-3~),
  libsamplerate-dev,
  libasound2-dev (= 1.0.18) [linux-any],
  libdbus-1-dev,
diff -Nru jackd2-1.9.8~dfsg.4+20120529git007cdc37/debian/rules jackd2-1.9.8~dfsg.4+20120529git007cdc37/debian/rules
--- jackd2-1.9.8~dfsg.4+20120529git007cdc37/debian/rules	2012-05-29 16:13:08.0 -0400
+++ jackd2-1.9.8~dfsg.4+20120529git007cdc37/debian/rules	2012-06-10 10:44:41.0 -0400
@@ -89,7 +89,7 @@
 endif	
 
 binary-install/jackd2::
-	dh_pysupport -pjackd2
+	dh_python2 -pjackd2
 
 # TODO: drop libstdc++6 override when bug#374049 closed in stable
 binary-post-install/libjack0::