[Pkg-wmaker-commits] [wmrack] 38/97: Imported Debian patch 1.2-1
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Sat Aug 22 02:42:03 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmrack.
commit 6da7d60f5a5167e20ee1fa4a6584c3e6e5158fd0
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date: Tue Jan 6 22:31:02 2015 -0600
Imported Debian patch 1.2-1
---
configure | 111 ++++++++++++++++++++++---------------------------------
debian/changelog | 10 +++--
debian/compat | 1 +
debian/control | 6 ++-
debian/rules | 12 ++----
5 files changed, 60 insertions(+), 80 deletions(-)
diff --git a/configure b/configure
index 1df8e6f..0e350ae 100755
--- a/configure
+++ b/configure
@@ -12,11 +12,7 @@ ac_help=
ac_default_prefix=/usr/local
# Any additions from configure.in:
ac_help="$ac_help
-\
- --without-ctrl Compile without command line tools."
-ac_help="$ac_help
-\
- --without-debug Compile without extra debug messages."
+ --with-debug Compile with extra debug messages."
ac_help="$ac_help
\
--without-gnustep Don't use GNUstep style library paths."
@@ -534,20 +530,10 @@ fi
-# Check whether --with-ctrl or --without-ctrl was given.
-if test "${with_ctrl+set}" = set; then
- withval="$with_ctrl"
- :
-else
- with_ctrl="yes"
-fi
-
# Check whether --with-debug or --without-debug was given.
if test "${with_debug+set}" = set; then
withval="$with_debug"
:
-else
- with_debug="yes"
fi
# Check whether --with-gnustep or --without-gnustep was given.
@@ -560,7 +546,7 @@ fi
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:564: checking for $ac_word" >&5
+echo "configure:550: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -590,7 +576,7 @@ if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:594: checking for $ac_word" >&5
+echo "configure:580: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -641,7 +627,7 @@ fi
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:645: checking for $ac_word" >&5
+echo "configure:631: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -673,7 +659,7 @@ fi
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:677: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:663: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -684,12 +670,12 @@ cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext << EOF
-#line 688 "configure"
+#line 674 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -715,12 +701,12 @@ if test $ac_cv_prog_cc_works = no; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:719: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:705: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:724: checking whether we are using GNU C" >&5
+echo "configure:710: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -729,7 +715,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:733: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:719: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
@@ -748,7 +734,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:752: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:738: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -810,7 +796,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:814: checking for a BSD compatible install" >&5
+echo "configure:800: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -863,7 +849,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:867: checking whether ln -s works" >&5
+echo "configure:853: checking whether ln -s works" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -887,7 +873,7 @@ fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:891: checking how to run the C preprocessor" >&5
+echo "configure:877: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -902,13 +888,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 906 "configure"
+#line 892 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:912: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -919,13 +905,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 923 "configure"
+#line 909 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:929: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:915: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -936,13 +922,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 940 "configure"
+#line 926 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:946: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:932: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -967,12 +953,12 @@ fi
echo "$ac_t""$CPP" 1>&6
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:971: checking for ANSI C header files" >&5
+echo "configure:957: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 976 "configure"
+#line 962 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -980,7 +966,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:984: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:970: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -997,7 +983,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1001 "configure"
+#line 987 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -1015,7 +1001,7 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1019 "configure"
+#line 1005 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -1036,7 +1022,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 1040 "configure"
+#line 1026 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1047,7 +1033,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
-if { (eval echo configure:1051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -1072,17 +1058,17 @@ fi
ac_safe=`echo "unistd.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for unistd.h""... $ac_c" 1>&6
-echo "configure:1076: checking for unistd.h" >&5
+echo "configure:1062: checking for unistd.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1081 "configure"
+#line 1067 "configure"
#include "confdefs.h"
#include <unistd.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1086: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1072: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1111,7 +1097,7 @@ fi
# Uses ac_ vars as temps to allow command line to override cache and checks.
# --without-x overrides everything else, but does not touch the cache.
echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:1115: checking for X" >&5
+echo "configure:1101: checking for X" >&5
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
@@ -1173,12 +1159,12 @@ if test "$ac_x_includes" = NO; then
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
-#line 1177 "configure"
+#line 1163 "configure"
#include "confdefs.h"
#include <$x_direct_test_include>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1168: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1247,14 +1233,14 @@ if test "$ac_x_libraries" = NO; then
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1251 "configure"
+#line 1237 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:1258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
LIBS="$ac_save_LIBS"
# We can link X programs with no special library path.
@@ -1348,7 +1334,7 @@ else
fi
echo $ac_n "checking for XpmCreatePixmapFromBuffer in -lXpm""... $ac_c" 1>&6
-echo "configure:1352: checking for XpmCreatePixmapFromBuffer in -lXpm" >&5
+echo "configure:1338: checking for XpmCreatePixmapFromBuffer in -lXpm" >&5
ac_lib_var=`echo Xpm'_'XpmCreatePixmapFromBuffer | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1357,7 +1343,7 @@ else
LIBS="-lXpm \
-lX11 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1361 "configure"
+#line 1347 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1368,7 +1354,7 @@ int main() {
XpmCreatePixmapFromBuffer()
; return 0; }
EOF
-if { (eval echo configure:1372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1394,17 +1380,17 @@ fi
ac_safe=`echo "X11/extensions/shape.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/extensions/shape.h""... $ac_c" 1>&6
-echo "configure:1398: checking for X11/extensions/shape.h" >&5
+echo "configure:1384: checking for X11/extensions/shape.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1403 "configure"
+#line 1389 "configure"
#include "confdefs.h"
#include <X11/extensions/shape.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1408: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1394: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1428,7 +1414,7 @@ else
fi
echo $ac_n "checking for XShapeCombineMask in -lXext""... $ac_c" 1>&6
-echo "configure:1432: checking for XShapeCombineMask in -lXext" >&5
+echo "configure:1418: checking for XShapeCombineMask in -lXext" >&5
ac_lib_var=`echo Xext'_'XShapeCombineMask | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1437,7 +1423,7 @@ else
LIBS="-lXext \
-lX11 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1441 "configure"
+#line 1427 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1448,7 +1434,7 @@ int main() {
XShapeCombineMask()
; return 0; }
EOF
-if { (eval echo configure:1452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1474,14 +1460,6 @@ fi
echo
-if test "x${with_ctrl}" = "xyes"; then
- echo "compiling the extra command line tools"
- CTRL="cdctrl mixctrl"
-else
- CTRL=""
-fi
-
-
if test "x${with_debug}" = "xyes"; then
echo "adding extra DEBUG output"
CFLAGS="-ggdb -DDEBUG $CFLAGS"
@@ -1645,7 +1623,6 @@ s%@INSTALL_DATA@%$INSTALL_DATA%g
s%@LN_S@%$LN_S%g
s%@INSTALL@%$INSTALL%g
s%@CPP@%$CPP%g
-s%@CTRL@%$CTRL%g
CEOF
EOF
diff --git a/debian/changelog b/debian/changelog
index 3b1c6d4..7f885e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wmrack (1.2-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Chris Waters <xtifr at debian.org> Thu, 2 Oct 2003 15:01:42 -0700
+
wmrack (1.1-2) unstable; urgency=low
* added missing build-dependency on xutils (grr, this is one of the most
@@ -93,6 +99,4 @@ wmrack (0.9-1) unstable; urgency=low
-- Marcelo E. Magallon <mmagallo at debian.org> Fri, 2 Jan 1998 14:00:10 -0600
-Local variables:
-mode: debian-changelog
-End:
+
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..b8626c4
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+4
diff --git a/debian/control b/debian/control
index f28a5d7..e184bb7 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: wmrack
Section: sound
Priority: optional
Maintainer: Chris Waters <xtifr at debian.org>
-Standards-Version: 3.5.0
-Build-Depends: xlibs-dev, xutils, debhelper (>= 3.0.0)
+Standards-Version: 3.6.0
+Build-Depends: xlibs-dev, xutils, debhelper (>= 4.0.0)
Package: wmrack
Architecture: any
@@ -19,3 +19,5 @@ Description: Combined CD Player + Mixer designed for WindowMaker
.
It's designed with WindowMaker in mind, but it works fine with any
window manager, and can be swallowed by afterstep/fvwm/gnome panel/etc.
+ .
+ Homepage: http://wmrack.sourceforge.net
diff --git a/debian/rules b/debian/rules
index 284da4b..79c313e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,11 @@
#!/usr/bin/make -f
-#export DH_VERBOSE = 1
-export DH_COMPAT=3
-
package=wmrack
build: stamp-build
stamp-build:
dh_testdir
- ./configure --without-debug --without-ctrl
+ ./configure --without-debug
$(MAKE)
touch stamp-build
@@ -16,9 +13,8 @@ clean:
dh_testdir
dh_testroot
-$(MAKE) clean
- -rm -f build Makefile XPM/standart.style cdctrl mixctrl wmrack \
- XPM/Makefile config.log config.h config.cache config.status \
- .depend
+ -rm -f build Makefile XPM/Makefile XPM/standart.style wmrack \
+ config.log config.h config.cache config.status .depend
dh_clean
binary-indep: build
@@ -32,7 +28,7 @@ binary-arch: build
install -m 755 -s wmrack debian/wmrack/usr/bin
dh_installdocs
dh_installmenu
- dh_installman wmrack.man
+ dh_installman wmrack.1
dh_installchangelogs CHANGES
dh_strip
dh_compress
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmrack.git
More information about the Pkg-wmaker-commits
mailing list