Package: dmucs
Version: 0.6.1-2.1
Severity: wishlist
Tags: patch
I've just uploaded to the 5 day delayed queue a NMU to solve all open
bugs against this package. Here is the patch used in my NMU.
Using dpatch for the new patch caused a lot of new lintian warnings to
show up about changes done directly in the diff, but I did not want to
change too much of the packaging so I left this as it was.
diff -u dmucs-0.6.1/debian/changelog dmucs-0.6.1/debian/changelog
--- dmucs-0.6.1/debian/changelog
+++ dmucs-0.6.1/debian/changelog
@@ -1,3 +1,16 @@
+dmucs (0.6.1-2.1) unstable; urgency=low
+
+ * Non-maintainer upload to fix release goal.
+ * Add missing init.d script dependencies (Closes: #541382).
+ * Add watch file from Ubuntu (Closes: #559211).
+ * Make sure to remove config.log in clean target. Thanks to lintian
+ for discovering the problem.
+ * Add 01_fix_FTBFS_vsprintf.dpatch to fix build problem on alpha and
+ sh4 by making sure va_list is used (Closes: #519824). Add dpatch
+ support to apply this patch. Patch fromNobuhiro Iwamatsu.
+
+ -- Petter Reinholdtsen <p...@debian.org> Mon, 22 Mar 2010 17:04:23 +0100
+
dmucs (0.6.1-2) unstable; urgency=low
* fix amd64 build (Closes: #471187)
diff -u dmucs-0.6.1/debian/rules dmucs-0.6.1/debian/rules
--- dmucs-0.6.1/debian/rules
+++ dmucs-0.6.1/debian/rules
@@ -5,6 +5,7 @@
+include /usr/share/cdbs/1/rules/dpatch.mk
install/dmucs::
cp remhost addhost
clean::
- rm -f addhost
+ rm -f addhost config.log
diff -u dmucs-0.6.1/debian/control dmucs-0.6.1/debian/control
--- dmucs-0.6.1/debian/control
+++ dmucs-0.6.1/debian/control
@@ -2,7 +2,7 @@
Section: devel
Priority: extra
Maintainer: Sam Clegg <s...@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), autotools-dev
+Build-Depends: cdbs, debhelper (>= 5), autotools-dev, dpatch
Standards-Version: 3.8.0
Package: dmucs
diff -u dmucs-0.6.1/debian/init dmucs-0.6.1/debian/init
--- dmucs-0.6.1/debian/init
+++ dmucs-0.6.1/debian/init
@@ -2,8 +2,8 @@
### BEGIN INIT INFO
# Provides: dmucs
# Should-Start: loadavg
-# Required-Start:
-# Required-Stop:
+# Required-Start: $remote_fs
+# Required-Stop: $remote_fs
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: <Enter a short description of the sortware>
only in patch2:
unchanged:
--- dmucs-0.6.1.orig/debian/watch
+++ dmucs-0.6.1/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/dmucs/dmucs-(.*)\.tar\.bz2
only in patch2:
unchanged:
--- dmucs-0.6.1.orig/debian/patches/00list
+++ dmucs-0.6.1/debian/patches/00list
@@ -0,0 +1 @@
+01_fix_FTBFS_vsprintf.dpatch
only in patch2:
unchanged:
--- dmucs-0.6.1.orig/debian/patches/01_fix_FTBFS_vsprintf.dpatch
+++ dmucs-0.6.1/debian/patches/01_fix_FTBFS_vsprintf.dpatch
@@ -0,0 +1,46 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_build_fail.dpatch by Nobuhiro Iwamatsu <iwama...@nigauri.org>
+##
+## DP: FTBFS : incompatible type for argument 3 of 'vsprintf'
+## DP: BTS #519824
+
+...@dpatch@
+diff -urNad dmucs-0.6.1~/COSMIC/HDR/sockets.h dmucs-0.6.1/COSMIC/HDR/sockets.h
+--- dmucs-0.6.1~/COSMIC/HDR/sockets.h 2009-08-17 13:27:29.000000000 +0900
++++ dmucs-0.6.1/COSMIC/HDR/sockets.h 2009-08-17 15:24:06.000000000 +0900
+@@ -437,7 +437,7 @@
+ int Sscanf(Socket *,char *,...);
/* Sscanf.c */
+ int Stest(Socket *);
/* Stest.c */
+ int Stimeoutwait(Socket *,long,long);
/* Stimeoutwait.c */
+-int Svprintf( Socket *, char *, void *);
/* Svprintf.c */
++int Svprintf( Socket *, char *, va_list);
/* Svprintf.c */
+ int Swait(Socket *);
/* Swait.c */
+ int Swrite( Socket *, const void *, int);
/* Swrite.c */
+ #else
+diff -urNad dmucs-0.6.1~/COSMIC/Svprintf.c dmucs-0.6.1/COSMIC/Svprintf.c
+--- dmucs-0.6.1~/COSMIC/Svprintf.c 2009-08-17 14:56:53.000000000 +0900
++++ dmucs-0.6.1/COSMIC/Svprintf.c 2009-08-17 15:23:04.000000000 +0900
+@@ -33,12 +33,12 @@
+ int Svprintf(
+ Socket *skt,
+ char *fmt,
+- void *args)
++ va_list args)
+ #else
+ int Svprintf(skt,fmt,args)
+ Socket *skt;
+ char *fmt;
+-void *args;
++va_list args;
+ #endif
+ {
+ int ret;
+@@ -53,7 +53,7 @@
+ #ifdef AS400
+ ret= vsprintf(buf,fmt,__va_list args);
+ #else
+-ret= vsprintf(buf,fmt,(void*) args);
++ret= vsprintf(buf,fmt,args);
+ #endif
+ Swrite(skt,buf,strlen(buf)+1); /* send the null byte, too */
+
--- dmucs-0.6.1/config.log
+++ dmucs-0.6.1.orig/config.log
@@ -1,174 +0,0 @@
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by dmucs configure 0.5, which was
-generated by GNU Autoconf 2.61. Invocation command line was
-
- $ /home/sam/debian/dmucs-0.6.1/./configure --build=x86_64-linux-gnu
--prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man
--infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var
--libexecdir=${prefix}/lib/dmucs --disable-maintainer-mode
--disable-dependency-tracking --srcdir=.
-
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = magicboy
-uname -m = x86_64
-uname -r = 2.6.26-1-amd64
-uname -s = Linux
-uname -v = #1 SMP Sat Jan 10 17:57:00 UTC 2009
-
-/usr/bin/uname -p = unknown
-/bin/uname -X = unknown
-
-/bin/arch = unknown
-/usr/bin/arch -k = unknown
-/usr/convex/getsysinfo = unknown
-/usr/bin/hostinfo = unknown
-/bin/machine = unknown
-/usr/bin/oslevel = unknown
-/bin/universe = unknown
-
-PATH: /usr/sbin
-PATH: /usr/bin
-PATH: /sbin
-PATH: /bin
-PATH: /usr/bin/X11
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-configure:1783: checking for a BSD-compatible install
-configure:1839: result: /usr/bin/install -c
-configure:1850: checking whether build environment is sane
-
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-
-ac_cv_env_CCC_set=
-ac_cv_env_CCC_value=
-ac_cv_env_CC_set=set
-ac_cv_env_CC_value=cc
-ac_cv_env_CFLAGS_set=set
-ac_cv_env_CFLAGS_value='-g -O2 -g -Wall -O2'
-ac_cv_env_CPPFLAGS_set=set
-ac_cv_env_CPPFLAGS_value=
-ac_cv_env_CPP_set=
-ac_cv_env_CPP_value=
-ac_cv_env_CXXFLAGS_set=set
-ac_cv_env_CXXFLAGS_value='-g -O2 -g -Wall -O2'
-ac_cv_env_CXX_set=set
-ac_cv_env_CXX_value=g++
-ac_cv_env_LDFLAGS_set=set
-ac_cv_env_LDFLAGS_value=
-ac_cv_env_LIBS_set=
-ac_cv_env_LIBS_value=
-ac_cv_env_build_alias_set=set
-ac_cv_env_build_alias_value=x86_64-linux-gnu
-ac_cv_env_host_alias_set=
-ac_cv_env_host_alias_value=
-ac_cv_env_target_alias_set=
-ac_cv_env_target_alias_value=
-ac_cv_path_install='/usr/bin/install -c'
-
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-
-ACLOCAL=''
-AMDEPBACKSLASH=''
-AMDEP_FALSE=''
-AMDEP_TRUE=''
-AMTAR=''
-AUTOCONF=''
-AUTOHEADER=''
-AUTOMAKE=''
-AWK=''
-CC='cc'
-CCDEPMODE=''
-CFLAGS='-g -O2 -g -Wall -O2'
-CPP=''
-CPPFLAGS=''
-CXX='g++'
-CXXDEPMODE=''
-CXXFLAGS='-g -O2 -g -Wall -O2'
-CYGPATH_W=''
-DEFS=''
-DEPDIR=''
-ECHO_C=''
-ECHO_N='-n'
-ECHO_T=''
-EGREP=''
-EXEEXT=''
-GREP=''
-INSTALL_DATA='${INSTALL} -m 644'
-INSTALL_PROGRAM='${INSTALL}'
-INSTALL_SCRIPT='${INSTALL}'
-INSTALL_STRIP_PROGRAM=''
-LDFLAGS=''
-LIBOBJS=''
-LIBS=''
-LTLIBOBJS=''
-MAKEINFO=''
-OBJEXT=''
-PACKAGE=''
-PACKAGE_BUGREPORT='vic.nor...@gmail.com'
-PACKAGE_NAME='dmucs'
-PACKAGE_STRING='dmucs 0.5'
-PACKAGE_TARNAME='dmucs'
-PACKAGE_VERSION='0.5'
-PATH_SEPARATOR=':'
-SET_MAKE=''
-SHELL='/bin/sh'
-STRIP=''
-VERSION=''
-ac_ct_CC=''
-ac_ct_CXX=''
-am__fastdepCC_FALSE=''
-am__fastdepCC_TRUE=''
-am__fastdepCXX_FALSE=''
-am__fastdepCXX_TRUE=''
-am__include=''
-am__leading_dot=''
-am__quote=''
-bindir='${exec_prefix}/bin'
-build_alias='x86_64-linux-gnu'
-datadir='${datarootdir}'
-datarootdir='${prefix}/share'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-dvidir='${docdir}'
-exec_prefix='NONE'
-host_alias=''
-htmldir='${docdir}'
-includedir='${prefix}/include'
-infodir='${prefix}/share/info'
-install_sh=''
-libdir='${exec_prefix}/lib'
-libexecdir='${prefix}/lib/dmucs'
-localedir='${datarootdir}/locale'
-localstatedir='/var'
-mandir='${prefix}/share/man'
-mkdir_p=''
-oldincludedir='/usr/include'
-pdfdir='${docdir}'
-prefix='/usr'
-program_transform_name='s,x,x,'
-psdir='${docdir}'
-sbindir='${exec_prefix}/sbin'
-sharedstatedir='${prefix}/com'
-sysconfdir='/etc'
-target_alias=''
-
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-
-#define PACKAGE_NAME "dmucs"
-#define PACKAGE_TARNAME "dmucs"
-#define PACKAGE_VERSION "0.5"
-#define PACKAGE_STRING "dmucs 0.5"
-#define PACKAGE_BUGREPORT "vic.nor...@gmail.com"
-
-configure: caught signal 2
-configure: exit 1
Happy hacking,
--
Petter Reinholdtsen
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
