r15779 - in /desktop/unstable/bug-buddy/debian: changelog control control.in patches/02_disable_breakpad.patch patches/60_detect-and-link-x11.patch patches/series rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sat Apr 26 13:56:11 UTC 2008
Author: joss
Date: Sat Apr 26 13:56:10 2008
New Revision: 15779
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15779
Log:
Switch to quilt for patch handling; build-depend on quilt.
Added:
desktop/unstable/bug-buddy/debian/patches/series
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/patches/60_detect-and-link-x11.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=15779&op=diff
==============================================================================
--- desktop/unstable/bug-buddy/debian/changelog (original)
+++ desktop/unstable/bug-buddy/debian/changelog Sat Apr 26 13:56:10 2008
@@ -1,3 +1,9 @@
+bug-buddy (2.22.0+dfsg-3) UNRELEASED; urgency=low
+
+ * Switch to quilt for patch handling; build-depend on quilt.
+
+ -- Josselin Mouette <joss at debian.org> Sat, 26 Apr 2008 15:47:46 +0200
+
bug-buddy (2.22.0+dfsg-2) unstable; urgency=low
* debian/control.in:
Modified: desktop/unstable/bug-buddy/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/bug-buddy/debian/control?rev=15779&op=diff
==============================================================================
--- desktop/unstable/bug-buddy/debian/control (original)
+++ desktop/unstable/bug-buddy/debian/control Sat Apr 26 13:56:10 2008
@@ -4,6 +4,7 @@
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Build-Depends: autotools-dev,
cdbs (>= 0.4.41),
+ quilt,
debhelper (>= 5),
dh-buildinfo,
gnome-doc-utils,
Modified: desktop/unstable/bug-buddy/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/bug-buddy/debian/control.in?rev=15779&op=diff
==============================================================================
--- desktop/unstable/bug-buddy/debian/control.in (original)
+++ desktop/unstable/bug-buddy/debian/control.in Sat Apr 26 13:56:10 2008
@@ -4,6 +4,7 @@
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Build-Depends: autotools-dev,
cdbs (>= 0.4.41),
+ quilt,
debhelper (>= 5),
dh-buildinfo,
gnome-doc-utils,
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=15779&op=diff
==============================================================================
--- desktop/unstable/bug-buddy/debian/patches/02_disable_breakpad.patch (original)
+++ desktop/unstable/bug-buddy/debian/patches/02_disable_breakpad.patch Sat Apr 26 13:56:10 2008
@@ -1,6 +1,8 @@
---- 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 @@
+Index: bug-buddy-2.22.0/configure.in
+===================================================================
+--- bug-buddy-2.22.0.orig/configure.in 2008-03-10 23:42:21.000000000 +0100
++++ bug-buddy-2.22.0/configure.in 2008-04-26 15:48:31.526972750 +0200
+@@ -91,7 +91,11 @@ AC_CHECK_LIB(elf, elf_version)
AC_CHECK_HEADERS([libelf.h],[],[AC_MSG_ERROR([libelf.h not found.])])
AC_CHECK_HEADERS([gelf.h],[],[AC_MSG_ERROR([gelf.h not found.])])
@@ -13,7 +15,7 @@
GOOGLE_BREAKPAD_SUPPORTED_OS="no"
case $target_os in
solaris*)
-@@ -110,12 +114,15 @@
+@@ -110,12 +114,15 @@ case $target_cpu in
GOOGLE_BREAKPAD_SUPPORTED_ARCH="yes" ;;
esac
Modified: desktop/unstable/bug-buddy/debian/patches/60_detect-and-link-x11.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/bug-buddy/debian/patches/60_detect-and-link-x11.patch?rev=15779&op=diff
==============================================================================
--- desktop/unstable/bug-buddy/debian/patches/60_detect-and-link-x11.patch (original)
+++ desktop/unstable/bug-buddy/debian/patches/60_detect-and-link-x11.patch Sat Apr 26 13:56:10 2008
@@ -1,10 +1,10 @@
GNOME #500179; Debian #453178; fixes missing link flags for libX11 (FTBFS)
-Index: configure.in
+Index: bug-buddy-2.22.0/configure.in
===================================================================
---- configure.in (revision 2462)
-+++ configure.in (working copy)
-@@ -144,6 +144,29 @@ then
+--- bug-buddy-2.22.0.orig/configure.in 2008-04-26 15:48:22.454968169 +0200
++++ bug-buddy-2.22.0/configure.in 2008-04-26 15:48:24.554971793 +0200
+@@ -151,6 +151,29 @@ then
AC_DEFINE(HAVE_NETWORKMANAGER, 1, [define if NetworkManager is installed])
fi
@@ -34,10 +34,10 @@
GETTEXT_PACKAGE=bug-buddy
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
-Index: gnome-breakpad/Makefile.am
+Index: bug-buddy-2.22.0/gnome-breakpad/Makefile.am
===================================================================
---- gnome-breakpad/Makefile.am (revision 2462)
-+++ gnome-breakpad/Makefile.am (working copy)
+--- bug-buddy-2.22.0.orig/gnome-breakpad/Makefile.am 2007-10-13 16:42:42.000000000 +0200
++++ bug-buddy-2.22.0/gnome-breakpad/Makefile.am 2008-04-26 15:48:24.554971793 +0200
@@ -37,5 +37,5 @@ module_LTLIBRARIES = libgnomebreakpad.la
moduledir = $(libdir)/gtk-2.0/modules
Added: desktop/unstable/bug-buddy/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/bug-buddy/debian/patches/series?rev=15779&op=file
==============================================================================
--- desktop/unstable/bug-buddy/debian/patches/series (added)
+++ desktop/unstable/bug-buddy/debian/patches/series Sat Apr 26 13:56:10 2008
@@ -1,0 +1,4 @@
+02_disable_breakpad.patch
+60_detect-and-link-x11.patch
+70_automake-autoconf.patch
+99_ltmain_as-needed.patch
Modified: desktop/unstable/bug-buddy/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/bug-buddy/debian/rules?rev=15779&op=diff
==============================================================================
--- desktop/unstable/bug-buddy/debian/rules (original)
+++ desktop/unstable/bug-buddy/debian/rules Sat Apr 26 13:56:10 2008
@@ -3,7 +3,7 @@
# CDBS Classes & Rules
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
More information about the pkg-gnome-commits
mailing list