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 
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   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 
+Maintainer: Ubuntu Developers 
+Original-Maintainer: Debian Electronics Team 
 Uploaders: Hamish Moffatt , أحمد المحمودي (Ahmed El-Mahmoudy) 
 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-04 14:59:23.524607577 -0500
 @@ -12,7 +12,7 @@
  #define SCWM_GUILE_H__
  
@@ -19,8 +19,8 @@ Ind

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 
+Maintainer: Ubuntu Developers 
+XSBC-Original-Maintainer: Debian Science Maintainers 
 Uploaders: أحمد المحمودي (Ahmed El-Mahmoudy) ,
 	   Georges Khaznadar 
 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#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#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#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 
+Build-Depends: cdbs, debhelper ( >> 4.1.0 ), gfortran, libblas-dev, liblapack-dev, libarpack2-dev, chrpath, dh-autoreconf
+Maintainer: Ubuntu Developers 
+XSBC-Original-Maintainer: Debian Science Team 
 Uploaders: Christophe Prud'homme 
 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#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 
+##
+## 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#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 
+Maintainer: Ubuntu Developers 
+XSBC-Original-Maintainer: Gustavo Franco 
 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;
+ 
+ List* 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 
-Build-Depends: debhelper (>= 7.0.50~), javahelper (>=0.25)
+Maintainer: Ubuntu Developers 
+XSBC-Original-Maintainer: Javier Fernández-Sanguino Peña 
+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#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#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#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-rc-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 ,
 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: gnudata

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#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 -l

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 
 Build-Depends:
- debhelper (>= 7.0.50~)
+ debhelper (>= 7.0.50~), python
 Build-Depends-Indep:
  perl
 Standards-Version: 3.9.2


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#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#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 2>&1
 	fi
 }
 
 check_and_delete_group() {
 if [ X"`getent group $U`" != X ]; then
-groupdel --quiet $U || true
+groupdel $U >/dev/null 2>&1 || true
 fi
 }
 


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 
 
 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 2>&1
+ 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#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 
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: geda-gaf
+Upstream-Contact: Ales Hvezda and gEDA Contributors 
 Source: http://geda.seul.org
 
 Copyright: 1998-2010, Ales Hvezda and gEDA Contributors  (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 
2009, Peter Clifton 
2009, أحمد المحمودي (Ahmed El-Mahmoudy) 
 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#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#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#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#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 
 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#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#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#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 
 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" = x""yes; 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" = x""yes; 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-0

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#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#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 
 Uploaders: Paul J Stevens 
 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#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  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#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 
 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#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) 2>conftest.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) 2>&5
+-  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) 2>&5
+-  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#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#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_E

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 
-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; i\n\
 Shisen-sho for Win  by Shinji Ono \n\
 Picture by Takayuki Akiyama 
-diff -Nur xshisen-1.51.orig/lang/XShisen.ad.ja_JP.eucJP xshisen-1.51/lang/XShisen.ad.ja_JP.eucJP
 xshisen-1.51.orig/lang/XShisen.ad.ja_JP.eucJP
-+++ xshisen-1.51/lang/XShisen.ad.ja_JP.eucJP
+Index: xshisen-1.51/lang/XShisen.ad.ja_JP.eucJP
+===
+--- xshisen-1.51.orig/lang/XShisen.ad.ja_JP.eucJP	2011-10-21 18:12:57.0 -0400
 xshisen-1.51/lang/XShisen.ad.ja_JP.eucJP	2011-10-21 18:16:00.0 -0400
 @@ -1,7 +1,7 @@
  ! Common resources
  XShisen*connectLineColor: blue
@@ -200,9 +216,10 @@
   ?? for X11 by   \n\
 ?? for Win   by   \n\
 ??   by   
-diff -Nur xshisen-1.51.orig/lang/XShisen.ad.ja_JP xshisen-1.51/lang/XShisen.ad.ja_JP
 xshisen-1.51.orig/lang/XShisen.ad.ja_JP
-+++ xshisen-1.51/lang/XShisen.ad.ja_JP
+Index: xshisen-1.51/lang/XShisen.ad.ja_JP
+===
+--- xshisen-1.51.orig/lang/XShisen.ad.ja_JP	2011-10-21 18:12:57.0 -0400
 xshisen-1.51/lang/XShisen.ad.ja_JP	2011-10-21 18:16:00.0 -0400
 @@ -1,7 +1,7 @@
  ! Common resources
  XShisen*connectLineColor: blue
@@ -212,9 +229,10 @@
   ?? for X11 by   \n\
  

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 
 Uploaders: Michael Hanke , Yaroslav Halchenko 
-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 2>&1; 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 2>&1; then
+udevadm control --reload-rules
+udevadm trigger
+fi
+;;
+esac
 ;;
 
 *)


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#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#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-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#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#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 2>&1 || 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#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 
 Standards-Version: 3.8.2
 Homepage: http://linux.bytesex.org/xawtv/tvfonts.html


Bug#615795: ftbfs with gold or ld --no-add-needed

2011-10-14 Thread Daniel T Chen
Package: wwwoffle
Version: 2.9f-2.2
Followup-For: Bug #615795
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

