Bug#765154: gwave: FTBFS: build-dependency not installable: libgwrap-runtime-dev

2015-03-04 Thread Daniel T Chen
Package: gwave
Version: 20090213-5
Followup-For: Bug #765154

Dear Maintainer,

Attached is git commit against current src:gwave master from pkg-electronics
to resolve FTBFS. These changes were test-compiled against Ubuntu Vivid/amd64.

-- 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-31-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
commit 2b2b5ea0bedbd0b0b23158c297efba715c199656
Author: Dan crimsun@ubuntu-server
Date:   Wed Mar 4 16:48:35 2015 -0500

Resolved FTBFS

diff --git a/debian/changelog b/debian/changelog
index 200ef65..f8f0a0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+gwave (20090213-5ubuntu1) vivid-proposed; urgency=low
+
+  * Rebased on Debian's git
+  * Resolved FTBFS (Closes: #765154):
++ Completed GH to scm transition
++ Added missing variable declaration
++ Added missing library to link
+
+ -- Daniel T Chen crim...@ubuntu.com  Wed, 04 Mar 2015 12:15:14 -0500
+
 gwave (20090213-5) unstable; urgency=medium
 
   * debian/control:
diff --git a/debian/control b/debian/control
index 3defcf0..1eb8d48 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: gwave
 Section: electronics
 Priority: optional
-Maintainer: Debian Electronics Team pkg-electronics-de...@lists.alioth.debian.org
+Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
+Original-Maintainer: Debian Electronics Team pkg-electronics-de...@lists.alioth.debian.org
 Uploaders: Hamish Moffatt ham...@debian.org, أحمد المحمودي (Ahmed El-Mahmoudy) aelmahmo...@users.sourceforge.net
 Standards-Version: 3.9.5
 Build-Depends: debhelper (= 9), libgtk2.0-dev, guile-2.0-dev | libguile-dev, libglib2.0-dev, libreadline-dev, guile-gnome2-dev, guile-cairo-dev, libgwrap-runtime-dev
diff --git a/debian/patches/fix_as-needed_linking.diff b/debian/patches/fix_as-needed_linking.diff
index 102b59b..87e470c 100644
--- a/debian/patches/fix_as-needed_linking.diff
+++ b/debian/patches/fix_as-needed_linking.diff
@@ -8,8 +8,10 @@ Bug-Debian: http://bugs.debian.org/641725
 Bug-Ubuntu: https://launchpad.net/bugs/770956
 Last-Update: 2011-09-15
 
 a/spicefile/Makefile.am
-+++ b/spicefile/Makefile.am
+Index: gwave-20090213/spicefile/Makefile.am
+===
+--- gwave-20090213.orig/spicefile/Makefile.am	2015-03-04 14:53:49.184605415 -0500
 gwave-20090213/spicefile/Makefile.am	2015-03-04 14:53:49.180605415 -0500
 @@ -10,11 +10,9 @@
  
  noinst_PROGRAMS = test_read
@@ -24,8 +26,10 @@ Last-Update: 2011-09-15
 -sp2sp_LDADD= libspicefile.a
 +sp2sp_LDADD= libspicefile.a @GTK_LIBS@
  
 a/src/Makefile.in
-+++ b/src/Makefile.in
+Index: gwave-20090213/src/Makefile.in
+===
+--- gwave-20090213.orig/src/Makefile.in	2015-03-04 14:53:49.184605415 -0500
 gwave-20090213/src/Makefile.in	2015-03-04 14:59:00.784607430 -0500
 @@ -55,7 +55,7 @@
  	GtkTable_indel.$(OBJEXT)
  gwave_OBJECTS = $(am_gwave_OBJECTS)
@@ -35,8 +39,19 @@ Last-Update: 2011-09-15
  	$(LDFLAGS) -o $@
  DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
  depcomp = $(SHELL) $(top_srcdir)/depcomp
 a/spicefile/Makefile.in
-+++ b/spicefile/Makefile.in
+@@ -189,7 +189,7 @@
+ 	rgeval.c xgserver.c measurebtn.c measurebtn.h \
+ 	GtkTable_indel.c GtkTable_indel.h  xsnarf.h
+ 
+-gwave_LDADD = ../spicefile/libspicefile.a  @GTK_LIBS@ @GUILE_GNOME_LIBS@ -lX11
++gwave_LDADD = ../spicefile/libspicefile.a  @GTK_LIBS@ @GUILE_GNOME_LIBS@ -lX11 -lm
+ gwave_LDFLAGS = @GUILE_LDFLAGS@
+ AM_CFLAGS = @GTK_CFLAGS@ @GUILE_CFLAGS@ @GUILE_GNOME_CFLAGS@ \
+ 	-DDATADIR=\$(datadir)\ -DBINGWAVE=\$(bindir)/gwave\
+Index: gwave-20090213/spicefile/Makefile.in
+===
+--- gwave-20090213.orig/spicefile/Makefile.in	2015-03-04 14:53:49.184605415 -0500
 gwave-20090213/spicefile/Makefile.in	2015-03-04 14:53:49.184605415 -0500
 @@ -186,11 +186,9 @@
  libspicefile_a_SOURCES = spicestream.c ss_cazm.c ss_hspice.c ss_spice3.c ss_spice2.c ss_nsout.c spicestream.h wavefile.c wavefile.h spice2.h ssintern.h
  AM_CFLAGS = @GTK_CFLAGS@
diff --git a/debian/patches/guile2.0.diff b/debian/patches/guile2.0.diff
index e4a6428..38b76b3 100644
--- a/debian/patches/guile2.0.diff
+++ b/debian/patches/guile2.0.diff
@@ -6,8 +6,8 @@ Bug-Debian: http://bugs.debian.org/746003
 
 Index: gwave-20090213/src/scwm_guile.h
 ===
 gwave-20090213.orig/src/scwm_guile.h
-+++ gwave-20090213/src/scwm_guile.h
+--- gwave-20090213.orig/src/scwm_guile.h	2015-03-04 14:59:23.528607577 -0500
 gwave-20090213/src/scwm_guile.h	2015-03

Bug#741818: tkgate: FTBFS: block.c:1103:20: error: 'Tcl_Interp' has no member named 'result'

2014-03-28 Thread Daniel T Chen
Package: tkgate
Version: 2.0~b10-3
Followup-For: Bug #741818
User: debian-de...@lists.debian.org
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

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

  * Resolve FTBFS:
- Use Tcl/Tk 8.5 as build-dependencies;
- Use autotools-dev helper for newer arches.


This debdiff may contain extraneous metadata. If so, kindly please ignore
them. 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.11.0-19-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u tkgate-2.0~b10/debian/changelog tkgate-2.0~b10/debian/changelog
diff -u tkgate-2.0~b10/debian/control tkgate-2.0~b10/debian/control
--- tkgate-2.0~b10/debian/control
+++ tkgate-2.0~b10/debian/control
@@ -1,11 +1,12 @@
 Source: tkgate
 Section: electronics
 Priority: optional
-Maintainer: Debian Science Maintainers debian-science-maintain...@lists.alioth.debian.org
+Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
+XSBC-Original-Maintainer: Debian Science Maintainers debian-science-maintain...@lists.alioth.debian.org
 Uploaders: أحمد المحمودي (Ahmed El-Mahmoudy) aelmahmo...@users.sourceforge.net,
 	   Georges Khaznadar georg...@debian.org
 Standards-Version: 3.9.5
-Build-Depends: debhelper (=7.0.50~), tcl-dev, tk-dev, bison|byacc, flex,
+Build-Depends: debhelper (=7.0.50~), tcl8.5-dev, tk8.5-dev, bison|byacc, flex,
  xutils-dev, libx11-dev, quilt (= 0.46-7~), autotools-dev,
  hardening-wrapper
 Homepage: http://www.tkgate.org/
diff -u tkgate-2.0~b10/debian/rules tkgate-2.0~b10/debian/rules
--- tkgate-2.0~b10/debian/rules
+++ tkgate-2.0~b10/debian/rules
@@ -5,7 +5,7 @@
 export DEB_BUILD_HARDENING=1
 
 %:
-	dh $@ --with quilt
+	dh $@ --with quilt,autotools_dev
 
 override_dh_auto_configure:
 	dh_auto_configure -- LDFLAGS=$(LDFLAGS) -Wl,--as-needed -lm
@@ -21 +21 @@
-	rm -f libexec/*
\ No newline at end of file
+	rm -f libexec/*


Bug#727323: arp-scan: run dh-autoreconf to update config.{sub, guess} and {libtool, aclocal}.m4

2014-03-03 Thread Daniel T Chen
Package: arp-scan
Version: 1.8.1-2
Followup-For: Bug #727323
User: debian-de...@lists.debian.org
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

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

  * Use autotools helper for newer arches (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.11.0-18-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 arp-scan-1.8.1/debian/rules arp-scan-1.8.1/debian/rules
--- arp-scan-1.8.1/debian/rules	2011-07-04 20:46:45.0 -0400
+++ arp-scan-1.8.1/debian/rules	2014-03-03 17:08:29.0 -0500
@@ -4,7 +4,7 @@
 #export DH_OPTIONS=-v
 
 %:
-	dh  $@
+	dh  $@ --with autotools_dev
 
 override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog


Bug#727912: kasumi: [PATCH] Fix autotools-dev dh helper use

2014-02-19 Thread Daniel T Chen
Package: kasumi
Version: 2.5-3
Followup-For: Bug #727912
User: debian-de...@lists.debian.org
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

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

  * Correct addition of autotools-dev dh helper for arm64 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.11.0-17-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 kasumi-2.5/debian/rules kasumi-2.5/debian/rules
--- kasumi-2.5/debian/rules	2013-06-09 18:55:48.0 -0400
+++ kasumi-2.5/debian/rules	2014-02-18 22:02:47.0 -0500
@@ -3,7 +3,7 @@
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
 %:
-	dh $@ --with-autotools-dev
+	dh $@ --with autotools_dev
 
 override_dh_build:
 	dh_build


Bug#727902: inotify-tools: run dh-autoreconf to update config.{sub, guess} and {libtool, aclocal}.m4

2014-02-17 Thread Daniel T Chen
Package: inotify-tools
Version: 3.14-1
Followup-For: Bug #727902
User: debian-de...@lists.debian.org
Usertags: origin-ubuntu trusty ubuntu-patch autoreconf

Dear Maintainer,

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

  * Use dh-autoreconf for newer arches (Closes: #727902).


This debdiff may contain extraneous metadata. If so, kindly please ignore
them. 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.11.0-17-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 inotify-tools-3.14/debian/changelog inotify-tools-3.14/debian/changelog
diff -Nru inotify-tools-3.14/debian/control inotify-tools-3.14/debian/control
--- inotify-tools-3.14/debian/control	2012-06-18 05:28:46.0 -0400
+++ inotify-tools-3.14/debian/control	2014-02-17 14:16:23.0 -0500
@@ -1,8 +1,10 @@
 Source: inotify-tools
 Section: misc
 Priority: optional
-Maintainer: Ryan Niebur r...@debian.org
+Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
+XSBC-Original-Maintainer: Ryan Niebur r...@debian.org
 Build-Depends: debhelper (= 7.0.50~), doxygen, autotools-dev, linux-libc-dev | linux-kernel-headers (= 2.6.18)
+ ,dh-autoreconf
 Standards-Version: 3.9.3
 Vcs-Git: git://anonscm.debian.org/git/collab-maint/inotify-tools.git/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/inotify-tools.git;a=summary
diff -Nru inotify-tools-3.14/debian/rules inotify-tools-3.14/debian/rules
--- inotify-tools-3.14/debian/rules	2012-06-18 05:24:32.0 -0400
+++ inotify-tools-3.14/debian/rules	2014-02-17 14:16:34.0 -0500
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@
+	dh $@ --with autoreconf
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(shell dpkg-buildflags --export=configure)


Bug#727904: jaula: run dh-autoreconf to update config.{sub, guess} and {libtool, aclocal}.m4

2014-02-17 Thread Daniel T Chen
Package: jaula
Version: 1.4.0-3
Followup-For: Bug #727904
User: debian-de...@lists.debian.org
Usertags: origin-ubuntu trusty ubuntu-patch autoreconf

Dear Maintainer,

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

  * Use dh-autoreconf for newer arches, resolving FTBFS
(Closes: #727904).


This debdiff may contain extraneous metadata. If so, kindly please ignore
them. 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.11.0-17-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u jaula-1.4.0/debian/control jaula-1.4.0/debian/control
--- jaula-1.4.0/debian/control
+++ jaula-1.4.0/debian/control
@@ -1,9 +1,10 @@
 Source: jaula
 Section: libs
 Priority: extra
-Maintainer: Loic Dachary (OuoU) l...@debian.org
+Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
+XSBC-Original-Maintainer: Loic Dachary (OuoU) l...@debian.org
 Standards-Version: 3.8.3
-Build-Depends: debhelper (= 5), flex, doxygen, dpatch
+Build-Depends: debhelper (= 5), flex, doxygen, dpatch, dh-autoreconf
 Uploaders: Ola Lundqvist o...@debian.org
 
 Package: libjaula1
diff -u jaula-1.4.0/debian/rules jaula-1.4.0/debian/rules
--- jaula-1.4.0/debian/rules
+++ jaula-1.4.0/debian/rules
@@ -35,8 +35,9 @@
 #major=`ls src/.libs/lib*.so.* | \
 # awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
 
-config.status: configure
+config.status: configure.in
 	dh_testdir
+	dh_autoreconf
 	# Add here commands to configure the package.
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=/usr --sysconfdir=/etc --disable-extended-debug \
@@ -69,14 +70,8 @@
 	[ ! -f Makefile ] || $(MAKE) clean
 	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f doc/jaula.tag
-ifneq $(wildcard /usr/share/misc/config.sub) 
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq $(wildcard /usr/share/misc/config.guess) 
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-
 
+	dh_autoreconf_clean
 	dh_clean 
 
 install: build
diff -u jaula-1.4.0/debian/changelog jaula-1.4.0/debian/changelog


Bug#727911: jwm: [PATCH] Use autotools_dev helper for dh

2014-02-17 Thread Daniel T Chen
Package: jwm
Version: 2.1.0+svn579-2
Followup-For: Bug #727911
User: debian-de...@lists.debian.org
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

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

  * Use autotools-dev for newer arches (closes: #727911).


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.11.0-17-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 jwm-2.1.0+svn579/debian/rules jwm-2.1.0+svn579/debian/rules
--- jwm-2.1.0+svn579/debian/rules	2012-11-18 13:33:23.0 -0500
+++ jwm-2.1.0+svn579/debian/rules	2014-02-17 21:53:01.0 -0500
@@ -32,6 +32,6 @@
 	# Disable. See debian/install instead.
 
 %:
-	dh $@
+	dh $@ --with autotools_dev
 
 # End of file


Bug#739391: jwm: [PATCH] Implicit declaration of Fribidi functions

2014-02-17 Thread Daniel T Chen
Package: jwm
Version: 2.1.0+svn579-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

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

  * Correct use of missing Fribidi functions.


On some 64-bit arches, implicitly declared functions result in segfaults
at runtime. This patch corrects those function uses. 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.11.0-17-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 jwm-2.1.0+svn579/debian/patches/60-fribidi.patch jwm-2.1.0+svn579/debian/patches/60-fribidi.patch
--- jwm-2.1.0+svn579/debian/patches/60-fribidi.patch	1969-12-31 19:00:00.0 -0500
+++ jwm-2.1.0+svn579/debian/patches/60-fribidi.patch	2014-02-17 22:27:28.0 -0500
@@ -0,0 +1,20 @@
+Index: jwm-2.1.0+svn579/src/font.c
+===
+--- jwm-2.1.0+svn579.orig/src/font.c	2012-01-26 20:04:17.0 -0500
 jwm-2.1.0+svn579/src/font.c	2014-02-17 22:27:26.906074506 -0500
+@@ -248,11 +248,13 @@
+ #ifdef USE_FRIBIDI
+ 
+temp = AllocateStack((len + 1) * sizeof(FriBidiChar));
+-   unicodeLength = fribidi_utf8_to_unicode((char*)str, len, temp);
++   unicodeLength = fribidi_charset_to_unicode(FRIBIDI_CHAR_SET_UTF8,
++  (char*)str, len, temp);
+ 
+fribidi_log2vis(temp, unicodeLength, type, temp, NULL, NULL, NULL);
+ 
+-   fribidi_unicode_to_utf8(temp, len, (char*)temp);
++   fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_UTF8, temp, len,
++  (char*)temp);
+output = (char*)temp;
+ 
+ #else
diff -Nru jwm-2.1.0+svn579/debian/patches/series jwm-2.1.0+svn579/debian/patches/series
--- jwm-2.1.0+svn579/debian/patches/series	2012-11-18 13:33:23.0 -0500
+++ jwm-2.1.0+svn579/debian/patches/series	2014-02-17 22:21:12.0 -0500
@@ -6,3 +6,4 @@
 50-jwmrc--removed-menus.patch
 55-alt-tab.patch
 57-jwmrc--debian-include.patch
+60-fribidi.patch


Bug#738877: freehdl: [PATCH] Enable build on newer arches

2014-02-13 Thread Daniel T Chen
Package: freehdl
Version: 0.0.7-1.1
Severity: wishlist
Tags: patch
User: debian-de...@lists.debian.org
Usertags: origin-ubuntu trusty ubuntu-patch autoreconf

Dear Maintainer,

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

  * Use dh-autoreconf for newer arches, e.g., x32, arm64, ppc64el.


This debdiff may contain extraneous metadata. If so, kindly please ignore
them. 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.11.0-17-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u freehdl-0.0.7/debian/control freehdl-0.0.7/debian/control
--- freehdl-0.0.7/debian/control
+++ freehdl-0.0.7/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
 XSBC-Original-Maintainer: José L. Redrejo Rodríguez jredr...@debian.org
-Build-Depends: debhelper (= 5.0.0), bison, flex, pkg-config, libtool
+Build-Depends: debhelper (= 5.0.0), bison, flex, pkg-config, libtool, dh-autoreconf
 Homepage: http://www.freehdl.seul.org
 Standards-Version: 3.8.1
 
@@ -32,7 +32,7 @@
 Package: libfreehdl0
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: VHDL simulator for Linux (shared libraries)
  This is a free VHDL simulator with these features:
   * Has a graphical waveform viewer.
diff -u freehdl-0.0.7/debian/rules freehdl-0.0.7/debian/rules
--- freehdl-0.0.7/debian/rules
+++ freehdl-0.0.7/debian/rules
@@ -16,7 +16,7 @@
 
 config.status: configure
 	dh_testdir
-
+	dh_autoreconf
 	CFLAGS=$(CFLAGS) ./configure --host=$(DEB_HOST_GNU_TYPE)  --prefix=/usr \
 	--mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info 
 
@@ -34,6 +34,7 @@
 	rm -f build-stamp 
 	rm -f config.log
 	 [ ! -f Makefile ] || $(MAKE) distclean
+	dh_autoreconf_clean
 	dh_clean 
 
 install: build
diff -u freehdl-0.0.7/debian/changelog freehdl-0.0.7/debian/changelog


Bug#738272: e17: [PATCH] Enable build on newer arches

2014-02-08 Thread Daniel T Chen
Package: e17
Version: 0.17.3-2
Severity: wishlist
Tags: patch
User: debian-de...@lists.debian.org
Usertags: origin-ubuntu trusty ubuntu-patch autoreconf

Dear Maintainer,

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

  * Use dh-autoreconf for newer arches.


This debdiff may contain extraneous metadata. If so, please kindly ignore
them. 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.11.0-17-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 e17-0.17.3/debian/changelog e17-0.17.3/debian/changelog
diff -Nru e17-0.17.3/debian/control e17-0.17.3/debian/control
--- e17-0.17.3/debian/control	2013-11-02 09:42:27.0 -0400
+++ e17-0.17.3/debian/control	2014-02-08 14:04:18.0 -0500
@@ -1,10 +1,11 @@
 Source: e17
 Section: x11
 Priority: optional
-Maintainer:  Debian Pkg-e Team pkg-e-de...@lists.alioth.debian.org
+Maintainer:  Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
+XSBC-Original-Maintainer:  Debian Pkg-e Team pkg-e-de...@lists.alioth.debian.org
 Uploaders: Albin Tonnerre lu...@debian.org,
  Jan Lübbe jlue...@debian.org
-Build-Depends: debhelper (= 6), cdbs,
+Build-Depends: debhelper (= 6), cdbs, dh-autoreconf,
  libeet-dev (= 1.7.7), libeio-dev (= 1.7.7),
  libedje-dev (= 1.7.7), libefreet-dev (= 1.7.7),
  libecore-dev (= 1.7.7), libedbus-dev (= 1.7.7),
diff -Nru e17-0.17.3/debian/rules e17-0.17.3/debian/rules
--- e17-0.17.3/debian/rules	2013-11-02 09:42:27.0 -0400
+++ e17-0.17.3/debian/rules	2014-02-08 14:03:31.0 -0500
@@ -2,6 +2,7 @@
 
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
 
 DEB_HOST_GNU_SYSTEM=$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
 DEB_HOST_GNU_CPU=$(shell dpkg-architecture -qDEB_HOST_GNU_CPU)


Bug#737641: dacs: [PATCH] Enable build on newer arches

2014-02-04 Thread Daniel T Chen
Package: dacs
Version: 1.4.28b-3
Severity: wishlist
Tags: patch
User: debian-de...@lists.debian.org
Usertags: origin-ubuntu trusty ubuntu-patch autoreconf

Dear Maintainer,

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

  * Use dh-autoreconf and dh_autotools-dev* for newer arches.
- Specify autoconf macros directory.


This debdiff may contain extraneous metadata. If so, kindly please ignore
them. 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.11.0-15-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 dacs-1.4.28b/debian/autoreconf dacs-1.4.28b/debian/autoreconf
--- dacs-1.4.28b/debian/autoreconf	1969-12-31 19:00:00.0 -0500
+++ dacs-1.4.28b/debian/autoreconf	2014-02-04 09:25:17.0 -0500
@@ -0,0 +1 @@
+src
diff -Nru dacs-1.4.28b/debian/changelog dacs-1.4.28b/debian/changelog
diff -Nru dacs-1.4.28b/debian/control dacs-1.4.28b/debian/control
--- dacs-1.4.28b/debian/control	2013-07-16 11:18:33.0 -0400
+++ dacs-1.4.28b/debian/control	2014-02-04 10:01:22.0 -0500
@@ -1,11 +1,12 @@
 Source: dacs
 Section: web
 Priority: optional
-Maintainer: Christoph Berg m...@debian.org
+Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
+XSBC-Original-Maintainer: Christoph Berg m...@debian.org
 Uploaders: Martin Zobel-Helas zo...@debian.org
 Build-Depends: debhelper (= 7),
  apache2-dev, libssl-dev, libexpat1-dev, chrpath,
- libsasl2-dev, libperl-dev, libldap2-dev, autotools-dev,
+ libsasl2-dev, libperl-dev, libldap2-dev, dh-autoreconf, autotools-dev,
  groff-base, xsltproc, docbook-xsl, libxmlsec1-dev, libpam0g-dev
 Standards-Version: 3.9.4
 Homepage: http://dacs.dss.ca/
diff -Nru dacs-1.4.28b/debian/patches/autoconf-macros-dir dacs-1.4.28b/debian/patches/autoconf-macros-dir
--- dacs-1.4.28b/debian/patches/autoconf-macros-dir	1969-12-31 19:00:00.0 -0500
+++ dacs-1.4.28b/debian/patches/autoconf-macros-dir	2014-02-04 09:42:46.0 -0500
@@ -0,0 +1,14 @@
+Index: dacs-1.4.28b/src/configure.ac
+===
+--- dacs-1.4.28b.orig/src/configure.ac	2014-02-04 09:37:55.008706996 -0500
 dacs-1.4.28b/src/configure.ac	2014-02-04 09:42:44.548491223 -0500
+@@ -24,7 +24,8 @@
+ 
+ AC_PREFIX_DEFAULT(/usr/local/dacs)
+ 
+-AC_CONFIG_AUX_DIR(./conftools)
++AC_CONFIG_AUX_DIR([./conftools])
++AC_CONFIG_MACRO_DIR([./conftools])
+ 
+ AC_CONFIG_SRCDIR([var.c])
+ 
diff -Nru dacs-1.4.28b/debian/patches/series dacs-1.4.28b/debian/patches/series
--- dacs-1.4.28b/debian/patches/series	2013-07-17 14:35:49.0 -0400
+++ dacs-1.4.28b/debian/patches/series	2014-02-04 09:28:19.0 -0500
@@ -2,3 +2,4 @@
 ssl_hook_Fixup
 libtool-shell
 shared-library-linkage
+autoconf-macros-dir
diff -Nru dacs-1.4.28b/debian/rules dacs-1.4.28b/debian/rules
--- dacs-1.4.28b/debian/rules	2013-07-17 14:38:21.0 -0400
+++ dacs-1.4.28b/debian/rules	2014-02-04 09:44:06.0 -0500
@@ -2,6 +2,7 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+export AUTOHEADER = true
 
 PKG_APACHE2:= libapache2-mod-dacs
 PKG_DACS   := dacs
@@ -69,15 +70,8 @@
 	   exit 1 ;\
 	fi
 
-ifneq $(wildcard /usr/share/misc/config.sub) 
-	rm -f src/conftools/config.sub
-	cp -f /usr/share/misc/config.sub src/conftools/config.sub
-endif
-ifneq $(wildcard /usr/share/misc/config.guess) 
-	rm -f src/conftools/config.guess
-	cp -f /usr/share/misc/config.guess src/conftools/config.guess
-endif
-
+	dh_autotools-dev_updateconfig
+	dh_autoreconf
 
 	#Linking external libraries and programs
 	# Apache
@@ -228,13 +222,6 @@
 	[ ! -f $(CURDIR)/src/Makefile ] || $(MAKE) -C $(CURDIR)/src distclean
 	[ ! -f $(CURDIR)/apache/Makefile ] || $(MAKE) -C $(CURDIR)/apache distclean
 
-ifneq $(wildcard /usr/share/misc/config.sub) 
-	rm -f src/conftools/config.sub
-endif
-ifneq $(wildcard /usr/share/misc/config.guess) 
-	rm -f src/conftools/config.guess
-endif
-
 	rm -f man/docbook-xsl
 	rm -f man/*.html
 	rm -f man/*.man
@@ -258,5 +245,7 @@
 	rm -f src/.ownername src/.groupname
 
 	rm -f configure-stamp build-stamp
+	dh_autoreconf_clean
+	dh_autotools-dev_restoreconfig
+	rm -f src/conftools/lt* src/conftools/libtool.m4
 	dh_clean
-


Bug#723964: devtodo: [PATCH] Enable build on newer arches and resolve FTBFS

2014-02-04 Thread Daniel T Chen
Package: devtodo
Version: 0.1.20-6
Followup-For: Bug #723964
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

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

  * Unconditionally add missing auto* files, resolving 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.11.0-15-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 devtodo-0.1.20/debian/rules devtodo-0.1.20/debian/rules
--- devtodo-0.1.20/debian/rules	2012-06-18 21:28:47.0 -0400
+++ devtodo-0.1.20/debian/rules	2014-02-04 11:22:09.0 -0500
@@ -15,7 +15,7 @@
 build-stamp:
 	ln -sf /usr/share/misc/config.sub config.sub
 	ln -sf /usr/share/misc/config.guess config.guess
-	autoreconf
+	autoreconf -f -i
 	dh build
 	touch build-stamp
 


Bug#533687: dhcping: [PATCH] Enable builds on newer arches

2014-02-04 Thread Daniel T Chen
Package: dhcping
Version: 1.2-4
Followup-For: Bug #533687
User: debian-de...@lists.debian.org
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

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

  * Use autotools-dev for newer arches (closes: Bug#533687)


This debdiff may contain extraneous metadata. If so, kindly please ignore
them. 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.11.0-15-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u dhcping-1.2/debian/rules dhcping-1.2/debian/rules
--- dhcping-1.2/debian/rules
+++ dhcping-1.2/debian/rules
@@ -37,6 +37,7 @@
 endif
 
 build:
+	dh_autotools-dev_updateconfig
 	test -f config.cache || ./configure
 	$(MAKE) CFLAGS=$(CFLAGS)
 	touch stamp-build
@@ -46,6 +47,8 @@
 	rm -f stamp-build
 	test ! -f Makefile || $(MAKE) distclean
 	rm -rf *~ copyright.txt
+	dh_autotools-dev_restoreconfig
+	dh_clean
 
 debclean:
 # Cleans debian binary directories to allow binary creation
diff -u dhcping-1.2/debian/control dhcping-1.2/debian/control
--- dhcping-1.2/debian/control
+++ dhcping-1.2/debian/control
@@ -1,7 +1,9 @@
 Source: dhcping
 Section: admin
 Priority: optional
-Maintainer: Martin Schulze j...@debian.org
+Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
+XSBC-Original-Maintainer: Martin Schulze j...@debian.org
+Build-Depends: debhelper, autotools-dev
 Standards-Version: 3.6.2
 
 Package: dhcping
diff -u dhcping-1.2/debian/changelog dhcping-1.2/debian/changelog


Bug#737368: ctemplate: [PATCH] Enable build on newer arches

2014-02-01 Thread Daniel T Chen
Package: ctemplate
Version: 2.2-4
Severity: wishlist
Tags: patch
User: debian-de...@lists.debian.org
Usertags: origin-ubuntu trusty ubuntu-patch autoreconf

Dear Maintainer,

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

  * Use dh-autoreconf for newer arches, resolving 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.11.0-15-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 ctemplate-2.2/debian/changelog ctemplate-2.2/debian/changelog
diff -Nru ctemplate-2.2/debian/control ctemplate-2.2/debian/control
--- ctemplate-2.2/debian/control	2013-11-08 22:28:09.0 -0500
+++ ctemplate-2.2/debian/control	2014-02-01 20:29:30.0 -0500
@@ -1,9 +1,10 @@
 Source: ctemplate
 Section: libdevel
 Priority: optional
-Maintainer: Debian KDE Extras Team pkg-kde-ext...@lists.alioth.debian.org
+Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
+XSBC-Original-Maintainer: Debian KDE Extras Team pkg-kde-ext...@lists.alioth.debian.org
 Uploaders: Mark Purcell m...@debian.org, Florian Reinhard florian.reinh...@googlemail.com
-Build-Depends: debhelper (= 7.0.50~), autotools-dev
+Build-Depends: debhelper (= 7.0.50~), dh-autoreconf
 Standards-Version: 3.9.4
 Vcs-Svn: svn://anonscm.debian.org/pkg-kde/kde-extras/ctemplate/trunk
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-kde/kde-extras/ctemplate/trunk
diff -Nru ctemplate-2.2/debian/rules ctemplate-2.2/debian/rules
--- ctemplate-2.2/debian/rules	2013-11-08 22:28:09.0 -0500
+++ ctemplate-2.2/debian/rules	2014-02-01 20:29:38.0 -0500
@@ -3,7 +3,7 @@
 export PTHREAD_CFLAGS=-lpthread
 
 %:
-	dh $@ --parallel --with autotools_dev
+	dh $@ --parallel --with autoreconf
 
 override_dh_auto_configure:
 	dh_auto_configure -- --program-prefix=ctemplate-


Bug#737157: source-highlight: [PATCH] Enable build on newer arches

2014-01-30 Thread Daniel T Chen
Package: source-highlight
Version: 3.1.6-2
Severity: wishlist
Tags: patch
User: debian-de...@lists.debian.org
Usertags: origin-ubuntu trusty ubuntu-patch autoreconf

Dear Maintainer,

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

  * Use dh-autoreconf for newer arches.
  * Backport upstream git changeset a9beab95 for AM_CPPFLAGS warning
using newer auto*.


This debdiff may contain extraneous metadata. If so, kindly please ignore
them. 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.11.0-15-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 source-highlight-3.1.6/debian/changelog source-highlight-3.1.6/debian/changelog
diff -Nru source-highlight-3.1.6/debian/control source-highlight-3.1.6/debian/control
--- source-highlight-3.1.6/debian/control	2013-11-05 06:23:19.0 -0500
+++ source-highlight-3.1.6/debian/control	2014-01-30 12:50:57.0 -0500
@@ -1,8 +1,9 @@
 Source: source-highlight
 Section: devel
 Priority: optional
-Maintainer: Peter Eisentraut pet...@debian.org
-Build-Depends: automake1.11, autotools-dev, debhelper (= 7.0.50~), exuberant-ctags, help2man, texi2html, texinfo, gawk, libboost-regex-dev
+Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
+XSBC-Original-Maintainer: Peter Eisentraut pet...@debian.org
+Build-Depends: dh-autoreconf, debhelper (= 7.0.50~), exuberant-ctags, help2man, texi2html, texinfo, gawk, libboost-regex-dev
 Standards-Version: 3.9.4
 Homepage: http://www.gnu.org/software/src-highlite/
 
diff -Nru source-highlight-3.1.6/debian/patches/automake_cppflags.patch source-highlight-3.1.6/debian/patches/automake_cppflags.patch
--- source-highlight-3.1.6/debian/patches/automake_cppflags.patch	1969-12-31 19:00:00.0 -0500
+++ source-highlight-3.1.6/debian/patches/automake_cppflags.patch	2014-01-30 13:11:03.0 -0500
@@ -0,0 +1,96 @@
+From a9beab9522b7f542f2a1fd624c3acfa244520ce1 Mon Sep 17 00:00:00 2001
+From: Lorenzo Bettini bett...@dsi.unifi.it
+Date: Sat, 14 Apr 2012 13:44:10 +
+Subject: Use AM_CPPFLAGS instead the obsolete INCLUDES
+
+---
+Index: source-highlight-3.1.6/lib/examples/Makefile.am
+===
+--- source-highlight-3.1.6.orig/lib/examples/Makefile.am	2011-12-16 12:10:10.0 -0500
 source-highlight-3.1.6/lib/examples/Makefile.am	2014-01-30 13:10:37.746798419 -0500
+@@ -8,7 +8,12 @@
+ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ 
+-AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl $(BOOST_CPPFLAGS) \
++AM_CPPFLAGS = \
++	-I$(top_srcdir)/gl \
++	-I$(top_builddir)/gl \
++	-I$(top_srcdir)/src \
++	-I$(srcdir)/.. \
++	$(BOOST_CPPFLAGS) \
+ 	-D DATADIR=\$(top_srcdir)/src/\
+ AM_LDFLAGS = $(BOOST_LDFLAGS) -no-install
+ 
+@@ -17,8 +22,6 @@
+ #LIBDIR = $(top_builddir)/lib/srchilite/
+ LIBDIR = ../srchilite/
+ 
+-INCLUDES = -I@top_srcdir@/src -I@srcdir@/..
+-
+ check_PROGRAMS = source-highlight-console infoformatter styleformatter
+ 
+ source_highlight_console_SOURCES = source-highlight-console-main.cpp
+Index: source-highlight-3.1.6/lib/srchilite/Makefile.am
+===
+--- source-highlight-3.1.6.orig/lib/srchilite/Makefile.am	2011-12-16 12:10:10.0 -0500
 source-highlight-3.1.6/lib/srchilite/Makefile.am	2014-01-30 13:10:37.746798419 -0500
+@@ -51,7 +51,7 @@
+ 	rm -f $(builddir)/html/*
+ endif
+ 
+-AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl $(BOOST_CPPFLAGS)
++AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl -I$(top_srcdir)/src $(BOOST_CPPFLAGS)
+ AM_LDFLAGS = $(BOOST_LDFLAGS)
+ 
+ LDADD = $(top_builddir)/gl/libgnu.la
+@@ -140,8 +140,6 @@
+  sourcehighlightutils.h utils.h \
+  instances.h
+ 
+-INCLUDES = -I@top_srcdir@/src
+-
+ EXTRA_DIST = $(h_sources) \
+ langelemsprinter_dbtab.cc \
+ highlightstatebuilder_dbtab.cc \
+Index: source-highlight-3.1.6/lib/tests/Makefile.am
+===
+--- source-highlight-3.1.6.orig/lib/tests/Makefile.am	2011-12-16 12:10:12.0 -0500
 source-highlight-3.1.6/lib/tests/Makefile.am	2014-01-30 13:10:37.746798419 -0500
+@@ -8,7 +8,11 @@
+ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ 
+-AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl $(BOOST_CPPFLAGS)
++AM_CPPFLAGS = \
++	-I$(top_srcdir)/gl \
++	-I$(top_builddir)/gl \
++	-I$(top_srcdir)/src -I$(srcdir)/..
++	$(BOOST_CPPFLAGS)
+ 

Bug#737068: sane-backends-extras: [PATCH] Enable build on newer arches

2014-01-29 Thread Daniel T Chen
Package: sane-backends-extras
Version: 1.0.22.3
Severity: wishlist
Tags: patch
User: debian-de...@lists.debian.org
Usertags: origin-ubuntu trusty ubuntu-patch autoreconf

Dear Maintainer,

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

  * Use dh-autoreconf for newer arches, resolving FTBFS.


This debdiff may contain extraneous metadata. If so, please kindly ignore
them. 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.11.0-15-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 sane-backends-extras-1.0.22.3/debian/changelog sane-backends-extras-1.0.22.3ubuntu1/debian/changelog
diff -Nru sane-backends-extras-1.0.22.3/debian/control sane-backends-extras-1.0.22.3ubuntu1/debian/control
--- sane-backends-extras-1.0.22.3/debian/control	2013-05-13 17:39:17.0 -0400
+++ sane-backends-extras-1.0.22.3ubuntu1/debian/control	2014-01-29 16:16:16.0 -0500
@@ -1,9 +1,10 @@
 Source: sane-backends-extras
 Section: graphics
 Priority: optional
-Maintainer: Debian QA Group packa...@qa.debian.org
+Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
+XSBC-Original-Maintainer: Debian QA Group packa...@qa.debian.org
 Standards-Version: 3.9.2
-Build-Depends: debhelper (= 9~), libusb-1.0-0-dev [!hurd-i386], pkg-config, autotools-dev, xutils-dev, chrpath
+Build-Depends: debhelper (= 9~), libusb-1.0-0-dev [!hurd-i386], pkg-config, dh-autoreconf, xutils-dev, chrpath
 
 Package: libsane-extras-common
 Section: libs
diff -Nru sane-backends-extras-1.0.22.3/debian/rules sane-backends-extras-1.0.22.3ubuntu1/debian/rules
--- sane-backends-extras-1.0.22.3/debian/rules	2013-05-13 17:44:25.0 -0400
+++ sane-backends-extras-1.0.22.3ubuntu1/debian/rules	2014-01-29 16:15:17.0 -0500
@@ -10,7 +10,7 @@
 endif
 
 %:
-	dh $@ --with=autotools_dev
+	dh $@ --with=autoreconf
 
 override_dh_auto_configure:
 	dh_auto_configure -- \


Bug#727917: libclamunrar: [PATCH] Enable build on newer arches

2014-01-28 Thread Daniel T Chen
Package: libclamunrar
Version: 0.96.4-1
Followup-For: Bug #727917
User: debian-de...@lists.debian.org
Usertags: origin-ubuntu trusty ubuntu-patch autoreconf

Dear Maintainer,

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

  * Use dh-autoreconf for newer arches.
- Quiet the autofoo warnings.
  * Use format 3.0 (quilt).


There may be extraneous metadata in the debdiff. If so, kindly please ignore
them. 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.11.0-15-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 libclamunrar-0.96.4/debian/changelog libclamunrar-0.96.4/debian/changelog
diff -Nru libclamunrar-0.96.4/debian/control libclamunrar-0.96.4/debian/control
--- libclamunrar-0.96.4/debian/control	2014-01-28 15:10:10.0 -0500
+++ libclamunrar-0.96.4/debian/control	2014-01-28 13:56:17.0 -0500
@@ -1,9 +1,10 @@
 Source: libclamunrar
 Priority: extra
 Section: non-free/libs
-Maintainer: ClamAV Team pkg-clamav-de...@lists.alioth.debian.org
+Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
+XSBC-Original-Maintainer: ClamAV Team pkg-clamav-de...@lists.alioth.debian.org
 Uploaders: Michael Tautschnig m...@debian.org, Stephen Gran sg...@debian.org
-Build-Depends: debhelper (= 7), autotools-dev, zlib1g-dev, libbz2-dev
+Build-Depends: debhelper (= 7), dh-autoreconf, zlib1g-dev, libbz2-dev
 Standards-Version: 3.9.1
 Homepage: http://www.clamav.net/
 XS-Autobuild: yes
diff -Nru libclamunrar-0.96.4/debian/patches/autofoo-no-fatal-warnings.patch libclamunrar-0.96.4/debian/patches/autofoo-no-fatal-warnings.patch
--- libclamunrar-0.96.4/debian/patches/autofoo-no-fatal-warnings.patch	1969-12-31 19:00:00.0 -0500
+++ libclamunrar-0.96.4/debian/patches/autofoo-no-fatal-warnings.patch	2014-01-28 14:26:30.0 -0500
@@ -0,0 +1,13 @@
+Index: libclamunrar-0.96.4/configure.in
+===
+--- libclamunrar-0.96.4.orig/configure.in	2010-10-25 17:47:12.0 -0400
 libclamunrar-0.96.4/configure.in	2014-01-28 14:26:26.219365758 -0500
+@@ -34,7 +34,7 @@
+ 
+ dnl -Wall and -Werror here are NOT CFLAGS, they refer to automake warnings
+ dnl enable stealth builds and psychedelic tests
+-AM_INIT_AUTOMAKE([1.11 -Wall -Wportability -Wno-override -Werror std-options foreign dist-bzip2 no-define color-tests parallel-tests tar-ustar])
++AM_INIT_AUTOMAKE([1.11 -Wall -Wportability -Wno-override std-options foreign dist-bzip2 no-define color-tests parallel-tests tar-ustar subdir-objects])
+ AM_SILENT_RULES([yes])
+ 
+ dnl we told automake to not define these, since we want to include
diff -Nru libclamunrar-0.96.4/debian/patches/series libclamunrar-0.96.4/debian/patches/series
--- libclamunrar-0.96.4/debian/patches/series	1969-12-31 19:00:00.0 -0500
+++ libclamunrar-0.96.4/debian/patches/series	2014-01-28 14:25:39.0 -0500
@@ -0,0 +1 @@
+autofoo-no-fatal-warnings.patch
diff -Nru libclamunrar-0.96.4/debian/rules libclamunrar-0.96.4/debian/rules
--- libclamunrar-0.96.4/debian/rules	2014-01-28 15:10:10.0 -0500
+++ libclamunrar-0.96.4/debian/rules	2014-01-28 13:56:41.0 -0500
@@ -34,13 +34,8 @@
 
 config.status: configure
 	dh_testdir
+	dh_autoreconf
 	# Add here commands to configure the package.
-ifneq $(wildcard /usr/share/misc/config.sub) 
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq $(wildcard /usr/share/misc/config.guess) 
-	cp -f /usr/share/misc/config.guess config.guess
-endif
 	chmod a+x configure
 	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS=$(CFLAGS) LDFLAGS=-Wl,-z,defs --disable-clamav
 
@@ -61,7 +56,7 @@
 
 	# Add here commands to clean up after the build process.
 	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -f config.sub config.guess
+	dh_autoreconf_clean
 
 	dh_clean 
 
diff -Nru libclamunrar-0.96.4/debian/source/format libclamunrar-0.96.4/debian/source/format
--- libclamunrar-0.96.4/debian/source/format	1969-12-31 19:00:00.0 -0500
+++ libclamunrar-0.96.4/debian/source/format	2014-01-28 14:25:09.0 -0500
@@ -0,0 +1 @@
+3.0 (quilt)


Bug#736967: webrtc-audio-processing: [PATCH] Enable build on newer arches

2014-01-28 Thread Daniel T Chen
Package: webrtc-audio-processing
Version: 0.1-2
Severity: wishlist
Tags: patch
User: debian-de...@lists.debian.org
Usertags: origin-ubuntu trusty ubuntu-patch autoreconf

Dear Maintainer,

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

  * Use dh-autoreconf for newer arches, resolving FTBFS.


This debdiff may contain extraneous metadata. If so, kindly please ignore
them. 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.11.0-15-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 webrtc-audio-processing-0.1/debian/changelog webrtc-audio-processing-0.1/debian/changelog
diff -Nru webrtc-audio-processing-0.1/debian/control webrtc-audio-processing-0.1/debian/control
--- webrtc-audio-processing-0.1/debian/control	2012-05-19 16:00:53.0 -0400
+++ webrtc-audio-processing-0.1/debian/control	2014-01-28 15:00:41.0 -0500
@@ -1,7 +1,8 @@
 Source: webrtc-audio-processing
 Priority: extra
-Maintainer: Sjoerd Simons sjo...@debian.org
-Build-Depends: debhelper (= 9), autotools-dev
+Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
+XSBC-Original-Maintainer: Sjoerd Simons sjo...@debian.org
+Build-Depends: debhelper (= 9), dh-autoreconf
 Standards-Version: 3.9.3
 Section: libs
 Homepage: http://freedesktop.org/software/pulseaudio/webrtc-audio-processing/
diff -Nru webrtc-audio-processing-0.1/debian/rules webrtc-audio-processing-0.1/debian/rules
--- webrtc-audio-processing-0.1/debian/rules	2012-05-19 16:00:53.0 -0400
+++ webrtc-audio-processing-0.1/debian/rules	2014-01-28 15:01:31.0 -0500
@@ -10,4 +10,4 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@  --with autotools-dev
+	dh $@  --with autoreconf


Bug#736819: worker: [PATCH] Resolve FTBFS due to missing library to link

2014-01-26 Thread Daniel T Chen
Package: worker
Version: 2.19.6-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

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

  * Add missing lib to link, resolving FTBFS.


This FTBFS appeared on ppc64el. 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.11.0-15-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 worker-2.19.6/debian/patches/fix_lib_underlinkage.patch worker-2.19.6/debian/patches/fix_lib_underlinkage.patch
--- worker-2.19.6/debian/patches/fix_lib_underlinkage.patch	1969-12-31 19:00:00.0 -0500
+++ worker-2.19.6/debian/patches/fix_lib_underlinkage.patch	2014-01-26 17:32:28.0 -0500
@@ -0,0 +1,26 @@
+Index: worker-2.19.6/src/Makefile.am
+===
+--- worker-2.19.6.orig/src/Makefile.am	2012-11-21 17:02:53.0 -0500
 worker-2.19.6/src/Makefile.am	2014-01-26 17:32:22.780051265 -0500
+@@ -409,7 +409,7 @@
+ 	wpucontext.cc \
+ 	wpucontext.h
+ 
+-worker_LDADD = aguix/libaguix.a @WORKER_LDADD@
++worker_LDADD = aguix/libaguix.a @WORKER_LDADD@ -ldl
+ #worker_DEPENDENCIES =
+ 
+ EXTRA_DIST = configparser.y \
+Index: worker-2.19.6/src/Makefile.in
+===
+--- worker-2.19.6.orig/src/Makefile.in	2012-11-21 17:03:47.0 -0500
 worker-2.19.6/src/Makefile.in	2014-01-26 17:32:22.780051265 -0500
+@@ -682,7 +682,7 @@
+ 	wpucontext.cc \
+ 	wpucontext.h
+ 
+-worker_LDADD = aguix/libaguix.a @WORKER_LDADD@
++worker_LDADD = aguix/libaguix.a @WORKER_LDADD@ -ldl
+ #worker_DEPENDENCIES =
+ EXTRA_DIST = configparser.y \
+ 	configscanner.l \
diff -Nru worker-2.19.6/debian/patches/series worker-2.19.6/debian/patches/series
--- worker-2.19.6/debian/patches/series	1969-12-31 19:00:00.0 -0500
+++ worker-2.19.6/debian/patches/series	2014-01-26 17:30:21.0 -0500
@@ -0,0 +1 @@
+fix_lib_underlinkage.patch


Bug#718102: zeroc-icee: [PATCH] Resolve FTBFS from stricter patch usage

2014-01-24 Thread Daniel T Chen
Package: zeroc-icee
Version: 1.2.0-6.1
Followup-For: Bug #718102
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

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

  * Adjust for stricter default patch usage, resolving 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.11.0-15-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u zeroc-icee-1.2.0/debian/rules zeroc-icee-1.2.0/debian/rules
--- zeroc-icee-1.2.0/debian/rules
+++ zeroc-icee-1.2.0/debian/rules
@@ -18,11 +18,10 @@
 	-mkdir -p debian/tmp/usr/share lib bin
-	ln -sf Make.rules.Linux config/Make.rules.GNU_kFreeBSD
-	ln -sf Make.rules.Linux config/Make.rules.GNU
+	(cd config ; cp -f Make.rules.Linux Make.rules.GNU_kFreeBSD)
+	(cd config ; cp -f Make.rules.Linux Make.rules.GNU)
 
 binary-install/icee-slice::
 	chmod a-x debian/icee-slice/usr/share/slice/*/*.ice
 
 clean::
-	$(RM) config/Make.rules.GNU
-	$(RM) config/Make.rules.GNU_kFreeBSD
+	(cd config ; rm -f Make.rules.GNU Make.rules.GNU_kFreeBSD)
 


Bug#718139: zeroc-icee-translators: [PATCH] Resolve FTBFS with stricter default patch usage

2014-01-24 Thread Daniel T Chen
Package: zeroc-icee-translators
Version: 1.2.0-6
Followup-For: Bug #718139
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

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

  * Correct broken links in build procedure.


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.11.0-15-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u zeroc-icee-translators-1.2.0/debian/rules zeroc-icee-translators-1.2.0/debian/rules
--- zeroc-icee-translators-1.2.0/debian/rules
+++ zeroc-icee-translators-1.2.0/debian/rules
@@ -20,8 +20,7 @@
 	-mkdir -p debian/tmp/usr lib bin
-	ln -sf Make.rules.Linux config/Make.rules.GNU_kFreeBSD
-	ln -sf Make.rules.Linux config/Make.rules.GNU
+	(cd config ; cp -f Make.rules.Linux Make.rules.GNU_kFreeBSD)
+	(cd config ; cp -f Make.rules.Linux Make.rules.GNU)
 
 clean::
-	$(RM) config/Make.rules.GNU
-	$(RM) config/Make.rules.GNU_kFreeBSD
+	(cd config ; rm -f Make.rules.GNU Make.rules.GNU_kFreeBSD)
 
diff -u zeroc-icee-translators-1.2.0/debian/control zeroc-icee-translators-1.2.0/debian/control
--- zeroc-icee-translators-1.2.0/debian/control
+++ zeroc-icee-translators-1.2.0/debian/control
@@ -13,7 +13,7 @@
  icecpp
 Conflicts: slice2cppe ( 1.2.0-5), slice2javae ( 1.2.0-5), 
  icecpp
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: ZeroC IceE Slice translators for C++ and Java
  ZeroC Ice is a CORBA-like middleware solution. Slice is the IDL used
  in Ice. IceE is a subset of Ice used in embedded systems. This


Bug#736549: chasen: [PATCH] Enable build on newer arches by using dh-autoreconf

2014-01-24 Thread Daniel T Chen
Package: chasen
Version: 2.4.5-9
Severity: wishlist
Tags: patch
User: debian-de...@lists.debian.org
Usertags: origin-ubuntu trusty ubuntu-patch autoreconf

Dear Maintainer,

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

  * Use dh-autoreconf to resolve FTBFS on ppc64el.


This debdiff may contain extraneous metadata. If so, kindly please ignore
them. 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.11.0-15-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 chasen-2.4.5/debian/changelog chasen-2.4.5/debian/changelog
diff -Nru chasen-2.4.5/debian/control chasen-2.4.5/debian/control
--- chasen-2.4.5/debian/control	2013-06-16 21:07:11.0 -0400
+++ chasen-2.4.5/debian/control	2014-01-24 15:38:14.0 -0500
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
 XSBC-Original-Maintainer: NOKUBI Takatsugu k...@daionet.gr.jp
 Uploaders: Hideki Yamane henr...@debian.org
-Build-Depends: debhelper (= 9), darts (= 0.3.2), autotools-dev
+Build-Depends: debhelper (= 9), darts (= 0.3.2), dh-autoreconf
 Standards-Version: 3.9.4
 Homepage: http://chasen-legacy.sourceforge.jp/
 Vcs-Git: git://git.debian.org/git/pkg-nlp-ja/chasen.git
diff -Nru chasen-2.4.5/debian/rules chasen-2.4.5/debian/rules
--- chasen-2.4.5/debian/rules	2013-06-16 21:06:52.0 -0400
+++ chasen-2.4.5/debian/rules	2014-01-24 15:38:21.0 -0500
@@ -4,7 +4,7 @@
 export DEB_BUILD_MAINT_OPTIONS := hardening=+all,-pie
 
 %:
-	dh $@ --with autotools-dev
+	dh $@ --with autoreconf
 
 override_dh_auto_configure:
 	dh_auto_configure -- --sysconfdir=/etc --with-darts=/usr/include


Bug#736347: gobby-infinote: [PATCH] Resolve FTBFS from missing #include

2014-01-22 Thread Daniel T Chen
Package: gobby-infinote
Version: 0.4.94-5.1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

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

  * Add missing preprocessor directive, resolving 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.11.0-15-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 gobby-infinote-0.4.94/debian/patches/missing-include.patch gobby-infinote-0.4.94/debian/patches/missing-include.patch
--- gobby-infinote-0.4.94/debian/patches/missing-include.patch	1969-12-31 19:00:00.0 -0500
+++ gobby-infinote-0.4.94/debian/patches/missing-include.patch	2014-01-22 09:37:25.0 -0500
@@ -0,0 +1,12 @@
+Index: gobby-infinote-0.4.94/code/dialogs/preferences-dialog.cpp
+===
+--- gobby-infinote-0.4.94.orig/code/dialogs/preferences-dialog.cpp	2014-01-22 09:28:57.0 -0500
 gobby-infinote-0.4.94/code/dialogs/preferences-dialog.cpp	2014-01-22 09:37:19.543557459 -0500
+@@ -28,6 +28,7 @@
+ #include stdexcept
+ 
+ #include gtksourceview/gtksourcestyleschememanager.h
++#include gtksourceview/gtksourcestylescheme.h
+ 
+ namespace
+ {
diff -Nru gobby-infinote-0.4.94/debian/patches/series gobby-infinote-0.4.94/debian/patches/series
--- gobby-infinote-0.4.94/debian/patches/series	2013-08-12 08:08:51.0 -0400
+++ gobby-infinote-0.4.94/debian/patches/series	2014-01-22 09:35:57.0 -0500
@@ -4,3 +4,4 @@
 0002-code-util-gtk-compat.hpp-fix-render_icon-with-missin.patch
 0001-Fix-compilation-with-recent-versions-of-gcc.patch
 textsessionview-gtksourcebuffer-fix.patch
+missing-include.patch


Bug#736366: openct: [PATCH] Resolve FTBFS on newer arches

2014-01-22 Thread Daniel T Chen
Package: openct
Version: 0.6.20-1.2
Severity: wishlist
Tags: patch
User: debian-de...@lists.debian.org
Usertags: origin-ubuntu trusty ubuntu-patch autoreconf

Dear Maintainer,

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

  * Use dh-autoreconf for newer arches, resolving FTBFS.
  * Don't attempt to move conffile from a nonexistent directory.


This debdiff may contain extraneous metadata. If so, kindly please ignore
them. 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.11.0-15-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 openct-0.6.20/debian/changelog openct-0.6.20/debian/changelog
diff -Nru openct-0.6.20/debian/control openct-0.6.20/debian/control
--- openct-0.6.20/debian/control	2011-04-12 06:43:34.0 -0400
+++ openct-0.6.20/debian/control	2014-01-22 13:53:48.0 -0500
@@ -1,8 +1,10 @@
 Source: openct
 Section: utils
 Priority: extra
-Maintainer: Eric Dorland e...@debian.org
-Build-Depends: cdbs (= 0.4.38), debhelper (= 5.0.45), libpcsclite-dev (= 1.4.0), pkg-config, libltdl3-dev, libusb2-dev [kfreebsd-any]
+Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
+XSBC-Original-Maintainer: Eric Dorland e...@debian.org
+Build-Depends: cdbs (= 0.4.38), debhelper (= 5.0.45), libpcsclite-dev (= 1.4.0), pkg-config, libltdl3-dev, libusb2-dev [kfreebsd-any],
+ dh-autoreconf
 Build-Conflicts: libusb-dev
 Standards-Version: 3.8.3
 Homepage: http://www.opensc-project.org/
diff -Nru openct-0.6.20/debian/patches/debian-changes openct-0.6.20/debian/patches/debian-changes
--- openct-0.6.20/debian/patches/debian-changes	2011-04-12 06:46:02.0 -0400
+++ openct-0.6.20/debian/patches/debian-changes	2014-01-22 14:56:35.0 -0500
@@ -12,3 +12,14 @@
  fi
  
  set -e
+--- openct-0.6.20.orig/etc/Makefile.am
 openct-0.6.20/etc/Makefile.am
+@@ -34,8 +34,6 @@ sysconf_DATA=#required in order to creat
+ install-exec-hook:	install-sysconfDATA openct.conf
+ 	if [ -f $(DESTDIR)$(sysconfdir)/openct.conf ]; then \
+ 		$(INSTALL_DATA) openct.conf $(DESTDIR)$(sysconfdir)/openct.conf.new; \
+-	else \
+-		$(INSTALL_DATA) openct.conf $(DESTDIR)$(sysconfdir)/openct.conf; \
+ 	fi
+ 
+ .in:
diff -Nru openct-0.6.20/debian/rules openct-0.6.20/debian/rules
--- openct-0.6.20/debian/rules	2010-04-07 16:40:00.0 -0400
+++ openct-0.6.20/debian/rules	2014-01-22 13:54:39.0 -0500
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS = --enable-pcsc --with-udev=/lib/udev \


Bug#736251: cliff-tablib: [PATCH] Resolve FTBFS from attempt to download distribute

2014-01-21 Thread Daniel T Chen
Package: cliff-tablib
Version: 1.0-2
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

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

  * Because we already build-depend on setuptools, just remove the use
of distribute (as upstream did in changeset 2646549), thereby
resolving FTBFS.


Because the buildds are firewalled, the build fails attempting to
download the deprecated distribute tarball. I chose to backport minimal
bits from the referenced changeset (as opposed to also removing
distribute_setup.py).

Alternately, these changes are already in upstream version 1.1.

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.11.0-15-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 cliff-tablib-1.0/debian/patches/fix-ftbfs-distribute.patch cliff-tablib-1.0/debian/patches/fix-ftbfs-distribute.patch
--- cliff-tablib-1.0/debian/patches/fix-ftbfs-distribute.patch	1969-12-31 19:00:00.0 -0500
+++ cliff-tablib-1.0/debian/patches/fix-ftbfs-distribute.patch	2014-01-21 09:44:13.0 -0500
@@ -0,0 +1,25 @@
+Index: cliff-tablib-1.0/setup.py
+===
+--- cliff-tablib-1.0.orig/setup.py	2012-08-02 13:05:36.0 -0400
 cliff-tablib-1.0/setup.py	2014-01-21 09:39:13.738309577 -0500
+@@ -3,10 +3,6 @@
+ # Change docs/source/conf.py too!
+ VERSION = '1.0'
+ 
+-# Bootstrap installation of Distribute
+-import distribute_setup
+-distribute_setup.use_setuptools()
+-
+ from setuptools import setup, find_packages
+ 
+ from distutils.util import convert_path
+Index: cliff-tablib-1.0/MANIFEST.in
+===
+--- cliff-tablib-1.0.orig/MANIFEST.in	2012-08-02 13:05:36.0 -0400
 cliff-tablib-1.0/MANIFEST.in	2014-01-21 09:44:07.503564021 -0500
+@@ -1,5 +1,4 @@
+ include setup.py
+-include distribute_setup.py
+ recursive-include docs *.rst *.py *.html *.css *.js *.png *.txt
+ recursive-include demoapp *.py
+ recursive-include tests *.py
diff -Nru cliff-tablib-1.0/debian/patches/series cliff-tablib-1.0/debian/patches/series
--- cliff-tablib-1.0/debian/patches/series	1969-12-31 19:00:00.0 -0500
+++ cliff-tablib-1.0/debian/patches/series	2014-01-21 09:38:59.0 -0500
@@ -0,0 +1 @@
+fix-ftbfs-distribute.patch


Bug#736266: madfuload: [PATCH] Resolve FTBFS with autoreconf for newer arches

2014-01-21 Thread Daniel T Chen
Package: madfuload
Version: 1.2-4
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch autoreconf

Dear Maintainer,

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

  * Include updated auto* files via dh-autoreconf, resolving FTBFS.


This debdiff may contain extraneous metadata. If so, kindly please ignore
them. 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.11.0-15-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u madfuload-1.2/debian/rules madfuload-1.2/debian/rules
--- madfuload-1.2/debian/rules
+++ madfuload-1.2/debian/rules
@@ -2,6 +2,5 @@
 %:
-	dh --with quilt $@
+	dh --with quilt,autoreconf $@
 
 override_dh_auto_configure:
-	autoreconf -f
 	dh_auto_configure -- --with-udev=/lib/udev
diff -u madfuload-1.2/debian/changelog madfuload-1.2/debian/changelog
diff -u madfuload-1.2/debian/control madfuload-1.2/debian/control
--- madfuload-1.2/debian/control
+++ madfuload-1.2/debian/control
@@ -1,8 +1,9 @@
 Source: madfuload
 Section: non-free/sound
 Priority: extra
-Maintainer: Free Ekanayaka fr...@debian.org
-Build-Depends: autoconf, automake, libtool, quilt (=0.46-7), debhelper (= 7.0.50), udev (= 136)
+Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
+XSBC-Original-Maintainer: Free Ekanayaka fr...@debian.org
+Build-Depends: dh-autoreconf, quilt (=0.46-7), debhelper (= 7.0.50), udev (= 136)
 Standards-Version: 3.8.4
 Homepage: http://usb-midi-fw.sourceforge.net/
 


Bug#736278: conserver: [PATCH] Resolve FTBFS with newer arches and remove source package cruft

2014-01-21 Thread Daniel T Chen
Package: conserver
Version: 8.1.18-2.2
Severity: wishlist
Tags: patch
User: debian-de...@lists.debian.org
Usertags: origin-ubuntu trusty ubuntu-patch autoreconf

Dear Maintainer,

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

  * Use dh-autoreconf for newer arches, resolving FTBFS.
  * Use source format 3.0 (quilt).


There may be extraneous metadata in the debdiff. If so, kindly please disregard
them. 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.11.0-15-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 conserver-8.1.18/autologin/Makefile conserver-8.1.18/autologin/Makefile
--- conserver-8.1.18/autologin/Makefile	2014-01-21 15:48:58.0 -0500
+++ conserver-8.1.18/autologin/Makefile	1969-12-31 19:00:00.0 -0500
@@ -1,52 +0,0 @@
-### Path settings
-srcdir = .
-top_srcdir = ..
-prefix = /usr
-exec_prefix = ${prefix}
-bindir = ${exec_prefix}/bin
-sysconfdir = /etc/conserver
-
-### Installation programs and flags
-INSTALL = /usr/bin/install -c
-INSTALL_PROGRAM = ${INSTALL} -s
-LN_S = ln -s
-MKDIR = mkdir -p -m 755
-
-### Compiler and link options
-CC	= gcc
-CFLAGS	= -O # -DPUCC -DSUN5
-DEFS	= -DHAVE_CONFIG_H -DSYSCONFDIR=\$(sysconfdir)\
-CPPFLAGS = -I.. -I$(top_srcdir) -I$(srcdir) $(DEFS)  
-LDFLAGS	=  
-LIBS	= -lutil -lcrypt  -lssl -lcrypto
-
-
-
-### Makefile rules - no user-servicable parts below
-
-AUTOLOGIN_OBJS = main.o autologin.o
-AUTOLOGIN_HDRS = ../config.h $(top_srcdir)/compat.h $(srcdir)/main.h
-ALL = autologin
-
-
-all: $(ALL)
-
-$(AUTOLOGIN_OBJS): $(AUTOLOGIN_HDRS)
-
-autologin: $(AUTOLOGIN_OBJS)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o autologin $(AUTOLOGIN_OBJS) $(LIBS)
-
-.c.o:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $
-
-clean:
-	rm -f *~ *.o $(ALL) core
-
-distclean: clean
-	rm -f Makefile
-
-install: autologin
-	$(MKDIR) $(DESTDIR)$(bindir)
-	$(INSTALL_PROGRAM) autologin $(DESTDIR)$(bindir)
-
-.PHONY: clean distclean install
diff -Nru conserver-8.1.18/conserver/test.cf conserver-8.1.18/conserver/test.cf
--- conserver-8.1.18/conserver/test.cf	2014-01-21 15:48:58.0 -0500
+++ conserver-8.1.18/conserver/test.cf	1969-12-31 19:00:00.0 -0500
@@ -1,30 +0,0 @@
-# dummy conserver config file
-#
-# $Id: dummy.cf,v 4.3 92/07/27 12:23:59 ksb Exp $
-#
-# 1. change the `/dev/ttya' to any tty device you can put a serial device on
-#that you could talk to with kermit/cu.  Put in the baud rate and parity.
-#
-# 2. change the `cc.purdue.edu' to your local domain.
-#
-# 3. !! do not leave this up, as it can give local users a root shell (login)
-#!! for extended testing change the `|' to `|su - tst' where tst is a
-#!! vanilla test acount, or comment out the `login' console.
-#
-# list of consoles we serve
-# name : tty[@host] : baud[parity] : device : group
-DOMAINHACK=
-LOGDIR=/tmp
-BREAK5=\rtest\r
-# shell:|:9600p::5
-# bash:|/usr/local/bin/bash:::2
-web:!localhost:80::
-# b:/dev/ttyb:9600p::
-#ts6-10:!ts6:10010::
-#ts6-11:!ts6:10011::
-#ts6-12:!ts6:10012::
-#ts6-13:!ts6:10013::
-%%
-# list of clients we allow
-# type machines
-trusted: 127.0.0.1
diff -Nru conserver-8.1.18/contrib/chat/Makefile conserver-8.1.18/contrib/chat/Makefile
--- conserver-8.1.18/contrib/chat/Makefile	2014-01-21 15:48:58.0 -0500
+++ conserver-8.1.18/contrib/chat/Makefile	1969-12-31 19:00:00.0 -0500
@@ -1,52 +0,0 @@
-### Path settings
-srcdir = .
-top_srcdir = ../..
-prefix = /usr
-exec_prefix = ${prefix}
-bindir = ${exec_prefix}/bin
-sysconfdir = /etc/conserver
-mandir = ${prefix}/share/man
-
-### Installation programs and flags
-INSTALL = /usr/bin/install -c
-INSTALL_PROGRAM = ${INSTALL} -s
-LN_S = ln -s
-MKDIR = mkdir -p -m 755
-
-### Compiler and link options
-CC	= gcc
-CFLAGS	= -O
-DEFS	= -DHAVE_CONFIG_H
-CPPFLAGS = -I$(top_srcdir) -I$(srcdir) $(DEFS)  
-LDFLAGS	=  
-LIBS	= -lutil -lcrypt  -lssl -lcrypto
-
-
-
-### Makefile rules - no user-servicable parts below
-
-CHAT_OBJS = chat.o
-CHAT_HDRS = ../../config.h
-ALL = chat
-
-all: $(ALL)
-
-chat: $(CHAT_OBJS)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o chat $(CHAT_OBJS) $(LIBS)
-
-.c.o:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $
-
-clean:
-	rm -f *~ *.o $(ALL) core
-
-distclean: clean
-	rm -f Makefile
-
-install: chat
-	$(MKDIR) $(DESTDIR)$(bindir)
-	$(INSTALL_PROGRAM) chat $(DESTDIR)$(bindir)
-	$(MKDIR) $(DESTDIR)$(mandir)/man1
-	$(INSTALL) chat.man $(DESTDIR)$(mandir)/man1/chat.1
-
-.PHONY: clean distclean install
diff -Nru conserver-8.1.18/debian/changelog conserver-8.1.18/debian/changelog
diff -Nru conserver-8.1.18/debian/control conserver-8.1.18/debian/control
--- conserver-8.1.18/debian/control	2014-01-21 15:48:58.0 -0500
+++ conserver-8.1.18/debian/control	2014-01-21 

Bug#713300: arpack++: FTBFS: parallel-tests: error: required file './test-driver' not found

2014-01-17 Thread Daniel T Chen
Package: arpack++
Followup-For: Bug #713300
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

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

  * Use dh-autoreconf, resolving FTBFS (Closes: #713300) (LP: #1229528)


This debdiff may contain extraneous metadata. If so, kindly please ignore
them. 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.11.0-15-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 arpack++-2.3/debian/changelog arpack++-2.3/debian/changelog
diff -Nru arpack++-2.3/debian/control arpack++-2.3/debian/control
--- arpack++-2.3/debian/control	2011-08-03 04:54:52.0 -0400
+++ arpack++-2.3/debian/control	2014-01-17 15:29:54.0 -0500
@@ -2,8 +2,9 @@
 Homepage: http://ljk.imag.fr/membres/Christophe.Prudhomme/software.php
 Section: devel
 Priority: optional
-Build-Depends: cdbs, debhelper (  4.1.0 ), gfortran, libblas-dev, liblapack-dev, libarpack2-dev, chrpath, automake, autoconf, libtool
-Maintainer: Debian Science Team debian-science-maintain...@lists.alioth.debian.org
+Build-Depends: cdbs, debhelper (  4.1.0 ), gfortran, libblas-dev, liblapack-dev, libarpack2-dev, chrpath, dh-autoreconf
+Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
+XSBC-Original-Maintainer: Debian Science Team debian-science-maintain...@lists.alioth.debian.org
 Uploaders: Christophe Prud'homme prudh...@debian.org
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/arpack++/
diff -Nru arpack++-2.3/debian/rules arpack++-2.3/debian/rules
--- arpack++-2.3/debian/rules	2011-08-03 05:09:17.0 -0400
+++ arpack++-2.3/debian/rules	2014-01-17 15:24:13.0 -0500
@@ -12,6 +12,7 @@
 
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
 
 DEB_BUILDDIR 			:= $(DEB_SRCDIR)/
 DEB_CONFIGURE_SCRIPT		:= $(CURDIR)/configure
@@ -31,10 +32,6 @@
 CXXFLAGS= -O3
 FFLAGS= -O3
 
-debian/stamp-autotools-files:
-	libtoolize
-	autoreconf
-
 VERSION=2.3
 orig-tarball:
 	mkdir tmp; \


Bug#735087: zinnia: [PATCH] Enable build on ppc64el

2014-01-12 Thread Daniel T Chen
Package: zinnia
Version: 0.06-1
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

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

  * Use dh-autoreconf for ppc64el, resolving FTBFS.


This debdiff may contain extraneous metadata. If so, kindly please ignore
them. 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.11.0-15-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 zinnia-0.06/debian/changelog zinnia-0.06/debian/changelog
diff -Nru zinnia-0.06/debian/control zinnia-0.06/debian/control
--- zinnia-0.06/debian/control	2010-06-21 07:23:24.0 -0400
+++ zinnia-0.06/debian/control	2014-01-12 11:50:42.0 -0500
@@ -1,10 +1,11 @@
 Source: zinnia
 Priority: optional
-Maintainer: IME Packaging Team pkg-ime-de...@lists.alioth.debian.org 
+Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
+XSBC-Original-Maintainer: IME Packaging Team pkg-ime-de...@lists.alioth.debian.org 
 Uploaders: LI Daobing lidaob...@debian.org
 Build-Depends: 
  debhelper (= 7), 
- autotools-dev, 
+ dh-autoreconf,
  python-all-dev (= 2.5.4-1~),
  python-support (= 0.90)
 Standards-Version: 3.8.4
diff -Nru zinnia-0.06/debian/rules zinnia-0.06/debian/rules
--- zinnia-0.06/debian/rules	2010-06-21 07:40:48.0 -0400
+++ zinnia-0.06/debian/rules	2014-01-12 11:52:13.0 -0500
@@ -29,12 +29,13 @@
 config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
-ifneq $(wildcard /usr/share/misc/config.sub) 
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq $(wildcard /usr/share/misc/config.guess) 
-	cp -f /usr/share/misc/config.guess config.guess
-endif
+#ifneq $(wildcard /usr/share/misc/config.sub) 
+#	cp -f /usr/share/misc/config.sub config.sub
+#endif
+#ifneq $(wildcard /usr/share/misc/config.guess) 
+#	cp -f /usr/share/misc/config.guess config.guess
+#endif
+	dh_autoreconf
 	./configure \
 		$(CROSS) \
 		--disable-dependency-tracking \
@@ -65,6 +66,7 @@
 	rm -rf python/build
 	rm -f config.sub config.guess
 
+	dh_autoreconf_clean
 	dh_clean 
 
 install: build install0 $(PYVERS:%=install-python%)


Bug#735094: zeromq: [PATCH] Enable build on ppc64el

2014-01-12 Thread Daniel T Chen
Package: zeromq
Version: 2.2.0+dfsg-4
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

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

  * Use dh-autoreconf for ppc64el, resolving FTBFS.


This debdiff may contain extraneous metadata. If so, kindly please ignore
them. 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.11.0-15-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 zeromq-2.2.0+dfsg/debian/changelog zeromq-2.2.0+dfsg/debian/changelog
diff -Nru zeromq-2.2.0+dfsg/debian/control zeromq-2.2.0+dfsg/debian/control
--- zeromq-2.2.0+dfsg/debian/control	2013-05-17 13:33:22.0 -0400
+++ zeromq-2.2.0+dfsg/debian/control	2014-01-12 12:27:56.0 -0500
@@ -1,9 +1,10 @@
 Source: zeromq
 Section: libs
 Priority: optional
-Maintainer: Alessandro Ghedini gh...@debian.org
+Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
+XSBC-Original-Maintainer: Alessandro Ghedini gh...@debian.org
 Build-Depends: debhelper (= 9),
- autotools-dev,
+ dh-autoreconf,
  libpgm-dev,
  pkg-config,
  uuid-dev
diff -Nru zeromq-2.2.0+dfsg/debian/rules zeromq-2.2.0+dfsg/debian/rules
--- zeromq-2.2.0+dfsg/debian/rules	2013-05-17 13:33:22.0 -0400
+++ zeromq-2.2.0+dfsg/debian/rules	2014-01-12 12:28:23.0 -0500
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with=autotools-dev
+	dh $@ --with=autoreconf
 
 override_dh_auto_configure:
 	dh_auto_configure -- --with-system-pgm


Bug#735013: zita-convolver: [PATCH] Enable build for arm64 and ppc64el (update symbols)

2014-01-11 Thread Daniel T Chen
Package: zita-convolver
Version: 3.1.0-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

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

  * Update symbols for arm64 and ppc64el, resolving 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.11.0-15-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 zita-convolver-3.1.0/debian/libzita-convolver3.symbols zita-convolver-3.1.0/debian/libzita-convolver3.symbols
--- zita-convolver-3.1.0/debian/libzita-convolver3.symbols	2013-10-12 17:25:13.0 -0400
+++ zita-convolver-3.1.0/debian/libzita-convolver3.symbols	2014-01-11 14:21:40.0 -0500
@@ -41,5 +41,5 @@
  (c++)Convlevel::~Convlevel()@Base 3.0.2
  (c++)typeinfo for Converror@Base 3.0.2
  (c++)typeinfo name for Converror@Base 3.0.2
-(arch=alpha amd64 ia64 kfreebsd-amd64 mips64 mips64el ppc64 s390 s390x)#include libzita-convolver3.symbols.64bit
-(arch=!alpha !amd64 !ia64 !kfreebsd-amd64 !mips64 !mips64el !ppc64 !s390 !s390x)#include libzita-convolver3.symbols.32bit
+(arch=alpha amd64 arm64 ia64 kfreebsd-amd64 mips64 mips64el ppc64 ppc64el s390 s390x)#include libzita-convolver3.symbols.64bit
+(arch=!alpha !amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64 !mips64el !ppc64 !ppc64el !s390 !s390x)#include libzita-convolver3.symbols.32bit


Bug#734501: jsxgraph: [PATCH] Resolve FTBFS because of missing b-d-i

2014-01-07 Thread Daniel T Chen
Package: jsxgraph
Version: 0.98~dfsg1-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

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

  * added missing build dependencies, resolving FTBFS


This debdiff may contain extraneous metadata. If so, kindly please ignore
them. 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.11.0-15-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 jsxgraph-0.98~dfsg1/debian/changelog jsxgraph-0.98~dfsg1/debian/changelog
diff -Nru jsxgraph-0.98~dfsg1/debian/control jsxgraph-0.98~dfsg1/debian/control
--- jsxgraph-0.98~dfsg1/debian/control	2013-12-09 10:24:29.0 -0500
+++ jsxgraph-0.98~dfsg1/debian/control	2014-01-07 11:56:06.0 -0500
@@ -1,10 +1,11 @@
 Source: jsxgraph
 Section: devel
 Priority: extra
-Maintainer: Georges Khaznadar georg...@debian.org
+Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
+XSBC-Original-Maintainer: Georges Khaznadar georg...@debian.org
 Build-Depends: debhelper (= 7.0.50~), quilt
 Build-Depends-Indep: jsdoc-toolkit (=2.4.0+dfsg-3), yui-compressor,
- node-almond, node-requirejs
+ node-almond, node-requirejs, node-uglify, zip
 Standards-Version: 3.9.4
 Homepage: http://jsxgraph.uni-bayreuth.de/cms/index.php
 


Bug#734510: shush: [PATCH] Resolve FTBFS because of format string errors (and add missing #include)

2014-01-07 Thread Daniel T Chen
Package: shush
Version: 1.2.3-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

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

  * Fix format string errors, resolving FTBFS.
  * Add missing preprocessor directive, resolving implicit
function declaration.


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.11.0-15-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 shush-1.2.3/debian/patches/01_fix_string_format.diff shush-1.2.3/debian/patches/01_fix_string_format.diff
--- shush-1.2.3/debian/patches/01_fix_string_format.diff	1969-12-31 19:00:00.0 -0500
+++ shush-1.2.3/debian/patches/01_fix_string_format.diff	2014-01-07 13:23:11.0 -0500
@@ -0,0 +1,22 @@
+Index: shush-1.2.3/src/analyzer.c
+===
+--- shush-1.2.3.orig/src/analyzer.c	2008-03-08 18:25:46.0 -0500
 shush-1.2.3/src/analyzer.c	2014-01-07 13:23:08.700034641 -0500
+@@ -654,7 +654,7 @@
+ 	else
+ 		tag = (format == CF_FORMAT_RICH) ? /Bold : /b;
+ 
+-	if (fprintf(mail, tag) != strlen(tag))
++	if (fprintf(mail, %s, tag) != strlen(tag))
+ 	  {
+ 		error(fprintf() failed: %s, ERRSTR);
+ 		return -1;
+@@ -675,7 +675,7 @@
+ 	else
+ 		abort();
+ 
+-	if (fprintf(mail, esc) != strlen(esc))
++	if (fprintf(mail, %s, esc) != strlen(esc))
+ 	  {
+ 		error(fprintf() failed: %s, ERRSTR);
+ 		return -1;
diff -Nru shush-1.2.3/debian/patches/02_fix_implicit_declaration_strftime.diff shush-1.2.3/debian/patches/02_fix_implicit_declaration_strftime.diff
--- shush-1.2.3/debian/patches/02_fix_implicit_declaration_strftime.diff	1969-12-31 19:00:00.0 -0500
+++ shush-1.2.3/debian/patches/02_fix_implicit_declaration_strftime.diff	2014-01-07 13:38:40.0 -0500
@@ -0,0 +1,12 @@
+Index: shush-1.2.3/src/check.c
+===
+--- shush-1.2.3.orig/src/check.c	2008-03-08 18:25:46.0 -0500
 shush-1.2.3/src/check.c	2014-01-07 13:38:36.991356799 -0500
+@@ -9,6 +9,7 @@
+ 
+ #include ctype.h
+ #include fcntl.h
++#include time.h
+ #if defined(HAVE_PATHS_H)
+ # include paths.h
+ #else
diff -Nru shush-1.2.3/debian/patches/series shush-1.2.3/debian/patches/series
--- shush-1.2.3/debian/patches/series	2013-12-29 19:24:18.0 -0500
+++ shush-1.2.3/debian/patches/series	2014-01-07 13:38:10.0 -0500
@@ -1 +1,3 @@
 00_fix_shush.1.diff
+01_fix_string_format.diff
+02_fix_implicit_declaration_strftime.diff


Bug#734013: usbredir: [PATCH] Enable ppc64el port compilation

2014-01-02 Thread Daniel T Chen
Package: usbredir
Version: 0.6-2
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

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

  * Use dh-autoreconf, resolving FTBFS on ppc64el.


This debdiff may contain extraneous metadata. If so, kindly please
ignore those portions. 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.11.0-14-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 usbredir-0.6/debian/changelog usbredir-0.6/debian/changelog
diff -Nru usbredir-0.6/debian/control usbredir-0.6/debian/control
--- usbredir-0.6/debian/control	2013-05-09 10:18:04.0 -0400
+++ usbredir-0.6/debian/control	2014-01-02 20:43:35.0 -0500
@@ -1,8 +1,9 @@
 Source: usbredir
 Section: libs
 Priority: optional
-Maintainer: Liang Guo guoli...@debian.org
-Build-Depends: debhelper (= 9), autotools-dev, libusb-1.0-0-dev, pkg-config
+Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
+XSBC-Original-Maintainer: Liang Guo guoli...@debian.org
+Build-Depends: debhelper (= 9), dh-autoreconf, libusb-1.0-0-dev, pkg-config
 Standards-Version: 3.9.3
 Homepage: http://www.spice-space.org/
 Vcs-Git: git://git.debian.org/collab-maint/usbredir.git
diff -Nru usbredir-0.6/debian/rules usbredir-0.6/debian/rules
--- usbredir-0.6/debian/rules	2012-12-30 09:05:46.0 -0500
+++ usbredir-0.6/debian/rules	2014-01-02 20:44:16.0 -0500
@@ -7,4 +7,4 @@
 
 
 %:
-	dh $@ 
+	dh $@ --with autoreconf


Bug#727327: bbe: update config.{sub,guess} for the AArch64 port

2013-12-30 Thread Daniel T Chen
Package: bbe
Version: 0.2.2-2
Followup-For: Bug #727327
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

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

  * Use dh_autotools-dev for newer ports, resolving FTBFS.


There may be extraneous metadata in the debdiff. If so, please kindly
ignore them. 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.11.0-14-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 bbe-0.2.2/debian/changelog bbe-0.2.2/debian/changelog
diff -Nru bbe-0.2.2/debian/control bbe-0.2.2/debian/control
--- bbe-0.2.2/debian/control	2013-03-02 08:45:44.0 -0500
+++ bbe-0.2.2/debian/control	2013-12-30 10:17:07.0 -0500
@@ -1,8 +1,9 @@
 Source: bbe
 Section: editors
 Priority: optional
-Maintainer: Jari Aalto jari.aa...@cante.net
-Build-Depends: debhelper (= 9), texinfo
+Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
+XSBC-Original-Maintainer: Jari Aalto jari.aa...@cante.net
+Build-Depends: debhelper (= 9), texinfo, autotools-dev
 Standards-Version: 3.9.4
 Vcs-Browser: http://git.debian.org/?p=collab-maint/bbe.git
 Vcs-Git: git://git.debian.org/git/collab-maint/bbe.git
diff -Nru bbe-0.2.2/debian/rules bbe-0.2.2/debian/rules
--- bbe-0.2.2/debian/rules	2013-03-02 08:45:44.0 -0500
+++ bbe-0.2.2/debian/rules	2013-12-30 10:18:03.0 -0500
@@ -14,6 +14,6 @@
 	dh_installchangelogs ChangeLog
 
 %:
-	dh $@
+	dh $@ --with autotools-dev
 
 # End of file


Bug#733660: abuse-sdl: [PATCH] Resolve FTBFS on aarch64 and powerpc64le

2013-12-30 Thread Daniel T Chen
Package: abuse-sdl
Version: 1:0.8-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

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

  * Use newer system autotools and libtool files instead of embedded
ones. Run dh_autoreconf* as appropriate during build, resolving
FTBFS on newer arches.


This debdiff may contain extraneous metadata. If so, please kindly ignore
them. 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.11.0-14-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u abuse-sdl-0.8/debian/control abuse-sdl-0.8/debian/control
--- abuse-sdl-0.8/debian/control
+++ abuse-sdl-0.8/debian/control
@@ -1,9 +1,11 @@
 Source: abuse-sdl
 Section: games
 Priority: optional
-Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
+Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
+XSBC-Original-Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
 Uploaders: Sam Hocevar s...@debian.org
-Build-Depends: debhelper ( 5.0), quilt, libsdl1.2-dev, libsdl-mixer1.2-dev, binutils (= 2.14.90.0.7)
+Build-Depends: debhelper ( 5.0), quilt, libsdl1.2-dev, libsdl-mixer1.2-dev, binutils (= 2.14.90.0.7),
+ dh-autoreconf
 Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/abuse-sdl/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/abuse-sdl/?op=log
diff -u abuse-sdl-0.8/debian/changelog abuse-sdl-0.8/debian/changelog
diff -u abuse-sdl-0.8/debian/rules abuse-sdl-0.8/debian/rules
--- abuse-sdl-0.8/debian/rules
+++ abuse-sdl-0.8/debian/rules
@@ -12,6 +12,7 @@
 
 config-stamp:
 	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+	dh_autoreconf
 	./configure --prefix=/usr --bindir=/usr/games
 	touch config-stamp
 
@@ -26,6 +27,7 @@
 	dh_testroot
 	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f config-stamp build-stamp
+	dh_autoreconf_clean
 	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 	dh_clean
 
diff -u abuse-sdl-0.8/debian/patches/series abuse-sdl-0.8/debian/patches/series
--- abuse-sdl-0.8/debian/patches/series
+++ abuse-sdl-0.8/debian/patches/series
@@ -1,0 +2 @@
+update_auto_libtool_for_new_arches.diff
only in patch2:
unchanged:
--- abuse-sdl-0.8.orig/debian/patches/update_auto_libtool_for_new_arches.diff
+++ abuse-sdl-0.8/debian/patches/update_auto_libtool_for_new_arches.diff
@@ -0,0 +1,11 @@
+Index: abuse-sdl-0.8/configure.ac
+===
+--- abuse-sdl-0.8.orig/configure.ac	2011-05-09 03:58:04.0 -0400
 abuse-sdl-0.8/configure.ac	2013-12-30 13:23:48.695097560 -0500
+@@ -1,6 +1,5 @@
+ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(abuse, 0.8)
+-AC_CONFIG_AUX_DIR(.auto)
+ AM_INIT_AUTOMAKE
+ AM_CONFIG_HEADER(config.h)
+ 


Bug#720800: cadaver: Please update linker flag(s) for FTBFS

2013-11-26 Thread Daniel T Chen
Package: cadaver
Followup-For: Bug #720800
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

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

  * Adjusted lib linking order to resolve FTBFS with --as-needed;
- Also removed d/rules addition for -lgcrypt based on above change.


Because Ubuntu uses ld --as-needed by default, the change made in the
current sid version still FTBFS in Ubuntu 14.04. The above change made
in the current Ubuntu version successfully builds in both jessie and
Ubuntu 14.04.

This patch may contain extraneous metadata; if so, kindly please
disregard those portions. 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.8.0-33-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u cadaver-0.23.3/debian/patches/00list cadaver-0.23.3/debian/patches/00list
--- cadaver-0.23.3/debian/patches/00list
+++ cadaver-0.23.3/debian/patches/00list
@@ -1,2 +1,3 @@
 manpage_hyphen.dpatch
+as-needed-ftbfs.dpatch
 
diff -u cadaver-0.23.3/debian/rules cadaver-0.23.3/debian/rules
--- cadaver-0.23.3/debian/rules
+++ cadaver-0.23.3/debian/rules
@@ -36,7 +36,7 @@
 			--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 			--prefix=/usr --mandir=\$${prefix}/share/man \
 			--enable-warnings --enable-netrc --with-ssl=gnutls \
-			CFLAGS=$(CFLAGS) LIBS=-lgcrypt
+			CFLAGS=$(CFLAGS)
 
 build: build-arch build-indep
 
only in patch2:
unchanged:
--- cadaver-0.23.3.orig/debian/patches/as-needed-ftbfs.dpatch
+++ cadaver-0.23.3/debian/patches/as-needed-ftbfs.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## as-needed-ftbfs.dpatch by Daniel T Chen crim...@ubuntu.com
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix FTBFS using ld --as-needed, ala Ubuntu 14.04
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' cadaver-0.23.3~/Makefile.in cadaver-0.23.3/Makefile.in
+--- cadaver-0.23.3~/Makefile.in	2008-02-11 05:29:53.0 -0500
 cadaver-0.23.3/Makefile.in	2013-11-26 10:51:16.086890396 -0500
+@@ -34,7 +34,7 @@
+ CFLAGS = @CFLAGS@
+ ALL_CFLAGS = $(CPPFLAGS) $(INCLUDES) $(CFLAGS)
+ LDFLAGS = @LDFLAGS@
+-LIBS = @LIBS@ @NEON_LIBS@
++LIBS = @LIBS@ @NEON_LIBS@ -lgcrypt
+ 
+ TARGET = $(PACKAGE)
+ SUBDIRS = lib/neon lib/intl


Bug#718719: yap: FTBFS on arm*

2013-11-22 Thread Daniel T Chen
Package: yap
Version: 6.2.2-1
Followup-For: Bug #718719
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

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

  * Backport patch from upstream yap-6.3 git branch (changeset 48d51e)
resolving FTBFS on unknown arches (closes: #718719).


This debdiff may contain extraneous metadata; if so, kindly please
disregard those portions! 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.8.0-33-generic (SMP w/2 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 yap-6.2.2/debian/patches/05_upstream_6_3_branch_handle_unknown_arch yap-6.2.2/debian/patches/05_upstream_6_3_branch_handle_unknown_arch
--- yap-6.2.2/debian/patches/05_upstream_6_3_branch_handle_unknown_arch	1969-12-31 19:00:00.0 -0500
+++ yap-6.2.2/debian/patches/05_upstream_6_3_branch_handle_unknown_arch	2013-11-22 12:02:18.0 -0500
@@ -0,0 +1,15 @@
+Index: yap-6.2.2/C/gprof.c
+===
+--- yap-6.2.2.orig/C/gprof.c	2010-11-21 18:31:42.0 -0500
 yap-6.2.2/C/gprof.c	2013-11-22 12:02:16.248810422 -0500
+@@ -102,8 +102,8 @@
+ 
+ #else
+ 
+-#define CONTEXT_PC NULL
+-#define CONTEXT_BP NULL
++#define CONTEXT_PC(scv) NULL
++#define CONTEXT_BP(scv) NULL
+ 
+ #endif
+ 
diff -Nru yap-6.2.2/debian/patches/series yap-6.2.2/debian/patches/series
--- yap-6.2.2/debian/patches/series	2013-06-14 16:09:44.0 -0400
+++ yap-6.2.2/debian/patches/series	2013-11-22 11:14:43.0 -0500
@@ -3,3 +3,4 @@
 04_clpr_docu
 yap-texinfo
 tai-ldflags
+05_upstream_6_3_branch_handle_unknown_arch


Bug#729490: libstxxl: [PATCH] Resolve FTBFS from conditional file removal in build infrastructure

2013-11-13 Thread Daniel T Chen
Package: libstxxl
Version: 1.3.1-5
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

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

  * Resolve FTBFS from extra build infrastructure command


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.8.0-33-generic (SMP w/2 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 libstxxl-1.3.1/debian/rules libstxxl-1.3.1/debian/rules
--- libstxxl-1.3.1/debian/rules	2013-08-31 07:35:20.0 -0400
+++ libstxxl-1.3.1/debian/rules	2013-11-12 17:03:51.0 -0500
@@ -31,7 +31,7 @@
 	rm $(CURDIR)/debian/libstxxl-dev/usr/include/bits/intel_compatibility.h
 	rmdir $(CURDIR)/debian/libstxxl-dev/usr/include/bits
 	#Remove duplicated changelog
-	rm $(CURDIR)/debian/libstxxl1/usr/share/doc/libstxxl1/CHANGELOG.gz
+	-rm $(CURDIR)/debian/libstxxl1/usr/share/doc/libstxxl1/CHANGELOG.gz
 
 clean::
 	-cd lib; \


Bug#729500: ssh-agent-filter: [PATCH] Resolve FTBFS from linking order

2013-11-13 Thread Daniel T Chen
Package: ssh-agent-filter
Version: 0.3-1
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

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

  * Changed linking order to resolve FTBFS.


I've taken the liberty of realigning the linker variables to bring them
in line with convention. Also, I noticed in the master git branch that
you've moved to boost:iostreams; I made the least invasive change to
resolve the 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.8.0-33-generic (SMP w/2 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 ssh-agent-filter-0.3/debian/patches/0001-Fix-linking-order-FTBFS.patch ssh-agent-filter-0.3/debian/patches/0001-Fix-linking-order-FTBFS.patch
--- ssh-agent-filter-0.3/debian/patches/0001-Fix-linking-order-FTBFS.patch	1969-12-31 19:00:00.0 -0500
+++ ssh-agent-filter-0.3/debian/patches/0001-Fix-linking-order-FTBFS.patch	2013-11-13 10:46:52.0 -0500
@@ -0,0 +1,21 @@
+Index: ssh-agent-filter-0.3/Makefile
+===
+--- ssh-agent-filter-0.3.orig/Makefile	2013-10-25 19:18:11.0 -0400
 ssh-agent-filter-0.3/Makefile	2013-11-13 10:46:50.438054442 -0500
+@@ -19,7 +19,7 @@
+ CXXFLAGS ?= -g -O2 -Wall -Wold-style-cast
+ 
+ CXXFLAGS += -std=c++11
+-LDFLAGS += -lstdc++ -lboost_program_options -lboost_filesystem -lboost_system -lnettle
++LDADD += -lstdc++ -lboost_program_options -lboost_filesystem -lboost_system -lnettle
+ 
+ all: ssh-agent-filter.1 afssh.1 ssh-askpass-noinput.1
+ 
+@@ -30,6 +30,7 @@
+ 	help2man -n $ -o $@ -N ./$
+ 
+ ssh-agent-filter: ssh-agent-filter.o
++	$(CXX) $ -o $@ $(LDADD)
+ 
+ ssh-agent-filter.o: ssh-agent-filter.C rfc4251.h ssh-agent.h version.h
+ 
diff -Nru ssh-agent-filter-0.3/debian/patches/series ssh-agent-filter-0.3/debian/patches/series
--- ssh-agent-filter-0.3/debian/patches/series	1969-12-31 19:00:00.0 -0500
+++ ssh-agent-filter-0.3/debian/patches/series	2013-11-13 10:30:27.0 -0500
@@ -0,0 +1 @@
+0001-Fix-linking-order-FTBFS.patch


Bug#729506: ratpoints: [PATCH] Resolve FTBFS from linking order

2013-11-13 Thread Daniel T Chen
Package: ratpoints
Version: 2.1.3+dfsg-2
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

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

  * Resolved FTBFS from linking order.


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.8.0-33-generic (SMP w/2 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 ratpoints-2.1.3+dfsg/debian/patches/automake.patch ratpoints-2.1.3+dfsg/debian/patches/automake.patch
--- ratpoints-2.1.3+dfsg/debian/patches/automake.patch	2013-07-28 18:25:01.0 -0400
+++ ratpoints-2.1.3+dfsg/debian/patches/automake.patch	2013-11-13 11:28:35.0 -0500
@@ -2,8 +2,10 @@
 Date: Tue, 05 Feb 2013
 Subject: Switch to automake, build a shared library using libtool
 
 a/Makefile
-+++ /dev/null
+Index: ratpoints-2.1.3+dfsg/Makefile
+===
+--- ratpoints-2.1.3+dfsg.orig/Makefile	2011-03-10 07:59:38.0 -0500
 /dev/null	1970-01-01 00:00:00.0 +
 @@ -1,139 +0,0 @@
 -#   ratpoints-2.1.3
 -#- A program to find rational points on hyperelliptic curves
@@ -144,9 +146,11 @@
 -
 -find_points.h: gen_find_points_h
 -	./gen_find_points_h  find_points.h
 /dev/null
-+++ b/Makefile.am
-@@ -0,0 +1,75 @@
+Index: ratpoints-2.1.3+dfsg/Makefile.am
+===
+--- /dev/null	1970-01-01 00:00:00.0 +
 ratpoints-2.1.3+dfsg/Makefile.am	2013-11-13 11:28:33.623763174 -0500
+@@ -0,0 +1,76 @@
 +INCLUDES = -I$(top_srcdir)
 +AM_CFLAGS = $(GMP_FLAGS) $(SIMD_FLAGS) -DRATPOINTS_MAX_BITS_IN_PRIME=7 -DUSE_SSE
 +AM_LIBS = $(GMP_LIBS) $(LIBM)
@@ -173,6 +177,7 @@
 +	$(top_srcdir)/primes.h \
 +	$(top_srcdir)/rp-private.h
 +libratpoints_la_LDFLAGS = -release 2.1.3
++libratpoints_la_LIBADD = -lm
 +
 +include_HEADERS = ratpoints.h
 +
@@ -222,8 +227,10 @@
 +check-local: $(top_builddir)/rptest testbase
 +	time $(top_builddir)/rptest  $(top_builddir)/rptest.out
 +	cmp -s $(top_srcdir)/testbase $(top_builddir)/rptest.out || echo Test failed!
 /dev/null
-+++ b/configure.ac
+Index: ratpoints-2.1.3+dfsg/configure.ac
+===
+--- /dev/null	1970-01-01 00:00:00.0 +
 ratpoints-2.1.3+dfsg/configure.ac	2013-11-13 11:15:18.0 -0500
 @@ -0,0 +1,75 @@
 +AC_INIT(ratpoints, 2.1.3)
 +AC_CANONICAL_TARGET


Bug#729528: dnsval: [PATCH] Resolve FTBFS from missing lib linking

2013-11-13 Thread Daniel T Chen
Package: dnsval
Version: 2.0-1.1
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

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

  * Resolve FTBFS from missing linking order.


libsres and libval* all needed explicit linking against libcrypto (and
appropriately libssl and libpthread). 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.8.0-33-generic (SMP w/2 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 dnsval-2.0/debian/patches/Fix_FTBFS_from_link_order.patch dnsval-2.0/debian/patches/Fix_FTBFS_from_link_order.patch
--- dnsval-2.0/debian/patches/Fix_FTBFS_from_link_order.patch	1969-12-31 19:00:00.0 -0500
+++ dnsval-2.0/debian/patches/Fix_FTBFS_from_link_order.patch	2013-11-13 15:20:43.0 -0500
@@ -0,0 +1,30 @@
+Index: dnsval-2.0/libsres/Makefile.in
+===
+--- dnsval-2.0.orig/libsres/Makefile.in	2012-03-23 11:11:57.0 -0400
 dnsval-2.0/libsres/Makefile.in	2013-11-13 15:20:41.766951407 -0500
+@@ -62,8 +62,9 @@
+ 	$(RM) -f $(OBJ) $(LOBJ) $(LIBRES) $(LIBSRESSO)
+ 	$(RM) -rf $(LT_DIR)
+ 
++LIBADD+= -lcrypto
+ $(LIBRES): $(LOBJ)
+-	$(LIBTOOLLD) -o $@ $(LOBJ) 
++	$(LIBTOOLLD) -o $@ $(LOBJ) $(LIBADD)
+ 
+ install:
+ 	$(MKPATH) $(DESTDIR)$(libdir)
+Index: dnsval-2.0/libval/Makefile.in
+===
+--- dnsval-2.0.orig/libval/Makefile.in	2012-09-24 17:57:17.0 -0400
 dnsval-2.0/libval/Makefile.in	2013-11-13 15:20:15.142915378 -0500
+@@ -62,8 +62,9 @@
+ 	$(RM) -f $(LOBJ) $(OBJ) $(LIBVAL)
+ 	$(RM) -rf $(LT_DIR)
+ 
++LIBADD+= -lssl -lcrypto -lpthread
+ $(LIBVAL): $(LOBJ)
+-	$(LIBTOOLLD) -o $@ $(LOBJ)
++	$(LIBTOOLLD) -o $@ $(LOBJ) $(LIBADD)
+ 
+ install:
+ 	$(MKPATH) $(DESTDIR)$(libdir)
diff -Nru dnsval-2.0/debian/patches/series dnsval-2.0/debian/patches/series
--- dnsval-2.0/debian/patches/series	2013-09-19 06:34:01.0 -0400
+++ dnsval-2.0/debian/patches/series	2013-11-13 14:52:03.0 -0500
@@ -1,2 +1,3 @@
 Add_-lcrypto_to_LIBS_in_apps.patch
 val_res_query.3_is_not_a_symlink.patch
+Fix_FTBFS_from_link_order.patch


Bug#729424: svox: [PATCH] Resolve FTBFS with link order

2013-11-12 Thread Daniel T Chen
Package: svox
Version: 1.0+git20130326-1
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

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

  * d/patches/0009-Fix-link-order.patch: Added to resolve FTBFS with
new toolchain.


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.8.0-33-generic (SMP w/2 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 svox-1.0+git20130326/debian/patches/0009-Fix-link-order.patch svox-1.0+git20130326/debian/patches/0009-Fix-link-order.patch
--- svox-1.0+git20130326/debian/patches/0009-Fix-link-order.patch	1969-12-31 19:00:00.0 -0500
+++ svox-1.0+git20130326/debian/patches/0009-Fix-link-order.patch	2013-11-12 13:00:55.0 -0500
@@ -0,0 +1,21 @@
+Index: svox-1.0+git20130326/pico/Makefile.am
+===
+--- svox-1.0+git20130326.orig/pico/Makefile.am	2013-11-12 12:37:05.939979854 -0500
 svox-1.0+git20130326/pico/Makefile.am	2013-11-12 13:00:52.336945041 -0500
+@@ -70,6 +70,8 @@
+ lib/picotrns.h \
+ lib/picowa.h
+ 
++libttspico_la_LIBADD = -lm
++
+ picolangdir = $(datadir)/pico/lang
+ picolang_DATA = \
+ lang/de-DE*.bin \
+@@ -83,6 +85,6 @@
+ pico2wave_SOURCES = \
+ 	bin/pico2wave.c
+ pico2wave_LDADD = \
+-	libttspico.la -lm -lpopt
++	libttspico.la -lpopt
+ pico2wave_CFLAGS = -Wall -Dpicolangdir=\$(picolangdir)\ -I lib
+ 
diff -Nru svox-1.0+git20130326/debian/patches/series svox-1.0+git20130326/debian/patches/series
--- svox-1.0+git20130326/debian/patches/series	2013-07-25 04:21:34.0 -0400
+++ svox-1.0+git20130326/debian/patches/series	2013-11-12 12:25:33.0 -0500
@@ -5,3 +5,4 @@
 0005-Install-lang-files.patch
 0006-Set-picolangdir.patch
 0008-64bits.patch
+0009-Fix-link-order.patch


Bug#729439: xxxterm: [PATCH] Resolve FTBFS from missing header

2013-11-12 Thread Daniel T Chen
Package: xxxterm
Version: 1:1.11.3-1.1
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

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

  * Added patch resolving FTBFS due to missing header.


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.8.0-33-generic (SMP w/2 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 xxxterm-1.11.3/debian/patches/0006-Add-missing-includes.patch xxxterm-1.11.3/debian/patches/0006-Add-missing-includes.patch
--- xxxterm-1.11.3/debian/patches/0006-Add-missing-includes.patch	1969-12-31 19:00:00.0 -0500
+++ xxxterm-1.11.3/debian/patches/0006-Add-missing-includes.patch	2013-11-12 15:25:41.0 -0500
@@ -0,0 +1,12 @@
+Index: xxxterm-1.11.3/xxxterm.c
+===
+--- xxxterm-1.11.3.orig/xxxterm.c	2013-11-12 15:23:46.329810769 -0500
 xxxterm-1.11.3/xxxterm.c	2013-11-12 15:25:37.595061314 -0500
+@@ -20,6 +20,7 @@
+  */
+ 
+ #include xxxterm.h
++#include netdb.h
+ #include version.h
+ 
+ char		*version = XXXTERM_VERSION;
diff -Nru xxxterm-1.11.3/debian/patches/series xxxterm-1.11.3/debian/patches/series
--- xxxterm-1.11.3/debian/patches/series	2012-03-17 09:44:23.0 -0400
+++ xxxterm-1.11.3/debian/patches/series	2013-11-12 15:23:56.0 -0500
@@ -3,3 +3,4 @@
 0003-Unnecessary-lib-directory-installation.patch
 0004-Fix-lintian-error-hyphen-used-as-minus-sign.patch
 0005-Fix-Icon-path-in-desktop-file.patch
+0006-Add-missing-includes.patch


Bug#705875: gpaint: FTBFS with gcc-4.8 in experimental and eglibc-2.7

2013-04-21 Thread Daniel T Chen
Package: gpaint
Version: 0.3.3-6
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,

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

  * Fixed FTBFS:
- added missing preprocessor directives and math lib to link;
- added forward declarations, fixing implicit declaration warnings
  that would have caused FTBFS on amd64 buildds.


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.5.0-27-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 gpaint-0.3.3/debian/patches/27_fix_missing_hdrs_libs.diff gpaint-0.3.3/debian/patches/27_fix_missing_hdrs_libs.diff
--- gpaint-0.3.3/debian/patches/27_fix_missing_hdrs_libs.diff	1969-12-31 19:00:00.0 -0500
+++ gpaint-0.3.3/debian/patches/27_fix_missing_hdrs_libs.diff	2013-04-21 10:16:18.0 -0400
@@ -0,0 +1,71 @@
+Index: gpaint-0.3.3/src/image.c
+===
+--- gpaint-0.3.3.orig/src/image.c	2013-04-21 10:13:06.029569664 -0400
 gpaint-0.3.3/src/image.c	2013-04-21 10:13:23.209284134 -0400
+@@ -28,6 +28,8 @@
+ #include image.h
+ #include debug.h
+ #include math.h
++#include string.h
++#include libintl.h
+ #include gdk/gdk.h
+ #include gdk/gdkx.h  /* for gdk_root_parent */
+ #include gdk-pixbuf/gdk-pixbuf.h
+Index: gpaint-0.3.3/src/text.c
+===
+--- gpaint-0.3.3.orig/src/text.c	2013-04-21 10:13:06.009569962 -0400
 gpaint-0.3.3/src/text.c	2013-04-21 10:13:23.209284134 -0400
+@@ -26,6 +26,8 @@
+ #  include config.h
+ #endif
+ 
++#include ctype.h
++#include stdlib.h
+ #include string.h
+ 
+ #ifdef HAVE_STRING_H
+@@ -76,6 +78,7 @@
+ static void text_draw_string(gpaint_text *text);
+ static gint text_handle_timeout(gpaint_text *text);
+ static void text_draw_current_string(gpaint_tool *tool);
++extern void convert_color(const GdkColor *color, unsigned char *r, unsigned char *g, unsigned char *b);
+ 
+ gpaint_tool *text_create(const char *name)
+ {
+Index: gpaint-0.3.3/src/main.c
+===
+--- gpaint-0.3.3.orig/src/main.c	2013-04-21 10:13:06.017569892 -0400
 gpaint-0.3.3/src/main.c	2013-04-21 10:13:23.209284134 -0400
+@@ -36,6 +36,7 @@
+ 
+ static GList *window_list = 0;
+ static void create_window(void);
++extern void text_set_fontpicker(gpaint_tool *tool, GtkFontButton *fontpicker);
+ 
+ 
+ 
+Index: gpaint-0.3.3/src/Makefile.am
+===
+--- gpaint-0.3.3.orig/src/Makefile.am	2013-04-21 10:15:52.766801609 -0400
 gpaint-0.3.3/src/Makefile.am	2013-04-21 10:16:09.014530578 -0400
+@@ -67,6 +67,6 @@
+ 
+ 
+ gpaint_2_CFLAGS = -I$(srcdir)
+-gpaint_2_LDADD = $(GUI_LIBS) $(PRINT_LIBS)
++gpaint_2_LDADD = $(GUI_LIBS) $(PRINT_LIBS) -lm
+ gpaint_2_LDFLAGS = -Wl,--export-dynamic
+ 
+Index: gpaint-0.3.3/src/Makefile.in
+===
+--- gpaint-0.3.3.orig/src/Makefile.in	2013-04-21 10:15:59.014697621 -0400
 gpaint-0.3.3/src/Makefile.in	2013-04-21 10:16:16.050413141 -0400
+@@ -168,7 +168,7 @@
+ 
+ 
+ gpaint_2_CFLAGS = -I$(srcdir)
+-gpaint_2_LDADD = $(GUI_LIBS) $(PRINT_LIBS)
++gpaint_2_LDADD = $(GUI_LIBS) $(PRINT_LIBS) -lm
+ gpaint_2_LDFLAGS = -Wl,--export-dynamic
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_CLEAN_FILES = 
diff -Nru gpaint-0.3.3/debian/patches/series gpaint-0.3.3/debian/patches/series
--- gpaint-0.3.3/debian/patches/series	2009-12-29 19:06:14.0 -0500
+++ gpaint-0.3.3/debian/patches/series	2013-04-21 10:15:13.0 -0400
@@ -10,3 +10,4 @@
 24_fix_crash_on_failed_write.diff
 25_fix_color_selection.diff
 26_fix_toolbar.diff
+27_fix_missing_hdrs_libs.diff


Bug#701420: tiobench: ftbfs with eglibc-2.17

2013-04-15 Thread Daniel T Chen
Package: tiobench
Version: 0.3.3-5
Tags: patch
Followup-For: Bug #701420
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,

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

  * Used patch from PLD Linux 
(http://git.pld-linux.org/gitweb.cgi?p=packages/tiobench.git;a=commitdiff_plain;h=655be581fb8c65248538d4a29443da973cfcfe7e)
 
to deconflict function name, fixing FTBFS (Closes: #701420).


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.5.0-27-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
--- tiobench-0.3.3.orig/tiotest.c
+++ tiobench-0.3.3/tiotest.c
@@ -31,7 +31,7 @@
 */
 ArgumentOptions args;
 
-static void * aligned_alloc(ssize_t size)
+static void * tio_aligned_alloc(ssize_t size)
 {
 	caddr_t a;
 	a = mmap((caddr_t )0, size, 
@@ -281,7 +281,7 @@
 		pthread_attr_setscope((d-threads[i].thread_attr),
   PTHREAD_SCOPE_SYSTEM);
 
-		d-threads[i].buffer = aligned_alloc( d-threads[i].blockSize );
+		d-threads[i].buffer = tio_aligned_alloc( d-threads[i].blockSize );
 		if( d-threads[i].buffer == NULL )
 		{
 			perror(Error allocating memory);


Bug#530207: tiobench: bashism in /bin/sh script

2013-04-15 Thread Daniel T Chen
Package: tiobench
Version: 0.3.3-5
Tags: patch
Followup-For: Bug #530207
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,

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

  * Fixed bashisms (Closes: #530207).


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.5.0-27-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
--- tiobench-0.3.3.orig/scripts/bigbench.sh
+++ tiobench-0.3.3/scripts/bigbench.sh
@@ -25,7 +25,7 @@
 # sekrit ninja crypto
 flag=`echo --qd0kkx-enqbd | tr 0a-z a-z`
 
-function doit()
+doit()
 {
 	sed -e s/@@CHUNK/${1}k/  raidtab.tp  raidtab
 	mkraid --configfile raidtab $flag $device
@@ -45,7 +45,7 @@
 	$tiobench --dir /bench --size $size --numruns $numruns  ${outputdir}/tiobench.${suffix}
 }
 
-function close() 
+close() 
 {
 	umount $device
 	umount $benchdir


Bug#701436: udpcast: ftbfs with eglibc-2.17

2013-04-14 Thread Daniel T Chen
Package: udpcast
Version: 20100130-3
Followup-For: Bug #701436
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,

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

  * Rearranged preprocessor directive for FD_SET(3), 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.5.0-27-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 udpcast-20100130/debian/patches/missing_fdset3 udpcast-20100130/debian/patches/missing_fdset3
--- udpcast-20100130/debian/patches/missing_fdset3	1969-12-31 19:00:00.0 -0500
+++ udpcast-20100130/debian/patches/missing_fdset3	2013-04-14 16:57:48.0 -0400
@@ -0,0 +1,25 @@
+Index: udpcast-20100130/console.c
+===
+--- udpcast-20100130.orig/console.c	2009-10-29 03:13:59.0 -0400
 udpcast-20100130/console.c	2013-04-14 16:57:42.006780323 -0400
+@@ -10,7 +10,6 @@
+ #ifndef __MINGW32__
+ 
+ #include termios.h
+-#include sys/select.h
+ 
+ struct console_t {
+ int fd; /* Filedescriptor for console, or -1 if disabled */
+Index: udpcast-20100130/console.h
+===
+--- udpcast-20100130.orig/console.h	2005-12-22 17:59:18.0 -0500
 udpcast-20100130/console.h	2013-04-14 16:57:35.402888636 -0400
+@@ -6,6 +6,8 @@
+ #include winbase.h
+ #endif /* __MINGW32__ */
+ 
++#include sys/select.h
++
+ #define prepareConsole udpc_prepareConsole
+ #define getConsoleFd udpc_getConsoleFd
+ #define restoreConsole udpc_restoreConsole
diff -Nru udpcast-20100130/debian/patches/series udpcast-20100130/debian/patches/series
--- udpcast-20100130/debian/patches/series	2011-07-23 06:22:40.0 -0400
+++ udpcast-20100130/debian/patches/series	2013-04-14 16:55:32.0 -0400
@@ -1,2 +1,3 @@
 nostrip
 manpage_fixes
+missing_fdset3


Bug#701429: beanstalkd: ftbfs with eglibc-2.17

2013-03-31 Thread Daniel T Chen
Package: beanstalkd
Version: 1.7-1
Followup-For: Bug #701429
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,

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

  * Added missing preprocessor directive to fix FTBFS on Linux.
(Closes: #701429)


I note that you're considering uploading upstream version 1.8 to sid; I have
not verified whether this patch is still necessary (at least the files have
changed) using the toolchain used to report this bug. (1.8 appears to build
in Ubuntu 13.04 on Linux without this proposed patch.)

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.5.0-26-generic (SMP w/2 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 beanstalkd-1.7/debian/patches/gcc-ftbfs.diff beanstalkd-1.7/debian/patches/gcc-ftbfs.diff
--- beanstalkd-1.7/debian/patches/gcc-ftbfs.diff	1969-12-31 19:00:00.0 -0500
+++ beanstalkd-1.7/debian/patches/gcc-ftbfs.diff	2013-03-31 18:19:52.0 -0400
@@ -0,0 +1,11 @@
+Index: beanstalkd-1.7/port-linux.c
+===
+--- beanstalkd-1.7.orig/port-linux.c	2012-09-10 03:58:03.0 -0400
 beanstalkd-1.7/port-linux.c	2013-03-31 18:19:48.080815383 -0400
+@@ -1,5 +1,6 @@
+ #define _XOPEN_SOURCE 600
+ #include stdint.h
++#include stddef.h
+ #include fcntl.h
+ #include dat.h
+ 
diff -Nru beanstalkd-1.7/debian/patches/series beanstalkd-1.7/debian/patches/series
--- beanstalkd-1.7/debian/patches/series	2012-09-15 06:17:44.0 -0400
+++ beanstalkd-1.7/debian/patches/series	2013-03-31 18:18:16.0 -0400
@@ -1 +1,2 @@
 freebsd-build.diff
+gcc-ftbfs.diff


Bug#702111: libsocialweb: [PATCH] Fix FTBFS using -format-security

2013-03-02 Thread Daniel T Chen
Package: libsocialweb
Version: 0.25.20-3.1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,

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

  * Patched source file to use format argument, fixing FTBFS.


Please note that CFLAGS in Ubuntu are likely more strict, thereby causing
this failure.

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-38-generic (SMP w/2 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 libsocialweb-0.25.20/debian/patches/format-security.patch libsocialweb-0.25.20/debian/patches/format-security.patch
--- libsocialweb-0.25.20/debian/patches/format-security.patch	1969-12-31 19:00:00.0 -0500
+++ libsocialweb-0.25.20/debian/patches/format-security.patch	2013-03-02 14:18:23.0 -0500
@@ -0,0 +1,20 @@
+Index: libsocialweb-0.25.20/libsocialweb-client/sw-client-service.c
+===
+--- libsocialweb-0.25.20.orig/libsocialweb-client/sw-client-service.c	2011-11-12 05:56:37.0 -0500
 libsocialweb-0.25.20/libsocialweb-client/sw-client-service.c	2013-03-02 14:18:17.496718396 -0500
+@@ -595,6 +595,7 @@
+  closure-userdata,
+  SW_CLIENT_SERVICE_ERROR,
+  0,
++ %s,
+  error_message);
+ g_object_unref (closure-service);
+ g_slice_free (SwClientServiceCallClosure, closure);
+@@ -663,6 +664,7 @@
+  closure-userdata,
+  SW_CLIENT_SERVICE_ERROR,
+  0,
++ %s,
+  info ? File to upload is not a regular file :
+  Could not get file size information for file);
+ if (info)
diff -Nru libsocialweb-0.25.20/debian/patches/series libsocialweb-0.25.20/debian/patches/series
--- libsocialweb-0.25.20/debian/patches/series	2013-03-02 05:43:53.0 -0500
+++ libsocialweb-0.25.20/debian/patches/series	2013-03-02 14:14:28.0 -0500
@@ -2,3 +2,4 @@
 c1791e96182815449781fcda6007b69cd88cf7bf.patch
 e928f75ca45df8fb170230c95860f1a0fb3ae4e9.patch
 CVE-2012-4511.patch
+format-security.patch


Bug#698120: acetoneiso: Depends on fuse-utils; uninstallable in sid

2013-01-21 Thread Daniel T Chen
Package: acetoneiso
Version: 2.3-2
Followup-For: Bug #698120
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,


In Ubuntu, the attached patch is ready to be applied to achieve the following:

  * Fix dependency on fuse-utils to fuse to resolve uninstallability in
Debian unstable (Closes: #698120)


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/2 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 acetoneiso-2.3/debian/control acetoneiso-2.3/debian/control
--- acetoneiso-2.3/debian/control	2012-01-21 14:43:47.0 -0500
+++ acetoneiso-2.3/debian/control	2013-01-21 10:46:39.0 -0500
@@ -12,7 +13,7 @@
 Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends},
   fuseiso,
-  fuse-utils,
+  fuse,
   genisoimage,
   cdrdao,
   p7zip-full,


Bug#663575: sawzall: FTBFS: error: 'sawzall::Proc::Proc' names the constructor, not the type

2013-01-06 Thread Daniel T Chen
Package: sawzall
Version: 1.0-1
Followup-For: Bug #663575
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

In Ubuntu, the attached patch can be applied to achieve the following:

  * Add fix_erroneous_contructor patch from upstream changeset #38 to
resolve FTBFS (Closes: #663575)


Thanks for considering the patch.

Please note that there are additional issues that cause further FTBFS;
this patch addresses this specific issue.


-- 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/2 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 sawzall-1.0/debian/changelog sawzall-1.0/debian/changelog
diff -Nru sawzall-1.0/debian/control sawzall-1.0/debian/control
--- sawzall-1.0/debian/control	2010-12-02 16:34:09.0 -0500
+++ sawzall-1.0/debian/control	2013-01-06 17:14:39.0 -0500
@@ -1,7 +1,8 @@
 Source: sawzall
 Section: devel
 Priority: optional
-Maintainer: Gustavo Franco stra...@debian.org
+Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
+XSBC-Original-Maintainer: Gustavo Franco stra...@debian.org
 Build-Depends: debhelper (= 7), autotools-dev, protobuf-compiler, libpcre3-dev, libssl-dev, libicu-dev, libstdc++6-4.4-dev, libprotoc-dev
 Standards-Version: 3.8.3
 Homepage: http://code.google.com/p/szl/
diff -Nru sawzall-1.0/debian/patches/fix_erroneous_contructor sawzall-1.0/debian/patches/fix_erroneous_contructor
--- sawzall-1.0/debian/patches/fix_erroneous_contructor	1969-12-31 19:00:00.0 -0500
+++ sawzall-1.0/debian/patches/fix_erroneous_contructor	2013-01-06 16:54:07.0 -0500
@@ -0,0 +1,13 @@
+Index: sawzall-1.0/src/engine/symboltable.cc
+===
+--- sawzall-1.0.orig/src/engine/symboltable.cc	2010-08-15 18:04:14.0 -0400
 sawzall-1.0/src/engine/symboltable.cc	2013-01-06 16:54:00.071962463 -0500
+@@ -44,7 +44,7 @@
+ // --
+ // Implementation of SymbolTable
+ 
+-Proc::Proc* SymbolTable::init_proc_ = NULL;
++Proc* SymbolTable::init_proc_ = NULL;
+ 
+ ListTableType** SymbolTable::table_types_ = NULL;
+ TableType* SymbolTable::collection_type_ = NULL;
diff -Nru sawzall-1.0/debian/patches/series sawzall-1.0/debian/patches/series
--- sawzall-1.0/debian/patches/series	2010-11-05 17:00:53.0 -0400
+++ sawzall-1.0/debian/patches/series	2013-01-06 16:53:18.0 -0500
@@ -1 +1,2 @@
 debian-changes-1.0-1
+fix_erroneous_contructor


Bug#684722: w3af: Does not start : pybloomfiltermmap is a required dependency

2013-01-05 Thread Daniel T Chen
Package: w3af
Version: 1.1svn5547-1
Followup-For: Bug #684722
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch is ready to be applied to achieve the following:

  * Rediff existing dependency patch into new
remove_pybloomfilter_import.patch and apply it (closes: #684722)


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/2 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 w3af-1.1svn5547/debian/changelog w3af-1.1svn5547/debian/changelog
diff -Nru w3af-1.1svn5547/debian/patches/remove_pybloomfiltermmap_import.patch w3af-1.1svn5547/debian/patches/remove_pybloomfiltermmap_import.patch
--- w3af-1.1svn5547/debian/patches/remove_pybloomfiltermmap_import.patch	1969-12-31 19:00:00.0 -0500
+++ w3af-1.1svn5547/debian/patches/remove_pybloomfiltermmap_import.patch	2013-01-06 01:18:30.0 -0500
@@ -0,0 +1,22 @@
+Index: w3af-1.1svn5547/core/controllers/dependency_check/dependency_check.py
+===
+--- w3af-1.1svn5547.orig/core/controllers/dependency_check/dependency_check.py	2013-01-05 23:48:46.0 -0500
 w3af-1.1svn5547/core/controllers/dependency_check/dependency_check.py	2013-01-05 23:55:07.164913283 -0500
+@@ -53,17 +53,6 @@
+ packages_mac_ports = []
+ additional_information = []
+ 
+-if platform.system() != 'Windows':
+-try:
+-from pybloomfilter import BloomFilter as mmap_filter
+-except Exception, e:
+-msg = 'pybloomfiltermmap is a required dependency in *nix systems,'
+-msg += 'in order to install it please run the following commands:'
+-msg += 'sudo apt-get install python2.6-dev\n'
+-msg += 'sudo easy_install pybloomfiltermmap'
+-additional_information.append(msg)
+-reasonForExit = True
+-#mem_test('after bloom filter import')
+ try:
+ import esmre
+ import esm
diff -Nru w3af-1.1svn5547/debian/patches/series w3af-1.1svn5547/debian/patches/series
--- w3af-1.1svn5547/debian/patches/series	2012-08-08 21:21:42.0 -0400
+++ w3af-1.1svn5547/debian/patches/series	2013-01-06 01:18:30.0 -0500
@@ -3,3 +3,4 @@
 disable-auto-update.patch
 dep-a-la-deb_01_nltk.patch
 disable-pybloom.patch
+remove_pybloomfiltermmap_import.patch


Bug#691809: storymaps: FTBFS: needs to build-depend on docbook-to-man

2012-12-16 Thread Daniel T Chen
Package: storymaps
Version: 1.0-1
Followup-For: Bug #691809
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,

Attached is a trivially tweaked patch for Debian unstable that resolves
the reported symptom.

  * Build depend on docbook-to-man, fixes FTBFS (Closes: #691809)


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-34-generic (SMP w/2 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 storymaps-1.0/debian/changelog storymaps-1.0/debian/changelog
diff -Nru storymaps-1.0/debian/control storymaps-1.0/debian/control
--- storymaps-1.0/debian/control	2012-08-07 22:14:38.0 -0400
+++ storymaps-1.0/debian/control	2012-12-01 11:52:12.0 -0500
@@ -1,7 +1,8 @@
 Source: storymaps
 Priority: extra
-Maintainer: Javier Fernández-Sanguino Peña j...@debian.org
-Build-Depends: debhelper (= 7.0.50~), javahelper (=0.25)
+Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
+XSBC-Original-Maintainer: Javier Fernández-Sanguino Peña j...@debian.org
+Build-Depends: debhelper (= 7.0.50~), javahelper (=0.25), docbook-to-man
 Build-Depends-Indep: default-jdk, libfreemarker-java, libpiccolo-java
 Standards-Version: 3.9.0
 Section: utils


Bug#656797: deb-gview: FTBFS due to use of deprecated GLib/GTK functions

2012-01-21 Thread Daniel T Chen
Package: deb-gview
Version: 0.2.8
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

Dear Maintainer,

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

  * dvpreview.c: Use UTF-8 functions instead of deprecated API. Fixes
FTBFS.
  * {interface,main}.c: Update not to use deprecated API. Fixes FTBFS.


In particular, please review the changes to dvpreview.c regarding
filename comparison; you may well have a better solution. 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')
Architecture: amd64 (x86_64)

Kernel: Linux 3.0.0-14-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 deb-gview-0.2.8/src/dvpreview.c deb-gview-0.2.8ubuntu1/src/dvpreview.c
--- deb-gview-0.2.8/src/dvpreview.c	2009-10-31 17:33:34.0 -0400
+++ deb-gview-0.2.8ubuntu1/src/dvpreview.c	2012-01-21 14:31:06.0 -0500
@@ -379,7 +379,7 @@
 	}
 	/* glib temp files don't cope well with suffixes. */
 	f = g_file_open_tmp (TMPPREFIX,	tmp_name, gerr);
-	if (g_strcasecmp (, prev-suffix))
+	if (g_utf8_collate(, g_utf8_casefold(prev-suffix, -1)))
 	{
 		temp_file = g_strconcat (tmp_name, ., prev-suffix, NULL);
 		g_remove (tmp_name);
@@ -463,7 +463,7 @@
 
 	gerr = NULL;
 	globbed = NULL;
-	ourterm = (g_strcasecmp (, terminal))	? terminal : DVDEFAULT;
+	ourterm = (g_utf8_collate(, g_utf8_casefold(terminal, -1)))? terminal : DVDEFAULT;
 	file = ./usr/share/man/man1/deb-gview.1.gz;
 	len = g_utf8_strlen (file, 255);
 	file_rev = g_utf8_strreverse (file, len);
diff -Nru deb-gview-0.2.8/src/interface.c deb-gview-0.2.8ubuntu1/src/interface.c
--- deb-gview-0.2.8/src/interface.c	2011-05-08 10:18:26.0 -0400
+++ deb-gview-0.2.8ubuntu1/src/interface.c	2012-01-21 14:46:17.0 -0500
@@ -136,7 +136,7 @@
 	if (deb_gview_window_icon_pixbuf)
 	{
 		gtk_window_set_icon (GTK_WINDOW (deb_gview_window), deb_gview_window_icon_pixbuf);
-		gdk_pixbuf_unref (deb_gview_window_icon_pixbuf);
+		g_object_unref (deb_gview_window_icon_pixbuf);
 	}
 
 	vbox1 = gtk_vbox_new (FALSE, 0);
diff -Nru deb-gview-0.2.8/src/main.c deb-gview-0.2.8ubuntu1/src/main.c
--- deb-gview-0.2.8/src/main.c	2012-01-08 09:09:44.0 -0500
+++ deb-gview-0.2.8ubuntu1/src/main.c	2012-01-21 14:42:14.0 -0500
@@ -183,7 +183,7 @@
 {
 	gtk_window_set_icon (GTK_WINDOW (dialog), 
 		deb_gview_window_icon_pixbuf);
-	gdk_pixbuf_unref (deb_gview_window_icon_pixbuf);
+	g_object_unref (deb_gview_window_icon_pixbuf);
 }
 gtk_dialog_run (dialog);
 gtk_widget_destroy (GTK_WIDGET (dialog));


Bug#656409: spd: FTBFS with ld --as-needed

2012-01-18 Thread Daniel T Chen
Package: spd
Version: 1.3.0-1
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

Dear Maintainer,

In Debian, ld --as-needed is not yet used. However, in Ubuntu, it is
used, and the attached patch was applied to achieve the following:

  * Add ld_as-needed.patch to fix link order. Fixes 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')
Architecture: amd64 (x86_64)

Kernel: Linux 3.0.0-14-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 spd-1.3.0/debian/patches/ld_as-needed.patch spd-1.3.0/debian/patches/ld_as-needed.patch
--- spd-1.3.0/debian/patches/ld_as-needed.patch	1969-12-31 19:00:00.0 -0500
+++ spd-1.3.0/debian/patches/ld_as-needed.patch	2012-01-18 20:38:29.0 -0500
@@ -0,0 +1,34 @@
+Index: spd-1.3.0/src/Makefile.am
+===
+--- spd-1.3.0.orig/src/Makefile.am	2011-10-08 06:43:05.0 -0400
 spd-1.3.0/src/Makefile.am	2012-01-18 20:37:54.0 -0500
+@@ -3,9 +3,10 @@
+ 	-DANDY_CORR -DVERSION=\SPD=1.3 SAXS=2.445 EDF=2.188\ -DUNDERSCORE
+ 
+ bin_PROGRAMS = spd
+-spd_LDADD = -lz -lm $(FLIBS) \
++spd_LDADD = -lz -lm \
+ 	../edfpack/libedfpack.a \
+-	../fitpack/libfitpack.a
++	../fitpack/libfitpack.a \
++	$(FLIBS)
+ 
+ spd_SOURCES= correct.c inout.c util.c version.c spd.h spec_shm.h
+ 
+Index: spd-1.3.0/src/Makefile.in
+===
+--- spd-1.3.0.orig/src/Makefile.in	2011-10-22 11:08:28.0 -0400
 spd-1.3.0/src/Makefile.in	2012-01-18 20:38:18.0 -0500
+@@ -160,9 +160,10 @@
+ 	-I$(top_srcdir)/edfpack -I$(top_srcdir)/fitpack \
+ 	-DANDY_CORR -DVERSION=\SPD=1.3 SAXS=2.445 EDF=2.188\ -DUNDERSCORE
+ 
+-spd_LDADD = -lz -lm $(FLIBS) \
++spd_LDADD = -lz -lm \
+ 	../edfpack/libedfpack.a \
+-	../fitpack/libfitpack.a
++	../fitpack/libfitpack.a \
++	$(FLIBS)
+ 
+ spd_SOURCES = correct.c inout.c util.c version.c spd.h spec_shm.h
+ all: all-am
diff -Nru spd-1.3.0/debian/patches/series spd-1.3.0/debian/patches/series
--- spd-1.3.0/debian/patches/series	1969-12-31 19:00:00.0 -0500
+++ spd-1.3.0/debian/patches/series	2012-01-18 20:36:57.0 -0500
@@ -0,0 +1 @@
+ld_as-needed.patch


Bug#655794: drupal7: FTBFS: find: `/build/drupal7-a0In4n/drupal7-7.10/debian//usr/share/drupal7': No such file or directory

2012-01-14 Thread Daniel T Chen
Package: drupal7
Version: 7.10-1
Followup-For: Bug #655794
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

Dear Maintainer,

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

  * debian/rules: export $PACKAGE to fix FTBFS. (Closes: #655794)


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')
Architecture: amd64 (x86_64)

Kernel: Linux 3.0.0-14-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 drupal7-7.10/debian/rules drupal7-7.10/debian/rules
--- drupal7-7.10/debian/rules	2011-12-26 12:05:35.0 -0500
+++ drupal7-7.10/debian/rules	2012-01-14 19:02:26.0 -0500
@@ -3,6 +3,8 @@
 #export DH_VERBOSE=1
 #export DH_OPTIONS=-v
 
+export PACKAGE=drupal7
+
 %:
 	dh  $@
 


Bug#646645: funcparserlib: FTBFS: make[2]: *** [test] Error 1

2012-01-14 Thread Daniel T Chen
Package: funcparserlib
Version: 0.3.5-1
Followup-For: Bug #646645
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

Dear Maintainer,

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

  * Add test_numbers.diff updating expected output to match current
upstream SVN changeset 788599d92a85. Fixes FTBFS. (Closes: #646645)


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')
Architecture: amd64 (x86_64)

Kernel: Linux 3.0.0-14-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
only in patch2:
unchanged:
--- funcparserlib-0.3.5.orig/debian/patches/series
+++ funcparserlib-0.3.5/debian/patches/series
@@ -0,0 +1 @@
+test_numbers.diff
only in patch2:
unchanged:
--- funcparserlib-0.3.5.orig/debian/patches/test_numbers.diff
+++ funcparserlib-0.3.5/debian/patches/test_numbers.diff
@@ -0,0 +1,18 @@
+Index: funcparserlib-0.3.5/examples/json/test-numbers.out
+===
+--- funcparserlib-0.3.5.orig/examples/json/test-numbers.out	2009-07-16 20:13:39.0 -0400
 funcparserlib-0.3.5/examples/json/test-numbers.out	2012-01-14 23:00:19.0 -0500
+@@ -5,9 +5,9 @@
+  -14,
+  65536,
+  0.0,
+- 3.1401,
+- -3.1401,
++ 3.14,
++ -3.14,
+  -123.456,
+- 6.67427995e-11,
++ 6.67428e-11,
+  -1.602176e-19,
+- 6.67427995e-11]
++ 6.67428e-11]


Bug#652164: FTBFS: ../../src/rakarrack.cxx:22892:37: error: format not a string literal and no format arguments [-Werror=format-security]

2011-12-24 Thread Daniel T Chen
Package: rakarrack
Version: 0.6.1-3
Followup-For: Bug #652164
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

In Ubuntu Precise, the following patch was applied to resolve the FTBFS.
Thanks for considering the patch.


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

Kernel: Linux 3.0.0-14-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


*** format-security.debdiff.diff.2
diff -u rakarrack-0.6.1/debian/patches/series 
rakarrack-0.6.1/debian/patches/series
--- rakarrack-0.6.1/debian/patches/series
+++ rakarrack-0.6.1/debian/patches/series
@@ -1,0 +2 @@
+format-security.diff
only in patch2:
unchanged:
--- rakarrack-0.6.1.orig/debian/patches/format-security.diff
+++ rakarrack-0.6.1/debian/patches/format-security.diff
@@ -0,0 +1,71 @@
+Index: rakarrack-0.6.1/src/rakarrack.cxx
+===
+--- rakarrack-0.6.1.orig/src/rakarrack.cxx 2011-12-24 15:31:22.0 
-0500
 rakarrack-0.6.1/src/rakarrack.cxx  2011-12-24 15:31:24.0 -0500
+@@ -22889,7 +22889,7 @@
+   Fl_Widget *m = fl_message_icon();
+   m-parent()-copy_label(rkr-jackcliname);
+   sprintf(temp2,Overwrite? \%s\,w-label());
+-  ok=fl_choice(temp2,No,Yes,NULL);
++  ok=fl_choice(%s,temp2,No,Yes,NULL);
+  if (!ok)
+  { 
+  o-value(0);
+@@ -24142,7 +24142,7 @@
+  w-parent()-copy_label(rkr-jackcliname);
+  
+ 
+- ok=fl_choice(Bank was modified, but not saved,Discard,Save,NULL);
++ ok=fl_choice(%s,Bank was modified, but not saved,Discard,Save,NULL);
+ 
+ 
+ 
+@@ -27243,7 +27243,7 @@
+ } 
+ 
+ sprintf(temp2,Delete? \%s\,s-text());
+-ok=fl_choice(temp2,No,Yes,NULL);
++ok=fl_choice(%s,temp2,No,Yes,NULL);
+ if (!ok) return;
+ memset(Rname,0,sizeof(Rname));
+ sprintf(Rname,%s,s-text());
+Index: rakarrack-0.6.1/src/fileio.C
+===
+--- rakarrack-0.6.1.orig/src/fileio.C  2011-12-24 15:31:22.0 -0500
 rakarrack-0.6.1/src/fileio.C   2011-12-24 15:31:24.0 -0500
+@@ -1641,7 +1641,7 @@
+ 
+case 3:
+ memset (temp, 0, sizeof (temp));
+-sprintf (temp, BankFilename);
++sprintf (temp, %s, BankFilename);
+ break;
+
+}
+@@ -2786,4 +2786,4 @@
+ 
+ }
+ 
+- 
+\ No newline at end of file
++
+Index: rakarrack-0.6.1/src/varios.C
+===
+--- rakarrack-0.6.1.orig/src/varios.C  2011-12-24 16:36:58.0 -0500
 rakarrack-0.6.1/src/varios.C   2011-12-24 16:37:49.0 -0500
+@@ -41,7 +41,7 @@
+   w-image (a);
+   w-align (FL_ALIGN_TOP | FL_ALIGN_INSIDE);
+   w-parent ()-copy_label (labelwin);
+-  fl_message (message_text);
++  fl_message (%s, message_text);
+   return (0);
+ 
+ };
+@@ -399,4 +399,4 @@
+ 
+ 
+ 
+-  
+\ No newline at end of file
++


-- System Information:
Debian Release: wheezy/sid
  APT prefers oneiric-updates
  APT policy: (900, 'oneiric-updates'), (800, 'oneiric'), (10, 'precise')
Architecture: amd64 (x86_64)

Kernel: Linux 3.0.0-14-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#648906: xslthl: FTBFS due to missing build-dependency on ant

2011-11-15 Thread Daniel T Chen
Package: src:xslthl
Version: 2.0.2-3
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch


This source package FTBFS in both Ubuntu and Debian due to a missing
B-D-I on ant. Thanks for considering this patch.


*** xslthl_2.0.2-3ubuntu1.debdiff
diff -Nru xslthl-2.0.2/debian/control xslthl-2.0.2/debian/control
--- xslthl-2.0.2/debian/control 2011-10-30 06:27:56.0 -0400
+++ xslthl-2.0.2/debian/control 2011-11-15 19:43:29.0 -0500
@@ -1,11 +1,11 @@
 Source: xslthl
 Section: text
 Priority: optional
 Maintainer: Debian Java Maintainers 
pkg-java-maintain...@lists.alioth.debian.org
 DM-Upload-Allowed: yes
 Uploaders: Mathieu Malaterre (malat) mathieu.malate...@gmail.com
 Build-Depends: debhelper (= 8), javahelper (= 0.33~)
-Build-Depends-Indep: default-jdk, libsaxon-java, libsaxonb-java, libxalan2-java
+Build-Depends-Indep: ant, default-jdk, libsaxon-java, libsaxonb-java, 
libxalan2-java
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/xslthl
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/xslthl/


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

Kernel: Linux 3.0.0-12-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#648916: libloader: FTBFS due to missing build-dependency on ant-optional

2011-11-15 Thread Daniel T Chen
Package: src:libloader
Version: 1.1.6.dfsg-2
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch


This source package FTBFS in Debian and Ubuntu due to a missing
component, junit, so we need to use ant-optional as the build-dep
instead of ant. Thanks for considering this patch.


*** libloader_1.1.6.dfsg-2ubuntu1.debdiff
diff -Nru libloader-1.1.6.dfsg/debian/control 
libloader-1.1.6.dfsg/debian/control
--- libloader-1.1.6.dfsg/debian/control 2011-11-01 11:14:05.0 -0400
+++ libloader-1.1.6.dfsg/debian/control 2011-11-16 00:15:17.0 -0500
@@ -1,9 +1,9 @@
 Source: libloader
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers 
pkg-java-maintain...@lists.alioth.debian.org
 Uploaders: Rene Engelhard r...@debian.org
-Build-Depends: debhelper (= 7), cdbs, default-jdk, ant, libjcommon-java (= 
1.0.10), libpixie-java (= 1.1.6), libbase-java, libcommons-logging-java, 
libehcache-java, libbatik-java, libxml-commons-external-java, javahelper, 
junit, ant-contrib
+Build-Depends: debhelper (= 7), cdbs, default-jdk, ant-optional, 
libjcommon-java (= 1.0.10), libpixie-java (= 1.1.6), libbase-java, 
libcommons-logging-java, libehcache-java, libbatik-java, 
libxml-commons-external-java, javahelper, junit, ant-contrib
 Build-Conflicts: liboscache-java
 Standards-Version: 3.8.4
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libloader


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

Kernel: Linux 3.0.0-12-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#648384: buildbot: FTBFS due to missing build-dependency on python-twisted-words

2011-11-10 Thread Daniel T Chen
Package: buildbot
Version: 0.8.5-1
Severity: important
Tags: patch

Just fixed the FTBFS in Ubuntu Precise with the following patch.


*** buildbot_0.8.5-1ubuntu1.debdiff
diff -Nru buildbot-0.8.5/debian/control buildbot-0.8.5/debian/control
--- buildbot-0.8.5/debian/control   2011-10-22 18:07:25.0 -0400
+++ buildbot-0.8.5/debian/control   2011-11-10 17:09:15.0 -0500
@@ -1,9 +1,9 @@
 Source: buildbot
 Section: devel
 Priority: optional
 Maintainer: Matthias Klose d...@debian.org
 Uploaders: Andriy Senkovych jolly_ro...@itblog.org.ua
-Build-Depends: debhelper (= 7.0.50~), python-all (= 2.6.6-3), 
python-twisted-core (= 2.0), python-twisted-web, python-twisted-mail, 
python-jinja2 (= 2.1), python-mock, texinfo, python-sqlalchemy, python-migrate
+Build-Depends: debhelper (= 7.0.50~), python-all (= 2.6.6-3), 
python-twisted-core (= 2.0), python-twisted-web, python-twisted-mail, 
python-jinja2 (= 2.1), python-mock, texinfo, python-sqlalchemy, 
python-migrate, python-twisted-words
 Homepage: http://buildbot.net
 Standards-Version: 3.9.2
 X-Python-Version: = 2.5


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

Kernel: Linux 3.0.0-12-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#644048: FTBFS: dpkg-buildflags

2011-11-09 Thread Daniel T Chen
Package: xdvik-ja
Version: 22.84.13-j1.34-3
Followup-For: Bug #644048
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

In Debian sid, the attached patch can be applied to achieve the following:

  * Add 100_fix_werror_format-security.diff to resolve FTBFS with
format strings. (Closes: #644048)


Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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 xdvik-ja-22.84.13-j1.34/debian/patches/100_fix_werror_format-security.diff xdvik-ja-22.84.13-j1.34/debian/patches/100_fix_werror_format-security.diff
--- xdvik-ja-22.84.13-j1.34/debian/patches/100_fix_werror_format-security.diff	1969-12-31 19:00:00.0 -0500
+++ xdvik-ja-22.84.13-j1.34/debian/patches/100_fix_werror_format-security.diff	2011-11-09 17:34:53.0 -0500
@@ -0,0 +1,35 @@
+diff -Nur -x '*.orig' -x '*~' xdvik-ja-22.84.13-j1.34/build-tree/xdvik-22.84.13/texk/xdvik/gui/message-window.c xdvik-ja-22.84.13-j1.34.new/build-tree/xdvik-22.84.13/texk/xdvik/gui/message-window.c
+--- xdvik-22.84.13/texk/xdvik/gui/message-window.c	2007-07-14 03:47:45.0 -0400
 xdvik-22.84.13/texk/xdvik/gui/message-window.c	2011-11-09 17:34:51.0 -0500
+@@ -704,7 +704,7 @@
+ Widget ret;
+ 
+ ASSERT(type  (sizeof my_msg_map / sizeof my_msg_map[0]), too few elements in my_msg_map);
+-sprintf(win_title, my_msg_map[type].window_title);
++sprintf(win_title, %s, my_msg_map[type].window_title);
+ 
+ #if DEBUG
+ fprintf(stderr, internal_popup_window called with prompt: \%s\\n, msg_buf);
+@@ -716,11 +716,11 @@
+ 	   supposed to be printf-format strings (i.e. with doubled `%' to escape them)
+ 	*/
+ 	fprintf(stderr, \n%s:\n, my_msg_map[type].window_title);
+-	fprintf(stderr, msg_buf);
++	fprintf(stderr, %s, msg_buf);
+ 	fprintf(stderr, \n);
+ 	if (helptext) {
+ 	fprintf(stderr, -- helptext --\n);
+-	fprintf(stderr, helptext);
++	fprintf(stderr, %s, helptext);
+ 	fprintf(stderr, \n-- end of helptext --\n);
+ 	}
+ 	return NULL;
+@@ -732,7 +732,7 @@
+ if (my_popup_num == MAX_POPUPS) {
+ 	/* already enough popups on screen, just dump it to stderr */
+ 	fprintf(stderr, %s: , win_title);
+-	fprintf(stderr, msg_buf);
++	fprintf(stderr, %s, msg_buf);
+ 	fputc('\n', stderr);
+ 	/* Note: If a mad function continues to open popups, this will
+ 	 * stop after MAX_POPUPS, but open a new window for each


Bug#647802: plplot library is required but was not found

2011-11-07 Thread Daniel T Chen
Package: gnudatalanguage
Version: 0.9.1-1
Followup-For: Bug #647802
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

In Debian sid, the attached patch can be applied to achieve the following:

  * Add use_std_namespace patch to resolve FTBFS. Backported upstream
r1.27 src/gdlgstream.cpp, r1.28 src/gdlgstream.hpp,
r1.46 src/devicex.hpp, r1.17 src/devicez.hpp, r1.17 src/deviceps.hpp,
r1.6 src/devicesvg.hpp. (Closes: #647802)


Note that the source package does not FTBFS due to a configure error (which
was unreproducible locally in a current sid amd64 sbuild) but due to namespace
ambiguities that are fixed upstream already. Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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 gnudatalanguage-0.9.1/debian/patches/build-with-debian-antlr-instead-embedded-one gnudatalanguage-0.9.1/debian/patches/build-with-debian-antlr-instead-embedded-one
--- gnudatalanguage-0.9.1/debian/patches/build-with-debian-antlr-instead-embedded-one	2011-02-15 16:46:12.0 -0500
+++ gnudatalanguage-0.9.1/debian/patches/build-with-debian-antlr-instead-embedded-one	2011-11-07 15:46:02.0 -0500
@@ -2,11 +2,11 @@
 embedded copy in src/antlr. Patch by Axel Beckert a...@debian.org,
 15-Feb-2011
 
-Index: gnudatalanguage/configure
+Index: gnudatalanguage-0.9.1/configure
 ===
 gnudatalanguage.orig/configure	2011-02-15 22:26:31.0 +0100
-+++ gnudatalanguage/configure	2011-02-15 22:37:02.635803162 +0100
-@@ -17709,7 +17709,7 @@
+--- gnudatalanguage-0.9.1.orig/configure	2011-11-07 15:45:55.0 -0500
 gnudatalanguage-0.9.1/configure	2011-11-07 15:45:59.0 -0500
+@@ -17952,7 +17952,7 @@
  
  
  
@@ -15,7 +15,7 @@
  
  cat confcache \_ACEOF
  # This file is a shell script that caches the results of configure
-@@ -18800,7 +18800,6 @@
+@@ -19043,7 +19043,6 @@
  libtool) CONFIG_COMMANDS=$CONFIG_COMMANDS libtool ;;
  Makefile) CONFIG_FILES=$CONFIG_FILES Makefile ;;
  src/Makefile) CONFIG_FILES=$CONFIG_FILES src/Makefile ;;
@@ -23,10 +23,10 @@
  src/pro/Makefile) CONFIG_FILES=$CONFIG_FILES src/pro/Makefile ;;
  src/pro/dicom/Makefile) CONFIG_FILES=$CONFIG_FILES src/pro/dicom/Makefile ;;
  testsuite/Makefile) CONFIG_FILES=$CONFIG_FILES testsuite/Makefile ;;
-Index: gnudatalanguage/src/Makefile.in
+Index: gnudatalanguage-0.9.1/src/Makefile.in
 ===
 gnudatalanguage.orig/src/Makefile.in	2010-08-25 15:57:07.0 +0200
-+++ gnudatalanguage/src/Makefile.in	2011-02-15 22:37:02.635803162 +0100
+--- gnudatalanguage-0.9.1.orig/src/Makefile.in	2011-11-07 15:45:46.0 -0500
 gnudatalanguage-0.9.1/src/Makefile.in	2011-11-07 15:45:59.0 -0500
 @@ -71,8 +71,7 @@
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
  am__installdirs = $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
@@ -47,7 +47,7 @@
  gdl_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
  	--mode=link $(CXXLD) $(gdl_CXXFLAGS) $(CXXFLAGS) \
  	$(gdl_LDFLAGS) $(LDFLAGS) -o $@
-@@ -454,7 +452,7 @@
+@@ -463,7 +461,7 @@
  
  # set the include path found by configure
  INCLUDES = $(EXT_INCLUDES) $(all_includes)
@@ -56,7 +56,7 @@
  noinst_HEADERS = gdlwidget.hpp prognode.hpp prognodeexpr.hpp
  cpp_hpp_files = accessdesc.hpp arrayindex.hpp assocdata.cpp assocdata.hpp \
  		basegdl.hpp basic_fun_cl.cpp basic_fun_cl.hpp basic_fun.cpp basic_fun.hpp \
-@@ -504,7 +502,7 @@
+@@ -513,7 +511,7 @@
  @BUILDASLIBRARY_FALSE@gdl_CXXFLAGS = $(AM_CXXFLAGS)
  # the library search path.
  @BUILDASLIBRARY_FALSE@gdl_LDFLAGS = $(all_libraries)
@@ -65,7 +65,7 @@
  
  # build as library (for python module)
  @BUILDASLIBRARY_TRUE@lib_LTLIBRARIES = libgdl.la
-@@ -514,7 +512,7 @@
+@@ -523,7 +521,7 @@
  # netCDF and HDF define some same symbols
  # hence -z muldefs has to be passed to the linker
  @BUILDASLIBRARY_TRUE@@DARWIN_TRUE@libgdl_la_LDFLAGS = $(all_libraries) -Wl,-m
@@ -74,8 +74,10 @@
  all: all-recursive
  
  .SUFFIXES:
 gnudatalanguage-0.9.orig/src/getfmtast.hpp
-+++ gnudatalanguage-0.9/src/getfmtast.hpp
+Index: gnudatalanguage-0.9.1/src/getfmtast.hpp
+===
+--- gnudatalanguage-0.9.1.orig/src/getfmtast.hpp	2011-11-07 15:45:46.0 -0500
 gnudatalanguage-0.9.1/src/getfmtast.hpp	2011-11-07 15:45:59.0 -0500
 @@ -22,7 +22,7 @@
  
  #include basegdl.hpp
@@ -85,8 +87,10 @@
  
  extern antlr::ASTFactory FMTNodeFactory;
  
 gnudatalanguage-0.9.orig/src/getfmtast.cpp
-+++ gnudatalanguage-0.9/src/getfmtast.cpp
+Index: 

Bug#647407: FTBFS: /usr/bin/env: python: No such file or directory

2011-11-04 Thread Daniel T Chen
Package: youtube-dl
Version: 2011.10.19-2
Followup-For: Bug #647407
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

In Debian sid, the attached patch can be applied to achieve the following:

  * Build-depend on python. Fixes FTBFS. (Closes: #647407)


Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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 youtube-dl-2011.10.19/debian/control youtube-dl-2011.10.19/debian/control
--- youtube-dl-2011.10.19/debian/control	2011-10-21 23:09:49.0 -0400
+++ youtube-dl-2011.10.19/debian/control	2011-11-04 18:39:12.0 -0400
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Rogério Brito rbr...@ime.usp.br
 Build-Depends:
- debhelper (= 7.0.50~)
+ debhelper (= 7.0.50~), python
 Build-Depends-Indep:
  perl
 Standards-Version: 3.9.2


Bug#646164: FTBFS: /usr/bin/ld: cannot find -lncurses

2011-11-04 Thread Daniel T Chen
Package: twinkle
Version: 1:1.4.2-2
Followup-For: Bug #646164
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

In Debian sid, the attached patch can be applied to achieve the following:

  * debian/patches/no-curses.patch: Don't link against curses. Fixes
FTBFS. (Closes: #646164)


Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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
only in patch2:
unchanged:
--- twinkle-1.4.2.orig/debian/patches/no-curses.patch
+++ twinkle-1.4.2/debian/patches/no-curses.patch
@@ -0,0 +1,90 @@
+diff -Nur -x '*.orig' -x '*~' twinkle-1.4.2//acinclude.m4 
twinkle-1.4.2.new//acinclude.m4
+--- twinkle-1.4.2//acinclude.m42007-11-27 15:43:29.0 -0500
 twinkle-1.4.2.new//acinclude.m42011-11-04 19:25:48.0 -0400
+@@ -4340,7 +4340,7 @@
+   KDE_TRY_LINK_PYTHON(m_and_thread_and_db3, [$LIBPTHREAD -lm -ldb-3 -lutil])
+   KDE_TRY_LINK_PYTHON(pthread_and_db3, [$LIBPTHREAD -ldb-3])
+   KDE_TRY_LINK_PYTHON(m_and_thread_and_db, [$LIBPTHREAD -lm -ldb -ltermcap 
-lutil])
+-  KDE_TRY_LINK_PYTHON(pthread_and_dl, [$LIBPTHREAD $LIBDL -lutil -lreadline 
-lncurses -lm])
++  KDE_TRY_LINK_PYTHON(pthread_and_dl, [$LIBPTHREAD $LIBDL -lutil -lreadline 
-lm])
+   KDE_TRY_LINK_PYTHON(pthread_and_panel_curses, [$LIBPTHREAD $LIBDL -lm 
-lpanel -lcurses])
+   KDE_TRY_LINK_PYTHON(m_and_thread_and_db_special, [$LIBPTHREAD -lm -ldb 
-lutil], [],
+   [AC_MSG_WARN([it seems, Python depends on another library.
+diff -Nur -x '*.orig' -x '*~' twinkle-1.4.2//configure 
twinkle-1.4.2.new//configure
+--- twinkle-1.4.2//configure   2009-02-25 15:15:58.0 -0500
 twinkle-1.4.2.new//configure   2011-11-04 19:25:03.0 -0400
+@@ -20936,11 +20936,9 @@
+ 
+ ORIG_LIBS=$LIBS
+ for readline_lib in readline edit editline; do
+-  for termcap_lib in  termcap curses ncurses; do
++  for termcap_lib in  termcap ; do
+ if test -z $termcap_lib; then
+   TRY_LIB=-l$readline_lib
+-else
+-  TRY_LIB=-l$readline_lib -l$termcap_lib
+ fi
+ LIBS=$ORIG_LIBS $TRY_LIB
+ cat conftest.$ac_ext _ACEOF
+diff -Nur -x '*.orig' -x '*~' twinkle-1.4.2//m4/vl_lib_readline.m4 
twinkle-1.4.2.new//m4/vl_lib_readline.m4
+--- twinkle-1.4.2//m4/vl_lib_readline.m4   2009-01-03 09:07:36.0 
-0500
 twinkle-1.4.2.new//m4/vl_lib_readline.m4   2011-11-04 19:26:38.0 
-0400
+@@ -66,11 +66,9 @@
+  vl_cv_lib_readline, [
+ ORIG_LIBS=$LIBS
+ for readline_lib in readline edit editline; do
+-  for termcap_lib in  termcap curses ncurses; do
++  for termcap_lib in  termcap ; do
+ if test -z $termcap_lib; then
+   TRY_LIB=-l$readline_lib
+-else
+-  TRY_LIB=-l$readline_lib -l$termcap_lib
+ fi
+ LIBS=$ORIG_LIBS $TRY_LIB
+ AC_TRY_LINK_FUNC(readline, vl_cv_lib_readline=$TRY_LIB)
+diff -Nur -x '*.orig' -x '*~' twinkle-1.4.2//src/gui/Makefile 
twinkle-1.4.2.new//src/gui/Makefile
+--- twinkle-1.4.2//src/gui/Makefile2009-02-25 15:17:04.0 -0500
 twinkle-1.4.2.new//src/gui/Makefile2011-11-04 19:27:24.0 
-0400
+@@ -19,7 +19,7 @@
+ INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -I.. -I../../src 
-I/usr/local/include -I/usr/include/libxml2 -I/opt/kde3/include -I/usr/include 
-I$(QTDIR)/include -I.ui/ -I. -I.moc/
+ LINK = g++
+ LFLAGS   = 
+-LIBS = -L/opt/kde3/lib $(SUBLIBS) -L/usr/lib/ -L$(QTDIR)/lib/ 
-L/usr/X11R6/lib/ ../libtwinkle.a ../parser/libsipparser.a 
../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a 
../audio/libaudio.a ../audits/libaudits.a ../stun/libstun.a ../mwi/libmwi.a 
../im/libim.a ../patterns/libpatterns.a ../presence/libpresence.a 
../utils/libutils.a -lsndfile -lmagic -lncurses -lreadline -L/usr/local/lib 
-lccext2 -pthread -lccrtp1 -lccgnu2 -ldl -lrt -lxml2 -lz -L/opt/kde3/lib 
-lkdecore -lkdeui -L/lib -lkabc -lresolv ../audio/gsm/libgsm.a -lasound -lspeex 
-lspeexdsp -lilbc -lzrtpcpp -lboost_regex -lqt-mt -lXext -lX11 -lm -lpthread
++LIBS = -L/opt/kde3/lib $(SUBLIBS) -L/usr/lib/ -L$(QTDIR)/lib/ 
-L/usr/X11R6/lib/ ../libtwinkle.a ../parser/libsipparser.a 
../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a 
../audio/libaudio.a ../audits/libaudits.a ../stun/libstun.a ../mwi/libmwi.a 
../im/libim.a ../patterns/libpatterns.a ../presence/libpresence.a 
../utils/libutils.a -lsndfile -lmagic -lreadline -L/usr/local/lib -lccext2 
-pthread -lccrtp1 -lccgnu2 -ldl -lrt -lxml2 -lz -L/opt/kde3/lib -lkdecore 
-lkdeui -L/lib -lkabc -lresolv ../audio/gsm/libgsm.a -lasound -lspeex 
-lspeexdsp -lilbc -lzrtpcpp -lboost_regex -lqt-mt -lXext -lX11 

Bug#647678: New symbols should be added to libcrystalspace-1.4.symbols.amd64

2011-11-04 Thread Daniel T Chen
Source: crystalspace
Version: 1.4.0+dfsg-4
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

The following unified diff has the new symbols appearing in a current sid
sbuild.


*** crystalspace_1.4.0+dfsg-5.debdiff
diff -Nru crystalspace-1.4.0+dfsg/debian/libcrystalspace-1.4.symbols.amd64 
crystalspace-1.4.0+dfsg/debian/libcrystalspace-1.4.symbols.amd64
--- crystalspace-1.4.0+dfsg/debian/libcrystalspace-1.4.symbols.amd64
2011-05-01 10:10:13.0 -0400
+++ crystalspace-1.4.0+dfsg/debian/libcrystalspace-1.4.symbols.amd64
2011-11-04 21:57:44.0 -0400
@@ -111,6 +111,8 @@
  _ZN10csDVector39NormalizeEv@Base 1.4.0+dfsg
  _ZN10csDVector3C1ERK9csVector3@Base 1.4.0+dfsg
  _ZN10csDVector3C2ERK9csVector3@Base 1.4.0+dfsg
+ _ZN10csGradient22scfGradientShadesArrayD0Ev@Base 1.4.0+dfsg-5
+ _ZN10csGradient22scfGradientShadesArrayD1Ev@Base 1.4.0+dfsg-5
  _ZN10csGradient5ClearEv@Base 1.4.0+dfsg
  _ZN10csGradient8AddShadeERK15csGradientShade@Base 1.4.0+dfsg
  _ZN10csGradient8AddShadeERK8csColor4S2_f@Base 1.4.0+dfsg
@@ -120,6 +122,8 @@
  _ZN10csGradientC1Ev@Base 1.4.0+dfsg
  _ZN10csGradientC2E8csColor4S0_@Base 1.4.0+dfsg
  _ZN10csGradientC2Ev@Base 1.4.0+dfsg
+ _ZN10csGradientD0Ev@Base 1.4.0+dfsg-5
+ _ZN10csGradientD1Ev@Base 1.4.0+dfsg-5
  _ZN10csMeshType10InitializeEP15iObjectRegistry@Base 1.4.0+dfsg
  _ZN10csMeshTypeC1EP5iBase@Base 1.4.0+dfsg
  _ZN10csMeshTypeC2EP5iBase@Base 1.4.0+dfsg
@@ -219,6 +223,8 @@
  _ZN11csPoolEvent6DecRefEv@Base 1.4.0+dfsg
  _ZN11csPoolEventC1EP12csEventQueue@Base 1.4.0+dfsg
  _ZN11csPoolEventC2EP12csEventQueue@Base 1.4.0+dfsg
+ _ZN11csPoolEventD0Ev@Base 1.4.0+dfsg-5
+ _ZN11csPoolEventD1Ev@Base 1.4.0+dfsg-5
  _ZN11csRandomGen10InitRANMAREjj@Base 1.4.0+dfsg
  _ZN11csRandomGen10InitializeEj@Base 1.4.0+dfsg
  _ZN11csRandomGen10InitializeEv@Base 1.4.0+dfsg
@@ -252,6 +258,8 @@
  _ZN12csBoxClipper4ClipEP9csVector2mS1_Rm@Base 1.4.0+dfsg
  _ZN12csBoxClipper4ClipEP9csVector2mS1_RmP14csVertexStatus@Base 1.4.0+dfsg
  _ZN12csBoxClipper4ClipEP9csVector2mS1_RmR6csBox2@Base 1.4.0+dfsg
+ _ZN12csBoxClipperD0Ev@Base 1.4.0+dfsg-5
+ _ZN12csBoxClipperD1Ev@Base 1.4.0+dfsg-5
  _ZN12csConfigFile10CreateNodeEPKc@Base 1.4.0+dfsg
  _ZN12csConfigFile10SetCommentEPKcS1_@Base 1.4.0+dfsg
  _ZN12csConfigFile11SetFileNameEPKcP4iVFS@Base 1.4.0+dfsg
@@ -293,6 +301,14 @@
  _ZN12csEventQueue18RemoveAllListenersEv@Base 1.4.0+dfsg
  _ZN12csEventQueue20CreateBroadcastEventEPKc@Base 1.4.0+dfsg
  _ZN12csEventQueue20CreateBroadcastEventERKm@Base 1.4.0+dfsg
+ _ZN12csEventQueue27ProcessFrameEventDispatcherD0Ev@Base 1.4.0+dfsg-5
+ _ZN12csEventQueue27ProcessFrameEventDispatcherD1Ev@Base 1.4.0+dfsg-5
+ _ZN12csEventQueue30PreProcessFrameEventDispatcherD0Ev@Base 1.4.0+dfsg-5
+ _ZN12csEventQueue30PreProcessFrameEventDispatcherD1Ev@Base 1.4.0+dfsg-5
+ _ZN12csEventQueue31PostProcessFrameEventDispatcherD0Ev@Base 1.4.0+dfsg-5
+ _ZN12csEventQueue31PostProcessFrameEventDispatcherD1Ev@Base 1.4.0+dfsg-5
+ _ZN12csEventQueue32FinalProcessFrameEventDispatcherD0Ev@Base 1.4.0+dfsg-5
+ _ZN12csEventQueue32FinalProcessFrameEventDispatcherD1Ev@Base 1.4.0+dfsg-5
  _ZN12csEventQueue3GetEv@Base 1.4.0+dfsg
  _ZN12csEventQueue4PostEP6iEvent@Base 1.4.0+dfsg
  _ZN12csEventQueue5ClearEv@Base 1.4.0+dfsg
@@ -1471,6 +1487,8 @@
  _ZN18csBaseEventHandler15UnregisterQueueEv@Base 1.4.0+dfsg
  _ZN18csBaseEventHandler16EventHandlerImplC1EPS_@Base 1.4.0+dfsg
  _ZN18csBaseEventHandler16EventHandlerImplC2EPS_@Base 1.4.0+dfsg
+ _ZN18csBaseEventHandler16EventHandlerImplD0Ev@Base 1.4.0+dfsg-5
+ _ZN18csBaseEventHandler16EventHandlerImplD1Ev@Base 1.4.0+dfsg-5
  _ZN18csBaseEventHandler16OnUnhandledEventER6iEvent@Base 1.4.0+dfsg
  _ZN18csBaseEventHandler16PostProcessFrameEv@Base 1.4.0+dfsg
  _ZN18csBaseEventHandler18OnMouseDoubleClickER6iEvent@Base 1.4.0+dfsg
@@ -1683,6 +1701,8 @@
  _ZN20csDocumentNodeCommon23GetContentsValueAsFloatEv@Base 1.4.0+dfsg
  _ZN20csDocumentNodeCommon24GetAttributeValueAsFloatEPKc@Base 1.4.0+dfsg
  _ZN20csDocumentNodeCommon8GetNodesEPKc@Base 1.4.0+dfsg
+ _ZN18csBaseEventHandler16EventHandlerImplD0Ev@Base 1.4.0+dfsg-5
+ _ZN18csBaseEventHandler16EventHandlerImplD1Ev@Base 1.4.0+dfsg-5
  
_ZN20csNormalMappingTools17CalculateTangentsEmPK10csTrianglemPK9csVector3S5_PK9csVector2PS3_S9_@Base
 1.4.0+dfsg
  
_ZN20csScriptObjectCommon10CallCommonEPKcR5csRefI12iScriptValueEP13__va_list_tagS1_@Base
 1.4.0+dfsg
  _ZN20csScriptObjectCommon3SetEPKcP13iScriptObject@Base 1.4.0+dfsg
@@ -1726,6 +1746,9 @@
  _ZN21csReversibleTransform10RotateThisERK9csVector3f@Base 1.4.0+dfsg
  _ZN21csReversibleTransform11RotateOtherERK9csVector3f@Base 1.4.0+dfsg
  _ZN21csReversibleTransform6LookAtERK9csVector3S2_@Base 1.4.0+dfsg
+ _ZN21csReversibleTransformD0Ev@Base 1.4.0+dfsg-5
+ _ZN21csReversibleTransformD1Ev@Base 1.4.0+dfsg-5
+ _ZN21csReversibleTransformD2Ev@Base 1.4.0+dfsg-5
  _ZN21csTiledCoverageBuffer10Debug_DumpEP11iGraphics3Di@Base 1.4.0+dfsg
  _ZN21csTiledCoverageBuffer10Debug_DumpEv@Base 1.4.0+dfsg
  

Bug#625362: ftbfs with gcc-4.6 -Werror

2011-11-04 Thread Daniel T Chen
Package: langupdate
Version: 0.1.0
Followup-For: Bug #625362
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

In Debian sid, the attached patch can be applied to achieve the following:

  * Fix unused-but-set-variable warnings revealed by -Wall CFLAGS.
(Closes: #625362)


The bug report's original title and summary are incorrect. The source
package builds fine, at least locally in current sid sbuilds of amd64
and armel, so the only things from the build log that potentially are
problematic are revealed by -Wall.

Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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 langupdate-0.1.0/src/aptcache.cc langupdate-0.1.0+nmu1/src/aptcache.cc
--- langupdate-0.1.0/src/aptcache.cc	2009-04-03 12:12:43.0 -0400
+++ langupdate-0.1.0+nmu1/src/aptcache.cc	2011-11-04 23:18:51.0 -0400
@@ -89,7 +89,6 @@
 static bool LoadSourceNames (gint verbose)
 {
 	gchar *src, *bin;
-	GList * p;
 
 	pkgCache Cache = *LangCache;
 	pkgRecords pkgRecs(*LangCache);
@@ -98,7 +97,6 @@
 
 	src_table = g_hash_table_new (g_str_hash, g_str_equal);
 
-	p = NULL;
 	pkgCache::PkgIterator Pkg = Cache.PkgBegin();
 	for (;Pkg.end() != true; Pkg++)
 	{
@@ -269,9 +267,7 @@
 lu_get_sourcepkg (const gchar * binary)
 {
 	gchar * src;
-	gint size;
 
-	size = g_hash_table_size (src_table);
 	src = g_strdup((gchar*)g_hash_table_lookup (src_table, binary));
 	return src;
 }


Bug#647519: should depend on python-setuptools

2011-11-03 Thread Daniel T Chen
Package: runsnakerun
Version: 2.0.2a1-1
Followup-For: Bug #647519
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

In Debian sid, the attached patch can be applied to achieve the following:

  * Depend on python-setuptools for pkg_resources. Thanks,
Tommaso Colombo! (Closes: #647519)


Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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 runsnakerun-2.0.2a1/debian/control runsnakerun-2.0.2a1/debian/control
--- runsnakerun-2.0.2a1/debian/control	2011-10-19 16:56:31.0 -0400
+++ runsnakerun-2.0.2a1/debian/control	2011-11-03 17:07:13.0 -0400
@@ -15,6 +15,7 @@
 Package: runsnakerun
 Architecture: all
 Depends: python-squaremap
+ , python-setuptools
  , ${python:Depends}
  , ${misc:Depends}
 Description: GUI utility for (Python) cProfile or Profile profiler dumps


Bug#624441: call nonexistent usleep command

2011-11-02 Thread Daniel T Chen
Package: scsitools
Version: 0.12-2
Followup-For: Bug #624441
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

In Debian sid, the attached patch can be applied to achieve the following:

  * rescan-scsi-bus.patch: Convert usleep invocations to sleep.
(Closes: #624441)


Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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 scsitools-0.12/debian/patches/rescan-scsi-bus.patch scsitools-0.12/debian/patches/rescan-scsi-bus.patch
--- scsitools-0.12/debian/patches/rescan-scsi-bus.patch	2011-01-10 16:53:41.0 -0500
+++ scsitools-0.12/debian/patches/rescan-scsi-bus.patch	2011-11-02 21:49:20.0 -0400
@@ -2,8 +2,10 @@
 Forwarded: no
 Author: Eric Delaunay delau...@debian.org
 
 a/rescan-scsi-bus/rescan-scsi-bus.8
-+++ b/rescan-scsi-bus/rescan-scsi-bus.8
+Index: scsitools-0.12/rescan-scsi-bus/rescan-scsi-bus.8
+===
+--- /dev/null	1970-01-01 00:00:00.0 +
 scsitools-0.12/rescan-scsi-bus/rescan-scsi-bus.8	2011-11-02 21:48:11.0 -0400
 @@ -0,0 +1,85 @@
 +.\ -*- nroff -*-
 +.TH RESCAN\-SCSI\-BUS.SH 8 March 1998
@@ -90,3 +92,34 @@
 +.nf
 +.B http://www.garloff.de/kurt/linux/scsidev/
 +.fi
+Index: scsitools-0.12/rescan-scsi-bus/rescan-scsi-bus.sh
+===
+--- scsitools-0.12.orig/rescan-scsi-bus/rescan-scsi-bus.sh	2011-11-02 21:49:15.0 -0400
 scsitools-0.12/rescan-scsi-bus/rescan-scsi-bus.sh	2011-11-02 21:49:11.0 -0400
+@@ -229,7 +229,7 @@
+   fi
+   while test $RC = 2 -o $RC = 6  test $ctr -le 8; do
+ if test $RC = 2 -a $RMB != 1; then echo -n .; let $LN+=1; sleep 1
+-else usleep 2; fi
++else sleep 0.02; fi
+ let ctr+=1
+ sg_turs /dev/$SGDEV /dev/null 21
+ RC=$?
+@@ -352,7 +352,7 @@
+ /sbin/udevadm settle
+ white_out
+   else
+-usleep 2
++sleep 0.02
+   fi
+ }
+ 
+@@ -388,7 +388,7 @@
+ 	fi
+ 	# FIXME: Can we skip udevadm settle for removal?
+ 	#udevadm_settle
+-	usleep 2
++	sleep 0.02
+   else
+ echo scsi remove-single-device $devnr  /proc/scsi/scsi
+ 	if test $RC -eq 1 -o $lun -eq 0 ; then


Bug#640588: package purge (after dependencies removal) fails

2011-11-02 Thread Daniel T Chen
Package: roundup
Version: 1.4.18-1
Followup-For: Bug #640588
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

In Debian sid, the attached patch can be applied to achieve the following:

  * debian/roundup.postrm: Remove obsolete --quiet option passed to
userdel and groupdel. (Closes: #640588)


Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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 roundup-1.4.18/debian/roundup.postrm roundup-1.4.18/debian/roundup.postrm
--- roundup-1.4.18/debian/roundup.postrm	2011-05-30 18:30:55.0 -0400
+++ roundup-1.4.18/debian/roundup.postrm	2011-11-02 22:40:05.0 -0400
@@ -4,13 +4,13 @@
 
 check_and_delete_user() {
 	if [ `getent passwd $U` ]; then
-		userdel --quiet $U
+		userdel $U /dev/null 21
 	fi
 }
 
 check_and_delete_group() {
 if [ X`getent group $U` != X ]; then
-groupdel --quiet $U || true
+groupdel $U /dev/null 21 || true
 fi
 }
 


Bug#646158: FTBFS: /usr/bin/ld: cannot find -lncurses

2011-11-02 Thread Daniel T Chen
Package: qcake
Version: 0.7.2-2
Followup-For: Bug #646158
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

In Debian sid, the attached patch can be applied to achieve the following:

  * 06_no_ncurses: Don't link against libncurses, as it isn't used
anyhow. Fixes FTBFS on Linux. (Closes: #646158)


Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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 qcake-0.7.2/debian/patches/series qcake-0.7.2/debian/patches/series
--- qcake-0.7.2/debian/patches/series
+++ qcake-0.7.2/debian/patches/series
@@ -4,0 +5 @@
+06_no_ncurses
only in patch2:
unchanged:
--- qcake-0.7.2.orig/debian/patches/06_no_ncurses
+++ qcake-0.7.2/debian/patches/06_no_ncurses
@@ -0,0 +1,26 @@
+Index: qcake-0.7.2/qcakeplayer/qcakeplayer.pro
+===
+--- qcake-0.7.2.orig/qcakeplayer/qcakeplayer.pro	2011-11-02 23:35:04.0 -0400
 qcake-0.7.2/qcakeplayer/qcakeplayer.pro	2011-11-02 23:35:00.0 -0400
+@@ -162,7 +162,7 @@
+ -lm \
+ -lpcre \
+ -lreadline \
+--lncurses \
++#-lncurses \
+ -ldl \
+ -lopenal \
+ -lalut \
+Index: qcake-0.7.2/qcweb3d/qcweb3d.pro
+===
+--- qcake-0.7.2.orig/qcweb3d/qcweb3d.pro	2011-11-02 23:35:02.0 -0400
 qcake-0.7.2/qcweb3d/qcweb3d.pro	2011-11-02 23:34:40.0 -0400
+@@ -178,7 +178,7 @@
+ -lm \
+ -lpcre \
+ -lreadline \
+--lncurses \
++#-lncurses \
+ -ldl \
+ -lopenal \
+ -lalut \


Bug#647177: missing dependency on gawk

2011-10-31 Thread Daniel T Chen
Package: geda-gaf
Version: 1:1.6.2-2
Followup-For: Bug #647177
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

In Debian sid, the attached patch can be applied to achieve the following:

  * geda-utils must depend on gawk. Thanks, Adrian Bunk!
(Closes: #647177)
  * debian/copyright: Fix lintian warning about license
misspelling.


Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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 geda-gaf-1.6.2/debian/control geda-gaf-1.6.2/debian/control
--- geda-gaf-1.6.2/debian/control	2011-04-07 00:45:58.0 -0400
+++ geda-gaf-1.6.2/debian/control	2011-10-31 16:26:30.0 -0400
@@ -162,7 +162,7 @@
 Package: geda-utils
 Architecture: any
 Breaks: geda (= 19990516-1)
-Depends: ${misc:Depends}, ${shlibs:Depends}, python
+Depends: ${misc:Depends}, ${shlibs:Depends}, python, gawk
 Description: GPL EDA -- Electronics design software (utilities)
  The gEDA project has produced and continues working on a full GPL'd suite and
  toolkit of Electronic Design Automation tools. These tools are used for
diff -Nru geda-gaf-1.6.2/debian/copyright geda-gaf-1.6.2/debian/copyright
--- geda-gaf-1.6.2/debian/copyright	2011-04-07 00:45:58.0 -0400
+++ geda-gaf-1.6.2/debian/copyright	2011-10-31 16:53:05.0 -0400
@@ -1,32 +1,47 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: geda-gaf
-Maintainer: Ales Hvezda and gEDA Contributors geda-...@geda.seul.org
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: geda-gaf
+Upstream-Contact: Ales Hvezda and gEDA Contributors geda-...@geda.seul.org
 Source: http://geda.seul.org
 
 Copyright: 1998-2010, Ales Hvezda and gEDA Contributors geda-...@geda.seul.org (see changelog for details)
 License: GPL-2+
-
-On Debian systems, the complete text of the GNU GPL2 licenses
-can be found at `/usr/share/common-licenses/GPL-2'.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+.
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+USA.
+.
+On Debian systems, the full text of the GNU General Public License
+version 2 can be found in the file `/usr/share/common-licenses/GPL-2'.
 
 Files: debian/*
 Copyright: 1998-2009, Hamish Moffatt ham...@debian.org
2009, Peter Clifton pc...@cam.ac.uk
2009, أحمد المحمودي (Ahmed El-Mahmoudy) aelmahmoudy@us...@users.sourceforge.net
 License: GPL-2+
-
-License: GPL-2+
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
-
+.
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
-
+.
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
 USA.
+.
+On Debian systems, the full text of the GNU General Public License
+version 2 can be found in the file `/usr/share/common-licenses/GPL-2'.


Bug#642352: FTBFS on armel: redefinition of 'struct user'

2011-10-30 Thread Daniel T Chen
Package: honeyd
Version: 1.5c-9
Followup-For: Bug #642352
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

In Debian sid, the attached patch can be applied to achieve the following:

  * honeydstats.[ch]: Rename struct user to honeyd_user to avoid collision
on armel. Fixes FTBFS. (Closes: #642352)


Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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 honeyd-1.5c/honeydstats.c honeyd-1.5c/honeydstats.c
--- honeyd-1.5c/honeydstats.c
+++ honeyd-1.5c/honeydstats.c
@@ -89,15 +89,15 @@
 char *address, uint16_t port);
 
 static int
-user_compare(struct user *a, struct user *b)
+user_compare(struct honeyd_user *a, struct honeyd_user *b)
 {
 	return (strcmp(a-name, b-name));
 }
 
 struct usertree users;
 
-SPLAY_PROTOTYPE(usertree, user, node, user_compare);
-SPLAY_GENERATE(usertree, user, node, user_compare);
+SPLAY_PROTOTYPE(usertree, honeyd_user, node, user_compare);
+SPLAY_GENERATE(usertree, honeyd_user, node, user_compare);
 
 int checkpoint_fd = -1;
 struct evbuffer *checkpoint_evbuf;
@@ -107,11 +107,11 @@
 void
 user_new(const char *name, const char *password)
 {
-	struct user *user = NULL, tmp;
+	struct honeyd_user *user = NULL, tmp;
 
 	tmp.name = name;
 	if ((user = SPLAY_FIND(usertree, users, tmp)) == NULL) {
-		if ((user = calloc(1, sizeof(struct user))) == NULL)
+		if ((user = calloc(1, sizeof(struct honeyd_user))) == NULL)
 			err(1, %s: calloc, __func__);
 
 		if ((user-name = strdup(name)) == NULL)
@@ -171,7 +171,7 @@
  */
 
 int
-record_process(struct user *user, struct evbuffer *evbuf)
+record_process(struct honeyd_user *user, struct evbuffer *evbuf)
 {
 	struct record *record;
 	int res = -1;
@@ -196,7 +196,7 @@
 }
 
 int
-measurement_process(struct user *user, struct evbuffer *evbuf)
+measurement_process(struct honeyd_user *user, struct evbuffer *evbuf)
 {
 	uint32_t counter;
 	struct timeval tv_start, tv_end, tv_diff;
@@ -260,7 +260,7 @@
 int
 signature_process(struct evbuffer *evbuf)
 {
-	struct user *user = NULL, tmpuser;
+	struct honeyd_user *user = NULL, tmpuser;
 	uint8_t tag;
 	struct evbuffer *tmp = NULL;
 	char *username = NULL;
diff -u honeyd-1.5c/debian/changelog honeyd-1.5c/debian/changelog
only in patch2:
unchanged:
--- honeyd-1.5c.orig/honeydstats.h
+++ honeyd-1.5c/honeydstats.h
@@ -32,8 +32,8 @@
 #ifndef _HONEYDSTATS_H_
 #define _HONEYDSTATS_H_
 
-struct user {
-	SPLAY_ENTRY(user) node;
+struct honeyd_user {
+	SPLAY_ENTRY(honeyd_user) node;
 	const char *name;
 	struct hmac_state hmac;
 
@@ -44,7 +44,7 @@
 	uint32_t seqnr;		/* last sequence number */
 };
 
-SPLAY_HEAD(usertree, user);
+SPLAY_HEAD(usertree, honeyd_user);
 
 int signature_process(struct evbuffer *evbuf);
 void checkpoint_replay(int fd);


Bug#646159: FTBFS: /usr/bin/ld: cannot find -lncurses

2011-10-30 Thread Daniel T Chen
Package: udftools
Version: 1.0.0b3-14.1
Followup-For: Bug #646159
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

In Debian sid, the attached patch can be applied to achieve the following:

  * wrudf/Makefile.*: Don't link against libncurses, as it isn't used.
Fixes FTBFS. (Closes: #646159)


Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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 udftools-1.0.0b3/wrudf/Makefile.in udftools-1.0.0b3/wrudf/Makefile.in
--- udftools-1.0.0b3/wrudf/Makefile.in
+++ udftools-1.0.0b3/wrudf/Makefile.in
@@ -171,7 +171,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-wrudf_LDADD = $(top_builddir)/libudffs/libudffs.la -lreadline -lncurses
+wrudf_LDADD = $(top_builddir)/libudffs/libudffs.la -lreadline
 wrudf_SOURCES = wrudf.c wrudf-cmnd.c wrudf-desc.c wrudf-cdrw.c wrudf-cdr.c ide-pc.c wrudf.h ide-pc.h ../include/ecma_167.h ../include/osta_udf.h ../include/bswap.h
 AM_CPPFLAGS = -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -DDEBUG
 all: all-am
only in patch2:
unchanged:
--- udftools-1.0.0b3.orig/wrudf/Makefile.am
+++ udftools-1.0.0b3/wrudf/Makefile.am
@@ -1,5 +1,5 @@
 bin_PROGRAMS = wrudf
-wrudf_LDADD = $(top_builddir)/libudffs/libudffs.la -lreadline -lncurses
+wrudf_LDADD = $(top_builddir)/libudffs/libudffs.la -lreadline
 wrudf_SOURCES = wrudf.c wrudf-cmnd.c wrudf-desc.c wrudf-cdrw.c wrudf-cdr.c ide-pc.c wrudf.h ide-pc.h ../include/ecma_167.h ../include/osta_udf.h ../include/bswap.h
 
 AM_CPPFLAGS = -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -DDEBUG


Bug#645868: fails to upgrade

2011-10-29 Thread Daniel T Chen
Package: xpilot-ng
Version: 1:4.7.3-1.3
Followup-For: Bug #645868
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

In Debian sid, the attached patch can be applied to achieve the following:

  * xpilot-ng-server.{init,postinst}: Create appropriate run directory
before invoking the server. (Closes: #645868)


Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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 xpilot-ng-4.7.3/debian/xpilot-ng-server.init xpilot-ng-4.7.3/debian/xpilot-ng-server.init
--- xpilot-ng-4.7.3/debian/xpilot-ng-server.init	2010-06-02 14:03:29.0 -0400
+++ xpilot-ng-4.7.3/debian/xpilot-ng-server.init	2011-10-29 11:14:17.0 -0400
@@ -31,6 +31,7 @@
 	echo $AUTOSTART |grep -iq yes || exit 0
 	test -f $DEFAULTMAP || exit 0
 
+	mkdir -p $(dirname $PIDFILE)
 	echo -n Starting XPilot NG server: 
 	start-stop-daemon --start --quiet --chuid $USER --background \
 		--oknodo --exec /usr/games/start-xpilot-ng-server
diff -Nru xpilot-ng-4.7.3/debian/xpilot-ng-server.postinst xpilot-ng-4.7.3/debian/xpilot-ng-server.postinst
--- xpilot-ng-4.7.3/debian/xpilot-ng-server.postinst	2010-06-02 14:03:29.0 -0400
+++ xpilot-ng-4.7.3/debian/xpilot-ng-server.postinst	2011-10-29 11:15:55.0 -0400
@@ -9,6 +9,7 @@
--shell /bin/sh --disabled-password xpilotng || true
 fi
 
+mkdir -p /var/run/xpilot-ng-server
 chmod 700 /var/run/xpilot-ng-server
 chown -R xpilotng:xpilotng /etc/xpilot-ng
 chmod -f 600 /etc/xpilot-ng/password.txt


Bug#646170: FTBFS: configure: error: Cannot find termcap compatible library.

2011-10-29 Thread Daniel T Chen
Package: ddd
Version: 1:3.3.12-2.1
Followup-For: Bug #646170
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

In Debian sid, the attached patch can be applied to achieve the following:

  * termcap.diff: Look for libtinfo first. Fixes FTBFS. (Closes: #646170)
  * Build-depend on info as well. Thanks, Sven Joachim!


Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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 ddd-3.3.12/debian/control ddd-3.3.12/debian/control
--- ddd-3.3.12/debian/control	2011-07-08 12:35:07.0 -0400
+++ ddd-3.3.12/debian/control	2011-10-29 18:05:58.0 -0400
@@ -1,7 +1,7 @@
 Source: ddd
 Section: devel
 Priority: optional
-Build-Depends: automake (= 1:1.10), bison, cdbs (= 0.4.0), debhelper (= 7), flex, lesstif2-dev, libreadline-dev, libtool, libxaw7-dev, libxp-dev, libelfg0-dev [powerpc]
+Build-Depends: automake (= 1:1.10), bison, cdbs (= 0.4.0), debhelper (= 7), flex, lesstif2-dev, libreadline-dev, libtool, libxaw7-dev, libxp-dev, libelfg0-dev [powerpc], info
 Maintainer: Daniel Schepler schep...@debian.org
 Homepage: http://www.gnu.org/software/ddd/
 Standards-Version: 3.9.1
diff -Nru ddd-3.3.12/debian/patches/series ddd-3.3.12/debian/patches/series
--- ddd-3.3.12/debian/patches/series	2011-07-08 12:27:55.0 -0400
+++ ddd-3.3.12/debian/patches/series	2011-10-29 17:48:08.0 -0400
@@ -5,3 +5,4 @@
 005_gcc44_fix.diff
 006_unumlaut_fix.diff
 machine_code_window_fix.diff
+termcap.diff
diff -Nru ddd-3.3.12/debian/patches/termcap.diff ddd-3.3.12/debian/patches/termcap.diff
--- ddd-3.3.12/debian/patches/termcap.diff	1969-12-31 19:00:00.0 -0500
+++ ddd-3.3.12/debian/patches/termcap.diff	2011-10-29 17:50:13.0 -0400
@@ -0,0 +1,44 @@
+Index: ddd-3.3.12/configure
+===
+--- ddd-3.3.12.orig/configure	2011-10-29 17:50:10.0 -0400
 ddd-3.3.12/configure	2011-10-29 17:49:54.0 -0400
+@@ -1581,7 +1581,7 @@
+   both]
+   --with-tags[=TAGS]  include additional configurations [automatic]
+   --with-termlib=LIB  terminal library is
+-  LIB=mytinfo|ncurses|curses|termcap|terminfo|...
++  LIB=tinfo|mytinfo|ncurses|curses|termcap|terminfo|...
+   --with-termlib-libraries=DIR
+   termlib libraries are in DIR
+   --with-readline do use the readline library default=no
+@@ -24646,7 +24646,7 @@
+ ddd_have_termcap=false
+ _termlib=${ddd_termlib}
+ if test x${ddd_termlib} = x; then
+-  _termlib=mytinfo ncurses curses termcap terminfo termlib
++  _termlib=tinfo mytinfo ncurses curses termcap terminfo termlib
+ fi
+ _termlib_path=
+ if test x${ddd_termlib_libraries_path} != x; then
+Index: ddd-3.3.12/configure.ac
+===
+--- ddd-3.3.12.orig/configure.ac	2011-10-29 17:50:09.0 -0400
 ddd-3.3.12/configure.ac	2011-10-29 17:49:10.0 -0400
+@@ -329,7 +329,7 @@
+ ddd_termlib=
+ AC_ARG_WITH([termlib],
+ AS_HELP_STRING([--with-termlib=LIB],
+-[terminal library is LIB=mytinfo|ncurses|curses|termcap|terminfo|...]),[
++[terminal library is LIB=tinfo|mytinfo|ncurses|curses|termcap|terminfo|...]),[
+  case ${withval} in
+  no)
+   AC_MSG_ERROR([A termcap compatible library is necessary.])
+@@ -360,7 +360,7 @@
+ dnl
+ _termlib=${ddd_termlib}
+ if test x${ddd_termlib} = x; then
+-  _termlib=mytinfo ncurses curses termcap terminfo termlib
++  _termlib=tinfo mytinfo ncurses curses termcap terminfo termlib
+ fi
+ _termlib_path=
+ if test x${ddd_termlib_libraries_path} != x; then


Bug#646136: FTBFS: /usr/bin/ld: cannot find -lncurses

2011-10-29 Thread Daniel T Chen
Package: eukleides
Version: 1.5.4-1
Followup-For: Bug #646136
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

In Debian sid, the attached patch can be applied to achieve the following:

  * build/Makefile: Remove libncurses from LDFLAGS, as it isn't used.
(Closes: #646136)


Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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
only in patch2:
unchanged:
--- eukleides-1.5.4.orig/build/Makefile
+++ eukleides-1.5.4/build/Makefile
@@ -17,7 +17,7 @@
 MOFLAGS = -DMO_DIR=\$(MO_DIR)\ 
 endif
 CFLAGS = -Wall -D__$(BINARY)__ $(IFLAGS) $(MOFLAGS)
-LDFLAGS = -lncurses -lreadline -lm
+LDFLAGS = -lreadline -lm
 VPATH = $(COMMON_DIR):$(MAIN_DIR):$(BUILD_DIR)
 
 $(BINARY):


Bug#633453: fails to install due to incorrect dependencies in init.d LSB header

2011-10-28 Thread Daniel T Chen
Package: drac
Version: 1.12-7.1
Followup-For: Bug #633453
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

In Debian sid, the attached patch can be applied to achieve the following:

  * Fix typo in debian/init.d preventing installation (Closes: #633453)


I've successfully tested a locally sbuilt package with piuparts. Thanks
for considering the patch.


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

Kernel: Linux 3.0.0-12-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 drac-1.12/debian/init.d drac-1.12/debian/init.d
--- drac-1.12/debian/init.d
+++ drac-1.12/debian/init.d
@@ -2,7 +2,7 @@
 # 2002-02-26, v0.0.1, Noèl Köthe, n...@debian.org
 ### BEGIN INIT INFO
 # Provides:  drac
-# Required-Start:$local_fs $remote_fs portmap
+# Required-Start:$local_fs $remote_fs $portmap
 # Required-Stop: $local_fs $remote_fs
 # Should-Start:  $syslog
 # Should-Stop:   $syslog


Bug#646135: FTBFS: configure: error: readline not found

2011-10-28 Thread Daniel T Chen
Package: dvbstreamer
Version: 2.1.0-2
Followup-For: Bug #646135
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

In Debian sid, the attached patch can be applied to achieve the following:

  * no_ncurses.patch: Don't look for or link against ncurses; it isn't
even used. (Closes: #646135)
  * debian/control: Because the majority of dvbstreamer's source is
GPLv2, we must use libreadline-gplv2-dev as a build-dependency.


Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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 dvbstreamer-2.1.0/debian/control dvbstreamer-2.1.0/debian/control
--- dvbstreamer-2.1.0/debian/control	2011-05-21 17:01:52.0 -0400
+++ dvbstreamer-2.1.0/debian/control	2011-10-28 18:45:51.0 -0400
@@ -4,7 +4,8 @@
 XSBC-Original-Maintainer: A Mennucc1 mennu...@debian.org
 Build-Depends: dpkg-dev (= 1.14.27), debhelper (= 7), quilt (= 0.46-4.1),
  autoconf, autotools-dev, automake, libtool, cdbs, libev-dev,
- libreadline-dev, sqlite3, libsqlite3-dev, libyaml-dev, libltdl-dev, zlib1g-dev
+ libreadline-gplv2-dev, sqlite3, libsqlite3-dev, libyaml-dev, libltdl-dev,
+ zlib1g-dev
 Standards-Version: 3.8.3
 Section: video
 Homepage: http://dvbstreamer.sf.net/
diff -Nru dvbstreamer-2.1.0/debian/patches/no_ncurses.patch dvbstreamer-2.1.0/debian/patches/no_ncurses.patch
--- dvbstreamer-2.1.0/debian/patches/no_ncurses.patch	1969-12-31 19:00:00.0 -0500
+++ dvbstreamer-2.1.0/debian/patches/no_ncurses.patch	2011-10-28 19:08:27.0 -0400
@@ -0,0 +1,88 @@
+Index: dvbstreamer-2.1.0/configure.in
+===
+--- dvbstreamer-2.1.0.orig/configure.in	2011-10-28 19:00:59.0 -0400
 dvbstreamer-2.1.0/configure.in	2011-10-28 19:00:59.0 -0400
+@@ -149,14 +149,6 @@
+ dnl ---
+ AC_CHECK_HEADER([readline/readline.h], [], [AC_MSG_FAILURE([readline header file not found])])
+ 
+-AC_CHECK_LIB([readline], [readline], [READLINE_TERMCAP=-lncurses],
+-[AC_CHECK_LIB([readline], [readline], [READLINE_TERMCAP=-ltermcap],
+-[AC_MSG_FAILURE([readline not found])],
+-[-ltermcap])],
+-[-lncurses])
+-
+-AC_SUBST(READLINE_TERMCAP)
+-
+ LIBS=
+ 
+ dnl ---
+Index: dvbstreamer-2.1.0/configure
+===
+--- dvbstreamer-2.1.0.orig/configure	2011-10-28 19:07:04.0 -0400
 dvbstreamer-2.1.0/configure	2011-10-28 19:08:25.0 -0400
+@@ -12537,7 +12537,7 @@
+   $as_echo_n (cached)  6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS=-lreadline -lncurses $LIBS
++LIBS=-lreadline $LIBS
+ cat confdefs.h - _ACEOF conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -12567,55 +12567,6 @@
+ fi
+ { $as_echo $as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline 5
+ $as_echo $ac_cv_lib_readline_readline 6; }
+-if test x$ac_cv_lib_readline_readline = xyes; then :
+-  READLINE_TERMCAP=-lncurses
+-else
+-  { $as_echo $as_me:${as_lineno-$LINENO}: checking for readline in -lreadline 5
+-$as_echo_n checking for readline in -lreadline...  6; }
+-if test ${ac_cv_lib_readline_readline+set} = set; then :
+-  $as_echo_n (cached)  6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS=-lreadline -ltermcap $LIBS
+-cat confdefs.h - _ACEOF conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern C
+-#endif
+-char readline ();
+-int
+-main ()
+-{
+-return readline ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link $LINENO; then :
+-  ac_cv_lib_readline_readline=yes
+-else
+-  ac_cv_lib_readline_readline=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo $as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline 5
+-$as_echo $ac_cv_lib_readline_readline 6; }
+-if test x$ac_cv_lib_readline_readline = xyes; then :
+-  READLINE_TERMCAP=-ltermcap
+-else
+-  { { $as_echo $as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd': 5
+-$as_echo $as_me: error: in \`$ac_pwd': 2;}
+-as_fn_error $? readline not found
+-See \`config.log' for more details $LINENO 5 ; }
+-fi
+-
+-fi
+ 
+ 
+ 
diff -Nru dvbstreamer-2.1.0/debian/patches/series dvbstreamer-2.1.0/debian/patches/series
--- dvbstreamer-2.1.0/debian/patches/series	2011-03-23 09:38:46.0 -0400
+++ 

Bug#646172: FTBFS: /usr/bin/ld: cannot find -ltermcap

2011-10-28 Thread Daniel T Chen
Package: eresi
Version: 1:0.8a25-3.1
Followup-For: Bug #646172
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

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

  * Update 01_build_fixes.dpatch not to link against termcap. Fixes
FTBFS. (Closes: #646172)


Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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 eresi-0.8a25/debian/patches/01_build_fixes.dpatch eresi-0.8a25/debian/patches/01_build_fixes.dpatch
--- eresi-0.8a25/debian/patches/01_build_fixes.dpatch
+++ eresi-0.8a25/debian/patches/01_build_fixes.dpatch
@@ -3,8 +3,21 @@
 ## All lines beginning with `## DP:' are a description of the patch.
 
 @DPATCH@
 eresi-0.8a25.orig/configure
-+++ eresi-0.8a25/configure
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' eresi-0.8a25~/configure eresi-0.8a25/configure
+--- eresi-0.8a25~/configure	2011-10-28 19:30:45.0 -0400
 eresi-0.8a25/configure	2011-10-28 19:34:23.0 -0400
+@@ -146,9 +146,9 @@
+ READLN=1
+ if [ ${OSNAME} != OpenBSD ] ; then
+ echo  READLNOPT	= -DUSE_READLN $CONFIGFILE
+-echo  LDREADLNOPT	= -L/opt/sfw/lib/ -lreadline -ltermcap  $CONFIGFILE
++echo  LDREADLNOPT	= -L/opt/sfw/lib/ -lreadline		 $CONFIGFILE
+ else
+-echo  LDREADLNOPT	= -lreadline -ltermcap			 $CONFIGFILE
++echo  LDREADLNOPT	= -lreadline $CONFIGFILE
+ fi
+ echo  LDUIOPT32	= -L../libui -lui32 $CONFIGFILE
+ echo  LDUIOPT64	= -L../libui -lui64 $CONFIGFILE
 @@ -608,6 +608,11 @@
  echo 	@cd libstderesi  \$(MAKE) \$(BUILD_TARGET)		 Makefile
  echo 	@echo 'Libstderesi has been built successfully.'	 Makefile
@@ -17,8 +30,30 @@
  echo 	@echo 'Building libe2dbg...'			  	 Makefile
  echo 	@cd libe2dbg  \$(MAKE) \$(BUILD_TARGET)		 Makefile
  echo 	@echo 'Libe2dbg has been built successfully.'	 Makefile
 eresi-0.8a25.orig/libe2dbg/common/Makefile
-+++ eresi-0.8a25/libe2dbg/common/Makefile
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' eresi-0.8a25~/libdump/Makefile eresi-0.8a25/libdump/Makefile
+--- eresi-0.8a25~/libdump/Makefile	2008-04-06 19:15:44.0 -0400
 eresi-0.8a25/libdump/Makefile	2011-10-28 19:34:47.0 -0400
+@@ -11,7 +11,7 @@
+ OBJ	= dump.o recv.o send.o
+ CFLAGS	= -Wall $(BITS) -g3 -Iinclude -I../libc/include/ -I../libelfsh/include/ \
+ 	-I../libaspect/include/ -I../elibc/include -DELFSH_INTERN -fPIC
+-LDFLAGS = -L./ -L../libelfsh/ -lelfsh -ldump -L/usr/pkg/lib/ -ltermcap \
++LDFLAGS = -L./ -L../libelfsh/ -lelfsh -ldump -L/usr/pkg/lib/ \
+ 	-lreadline -laspect $(BITS) $(EXTRAOPT)
+ CC	?= gcc
+ LD	?= ld
+@@ -27,7 +27,7 @@
+ #	$(CC) $(CFLAGS) $(LDFLAGS) dump_main.o -o dump_main 
+ 	gcc  -Wall -DERESI32 -g3 -Iinclude -I../libhash/include/ \
+ 	-DELFSH_INTERN -L./ -L../libelfsh/ -llibelfsh -L/usr/pkg/lib/ \
+-	-ltermcap -lreadline -DERESI32  ../libhash/hash.o dump.o recv.o\
++	-lreadline -DERESI32  ../libhash/hash.o dump.o recv.o\
+ 	send.o dump_main.c -o dump_main
+ 
+ clean	:
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' eresi-0.8a25~/libe2dbg/common/Makefile eresi-0.8a25/libe2dbg/common/Makefile
+--- eresi-0.8a25~/libe2dbg/common/Makefile	2008-04-06 19:16:29.0 -0400
 eresi-0.8a25/libe2dbg/common/Makefile	2011-10-28 19:30:45.0 -0400
 @@ -14,7 +14,7 @@
  CC			?= gcc
  RM			= rm -f
@@ -37,8 +72,9 @@
  			-I../../libelfsh/include/ -I../../libdump/include/   \
  			-I../../libasm/include/ -I../../libstderesi/include/	 \
  			-I../../libui/include/ -I../../libmjollnir/include/ 	 \
 eresi-0.8a25.orig/librevm/Makefile
-+++ eresi-0.8a25/librevm/Makefile
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' eresi-0.8a25~/librevm/Makefile eresi-0.8a25/librevm/Makefile
+--- eresi-0.8a25~/librevm/Makefile	2011-10-28 19:30:45.0 -0400
 eresi-0.8a25/librevm/Makefile	2011-10-28 19:30:45.0 -0400
 @@ -48,6 +48,7 @@
  
  $(NAME32).so			:


Bug#638835: won't work without ipchains

2011-10-27 Thread Daniel T Chen
Package: bastille
Version: 1:3.0.9-13
Followup-For: Bug #638835
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

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

  * Apply patch from Marcos Marado mindboosterno...@gmail.com resolving
inability to interact with Linux 3.0+. (Closes: #638835)


Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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 bastille-3.0.9/bastille-firewall bastille-3.0.9/bastille-firewall
--- bastille-3.0.9/bastille-firewall
+++ bastille-3.0.9/bastille-firewall
@@ -68,7 +68,7 @@
   exit 1
 fi
 
-if [ -n $(uname -r | awk -F. ' $1 == 2  $2  2 {print}') ]; then
+if [ -n $(uname -r | awk -F. ' $1$2  22 {print}') ]; then
 	# We are using Linux 2.3 or newer; use the netfilter script if available
 	if [ -x /sbin/bastille-netfilter ]; then
 		REALSCRIPT=/sbin/bastille-netfilter


Bug#630376: package FTBFS on squeeze

2011-10-27 Thread Daniel T Chen
Package: cpu
Version: 1.4.3-11.2
Followup-For: Bug #630376
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

In Debian sid, the attached patch can be applied to achieve the following:

  * Upon advice from Peter Green, Build-Conflicts automake1.7 to resolve
FTBFS. (Closes: #630376)


Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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 cpu-1.4.3/debian/control cpu-1.4.3/debian/control
--- cpu-1.4.3/debian/control
+++ cpu-1.4.3/debian/control
@@ -4,6 +4,7 @@
 Maintainer: Guido Trotter ultrot...@debian.org
 Uploaders: Paul J Stevens p...@nfg.nl
 Build-Depends: debhelper (= 7), dpatch, libldap2-dev, libcrack2-dev (= 2.8.12), autotools-dev
+Build-Conflicts: automake1.7
 Standards-Version: 3.7.3
 
 Package: cpu


Bug#640827: FTBFS on armel

2011-10-27 Thread Daniel T Chen
Package: cxxtools
Version: 2.0-1
Followup-For: Bug #640827
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

In Debian sid, the attached patch can be applied to achieve the following:

  * Add arm_gcc4.6_ftbfs_fix from upstream r1136 to resolve FTBFS.
(Closes: #640827)


Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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 cxxtools-2.0/debian/patches/arm_gcc4.6_ftbfs_fix cxxtools-2.0/debian/patches/arm_gcc4.6_ftbfs_fix
--- cxxtools-2.0/debian/patches/arm_gcc4.6_ftbfs_fix	1969-12-31 19:00:00.0 -0500
+++ cxxtools-2.0/debian/patches/arm_gcc4.6_ftbfs_fix	2011-10-27 20:35:58.0 -0400
@@ -0,0 +1,13 @@
+Index: src/atomicity.gcc.arm.cpp
+===
+--- a/src/atomicity.gcc.arm.cpp	(revision 1135)
 b/src/atomicity.gcc.arm.cpp	(revision 1136)
+@@ -125,7 +125,7 @@
+: =r (a), =r (b)
+: r (dest), r (exch), r (comp)
+: cc, memory);
+-return a;
++return (void*)a;
+ }
+ 
+ 
diff -Nru cxxtools-2.0/debian/patches/series cxxtools-2.0/debian/patches/series
--- cxxtools-2.0/debian/patches/series	2011-08-08 06:30:43.0 -0400
+++ cxxtools-2.0/debian/patches/series	2011-10-27 20:35:46.0 -0400
@@ -2,3 +2,4 @@
 no_shared_flag
 iconvstream_size_t_fix
 configure.in_fix
+arm_gcc4.6_ftbfs_fix


Bug#646169: FTBFS: cp: cannot stat `debian/tmp/usr/bin/icegridregistry': No such file or directory

2011-10-26 Thread Daniel T Chen
Package: zeroc-ice
Version: 3.4.2-4
Followup-For: Bug #646169
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

In Debian sid, the attached patch can be applied to achieve the following:

  * make-rules.patch: Don't attempt to link against libncurses. Fixes
FTBFS. (Closes: #646169)
  * debian/control: Because zeroc-ice is distributed under GPLv2, we
must use libreadline-gplv2-dev and not libreadline-dev.


Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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 zeroc-ice-3.4.2/debian/control zeroc-ice-3.4.2/debian/control
--- zeroc-ice-3.4.2/debian/control	2011-06-27 15:31:52.0 -0400
+++ zeroc-ice-3.4.2/debian/control	2011-10-26 22:55:03.0 -0400
@@ -5,7 +5,7 @@
 Uploaders: Cleto Martín cleto.mar...@gmail.com
 Build-Depends: cdbs (= 0.4.43), debhelper (= 5.0.37.2), quilt,
  patchutils (= 0.2.25), libdb5.1++-dev | libdb++-dev, libmcpp-dev (=
- 2.7.1), libreadline-dev, libexpat1-dev, libssl-dev, libbz2-dev,
+ 2.7.1), libreadline-gplv2-dev, libexpat1-dev, libssl-dev, libbz2-dev,
  zlib1g-dev | libz-dev, python-all-dev (= 2.3.5-11), python-support
  (= 0.3), php5-dev, ruby1.8-dev, ruby1.8, libqt4-dev
 Build-Depends-Indep: cli-common-dev (= 0.4.4),
diff -Nru zeroc-ice-3.4.2/debian/patches/make-rules.patch zeroc-ice-3.4.2/debian/patches/make-rules.patch
--- zeroc-ice-3.4.2/debian/patches/make-rules.patch	1969-12-31 19:00:00.0 -0500
+++ zeroc-ice-3.4.2/debian/patches/make-rules.patch	2011-10-26 17:41:30.0 -0400
@@ -0,0 +1,13 @@
+Index: zeroc-ice-3.4.2/cpp/config/Make.rules
+===
+--- zeroc-ice-3.4.2.orig/cpp/config/Make.rules	2011-10-26 17:21:57.0 -0400
 zeroc-ice-3.4.2/cpp/config/Make.rules	2011-10-26 17:22:04.0 -0400
+@@ -210,7 +210,7 @@
+ ifeq ($(PLATFORM_HAS_READLINE),yes)
+ ifeq ($(USE_READLINE),yes)
+ READLINE_FLAGS  = -DHAVE_READLINE $(if $(READLINE_HOME),-I$(READLINE_HOME)/include)
+-READLINE_LIBS   = $(if $(READLINE_HOME),-L$(READLINE_HOME)/$(libsubdir)) -lreadline -lncurses
++READLINE_LIBS   = $(if $(READLINE_HOME),-L$(READLINE_HOME)/$(libsubdir)) -lreadline
+ endif
+ endif
+ 
diff -Nru zeroc-ice-3.4.2/debian/patches/series zeroc-ice-3.4.2/debian/patches/series
--- zeroc-ice-3.4.2/debian/patches/series	2011-06-27 15:31:52.0 -0400
+++ zeroc-ice-3.4.2/debian/patches/series	2011-10-26 17:08:17.0 -0400
@@ -11,3 +11,4 @@
 archs.patch
 libdb5.1.patch
 ptrdiff_t-gcc-4.6.patch
+make-rules.patch


Bug#646615: depend on gnome-icon-theme

2011-10-25 Thread Daniel T Chen
Package: arista
Version: 0.9.7-1
Followup-For: Bug #646615
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

In Debian sid, the attached patch can be applied to achieve the following:

  * Depend on an icon theme to resolve a GError with missing icon.
(Closes: #646615)


Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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 arista-0.9.7/debian/control arista-0.9.7/debian/control
--- arista-0.9.7/debian/control	2011-06-23 04:19:05.0 -0400
+++ arista-0.9.7/debian/control	2011-10-25 19:00:14.0 -0400
@@ -25,7 +25,8 @@
  gstreamer0.10-plugins-base,
  gstreamer0.10-plugins-good,
  ${python:Depends},
- ${misc:Depends}
+ ${misc:Depends},
+ gnome-icon-theme | gnome-icon-theme-gartoon | gnome-icon-theme-nuovo | gnome-icon-theme-yasis | lxde-icon-theme | moblin-icon-theme | tango-icon-theme | gnome-themes-more | gnome-accessibility-themes
 Recommends: gnome-codec-install,
  gstreamer0.10-plugins-bad | gstreamer0.10-plugins-really-bad | gstreamer0.10-plugins-bad-multiverse,
  gstreamer0.10-plugins-ugly | gstreamer0.10-plugins-ugly-multiverse


Bug#646134: FTBFS: configure: error: cannot find the curses library.

2011-10-25 Thread Daniel T Chen
Package: cdcd
Followup-For: Bug #646134
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

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

  * Add 07-no-curses.patch to fix FTBFS. Since curses isn't used
anyway, don't test for or use it. (Closes: #646134)


Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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 cdcd-0.6.6/debian/patches/07-no-curses.patch cdcd-0.6.6/debian/patches/07-no-curses.patch
--- cdcd-0.6.6/debian/patches/07-no-curses.patch	1969-12-31 19:00:00.0 -0500
+++ cdcd-0.6.6/debian/patches/07-no-curses.patch	2011-10-25 19:56:06.0 -0400
@@ -0,0 +1,104 @@
+Index: cdcd-0.6.6/config.h.in
+===
+--- cdcd-0.6.6.orig/config.h.in	2011-10-25 19:56:03.0 -0400
 cdcd-0.6.6/config.h.in	2011-10-25 19:54:56.0 -0400
+@@ -33,9 +33,6 @@
+ /* True if we must provide -llibcdaudio (for IRIX). */
+ #undef HAVE_LIBCDAUDIO
+ 
+-/* Define to 1 if you have the `curses' library (-lcurses). */
+-#undef HAVE_LIBCURSES
+-
+ /* Define to 1 if you have the `readline' library (-lreadline). */
+ #undef HAVE_LIBREADLINE
+ 
+Index: cdcd-0.6.6/configure
+===
+--- cdcd-0.6.6.orig/configure	2011-10-25 19:56:03.0 -0400
 cdcd-0.6.6/configure	2011-10-25 19:56:03.0 -0400
+@@ -3677,85 +3677,6 @@
+ 
+ 
+ 
+-echo $as_me:$LINENO: checking for tputs in -lcurses 5
+-echo $ECHO_N checking for tputs in -lcurses... $ECHO_C 6
+-if test ${ac_cv_lib_curses_tputs+set} = set; then
+-  echo $ECHO_N (cached) $ECHO_C 6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS=-lcurses  $LIBS
+-cat conftest.$ac_ext _ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h conftest.$ac_ext
+-cat conftest.$ac_ext _ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern C
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char tputs ();
+-int
+-main ()
+-{
+-tputs ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo $as_me:$LINENO: \$ac_link\) 5
+-  (eval $ac_link) 2conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err 5
+-  echo $as_me:$LINENO: \$? = $ac_status 5
+-  (exit $ac_status); } 
+-	 { ac_try='test -z $ac_c_werror_flag			 || test ! -s conftest.err'
+-  { (eval echo $as_me:$LINENO: \$ac_try\) 5
+-  (eval $ac_try) 25
+-  ac_status=$?
+-  echo $as_me:$LINENO: \$? = $ac_status 5
+-  (exit $ac_status); }; } 
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo $as_me:$LINENO: \$ac_try\) 5
+-  (eval $ac_try) 25
+-  ac_status=$?
+-  echo $as_me:$LINENO: \$? = $ac_status 5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_curses_tputs=yes
+-else
+-  echo $as_me: failed program was: 5
+-sed 's/^/| /' conftest.$ac_ext 5
+-
+-ac_cv_lib_curses_tputs=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-  conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo $as_me:$LINENO: result: $ac_cv_lib_curses_tputs 5
+-echo ${ECHO_T}$ac_cv_lib_curses_tputs 6
+-if test $ac_cv_lib_curses_tputs = yes; then
+-  cat confdefs.h _ACEOF
+-#define HAVE_LIBCURSES 1
+-_ACEOF
+-
+-  LIBS=-lcurses $LIBS
+-
+-else
+-  { { echo $as_me:$LINENO: error: cannot find the curses library.
+-Check the INSTALL file, maybe you can find how to solve the problem. 5
+-echo $as_me: error: cannot find the curses library.
+-Check the INSTALL file, maybe you can find how to solve the problem. 2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-
+-
+ echo $as_me:$LINENO: checking for rl_completion_matches in -lreadline 5
+ echo $ECHO_N checking for rl_completion_matches in -lreadline... $ECHO_C 6
+ if test ${ac_cv_lib_readline_rl_completion_matches+set} = set; then
diff -Nru cdcd-0.6.6/debian/patches/series cdcd-0.6.6/debian/patches/series
--- cdcd-0.6.6/debian/patches/series	2011-09-04 10:49:43.0 -0400
+++ cdcd-0.6.6/debian/patches/series	2011-10-25 19:54:39.0 -0400
@@ -4,3 +4,4 @@
 04-freedb-url
 05-fix-rndplay-segfault.patch
 06-manpage-hyphen-fix.patch
+07-no-curses.patch


Bug#646503: FTBFS: fo-area-page.c:907:12: error: format not a string literal and no format arguments [-Werror=format-security]

2011-10-24 Thread Daniel T Chen
Package: xmlroff
Version: 0.6.2-1
Followup-For: Bug #646503
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

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

  * Fix format-security FTBFS with gcc-4.6. (Closes: #646503)


Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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
only in patch2:
unchanged:
--- xmlroff-0.6.2.orig/libfo/fo-xslt-transformer.c
+++ xmlroff-0.6.2/libfo/fo-xslt-transformer.c
@@ -97,6 +97,7 @@
   g_set_error (error,
   FO_XSLT_TRANSFORMER_ERROR,
   FO_XSLT_TRANSFORMER_ERROR_NO_STYLESHEET_DOC,
+  %s,
   
_(fo_xslt_transformer_error_messages[FO_XSLT_TRANSFORMER_ERROR_NO_STYLESHEET_DOC]));
   return NULL;
 }
@@ -107,6 +108,7 @@
   g_set_error (error,
   FO_XSLT_TRANSFORMER_ERROR,
   FO_XSLT_TRANSFORMER_ERROR_NO_XML_DOC,
+  %s,
   
_(fo_xslt_transformer_error_messages[FO_XSLT_TRANSFORMER_ERROR_NO_XML_DOC]));
   return NULL;
 }
@@ -119,6 +121,7 @@
   g_set_error (error,
   FO_XSLT_TRANSFORMER_ERROR,
   FO_XSLT_TRANSFORMER_ERROR_PARSE_FAILED,
+  %s,
   
_(fo_xslt_transformer_error_messages[FO_XSLT_TRANSFORMER_ERROR_PARSE_FAILED]));
 
   return NULL;
@@ -135,6 +138,7 @@
  g_set_error (error,
   FO_XSLT_TRANSFORMER_ERROR,
   FO_XSLT_TRANSFORMER_ERROR_TRANSFORM_FAILED,
+  %s,
   
_(fo_xslt_transformer_error_messages[FO_XSLT_TRANSFORMER_ERROR_TRANSFORM_FAILED]));
 
  return NULL;
only in patch2:
unchanged:
--- xmlroff-0.6.2.orig/libfo/fo-xml-doc.c
+++ xmlroff-0.6.2/libfo/fo-xml-doc.c
@@ -203,6 +203,7 @@
   g_set_error (error,
   FO_XML_DOC_ERROR,
   FO_XML_DOC_ERROR_MEMORY_PARSE_FAILED,
+  %s,
   
_(fo_xml_doc_error_messages[FO_XML_DOC_ERROR_MEMORY_PARSE_FAILED]));
 
 }
@@ -246,6 +247,7 @@
   g_set_error (error,
   FO_XML_DOC_ERROR,
   FO_XML_DOC_ERROR_MEMORY_PARSE_FAILED,
+  %s,
   
_(fo_xml_doc_error_messages[FO_XML_DOC_ERROR_MEMORY_PARSE_FAILED]));
 
 }
only in patch2:
unchanged:
--- xmlroff-0.6.2.orig/libfo/fo-doc-cairo.c
+++ xmlroff-0.6.2/libfo/fo-doc-cairo.c
@@ -362,6 +362,7 @@
  g_set_error (error,
   FO_DOC_ERROR,
   FO_DOC_ERROR_UNSUPPORTED_FORMAT,
+  %s,
   
N_(fo_doc_error_messages[FO_DOC_ERROR_UNSUPPORTED_FORMAT]));
}
   break;
@@ -378,6 +379,7 @@
   g_set_error (error,
   FO_DOC_ERROR,
   FO_DOC_ERROR_UNSUPPORTED_FORMAT,
+  %s,
   N_(fo_doc_error_messages[FO_DOC_ERROR_UNSUPPORTED_FORMAT]));
 
 }
@@ -424,6 +426,7 @@
   g_set_error (error,
   FO_DOC_ERROR,
   FO_DOC_ERROR_FAILED,
+  %s,
   N_(fo_doc_error_messages[FO_DOC_ERROR_FAILED]));
   return;
 }
@@ -441,6 +444,7 @@
   g_set_error (error,
   FO_DOC_ERROR,
   FO_DOC_ERROR_FAILED,
+  %s,
   N_(fo_doc_error_messages[FO_DOC_ERROR_FAILED]));
   return;
 }
only in patch2:
unchanged:
--- xmlroff-0.6.2.orig/libfo/fo-node.c
+++ xmlroff-0.6.2/libfo/fo-node.c
@@ -1311,6 +1311,7 @@
 
   new_error = g_error_new (src-domain,
   src-code,
+  %s,
   new_message-str);
 
   g_string_free (new_message, TRUE);
@@ -1367,6 +1368,7 @@
 
   new_error = g_error_new (src-domain,
   src-code,
+  %s,
   new_message-str);
 
   g_string_free (new_message, TRUE);
only in patch2:
unchanged:
--- xmlroff-0.6.2.orig/libfo/fo-xsl-formatter.c
+++ xmlroff-0.6.2/libfo/fo-xsl-formatter.c
@@ -984,6 +984,7 @@
   g_set_error (error,
   FO_XSL_FORMATTER_ERROR,
   FO_XSL_FORMATTER_ERROR_NO_RESULT_TREE,
+  %s,
   
_(fo_xsl_formatter_error_messages[FO_XSL_FORMATTER_ERROR_NO_RESULT_TREE]));
   return FALSE;
 }
@@ -998,6 +999,7 @@
   g_set_error (error,
   FO_XSL_FORMATTER_ERROR,
   FO_XSL_FORMATTER_ERROR_RESULT_TREE_NOT_FO,
+  %s\n%s,
   
_(fo_xsl_formatter_error_messages[FO_XSL_FORMATTER_ERROR_RESULT_TREE_NOT_FO]),
   

Bug#565064: ftbfs with gcc-4.5

2011-10-21 Thread Daniel T Chen
Package: xshisen
Version: 1:1.51-3.1
Followup-For: Bug #565064
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

In Debian sid, the attached patch can be applied to achieve the following:

  * Use quilt
- Replace simple-patchsys.mk with patchsys-quilt.mk and build-depend
  on quilt.
- Add debian/patches/series.
  * 10_oldfixes.patch: Fix format string use, FTBFS with gcc-4.6.
(Closes: #565064)


Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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 xshisen-1.51/debian/control xshisen-1.51/debian/control
--- xshisen-1.51/debian/control	2010-05-08 18:26:37.0 -0400
+++ xshisen-1.51/debian/control	2011-10-21 18:55:23.0 -0400
@@ -2,7 +2,7 @@
 Section: games
 Priority: optional
 Maintainer: Zak B. Elep zak...@spunge.org
-Build-Depends: autotools-dev, cdbs, debhelper (= 7.1), lesstif2-dev, libx11-dev, libxmu-dev, libxpm-dev, libxt-dev, libxaw7-dev, xutils-dev
+Build-Depends: autotools-dev, cdbs, quilt, debhelper (= 7.1), lesstif2-dev, libx11-dev, libxmu-dev, libxpm-dev, libxt-dev, libxaw7-dev, xutils-dev
 Standards-Version: 3.8.4
 Homepage: http://www.techfirm.co.jp/~masaoki/xshisen.html
 
diff -Nru xshisen-1.51/debian/patches/10_oldfixes.patch xshisen-1.51/debian/patches/10_oldfixes.patch
--- xshisen-1.51/debian/patches/10_oldfixes.patch	2010-05-04 12:05:41.0 -0400
+++ xshisen-1.51/debian/patches/10_oldfixes.patch	2011-10-21 18:20:59.0 -0400
@@ -1,6 +1,7 @@
-diff -Nur xshisen-1.51.orig/main.C xshisen-1.51/main.C
 xshisen-1.51.orig/main.C
-+++ xshisen-1.51/main.C
+Index: xshisen-1.51/main.C
+===
+--- xshisen-1.51.orig/main.C	2011-10-21 18:12:57.0 -0400
 xshisen-1.51/main.C	2011-10-21 18:16:00.0 -0400
 @@ -210,7 +210,7 @@
  char buffer[100], *p;
  char *(*codeconv)(const char*);
@@ -47,9 +48,10 @@
  }
  else {
  GetGameSize(initial_game_state, num_piece_x, num_piece_y);
-diff -Nur xshisen-1.51.orig/menubar.C xshisen-1.51/menubar.C
 xshisen-1.51.orig/menubar.C
-+++ xshisen-1.51/menubar.C
+Index: xshisen-1.51/menubar.C
+===
+--- xshisen-1.51.orig/menubar.C	2011-10-21 18:12:57.0 -0400
 xshisen-1.51/menubar.C	2011-10-21 18:16:00.0 -0400
 @@ -158,8 +158,13 @@
(XtCallbackProc)GameCB, (XtPointer)1);
  XtAddCallback(XtNameToWidget(menushell0, button_2), XtNcallback,
@@ -64,18 +66,28 @@
  XtAddCallback(XtNameToWidget(menushell0, button_4), XtNcallback,
(XtCallbackProc)GameCB, (XtPointer)4);
  XtAddCallback(XtNameToWidget(menushell0, button_5), XtNcallback,
-diff -Nur xshisen-1.51.orig/score.C xshisen-1.51/score.C
 xshisen-1.51.orig/score.C
-+++ xshisen-1.51/score.C
+Index: xshisen-1.51/score.C
+===
+--- xshisen-1.51.orig/score.C	2011-10-21 18:12:57.0 -0400
 xshisen-1.51/score.C	2011-10-21 18:20:57.0 -0400
+@@ -337,7 +337,7 @@
+ }
+ // Always read the latest high score
+ readfile();
+-sprintf(format, res_strings[0]);
++snprintf(format, sizeof(format)-1, %s, res_strings[0]);
+ prev_time = -1;
+ for(int i=0; iSCORENUM; i++) {
+ this_time = rec[i].hour * 3600 + rec[i].min * 60 + rec[i].sec;
 @@ -372,12 +372,15 @@
  time_t t;
  struct tm *tp;
  struct passwd *pw;
 -char   namebuf[128], myname[NAMELEN+1], gecos[128], *po;
 +char   namebuf[142], myname[NAMELEN+1], gecos[128], *po;
- 
++
 +#ifndef NO_GLOBAL_HIGHSCORE
-+
+ 
  s1 = scoreToRegister / 1000;
  ms_to_hms(scoreToRegister, h, m, s);
  pw = getpwuid(getuid());
@@ -106,9 +118,10 @@
  bp += strlen(bp);
  sprintf(bp, %-14.14s: %2.2d:%2.2d:%2.2d (%4.1f) %6d %s\n,
  res_strings[8], t1, t2, t3, y, rcount[0], res_strings[11]);
-diff -Nur xshisen-1.51.orig/readxpm.C xshisen-1.51/readxpm.C
 xshisen-1.51.orig/readxpm.C
-+++ xshisen-1.51/readxpm.C
+Index: xshisen-1.51/readxpm.C
+===
+--- xshisen-1.51.orig/readxpm.C	2011-10-21 18:12:57.0 -0400
 xshisen-1.51/readxpm.C	2011-10-21 18:16:00.0 -0400
 @@ -12,7 +12,7 @@
char buffer[1024];
  
@@ -118,9 +131,10 @@
  Mp[i].ReadFile(w, buffer, i, globRes.colorCloseness);
}
  }
-diff -Nur xshisen-1.51.orig/Makefile.in xshisen-1.51/Makefile.in
 xshisen-1.51.orig/Makefile.in
-+++ xshisen-1.51/Makefile.in
+Index: xshisen-1.51/Makefile.in

Bug#623144: on missing libdcmtk1-dev

2011-10-20 Thread Daniel T Chen
Package: lipsia
Version: 1.6.0-4
Followup-For: Bug #623144
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

In Debian sid, the attached patch can be applied to achieve the following:

  * debian/control: Update build-dependency to libdcmtk2-dev.
(Closes: #623144)
  * debian/patches/dont_build_dictov_converter: Unfortunately upstream
for lipsia has removed support for the dictov converter (among
others) as of 2.0.0, so fixing these FTBFS errors isn't worth the
resources. In this case, just don't build the dictov converter.


Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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 lipsia-1.6.0/debian/control lipsia-1.6.0/debian/control
--- lipsia-1.6.0/debian/control	2010-07-25 09:14:09.0 -0400
+++ lipsia-1.6.0/debian/control	2011-10-20 16:45:59.0 -0400
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: NeuroDebian Team t...@neuro.debian.net
 Uploaders: Michael Hanke michael.ha...@gmail.com, Yaroslav Halchenko deb...@onerussian.com
-Build-Depends: debhelper (= 7.0.50~), cmake, fftw3-dev, libdcmtk1-dev, libgsl0-dev, libqt3-compat-headers, libqt3-mt-dev, libnifti-dev, libvia-dev (= 1.4.1)
+Build-Depends: debhelper (= 7.0.50~), cmake, fftw3-dev, libdcmtk2-dev, libgsl0-dev, libqt3-compat-headers, libqt3-mt-dev, libnifti-dev, libvia-dev (= 1.4.1)
 Standards-Version: 3.8.3.0
 Homepage: http://www.cbs.mpg.de/institute/software/lipsia
 Vcs-Browser: http://git.debian.org/?p=debian-med/lipsia.git
diff -Nru lipsia-1.6.0/debian/patches/dont_build_dictov_converter lipsia-1.6.0/debian/patches/dont_build_dictov_converter
--- lipsia-1.6.0/debian/patches/dont_build_dictov_converter	1969-12-31 19:00:00.0 -0500
+++ lipsia-1.6.0/debian/patches/dont_build_dictov_converter	2011-10-20 16:45:39.0 -0400
@@ -0,0 +1,12 @@
+Index: lipsia-1.6.0/src/CMakeLists.txt
+===
+--- lipsia-1.6.0.orig/src/CMakeLists.txt	2011-10-20 16:45:36.0 -0400
 lipsia-1.6.0/src/CMakeLists.txt	2011-10-20 16:45:31.0 -0400
+@@ -86,7 +86,6 @@
+ ADD_SUBDIRECTORY(vwilcoxon)
+ ADD_SUBDIRECTORY(vzmapborder)
+ ADD_SUBDIRECTORY(vzmax)
+-ADD_SUBDIRECTORY(dictov)
+ 
+ # needs Matlab?
+ #mattov vtomat
diff -Nru lipsia-1.6.0/debian/patches/series lipsia-1.6.0/debian/patches/series
--- lipsia-1.6.0/debian/patches/series	2010-07-21 16:06:06.0 -0400
+++ lipsia-1.6.0/debian/patches/series	2011-10-20 16:45:17.0 -0400
@@ -1 +1,2 @@
 various_fixes
+dont_build_dictov_converter


Bug#640595: installation fails

2011-10-19 Thread Daniel T Chen
Package: x52pro
Version: 0.1.1-2
Followup-For: Bug #640595
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

In Debian sid, the attached patch can be applied to achieve the following:

  * Conditionally execute udevadm, allowing the package to be installed
and/or removed. (Closes: #640595)


Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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 x52pro-0.1.1/debian/libx52pro0.postinst x52pro-0.1.1/debian/libx52pro0.postinst
--- x52pro-0.1.1/debian/libx52pro0.postinst	2011-05-18 10:35:41.0 -0400
+++ x52pro-0.1.1/debian/libx52pro0.postinst	2011-10-19 17:54:22.0 -0400
@@ -20,8 +20,14 @@
 
 case $1 in
 configure)
-udevadm control --reload-rules
-udevadm trigger
+case $(uname -s) in
+Linux)
+if which udevadm /dev/null 21; then
+udevadm control --reload-rules
+udevadm trigger
+fi
+;;
+esac
 ;;
 
 abort-upgrade|abort-remove|abort-deconfigure)
diff -Nru x52pro-0.1.1/debian/libx52pro0.postrm x52pro-0.1.1/debian/libx52pro0.postrm
--- x52pro-0.1.1/debian/libx52pro0.postrm	2011-05-18 10:35:41.0 -0400
+++ x52pro-0.1.1/debian/libx52pro0.postrm	2011-10-19 17:57:47.0 -0400
@@ -21,8 +21,14 @@
 
 case $1 in
 purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-udevadm control --reload-rules
-udevadm trigger
+case $(uname -s) in
+Linux)
+if which udevadm /dev/null 21; then
+udevadm control --reload-rules
+udevadm trigger
+fi
+;;
+esac
 ;;
 
 *)


Bug#639279: to purge if ucf is not installed

2011-10-18 Thread Daniel T Chen
Package: nagiosgrapher
Version: 1.7.1-2.1
Followup-For: Bug #639279
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

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

  * Don't fail in postrm if ucf is not present. (Closes: #639279)


Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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 nagiosgrapher-1.7.1/debian/postrm.in nagiosgrapher-1.7.1/debian/postrm.in
--- nagiosgrapher-1.7.1/debian/postrm.in
+++ nagiosgrapher-1.7.1/debian/postrm.in
@@ -31,12 +31,12 @@
 
 if [ $1 = purge ]; then
 	for cfg in $CFGS; do
-		ucf --purge /etc/nagiosgrapher/$cfg
+		ucf --purge /etc/nagiosgrapher/$cfg || true
 		rm -f /etc/nagiosgrapher/$cfg
 	done
 	
 	for tmpl in $TMPL_CFGS; do
-		ucf --purge /etc/nagiosgrapher/ngraph.d/$tmpl
+		ucf --purge /etc/nagiosgrapher/ngraph.d/$tmpl || true
 		rm -f /etc/nagiosgrapher/ngraph.d/$tmpl
 	done
 fi


Bug#643339: build fails on configure-step (couldn't find slang.h)

2011-10-18 Thread Daniel T Chen
Package: most
Followup-For: Bug #643339
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

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

  * debian/rules: Handle multiarch slang2. Fixes FTBFS.
(Closes: #643339)


Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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 most-5.0.0a/debian/rules most-5.0.0a/debian/rules
--- most-5.0.0a/debian/rules
+++ most-5.0.0a/debian/rules
@@ -14,6 +14,7 @@
 
 # This is the debhelper compatibility version to use.
 # export DH_COMPAT=4
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 CC = gcc
 CFLAGS = -O2 -g -Wall -DUTF8
@@ -28,7 +29,7 @@
 build-stamp:
 	dh_testdir
 	@echo Building the binaries ...
-	CC=$(CC) CFLAGS=$(CFLAGS) ./configure
+	CC=$(CC) CFLAGS=$(CFLAGS) ./configure --with-slanglib=/usr/lib/$(DEB_HOST_MULTIARCH)
 	$(MAKE) SYS_INITFILE=/etc/most.conf
 	touch $@
 


Bug#641156: xset: not found

2011-10-16 Thread Daniel T Chen
Package: tv-fonts
Version: 1.1-7
Followup-For: Bug #641156
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

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

  * Revert build-dependency addition from previous upload upon advice
from Julien Cristau; instead, patch the upstream Makefile not to
execute the xset commands in the first place. (Closes: #641156)
- Use simple-patchsys.mk and add dont-run-xset.diff.


Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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 tv-fonts-1.1/debian/rules tv-fonts-1.1/debian/rules
--- tv-fonts-1.1/debian/rules
+++ tv-fonts-1.1/debian/rules
@@ -2,6 +2,7 @@
 
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_TAR_SRCDIR := tv-fonts-$(DEB_UPSTREAM_VERSION)
 DEB_TARBALL := tv-fonts-$(DEB_UPSTREAM_VERSION).tar.bz2
--- tv-fonts-1.1.orig/debian/patches/dont-run-xset.diff
+++ tv-fonts-1.1/debian/patches/dont-run-xset.diff
@@ -0,0 +1,15 @@
+diff -uNr tv-fonts-1.1.orig//Makefile tv-fonts-1.1//Makefile
+--- tv-fonts-1.1.orig//Makefile	2003-04-15 04:16:09.0 -0400
 tv-fonts-1.1//Makefile	2011-10-16 10:07:03.0 -0400
+@@ -24,11 +24,6 @@
+ 
+ all: $(LED_PCF) $(TT_PCF) $(LED_BDF) $(TT_BDF)
+ 	mkfontdir
+-ifneq ($(DISPLAY),)
+-	-xset fp- `pwd`:unscaled
+-	xset +fp `pwd`:unscaled
+-	xset fp rehash
+-endif
+ 
+ clean distclean:
+ 	rm -f $(LED_PCF) $(TT_PCF) $(TT_BDF)


Bug#640591: installation fails: /var/lib/dpkg/info/smbind.postinst: 42: local: not in a function

2011-10-16 Thread Daniel T Chen
Package: smbind
Version: 0.4.7-5
Followup-For: Bug #640591
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

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

  * debian/postinst: Fix semantic error with local variables so that
the package is installable again. (Closes: #640591)


Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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 smbind-0.4.7/debian/postinst smbind-0.4.7/debian/postinst
--- smbind-0.4.7/debian/postinst	2010-09-05 15:58:27.0 -0400
+++ smbind-0.4.7/debian/postinst	2011-10-16 18:49:53.0 -0400
@@ -38,7 +38,6 @@
 	dbc_generate_include=php:/etc/smbind/config-db.php
 	# Make sure the passwords match
 	if [ -z $2 ]; then
-		local pass1 pass2
 		while :; do
 			db_input high smbind/password1 || true
 			db_go


Bug#641156: xset: not found

2011-10-15 Thread Daniel T Chen
Package: tv-fonts
Version: 1.1-7
Followup-For: Bug #641156
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

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

  * debian/control: Add x11-xserver-utils to build-dependencies. We
can't guarantee that someone won't build in a tty with a non-empty
$DISPLAY (which is what the upstream Makefile checks), so even
though this source package compiles fine on the buildds, handle the
other case, too. Fixes FTBFS. (Closes: #641156)


Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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 tv-fonts-1.1/debian/control tv-fonts-1.1/debian/control
--- tv-fonts-1.1/debian/control
+++ tv-fonts-1.1/debian/control
@@ -2,7 +2,7 @@
 Section: fonts
 Priority: extra
 Build-Depends: cdbs, debhelper (= 7)
-Build-Depends-Indep: xfonts-utils, bzip2
+Build-Depends-Indep: xfonts-utils, bzip2, x11-xserver-utils
 Maintainer: Roberto Lumbreras ro...@debian.org
 Standards-Version: 3.8.2
 Homepage: http://linux.bytesex.org/xawtv/tvfonts.html


Bug#644921: uninstallable

2011-10-15 Thread Daniel T Chen
Package: tuxguitar
Version: 1.2-9.1
Followup-For: Bug #644921
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

For Debian sid, the attached patch can be applied to achieve the following:

  * debian/control: Add xulrunner-7.0 as an alternate dependency to
fix uninstallable package. (Closes: #644921)
  * debian/patches/01-tuxguitar-rzr.patch: Handle xulrunner-7.0.
  * debian/patches/03-CVE-2010-3385.patch: Refresh/rediff.


Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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 tuxguitar-1.2/debian/control tuxguitar-1.2/debian/control
--- tuxguitar-1.2/debian/control	2011-08-11 16:30:01.0 -0400
+++ tuxguitar-1.2/debian/control	2011-10-15 22:16:21.0 -0400
@@ -12,7 +12,7 @@
 Package: tuxguitar
 Architecture: all
 Section: sound
-Depends: default-jre | java2-runtime, libitext-java, libswt-gtk-3-java, libswt-cairo-gtk-3-jni, libswt-webkit-gtk-3-jni, xulrunner-6.0 | xulrunner-5.0 | xulrunner-1.9.1, ${misc:Depends}
+Depends: default-jre | java2-runtime, libitext-java, libswt-gtk-3-java, libswt-cairo-gtk-3-jni, libswt-webkit-gtk-3-jni, xulrunner-7.0 | xulrunner-6.0 | xulrunner-5.0 | xulrunner-1.9.1, ${misc:Depends}
 Recommends: tuxguitar-alsa (= ${source:Version}), tuxguitar-oss (= ${source:Version})
 Suggests: tuxguitar-jsa (= ${source:Version}), lilypond
 Description: Multitrack guitar tablature editor and player (gp3 to gp5)
diff -Nru tuxguitar-1.2/debian/patches/01-tuxguitar-rzr.patch tuxguitar-1.2/debian/patches/01-tuxguitar-rzr.patch
--- tuxguitar-1.2/debian/patches/01-tuxguitar-rzr.patch	2011-08-11 16:30:01.0 -0400
+++ tuxguitar-1.2/debian/patches/01-tuxguitar-rzr.patch	2011-10-15 22:36:27.0 -0400
@@ -1,5 +1,7 @@
 /dev/null
-+++ b/Makefile
+Index: tuxguitar-1.2/Makefile
+===
+--- /dev/null	1970-01-01 00:00:00.0 +
 tuxguitar-1.2/Makefile	2011-10-15 22:35:25.0 -0400
 @@ -0,0 +1,263 @@
 +#! /usr/bin/make -f
 +# -*- makefile -*-
@@ -264,8 +266,10 @@
 +../${snapshot_dir} ../${release_dir}:
 +	svn co ${scmroot} $@
 +
 a/misc/tuxguitar.sh
-+++ b/misc/tuxguitar.sh
+Index: tuxguitar-1.2/misc/tuxguitar.sh
+===
+--- tuxguitar-1.2.orig/misc/tuxguitar.sh	2011-10-15 22:35:24.0 -0400
 tuxguitar-1.2/misc/tuxguitar.sh	2011-10-15 22:36:20.0 -0400
 @@ -4,7 +4,7 @@
  #@Licence: LGPL
  #@Description: Wrapper script for starting java application tuxguitar
@@ -327,7 +331,7 @@
  file -L $f /dev/null 21 || f=
  echo $f
  }
-@@ -91,36 +94,51 @@
+@@ -91,36 +94,53 @@
  test -r $t/libxpcom.so  d=$t
  t=/usr/lib/xulrunner-1.9
  test -r $t/libxpcom.so  d=$t
@@ -337,6 +341,8 @@
 +test -r $t/libxpcom.so  d=$t
 +t=/usr/lib/xulrunner-6.0
 +test -r $t/libxpcom.so  d=$t
++t=/usr/lib/xulrunner-7.0
++test -r $t/libxpcom.so  d=$t
  echo $d
  }
  
@@ -385,7 +391,7 @@
  tuxguitar_()
  {
  local PACKAGE=${PACKAGE:=tuxguitar}
-@@ -140,11 +158,11 @@
+@@ -140,11 +160,11 @@
  [ -r $t ]  CLASSPATH=${CLASSPATH}:$t
  
  JAVA_FLAGS=${JAVA_FLAGS:=-Xms128m -Xmx128m}
@@ -402,7 +408,7 @@
  local arg=
  [ -z $1 ]  arg=/usr/share/tuxguitar/tuxguitar.tg
  # run java
-@@ -155,6 +173,7 @@
+@@ -155,6 +175,7 @@
  }
  
  # main
diff -Nru tuxguitar-1.2/debian/patches/03-CVE-2010-3385.patch tuxguitar-1.2/debian/patches/03-CVE-2010-3385.patch
--- tuxguitar-1.2/debian/patches/03-CVE-2010-3385.patch	2011-08-11 16:30:01.0 -0400
+++ tuxguitar-1.2/debian/patches/03-CVE-2010-3385.patch	2011-10-15 22:36:35.0 -0400
@@ -1,6 +1,8 @@
 a/misc/tuxguitar.sh
-+++ b/misc/tuxguitar.sh
-@@ -126,7 +126,7 @@
+Index: tuxguitar-1.2/misc/tuxguitar.sh
+===
+--- tuxguitar-1.2.orig/misc/tuxguitar.sh	2011-10-15 22:36:20.0 -0400
 tuxguitar-1.2/misc/tuxguitar.sh	2011-10-15 22:36:31.0 -0400
+@@ -131,7 +131,7 @@
  	 t=$(mozilla_guess_)  [ -d $t ]  MOZILLA_FIVE_HOME=$t
  if [ -d $MOZILLA_FIVE_HOME ] ; then
  export MOZILLA_FIVE_HOME


Bug#628590: make siggen depends on oss-compat

2011-10-15 Thread Daniel T Chen
Package: siggen
Version: 2.3.10-2
Followup-For: Bug #628590
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

In Debian sid, the attached patch can be applied to achieve the following:

  * debian/control: Depend on oss-compat to forestall confusing errors
due to missing /dev/dsp. (Closes: #628590)


Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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 siggen-2.3.10/debian/control siggen-2.3.10/debian/control
--- siggen-2.3.10/debian/control
+++ siggen-2.3.10/debian/control
@@ -9,7 +9,7 @@
 
 Package: siggen
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, oss-compat
 Description: Waveform generation tools
  a set of tools for imitating a laboratory Signal Generator,
  generating audio signals out of Linux's /dev/dsp audio device.  There


Bug#638379: fatal error: curl/types.h: No such file or directory

2011-10-14 Thread Daniel T Chen
Package: xine-ui
Version: 0.99.6-1
Followup-For: Bug #638379
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

In Ubuntu, the attached patch will be applied to achieve the following:

  * debian/patches/remove-deprecated-curl-typesh-easyh: Don't use long-
deprecated header files. Fixes FTBFS. (Closes: #638379)


Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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 xine-ui-0.99.6/debian/patches/remove-deprecated-curl-typesh-easyh xine-ui-0.99.6/debian/patches/remove-deprecated-curl-typesh-easyh
--- xine-ui-0.99.6/debian/patches/remove-deprecated-curl-typesh-easyh	1969-12-31 19:00:00.0 -0500
+++ xine-ui-0.99.6/debian/patches/remove-deprecated-curl-typesh-easyh	2011-10-14 08:45:16.0 -0400
@@ -0,0 +1,13 @@
+Index: xine-ui-0.99.6/src/xitk/download.c
+===
+--- xine-ui-0.99.6.orig/src/xitk/download.c	2011-10-14 08:45:13.0 -0400
 xine-ui-0.99.6/src/xitk/download.c	2011-10-14 08:45:11.0 -0400
+@@ -28,8 +28,6 @@
+ 
+ #ifdef HAVE_CURL
+ #include curl/curl.h
+-#include curl/types.h
+-#include curl/easy.h
+ #endif
+ 
+ #include common.h
diff -Nru xine-ui-0.99.6/debian/patches/series xine-ui-0.99.6/debian/patches/series
--- xine-ui-0.99.6/debian/patches/series	2010-03-20 13:18:46.0 -0400
+++ xine-ui-0.99.6/debian/patches/series	2011-10-14 08:45:46.0 -0400
@@ -1 +1,2 @@
 debian-changes
+remove-deprecated-curl-typesh-easyh


Bug#642116: debian/copyright misses copyright from source

2011-10-14 Thread Daniel T Chen
Package: xfishtank
Version: 2.2-25.1
Followup-For: Bug #642116
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

In Ubuntu, the attached patch will be applied to achieve the following:

  * debian/copyright: Add missing notices. (Closes: #642116)


Thanks for considering the patch.


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

Kernel: Linux 3.0.0-12-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 xfishtank-2.2/debian/copyright xfishtank-2.2/debian/copyright
--- xfishtank-2.2/debian/copyright
+++ xfishtank-2.2/debian/copyright
@@ -24,0 +25,47 @@
+
+vroot.h has this copyright:
+
+/**   Copyright 1991 by Andreas Stolcke **/
+/**   Copyright 1990 by Solbourne Computer Inc. **/
+/**  Longmont, Colorado **/
+/** **/
+/**   All Rights Reserved   **/
+/** **/
+/**Permission to use, copy, modify, and distribute this software and**/
+/**its documentation  for  any  purpose  and  without  fee is hereby**/
+/**granted, provided that the above copyright notice appear  in  all**/
+/**copies and that both  that  copyright  notice  and  this  permis-**/
+/**sion  notice appear in supporting  documentation,  and  that  the**/
+/**name of Solbourne not be used in advertising **/
+/**in publicity pertaining to distribution of the  software  without**/
+/**specific, written prior permission.  **/
+/** **/
+/**ANDREAS STOLCKE AND SOLBOURNE COMPUTER INC. DISCLAIMS ALL WARRANTIES **/
+/**WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF**/
+/**MERCHANTABILITY  AND  FITNESS,  IN  NO  EVENT SHALL ANDREAS STOLCKE  **/
+/**OR SOLBOURNE BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL**/
+/**DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA   **/
+/**OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER**/
+/**TORTIOUS ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE**/
+/**OR PERFORMANCE OF THIS SOFTWARE. **/
+
+README.TrueColor has this copyright:
+
+You may use, redistribute this version as long as you keep all the READMEs and
+copyright stuff with the code. This is to ensure credit goes to those deserve.
+After all, I did not write this code. I only add TrueColor support.
+
+There no warranty of any kind. Use this code at your own risk. Don't blame me
+for any damage it may cause. Bugfixes and comments are welcome.
+
+Enjoy,
+
+TJ Phan
+p...@aur.alcatel.com
+
+xfishtank.1x has this copyright:
+
+Copyright (c) 1988-92 (xfishtank)
+Jonathan Greenblatt
+Dave Lemke
+Eric Bina


  1   2   >