Bug#814536: vsftpd: add dh_apport for vsftpd

[Chris J Arges]

Package: vsftpd
Version: 3.0.3-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu xenial ubuntu-patch

Dear Maintainer,

In Ubuntu packaging we add dh_apport support. Please consider merging this into
Debian.

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-4-generic (SMP w/12 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 vsftpd-3.0.3/debian/control vsftpd-3.0.3/debian/control
--- vsftpd-3.0.3/debian/control	2015-05-25 14:32:52.0 -0500
+++ vsftpd-3.0.3/debian/control	2016-02-12 09:21:47.0 -0600
@@ -4,6 +4,7 @@
 Maintainer: Jörg Frings-Fürst 
 Build-Depends:
  debhelper (>= 9),
+ dh-apport,
  dh-systemd,
  libcap2-dev [linux-any],
  libpam0g-dev,
diff -Nru vsftpd-3.0.3/debian/rules vsftpd-3.0.3/debian/rules
--- vsftpd-3.0.3/debian/rules	2015-04-21 14:29:21.0 -0500
+++ vsftpd-3.0.3/debian/rules	2016-02-10 17:47:35.0 -0600
@@ -10,7 +10,7 @@
 endif
 
 %:
-	dh ${@} --parallel --with=systemd
+	dh ${@} --parallel --with=systemd,apport
 
 override_dh_auto_build:
 	$(MAKE) CFLAGS="$(CFLAGS) $(CPPFLAGS)" LIBS="$(LIBS)" LINK=""

Bug#793485: makedumpfile missing fadump patches

[Chris J Arges]

Package: makedumpfile
Version: 1:1.5.8-3

Ubuntu bug (LP: #1415562) introduced a patch for fadump support on
POWER8. Please re-introduce this into the debian version. The current
Ubuntu bug tracking this is (LP: #1475497).

Thanks,
--chris j arges


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

Bug#788239: crash: update of debian/tests/live to fix autopkgtest failures

[Chris J Arges]

Package: crash
Version: 7.1.1-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu wily ubuntu-patch

Dear Maintainer,

I've observed failures in Ubuntu's autopkgtest infrastructure for the crash
package. I've updated the testcase in order to ensure this is passing. 

  * debian/test/live: updates for live testcase.

Thanks for considering the patch.


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

Kernel: Linux 3.16.0-38-generic (SMP w/12 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 crash-7.1.1/debian/changelog crash-7.1.1/debian/changelog
diff -u crash-7.1.1/debian/tests/live crash-7.1.1/debian/tests/live
--- crash-7.1.1/debian/tests/live
+++ crash-7.1.1/debian/tests/live
@@ -1,4 +1,5 @@
-#/bin/sh
+#!/bin/sh
+
 set -e
 
 echo Adding linux-image debug symbols.
@@ -9,14 +10,12 @@
-tee /etc/apt/sources.list.d/ddebs.list  EOF
-deb http://ddebs.ubuntu.com/ $(lsb_release -cs)  main restricted universe multiverse
-deb http://ddebs.ubuntu.com/ $(lsb_release -cs)-security main restricted universe multiverse
-deb http://ddebs.ubuntu.com/ $(lsb_release -cs)-updates  main restricted universe multiverse
-deb http://ddebs.ubuntu.com/ $(lsb_release -cs)-proposed main restricted universe multiverse
+sudo tee /etc/apt/sources.list.d/ddebs.list  EOF
+deb http://ddebs.ubuntu.com/ $(lsb_release -cs)  main
+deb http://ddebs.ubuntu.com/ $(lsb_release -cs)-updates  main
 EOF
 # avoid stderr output
-apt-key adv --keyserver keyserver.ubuntu.com --recv-keys ECDCAD72428D7C01 21
-apt-get update
-apt-get install linux-image-$(uname -r)-dbgsym
+sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys ECDCAD72428D7C01 21
+sudo apt-get update
+sudo DEBIAN_FRONTEND=noninteractive apt-get install -y -q linux-image-$(uname -r)-dbgsym
 fi
 
 echo Testing crash on live kernel
-crash -st /usr/lib/debug/boot/vmlinux-$(uname -r)
+crash -st /usr/lib/debug/boot/vmlinux-$(uname -r) 21

Bug#776574: makedumpfile: Please enable firmware assisted dump

[Chris J Arges]

Package: makedumpfile
Version: 1:1.5.7-5
Followup-For: Bug #776574
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu vivid ubuntu-patch

Dear Louis,

Here is an updated patch that addresses issues highlighted here:
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1415562/comments/11

Thanks,
--chris


  * Fix panic_on_oops erratic handling
Closes: #776582

  [ Hari Bathini hbath...@linux.vnet.ibm.com ]
  * Add firmware assisted dump support, add changes to remove warnings.
Closes: #776574, LP: #1415562


Thanks for considering the patch.


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

Kernel: Linux 3.13.0-45-lowlatency (SMP w/12 CPU cores; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff -Nru makedumpfile-1.5.7/debian/changelog makedumpfile-1.5.7/debian/changelog
diff -Nru makedumpfile-1.5.7/debian/kdump-config makedumpfile-1.5.7/debian/kdump-config
--- makedumpfile-1.5.7/debian/kdump-config	2014-12-05 05:17:00.0 -0600
+++ makedumpfile-1.5.7/debian/kdump-config	2015-02-06 13:22:25.0 -0600
@@ -55,8 +55,19 @@
 # Constants
 vmcore_file=/proc/vmcore
 sys_kexec_crash=/sys/kernel/kexec_crash_loaded
+sys_fadump_enabled=/sys/kernel/fadump_enabled
+sys_fadump_registered=/sys/kernel/fadump_registered
 kexec_cmd_file=$KDUMP_COREDIR/kexec_cmd
 
+# DUMP_MODE = kdump/fadump
+# The default dump mode is kdump.
+DUMP_MODE=kdump
+
+# If /sys/kernel/fadump_enabled is set to `1`, use fadump as dump mechanism
+if [ -e $sys_fadump_enabled ]  [ `cat $sys_fadump_enabled` -eq 1 ]; then
+	DUMP_MODE=fadump
+fi
+
 # Utility Functions
 #
 function kdump_help()
@@ -65,14 +76,19 @@
 Usage:
 kdump-config {help|test|show|status|load|unload|savecore|propagate}
   help  - print this page
-  test  - Do a dry-run of the load command.  Show the kernels and
-  parameters that will be used and echo the kexec command.
-  The kexec command will not be executed.
-  show  - Show kdump status, kexec command, and any current parameters.
-  status- evaluate /sys/kernel/kexec_crash_loaded and print a message
+  test  - Do a dry-run of kdump kernel load command by showing
+  the kernels and parameters that will be used and echo'ing
+  the kexec command. The kexec command will not be executed.
+  If using fadump, check if required sysfs directories exist.
+  show  - Show dump mode, status, any current parameters.
+  Show kexec command for kdump.
+  status- evaluate /sys/kernel/{kexec_crash_loaded,fadump_registered}
+  depending on dump mode. Print appropriate message
   load  - Locate the kdump kernel, debug kernel, and establish links for
   makedumpfile.  Then load the kdump kernel using kexec
+  If using fadump, register.
   unload- unload the kdump kernel using kexec
+  If using fadump, unregister.
   savecore  - use previously made links to save /proc/vmcore
   propagate - Send public ssh key to remote host for passwordless connection
 
@@ -81,10 +97,13 @@
 
 function kdump_show()
 {
+	echo DUMP_MODE:$DUMP_MODE
 	echo USE_KDUMP:$USE_KDUMP
 	echo KDUMP_SYSCTL: $KDUMP_SYSCTL
 	echo KDUMP_COREDIR:$KDUMP_COREDIR
-	echo crashkernel addr: $IOMEM_ADDR
+	if [ $DUMP_MODE == kdump ]; then
+		echo crashkernel addr: $IOMEM_ADDR
+	fi
 
 	if [ -n $SSH ];then
 		echo SSH:  $SSH
@@ -100,6 +119,16 @@
 		echo HOSTTAG:  $HOSTTAG
 	fi
 
+	if [ $DUMP_MODE == fadump ]; then
+		if [ -e $sys_fadump_registered ] 
+			[ `cat $sys_fadump_registered` -eq 1 ] ; then
+			echo current state:ready to fadump;
+		else
+			echo current state:Not ready to fadump;
+		fi
+		return 0
+	fi
+
 	if [ -e $sys_kexec_crash -a `cat $sys_kexec_crash` -eq 1 ] ; then
 		echo current state:ready to kdump;
 	else
@@ -130,6 +159,29 @@
 	echo   $KEXEC_CMD
 }
 
+# check_fadump_support:  Other miscellaneous checks go here:
+# 1: if USE_KDUMP is 0, don't set up fadump.
+# 2: -e /sys/kernel/fadump_registered indicates that this kernel
+#thinks it supports fadump
+#
+# Returns: none. prints warnings or exit
+function check_fadump_support()
+{
+	if [ -z $USE_KDUMP -o $USE_KDUMP == 0 ] ; then
+		log_failure_msg $KDUMP_DEFAULTS: USE_KDUMP is not set or zero
+		[ ! $DRY_RUN ]  exit 1;
+	fi
+	if [ ! -e $sys_fadump_registered ]; then
+		log_failure_msg fadump is not configured in this kernel.
+		log_failure_msg Try passing \fadump=on\ to enable fadump
+		[ ! $DRY_RUN ]  exit 1;
+	fi
+if [ -n $NFS ]  [ -n $SSH ];then
+		log_failure_msg \$SSH and \$NFS cannot be defined concurrently
+		[ ! $DRY_RUN ]  exit 1;
+	fi
+}
+
 # check_kdump_support:  Other miscellaneous checks go 

Bug#763623: [Pkg-libvirt-maintainers] Bug#763623: virt-manager: depends on arch-specific package(s)

[Chris J Arges]

On 11/07/2014 01:53 AM, Guido Günther wrote:
 On Thu, Nov 06, 2014 at 04:13:08PM -0600, Chris J Arges wrote:
 Package: virt-manager
 Version: 1:0.10.0+git20130205.69015c-1
 Followup-For: Bug #763623
 User: ubuntu-de...@lists.ubuntu.com
 Usertags: origin-ubuntu vivid ubuntu-patch

 Dear Maintainer,

 In Ubuntu, the attached patch was applied to achieve the following:

   * Change gir1.2-spice-client-gtk-3.0 from Depends to Recommends due to
 amd64 and i386 arch dependencies. (LP: #1385386)
 
 I don't think it's that simple since the import is unconditional so
 virt-manager will break without the Gir repository. Did you check
 that?
  -- Guido
 

I see this now, thanks for updating this properly.
--chris


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

Bug#763623: virt-manager: depends on arch-specific package(s)

[Chris J Arges]

Package: virt-manager
Version: 1:0.10.0+git20130205.69015c-1
Followup-For: Bug #763623
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu vivid ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * Change gir1.2-spice-client-gtk-3.0 from Depends to Recommends due to
amd64 and i386 arch dependencies. (LP: #1385386)

Thanks for considering the patch.


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

Kernel: Linux 3.13.0-39-lowlatency (SMP w/8 CPU cores; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff -Nru virt-manager-1.0.1/debian/changelog virt-manager-1.0.1/debian/changelog
diff -Nru virt-manager-1.0.1/debian/control virt-manager-1.0.1/debian/control
--- virt-manager-1.0.1/debian/control	2014-06-20 12:34:23.0 -0500
+++ virt-manager-1.0.1/debian/control	2014-11-06 16:10:37.0 -0600
@@ -1,8 +1,7 @@
 Source: virt-manager
 Section: admin
 Priority: optional
-Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
-XSBC-Original-Maintainer: Debian Libvirt Maintainers pkg-libvirt-maintain...@lists.alioth.debian.org
+Maintainer: Debian Libvirt Maintainers pkg-libvirt-maintain...@lists.alioth.debian.org
 Uploaders: Guido Günther a...@sigxcpu.org, Laurent Léonard laur...@open-minds.org
 Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/git/pkg-libvirt/virt-manager.git
@@ -27,11 +26,11 @@
  gir1.2-appindicator3-0.1,
  gir1.2-libvirt-glib-1.0,
  gir1.2-gtk-vnc-2.0,
- gir1.2-spice-client-gtk-3.0,
  gir1.2-vte-2.90,
  virtinst (= ${binary:Version}),
 Recommends: libvirt-bin (= 0.4.6), gnome-icon-theme,
- python-spice-client-gtk
+ python-spice-client-gtk,
+ gir1.2-spice-client-gtk-3.0
 Suggests: virt-viewer, ssh-askpass, gnome-keyring, python-gnomekeyring,
  python-guestfs
 Description: desktop application for managing virtual machines

Bug#763688: makedumpfile: kdump-config load fails with vmlinux kernel (vs. vmlinuz)

[Chris J Arges]

Package: makedumpfile
Version: 1.5.6-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu utopic ubuntu-patch

Dear Louis,

This patch adds the ability to automatically find vmlinux kernels as
well as vmlinuz.
This is required for architectures such as ppc64el.

Please attribute the patch to:
Mauricio Faria de Oliveira mauri...@linux.vnet.ibm.com

Thanks for considering the patch.


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

Kernel: Linux 3.13.0-36-lowlatency (SMP w/8 CPU cores; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff -Nru makedumpfile-1.5.6/debian/changelog makedumpfile-1.5.6/debian/changelog
diff -Nru makedumpfile-1.5.6/debian/kdump-config makedumpfile-1.5.6/debian/kdump-config
--- makedumpfile-1.5.6/debian/kdump-config	2014-06-08 00:02:15.0 -0500
+++ makedumpfile-1.5.6/debian/kdump-config	2014-10-01 12:05:38.0 -0500
@@ -184,7 +184,13 @@
 	# 2: The currently running kernel may be relocatable.  If so, then
 	#use the currently running kernel as the crash kernel.
 	if check_relocatable /boot/config-$KVER; then
-		KDUMP_KERNEL=/boot/vmlinuz-$KVER
+		if [ -f /boot/vmlinuz-$KVER ]; then
+			KDUMP_KERNEL=/boot/vmlinuz-$KVER
+		elif [ -f /boot/vmlinux-$KVER ]; then
+			KDUMP_KERNEL=/boot/vmlinux-$KVER
+		else
+			KDUMP_KERNEL=
+		fi
 		if [ -f /boot/initrd.img-$KVER ]; then
 			KDUMP_INITRD=/boot/initrd.img-$KVER
 		else

Bug#758042: qemu-kvm: add kvm_stat to qemu-utils package

[Chris J Arges]

Package: qemu
Version: 2.1+dfsg-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu utopic ubuntu-patch

Dear Maintainer,

Please accept this patch which allows kvm_utils to be installed as part
of the
qemu-utils package. This utility is useful for getting runtime
statistics from
the kvm module.

Thanks for considering the patch.


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

Kernel: Linux 3.16.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 qemu-2.1+dfsg/debian/qemu-utils.install qemu-2.1+dfsg/debian/qemu-utils.install
--- qemu-2.1+dfsg/debian/qemu-utils.install	2014-08-05 14:08:32.0 -0500
+++ qemu-2.1+dfsg/debian/qemu-utils.install	2014-08-13 10:52:22.0 -0500
@@ -4,3 +4,4 @@
 debian/tmp/usr/share/man/man8/qemu-nbd.8
 debian/tmp/usr/bin/qemu-io
 debian/qemu-make-debian-root usr/sbin/
+scripts/kvm/kvm_stat usr/bin/

Bug#758042: qemu-kvm: add kvm_stat to qemu-utils package

[Chris J Arges]

On 08/13/2014 12:35 PM, Michael Tokarev wrote:
 Control: tag -1 - patch + confirmed
 Control: severity -1 wishlist
 
 13.08.2014 20:59, Chris J Arges wrote:
 Package: qemu
 Version: 2.1+dfsg-2
 Severity: normal
 Tags: patch
 User: ubuntu-de...@lists.ubuntu.com
 Usertags: origin-ubuntu utopic ubuntu-patch

 Dear Maintainer,

 Please accept this patch which allows kvm_utils to be installed as part
 of the
 qemu-utils package. This utility is useful for getting runtime
 statistics from
 the kvm module.
 
 kvm_stat utility has been in qemu-kvm package in debian, but it was never
 part of qemu packages.  Because else it'll conflict with qemu-kvm which is
 not a good idea.  This is a reason I haven't actually added it in the first
 place - I didnt' want to conflict with qemu-kvm, so the two packages can
 coexist with each other.  That's also why I untagging it as patch -- the
 supplied one line is not sufficient, we should add proper replaces too,
 I'll think about this.
Ok so I see that older qemu-kvm packages provide kvm_stat; however the
newest qemu-kvm package doesn't:
https://packages.debian.org/sid/amd64/qemu-kvm/filelist

Would this be an issue for users of the newer packages?

 
 There's also no manpage for kvm_stat - adding it will bring us one more
 lintian warning.  Can you provide a minimal manpage for this command please? 
 :)
 
Sure I can do that.

 And besides, why do you think it belongs to qemu-utils?  It seems like it
 belongs to qemu-system-common instead, -- a helper packge for all qemu-system
 targets, where kvm can actually be used.  qemu-utils is a bit more generic
 than for qemu-system, I think.

That's fine, qemu-system-common works for me.

 
 Thanks,
 
 /mjt
 


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

Bug#758042: qemu-kvm: add kvm_stat to qemu-utils package

[Chris J Arges]

On 08/13/2014 12:58 PM, Michael Tokarev wrote:
 13.08.2014 21:49, Chris J Arges wrote:
 On 08/13/2014 12:35 PM, Michael Tokarev wrote:
 []
 kvm_stat utility has been in qemu-kvm package in debian, but it was never
 part of qemu packages.  Because else it'll conflict with qemu-kvm which is
 not a good idea.  This is a reason I haven't actually added it in the first
 place - I didnt' want to conflict with qemu-kvm, so the two packages can
 coexist with each other.  That's also why I untagging it as patch -- the
 supplied one line is not sufficient, we should add proper replaces too,
 I'll think about this.
 
 Ok so I see that older qemu-kvm packages provide kvm_stat; however the
 newest qemu-kvm package doesn't:
 https://packages.debian.org/sid/amd64/qemu-kvm/filelist

 Would this be an issue for users of the newer packages?
 
 I refer to ability to install old (wheezy) qemu-kvm package together with
 current qemu.  This qemu-kvm in sid is just a wrapper around qemu-system-x86,
 while qemu-kvm in wheezy provided actual binary.  I find myself in a situation
 when I need to compare how various guests work in current qemu and how they
 worked in older qemu-kvm.  It is handy when I can install both at the same
 time.
 
 At any rate, the proper Replaces (versioned) is still needed.

Michael,
Looking into this further I see why kvm_stat wasn't ever properly
package was that it was supposed to be superceeded by perf.
I see this thread:
http://marc.info/?l=kvmm=134694012509766w=2

And essentially I can run:
'sudo perf kvm stat live'

To see some of the same output. Therefore it may not be a good idea to
include this script if it was planned on being deprecated a few years ago.

Thanks and sorry about the noise,
--chris

 
 Thanks,
 
 /mjt
 


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

Bug#756300: terminator: Tab with multiple terminals not closed

[Chris J Arges]

Package: terminator
Version: 0.97-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu utopic ubuntu-patch

Dear Maintainer,

If there are multiple terminals in a tab, the user is prompted for
confirmation. Then, the program fails to close the tab and does so silently.
Here is the bug:
https://bugs.launchpad.net/ubuntu/+source/terminator/+bug/1253995

In Ubuntu, the attached patch was applied to achieve the following:

  [ Stephen Boddy ]
  * Backport patch for tabs with multiple terminals not closing. (LP:
#1253995)

Thanks for considering the patch.

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

Kernel: Linux 3.13.0-32-generic (SMP w/8 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 terminator-0.97/debian/changelog terminator-0.97/debian/changelog
diff -Nru terminator-0.97/debian/patches/fix-tab-with-multiple-terminals-not-closing.diff terminator-0.97/debian/patches/fix-tab-with-multiple-terminals-not-closing.diff
--- terminator-0.97/debian/patches/fix-tab-with-multiple-terminals-not-closing.diff	1969-12-31 18:00:00.0 -0600
+++ terminator-0.97/debian/patches/fix-tab-with-multiple-terminals-not-closing.diff	2014-07-28 09:27:24.0 -0500
@@ -0,0 +1,20 @@
+Description: Fix tab with multiple terminals not closing
+Author: Stephen Boddy stephen.j.bo...@gmail.com
+
+Origin: upstream, http://bazaar.launchpad.net/~gnome-terminator/terminator/trunk/revision/1490
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1253995
+Last-Update: 2014-07-28
+
+--- terminator-0.97.orig/terminatorlib/notebook.py
 terminator-0.97/terminatorlib/notebook.py
+@@ -313,9 +313,7 @@ class Notebook(Container, gtk.Notebook):
+ return
+ elif maker.isinstance(child, 'Container'):
+ dbg('Notebook::closetab: child is a Container')
+-dialog = self.construct_confirm_close(self.window, _('tab'))
+-result = dialog.run()
+-dialog.destroy()
++result = self.construct_confirm_close(self.window, _('tab'))
+ 
+ if result == gtk.RESPONSE_ACCEPT:
+ containers = None
diff -Nru terminator-0.97/debian/patches/series terminator-0.97/debian/patches/series
--- terminator-0.97/debian/patches/series	2014-07-01 11:12:40.0 -0500
+++ terminator-0.97/debian/patches/series	2014-07-28 09:24:52.0 -0500
@@ -5,3 +5,4 @@
 fix-unfocused-font-brightness.diff
 fix-maximize.diff
 fix-split-multiple-tabs.diff
+fix-tab-with-multiple-terminals-not-closing.diff

Bug#735181: dkms uninstall fails unexpectedly without error message

[Chris J Arges]

Package: dkms
Version: 2.2.0.3-1.2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

The following bug in Ubuntu gives detail about this issue:
https://bugs.launchpad.net/ubuntu/+source/dkms/+bug/1261116

Essentially the 'have_one_kernel' function in the dkms script doesn't
evaluate
to the correct return value when it succeeds.

This patch fixes the issue which is backported here:
  * [eea7213f] add missing patch that fixes have_one_kernel for non-zero
return code

Thanks for considering the patch.

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

Kernel: Linux 3.8.0-35-generic (SMP w/8 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 dkms-2.2.0.3/debian/changelog dkms-2.2.0.3/debian/changelog
diff -Nru dkms-2.2.0.3/debian/patches/fix_have_one_kernel_for_non-zero_return_code.diff dkms-2.2.0.3/debian/patches/fix_have_one_kernel_for_non-zero_return_code.diff
--- dkms-2.2.0.3/debian/patches/fix_have_one_kernel_for_non-zero_return_code.diff	1969-12-31 18:00:00.0 -0600
+++ dkms-2.2.0.3/debian/patches/fix_have_one_kernel_for_non-zero_return_code.diff	2014-01-13 09:24:33.0 -0600
@@ -0,0 +1,29 @@
+Description: Fixes function have_one_kernel in dkms script for non-zero return code
+Author: Mario Limonciello mario_limoncie...@dell.com
+Origin: upstream, http://linux.dell.com/cgi-bin/cgit.cgi/dkms.git/commit/?id=eea7213f
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1261116
+
+Index: dkms/dkms
+===
+--- dkms.orig/dkms	2014-01-10 16:33:48.000168000 +0100
 dkms/dkms	2014-01-10 16:44:48.522601051 +0100
+@@ -162,11 +162,14 @@
+ 
+ # A little test function for DKMS commands that only work on one kernel.
+ have_one_kernel() {
+-(( ${#kernelver[@]}  1 ))  \
+-	die 4 $The action $1 does not support multiple kernel version \
+-	$parameters on the command line.
+-[[ $all ]]  die 5 $The action $1 does not support the --all \
+-	$parameter.
++if (( ${#kernelver[@]} != 1 )); then
++die 4 $The action $1 does not support multiple kernel version \
++$parameters on the command line.
++fi
++if [[ $all ]]; then
++die 5 $The action $1 does not support the --all \
++$parameter.
++fi
+ }
+ 
+ # Set up the kernelver and arch arrays.  You must have a 1:1 correspondence --
diff -Nru dkms-2.2.0.3/debian/patches/series dkms-2.2.0.3/debian/patches/series
--- dkms-2.2.0.3/debian/patches/series	2012-10-05 22:52:13.0 -0500
+++ dkms-2.2.0.3/debian/patches/series	2014-01-13 09:24:44.0 -0600
@@ -1,3 +1,4 @@
 666023.patch
 657145.patch
 688904.patch
+fix_have_one_kernel_for_non-zero_return_code.diff

Bug#734878: xrdp: install fails if xrdp user already exists

[Chris J Arges]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

On 01/11/2014 12:58 PM, Vincent Bernat wrote:
 ❦ 10 janvier 2014 16:38 CET, Chris J Arges
 chris.j.ar...@canonical.com :
 
 If xrdp already exists as a user the package fails to install
 with the following error message:
 
 Setting up xrdp (0.6.0-1) ... adduser: The user `xrdp' already
 exists. Exiting. dpkg: error processing xrdp (--configure): 
 subprocess installed post-installation script returned error exit
 status 1
 
 This patch checks if the user already exists and doesn't
 re-create the user.
 
 I'm not sure if this is the best approach, as an existing user
 might not have the correct setup to use this package.
 
 adduser is already checking if the user already exists. You get an
 error because the user exists and is not what is expected, notably,
 it is not a system user. I don't think we can accept an existing
 normal user: if it is affected to a real user, this user will have
 privileged access to the xrdp daemon.
 

This makes sense. Please close this as you see fit.
Thanks,
- --chris j arges
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQEcBAEBAgAGBQJS1CpmAAoJEPNFAiJniEz2bO8H+gPd4lZa1KVYOBBhoVRxhq9G
/yzkC0X8S0HEfYy1zE94nRxMprpjDdenXmtcad4owd4bq8MR0vC5Lfvb62kPutPh
ER23z62gtXvQk+C7kf1YHEWvUwPVr80zTKeODUauu7n4dk/LOpyLlnlf9Psa19tn
p/eWpYa9W0xvJ6zr0K4Tj+/aj9lvRiZlKw4a/hUwTS4b+jKkrCWrBvJ1LMQLtrNA
zcEOHvlX961Th9o60ghtGsjF0ZLW16hd71VQLHaOkVrDgbApPU8yjVmrU7pJfUOp
eBNYmdK1/2mU7wBqIVR/+c7iSmwRsHYz48OEFDOCfviRTwEGaj78J8mKqyVCCLY=
=v6VN
-END PGP SIGNATURE-


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

Bug#734878: xrdp: install fails if xrdp user already exists

[Chris J Arges]

Package: xrdp
Version: 0.6.0-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,
If xrdp already exists as a user the package fails to install with the
following error message:

Setting up xrdp (0.6.0-1) ...
adduser: The user `xrdp' already exists. Exiting.
dpkg: error processing xrdp (--configure):
 subprocess installed post-installation script returned error exit status 1

This patch checks if the user already exists and doesn't re-create the user.

I'm not sure if this is the best approach, as an existing user might not
have the correct setup to use this package.

Thanks for considering the patch.


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

Kernel: Linux 3.8.0-35-generic (SMP w/8 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 xrdp-0.6.0/debian/changelog xrdp-0.6.0/debian/changelog
diff -Nru xrdp-0.6.0/debian/postinst xrdp-0.6.0/debian/postinst
--- xrdp-0.6.0/debian/postinst	2012-09-29 08:04:03.0 -0500
+++ xrdp-0.6.0/debian/postinst	2014-01-10 09:34:35.0 -0600
@@ -10,8 +10,8 @@
 ADDUSER=/usr/sbin/adduser
 
 [ -d /var/run/xrdp ] || mkdir -p /var/run/xrdp
-$ADDUSER --system --disabled-password --disabled-login --home /var/run/xrdp \
- --no-create-home --quiet --group $XRDP
+id -u $XRDP /dev/null || $ADDUSER --system --disabled-password \
+--disabled-login --home /var/run/xrdp --no-create-home --quiet --group $XRDP
 
 $CHOWN -R $XRDP:$XRDP /etc/xrdp
 

Bug#734879: xrdp: install fails if xrdp user already exists

[Chris J Arges]

Package: xrdp
Version: 0.6.0-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,
If xrdp already exists as a user the package fails to install with the
following error message:

Setting up xrdp (0.6.0-1) ...
adduser: The user `xrdp' already exists. Exiting.
dpkg: error processing xrdp (--configure):
 subprocess installed post-installation script returned error exit status 1

This patch checks if the user already exists and doesn't re-create the user.

I'm not sure if this is the best approach, as an existing user might not
have the correct setup to use this package.

Thanks for considering the patch.


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

Kernel: Linux 3.8.0-35-generic (SMP w/8 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 xrdp-0.6.0/debian/changelog xrdp-0.6.0/debian/changelog
diff -Nru xrdp-0.6.0/debian/postinst xrdp-0.6.0/debian/postinst
--- xrdp-0.6.0/debian/postinst	2012-09-29 08:04:03.0 -0500
+++ xrdp-0.6.0/debian/postinst	2014-01-10 09:34:35.0 -0600
@@ -10,8 +10,8 @@
 ADDUSER=/usr/sbin/adduser
 
 [ -d /var/run/xrdp ] || mkdir -p /var/run/xrdp
-$ADDUSER --system --disabled-password --disabled-login --home /var/run/xrdp \
- --no-create-home --quiet --group $XRDP
+id -u $XRDP /dev/null || $ADDUSER --system --disabled-password \
+--disabled-login --home /var/run/xrdp --no-create-home --quiet --group $XRDP
 
 $CHOWN -R $XRDP:$XRDP /etc/xrdp
 

Bug#734879: Acknowledgement (xrdp: install fails if xrdp user already exists)

[Chris J Arges]

On 01/10/2014 09:45 AM, Debian Bug Tracking System wrote:
 Thank you for filing a new Bug report with Debian.
 
 This is an automatically generated reply to let you know your message
 has been received.
 
 Your message is being forwarded to the package maintainers and other
 interested parties for their attention; they will reply in due course.
 
 Your message has been sent to the package maintainer(s):
  Vincent Bernat ber...@debian.org
 
 If you wish to submit further information on this problem, please
 send it to 734...@bugs.debian.org.
 
 Please do not send mail to ow...@bugs.debian.org unless you wish
 to report a problem with the Bug-tracking system.
 

Sorry for the duplicates, my e-mail client was having problems. Please
close this and any duplicates.


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

Bug#734882: xrdp: install fails if xrdp user already exists

[Chris J Arges]

Package: xrdp
Version: 0.6.0-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,
If xrdp already exists as a user the package fails to install with the
following error message:

Setting up xrdp (0.6.0-1) ...
adduser: The user `xrdp' already exists. Exiting.
dpkg: error processing xrdp (--configure):
 subprocess installed post-installation script returned error exit status 1

This patch checks if the user already exists and doesn't re-create the user.

I'm not sure if this is the best approach, as an existing user might not
have the correct setup to use this package.

Thanks for considering the patch.


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

Kernel: Linux 3.8.0-35-generic (SMP w/8 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 xrdp-0.6.0/debian/changelog xrdp-0.6.0/debian/changelog
diff -Nru xrdp-0.6.0/debian/postinst xrdp-0.6.0/debian/postinst
--- xrdp-0.6.0/debian/postinst	2012-09-29 08:04:03.0 -0500
+++ xrdp-0.6.0/debian/postinst	2014-01-10 09:34:35.0 -0600
@@ -10,8 +10,8 @@
 ADDUSER=/usr/sbin/adduser
 
 [ -d /var/run/xrdp ] || mkdir -p /var/run/xrdp
-$ADDUSER --system --disabled-password --disabled-login --home /var/run/xrdp \
- --no-create-home --quiet --group $XRDP
+id -u $XRDP /dev/null || $ADDUSER --system --disabled-password \
+--disabled-login --home /var/run/xrdp --no-create-home --quiet --group $XRDP
 
 $CHOWN -R $XRDP:$XRDP /etc/xrdp
 

Bug#734881: xrdp: install fails if xrdp user already exists

[Chris J Arges]

Package: xrdp
Version: 0.6.0-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,
If xrdp already exists as a user the package fails to install with the
following error message:

Setting up xrdp (0.6.0-1) ...
adduser: The user `xrdp' already exists. Exiting.
dpkg: error processing xrdp (--configure):
 subprocess installed post-installation script returned error exit status 1

This patch checks if the user already exists and doesn't re-create the user.

I'm not sure if this is the best approach, as an existing user might not
have the correct setup to use this package.

Thanks for considering the patch.


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

Kernel: Linux 3.8.0-35-generic (SMP w/8 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 xrdp-0.6.0/debian/changelog xrdp-0.6.0/debian/changelog
diff -Nru xrdp-0.6.0/debian/postinst xrdp-0.6.0/debian/postinst
--- xrdp-0.6.0/debian/postinst	2012-09-29 08:04:03.0 -0500
+++ xrdp-0.6.0/debian/postinst	2014-01-10 09:34:35.0 -0600
@@ -10,8 +10,8 @@
 ADDUSER=/usr/sbin/adduser
 
 [ -d /var/run/xrdp ] || mkdir -p /var/run/xrdp
-$ADDUSER --system --disabled-password --disabled-login --home /var/run/xrdp \
- --no-create-home --quiet --group $XRDP
+id -u $XRDP /dev/null || $ADDUSER --system --disabled-password \
+--disabled-login --home /var/run/xrdp --no-create-home --quiet --group $XRDP
 
 $CHOWN -R $XRDP:$XRDP /etc/xrdp
 

Bug#729890: ardour3: use higher resolution picture for desktop icon

[Chris J Arges]

Package: ardour3
Version: 3.5.74~dfsg-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,
This patch updates the ardour3 icon and desktop shortcut to make it look
better.

  * Update ardour3.xpm, ardour3.desktop.

Thanks for considering the patch.


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

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

=== modified file 'debian/ardour3.desktop'
--- debian/ardour3.desktop	2013-09-21 19:05:02 +
+++ debian/ardour3.desktop	2013-11-18 16:46:46 +
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Version=1.0
-Name=ARDOUR3
+Name=Ardour3
 GenericName=Ardour Digital Audio Workstation 3
 Comment=Record, mix and master multi-track audio
 Keywords=audio;sound;jackd,DAW,multitrack,ladspa,lv2,midi

=== modified file 'debian/ardour3.xpm'
--- debian/ardour3.xpm	2013-09-21 19:05:02 +
+++ debian/ardour3.xpm	2013-11-18 16:45:56 +
@@ -1,145 +1,705 @@
 /* XPM */
-static char *ardour3[] = {
-/* columns rows colors chars-per-pixel */
-32 32 107 2,
-   c black,
-.  c #0A0101,
-X  c #130303,
-o  c #180404,
-O  c #24,
-+  c #2C0303,
-@  c #330505,
-#  c #350808,
-$  c #3B0505,
-%  c #3C0A0A,
-  c #430606,
-*  c #440A0A,
-=  c #490707,
--  c #4D0A0A,
-;  c #47,
-:  c #4B1414,
-  c #530B0B,
-,  c #5C0C0C,
-  c #501717,
-1  c #571C1C,
-2  c #5A1B1B,
-3  c #640D0D,
-4  c #6D0F0F,
-5  c #661313,
-6  c #671B1B,
-7  c #6D,
-8  c #720F0F,
-9  c #75,
-0  c #7B1212,
-q  c #692727,
-w  c #6D2929,
-e  c #7C2020,
-r  c #7D,
-t  c #841414,
-y  c #8B1515,
-u  c #951717,
-i  c #991717,
-p  c #9B1919,
-a  c #892020,
-s  c #8E2A2A,
-d  c #863737,
-f  c #8B3E3E,
-g  c #923838,
-h  c #983939,
-j  c #A31919,
-k  c #AB1C1C,
-l  c #B40909,
-z  c #BB0D0D,
-x  c #B61D1D,
-c  c #BA1D1D,
-v  c #A83D3D,
-b  c #B12F2F,
-n  c #904040,
-m  c #9D4747,
-M  c #9D4949,
-N  c #A54646,
-B  c #A04B4B,
-V  c #BE4C4C,
-C  c #B25656,
-Z  c #B45858,
-A  c #B95454,
-S  c #B95858,
-D  c #C00F0F,
-F  c #C41212,
-G  c #C01F1F,
-H  c #CD1616,
-J  c #C91C1C,
-K  c #D71C1C,
-L  c #D91C1C,
-P  c #C42020,
-I  c #CA,
-U  c #CD2B2B,
-Y  c #CF3030,
-T  c #D32323,
-R  c #D32C2C,
-E  c #DD,
-W  c #D23535,
-Q  c #D43D3D,
-!  c #E2,
-~  c #E82525,
-^  c #EE2A2A,
-/  c #E43636,
-(  c #C05E5E,
-)  c #D7,
-_  c #D94747,
-`  c #D94C4C,
-'  c #DB5353,
-]  c #DE5C5C,
-[  c #C46161,
-{  c #D3,
-}  c #D06868,
-|  c #DE6262,
- . c #DC6E6E,
-.. c #DE7070,
-X. c #E14242,
-o. c #E74F4F,
-O. c #EA4646,
-+. c #E85757,
-@. c #EA5C5C,
-#. c #E16464,
-$. c #E36B6B,
-%. c #EA6060,
-. c #EC6C6C,
-*. c #E67373,
-=. c #EA7373,
--. c #EE7A7A,
-;. c None,
-/* pixels */
-;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.,
-;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.,
-;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.,
-;.;.;.;.;.;.;.;.;.;.;.;.;.;.9 9   ;.;.;.;.;.;.;.;.;.;.;.;.;.,
-;.;.;.;.;.;.;.;.;.;.;.;.;.j # # 0   ;.;.;.;.;.;.;.;.;.;.;.;.,
-;.;.;.;.;.;.;.;.;.;.;.;.^  m m  o   ;.;.;.;.;.;.;.;.;.;.;.,
-;.;.;.;.;.;.;.;.;.;.;.;.y ; -.=.; 9   ;.;.;.;.;.;.;.;.;.;.;.,
-;.;.;.;.;.;.;.;.;.;.;.P $ ( =.$.V $ %   ;.;.;.;.;.;.;.;.;.;.,
-;.;.;.;.;.;.;.;.;.;.;.9 q -.$.#.@.6 7 ;.;.;.;.;.;.;.;.;.,
-;.;.;.;.;.;.;.;.;.;.k @ ..$.#.] ' ) @ ,   ;.;.;.;.;.;.;.;.;.,
-;.;.;.;.;.;.;.;.;.^ 3 f =.$.] ' _ X.a , .   ;.;.;.;.;.;.;.;.,
-;.;.;.;.;.;.;.;.;.u % -.$.| ' ` ) W / $ 7   ;.;.;.;.;.;.;.;.,
-;.;.;.;.;.;.;.;.T * C *.| ] ' ) Q R R k  +   ;.;.;.;.;.;.;.,
-;.;.;.;.;.;.;.;.t 1 -.$.| ' ` Q W I J !  4 ;.;.;.;.;.;.,
-;.;.;.;.;.;.;.x # } $.| ] ` ) W U I H H I @ -   ;.;.;.;.;.;.,
-;.;.;.;.;.;.;.7 r =.$.] ` ) Q Y I H F F K 0 3 ;.;.;.;.;.,
-;.;.;.;.;.;.j # *.$.| ' ` Q W U J F F D D L @ 4   ;.;.;.;.;.,
-;.;.;.;.;.^  M =..%.+.o.O.U I J D D D D H i  o   ;.;.;.;.,
-;.;.;.;.;.y : -.=.h v ` O b / ^ K F D D D z ! = 9   ;.;.;.;.,
-;.;.;.;.P % [ =..+ % s $ 5 R $ T F D z z z D c $ %   ;.;.;.,
-;.;.;.;.9 w *.+ g @ O 0 3  t + t ~ ! D z z z L 3 4 ;.;.,
-;.;.;.k # ..A O 2  @ 6 9  7  0 8 3 ! z z l l T @ ,   ;.;.,
-;.;.^ 3 n { N + *  $  t $ , 4 4 + + L D z l l H y , .   ;.,
-;.;.i % C O : * O , * % t + = 0  @ $ T k E z l l E $ 7   ;.,
-;.E * Z d @ O , O 3 - O t O $ t $  = y O t ! K l z k  +   ,
-;.t 1 S 1 0 O 0 O 8 3 O 0  @ y +   = = 3 y i K z K  8   ,
-x # n O O i -  , % 9 t X y y   t 8 O t @ @ # c J K I # - ,
- O O y t X $ .  y % 8 u  @ $ y t - 3 ,
-# 5  , 3 4 4 4   ,
-;.;.,
-;.;.  ;.;.;.;.;.;.;.;.;.;.;.;.;.;.  ,
-;.;.

Bug#722496: please close this bug

[Chris J Arges]

I believe this is a configuration problem instead of an actual bug.
Please close.


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

Bug#728991: tofrodos: dpkg-parsechangelog causes FTBFS

[Chris J Arges]

Package: tofrodos
Version: 1.7.13+ds-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

When building tofrodos in trusty, there was an issue with
dpkg-parsechangelog that caused an error:

dpkg-buildpackage: host architecture i386
 /usr/bin/fakeroot debian/rules clean
dpkg-parsechangelog: unknown option `-SVersion'

dpkg-parsechangelog: unknown option `-SVersion'

I: tofrodos_Usage: dpkg  Options: Parser options:
   output formats, defaults to 'dpkg'
  for compatibility with dpkg
   than version


I've attached a patch that fixes the issue.

Thanks for considering the patch.


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

Kernel: Linux 3.5.0-42-generic (SMP w/8 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 tofrodos-1.7.13+ds/debian/changelog tofrodos-1.7.13+ds/debian/changelog
diff -Nru tofrodos-1.7.13+ds/debian/rules tofrodos-1.7.13+ds/debian/rules
--- tofrodos-1.7.13+ds/debian/rules	2013-10-29 03:47:51.0 -0500
+++ tofrodos-1.7.13+ds/debian/rules	2013-11-07 11:04:22.0 -0600
@@ -7,7 +7,7 @@
 
 PKD   = $(abspath $(dir $(MAKEFILE_LIST)))
 PKG   = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
-UVER  = $(shell dpkg-parsechangelog -l$(PKD)/changelog -SVersion | cut -d- -f1)
+UVER  = $(shell dpkg-parsechangelog -l$(PKD)/changelog | grep Version: | cut -d' ' -f2-)
 DTYPE = +ds
 VER  ?= $(subst $(DTYPE),,$(UVER))
 

Bug#726427: iproute - Cannot remove /var/run/netns/namespace: Device or resource busy

[Chris J Arges]

Package: iproute
Version: 2017-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu saucy ubuntu-patch

Dear Maintainer,

When trying to remove a namespace when another namespace is mounted may
cause a failure.
Upstream discussion here:
http://comments.gmane.org/gmane.linux.network/240795

Ubuntu bug is here: http://bugs.launchpad.net/bugs/1238981

This upstream patch solves the issue.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise-proposed'), (500, 'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.5.0-42-generic (SMP w/8 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 iproute-2017/debian/changelog iproute-2017/debian/changelog
diff -Nru iproute-2017/debian/patches/make-ip-netns-delete-more-likely-to-succeed.patch iproute-2017/debian/patches/make-ip-netns-delete-more-likely-to-succeed.patch
--- iproute-2017/debian/patches/make-ip-netns-delete-more-likely-to-succeed.patch	1969-12-31 18:00:00.0 -0600
+++ iproute-2017/debian/patches/make-ip-netns-delete-more-likely-to-succeed.patch	2013-10-15 10:59:50.0 -0500
@@ -0,0 +1,61 @@
+Description: iproute2: Make ip netns delete more likely to succeed
+
+Sometimes ip netns delete fails because it can not delete the file a
+network namespace was mounted on.  If this only happened when a
+network namespace was really in use this would be fine, but today it
+is possible to pin all network namespaces by simply having a long
+running process started with ip netns exec.
+
+Every mount is copied when a network namespace is created so it is
+impossible to prevent the mounts from getting into other mount
+namespaces.  Modify all mounts in the files and subdirectories of
+/var/run/netns to be shared mount points so that unmount events can
+propogate, making it unlikely that ip netns delete will fail because
+a directory is mounted in another mount namespace.
+
+Author: Eric W. Biederman ebied...@xmission.com
+
+Origin: upstream, https://git.kernel.org/cgit/linux/kernel/git/shemminger/iproute2.git/commit/?id=58a3e8270fe72f8ed92687d3a3132c2a708582dd
+Bug-Ubuntu: https://launchpad.net/bugs/1238981
+Last-Update: 2013-10-15
+
+--- a/ip/ipnetns.c
 b/ip/ipnetns.c
+@@ -205,6 +205,7 @@ static int netns_add(int argc, char **ar
+ 	char netns_path[MAXPATHLEN];
+ 	const char *name;
+ 	int fd;
++	int made_netns_run_dir_mount = 0;
+ 
+ 	if (argc  1) {
+ 		fprintf(stderr, No netns name specified\n);
+@@ -217,6 +218,29 @@ static int netns_add(int argc, char **ar
+ 	/* Create the base netns directory if it doesn't exist */
+ 	mkdir(NETNS_RUN_DIR, S_IRWXU|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH);
+ 
++	/* Make it possible for network namespace mounts to propogate between
++	 * mount namespaces.  This makes it likely that a unmounting a network
++	 * namespace file in one namespace will unmount the network namespace
++	 * file in all namespaces allowing the network namespace to be freed
++	 * sooner.
++	 */
++	while (mount(, NETNS_RUN_DIR, none, MS_SHARED | MS_REC, NULL)) {
++		/* Fail unless we need to make the mount point */
++		if (errno != EINVAL || made_netns_run_dir_mount) {
++			fprintf(stderr, mount --make-shared %s failed: %s\n,
++NETNS_RUN_DIR, strerror(errno));
++			return EXIT_FAILURE;
++		}
++
++		/* Upgrade NETNS_RUN_DIR to a mount point */
++		if (mount(NETNS_RUN_DIR, NETNS_RUN_DIR, none, MS_BIND, NULL)) {
++			fprintf(stderr, mount --bind %s %s failed: %s\n,
++NETNS_RUN_DIR, NETNS_RUN_DIR, strerror(errno));
++			return EXIT_FAILURE;
++		}
++		made_netns_run_dir_mount = 1;
++	}
++
+ 	/* Create the filesystem state */
+ 	fd = open(netns_path, O_RDONLY|O_CREAT|O_EXCL, 0);
+ 	if (fd  0) {
diff -Nru iproute-2017/debian/patches/series iproute-2017/debian/patches/series
--- iproute-2017/debian/patches/series	2012-04-08 18:40:42.0 -0500
+++ iproute-2017/debian/patches/series	2013-10-15 10:57:34.0 -0500
@@ -1,3 +1,4 @@
 moo.diff
 txtdocs.diff
 cross.diff
+make-ip-netns-delete-more-likely-to-succeed.patch

Bug#722496: mtu not always set properly on bond/vlan interface

[Chris J Arges]

Package: ifupdown
Version: 0.7.44

* Description

When configuring a network with bonding+vlan and setting the MTU,
occasionally the MTU doesn't get set properly on the vlan interface.

In addition if one checks /var/log/upstart/networking.log whenever there
is a failure the following message is printed:
SIOCSIFMTU: Numerical result out of range

I've tested the latest ifupdown package (0.7.44) and the problem still
exists.
Multi/single CPU settings both exhibit the issue.

* Test Case

# Create a p/q/r/s server vm with two network interfaces
# This is reproducible on real hardware as well

# Install the following
sudo apt-get install vlan ifenslave-2.6 bridge-utils
sudo modprobe bonding 8021q

# Edit the interfaces file
/etc/networking/interfaces:

auto bond0
iface bond0 inet manual
  bond-mode 802.3ad
  bond-miimon 100
  bond-lacp-rate 1
  bond-slaves eth0 eth1
  post-up ifconfig bond0 mtu 9000

auto eth0
iface eth0 inet manual
  bond-master bond0
  post-up ifconfig eth0 mtu 9000

auto eth1
iface eth1 inet manual
  bond-master bond0
  post-up ifconfig eth1 mtu 9000

auto bond0.123
iface bond0.123 inet static
  address 192.168.122.68
  netmask 255.255.255.0
  gateway 192.168.122.1
  post-up ifconfig bond0.123 mtu 9000

# edit rc.local (or another startup script) so we reboot until we hit
the error
/etc/rc.local:

DEVS=eth0 eth1 bond0 bond0.123
for d in $DEVS; do
mtu=$(cat /sys/class/net/$d/mtu)
if [ $mtu != 9000 ]; then
echo FAIL
exit 1
fi
done

reboot
exit 0

# Now reboot the machine, within 10m or so you should be at the login prompt
# if you ifconfig | grep MTU you will see some of our interfaces did not get
# the MTU properly set and the test failed.
# Essentially we want to ensure that all MTU's (except lo) were set to 9000

* Workaround

Change the bond0.123 post-up command to:
  post-up sleep 2  ifconfig bond0.123 mtu 9000

Now when rebooting the interfaces will all be brought up with the proper
MTU.


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

Bug#721095: crash: basic autopkgtest for crash

[Chris J Arges]

Package: crash
Version: 6.1.6-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu saucy ubuntu-patch

Dear Maintainer,

Please accept this patch to add a basic autopkgtest for crash.
This test simply downloads the proper vmlinux image and runs
crash on a live kernel. It works on both Ubuntu and Debian.

Thanks for considering the patch.

-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise-proposed'), (500, 'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.5.0-39-generic (SMP w/8 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 crash-6.1.6/debian/control crash-6.1.6/debian/control
--- crash-6.1.6/debian/control
+++ crash-6.1.6/debian/control
@@ -6,6 +6,7 @@
 Uploaders:
 Build-Depends: debhelper (= 9), dpkg-dev (= 1.16.1), quilt (= 0.47), binutils, binutils-dev, zlib1g-dev, libncurses5-dev
 Standards-Version: 3.9.3.1
+XS-Testsuite: autopkgtest
 
 Package: crash
 Architecture: i386 ia64 alpha powerpc amd64 armhf
diff -u crash-6.1.6/debian/changelog crash-6.1.6/debian/changelog
only in patch2:
unchanged:
--- crash-6.1.6.orig/debian/tests/control
+++ crash-6.1.6/debian/tests/control
@@ -0,0 +1,3 @@
+Tests: live
+Restrictions: needs-root
+Depends: @, lsb-release
only in patch2:
unchanged:
--- crash-6.1.6.orig/debian/tests/live
+++ crash-6.1.6/debian/tests/live
@@ -0,0 +1,20 @@
+#/bin/sh -x
+set -e
+
+echo Adding linux-image debug symbols.
+if [ $(lsb_release -is) = Debian ]; then
+sudo apt-get install linux-image-$(uname -r)-dbg
+elif [ $(lsb_release -is) = Ubuntu ]; then
+sudo tee /etc/apt/sources.list.d/ddebs.list  EOF
+deb http://ddebs.ubuntu.com/ $(lsb_release -cs)  main restricted universe multiverse
+deb http://ddebs.ubuntu.com/ $(lsb_release -cs)-security main restricted universe multiverse
+deb http://ddebs.ubuntu.com/ $(lsb_release -cs)-updates  main restricted universe multiverse
+deb http://ddebs.ubuntu.com/ $(lsb_release -cs)-proposed main restricted universe multiverse
+EOF
+sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys ECDCAD72428D7C01
+sudo apt-get update
+sudo apt-get install linux-image-$(uname -r)-dbgsym
+fi
+
+echo Testing crash on live kernel
+sudo crash -st /usr/lib/debug/boot/vmlinux-$(uname -r)

Bug#699245: gpgme1.0: Fix potential FTBFS in t-encrypt-sign testcase by updating gnupg.

[Chris J Arges]

Package: gpgme1.0
Version: 1.2.0-1.4
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,

When using newer versions of gnupg this package FTBFS. By taking a portion of 
this
upstream patch and applying it to the failed testcase, it passes and the 
package builds.

In Ubuntu, the attached patch was applied to achieve the following:

  * debian/patches/fix-t-encrypt-sign.dpatch:
- Fixes FTBFS by updating the t-encrypt-sign test for use with a
  newer version of GnuPG.


Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 
'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-36-generic (SMP w/8 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 gpgme1.0-1.2.0/debian/changelog gpgme1.0-1.2.0/debian/changelog
diff -u gpgme1.0-1.2.0/debian/patches/00list gpgme1.0-1.2.0/debian/patches/00list
--- gpgme1.0-1.2.0/debian/patches/00list
+++ gpgme1.0-1.2.0/debian/patches/00list
@@ -4,0 +5 @@
+fix-t-encrypt-sign.dpatch
only in patch2:
unchanged:
--- gpgme1.0-1.2.0.orig/debian/patches/fix-t-encrypt-sign.dpatch
+++ gpgme1.0-1.2.0/debian/patches/fix-t-encrypt-sign.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-t-encrypt-sign.dpatch by Chris J Arges chris.j.ar...@canonical.com
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes t-encrypt-sign testcase by allowing RMD160 hash algorithm.
+## DP: Origin: upstream, http://gitorious.org/gnupg-org/gpgme/commit/43f38db1afe9830b888076adeec1eec21f32335c
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gpgme1.0-1.2.0~/tests/gpg/t-encrypt-sign.c gpgme1.0-1.2.0/tests/gpg/t-encrypt-sign.c
+--- gpgme1.0-1.2.0~/tests/gpg/t-encrypt-sign.c	2005-09-08 09:42:32.0 -0500
 gpgme1.0-1.2.0/tests/gpg/t-encrypt-sign.c	2013-01-28 15:07:49.755170137 -0600
+@@ -60,7 +60,8 @@
+ 	   result-signatures-pubkey_algo);
+   exit (1);
+ }
+-  if (result-signatures-hash_algo != GPGME_MD_SHA1)
++  if (result-signatures-hash_algo != GPGME_MD_SHA1
++   result-signatures-hash_algo != GPGME_MD_RMD160)
+ {
+   fprintf (stderr, Wrong hash algorithm reported: %i\n,
+ 	   result-signatures-hash_algo);

Bug#699247: gpgme1.0: Update packaging to dpkg-source-v3

[Chris J Arges]

Package: gpgme1.0
Severity: normal

Dear Maintainer,
Please update packaging to dpkg-source-v3 / quilt.
Thanks!

-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 
'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-36-generic (SMP w/8 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#698655: notify-python: fix python include issues for multi-arch

[Chris J Arges]

Package: notify-python
Version: 0.1.1-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,

This patch fixes multi-arch python include issues.

In Ubuntu, the attached patch was applied to achieve the following:

  * Fix multi-arch python includes issues. 

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 
'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-36-generic (SMP w/8 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 notify-python-0.1.1/debian/changelog notify-python-0.1.1/debian/changelog
diff -u notify-python-0.1.1/debian/control notify-python-0.1.1/debian/control
--- notify-python-0.1.1.orig/configure
+++ notify-python-0.1.1/configure
@@ -18788,7 +18788,7 @@
 echo $ECHO_N checking for headers required to compile python extensions... $ECHO_C 6
 py_prefix=`$PYTHON -c import sys; print sys.prefix`
 py_exec_prefix=`$PYTHON -c import sys; print sys.exec_prefix`
-PYTHON_INCLUDES=-I${py_prefix}/include/python${PYTHON_VERSION}
+PYTHON_INCLUDES=`$PYTHON-config --includes`
 if test $py_prefix != $py_exec_prefix; then
   PYTHON_INCLUDES=$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}
 fi
only in patch2:
unchanged:
--- notify-python-0.1.1.orig/acinclude.m4
+++ notify-python-0.1.1/acinclude.m4
@@ -230,7 +230,7 @@
 dnl deduce PYTHON_INCLUDES
 py_prefix=`$PYTHON -c import sys; print sys.prefix`
 py_exec_prefix=`$PYTHON -c import sys; print sys.exec_prefix`
-PYTHON_INCLUDES=-I${py_prefix}/include/python${PYTHON_VERSION}
+PYTHON_INCLUDES=`$PYTHON-config --includes`
 if test $py_prefix != $py_exec_prefix; then
   PYTHON_INCLUDES=$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}
 fi

Bug#698657: pywebkitgtk: fix python multi-arch include issues

[Chris J Arges]

Package: pywebkitgtk
Version: 1.1.8-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,

This patch fixes python multi-arch include issues by using python-config to 
include both general and platform dependent include paths.

In Ubuntu, the attached patch was applied to achieve the following:

  * Fix python multi-arch includes issues.


Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 
'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-36-generic (SMP w/8 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 pywebkitgtk-1.1.8/debian/changelog pywebkitgtk-1.1.8/debian/changelog
diff -Nru pywebkitgtk-1.1.8/debian/control pywebkitgtk-1.1.8/debian/control
--- pywebkitgtk-1.1.8/debian/control	2011-12-05 08:24:44.0 -0600
+++ pywebkitgtk-1.1.8/debian/control	2013-01-21 13:04:23.0 -0600
@@ -2,7 +2,6 @@
 # 
 # Modifications should be made to debian/control.in instead.
 # This file is regenerated automatically in the clean target.
-
 Source: pywebkitgtk
 Section: python
 Priority: optional
diff -Nru pywebkitgtk-1.1.8/debian/patches/fix-python-multiarch-includes.patch pywebkitgtk-1.1.8/debian/patches/fix-python-multiarch-includes.patch
--- pywebkitgtk-1.1.8/debian/patches/fix-python-multiarch-includes.patch	1969-12-31 18:00:00.0 -0600
+++ pywebkitgtk-1.1.8/debian/patches/fix-python-multiarch-includes.patch	2013-01-21 13:04:20.0 -0600
@@ -0,0 +1,29 @@
+Description: Fix python multi-arch includes issues.
+ .
+ pywebkitgtk (1.1.8-2ubuntu4) raring; urgency=low
+ .
+   * Fix python multi-arch includes issues.
+Author: Chris J Arges chris.j.ar...@canonical.com
+
+--- pywebkitgtk-1.1.8.orig/configure
 pywebkitgtk-1.1.8/configure
+@@ -12243,7 +12243,7 @@ $as_echo $am_cv_python_pyexecdir 6;
+ $as_echo_n checking for headers required to compile python extensions...  6; }
+ py_prefix=`$PYTHON -c import sys; print sys.prefix`
+ py_exec_prefix=`$PYTHON -c import sys; print sys.exec_prefix`
+-PYTHON_INCLUDES=-I${py_prefix}/include/python${PYTHON_VERSION}
++PYTHON_INCLUDES=`$PYTHON-config --includes`
+ if test $py_prefix != $py_exec_prefix; then
+   PYTHON_INCLUDES=$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}
+ fi
+--- pywebkitgtk-1.1.8.orig/m4/python.m4
 pywebkitgtk-1.1.8/m4/python.m4
+@@ -45,7 +45,7 @@ AC_MSG_CHECKING(for headers required to
+ dnl deduce PYTHON_INCLUDES
+ py_prefix=`$PYTHON -c import sys; print sys.prefix`
+ py_exec_prefix=`$PYTHON -c import sys; print sys.exec_prefix`
+-PYTHON_INCLUDES=-I${py_prefix}/include/python${PYTHON_VERSION}
++PYTHON_INCLUDES=`$PYTHON-config --includes`
+ if test $py_prefix != $py_exec_prefix; then
+   PYTHON_INCLUDES=$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}
+ fi
diff -Nru pywebkitgtk-1.1.8/debian/patches/series pywebkitgtk-1.1.8/debian/patches/series
--- pywebkitgtk-1.1.8/debian/patches/series	2011-08-09 15:51:28.0 -0500
+++ pywebkitgtk-1.1.8/debian/patches/series	2013-01-21 13:03:32.0 -0600
@@ -1 +1,2 @@
 web_view_get_title.patch
+fix-python-multiarch-includes.patch

Bug#698662: pygoocanvas: fix python multi-arch include issues

[Chris J Arges]

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

Dear Maintainer,
This patch changes the python include paths to use python-config --includes 
instead.
This allows for both platform depdendent and generic paths to be included.

In Ubuntu, the attached patch was applied to achieve the following:

  * Fix python multi-arch include issues. 

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 
'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-36-generic (SMP w/8 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 pygoocanvas-0.14.1/debian/changelog pygoocanvas-0.14.1/debian/changelog
only in patch2:
unchanged:
--- pygoocanvas-0.14.1.orig/configure
+++ pygoocanvas-0.14.1/configure
@@ -13066,7 +13066,7 @@
 $as_echo_n checking for headers required to compile python extensions...  6; }
 py_prefix=`$PYTHON -c import sys; print sys.prefix`
 py_exec_prefix=`$PYTHON -c import sys; print sys.exec_prefix`
-PYTHON_INCLUDES=-I${py_prefix}/include/python${PYTHON_VERSION}
+PYTHON_INCLUDES=`$PYTHON-config --includes`
 if test $py_prefix != $py_exec_prefix; then
   PYTHON_INCLUDES=$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}
 fi
only in patch2:
unchanged:
--- pygoocanvas-0.14.1.orig/acinclude.m4
+++ pygoocanvas-0.14.1/acinclude.m4
@@ -45,7 +45,7 @@
 dnl deduce PYTHON_INCLUDES
 py_prefix=`$PYTHON -c import sys; print sys.prefix`
 py_exec_prefix=`$PYTHON -c import sys; print sys.exec_prefix`
-PYTHON_INCLUDES=-I${py_prefix}/include/python${PYTHON_VERSION}
+PYTHON_INCLUDES=`$PYTHON-config --includes`
 if test $py_prefix != $py_exec_prefix; then
   PYTHON_INCLUDES=$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}
 fi

Bug#698443: subversion: fix python multi-arch include issues

[Chris J Arges]

Package: subversion
Version: 1.7.5-1
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,

This patch fixes issues related python multi-arch include problems.
This casues this package to FTBFS when building in Ubuntu raring.

  * Fix python multi-arch includes issues. 


Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 
'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-35-generic (SMP w/8 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 subversion-1.7.5/debian/changelog subversion-1.7.5/debian/changelog
diff -u subversion-1.7.5/debian/rules subversion-1.7.5/debian/rules
--- subversion-1.7.5/debian/rules
+++ subversion-1.7.5/debian/rules
@@ -64,6 +64,7 @@
 	set -e; for v in $(PYVERSIONS); do \
 		$(RM) $(PY_DIR); \
 		ln -fs python$$v $(PY_DIR); \
+		pyinc=$$(python$$v-config --includes); \
 		pylib=$$(python$$v -c 'from distutils import sysconfig; print sysconfig.get_python_lib()'); \
 		$1; \
 	done
@@ -72,6 +73,7 @@
 	set -e; for v in $(PYVERSIONS); do \
 		$(RM) $(PY_DIR); \
 		ln -fs python$$v-dbg $(PY_DIR); \
+		pyinc=$$(python$$v-dbg-config --includes); \
 		pylib=$$(python$$v -c 'from distutils import sysconfig; print sysconfig.get_python_lib()'); \
 		$1; \
 	done
@@ -204,7 +206,7 @@
 	  $(MAKE_B) $@ PYTHON=python$$v PYVER=$$v $(check_defs))
 	$(call allpydbg, \
 	  $(MAKE_B) $@ PYTHON=python$$v-dbg PYVER=$${v}_d \
-		PYTHON_INCLUDES=-I/usr/include/python$${v}_d $(check_defs))
+		PYTHON_INCLUDES=$$pyinc $(check_defs))
 
 build-arch: debian/stamp-build-arch
 debian/stamp-build-arch: debian/stamp-configure
@@ -220,11 +222,11 @@
 	$(DEB_BUILDDIR)/subversion/svn/svn --version  /dev/null
 	$(call allpy, \
 	  $(MAKE_B) swig-py PYTHON=python$$v PYVER=$$v \
-	PYTHON_INCLUDES=-I/usr/include/python$$v \
+	PYTHON_INCLUDES=$$pyinc \
 	swig_pydir=$$pylib/libsvn swig_pydir_extra=$$pylib/svn)
 	$(call allpydbg, \
 	  $(MAKE_B) swig-py PYTHON=python$$v PYVER=$${v}_d \
-	PYTHON_INCLUDES=-I/usr/include/python$${v}_d \
+	PYTHON_INCLUDES=$$pyinc \
 	EXTRA_SWIG_PY_CFLAGS=-O0 \
 	swig_pydir=$$pylib/libsvn swig_pydir_extra=$$pylib/svn)
 	ln -sf python$(PYDEFAULT) $(PY_DIR)
@@ -347,7 +349,7 @@
 	$(call allpydbg, \
 	  $(MAKE_B) install-swig-py DESTDIR=$(CURDIR)/debian/tmp \
 	PYTHON=python$$v-dbg PYVER=$${v}_d \
-	PYTHON_INCLUDES=-I/usr/include/python$${v}_d \
+	PYTHON_INCLUDES=$$pyinc \
 	EXTRA_SWIG_PY_CFLAGS=-O0 \
 	swig_pydir=$$pylib/libsvn swig_pydir_extra=$$pylib/svn)
 	for i in $$(find debian/tmp/usr/lib/python* -name '*.so'); do \

Bug#698237: xen requires openssl to build

[Chris J Arges]

Package: xen
Version: 4.2.0-1
Severity: normal

Dear Maintainer,

When building the latest Debian xen 4.2.0-1 dsc in an Ubuntu raring
schroot I get a build failure due to libssl-dev not being pulled in. If
I build the same package
in a sid schroot it builds because libssl-dev is pulled in indirectly.

I think that libssl-dev should be added as a Build-Depends because it is
referenced
and required by the configure file in order to build. However, because
of this change
I understand that the debian/copyright file might need to be amended.

I see that tools/blktap/drivers/Makefile is flexible and can link
against -lgcrypt, however
tools/vtpm_manager/manager only links against -lcrypto. In addition
xen/include/crypto/vmac.h requires some libssl-dev headers to compile.

Thanks for your time,
--chris j arges


-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise-proposed'), (500, 'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-36-lowlatency (SMP w/8 CPU cores; PREEMPT)
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#697772: php-horde-ingo: fix FTBFS due to rm failure

[Chris J Arges]

Package: php-horde-ingo
Version: 3.0.1-1
Severity: serious
Tags: patch
Justification: fails to build from source (but built successfully in the
past)
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,

This patch fixes an FTBFS issue in sid for this package.
In Ubuntu, the attached patch was applied to achieve the following:

  * Add -f to rm to fix FTBFS when removing the LICENSE file.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise-proposed'), (500, 'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-35-lowlatency (SMP w/8 CPU cores; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff -Nru php-horde-ingo-3.0.1/debian/changelog php-horde-ingo-3.0.1/debian/changelog
diff -Nru php-horde-ingo-3.0.1/debian/rules php-horde-ingo-3.0.1/debian/rules
--- php-horde-ingo-3.0.1/debian/rules	2012-12-01 04:51:57.0 -0600
+++ php-horde-ingo-3.0.1/debian/rules	2013-01-09 08:35:40.0 -0600
@@ -18,5 +18,5 @@
 override_dh_auto_install:
 	dh_auto_install -O--buildsystem=phppear
 	# Remove extra license file
-	rm $(DESTDIR)/usr/share/doc/php-horde-ingo/LICENSE
+	rm -f $(DESTDIR)/usr/share/doc/php-horde-ingo/LICENSE
 

Bug#697773: php-horde-mnemo: fix FTBFS due to rm failure

[Chris J Arges]

Package: php-horde-mnemo
Version: 4.0.1-1
Severity: serious
Tags: patch
Justification: fails to build from source (but built successfully in the
past)
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,

Fix FTBFS due to rm failure.
In Ubuntu, the attached patch was applied to achieve the following:

  * Add -f to rm to fix FTBFS when removing the LICENSE file.
Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise-proposed'), (500, 'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-35-lowlatency (SMP w/8 CPU cores; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff -Nru php-horde-mnemo-4.0.1/debian/changelog php-horde-mnemo-4.0.1/debian/changelog
diff -Nru php-horde-mnemo-4.0.1/debian/rules php-horde-mnemo-4.0.1/debian/rules
--- php-horde-mnemo-4.0.1/debian/rules	2012-12-01 04:53:56.0 -0600
+++ php-horde-mnemo-4.0.1/debian/rules	2013-01-09 08:42:50.0 -0600
@@ -18,5 +18,5 @@
 override_dh_auto_install:
 	dh_auto_install -O--buildsystem=phppear
 	# Remove extra license file
-	rm $(DESTDIR)/usr/share/doc/php-horde-mnemo/LICENSE
+	rm -f $(DESTDIR)/usr/share/doc/php-horde-mnemo/LICENSE
 

Bug#697774: php-horde-turba: fix FTBFS due to rm failure

[Chris J Arges]

Package: php-horde-turba
Version: 4.0.1-1
Severity: serious
Tags: patch
Justification: fails to build from source (but built successfully in the
past)
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,

This patch fixes an FTBFS issue in sid for this package.
In Ubuntu, the attached patch was applied to achieve the following:

  * Add -f to rm to fix FTBFS when removing the LICENSE file.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise-proposed'), (500, 'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-35-lowlatency (SMP w/8 CPU cores; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff -Nru php-horde-turba-4.0.1/debian/changelog php-horde-turba-4.0.1/debian/changelog
diff -Nru php-horde-turba-4.0.1/debian/rules php-horde-turba-4.0.1/debian/rules
--- php-horde-turba-4.0.1/debian/rules	2012-12-01 04:55:24.0 -0600
+++ php-horde-turba-4.0.1/debian/rules	2013-01-09 08:43:48.0 -0600
@@ -18,5 +18,5 @@
 override_dh_auto_install:
 	dh_auto_install -O--buildsystem=phppear
 	# Remove extra license file
-	rm $(DESTDIR)/usr/share/doc/php-horde-turba/LICENSE
+	rm -f $(DESTDIR)/usr/share/doc/php-horde-turba/LICENSE
 

Bug#697714: libxcrypt: fix ftbfs due to deprecated libc locking macros

[Chris J Arges]

Package: libxcrypt
Version: 1:2.4-1.1
Severity: serious
Tags: patch
Justification: fails to build from source (but built successfully in the
past)
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,

This patch fixes an Ubuntu ftbfs for libxcrypt.
Due to a newer version of glibc that includes patch 9463518d:
http://sourceware.org/git/?p=glibc.git;a=commit;h=9463518d0d314d7bd0160315e0ef30e15be08985
libxcrypt no longer compiles on Ubuntu.
This patch replaces the __libc_lock* functions with pthread locking
functions
that behave in the same manner.

  * Change __libc_lock to use pthread_mutex interfaces because
__libc_lock interfaces were deprecated by patch 9463518d in glibc.


Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise-proposed'), (500, 'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-35-lowlatency (SMP w/8 CPU cores; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff -u libxcrypt-2.4/debian/changelog libxcrypt-2.4/debian/changelog
only in patch2:
unchanged:
--- libxcrypt-2.4.orig/src/crypt_util.c
+++ libxcrypt-2.4/src/crypt_util.c
@@ -29,8 +29,7 @@
 #endif
 #include string.h
 
-#include bits/libc-lock.h
-#define __libc_lock_t pthread_mutex_t
+#include pthread.h
 
 #ifndef STATIC
 #define STATIC static
@@ -264,7 +263,7 @@
  */
 struct crypt_data _ufc_foobar;
 
-__libc_lock_define_initialized (static, _ufc_tables_lock)
+static pthread_mutex_t _ufc_tables_lock = PTHREAD_MUTEX_INITIALIZER;
 
 #ifdef DEBUG
 
@@ -362,7 +361,7 @@
 #endif
 
   if(small_tables_initialized == 0) {
-__libc_lock_lock (_ufc_tables_lock);
+pthread_mutex_lock (_ufc_tables_lock);
 if(small_tables_initialized)
   goto small_tables_done;
 
@@ -467,7 +466,7 @@
 }
 small_tables_initialized = 1;
 small_tables_done:
-__libc_lock_unlock(_ufc_tables_lock);
+pthread_mutex_unlock(_ufc_tables_lock);
   }
 
   /*

Bug#697634: rpm: Fix multi-arch python include issues for RPM

[Chris J Arges]

Package: rpm
Version: 4.10.1-2.1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,

This fix addresses issues we are seeing in Ubuntu causing an FTBFS with
python and multi-arch support.

  * debian/patches/fix-python-multiarch-include.patch:
Fix python multiarch include issue that causes FTBFS.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise-proposed'), (500, 'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-35-lowlatency (SMP w/8 CPU cores; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff -Nru rpm-4.10.1/debian/changelog rpm-4.10.1/debian/changelog
diff -Nru rpm-4.10.1/debian/patches/fix-python-multiarch-include.patch rpm-4.10.1/debian/patches/fix-python-multiarch-include.patch
--- rpm-4.10.1/debian/patches/fix-python-multiarch-include.patch	1969-12-31 18:00:00.0 -0600
+++ rpm-4.10.1/debian/patches/fix-python-multiarch-include.patch	2013-01-07 14:01:47.0 -0600
@@ -0,0 +1,38 @@
+Description: Fix python include issues due to multiarch.
+ .
+ rpm (4.10.1-2.1ubuntu1) raring; urgency=low
+ .
+  * debian/patches/fix-python-multiarch-include.patch:
+Fix python multiarch include issue that causes FTBFS.
+Author: Chris J Arges chris.j.ar...@canonical.com
+Last-Update: 2013-01-07
+
+---
+
+
+--- a/configure.ac
 b/configure.ac
+@@ -509,10 +509,10 @@ esac],
+ 
+ AS_IF([test $enable_python = yes],[
+   AM_PATH_PYTHON([2.6],[
+-WITH_PYTHON_INCLUDE=`${PYTHON} -c 'from distutils.sysconfig import *; import sys; sys.stdout.write(get_python_inc())'`
++WITH_PYTHON_INCLUDE=`python-config --includes`
+ WITH_PYTHON_SUBPACKAGE=1
+ save_CPPFLAGS=$CPPFLAGS
+-CPPFLAGS=$CPPFLAGS -I$WITH_PYTHON_INCLUDE
++CPPFLAGS=$CPPFLAGS $WITH_PYTHON_INCLUDE
+ AC_CHECK_HEADER([Python.h],[],
+   [AC_MSG_ERROR([missing Python.h])
+   ])
+--- a/python/Makefile.am
 b/python/Makefile.am
+@@ -4,7 +4,7 @@ EXTRA_DIST = rpm/__init__.py rpm/transac
+ 
+ AM_CPPFLAGS = -I$(top_builddir)/include/
+ AM_CPPFLAGS += -I$(top_srcdir)/python
+-AM_CPPFLAGS += -I@WITH_PYTHON_INCLUDE@
++AM_CPPFLAGS += @WITH_PYTHON_INCLUDE@
+ 
+ pkgpyexec_LTLIBRARIES = _rpmmodule.la _rpmbmodule.la _rpmsmodule.la
+ pkgpyexec_DATA = rpm/__init__.py rpm/transaction.py
diff -Nru rpm-4.10.1/debian/patches/series rpm-4.10.1/debian/patches/series
--- rpm-4.10.1/debian/patches/series	2013-01-05 16:53:37.0 -0600
+++ rpm-4.10.1/debian/patches/series	2013-01-07 14:02:21.0 -0600
@@ -11,3 +11,4 @@
 lua-libname.patch
 rpm-4.9.1.2-rpmlib-filesystem-check.patch
 0001-Ensure-correct-return-code-on-malformed-signature-in.patch
+fix-python-multiarch-include.patch

Bug#697013: calcurse: FTBFS: testsuite failure

[Chris J Arges]

Package: calcurse
Version: 3.1.2-1
Followup-For: Bug #697013
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,

This patch fixes an FTBFS that exists with this package. I have tested
this with the Ubuntu version of the package.

  * Fix FTBFS for 32-bit architectures.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise-proposed'), (500, 'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-35-generic (SMP w/8 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 calcurse-3.1.2/debian/changelog calcurse-3.1.2/debian/changelog
diff -Nru calcurse-3.1.2/debian/patches/series calcurse-3.1.2/debian/patches/series
--- calcurse-3.1.2/debian/patches/series	1969-12-31 18:00:00.0 -0600
+++ calcurse-3.1.2/debian/patches/series	2013-01-04 10:02:05.0 -0600
@@ -0,0 +1 @@
+test-Use-faketime-f.patch
diff -Nru calcurse-3.1.2/debian/patches/test-Use-faketime-f.patch calcurse-3.1.2/debian/patches/test-Use-faketime-f.patch
--- calcurse-3.1.2/debian/patches/test-Use-faketime-f.patch	1969-12-31 18:00:00.0 -0600
+++ calcurse-3.1.2/debian/patches/test-Use-faketime-f.patch	2013-01-04 10:09:12.0 -0600
@@ -0,0 +1,96 @@
+From: Chris J Arges chris.j.ar...@canonical.com
+Subject: [PATCH] test/: Use `faketime -f`
+
+Description: Use the advanced timestamp specification format for libfaketime.
+  Before using that, some tests failed on 32-bit systems due to integer
+  overflows. It seems like faketime translates absolute dates to relative
+  dates by default. Moreover, libfaketime is not able to handle relative
+  dates that exceed the maximum value of a signed integer. Using -f
+  skips the conversion to relative dates.
+
+Bug-Debian: http://bugs.debian.org/697013
+
+Origin: upstream, commit 2ea91e1a8a2ee4318e3530ec2680565ad11b1585 git://git.calcurse.org/calcurse.git
+Author: Lukas Fleischer calcu...@cryptocrack.de
+
+--- a/test/appointment-001.sh
 b/test/appointment-001.sh
+@@ -6,7 +6,7 @@ if [ ! -x $(command -v faketime) ]; th
+ fi
+ 
+ if [ $1 = 'actual' ]; then
+-  faketime '2011-02-25 23:42' $CALCURSE --read-only -D $DATA_DIR -a
++  faketime -f '2011-02-25 23:42:00' $CALCURSE --read-only -D $DATA_DIR -a
+ elif [ $1 = 'expected' ]; then
+   cat EOD
+ 02/25/11:
+--- a/test/day-002.sh
 b/test/day-002.sh
+@@ -6,7 +6,8 @@ if [ ! -x $(command -v faketime) ]; th
+ fi
+ 
+ if [ $1 = 'actual' ]; then
+-  faketime '1912-06-23' $CALCURSE --read-only -D $DATA_DIR/ -d42
++  faketime -f '1912-06-23 00:00:00' $CALCURSE --read-only -D $DATA_DIR/ \
++-d42
+ elif [ $1 = 'expected' ]; then
+   cat EOD
+ 06/24/12:
+--- a/test/day-003.sh
 b/test/day-003.sh
+@@ -6,7 +6,8 @@ if [ ! -x $(command -v faketime) ]; th
+ fi
+ 
+ if [ $1 = 'actual' ]; then
+-  faketime '1912-06-23' $CALCURSE --read-only -D $DATA_DIR/ -d42
++  faketime -f '1912-06-23 00:00:00' $CALCURSE --read-only -D $DATA_DIR/ \
++-d42
+ elif [ $1 = 'expected' ]; then
+   $CALCURSE --read-only -D $DATA_DIR/ -s06/23/1912 -r42
+ else
+--- a/test/next-001.sh
 b/test/next-001.sh
+@@ -6,7 +6,7 @@ if [ ! -x $(command -v faketime) ]; th
+ fi
+ 
+ if [ $1 = 'actual' ]; then
+-  faketime '1912-07-10 04:10' $CALCURSE --read-only -D $DATA_DIR -n
++  faketime -f '1912-07-10 04:10:00' $CALCURSE --read-only -D $DATA_DIR -n
+ elif [ $1 = 'expected' ]; then
+   cat EOD
+ next appointment:
+--- a/test/range-001.sh
 b/test/range-001.sh
+@@ -6,7 +6,7 @@ if [ ! -x $(command -v faketime) ]; th
+ fi
+ 
+ if [ $1 = 'actual' ]; then
+-  faketime '2011-02-25 00:00:00' $CALCURSE --read-only -D $DATA_DIR/ -r
++  faketime -f '2011-02-25 00:00:00' $CALCURSE --read-only -D $DATA_DIR/ -r
+ elif [ $1 = 'expected' ]; then
+   cat EOD
+ 02/25/11:
+--- a/test/range-002.sh
 b/test/range-002.sh
+@@ -6,7 +6,8 @@ if [ ! -x $(command -v faketime) ]; th
+ fi
+ 
+ if [ $1 = 'actual' ]; then
+-  faketime '2000-01-01 00:00:00' $CALCURSE --read-only -D $DATA_DIR/ -r400
++  faketime -f '2000-01-01 00:00:00' $CALCURSE --read-only -D $DATA_DIR/ \
++-r400
+ elif [ $1 = 'expected' ]; then
+   cat EOD
+ 04/07/00:
+--- a/test/range-003.sh
 b/test/range-003.sh
+@@ -6,7 +6,8 @@ if [ ! -x $(command -v faketime) ]; th
+ fi
+ 
+ if [ $1 = 'actual' ]; then
+-  faketime '2000-01-01 00:00:00' $CALCURSE --read-only -D $DATA_DIR/ -r400
++  faketime -f '2000-01-01 00:00:00' $CALCURSE --read-only -D $DATA_DIR/ \
++-r400
+ elif [ $1 = 'expected' ]; then
+   $CALCURSE --read-only -D $DATA_DIR/ -s01/01/2000 -r400
+ else

Bug#693910: rsyslog: Message and memory corruption in rsyslog using RFC5424 format

[Chris J Arges]

Package: rsyslog
Version: 5.8.6-1
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,
Please consider applying this patch which fixes an rsyslogd bug.

In Ubuntu, the attached patch was applied to achieve the following:

This upstream patch was backported to fix corruption/crashes when using
RFC5424 format in rsyslogd.
Please consult:
https://bugs.launchpad.net/ubuntu/+source/rsyslog/+bug/1059592 for more
info.

  * debian/patches/101-fix-rfc5424-instabilities.patch:
- bugfix: instabilities when using RFC5424 header fields (LP: #1059592)

The upstream bug is: http://bugzilla.adiscon.com/show_bug.cgi?id=296

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise-proposed'), (500, 'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-34-generic (SMP w/8 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 rsyslog-5.8.6/debian/changelog rsyslog-5.8.6/debian/changelog
diff -Nru rsyslog-5.8.6/debian/control rsyslog-5.8.6/debian/control
--- rsyslog-5.8.6/debian/control	2012-03-30 12:10:24.0 -0500
+++ rsyslog-5.8.6/debian/control	2012-11-21 11:09:28.0 -0600
@@ -1,8 +1,7 @@
 Source: rsyslog
 Section: admin
 Priority: important
-Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
-XSBC-Original-Maintainer: Michael Biebl bi...@debian.org
+Maintainer: Michael Biebl bi...@debian.org
 Build-Depends: debhelper (= 8),
dpkg-dev (= 1.6.1),
autotools-dev (= 20100122.1),
diff -Nru rsyslog-5.8.6/debian/patches/101-fix-rfc5424-instabilities.patch rsyslog-5.8.6/debian/patches/101-fix-rfc5424-instabilities.patch
--- rsyslog-5.8.6/debian/patches/101-fix-rfc5424-instabilities.patch	1969-12-31 18:00:00.0 -0600
+++ rsyslog-5.8.6/debian/patches/101-fix-rfc5424-instabilities.patch	2012-11-21 10:26:38.0 -0600
@@ -0,0 +1,59 @@
+From: Kaiwang Chen kaiwang.c...@gmail.com
+Date: Mon, 9 Jan 2012 13:32:52 + (+0100)
+Subject: bugfix: instabilities when using RFC5424 header fields
+X-Git-Url: http://git.adiscon.com/?p=rsyslog.git;a=commitdiff_plain;h=791b16ce06d75944e338a6e5fa14c0394bde6f1d
+
+bugfix: instabilities when using RFC5424 header fields
+
+Origin: upstream, http://git.adiscon.com/?p=rsyslog.git;a=commitdiff_plain;h=791b16ce06d75944e338a6e5fa14c0394bde6f1d
+Bug: http://bugzilla.adiscon.com/show_bug.cgi?id=296
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/rsyslog/+bug/1059592
+---
+
+--- a/runtime/msg.c
 b/runtime/msg.c
+@@ -7,7 +7,7 @@
+  * of the old message code without any modifications. However, it
+  * helps to have things at the right place one we go to the meat of it.
+  *
+- * Copyright 2007, 2008 Rainer Gerhards and Adiscon GmbH.
++ * Copyright 2007-2012 Rainer Gerhards and Adiscon GmbH.
+  *
+  * This file is part of the rsyslog runtime library.
+  *
+@@ -1609,7 +1609,7 @@ char *getPROCID(msg_t *pM, sbool bLockMu
+ 
+ 	ISOBJ_TYPE_assert(pM, msg);
+ 	if(bLockMutex == LOCK_MUTEX)
+-		MsgUnlock(pM);
++		MsgLock(pM);
+ 	preparePROCID(pM, MUTEX_ALREADY_LOCKED);
+ 	if(pM-pCSPROCID == NULL)
+ 		pszRet = UCHAR_CONSTANT();
+@@ -1846,7 +1846,7 @@ static inline char *getStructuredData(ms
+ {
+ 	uchar *pszRet;
+ 
+-	MsgUnlock(pM);
++	MsgLock(pM);
+ 	if(pM-pCSStrucData == NULL)
+ 		pszRet = UCHAR_CONSTANT(-);
+ 	else 
+@@ -1894,7 +1894,7 @@ uchar *getProgramName(msg_t *pM, sbool b
+ 	uchar *pszRet;
+ 
+ 	if(bLockMutex == LOCK_MUTEX)
+-		MsgUnlock(pM);
++		MsgLock(pM);
+ 	prepareProgramName(pM, MUTEX_ALREADY_LOCKED);
+ 	if(pM-pCSProgName == NULL)
+ 		pszRet = UCHAR_CONSTANT();
+@@ -1952,7 +1952,7 @@ char *getAPPNAME(msg_t *pM, sbool bLockM
+ 
+ 	assert(pM != NULL);
+ 	if(bLockMutex == LOCK_MUTEX)
+-		MsgUnlock(pM);
++		MsgLock(pM);
+ 	prepareAPPNAME(pM, MUTEX_ALREADY_LOCKED);
+ 	if(pM-pCSAPPNAME == NULL)
+ 		pszRet = UCHAR_CONSTANT();
diff -Nru rsyslog-5.8.6/debian/patches/series rsyslog-5.8.6/debian/patches/series
--- rsyslog-5.8.6/debian/patches/series	2012-03-30 12:10:24.0 -0500
+++ rsyslog-5.8.6/debian/patches/series	2012-11-21 09:40:09.0 -0600
@@ -2,3 +2,4 @@
 01-dont_create_db.patch
 # Ubuntu patches for rsyslog
 100-imuxsock-allow-missing-date.patch
+101-fix-rfc5424-instabilities.patch

Bug#684526: whois: Remove version check from debian/rules.

[Chris J Arges]

Package: whois
Version: 5.0.18
Followup-For: Bug #684526
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Here is an updated version of the patch which allows for Ubuntu patches,
and backports.
I've tested this with those types of packages and it works perfectly.
Thanks for considering the patch.

-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-23-lowlatency (SMP w/8 CPU cores; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff -Nru whois-5.0.18/debian/changelog whois-5.0.18ubuntu1/debian/changelog
diff -Nru whois-5.0.18/debian/rules whois-5.0.18ubuntu1/debian/rules
--- whois-5.0.18/debian/rules	2012-06-24 20:15:43.0 -0500
+++ whois-5.0.18ubuntu1/debian/rules	2012-09-17 10:23:01.0 -0500
@@ -6,7 +6,7 @@
 
 D := $(CURDIR)/debian/whois
 
-VERSION := $(shell dpkg-parsechangelog | sed -n 's/ubuntu[0-9]*.*$$//; s/\+.*$$//; /^Version/s/.* //p')
+VERSION := $(shell dpkg-parsechangelog | sed -n 's/~*ubuntu[0-9]*.*$$//; s/\+.*$$//; /^Version/s/.* //p')
 
 build:
 	dh_testdir

Bug#685356: quotatool: Quota reporting on XFS filesytsems is broken. Upstream repository has fix.

[Chris J Arges]

Package: quota
Version: 4.00-4
Followup-For: Bug #685356
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

Attached is a patch that adds the upstream fix identified by David
Chinner. I have built with the patch, but haven't tested functionality yet.

  * Added upstream patch to fix issue with repquota for XFS. (Closes:
#685356)
Thanks for considering the patch.

-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-29-generic (SMP w/8 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 quota-4.00/debian/changelog quota-4.00/debian/changelog
diff -u quota-4.00/debian/patches/series quota-4.00/debian/patches/series
--- quota-4.00/debian/patches/series
+++ quota-4.00/debian/patches/series
@@ -4,0 +5 @@
+repquota_fix_xfs_reporting.diff
only in patch2:
unchanged:
--- quota-4.00.orig/debian/patches/repquota_fix_xfs_reporting.diff
+++ quota-4.00/debian/patches/repquota_fix_xfs_reporting.diff
@@ -0,0 +1,25 @@
+Author: Jan Kara j...@suse.cz
+Description; repquota: Fix reporting for XFS
+
+Conversion to generic quota scanning introduced a bug for XFS where we
+stopped scanning after quotactl reported first error. quotactl for XFS
+however reports ENOENT when it has nothing to report for a particular user
+/ group and we shouldn't stop scanning after that. We tried to test for this
+but the test was wrong. Fix it.
+
+cherry-picked from commit 6ba6546dd167297cb9ed69d0257ee245b0faea47
+
+--- a/quotaio_xfs.c
 b/quotaio_xfs.c
+@@ -183,9 +183,9 @@ static int xfs_get_dquot(struct dquot *d
+ 	memset(d, 0, sizeof(d));
+ 	ret = quotactl(qcmd, dq-dq_h-qh_quotadev, dq-dq_id, (void *)d);
+ 	if (ret  0) {
+-		if (ret == -ENOENT)
++		if (errno == ENOENT)
+ 			return 0;
+-		return ret;
++		return -1;
+ 	}
+ 	xfs_kern2utildqblk(dq-dq_dqb, d);
+ 	return 0;

Bug#684526: whois: Remove version check from debian/rules.

[Chris J Arges]

Package: whois
Version: 5.0.17
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Marco,
There has been another change in how version strings for backports are
formatted in Ubuntu.
The last change did not account for this. Is it possible to remove this
check completely?
This would make it easier to handle backports and different strings,
without having to change packaging each time. Otherwise I would be happy
to write another patch to handle the new regex.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-27-generic (SMP w/8 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 whois-5.0.17/debian/changelog whois-5.0.17ubuntu1/debian/changelog
diff -Nru whois-5.0.17/debian/rules whois-5.0.17ubuntu1/debian/rules
--- whois-5.0.17/debian/rules	2012-06-24 20:15:43.0 -0500
+++ whois-5.0.17ubuntu1/debian/rules	2012-08-10 13:02:05.0 -0500
@@ -6,8 +6,6 @@
 
 D := $(CURDIR)/debian/whois
 
-VERSION := $(shell dpkg-parsechangelog | sed -n 's/ubuntu[0-9]*.*$$//; s/\+.*$$//; /^Version/s/.* //p')
-
 build:
 	dh_testdir
 	$(MAKE) CONFIG_FILE=/etc/whois.conf HAVE_LIBIDN=1 HAVE_ICONV=1
@@ -23,9 +21,6 @@
 	dh_testdir
 	dh_clean
 
-	# sanity check
-	egrep -q '^#define VERSION $(VERSION)$$' config.h
-
 	dh_installdirs usr/bin
 	$(MAKE) install BASEDIR=$D
 	dh_installman whois.1 mkpasswd.1

Bug#678383: pixelmed: FTBFS with Java7 (uses internal Java API)

[Chris J Arges]

Package: pixelmed
Version: 20120508-1
Followup-For: Bug #678383
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

This patch fixes FTBFS errors with pixelmed.
It bumps the java version from 1.5 to 1.7 and fixes the deprecated
library issue when saving a JPEG image.

In Ubuntu, the attached patch was applied to achieve the following:

  * debian/patch/target_java_1.7.patch: Fixes FTBFS by targeting Java 1.7.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-25-generic (SMP w/8 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 pixelmed-20120508/debian/changelog pixelmed-20120508/debian/changelog
diff -Nru pixelmed-20120508/debian/patches/series pixelmed-20120508/debian/patches/series
--- pixelmed-20120508/debian/patches/series	2012-05-08 08:25:37.0 -0500
+++ pixelmed-20120508/debian/patches/series	2012-06-27 15:45:58.0 -0500
@@ -8,3 +8,4 @@
 addmanifest.patch
 fixfonts.patch
 removetest.patch
+target_java_1.7.patch
diff -Nru pixelmed-20120508/debian/patches/target_java_1.7.patch pixelmed-20120508/debian/patches/target_java_1.7.patch
--- pixelmed-20120508/debian/patches/target_java_1.7.patch	1969-12-31 18:00:00.0 -0600
+++ pixelmed-20120508/debian/patches/target_java_1.7.patch	2012-06-27 16:09:46.0 -0500
@@ -0,0 +1,89 @@
+Description: Update java to use version 1.7 instead of 1.5.
+This patch updates the Makefiles to use Java 1.7. This fixes some issues
+but causes an issue in com.pixelmed.display.ApplicationFrame. This issue
+is due to a deprecated library to be used when writing and encoding files.
+This has been updated to use the ImageIO library.
+
+Author: Chris J Arges chris.j.ar...@canonical.com
+Bug-Ubuntu: https://launchpad.net/bugs/888993
+Last-Update: 2012-06-28
+
+---
+
+Index: pixelmed-20120508/Makefile.common.mk
+===
+--- pixelmed-20120508.orig/Makefile.common.mk	2012-06-27 16:08:02.222956169 -0500
 pixelmed-20120508/Makefile.common.mk	2012-06-27 16:08:02.250956168 -0500
+@@ -43,9 +43,9 @@
+ 
+ .SUFFIXES:	.class .java .ico .png
+ 
+-#JAVACOPTIONS = -O -target 1.5 -encoding UTF8 -Xlint:deprecation -Xlint:unchecked
+-JAVACOPTIONS = -O -target 1.5 -encoding UTF8 -Xlint:deprecation
+-#JAVACOPTIONS = -g -O -target 1.5 -encoding UTF8 -Xlint:deprecation
++#JAVACOPTIONS = -O -target 1.7 -encoding UTF8 -Xlint:deprecation -Xlint:unchecked
++JAVACOPTIONS = -O -target 1.7 -encoding UTF8 -Xlint:deprecation
++#JAVACOPTIONS = -g -O -target 1.7 -encoding UTF8 -Xlint:deprecation
+ 
+ .java.class:
+ 	javac ${JAVACOPTIONS} -classpath ${PATHTOROOT} -sourcepath ${PATHTOROOT} $
+Index: pixelmed-20120508/com/pixelmed/test/Makefile
+===
+--- pixelmed-20120508.orig/com/pixelmed/test/Makefile	2012-06-27 16:08:02.246956169 -0500
 pixelmed-20120508/com/pixelmed/test/Makefile	2012-06-27 16:08:02.250956168 -0500
+@@ -73,7 +73,7 @@
+ .SUFFIXES:	.class .java
+ 
+ .java.class:
+-	javac ${JAVACOPTIONS} -classpath ${PATHTOROOT}:${VIEWERADDITIONALJARS}:${JUNITJAR} -sourcepath ${PATHTOROOT} -target 1.5 -encoding UTF8 $
++	javac ${JAVACOPTIONS} -classpath ${PATHTOROOT}:${VIEWERADDITIONALJARS}:${JUNITJAR} -sourcepath ${PATHTOROOT} -target 1.7 -encoding UTF8 $
+ 
+ archive:
+ 	tar -cvf - Makefile *.java | gzip -best  ../../../test.`date '+%Y%m%d'`.tar.gz
+Index: pixelmed-20120508/com/pixelmed/display/ApplicationFrame.java
+===
+--- pixelmed-20120508.orig/com/pixelmed/display/ApplicationFrame.java	2012-06-27 16:08:02.238956169 -0500
 pixelmed-20120508/com/pixelmed/display/ApplicationFrame.java	2012-06-27 16:09:35.226953167 -0500
+@@ -9,6 +9,7 @@
+ import java.awt.event.*; 
+ import java.util.*; 
+ import java.io.*; 
++import javax.imageio.*;
+ import javax.swing.*; 
+ import javax.swing.event.*; 
+ 
+@@ -163,7 +164,7 @@
+ 		try {
+ 			snapShotFile = File.createTempFile(snap,.jpg,new File(System.getProperty(user.home)));
+ 			java.awt.image.BufferedImage snapShotImage = new Robot().createScreenCapture(extent);
+-			com.sun.image.codec.jpeg.JPEGCodec.createJPEGEncoder(new FileOutputStream(snapShotFile)).encode(snapShotImage);
++			ImageIO.write(snapShotImage, jpeg, snapShotFile);
+ 		}
+ 		catch (Exception ex) {
+ 			ex.printStackTrace();
+Index: pixelmed-20120508/com/pixelmed/dose/Makefile
+===
+--- pixelmed-20120508.orig/com/pixelmed/dose/Makefile	2012-06-27 16:08:01.422956195 -0500
 pixelmed-20120508/com/pixelmed/dose/Makefile	2012-06-27 16:08:02.270956168 -0500
+@@ -28,7 +28,7 @@
+ .SUFFIXES

Bug#678903: gearmand: FTBFS where gcc = gcc-4.7:

[Chris J Arges]

Package: gearmand
Version: 0.33-1
Followup-For: Bug #678903
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

This minor patch adds the gcc/g++-4.6 Build-Depends to fix the ftbfs.

  * Add Build-Depends for gcc/g++-4.6.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-25-generic (SMP w/8 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 gearmand-0.33/debian/changelog gearmand-0.33/debian/changelog
diff -Nru gearmand-0.33/debian/control gearmand-0.33/debian/control
--- gearmand-0.33/debian/control	2012-06-24 06:53:11.0 -0500
+++ gearmand-0.33/debian/control	2012-06-25 16:55:59.0 -0500
@@ -8,6 +8,8 @@
  chrpath,
  debhelper (= 9),
  dh-autoreconf,
+ gcc-4.6,
+ g++-4.6,
  lcov,
  libboost-program-options-dev (= 1.39.0),
  libboost-thread-dev (= 1.39.0),

Bug#663022: unicap: FTBFS: unicapgtk_device_property.c:199: undefined reference to `fmin'

[Chris J Arges]

Package: unicap
Version: 0.9.5-1.3
Followup-For: Bug #663022
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

This patch adds -lm to libunicapgtk Makefile.am to allow non-i386 builds.

In Ubuntu, the attached patch was applied to achieve the following:

  * FTBFS: Add -lm to libunicapgtk, to fix non-i386 builds.
Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-25-generic (SMP w/8 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 unicap-0.9.5/debian/changelog unicap-0.9.5/debian/changelog
diff -u unicap-0.9.5/debian/patches/series unicap-0.9.5/debian/patches/series
--- unicap-0.9.5/debian/patches/series
+++ unicap-0.9.5/debian/patches/series
@@ -10,0 +11 @@
+2002_add_lm_to_libunicapgtk.patch
only in patch2:
unchanged:
--- unicap-0.9.5.orig/debian/patches/2002_add_lm_to_libunicapgtk.patch
+++ unicap-0.9.5/debian/patches/2002_add_lm_to_libunicapgtk.patch
@@ -0,0 +1,18 @@
+#Description: Add -lm to libunicapgtk build to fix FTBFS.
+#Author: Chris J Arges chris.j.ar...@canonical.com
+#Last-Update: 2011-06-22
+
+Index: unicap-0.9.5/libunicapgtk/Makefile.am
+===
+--- unicap-0.9.5.orig/libunicapgtk/Makefile.am	2008-06-12 10:25:12.0 -0500
 unicap-0.9.5/libunicapgtk/Makefile.am	2012-06-22 11:27:45.313445332 -0500
+@@ -40,7 +40,8 @@
+ 			  -L../libunicap/.libs \
+ 			  -lunicap \
+ 			  -L../libucil/.libs \
+-			  -lucil
++			  -lucil \
++			  -lm
+ 
+ libunicapgtk_la_CFLAGS = \
+ 			 -DUNICAP_LOCALEDIR=\$(prefix)/$(DATADIRNAME)/locale\

Bug#678415: faumachine: ftbfs with gcc-4.6 on i386

[Chris J Arges]

Package: faumachine
Version: 20110812-1.1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

This small patch just adds gcc-4.6 [i386] to debian/control so we can
build on i386. The last debian change didn't require that gcc-4.6
get installed on i386, only on amd64.

In Ubuntu, the attached patch was applied to achieve the following:

  * Add gcc-4.6 [i386] Build-Dependency to fix FTBFS.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-25-generic (SMP w/8 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 faumachine-20110812/debian/changelog faumachine-20110812/debian/changelog
diff -u faumachine-20110812/debian/control faumachine-20110812/debian/control
--- faumachine-20110812/debian/control
+++ faumachine-20110812/debian/control
@@ -20,6 +21,7 @@
  xmlto, 
  automake (= 1.10),
  gcc-4.6-multilib [amd64] | libc6-dev-i386 [amd64],
+ gcc-4.6 [i386],
  iasl,
  libfauhdli-dev (= 20110812),
  faucc (= 20090220),

Bug#678449: qjackctl: 00_settings.patch does not apply correctly

[Chris J Arges]

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

Dear Maintainer,

When building qjackctl in Ubuntu the 00_settings patch is applied.
I understand that Debian doesn't use this patch. However, this causes a
FTBFS in Ubuntu since the patch doesn't cleanly apply. I have a patch to
the patch here that fixes the issue and allows it to be applied cleanly.

  * Update 00_settings.patch so that it applies correctly fixing FTBFS.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-25-generic (SMP w/8 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 qjackctl-0.3.9/debian/patches/00_settings.patch qjackctl-0.3.9/debian/patches/00_settings.patch
--- qjackctl-0.3.9/debian/patches/00_settings.patch	2012-05-22 08:15:35.0 -0500
+++ qjackctl-0.3.9/debian/patches/00_settings.patch	2012-06-21 14:02:43.0 -0500
@@ -1,22 +1,24 @@
 Description: Apply Debian-specific patches.
+  This patch was modified from the original debian patch. 
+  It changes the default jackd patch to /usr/bin/jackd.
+  In addition, the preset sample rate is 44100.
 Origin: Debian
+Author: Chris J Arges chris.j.ar...@canonical.com
 Forwarded: not-needed

- src/qjackctlSetup.cpp |4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+Last-Update: 2012-06-21
 
 qjackctl.orig/src/qjackctlSetup.cpp
-+++ qjackctl/src/qjackctlSetup.cpp
-@@ -343,7 +343,7 @@ bool qjackctlSetup::loadPreset ( qjackct
+--- qjackctl-0.3.9.orig/src/qjackctlSetup.cpp
 qjackctl-0.3.9/src/qjackctlSetup.cpp
+@@ -345,7 +345,7 @@ bool qjackctlSetup::loadPreset ( qjackct
  	}
  
  	m_settings.beginGroup(/Settings + sSuffix);
--	preset.sServer  = m_settings.value(/Server, jackd).toString();
-+	preset.sServer  = m_settings.value(/Server, /usr/bin/jackd).toString();
+-	preset.sServerPrefix = m_settings.value(/Server, jackd).toString();
++	preset.sServerPrefix = m_settings.value(/Server, /usr/bin/jackd).toString();
  	preset.sServerName  = m_settings.value(/ServerName).toString();
  	preset.bRealtime= m_settings.value(/Realtime, true).toBool();
  	preset.bSoftMode= m_settings.value(/SoftMode, false).toBool();
-@@ -356,7 +356,7 @@ bool qjackctlSetup::loadPreset ( qjackct
+@@ -358,7 +358,7 @@ bool qjackctlSetup::loadPreset ( qjackct
  	preset.bIgnoreHW= m_settings.value(/IgnoreHW, false).toBool();
  	preset.iPriority= m_settings.value(/Priority, 0).toInt();
  	preset.iFrames  = m_settings.value(/Frames, 1024).toInt();

Bug#677130: pyppd doesn't build with python3

[Chris J Arges]

Package: pyppd
Version: 0.4.9-7
Severity: serious
Tags: patch
Justification: fails to build from source (but built successfully in the
past)
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

This patch allows pyppd to build with python3. In addition I've tested
it with
python2.7.
This modifies the setup.py long_description variable to convert loaded data
into bytes first,
then to utf-8.

*** /tmp/tmpUEI3Df/bug_body
In Ubuntu, the attached patch was applied to achieve the following:

  * debian/patches/03_python3_setup.patch: setup.py long_description fixed
to work with both python2 and 3.

Thanks for considering the patch.



-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-24-generic (SMP w/8 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 pyppd-0.4.9/debian/changelog pyppd-0.4.9/debian/changelog
diff -Nru pyppd-0.4.9/debian/patches/03_python3_setup.patch pyppd-0.4.9/debian/patches/03_python3_setup.patch
--- pyppd-0.4.9/debian/patches/03_python3_setup.patch	1969-12-31 18:00:00.0 -0600
+++ pyppd-0.4.9/debian/patches/03_python3_setup.patch	2012-06-11 11:59:36.0 -0500
@@ -0,0 +1,17 @@
+## Description: Fixes setup.py long_description to work with python3.
+## Author: Chris J Arges chris.j.ar...@canonical.com
+Index: pyppd-0.4.9/setup.py
+===
+--- pyppd-0.4.9.orig/setup.py	2012-06-11 10:53:18.130693582 -0500
 pyppd-0.4.9/setup.py	2012-06-11 10:55:45.822691880 -0500
+@@ -28,8 +28,8 @@
+ url='http://gitorious.org/vitorbaptista/pyppd/',
+ license='GPLv3',
+ description='A CUPS PostScript Printer Driver\'s compressor and generator',
+-long_description=open('README.txt').read() + \n +
+- open('ISSUES.txt').read(),
++long_description=(open('README.txt', 'rb').read() + b\n +
++ open('ISSUES.txt', 'rb').read()).decode(utf-8),
+ cmdclass={'sdist': sdist},
+ classifiers=[
+ 'Development Status :: 4 - Beta',
diff -Nru pyppd-0.4.9/debian/patches/series pyppd-0.4.9/debian/patches/series
--- pyppd-0.4.9/debian/patches/series	2012-06-05 02:52:15.0 -0500
+++ pyppd-0.4.9/debian/patches/series	2012-06-11 11:08:18.0 -0500
@@ -1,3 +1,4 @@
 00git_improve_runtime_error_handling.patch
 01_python3_compat.patch
 02_use_python3.patch
+03_python3_setup.patch

Bug#671097: Any updates on this small patch?

[Chris J Arges]

Let me know if there are any questions, or any modifications that need
to be done. Thanks,
--chris j arges



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

Bug#671097: Any updates on this small patch?

[Chris J Arges]

On 05/21/2012 12:41 PM, Marco d'Itri wrote:
 On May 21, Chris J Arges christopherar...@gmail.com wrote:
 
 Let me know if there are any questions, or any modifications that
 need to be done. Thanks,
 Why the hurry? I will apply it in time for the next upload.
 

Marco,
Ok great, no hurry. It's my first debian patch, so I was just making
sure the patch was ok.
Thanks,
--chris j arges



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

Bug#671097: whois: VERSION regex doesn't handle backport version strings

[Chris J Arges]

Package: whois
Version: 5.0.17
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Hello,

I'm trying to backport whois to an older Ubuntu release, but I've
noticed it won't build because of the VERSION check in debian/rules.

When backporting a package the version number will look like the following:
5.0.15ubuntu2~oneiric1

This will fail because the regex isn't expecting ~oneiric1. The attached
patch will expand this regex and allow for such addition to the
changelog string, and will be cut appropriately when compared with the
VERSION in config.h.

Here is the changelog addition:

  * debian/rules: Updated VERSION regex to allow for extra version strings.

Thanks for considering the patch.

-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-24-generic (SMP w/8 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 whois-5.0.16/debian/changelog whois-5.0.17/debian/changelog
diff -Nru whois-5.0.16/debian/rules whois-5.0.17/debian/rules
--- whois-5.0.16/debian/rules	2012-03-05 15:57:49.0 -0600
+++ whois-5.0.17/debian/rules	2012-05-01 14:47:07.0 -0500
@@ -6,7 +6,7 @@
 
 D := $(shell pwd)/debian/whois
 
-VERSION := $(shell dpkg-parsechangelog | sed -n 's/ubuntu[0-9]*$$//; s/\+.*$$//; /^Version/s/.* //p')
+VERSION := $(shell dpkg-parsechangelog | sed -n 's/ubuntu[0-9]*.*$$//; s/\+.*$$//; /^Version/s/.* //p')
 
 build:
 	dh_testdir