[SCM] pulseaudio packaging branch, master, updated. debian/0.9.21-2-10-gcf9ded0

[sjoerd at users.alioth.debian.org]

The branch, master has been updated
       via  cf9ded0f2f8c99a33df86914dc1fd0bde7a6bd9a (commit)
       via  7eecb80b3d850519610af0c1193bb6a2a18e6bd3 (commit)
      from  831c9886356d30db4de1638af5c7486c912d28eb (commit)


- Shortlog ------------------------------------------------------------
cf9ded0 debian/rules: Stop using -g0 on mips{,el} the toolchain has been fixed
7eecb80 fixup fallout of failing to merge upstreams in the past

Summary of changes:
 configure        |   72 +----------------------------------------------------
 debian/changelog |    3 +-
 debian/rules     |    5 ---
 ltmain.sh        |    4 +++
 4 files changed, 8 insertions(+), 76 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit cf9ded0f2f8c99a33df86914dc1fd0bde7a6bd9a
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Sun Dec 5 11:08:25 2010 +0000

    debian/rules: Stop using -g0 on mips{,el} the toolchain has been fixed

diff --git a/debian/changelog b/debian/changelog
index 9df7876..57efcac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ pulseaudio (0.9.22-1) UNRELEASED; urgency=low
     + Dropped, fixed upstream
   * debian/patches/0003-Re-bootstrap.patch
     + Dropped, not needed anymore
+  * debian/rules: Stop using -g0 on mips{,el} the toolchain has been fixed
 
- -- Sjoerd Simons <sjoerd at debian.org>  Sun, 05 Dec 2010 10:59:57 +0000
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 05 Dec 2010 11:07:44 +0000
 
 pulseaudio (0.9.21-3) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 4c0387f..3503079 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,11 +5,6 @@ include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-ifneq (,$(filter mips mipsel, $(DEB_HOST_ARCH)))
-  CFLAGS = -Wall -g0 $(DEB_OPT_FLAG)
-endif
-
-
 common-build-arch::
 	grep -v -e alsa -e evdev -e udev debian/pulseaudio.install > \
 	    debian/pulseaudio.install.kfreebsd-i386

commit 7eecb80b3d850519610af0c1193bb6a2a18e6bd3
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Sun Dec 5 11:06:07 2010 +0000

    fixup fallout of failing to merge upstreams in the past

diff --git a/configure b/configure
index a494c0a..78ed842 100755
--- a/configure
+++ b/configure
@@ -12148,6 +12148,7 @@ fi
 fi
 
 
+fi
 
 
 fi
@@ -12407,53 +12408,13 @@ fi
 
 
 
-for ac_header in netinet/ip.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "netinet/ip.h" "ac_cv_header_netinet_ip_h" "#include <sys/types.h>
-                  #if HAVE_NETINET_IN_H
-                  # include <netinet/in.h>
-                  #endif
-                  #if HAVE_NETINET_IN_SYSTM_H
-                  # include <netinet/in_systm.h>
-                  #endif
 
-"
-if test "x$ac_cv_header_netinet_ip_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_NETINET_IP_H 1
-_ACEOF
 
-fi
 
-done
 
-for ac_header in regex.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "regex.h" "ac_cv_header_regex_h" "$ac_includes_default"
-if test "x$ac_cv_header_regex_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_REGEX_H 1
-_ACEOF
- HAVE_REGEX=1
-else
-  HAVE_REGEX=0
-fi
 
-done
 
-for ac_header in sys/un.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sys/un.h" "ac_cv_header_sys_un_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_un_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_UN_H 1
-_ACEOF
- HAVE_AF_UNIX=1
-else
-  HAVE_AF_UNIX=0
-fi
 
-done
 
 
 striplib=
@@ -12486,38 +12447,11 @@ $as_echo "no" >&6; }
   esac
 fi
 
- if test "x$HAVE_AF_UNIX" = "x1"; then
-  HAVE_AF_UNIX_TRUE=
-  HAVE_AF_UNIX_FALSE='#'
-else
-  HAVE_AF_UNIX_TRUE='#'
-  HAVE_AF_UNIX_FALSE=
-fi
 
 
-# Linux
-for ac_header in linux/input.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "linux/input.h" "ac_cv_header_linux_input_h" "$ac_includes_default"
-if test "x$ac_cv_header_linux_input_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LINUX_INPUT_H 1
-_ACEOF
- HAVE_EVDEV=1
-else
-  HAVE_EVDEV=0
-fi
 
-done
 
 
- if test "x$HAVE_EVDEV" = "x1"; then
-  HAVE_EVDEV_TRUE=
-  HAVE_EVDEV_FALSE='#'
-else
-  HAVE_EVDEV_TRUE='#'
-  HAVE_EVDEV_FALSE=
-fi
 
 
 
@@ -12573,12 +12507,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 CC="$lt_save_CC"
 
-# NetBSD
 
 
 
 
-# Other
 
 
 
@@ -21877,7 +21809,7 @@ if test "x$ac_cr" = x; then
 fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\r'
+  ac_cs_awk_cr='\\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
diff --git a/ltmain.sh b/ltmain.sh
index c04f6fc..d8efb57 100755
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -2544,6 +2544,10 @@ func_generate_dlsyms ()
 extern \"C\" {
 #endif
 
+#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
+#endif
+
 /* External symbol declarations for the compiler. */\
 "
 

-- 
pulseaudio packaging