r13158 - in /desktop/unstable/bug-buddy/debian: changelog control control.in patches/01_email-rfc3696.patch patches/02_disable_breakpad.patch rules

joss at users.alioth.debian.org joss at users.alioth.debian.org
Tue Oct 16 09:20:06 UTC 2007


Author: joss
Date: Tue Oct 16 09:20:06 2007
New Revision: 13158

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13158
Log:
* New upstream release.
  + Fixes crashes in SWT applications.
    Closes: #443990, #443820, #445134, #445442.
* Repackaged without convert_UTF.c, which has a non-free license.
* 01_email-rfc3696.patch: dropped, merged upstream.
* 02_disable_breakpad.patch: updated.
* Require GTK+ 2.12.
* Remove the .so dance in the modules dir, upstream now does things 
  correctly.

Removed:
    desktop/unstable/bug-buddy/debian/patches/01_email-rfc3696.patch
Modified:
    desktop/unstable/bug-buddy/debian/changelog
    desktop/unstable/bug-buddy/debian/control
    desktop/unstable/bug-buddy/debian/control.in
    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=13158&op=diff
==============================================================================
--- desktop/unstable/bug-buddy/debian/changelog (original)
+++ desktop/unstable/bug-buddy/debian/changelog Tue Oct 16 09:20:06 2007
@@ -1,3 +1,17 @@
+bug-buddy (2.20.1+dfsg-1) unstable; urgency=low
+
+  * New upstream release.
+    + Fixes crashes in SWT applications.
+      Closes: #443990, #443820, #445134, #445442.
+  * Repackaged without convert_UTF.c, which has a non-free license.
+  * 01_email-rfc3696.patch: dropped, merged upstream.
+  * 02_disable_breakpad.patch: updated.
+  * Require GTK+ 2.12.
+  * Remove the .so dance in the modules dir, upstream now does things 
+    correctly.
+
+ -- Josselin Mouette <joss at debian.org>  Tue, 16 Oct 2007 11:14:07 +0200
+
 bug-buddy (2.20.0-3) unstable; urgency=low
 
   * 02_disable_breakpad.patch: Changed so configure provides a

Modified: desktop/unstable/bug-buddy/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/bug-buddy/debian/control?rev=13158&op=diff
==============================================================================
--- desktop/unstable/bug-buddy/debian/control (original)
+++ desktop/unstable/bug-buddy/debian/control Tue Oct 16 09:20:06 2007
@@ -16,7 +16,7 @@
                libxml-parser-perl,
                scrollkeeper,
                xsltproc,
-               libgtk2.0-dev (>= 2.9),
+               libgtk2.0-dev (>= 2.12),
                libxml2-dev (>= 2.4.6),
                libsoup2.2-dev (>= 2.2.96),
                libgtop2-dev (>= 2.13.3),

Modified: desktop/unstable/bug-buddy/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/bug-buddy/debian/control.in?rev=13158&op=diff
==============================================================================
--- desktop/unstable/bug-buddy/debian/control.in (original)
+++ desktop/unstable/bug-buddy/debian/control.in Tue Oct 16 09:20:06 2007
@@ -16,7 +16,7 @@
                libxml-parser-perl,
                scrollkeeper,
                xsltproc,
-               libgtk2.0-dev (>= 2.9),
+               libgtk2.0-dev (>= 2.12),
                libxml2-dev (>= 2.4.6),
                libsoup2.2-dev (>= 2.2.96),
                libgtop2-dev (>= 2.13.3),

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=13158&op=diff
==============================================================================
--- desktop/unstable/bug-buddy/debian/patches/02_disable_breakpad.patch (original)
+++ desktop/unstable/bug-buddy/debian/patches/02_disable_breakpad.patch Tue Oct 16 09:20:06 2007
@@ -1,69 +1,250 @@
-Index: configure.in
-===================================================================
---- configure.in	(revision 2429)
-+++ configure.in	(working copy)
-@@ -76,25 +76,32 @@
+--- configure.in.orig	2007-10-06 21:25:07.000000000 +0200
++++ configure.in	2007-10-16 10:49:51.237391396 +0200
+@@ -91,7 +91,11 @@
  AC_CHECK_HEADERS([libelf.h],[],[AC_MSG_ERROR([libelf.h not found.])])
  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
 +AC_ARG_ENABLE(google-breakpad,
 +  AC_HELP_STRING([--disable-google-breakpad],
 +      [compile without google breakpad]),
 +      enable_google_breakpad=$enableval, enable_google_breakpad=yes)
- 
--GOOGLE_BREAKPAD_SUPPORTED_ARCH="no"
--case $target_cpu in
--    *86)
--       GOOGLE_BREAKPAD_SUPPORTED_ARCH="yes" ;;
--esac
++
+ GOOGLE_BREAKPAD_SUPPORTED_OS="no"
+ case $target_os in
+     solaris*)
+@@ -110,12 +114,15 @@
+        GOOGLE_BREAKPAD_SUPPORTED_ARCH="yes" ;;
+ esac
+ 
+-if test x$GOOGLE_BREAKPAD_SUPPORTED_OS = xyes ; then
 +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
- 
--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
-+  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])
-+			AC_CONFIG_SUBDIRS(google-breakpad)
-+			use_google_breakpad=yes
-+		fi
++  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])
++		AC_CONFIG_SUBDIRS(google-breakpad)
+ 		use_google_breakpad=yes
  	fi
++  fi
  fi
  
