tags 669449 + patch pending thanks Hi,
I've prepared an NMU and uploaded to DELAYED/10. Full debdiff is attached. I know that switching to dpkg source format 3.0 (quilt) is a bit controversial in an NMU, but the package didn't have a patch system, so this looked like the cleanest way to me. If you want me to cancel the NMU, please let me know. Cheers, Michael -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
diff -Nru regexxer-0.9/debian/changelog regexxer-0.9/debian/changelog --- regexxer-0.9/debian/changelog 2012-05-06 16:06:53.000000000 +0200 +++ regexxer-0.9/debian/changelog 2012-05-06 15:41:04.000000000 +0200 @@ -1,3 +1,14 @@ +regexxer (0.9-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Use ">=" for libpcre3-dev build-dependency. + * Switch to dpkg source format 3.0 (quilt). + * Add debian/patches/glib-single-include.patch to fix build failures with + glib 2.32 where including individual headers is no longer allowed. + (Closes: #669449) + + -- Michael Biebl <bi...@debian.org> Sun, 06 May 2012 15:33:13 +0200 + regexxer (0.9-2) unstable; urgency=low [ Ross Burton ] diff -Nru regexxer-0.9/debian/control regexxer-0.9/debian/control --- regexxer-0.9/debian/control 2012-05-06 16:06:53.000000000 +0200 +++ regexxer-0.9/debian/control 2012-05-06 15:33:08.000000000 +0200 @@ -2,7 +2,7 @@ Section: devel Priority: optional Maintainer: Ross Burton <r...@debian.org> -Build-Depends: debhelper (>= 4.1.0), cdbs (>= 0.4.17), autotools-dev, intltool, libpcre3-dev (> 5.0), libgtk2.0-bin, libgtkmm-2.4-dev (>= 2.6), libglademm-2.4-dev (>= 2.4.0), libgconfmm-2.6-dev (>= 2.6.1), gconf2 +Build-Depends: debhelper (>= 4.1.0), cdbs (>= 0.4.17), autotools-dev, intltool, libpcre3-dev (>= 5.0), libgtk2.0-bin, libgtkmm-2.4-dev (>= 2.6), libglademm-2.4-dev (>= 2.4.0), libgconfmm-2.6-dev (>= 2.6.1), gconf2 Standards-Version: 3.7.3 Package: regexxer diff -Nru regexxer-0.9/debian/patches/glib-single-include.patch regexxer-0.9/debian/patches/glib-single-include.patch --- regexxer-0.9/debian/patches/glib-single-include.patch 1970-01-01 01:00:00.000000000 +0100 +++ regexxer-0.9/debian/patches/glib-single-include.patch 2012-05-06 15:38:07.000000000 +0200 @@ -0,0 +1,29 @@ +Description: Fix glib includes with glib 2.32 +Author: Michael Biebl <bi...@debian.org> +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=669449 +Index: regexxer-0.9/src/globalstrings.h +=================================================================== +--- regexxer-0.9.orig/src/globalstrings.h 2007-01-13 04:16:03.000000000 +0100 ++++ regexxer-0.9/src/globalstrings.h 2012-05-06 15:35:45.304155909 +0200 +@@ -21,7 +21,7 @@ + #ifndef REGEXXER_GLOBALSTRINGS_H_INCLUDED + #define REGEXXER_GLOBALSTRINGS_H_INCLUDED + +-#include <glib/gutils.h> /* for G_DIR_SEPARATOR_S */ ++#include <glib.h> /* for G_DIR_SEPARATOR_S */ + + namespace Regexxer + { +Index: regexxer-0.9/src/translation.h +=================================================================== +--- regexxer-0.9.orig/src/translation.h 2007-02-01 23:55:00.000000000 +0100 ++++ regexxer-0.9/src/translation.h 2012-05-06 15:35:45.216155913 +0200 +@@ -21,7 +21,7 @@ + #ifndef REGEXXER_TRANSLATION_H_INCLUDED + #define REGEXXER_TRANSLATION_H_INCLUDED + +-#include <glib/gmacros.h> ++#include <glib.h> + #include <glibmm/ustring.h> + + #ifndef gettext_noop diff -Nru regexxer-0.9/debian/patches/series regexxer-0.9/debian/patches/series --- regexxer-0.9/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ regexxer-0.9/debian/patches/series 2012-05-06 15:39:17.000000000 +0200 @@ -0,0 +1 @@ +glib-single-include.patch diff -Nru regexxer-0.9/debian/source/format regexxer-0.9/debian/source/format --- regexxer-0.9/debian/source/format 1970-01-01 01:00:00.000000000 +0100 +++ regexxer-0.9/debian/source/format 2012-05-06 15:38:58.000000000 +0200 @@ -0,0 +1 @@ +3.0 (quilt)
signature.asc
Description: OpenPGP digital signature
