r12765 - in /desktop/unstable/bug-buddy/debian: changelog patches/02_disable_breakpad.patch rules
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Sun Sep 23 11:15:46 UTC 2007
Author: sjoerd
Date: Sun Sep 23 11:15:46 2007
New Revision: 12765
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12765
Log:
* 02_disable_breakpad.patch: Changed so configure provides a
--disable-google-breakpad option. Also fixes ftbs on i386 (Closes: #443588)
* debian/rules: Add --disable-google-breakpad to DEB_CONFIGURE_EXTRA_FLAGS
Modified:
desktop/unstable/bug-buddy/debian/changelog
desktop/unstable/bug-buddy/debian/patches/02_disable_breakpad.patch
desktop/unstable/bug-buddy/debian/rules
Modified: desktop/unstable/bug-buddy/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/bug-buddy/debian/changelog?rev=12765&op=diff
==============================================================================
--- desktop/unstable/bug-buddy/debian/changelog (original)
+++ desktop/unstable/bug-buddy/debian/changelog Sun Sep 23 11:15:46 2007
@@ -1,3 +1,11 @@
+bug-buddy (2.20.0-3) unstable; urgency=low
+
+ * 02_disable_breakpad.patch: Changed so configure provides a
+ --disable-google-breakpad option. Also fixes ftbs on i386 (Closes: #443588)
+ * debian/rules: Add --disable-google-breakpad to DEB_CONFIGURE_EXTRA_FLAGS
+
+ -- Sjoerd Simons <sjoerd at debian.org> Sun, 23 Sep 2007 12:58:57 +0200
+
bug-buddy (2.20.0-2) unstable; urgency=low
* copyright: updated to point to GPL-2.
Modified: desktop/unstable/bug-buddy/debian/patches/02_disable_breakpad.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/bug-buddy/debian/patches/02_disable_breakpad.patch?rev=12765&op=diff
==============================================================================
--- desktop/unstable/bug-buddy/debian/patches/02_disable_breakpad.patch (original)
+++ desktop/unstable/bug-buddy/debian/patches/02_disable_breakpad.patch Sun Sep 23 11:15:46 2007
@@ -1,22 +1,130 @@
---- configure.in.orig 2007-09-21 22:07:09.017597198 +0200
-+++ configure.in 2007-09-21 22:07:32.238920505 +0200
-@@ -98,6 +98,8 @@
+--- bug-buddy-2.20.0-vanilla/configure.in 2007-09-17 22:02:09.000000000 +0200
++++ bug-buddy-2.20.0/configure.in 2007-09-23 12:28:40.000000000 +0200
+@@ -77,24 +77,33 @@
+ AC_CHECK_HEADERS([gelf.h],[],[AC_MSG_ERROR([gelf.h not found.])])
+
+ AC_CONFIG_SUBDIRS(google-breakpad)
+-GOOGLE_BREAKPAD_SUPPORTED_OS="no"
+-case $target_os in
+- solaris*) ;;
+- linux*)
+- GOOGLE_BREAKPAD_SUPPORTED_OS="yes" ;;
+-esac
+-
+-GOOGLE_BREAKPAD_SUPPORTED_ARCH="no"
+-case $target_cpu in
+- *86)
+- GOOGLE_BREAKPAD_SUPPORTED_ARCH="yes" ;;
+-esac
+-
+-if test x$GOOGLE_BREAKPAD_SUPPORTED_OS = xyes ; then
+- if test x$GOOGLE_BREAKPAD_SUPPORTED_ARCH = xyes ; then
+- echo "OS and CPU supported: enabling google-breakpad"
+- AC_DEFINE(ENABLE_GOOGLE_BREAKPAD, 1, [define if google-break is enabled])
+- use_google_breakpad=yes
++
++
++AC_ARG_ENABLE(google-breakpad,
++ AC_HELP_STRING([--disable-google-breakpad],
++ [compile without google breakpad]),
++ enable_google_breakpad=$enableval, enable_google_breakpad=yes)
++
++if test x$enable_google_breakpad = xyes; then
++ GOOGLE_BREAKPAD_SUPPORTED_OS="no"
++ case $target_os in
++ solaris*) ;;
++ linux*)
++ GOOGLE_BREAKPAD_SUPPORTED_OS="yes" ;;
++ esac
++
++ GOOGLE_BREAKPAD_SUPPORTED_ARCH="no"
++ case $target_cpu in
++ *86)
++ GOOGLE_BREAKPAD_SUPPORTED_ARCH="yes" ;;
++ esac
++
++ if test x$GOOGLE_BREAKPAD_SUPPORTED_OS = xyes ; then
++ if test x$GOOGLE_BREAKPAD_SUPPORTED_ARCH = xyes ; then
++ echo "OS and CPU supported: enabling google-breakpad"
++ AC_DEFINE(ENABLE_GOOGLE_BREAKPAD, 1, [define if google-break is enabled])
++ use_google_breakpad=yes
++ fi
fi
fi
-+use_google_breakpad=no
+--- bug-buddy-2.20.0-vanilla/configure 2007-09-17 23:52:25.000000000 +0200
++++ bug-buddy-2.20.0/configure 2007-09-23 12:32:18.000000000 +0200
+@@ -1564,6 +1563,8 @@
+ --enable-fast-install[=PKGS]
+ optimize for fast installation [default=yes]
+ --disable-libtool-lock avoid locking (might break parallel builds)
++ --disable-google-breakpad
++ compile without google breakpad
+ --enable-compile-warnings=[no/minimum/yes/maximum/error]
+ Turn on compiler warnings
+ --enable-iso-c Try to warn if code is not ISO C
+@@ -21596,32 +21722,46 @@
+
+ subdirs="$subdirs google-breakpad"
+
+-GOOGLE_BREAKPAD_SUPPORTED_OS="no"
+-case $target_os in
+- solaris*) ;;
+- linux*)
+- GOOGLE_BREAKPAD_SUPPORTED_OS="yes" ;;
+-esac
+-
+-GOOGLE_BREAKPAD_SUPPORTED_ARCH="no"
+-case $target_cpu in
+- *86)
+- GOOGLE_BREAKPAD_SUPPORTED_ARCH="yes" ;;
+-esac
+-
+-if test x$GOOGLE_BREAKPAD_SUPPORTED_OS = xyes ; then
+- if test x$GOOGLE_BREAKPAD_SUPPORTED_ARCH = xyes ; then
+- echo "OS and CPU supported: enabling google-breakpad"
+
- AM_CONDITIONAL(USE_GOOGLE_BREAKPAD, test x$use_google_breakpad = xyes)
++
++# Check whether --enable-google-breakpad was given.
++if test "${enable_google_breakpad+set}" = set; then
++ enableval=$enable_google_breakpad; enable_google_breakpad=$enableval
++else
++ enable_google_breakpad=yes
++fi
++
++
++if test x$enable_google_breakpad = xyes; then
++ GOOGLE_BREAKPAD_SUPPORTED_OS="no"
++ case $target_os in
++ solaris*) ;;
++ linux*)
++ GOOGLE_BREAKPAD_SUPPORTED_OS="yes" ;;
++ esac
++
++ GOOGLE_BREAKPAD_SUPPORTED_ARCH="no"
++ case $target_cpu in
++ *86)
++ GOOGLE_BREAKPAD_SUPPORTED_ARCH="yes" ;;
++ esac
++
++ if test x$GOOGLE_BREAKPAD_SUPPORTED_OS = xyes ; then
++ if test x$GOOGLE_BREAKPAD_SUPPORTED_ARCH = xyes ; then
++ echo "OS and CPU supported: enabling google-breakpad"
- GDK_REQUIRED="gdk-2.0 >= 2.9"
---- configure.orig 2007-09-21 22:07:45.471674597 +0200
-+++ configure 2007-09-21 22:07:52.048049363 +0200
-@@ -21621,6 +21621,8 @@
+ cat >>confdefs.h <<\_ACEOF
+ #define ENABLE_GOOGLE_BREAKPAD 1
+ _ACEOF
+
+- use_google_breakpad=yes
++ use_google_breakpad=yes
++ fi
fi
fi
-+use_google_breakpad=no
+- if test x$use_google_breakpad = xyes; then
+
- if test x$use_google_breakpad = xyes; then
++
++if test x$use_google_breakpad = xyes; then
USE_GOOGLE_BREAKPAD_TRUE=
USE_GOOGLE_BREAKPAD_FALSE='#'
+ else
Modified: desktop/unstable/bug-buddy/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/bug-buddy/debian/rules?rev=12765&op=diff
==============================================================================
--- desktop/unstable/bug-buddy/debian/rules (original)
+++ desktop/unstable/bug-buddy/debian/rules Sun Sep 23 11:15:46 2007
@@ -10,7 +10,7 @@
# Compile options
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --disable-google-breakpad
# Debhelper Arguments
DEB_DH_INSTALL_ARGS += debian/bug-buddy.xpm usr/share/pixmaps/
More information about the pkg-gnome-commits
mailing list