tags 555755 + patch
tags 555755 + pending
thanks
Dear maintainer,
I've prepared an NMU for msort (versioned as 8.52-1.3) and uploaded it
to DELAYED/5. Please feel free to tell me if I should delay it longer.
--
Jakub Wilk
diffstat for msort_8.52-1.2 msort_8.52-1.3
Makefile.am | 2
Makefile.in | 15 +-
config.log | 296 --------------------------------------------
msort-8.52/debian/changelog | 9 +
4 files changed, 22 insertions(+), 300 deletions(-)
reverted:
--- msort-8.52/config.log
+++ msort-8.52.orig/config.log
@@ -1,296 +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 msort configure 8.52, which was
-generated by GNU Autoconf 2.59. Invocation command line was
-
- $ ./configure --prefix=/usr --disable-utf8proc
-
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = galadriel
-uname -m = i686
-uname -r = 2.6.32-trunk-686
-uname -s = Linux
-uname -v = #1 SMP Sun Jan 10 06:32:16 UTC 2010
-
-/usr/bin/uname -p = unknown
-/bin/uname -X = unknown
-
-/bin/arch = unknown
-/usr/bin/arch -k = unknown
-/usr/convex/getsysinfo = unknown
-hostinfo = unknown
-/bin/machine = unknown
-/usr/bin/oslevel = unknown
-/bin/universe = unknown
-
-PATH: /home/jmm/bin
-PATH: /usr/local/bin
-PATH: /usr/bin
-PATH: /bin
-PATH: /usr/bin/X11
-PATH: /usr/games
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-configure:1358: checking for a BSD-compatible install
-configure:1413: result: /usr/bin/install -c
-configure:1424: checking whether build environment is sane
-configure:1467: result: yes
-configure:1532: checking for gawk
-configure:1548: found /usr/bin/gawk
-configure:1558: result: gawk
-configure:1568: checking whether make sets $(MAKE)
-configure:1588: result: yes
-configure:1933: checking for gcc
-configure:1949: found /usr/bin/gcc
-configure:1959: result: gcc
-configure:2203: checking for C compiler version
-configure:2206: gcc --version </dev/null >&5
-gcc (Debian 4.4.3-1) 4.4.3
-Copyright (C) 2010 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-configure:2209: $? = 0
-configure:2211: gcc -v </dev/null >&5
-Using built-in specs.
-Target: i486-linux-gnu
-Configured with: ../src/configure -v --with-pkgversion='Debian 4.4.3-1' --with-bugurl=file:///usr/share/doc/gcc-4.4/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared --enable-multiarch --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.4 --program-suffix=-4.4 --enable-nls --enable-clocale=gnu --enable-libstdcxx-debug --enable-objc-gc --enable-targets=all --with-arch-32=i486 --with-tune=generic --enable-checking=release --build=i486-linux-gnu --host=i486-linux-gnu --target=i486-linux-gnu
-Thread model: posix
-gcc version 4.4.3 (Debian 4.4.3-1)
-configure:2214: $? = 0
-configure:2216: gcc -V </dev/null >&5
-gcc: '-V' option must have argument
-configure:2219: $? = 1
-configure:2242: checking for C compiler default output file name
-configure:2245: gcc -Wall -g -O2 conftest.c >&5
-configure:2248: $? = 0
-configure:2294: result: a.out
-configure:2299: checking whether the C compiler works
-configure:2305: ./a.out
-configure:2308: $? = 0
-configure:2325: result: yes
-configure:2332: checking whether we are cross compiling
-configure:2334: result: no
-configure:2337: checking for suffix of executables
-configure:2339: gcc -o conftest -Wall -g -O2 conftest.c >&5
-configure:2342: $? = 0
-configure:2367: result:
-configure:2373: checking for suffix of object files
-configure:2394: gcc -c -Wall -g -O2 conftest.c >&5
-configure:2397: $? = 0
-configure:2419: result: o
-configure:2423: checking whether we are using the GNU C compiler
-configure:2447: gcc -c -Wall -g -O2 conftest.c >&5
-configure:2453: $? = 0
-configure:2457: test -z
- || test ! -s conftest.err
-configure:2460: $? = 0
-configure:2463: test -s conftest.o
-configure:2466: $? = 0
-configure:2479: result: yes
-configure:2485: checking whether gcc accepts -g
-configure:2506: gcc -c -g conftest.c >&5
-configure:2512: $? = 0
-configure:2516: test -z
- || test ! -s conftest.err
-configure:2519: $? = 0
-configure:2522: test -s conftest.o
-configure:2525: $? = 0
-configure:2536: result: yes
-configure:2553: checking for gcc option to accept ANSI C
-configure:2623: gcc -c -Wall -g -O2 conftest.c >&5
-configure:2629: $? = 0
-configure:2633: test -z
- || test ! -s conftest.err
-configure:2636: $? = 0
-configure:2639: test -s conftest.o
-configure:2642: $? = 0
-configure:2660: result: none needed
-configure:2678: gcc -c -Wall -g -O2 conftest.c >&5
-conftest.c:2: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'me'
-configure:2684: $? = 1
-configure: failed program was:
-| #ifndef __cplusplus
-| choke me
-| #endif
-configure:2828: checking for style of include used by make
-configure:2856: result: GNU
-configure:2884: checking dependency style of gcc
-configure:2974: result: gcc3
-configure:3010: checking for a BSD-compatible install
-configure:3065: result: /usr/bin/install -c
-configure:3080: checking for regwcomp in -ltre
-configure:3110: gcc -o conftest -g -O2 conftest.c -ltre >&5
-/tmp/cckppu04.o: In function `main':
-/home/jmm/scratch/msort-8.52/conftest.c:22: undefined reference to `regwcomp'
-collect2: ld returned 1 exit status
-configure:3116: $? = 1
-configure: failed program was:
-| /* confdefs.h. */
-|
-| #define PACKAGE_NAME "msort"
-| #define PACKAGE_TARNAME "msort"
-| #define PACKAGE_VERSION "8.52"
-| #define PACKAGE_STRING "msort 8.52"
-| #define PACKAGE_BUGREPORT "billpo...@alum.mit.edu"
-| #define PACKAGE "msort"
-| #define VERSION "8.52"
-| /* 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 regwcomp ();
-| int
-| main ()
-| {
-| regwcomp ();
-| ;
-| return 0;
-| }
-configure:3142: result: no
-configure:3152: error: libtre not found. see http://laurikari.net/tre/
-
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-
-ac_cv_c_compiler_gnu=yes
-ac_cv_env_CC_set=
-ac_cv_env_CC_value=
-ac_cv_env_CFLAGS_set=set
-ac_cv_env_CFLAGS_value='-Wall -g -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_LDFLAGS_set=set
-ac_cv_env_LDFLAGS_value=
-ac_cv_env_build_alias_set=
-ac_cv_env_build_alias_value=
-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_exeext=
-ac_cv_lib_tre_regwcomp=no
-ac_cv_objext=o
-ac_cv_path_install='/usr/bin/install -c'
-ac_cv_prog_AWK=gawk
-ac_cv_prog_ac_ct_CC=gcc
-ac_cv_prog_cc_g=yes
-ac_cv_prog_cc_stdc=
-ac_cv_prog_make_make_set=yes
-am_cv_CC_dependencies_compiler_type=gcc3
-
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-
-ACLOCAL='${SHELL} /home/jmm/scratch/msort-8.52/missing --run aclocal-1.9'
-ALLOCAOK_FALSE='#'
-ALLOCAOK_TRUE=''
-AMDEPBACKSLASH='\'
-AMDEP_FALSE='#'
-AMDEP_TRUE=''
-AMTAR='${SHELL} /home/jmm/scratch/msort-8.52/missing --run tar'
-AUTOCONF='${SHELL} /home/jmm/scratch/msort-8.52/missing --run autoconf'
-AUTOHEADER='${SHELL} /home/jmm/scratch/msort-8.52/missing --run autoheader'
-AUTOMAKE='${SHELL} /home/jmm/scratch/msort-8.52/missing --run automake-1.9'
-AWK='gawk'
-CC='gcc'
-CCDEPMODE='depmode=gcc3'
-CFLAGS='-g -O2'
-CPP=''
-CPPFLAGS=''
-CYGPATH_W='echo'
-DEBUGBUILD_FALSE=''
-DEBUGBUILD_TRUE='#'
-DEFS=''
-DEPDIR='.deps'
-ECHO_C=''
-ECHO_N='-n'
-ECHO_T=''
-EGREP=''
-EXEEXT=''
-INSTALL_DATA='${INSTALL} -m 644'
-INSTALL_PROGRAM='${INSTALL}'
-INSTALL_SCRIPT='${INSTALL}'
-INSTALL_STRIP_PROGRAM='${SHELL} $(install_sh) -c -s'
-LDFLAGS=''
-LIBOBJS=''
-LIBS=''
-LTLIBOBJS=''
-MAKEINFO='${SHELL} /home/jmm/scratch/msort-8.52/missing --run makeinfo'
-NOCOMPARISONCNT_FALSE=''
-NOCOMPARISONCNT_TRUE='#'
-OBJEXT='o'
-PACKAGE='msort'
-PACKAGE_BUGREPORT='billpo...@alum.mit.edu'
-PACKAGE_NAME='msort'
-PACKAGE_STRING='msort 8.52'
-PACKAGE_TARNAME='msort'
-PACKAGE_VERSION='8.52'
-PATH_SEPARATOR=':'
-SET_MAKE=''
-SHELL='/bin/sh'
-STRIP=''
-UNINUMOK_FALSE='#'
-UNINUMOK_TRUE=''
-UTF8PROCOK_FALSE=''
-UTF8PROCOK_TRUE='#'
-VERSION='8.52'
-ac_ct_CC='gcc'
-ac_ct_STRIP=''
-am__fastdepCC_FALSE='#'
-am__fastdepCC_TRUE=''
-am__include='include'
-am__leading_dot='.'
-am__quote=''
-am__tar='${AMTAR} chof - "$$tardir"'
-am__untar='${AMTAR} xf -'
-bindir='${exec_prefix}/bin'
-build_alias=''
-datadir='${prefix}/share'
-exec_prefix='NONE'
-host_alias=''
-includedir='${prefix}/include'
-infodir='${prefix}/info'
-install_sh='/home/jmm/scratch/msort-8.52/install-sh'
-libdir='${exec_prefix}/lib'
-libexecdir='${exec_prefix}/libexec'
-localstatedir='${prefix}/var'
-mandir='${prefix}/man'
-mkdir_p='mkdir -p --'
-oldincludedir='/usr/include'
-prefix='/usr'
-program_transform_name='s,x,x,'
-sbindir='${exec_prefix}/sbin'
-sharedstatedir='${prefix}/com'
-sysconfdir='${prefix}/etc'
-target_alias=''
-
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-
-#define PACKAGE "msort"
-#define PACKAGE_BUGREPORT "billpo...@alum.mit.edu"
-#define PACKAGE_NAME "msort"
-#define PACKAGE_STRING "msort 8.52"
-#define PACKAGE_TARNAME "msort"
-#define PACKAGE_VERSION "8.52"
-#define VERSION "8.52"
-
-configure: exit 1
diff -u msort-8.52/debian/changelog msort-8.52/debian/changelog
--- msort-8.52/debian/changelog
+++ msort-8.52/debian/changelog
@@ -1,3 +1,12 @@
+msort (8.52-1.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add -licuuc to LIBS to fix FTBFS with --no-copy-dt-needed-entries
+ (closes: #555755). Thanks to Peter Fritzsche for the bug report.
+ * Remove stray config.log from the source package.
+
+ -- Jakub Wilk <jw...@debian.org> Mon, 29 Aug 2011 21:24:24 +0200
+
msort (8.52-1.2) unstable; urgency=medium
* Non-maintainer upload.
only in patch2:
unchanged:
--- msort-8.52.orig/Makefile.am
+++ msort-8.52/Makefile.am
@@ -22,7 +22,7 @@
LIBS+=-lutf8proc
AM_CFLAGS += -DUSEUTF8PROC
else
-LIBS+=-licutu
+LIBS+=-licutu -licuuc
endif
msg: msg.tcl
only in patch2:
unchanged:
--- msort-8.52.orig/Makefile.in
+++ msort-8.52/Makefile.in
@@ -40,7 +40,7 @@
@DEBUGBUILD_TRUE@am__append_1 = -DDEBUGBUILD
@UTF8PROCOK_TRUE@am__append_2 = -lutf8proc
@UTF8PROCOK_TRUE@am__append_3 = -DUSEUTF8PROC
-@UTF8PROCOK_FALSE@am__append_4 = -licutu
+@UTF8PROCOK_FALSE@am__append_4 = -licutu -licuuc
@NOCOMPARISONCNT_TRUE@am__append_5 = -DNOCOMPARISONCNT
@UNINUMOK_TRUE@am__append_6 = -DUSEUNINUMOK
subdir = .
@@ -121,6 +121,7 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -138,6 +139,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
SET_MAKE = @SET_MAKE@
@@ -149,7 +151,6 @@
UTF8PROCOK_TRUE = @UTF8PROCOK_TRUE@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -160,19 +161,26 @@
bindir = @bindir@
build_alias = @build_alias@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
@@ -449,7 +457,8 @@
|| exit 1; \
fi; \
done
- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ -find "$(distdir)" -type d ! -perm -755 \
+ -exec chmod u+rwx,go+rx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
