--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: unblock: bluefish/2.2.6-2
- From: Daniel Leidert <daniel.leidert@wgdd.de>
- Date: Mon, 01 Dec 2014 00:28:25 +0100
- Message-id: <20141130232825.3273.7546.reportbug@haktar.debian.wgdd.de>
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Please unblock package bluefish
The last upload fixes three issues.
(1) It fixes an FTBFS. The bluefish source makes use of internationalisation
in sub-directories. dh_autoreconf cannot handle this layout (and AFAIK
gettext itself also can't). Therefor the time came, when the build failed
because of gettext macro version mismatches. I simply put the autogen.sh
script to create the bluefish source files into a patch nd run this script
in override_dh_autoreconf. AFAICS it's building fine on all architectures.
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=759935
The next two fixes might not be fully in line with the freeze policy. But both
are one-line fixes and should be easy to handle.
(2) The command to start the chromium browser in Debian changed from
chromium-browser to chromium. There is a one-line-fix to src/rcfile.c to
fix the default command.
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752234
(3) There was further a report about a conflicting function declaration of
rpopup_bevent_in_html_code(). The function itself is only used once and
the fix to the conflict is a one-liner too.
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=747963
The debdiff is attached.
unblock bluefish/2.2.6-2
- -- System Information:
Debian Release: 8.0
APT prefers unstable
APT policy: (850, 'unstable'), (700, 'testing'), (560, 'stable'), (500, 'oldstable'), (110, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.16.0-4-amd64 (SMP w/2 CPU cores)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAEBCAAGBQJUe6gNAAoJEEvNBWfCltBdy0IQAKn/EOvHnoNz4KB/o+qL59vY
X81L3rnZdpbpNDNM/ec+pCZJok9XG4Fw2pnv5mEsId5Fs6Zz54ZuMRxbWBJ1gSH1
v929wecbJG04EM26+vUSMltt9EGWt61PavxkqfMp/ExOn5kUpPnd7emjAPxJ9s7s
+J076rbLUmrwNmWqqA1VYFz6kQkS8VbdRtMw5G5bQisaboKwAs7VmzKssM2DtzO4
8HNL7yL5jdfPiqjerhq5lt3yFdqPnsdGCYuoCyzA8WWiWWllMqv0yWoxJCb5MQrI
Uf0XNIapny5x00AVb5Lq0KK7xgf4Bguwvvi8V3bxkkMDh59GWlqJAPZL3ycSi6AI
IbWkOcxivgs8PyhQz/42neWeaKdKyZ8KrXizmMRuK0Yhef6S+ykXub9QMHa7fccg
W/ZJyTnLcTuABmIuR2Ff9vn3naV1tv8FOnkHomljnuHJXf0qrx9vfXFQi5UGVFs7
L9CuR8WaH0mZIjvBxO9PgXs0HGIDR2u4M+99NuXIFs/QNEFDyI//ag9BtiATZhlY
u3ce6CwS5Z8RU6SPfiAeLHwG/oOEO3b7XbOCoTRycahZNcsg9Oj2ZtWkIJL6Qb5K
eW6XWsZU0UZBRC+81ggo1DcM/QbEpdOD4A+KACy1p/23ooe+ogZg3nXoUPSgrFA5
HrRmmw7zw8TYnXZ1wqtn
=6sVn
-----END PGP SIGNATURE-----
diff -Nru bluefish-2.2.6/debian/changelog bluefish-2.2.6/debian/changelog
--- bluefish-2.2.6/debian/changelog 2014-05-10 23:13:42.000000000 +0200
+++ bluefish-2.2.6/debian/changelog 2014-11-29 20:32:12.000000000 +0100
@@ -1,3 +1,16 @@
+bluefish (2.2.6-2) unstable; urgency=medium
+
+ * debian/rules: Added override_dh_autoreconf target and run the upstream
+ autogen.sh script to fix the FTBFS reported in #759935.
+ * debian/patches/747963_fix_conflicting_declarations.patch: Added.
+ - Fixed a conflicting function declaration (closes: #747963).
+ * debian/patches/752234_fix_chromium_command.patch: Added.
+ - Fixed chromium command (closes: #752234).
+ * debian/patches/759935_autogen.patch: Added.
+ - Added the autogen.sh script from upstream (closes: #759935).
+
+ -- Daniel Leidert <dleidert@debian.org> Sat, 29 Nov 2014 20:32:08 +0100
+
bluefish (2.2.6-1) unstable; urgency=medium
* New upstream release.
diff -Nru bluefish-2.2.6/debian/patches/747963_fix_conflicting_declarations.patch bluefish-2.2.6/debian/patches/747963_fix_conflicting_declarations.patch
--- bluefish-2.2.6/debian/patches/747963_fix_conflicting_declarations.patch 1970-01-01 01:00:00.000000000 +0100
+++ bluefish-2.2.6/debian/patches/747963_fix_conflicting_declarations.patch 2014-11-29 20:31:33.000000000 +0100
@@ -0,0 +1,16 @@
+Author: Daniel Leidert <dleidert@debian.org>
+Description: There was a conflicting declaration of the
+ rpopup_bevent_in_html_code() function in src/rcfile.c and src/rcfile.h.
+Bug-Debian: https://bugs.debian.org/747963
+
+--- a/src/plugin_htmlbar/rpopup.h
++++ b/src/plugin_htmlbar/rpopup.h
+@@ -20,7 +20,7 @@
+ #ifndef __RPOPUP_H_
+ #define __RPOPUP_H_
+
+-gboolean rpopup_bevent_in_html_code(Tdocument *doc);
++void rpopup_bevent_in_html_code(Tdocument *doc);
+ gboolean rpopup_doc_located_tag(Tdocument *doc);
+ gboolean rpopup_doc_located_color(Tdocument *doc);
+ void rpopup_edit_tag_cb(GtkMenuItem *menuitem,Tdocument *doc);
diff -Nru bluefish-2.2.6/debian/patches/752234_fix_chromium_command.patch bluefish-2.2.6/debian/patches/752234_fix_chromium_command.patch
--- bluefish-2.2.6/debian/patches/752234_fix_chromium_command.patch 1970-01-01 01:00:00.000000000 +0100
+++ bluefish-2.2.6/debian/patches/752234_fix_chromium_command.patch 2014-11-29 20:31:33.000000000 +0100
@@ -0,0 +1,15 @@
+Author: Daniel Leidert <dleidert@debian.org>
+Description: Fix the chromium browser command.
+Bug-Debian: https://bugs.debian.org/752234
+
+--- a/src/rcfile.c
++++ b/src/rcfile.c
+@@ -858,7 +858,7 @@
+ NULL));
+ defaults =
+ g_list_prepend(defaults,
+- array_from_arglist(_("Chromium"), "chromium-browser '%p'&", "0", NULL));
++ array_from_arglist(_("Chromium"), "chromium '%p'&", "0", NULL));
+ defaults =
+ g_list_prepend(defaults,
+ array_from_arglist(_("Konqueror"), "konqueror '%p'&", "0", NULL));
diff -Nru bluefish-2.2.6/debian/patches/759935_autogen.patch bluefish-2.2.6/debian/patches/759935_autogen.patch
--- bluefish-2.2.6/debian/patches/759935_autogen.patch 1970-01-01 01:00:00.000000000 +0100
+++ bluefish-2.2.6/debian/patches/759935_autogen.patch 2014-11-29 20:31:33.000000000 +0100
@@ -0,0 +1,196 @@
+Author: Daniel Leidert <dleidert@debian.org>
+Description: Bootstrap build environment to fix build on new architectures.
+ Calling just dh_autoreconf might fail, because src/plugin_*/po/ contains
+ gettext environments and the gettext version of the macros in the bluefish
+ source and the gettext system version might differ and lead to FTBFS.
+ Therefor we use the autogen.sh script from the bluefish repository.
+Bug-Debian: https://bugs.debian.org/759935
+Origin: http://sourceforge.net/p/bluefish/code/HEAD/tree/trunk/bluefish/autogen.sh
+
+--- /dev/null
++++ b/autogen.sh
+@@ -0,0 +1,184 @@
++#!/bin/bash
++#
++# $Id: autogen.sh,v 1.11 2008-05-06 14:44:52 dleidert Exp $
++
++set -e
++
++## all initial declarations, overwrite them using e.g. 'ACLOCAL=aclocal-1.8 AUTOMAKE=automake-1.8 ./autogen.sh'
++ACLOCAL=${ACLOCAL:-aclocal}
++AUTOCONF=${AUTOCONF:-autoconf}
++AUTOHEADER=${AUTOHEADER:-autoheader}
++AUTOMAKE=${AUTOMAKE:-automake}
++GETTEXTIZE=${GETTEXTIZE:-gettextize}
++INTLTOOLIZE=${INTLTOOLIZE:-intltoolize}
++LIBTOOLIZE=${LIBTOOLIZE:-libtoolize}
++
++## check, if all binaries exist and fail with error 1 if not
++if [ -z `which $ACLOCAL` ] ; then echo "Error. ACLOCAL=$ACLOCAL not found." >&2 && exit 1 ; fi
++if [ -z `which $AUTOCONF` ] ; then echo "Error. AUTOCONF=$AUTOCONF not found." >&2 && exit 1 ; fi
++if [ -z `which $AUTOHEADER` ] ; then echo "Error. AUTOHEADER=$AUTOHEADER not found." >&2 && exit 1 ; fi
++if [ -z `which $AUTOMAKE` ] ; then echo "Error. AUTOMAKE=$AUTOMAKE not found." >&2 && exit 1 ; fi
++if [ -z `which $GETTEXTIZE` ] ; then echo "Error. GETTEXTIZE=$GETTEXTIZE not found." >&2 && exit 1 ; fi
++if [ -z `which $INTLTOOLIZE` ] ; then echo "Error. INTLTOOLIZE=$INTLTOOLIZE not found." >&2 && exit 1 ; fi
++if [ -z `which $LIBTOOLIZE` ] ; then echo "Error. LIBTOOLIZE=$LIBTOOLIZE not found." >&2 && exit 1 ; fi
++
++## find where automake is installed and get the version
++AUTOMAKE_PATH=${AUTOMAKE_PATH:-`which $AUTOMAKE | sed 's|\/bin\/automake.*||'`}
++AUTOMAKE_VERSION=`$AUTOMAKE --version | grep automake | awk '{print $4}' | awk -F. '{print $1"."$2}'`
++
++## find gettext version. Use GETTEXTIZE since it is already initialized
++GETTEXT_VERSION=`$GETTEXTIZE --version | grep gettextize | awk '{print $4}' | awk -F. '{print $1"."$2}'`
++
++## automake files we need to have inside our source
++if [[ $AUTOMAKE_VERSION = "1.7" || $GETTEXT_VERSION < "0.15" ]] ; then
++ AUTOMAKE_FILES="missing mkinstalldirs install-sh"
++else
++ AUTOMAKE_FILES="missing install-sh"
++fi
++
++## the directories which will contain the $GETTEXT_FILES
++GETTEXT_PO_DIRS="
++src/plugin_about/po
++src/plugin_charmap/po
++src/plugin_entities/po
++src/plugin_htmlbar/po
++src/plugin_infbrowser/po
++src/plugin_snippets/po
++src/plugin_zencoding/po
++"
++
++## the gettext files we need to copy to $GETTEXT_PO_DIRS
++GETTEXT_FILES="
++Makefile.in.in
++boldquot.sed
++en@boldquot.header
++en@quot.header
++insert-header.sin
++quot.sed
++remove-potcdate.sin
++Rules-quot
++"
++
++## the prefix where we expect share/gettext/po/$GETTEXT_FILES files
++GETTEXT_LOCATION_LIST="
++`which $GETTEXTIZE | sed 's|\/bin\/gettextize|\/share\/gettext\/po|'`
++`echo $PATH | tr ':' '\n' | sed 's|bin|share|;s|$|\/gettext\/po|g'`
++/usr/share/gettext/po
++/usr/local/share/gettext/po
++"
++
++## use $GETTEXT_LOCATION to add a custom gettext location prefix
++GETTEXT_LOCATION=${GETTEXT_LOCATION:-$GETTEXT_LOCATION_LIST}
++
++## check if $GETTEXT_LOCATION contains the files we need and set $GETTEXT_DIR
++for dir in $GETTEXT_LOCATION ; do
++ if [ -f $dir/Makefile.in.in ] ; then
++ GETTEXT_DIR=$dir
++ break
++ fi
++done
++
++## if $GETTEXT_DIR is still undefined, fail with error 1
++if [ -z $GETTEXT_DIR ] ; then
++ echo "Error. GETTEXT_LOCATION=$GETTEXT_LOCATION_LIST does not exist." >&2
++ exit 1
++fi
++
++## our help output - if autogen.sh was called with -h|--help or unkbown option
++autogen_help() {
++ echo
++ echo "autogen.sh usage:"
++ echo
++ echo " Produces all files necessary to build the bluefish project files."
++ echo " The files are linked by default, if you run ./autogen.sh without an option."
++ echo
++ echo " -v Be more verbose about every step (debugging)."
++ echo " -f FILE Output everything to FILE (debugging). Useful for debug output."
++ echo " -c Copy files instead to link them."
++ echo " -h Print this message."
++ echo
++ echo " You can overwrite the automatically determined location of aclocal (>= 1.8),"
++ echo " automake (>= 1.8), autoheader, autoconf, libtoolize, intltoolize and"
++ echo " gettextize using:"
++ echo
++ echo " ACLOCAL=/foo/bin/aclocal-1.9 AUTOMAKE=automake-1.9 ./autogen.sh"
++ echo
++}
++
++## copy $GETTEXT_FILES from $GETTEXT_DIR into $GETTEXT_PO_DIRS
++## this will probably become obsolete with gettext 0.16.2, which adds the
++## necessary functionality to gettextize - we should prefer this way then
++prepare_gettext() {
++ for dir in $GETTEXT_PO_DIRS ; do
++ if [ -d $dir ] ; then
++ for file in $GETTEXT_FILES ; do
++ if [ -n "$VERBOSE" ]; then
++ echo "DEBUG: $COPYACTION -f $GETTEXT_DIR/$file `pwd`/$dir" >&2
++ fi
++ $COPYACTION -f $GETTEXT_DIR/$file `pwd`/$dir
++ done
++ else
++ echo "ERROR: $dir does not exist!"
++ break
++ fi
++ done
++}
++
++## check if $AUTOMAKE_FILES were copied to our source
++## link/copy them if not - necessary for e.g. gettext, which seems to always need mkinstalldirs
++autogen_if_missing() {
++ for file in $AUTOMAKE_FILES ; do
++ if [ ! -e "$file" ] ; then
++ if [ -n "$VERBOSE" ]; then
++ echo "DEBUG: $COPYACTION -f $AUTOMAKE_PATH/share/automake-$AUTOMAKE_VERSION/$file ." >&2
++ fi
++ $COPYACTION -f $AUTOMAKE_PATH/share/automake-$AUTOMAKE_VERSION/$file .
++ fi
++ done
++}
++
++## link/copy the necessary files to our source to prepare for a build
++autogen() {
++ $LIBTOOLIZE $DEBUG -f $COPYOPTION
++ $INTLTOOLIZE $DEBUG -f $COPYOPTION
++ prepare_gettext
++ $ACLOCAL $ACLOCAL_OPT --force $VERBOSE
++ $AUTOHEADER -f $DEBUG $VERBOSE
++ $AUTOMAKE --gnu -a $VERBOSE $COPYOPTION
++ autogen_if_missing
++ $AUTOCONF $DEBUG $VERBOSE
++}
++
++## the main function
++COPYACTION="ln -s"
++while getopts "chvf:" options; do
++ case "$options" in
++ h)
++ autogen_help
++ exit 0
++ ;;
++ c)
++ COPYACTION="cp"
++ COPYOPTION="-c"
++ ;;
++ f)
++ OUTPUTFILE=$OPTARG
++ ;;
++ v)
++ DEBUG="--debug"
++ VERBOSE="--verbose"
++ set -x
++ ;;
++ esac
++done
++
++if [ -n "$OUTPUTFILE" ]; then
++ exec &>$OUTPUTFILE
++fi
++autogen
++
++## ready to rumble
++echo "Run ./configure with the appropriate options, then make and enjoy."
++
++exit 0
++
diff -Nru bluefish-2.2.6/debian/patches/series bluefish-2.2.6/debian/patches/series
--- bluefish-2.2.6/debian/patches/series 2013-05-09 14:31:02.000000000 +0200
+++ bluefish-2.2.6/debian/patches/series 2014-11-29 20:31:33.000000000 +0100
@@ -0,0 +1,3 @@
+747963_fix_conflicting_declarations.patch
+752234_fix_chromium_command.patch
+759935_autogen.patch
diff -Nru bluefish-2.2.6/debian/rules bluefish-2.2.6/debian/rules
--- bluefish-2.2.6/debian/rules 2014-02-15 13:42:25.000000000 +0100
+++ bluefish-2.2.6/debian/rules 2014-11-29 20:31:33.000000000 +0100
@@ -16,6 +16,9 @@
%:
dh $@ --with autoreconf,python2 --parallel
+override_dh_autoreconf:
+ /bin/bash $(CURDIR)/autogen.sh -c
+
override_dh_auto_test:
override_dh_auto_configure: configure
dh_auto_configure -- \
--- End Message ---