---- configure	2007-09-17 23:52:25.000000000 +0200
-+++ configure	2007-09-23 13:05:26.000000000 +0200
-@@ -1564,6 +1563,8 @@
-   --enable-fast-install[=PKGS]
-                           optimize for fast installation [default=yes]
+ AM_CONDITIONAL(USE_GOOGLE_BREAKPAD, test x$use_google_breakpad = xyes)
+--- configure.orig	2007-10-06 21:26:08.000000000 +0200
++++ configure	2007-10-16 10:50:33.339790675 +0200
+@@ -1574,6 +1574,8 @@
    --disable-libtool-lock  avoid locking (might break parallel builds)
+   --enable-eds            Enable support for getting user email from eds
+                           [default=yes]
 +  --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
-@@ -21594,34 +21720,46 @@
+@@ -6880,7 +6882,7 @@
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 6883 "configure"' > conftest.$ac_ext
++  echo '#line 6885 "configure"' > conftest.$ac_ext
+   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -8734,11 +8736,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:8737: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8739: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:8741: \$? = $ac_status" >&5
++   echo "$as_me:8743: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -9002,11 +9004,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:9005: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9007: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:9009: \$? = $ac_status" >&5
++   echo "$as_me:9011: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -9106,11 +9108,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:9109: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9111: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:9113: \$? = $ac_status" >&5
++   echo "$as_me:9115: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -10571,7 +10573,7 @@
+   libsuff=
+   case "$host_cpu" in
+   x86_64*|s390x*|powerpc64*)
+-    echo '#line 10574 "configure"' > conftest.$ac_ext
++    echo '#line 10576 "configure"' > conftest.$ac_ext
+     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -11435,7 +11437,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 11438 "configure"
++#line 11440 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -11535,7 +11537,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 11538 "configure"
++#line 11540 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -13871,11 +13873,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:13874: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:13876: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:13878: \$? = $ac_status" >&5
++   echo "$as_me:13880: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -13975,11 +13977,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:13978: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:13980: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:13982: \$? = $ac_status" >&5
++   echo "$as_me:13984: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -14511,7 +14513,7 @@
+   libsuff=
+   case "$host_cpu" in
+   x86_64*|s390x*|powerpc64*)
+-    echo '#line 14514 "configure"' > conftest.$ac_ext
++    echo '#line 14516 "configure"' > conftest.$ac_ext
+     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -15566,11 +15568,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:15569: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15571: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:15573: \$? = $ac_status" >&5
++   echo "$as_me:15575: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -15670,11 +15672,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:15673: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15675: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:15677: \$? = $ac_status" >&5
++   echo "$as_me:15679: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -17115,7 +17117,7 @@
+   libsuff=
+   case "$host_cpu" in
+   x86_64*|s390x*|powerpc64*)
+-    echo '#line 17118 "configure"' > conftest.$ac_ext
++    echo '#line 17120 "configure"' > conftest.$ac_ext
+     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -17889,11 +17891,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:17892: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17894: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:17896: \$? = $ac_status" >&5
++   echo "$as_me:17898: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -18157,11 +18159,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:18160: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18162: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:18164: \$? = $ac_status" >&5
++   echo "$as_me:18166: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -18261,11 +18263,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:18264: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18266: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:18268: \$? = $ac_status" >&5
++   echo "$as_me:18270: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -19726,7 +19728,7 @@
+   libsuff=
+   case "$host_cpu" in
+   x86_64*|s390x*|powerpc64*)
+-    echo '#line 19729 "configure"' > conftest.$ac_ext
++    echo '#line 19731 "configure"' > conftest.$ac_ext
+     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -21729,7 +21731,13 @@
  done
  
  
@@ -74,56 +255,29 @@
 +else
 +  enable_google_breakpad=yes
 +fi
- 
--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
++
+ 
+ GOOGLE_BREAKPAD_SUPPORTED_OS="no"
+ case $target_os in
+@@ -21749,7 +21757,8 @@
+        GOOGLE_BREAKPAD_SUPPORTED_ARCH="yes" ;;
+ esac
+ 
+-if test x$GOOGLE_BREAKPAD_SUPPORTED_OS = xyes ; then
 +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"
-+	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"
- 
- cat >>confdefs.h <<\_ACEOF
++  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"
+ 
+@@ -21757,8 +21766,11 @@
  #define ENABLE_GOOGLE_BREAKPAD 1
  _ACEOF
  
--		use_google_breakpad=yes
-+			subdirs="$subdirs google-breakpad"
++		subdirs="$subdirs google-breakpad"
 +
-+			use_google_breakpad=yes
-+		fi
+ 		use_google_breakpad=yes
  	fi
++  fi
  fi
  
-- 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
+  if test x$use_google_breakpad = xyes; then

Modified: desktop/unstable/bug-buddy/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/bug-buddy/debian/rules?rev=13158&op=diff
==============================================================================
--- desktop/unstable/bug-buddy/debian/rules (original)
+++ desktop/unstable/bug-buddy/debian/rules Tue Oct 16 09:20:06 2007
@@ -17,7 +17,6 @@
 
 binary-post-install/bug-buddy::
 	cd debian/$(cdbs_curpkg)/usr/lib/gtk-2.0/modules && \
-		rm -f *.a *.la libgnomebreakpad.so libgnomebreakpad.so.? && \
-		mv libgnomebreakpad.so.* libgnomebreakpad.so
+		rm -f *.a *.la
 # Record build-time version information
 	dh_buildinfo




More information about the pkg-gnome-commits mailing list