In Ubuntu, the attached patch (courtesy of Roy Jamison
) was applied to achieve the following:

  * Explicitly linked -lgcrypt for binutils-gold, fixes the 
FTBFS (LP: #662986)


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 wwwoffle-2.9f/configure wwwoffle-2.9f/configure
--- wwwoffle-2.9f/configure
+++ wwwoffle-2.9f/configure
@@ -4490,7 +4490,7 @@
 else
if test "$WITH_GNUTLS" = "yes"; then
   GNUTLS_INC=
-  GNUTLS_LIB=-lgnutls
+  GNUTLS_LIB="-lgnutls -lgcrypt"
else
   GNUTLS_INC="$WITH_GNUTLS/include"
   GNUTLS_LIB="$WITH_GNUTLS/lib"


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


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 
+-#include 
+-#include 
+ #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#645054: Missing dependency on python-eggtrayicon

2011-10-12 Thread Daniel T Chen
Package: ccontrol
Version: 0.9.1+20071204-2
Followup-For: Bug #645054
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch

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

  * debian/control: Recommend python-eggtrayicon so that gccontrol is
usable. (Closes: #645054)


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 ccontrol-0.9.1+20071204/debian/control ccontrol-0.9.1+20071204/debian/control
--- ccontrol-0.9.1+20071204/debian/control
+++ ccontrol-0.9.1+20071204/debian/control
@@ -14,6 +15,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
  gcc, make, binutils, ccache
+Recommends: python-eggtrayicon
 Suggests: distcc
 XB-Python-Version: ${python:Versions}
 Description: Compilation controller


Bug#615691: ftbfs with gold or ld --no-add-needed

2011-10-12 Thread Daniel T Chen
Package: anytun
Version: 0.3.3-2.1
Followup-For: Bug #615691
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch

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

  * Forward patch from Ubuntu (courtesy of Ilya Barygin
) to resolve FTBFS. (Closes: #615691)


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 anytun-0.3.3/debian/changelog anytun-0.3.3/debian/changelog
only in patch2:
unchanged:
--- anytun-0.3.3.orig/src/configure
+++ anytun-0.3.3/src/configure
@@ -36,7 +36,7 @@
 EBUILD_COMPAT=0
 
 CXXFLAGS='-g -Wall -O2 -DLOG_SYSLOG -DLOG_FILE -DLOG_STDOUT'
-LDFLAGS='-g -Wall -O2 -lboost_thread -lboost_serialization -lboost_system -lboost_date_time'
+LDFLAGS='-g -Wall -O2 -lboost_thread -lboost_serialization -lboost_system -lboost_date_time -lpthread'
 
 CRYPTO_LIB='gcrypt'
 PASSPHRASE=1
@@ -230,7 +230,7 @@
 TARGET = $TARGET
 CXX = gcc
 CXXFLAGS = $CXXFLAGS
-LD = gcc
+LD = g++
 LDFLAGS = $LDFLAGS
 STRIP = strip
 INSTALL = install


Bug#640599: installation fails: chown: cannot access `/var/run/anon-proxy': No such file or directory

2011-10-12 Thread Daniel T Chen
Package: anon-proxy
Version: 00.05.38+20081230-2
Followup-For: Bug #640599
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch

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

  * debian/postinst: Don't pass --no-create-home to adduser, because
we attempt to chown a home directory in the next command, which
will fail if it's missing. (Closes: #640599)


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 anon-proxy-00.05.38+20081230/debian/postinst anon-proxy-00.05.38+20081230/debian/postinst
--- anon-proxy-00.05.38+20081230/debian/postinst
+++ anon-proxy-00.05.38+20081230/debian/postinst
@@ -40,7 +40,7 @@
 db_stop
 
 if ! getent passwd anon-proxy > /dev/null; then
-  adduser --quiet --system --no-create-home \
+  adduser --quiet --system \
 --home /var/run/anon-proxy anon-proxy || true
   chown anon-proxy:root /var/run/anon-proxy
 fi


Bug#603898: misses copyright information

2011-10-12 Thread Daniel T Chen
Package: adept
Version: 3.0~beta7.2+nmu1
Followup-For: Bug #603898
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch

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

  * debian/copyright: Update source location. (Closes: #603898)


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 adept-3.0~beta7.2+nmu1/debian/changelog adept-3.0~beta7.2+nmu1.1/debian/changelog
diff -Nru adept-3.0~beta7.2+nmu1/debian/copyright adept-3.0~beta7.2+nmu1.1/debian/copyright
--- adept-3.0~beta7.2+nmu1/debian/copyright	2009-08-03 11:55:53.0 -0400
+++ adept-3.0~beta7.2+nmu1.1/debian/copyright	2011-10-12 09:56:25.0 -0400
@@ -1,6 +1,8 @@
 This package was debianized by Enrico Zini  on
 Tue Nov  2 14:20:12 BRST 2004.
 
+It was downloaded from http://repos.mornfall.net/adept-3/
+
 The software is
 Copyright (C) 2004, 2005, 2006, 2007, 2008 Peter Rockai
 


Bug#615684: ftbfs with gcc-4.5 and gcc-4.6

2011-09-23 Thread Daniel T Chen
Package: qucs
Version: 0.0.15-1
Followup-For: Bug #615684
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch

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

  * Backport patch from Red Hat Bugzilla #631404 (cf.
https://bugzilla.redhat.com/attachment.cgi?id=511054) to disable
use of tr1 for complex functions. Fixes FTBFS. (LP: #756183)


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-11-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
--- qucs-0.0.15.orig/qucs-core/configure
+++ qucs-0.0.15/qucs-core/configure
@@ -6478,7 +6478,6 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include 
 using namespace std;
 using namespace std::tr1;
 int


Bug#640625: FTBFS: rm: cannot remove `debian/tmp/usr/lib/gtk-2.0/*/immodules/im-scim-bridge.a': No such file or directory

2011-09-22 Thread Daniel T Chen
Package: scim-bridge
Version: 0.4.16-2
Followup-For: Bug #640625
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch

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

  * debian/{rules,scim-bridge-client-gtk.install}: Use GTK+ multiarch
lib path. Fixes FTBFS. (LP: #832786) (Closes: #640625)


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-11-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u scim-bridge-0.4.16/debian/rules scim-bridge-0.4.16/debian/rules
--- scim-bridge-0.4.16/debian/rules
+++ scim-bridge-0.4.16/debian/rules
@@ -8,6 +8,7 @@
 # from having to guess our platform (since we know it already)
 export DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+export DEB_HOST_MULTIARCH  ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 ONFFLAGS =
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
@@ -75,8 +76,8 @@
 	# Add here commands to install the package into debian/scim-bridge.
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	chrpath -d debian/tmp/usr/bin/scim-bridge
-	rm debian/tmp/usr/lib/gtk-2.0/*/immodules/im-scim-bridge.a
-	rm debian/tmp/usr/lib/gtk-2.0/*/immodules/im-scim-bridge.la
+	rm debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gtk-2.0/*/immodules/im-scim-bridge.a
+	rm debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gtk-2.0/*/immodules/im-scim-bridge.la
 	rm debian/tmp/usr/lib/qt3/plugins/inputmethods/im-scim-bridge.a
 	rm debian/tmp/usr/lib/qt3/plugins/inputmethods/im-scim-bridge.la
 	rm debian/tmp/usr/lib/qt4/plugins/inputmethods/im-scim-bridge.a
diff -u scim-bridge-0.4.16/debian/scim-bridge-client-gtk.install scim-bridge-0.4.16/debian/scim-bridge-client-gtk.install
--- scim-bridge-0.4.16/debian/scim-bridge-client-gtk.install
+++ scim-bridge-0.4.16/debian/scim-bridge-client-gtk.install
@@ -1 +1 @@
-usr/lib/gtk-2.0/*/immodules/im-scim-bridge.so
+usr/lib/*/gtk-2.0/*/immodules/im-scim-bridge.so


Bug#642139: ftbfs from source in unstable

2011-09-21 Thread Daniel T Chen
Package: pcx
Version: 1.1.18-2
Followup-For: Bug #642139
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch

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

  * MAKEARCH/linux.make: Don't link nullmain.o; it only serves to
duplicate an existing main routine and thus breaks the build.
Not linking it fixes the FTBFS. (LP: #756001)


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-11-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
only in patch2:
unchanged:
--- pcx-1.1.18.orig/MAKEARCH/linux.make
+++ pcx-1.1.18/MAKEARCH/linux.make
@@ -1,3 +1,3 @@
 RANLIB   = ranlib
 
-MISC_OBJS = nullmain.o
+#MISC_OBJS = nullmain.o


Bug#625678: FTBFS: some symbols or patterns disappeared in the symbols file

2011-09-19 Thread Daniel T Chen
Package: setools
Version: 3.3.6.ds-7.2
Tags: patch
Followup-For: Bug #625678
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch

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

  * debian/libsefs4.symbols.*: Update for removed symbol. Fixes FTBFS.
(LP: #802949) (Closes: #625678)


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-11-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u setools-3.3.6.ds/debian/libsefs4.symbols.mips setools-3.3.6.ds/debian/libsefs4.symbols.mips
--- setools-3.3.6.ds/debian/libsefs4.symbols.mips
+++ setools-3.3.6.ds/debian/libsefs4.symbols.mips
@@ -86,17 +86,17 @@
  _ZTI11sefs_fclist@VERS_4.0 3.3.4.ds
  _ZTI15sefs_filesystem@VERS_4.0 3.3.4.ds
  _ZTI7sefs_db@VERS_4.0 3.3.4.ds
- _ZTISt16invalid_argument@VERS_4.0 3.3.4.ds
+#MISSING: 3.3.6.ds-7.2# _ZTISt16invalid_argument@VERS_4.0 3.3.4.ds
  _ZTS11sefs_fcfile@VERS_4.0 3.3.4.ds
  _ZTS11sefs_fclist@VERS_4.0 3.3.4.ds
  _ZTS15sefs_filesystem@VERS_4.0 3.3.4.ds
  _ZTS7sefs_db@VERS_4.0 3.3.4.ds
- _ZTSSt16invalid_argument@VERS_4.0 3.3.4.ds
+#MISSING: 3.3.6.ds-7.2# _ZTSSt16invalid_argument@VERS_4.0 3.3.4.ds
  _ZTV11sefs_fcfile@VERS_4.0 3.3.4.ds
  _ZTV11sefs_fclist@VERS_4.0 3.3.4.ds
  _ZTV15sefs_filesystem@VERS_4.0 3.3.4.ds
  _ZTV7sefs_db@VERS_4.0 3.3.4.ds
- _ZTVSt16invalid_argument@VERS_4.0 3.3.4.ds
+#MISSING: 3.3.6.ds-7.2# _ZTVSt16invalid_argument@VERS_4.0 3.3.4.ds
  libsefs_get_version@VERS_4.0 3.3.4.ds
  sefs_db_create_from_file@VERS_4.0 3.3.4.ds
  sefs_db_create_from_filesystem@VERS_4.0 3.3.4.ds
diff -u setools-3.3.6.ds/debian/libsefs4.symbols.s390 setools-3.3.6.ds/debian/libsefs4.symbols.s390
--- setools-3.3.6.ds/debian/libsefs4.symbols.s390
+++ setools-3.3.6.ds/debian/libsefs4.symbols.s390
@@ -86,17 +86,17 @@
  _ZTI11sefs_fclist@VERS_4.0 3.3.4.ds
  _ZTI15sefs_filesystem@VERS_4.0 3.3.4.ds
  _ZTI7sefs_db@VERS_4.0 3.3.4.ds
- _ZTISt16invalid_argument@VERS_4.0 3.3.4.ds
+#MISSING: 3.3.6.ds-7.2# _ZTISt16invalid_argument@VERS_4.0 3.3.4.ds
  _ZTS11sefs_fcfile@VERS_4.0 3.3.4.ds
  _ZTS11sefs_fclist@VERS_4.0 3.3.4.ds
  _ZTS15sefs_filesystem@VERS_4.0 3.3.4.ds
  _ZTS7sefs_db@VERS_4.0 3.3.4.ds
- _ZTSSt16invalid_argument@VERS_4.0 3.3.4.ds
+#MISSING: 3.3.6.ds-7.2# _ZTSSt16invalid_argument@VERS_4.0 3.3.4.ds
  _ZTV11sefs_fcfile@VERS_4.0 3.3.4.ds
  _ZTV11sefs_fclist@VERS_4.0 3.3.4.ds
  _ZTV15sefs_filesystem@VERS_4.0 3.3.4.ds
  _ZTV7sefs_db@VERS_4.0 3.3.4.ds
- _ZTVSt16invalid_argument@VERS_4.0 3.3.4.ds
+#MISSING: 3.3.6.ds-7.2# _ZTVSt16invalid_argument@VERS_4.0 3.3.4.ds
  libsefs_get_version@VERS_4.0 3.3.4.ds
  sefs_db_create_from_file@VERS_4.0 3.3.4.ds
  sefs_db_create_from_filesystem@VERS_4.0 3.3.4.ds
diff -u setools-3.3.6.ds/debian/libsefs4.symbols.arm setools-3.3.6.ds/debian/libsefs4.symbols.arm
--- setools-3.3.6.ds/debian/libsefs4.symbols.arm
+++ setools-3.3.6.ds/debian/libsefs4.symbols.arm
@@ -86,17 +86,17 @@
  _ZTI11sefs_fclist@VERS_4.0 3.3.4.ds
  _ZTI15sefs_filesystem@VERS_4.0 3.3.4.ds
  _ZTI7sefs_db@VERS_4.0 3.3.4.ds
- _ZTISt16invalid_argument@VERS_4.0 3.3.4.ds
+#MISSING: 3.3.6.ds-7.2# _ZTISt16invalid_argument@VERS_4.0 3.3.4.ds
  _ZTS11sefs_fcfile@VERS_4.0 3.3.4.ds
  _ZTS11sefs_fclist@VERS_4.0 3.3.4.ds
  _ZTS15sefs_filesystem@VERS_4.0 3.3.4.ds
  _ZTS7sefs_db@VERS_4.0 3.3.4.ds
- _ZTSSt16invalid_argument@VERS_4.0 3.3.4.ds
+#MISSING: 3.3.6.ds-7.2# _ZTSSt16invalid_argument@VERS_4.0 3.3.4.ds
  _ZTV11sefs_fcfile@VERS_4.0 3.3.4.ds
  _ZTV11sefs_fclist@VERS_4.0 3.3.4.ds
  _ZTV15sefs_filesystem@VERS_4.0 3.3.4.ds
  _ZTV7sefs_db@VERS_4.0 3.3.4.ds
- _ZTVSt16invalid_argument@VERS_4.0 3.3.4.ds
+#MISSING: 3.3.6.ds-7.2# _ZTVSt16invalid_argument@VERS_4.0 3.3.4.ds
  libsefs_get_version@VERS_4.0 3.3.4.ds
  sefs_db_create_from_file@VERS_4.0 3.3.4.ds
  sefs_db_create_from_filesystem@VERS_4.0 3.3.4.ds
diff -u setools-3.3.6.ds/debian/libsefs4.symbols.i386 setools-3.3.6.ds/debian/libsefs4.symbols.i386
--- setools-3.3.6.ds/debian/libsefs4.symbols.i386
+++ setools-3.3.6.ds/debian/libsefs4.symbols.i386
@@ -86,17 +86,17 @@
  _ZTI11sefs_fclist@VERS_4.0 3.3.4.ds
  _ZTI15sefs_filesystem@VERS_4.0 3.3.4.ds
  _ZTI7sefs_db@VERS_4.0 3.3.4.ds
- _ZTISt16invalid_argument@VERS_4.0 3.3.4.ds
+#MISSING: 3.3.6.ds-7.2# _ZTISt16invalid_argument@VERS_4.0 3.3.4.ds
  _ZTS11sefs_fcfile@VERS_4.0 3.3.4.ds
  _ZTS11sefs_fclist@VERS_4.0 3.3.4.ds
  _ZTS15sefs_filesystem@VERS_4.0 3.3.4.ds
  _ZTS7sefs_db@VERS_4.0 3.3.4.ds
- _ZTSSt16invalid_argument@VERS_4.0 3.3.4.ds
+#MISSING: 3.3.6.ds-7.2# _ZTSSt16invalid_argument@VERS_4.0 3.3.4.ds
  _ZTV11sefs_fcfile@VERS_4.0 3.3.4.ds
  _ZTV11sefs_fclist@VERS_4.0 3.3.4.ds
  _ZTV15sefs_filesystem@VERS_4.0 3.3.4.ds
  _ZTV7sefs_db@VERS_4.0 3.3.4.ds
- _ZTVSt16invalid_argument@VERS_4.0 3.3.4.ds
+#MISSING: 3.3.6.ds-7.2

Bug#624965: FTBFS: BulletSoftBody/btSoftBodyInternals.h:175:17: error: uninitialized const 'zerodummy' [-fpermissive]

2011-09-14 Thread Daniel T Chen
Package: critterding
Version: 1.0-beta12.1-1
Tags: patch
Followup-For: Bug #624965
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch

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

  * Add:
- 10uninitialized_constant
- 11const_cast
Fixes FTBFS. (LP: #770902) (Closes: #624965)


Both patches are backported from upstream svn and are necessary to
resolve FTBFS with g++-4.6. 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-11-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru critterding-1.0-beta12.1/debian/patches/10uninitialized_constant critterding-1.0-beta12.1/debian/patches/10uninitialized_constant
--- critterding-1.0-beta12.1/debian/patches/10uninitialized_constant	1969-12-31 19:00:00.0 -0500
+++ critterding-1.0-beta12.1/debian/patches/10uninitialized_constant	2011-09-15 00:02:14.0 -0400
@@ -0,0 +1,33 @@
+Description: Fix g++-4.6 error by initializing T
+Origin: upstream, http://bullet.googlecode.com/issues/attachment?aid=-7554332888653313858&name=zero_initialize.patch&token=a4c807e33cfb4fe1bb62cf5b13bb1be9, committed r935 in upstream svn
+Bug: http://code.google.com/p/bullet/issues/detail?id=481
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=624965
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/critterding/+bug/770902
+Forwarded: not-needed
+Author: Erwin Coumans 
+Reviewed-by: Daniel T Chen 
+Last-Updated: 2011-09-14
+
+Index: critterding-1.0-beta12.1/src/utils/bullet/BulletSoftBody/btSoftBodyInternals.h
+===
+--- critterding-1.0-beta12.1.orig/src/utils/bullet/BulletSoftBody/btSoftBodyInternals.h	2011-09-14 23:18:36.0 -0400
 critterding-1.0-beta12.1/src/utils/bullet/BulletSoftBody/btSoftBodyInternals.h	2011-09-14 23:19:13.0 -0400
+@@ -25,7 +25,7 @@
+ #include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
+ #include "BulletCollision/CollisionShapes/btConvexInternalShape.h"
+ #include "BulletCollision/NarrowPhaseCollision/btGjkEpa2.h"
+-
++#include  //for memset
+ //
+ // btSymMatrix
+ //
+@@ -172,8 +172,7 @@
+ template 
+ static inline void			ZeroInitialize(T& value)
+ {
+-	static const T	zerodummy;
+-	value=zerodummy;
++	memset(&value,0,sizeof(T));
+ }
+ //
+ template 
diff -Nru critterding-1.0-beta12.1/debian/patches/11const_cast critterding-1.0-beta12.1/debian/patches/11const_cast
--- critterding-1.0-beta12.1/debian/patches/11const_cast	1969-12-31 19:00:00.0 -0500
+++ critterding-1.0-beta12.1/debian/patches/11const_cast	2011-09-15 00:03:43.0 -0400
@@ -0,0 +1,20 @@
+Description: Fix missing const parameter with g++-4.5
+Origin: upstream, committed r1123 in upstream svn
+Forwarded: not-needed
+Author: Daniel T Chen 
+Reviewed-by: Daniel T Chen 
+Last-Updated: 2011-09-15
+
+Index: critterding-1.0-beta12.1/src/scenes/evolution.cpp
+===
+--- critterding-1.0-beta12.1.orig/src/scenes/evolution.cpp	2011-09-14 23:39:17.0 -0400
 critterding-1.0-beta12.1/src/scenes/evolution.cpp	2011-09-14 23:39:38.0 -0400
+@@ -297,7 +297,7 @@
+ 	}
+ 	else if ( world->mouseRayHitEntity->type == 0 )
+ 	{
+-		CritterB* c = static_cast(world->mouseRayHitEntity);
++		const CritterB* c = static_cast(world->mouseRayHitEntity);
+ 		Textprinter::Instance()->print( oldx+margin, oldy,"critter");
+ 		Textprinter::Instance()->print(oldx+rmargindistance, oldy, "%1i", c->critterID);
+ 		Textprinter::Instance()->print( oldx+margin, oldy+vspacer, "energy");
diff -Nru critterding-1.0-beta12.1/debian/patches/series critterding-1.0-beta12.1/debian/patches/series
--- critterding-1.0-beta12.1/debian/patches/series	2010-03-17 21:01:25.0 -0400
+++ critterding-1.0-beta12.1/debian/patches/series	2011-09-14 23:39:04.0 -0400
@@ -1 +1,3 @@
 00fontandiconpath
+10uninitialized_constant
+11const_cast


Bug#628256: FTBFS: g++: error: unrecognized option '--export_dynamic'

2011-09-13 Thread Daniel T Chen
Package: boinc-app-milkyway
Version: 0.18d-1
Followup-For: Bug #628256
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch

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

  * bin/make.linux: Correct syntax that broke the build. Fixes FTBFS.
(LP: #765947)


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-11-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u boinc-app-milkyway-0.18d/debian/changelog boinc-app-milkyway-0.18d/debian/changelog
diff -u boinc-app-milkyway-0.18d/bin/make.linux boinc-app-milkyway-0.18d/bin/make.linux
--- boinc-app-milkyway-0.18d/bin/make.linux
+++ boinc-app-milkyway-0.18d/bin/make.linux
@@ -12,7 +12,7 @@
 	-I$(BOINC_DIR)
 CXX := g++
 #LDFLAGS := -Wl -static -static-libgcc
-LDFLAGS := -Wl --export_dynamic
+LDFLAGS := -Wl,--export-dynamic
 
 ifeq ($(ARCH),i686)
 CXXFLAGS += -m32


Bug#625079: FTBFS: ../../src/tools/tDirectories.cpp:502:26: error: uninitialized const 'st_Config' [-fpermissive]

2011-08-29 Thread Daniel T Chen
Package: armagetronad
Version: 0.2.8.3.1-1
Followup-For: Bug #625079
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch

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

  * Add 01_g++-4.6: Apply upstream r1275 to resolve FTBFS.
(Closes: #625079) (LP: #765939)


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-9-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru armagetronad-0.2.8.3.1/debian/patches/01_g++-4.6 armagetronad-0.2.8.3.1/debian/patches/01_g++-4.6
--- armagetronad-0.2.8.3.1/debian/patches/01_g++-4.6	1969-12-31 19:00:00.0 -0500
+++ armagetronad-0.2.8.3.1/debian/patches/01_g++-4.6	2011-08-29 20:51:29.0 -0400
@@ -0,0 +1,70 @@
+Description: Add ctors to resolve FTBFS with g++-4.6
+Forwarded: not-needed
+Author: Daniel Lee Harple
+Applied-upstream: http://bazaar.launchpad.net/~armagetronad-dev/armagetronad/0.2.8-armagetronad-work/revision/1275
+Reviewed-by: Daniel T Chen 
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/armagetronad/+bug/765939
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=625079
+Last-update: 2011-08-29
+
+Index: armagetronad-0.2.8.3.1/src/tools/tDirectories.cpp
+===
+--- armagetronad-0.2.8.3.1.orig/src/tools/tDirectories.cpp	2011-08-29 20:36:00.0 -0400
 armagetronad-0.2.8.3.1/src/tools/tDirectories.cpp	2011-08-29 20:36:21.0 -0400
+@@ -474,6 +474,7 @@
+ class tPathConfig: public tPath
+ {
+ public:
++tPathConfig() {}
+ private:
+ void Paths ( tArray< tString >& paths ) const
+ {
+@@ -505,6 +506,7 @@
+ class tPathData: public tPath
+ {
+ public:
++tPathData() {}
+ private:
+ void Paths ( tArray< tString >& paths ) const
+ {
+@@ -526,6 +528,7 @@
+ class tPathVar: public tPath
+ {
+ public:
++tPathVar() {}
+ private:
+ void Paths ( tArray< tString >& paths ) const
+ {
+@@ -552,6 +555,7 @@
+ class tPathScreenshot: public tPath
+ {
+ public:
++tPathScreenshot() {}
+ private:
+ void Paths ( tArray< tString >& paths ) const
+ {
+Index: armagetronad-0.2.8.3.1/src/tools/tDirectories.h
+===
+--- armagetronad-0.2.8.3.1.orig/src/tools/tDirectories.h	2011-08-29 20:36:00.0 -0400
 armagetronad-0.2.8.3.1/src/tools/tDirectories.h	2011-08-29 20:36:21.0 -0400
+@@ -58,6 +58,7 @@
+ 
+ class tPathResource: public tPath {
+ public:
++tPathResource() {}
+ tString GetWritePath(const char *filename) const;
+ tString GetIncluded() const; //!< returns the path to the included resources
+ private:
+Index: armagetronad-0.2.8.3.1/src/tools/tList.h
+===
+--- armagetronad-0.2.8.3.1.orig/src/tools/tList.h	2011-08-29 20:36:00.0 -0400
 armagetronad-0.2.8.3.1/src/tools/tList.h	2011-08-29 20:36:21.0 -0400
+@@ -149,7 +149,7 @@
+ }
+ (*this)[this->Len()-1] = NULL;
+ 
+-SetLen(this->Len()-1);
++this->SetLen(this->Len()-1);
+ 
+ if ( REFERENCE )
+ {
diff -Nru armagetronad-0.2.8.3.1/debian/patches/series armagetronad-0.2.8.3.1/debian/patches/series
--- armagetronad-0.2.8.3.1/debian/patches/series	2010-03-12 00:19:03.0 -0500
+++ armagetronad-0.2.8.3.1/debian/patches/series	2011-08-29 20:53:18.0 -0400
@@ -1 +1,2 @@
 #
+01_g++-4.6


Bug#621964: FTBFS: video.c:25:28: fatal error: linux/videodev.h: No such file or directory

2011-08-29 Thread Daniel T Chen
Package: linuxtv-dvb-apps
Version: 1.1.1+rev1355-1
Followup-For: Bug #621964
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch

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

  * Remove legacy test app as per upstream hg changeset 1424 to resolve
FTBFS. (Closes: #621964) (LP: #756224)

The previous patch for videodev2.h that I submitted is bunk; please
ignore it. Sorry for the hassle.

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-9-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u linuxtv-dvb-apps-1.1.1+rev1355/debian/patches/00list linuxtv-dvb-apps-1.1.1+rev1355/debian/patches/00list
--- linuxtv-dvb-apps-1.1.1+rev1355/debian/patches/00list
+++ linuxtv-dvb-apps-1.1.1+rev1355/debian/patches/00list
@@ -3,0 +4 @@
+17_ftbfs_gcc4.6
only in patch2:
unchanged:
--- linuxtv-dvb-apps-1.1.1+rev1355.orig/debian/patches/17_ftbfs_gcc4.6
+++ linuxtv-dvb-apps-1.1.1+rev1355/debian/patches/17_ftbfs_gcc4.6
@@ -0,0 +1,205 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 17_ftbfs_gcc4.6 by Daniel T Chen 
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Upstream removed the legacy test app in hg changeset 1424.
+## DP: Follow suit to fix FTBFS (Closes: #621964)
+
+@DPATCH@
+diff -r 3c14666ebdcc -r e5745959ca83 test/Makefile
+--- a/test/Makefile	Sun Apr 03 10:57:58 2011 -0300
 b/test/Makefile	Sun Apr 03 11:05:32 2011 -0300
+@@ -20,7 +20,6 @@
+test_vevent \
+test_video  \
+ 	   evtest	   \
+-	   video	   \
+ 	   szap2
+ 
+ .PHONY: all
+diff -r 3c14666ebdcc -r e5745959ca83 test/video.c
+--- a/test/video.c	Sun Apr 03 10:57:58 2011 -0300
 /dev/null	Thu Jan 01 00:00:00 1970 +
+@@ -1,182 +0,0 @@
+-#define USAGE \
+-"\n" \
+-"\n A tiny video watching application, just starts capturing /dev/video" \
+-"\n into /dev/fb0." \
+-"\n Be shure to have >8Bit/pixel color resolution and r/w access for " \
+-"\n /dev/video0, /dev/fb0 and /dev/tty0 to let this work..." \
+-"\n" \
+-"\n  compile with" \
+-"\n" \
+-"\n  $ gcc -g -Wall -O2 -o video video.c -I../../ost/include" \
+-"\n"
+-
+-#include 
+-#include 
+-#include 
+-#include 
+-#include 
+-#include 
+-#include 
+-#include 
+-#include 
+-#include 
+-
+-#include 
+-#include 
+-
+-#define VIDEO_DEV "/dev/video0"
+-#define FB_DEV "/dev/fb0"
+-#define VT_DEV "/dev/tty0"
+-
+-static char *video_devname = VIDEO_DEV;
+-
+-#define min(a,b)	(a) < (b) ? (a) : (b)
+-
+-static int zero = 0;
+-static int one = 1;
+-
+-static struct fb_var_screeninfo fb_var;
+-static struct fb_fix_screeninfo fb_fix;
+-
+-
+-int init_fb (void)
+-{
+-	const char blankoff_str[] = "\033[9;0]";
+-	int fd, vt_fd;
+-
+-	fd = open (FB_DEV, O_RDWR);
+-	if (fd < 0) {
+-		perror("Could not open " FB_DEV ", please check permissions\n");
+-		return 1;
+-	}
+-
+-	if ((vt_fd = open( VT_DEV, O_RDWR )) < 0) {
+-		perror("Could not open " VT_DEV ", please check permissions\n");
+-		return 1;
+-	}
+-
+-	write( vt_fd, blankoff_str, strlen(blankoff_str) );
+-
+-	if (ioctl (fd, FBIOGET_VSCREENINFO, &fb_var) < 0) {
+-		perror("Could not get variable screen information (fb_var)\n");
+-		return 1;
+-	}
+-
+-	if (ioctl (fd, FBIOGET_FSCREENINFO, &fb_fix) < 0) {
+-		perror("Could not get fixed screen information (fb_fix)\n");
+-		return 1;
+-	}
+-
+-	close (fd);
+-	return 0;
+-}
+-
+-
+-int init_video (int stop)
+-{
+-	int fd;
+-	struct video_capability vcap;
+-
+-	if ((fd = open (video_devname, O_RDWR)) < 0) {
+-		fprintf (stderr,
+-			 "%s: Could not open %s, please check permissions\n",
+-			 __FUNCTION__, video_devname);
+-		return -1;
+-	}
+-
+-	ioctl(fd, VIDIOCGCAP, &vcap);
+-
+-	if (ioctl(fd, VIDIOCCAPTURE, &zero) < 0) {
+-		perror("Could not stop capturing (VIDIOCCAPTURE failed)\n");
+-		return -2;
+-	}
+-
+-	if (stop)
+-		return 0;
+-
+-	{
+-		struct video_buffer b;
+-		b.base = (void*) fb_fix.smem_start;
+-		b.width = fb_var.xres;
+-		b.height = fb_var.yres;
+-		b.depth = fb_var.bits_per_pixel;
+-		b.bytesperline = fb_var.xres*((fb_var.bits_per_pixel+7)/8);
+-		if (ioctl(fd, VIDIOCSFBUF, &b) < 0) {
+-			fprintf(stderr, "VIDIOCSFBUF failed, must run as root?\n");
+-			return -3;
+-		}
+-	}
+-
+-	{
+-		struct video_picture p;
+-		if (ioctl(fd, VIDIOCGPICT, &p) < 0) {
+-			perror("VIDIOCGPICT failed\n");
+-			return -4;
+-		}
+-		p.depth = fb_var.bits_per_

Bug#621964: FTBFS: video.c:25:28: fatal error: linux/videodev.h: No such file or directory

2011-08-29 Thread Daniel T Chen
Package: linuxtv-dvb-apps
Version: 1.1.1+rev1355-1
Followup-For: Bug #621964
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch

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

  * Update preprocessor directive in test/video.c with new filename to
resolve FTBFS. (Closes: #621964) (LP: #756224)


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-9-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u linuxtv-dvb-apps-1.1.1+rev1355/debian/patches/00list linuxtv-dvb-apps-1.1.1+rev1355/debian/patches/00list
--- linuxtv-dvb-apps-1.1.1+rev1355/debian/patches/00list
+++ linuxtv-dvb-apps-1.1.1+rev1355/debian/patches/00list
@@ -3,0 +4 @@
+17_ftbfs_gcc4.6
only in patch2:
unchanged:
--- linuxtv-dvb-apps-1.1.1+rev1355.orig/debian/patches/17_ftbfs_gcc4.6
+++ linuxtv-dvb-apps-1.1.1+rev1355/debian/patches/17_ftbfs_gcc4.6
@@ -0,0 +1,12 @@
+diff -Nur -x '*.orig' -x '*~' linuxtv-dvb-apps-1.1.1+rev1355//test/video.c linuxtv-dvb-apps-1.1.1+rev1355.new//test/video.c
+--- linuxtv-dvb-apps-1.1.1+rev1355//test/video.c	2010-02-14 07:21:19.0 -0500
 linuxtv-dvb-apps-1.1.1+rev1355.new//test/video.c	2011-08-29 07:18:06.0 -0400
+@@ -22,7 +22,7 @@
+ #include 
+ 
+ #include 
+-#include 
++#include 
+ 
+ #define VIDEO_DEV "/dev/video0"
+ #define FB_DEV "/dev/fb0"


Bug#403542: python-mutagen: Does not write syncsafe datalen flags

2006-12-30 Thread Daniel T. Chen
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

It's SVN changeset 3966[0].

[0] http://sacredchao.net/quodlibet/changeset/3966

Thanks,
- --
Daniel T. Chen[EMAIL PROTECTED]
GPG key:  0xC88ABDA3
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFFlvq7e9GwFciKvaMRAp5VAJ40YTRB0ReAvdFKVZrg4H0a3jmxIQCgki0E
7UMb0DWHRT6wnzMSHMK1FXU=
=jEs6
-END PGP SIGNATURE-


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Bug#372649: ivtools: FTBFS: dh_movefiles: debian/tmp/usr/lib/libIV.so.1 not found

2006-07-25 Thread Daniel T. Chen
Using a shell other than bash will trigger the bug for this report. 
pushd/popd are the culprits in config/site.def.DEBIAN.


Thanks,
--
Daniel T. Chen[EMAIL PROTECTED]
GPG key:   www.sh.nu/~crimsun/pubkey.gpg.asc


--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]