--- deskbar-applet-2.22.2.1.orig/debian/patches/90_aclocal+autoconf+automake.patch +++ deskbar-applet-2.22.2.1/debian/patches/90_aclocal+autoconf+automake.patch @@ -0,0 +1,571 @@ +# Description: run autotools update +# UbuntuSpecific: run autotools update +# +diff -Nur deskbar-applet-2.19.91/aclocal.m4 deskbar-applet-2.19.91.new/aclocal.m4 +--- deskbar-applet-2.19.91/aclocal.m4 2007-08-27 15:04:01.000000000 +0200 ++++ deskbar-applet-2.19.91.new/aclocal.m4 2007-08-27 17:32:22.505251333 +0200 +@@ -538,6 +538,253 @@ + AC_SUBST(DISABLE_DEPRECATED) + ]) + ++dnl Do not call GNOME_DOC_DEFINES directly. It is split out from ++dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself. ++AC_DEFUN([GNOME_DOC_DEFINES], ++[ ++AC_ARG_WITH([help-dir], ++ AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),, ++ [with_help_dir='${datadir}/gnome/help']) ++HELP_DIR="$with_help_dir" ++AC_SUBST(HELP_DIR) ++ ++AC_ARG_WITH([omf-dir], ++ AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),, ++ [with_omf_dir='${datadir}/omf']) ++OMF_DIR="$with_omf_dir" ++AC_SUBST(OMF_DIR) ++ ++AC_ARG_WITH([help-formats], ++ AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),, ++ [with_help_formats='']) ++DOC_USER_FORMATS="$with_help_formats" ++AC_SUBST(DOC_USER_FORMATS) ++ ++AC_ARG_ENABLE([scrollkeeper], ++ [AC_HELP_STRING([--disable-scrollkeeper], ++ [do not make updates to the scrollkeeper database])],, ++ enable_scrollkeeper=yes) ++AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"]) ++ ++AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"]) ++]) ++ ++# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) ++# ++AC_DEFUN([GNOME_DOC_INIT], ++[ ++ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1]) ++ ++PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required], ++ [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no]) ++ ++if test "$gdu_cv_have_gdu" = "yes"; then ++ ifelse([$2],,[:],[$2]) ++else ++ ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3]) ++fi ++ ++GNOME_DOC_DEFINES ++]) ++ ++ ++dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) ++# serial 36 IT_PROG_INTLTOOL ++AC_DEFUN([IT_PROG_INTLTOOL], ++[AC_PREREQ([2.50])dnl ++ ++case "$am__api_version" in ++ 1.[01234]) ++ AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) ++ ;; ++ *) ++ ;; ++esac ++ ++if test -n "$1"; then ++ AC_MSG_CHECKING([for intltool >= $1]) ++ ++ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` ++ INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in` ++ [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in` ++ ] ++ AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) ++ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || ++ AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) ++fi ++ ++ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' ++ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' ++ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ ++AC_SUBST(INTLTOOL_DESKTOP_RULE) ++AC_SUBST(INTLTOOL_DIRECTORY_RULE) ++AC_SUBST(INTLTOOL_KEYS_RULE) ++AC_SUBST(INTLTOOL_PROP_RULE) ++AC_SUBST(INTLTOOL_OAF_RULE) ++AC_SUBST(INTLTOOL_PONG_RULE) ++AC_SUBST(INTLTOOL_SERVER_RULE) ++AC_SUBST(INTLTOOL_SHEET_RULE) ++AC_SUBST(INTLTOOL_SOUNDLIST_RULE) ++AC_SUBST(INTLTOOL_UI_RULE) ++AC_SUBST(INTLTOOL_XAM_RULE) ++AC_SUBST(INTLTOOL_KBD_RULE) ++AC_SUBST(INTLTOOL_XML_RULE) ++AC_SUBST(INTLTOOL_XML_NOMERGE_RULE) ++AC_SUBST(INTLTOOL_CAVES_RULE) ++AC_SUBST(INTLTOOL_SCHEMAS_RULE) ++AC_SUBST(INTLTOOL_THEME_RULE) ++AC_SUBST(INTLTOOL_SERVICE_RULE) ++AC_SUBST(INTLTOOL_POLICY_RULE) ++ ++# Use the tools built into the package, not the ones that are installed. ++AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract') ++AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge') ++AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update') ++ ++AC_PATH_PROG(INTLTOOL_PERL, perl) ++if test -z "$INTLTOOL_PERL"; then ++ AC_MSG_ERROR([perl not found; required for intltool]) ++fi ++if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then ++ AC_MSG_ERROR([perl 5.x required for intltool]) ++fi ++if test "x$2" != "xno-xml"; then ++ AC_MSG_CHECKING([for XML::Parser]) ++ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then ++ AC_MSG_RESULT([ok]) ++ else ++ AC_MSG_ERROR([XML::Parser perl module is required for intltool]) ++ fi ++fi ++ ++# Substitute ALL_LINGUAS so we can use it in po/Makefile ++AC_SUBST(ALL_LINGUAS) ++ ++# Set DATADIRNAME correctly if it is not set yet ++# (copied from glib-gettext.m4) ++if test -z "$DATADIRNAME"; then ++ AC_LINK_IFELSE( ++ [AC_LANG_PROGRAM([[]], ++ [[extern int _nl_msg_cat_cntr; ++ return _nl_msg_cat_cntr]])], ++ [DATADIRNAME=share], ++ [case $host in ++ *-*-solaris*) ++ dnl On Solaris, if bind_textdomain_codeset is in libc, ++ dnl GNU format message catalog is always supported, ++ dnl since both are added to the libc all together. ++ dnl Hence, we'd like to go with DATADIRNAME=share ++ dnl in this case. ++ AC_CHECK_FUNC(bind_textdomain_codeset, ++ [DATADIRNAME=share], [DATADIRNAME=lib]) ++ ;; ++ *) ++ [DATADIRNAME=lib] ++ ;; ++ esac]) ++fi ++AC_SUBST(DATADIRNAME) ++ ++IT_PO_SUBDIR([po]) ++ ++dnl The following is very similar to ++dnl ++dnl AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update]) ++dnl ++dnl with the following slight differences: ++dnl - the *.in files are in ac_aux_dir, ++dnl - if the file haven't changed upon reconfigure, it's not touched, ++dnl - the evaluation of the third parameter enables a hack which computes ++dnl the actual value of $libdir, ++dnl - the user sees "executing intltool commands", instead of ++dnl "creating intltool-extract" and such. ++dnl ++dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were ++dnl a reason for it. ++ ++AC_CONFIG_COMMANDS([intltool], [ ++ ++for file in intltool-extract intltool-merge intltool-update; do ++ sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \ ++ -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \ ++ -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \ ++ < ${ac_aux_dir}/${file}.in > ${file}.out ++ if cmp -s ${file} ${file}.out 2>/dev/null; then ++ rm -f ${file}.out ++ else ++ mv -f ${file}.out ${file} ++ fi ++ chmod ugo+x ${file} ++ chmod u+w ${file} ++done ++ ++], ++[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}' ++prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" ++INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}']) ++ ++]) ++ ++ ++# IT_PO_SUBDIR(DIRNAME) ++# --------------------- ++# All po subdirs have to be declared with this macro; the subdir "po" is ++# declared by IT_PROG_INTLTOOL. ++# ++AC_DEFUN([IT_PO_SUBDIR], ++[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. ++dnl ++dnl The following CONFIG_COMMANDS should be exetuted at the very end ++dnl of config.status. ++AC_CONFIG_COMMANDS_PRE([ ++ AC_CONFIG_COMMANDS([$1/stamp-it], [ ++ rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" ++ >"$1/stamp-it.tmp" ++ [sed '/^#/d ++ s/^[[].*] *// ++ /^[ ]*$/d ++ '"s|^| $ac_top_srcdir/|" \ ++ "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" ++ ] ++ if test ! -f "$1/Makefile"; then ++ AC_MSG_ERROR([$1/Makefile is not ready.]) ++ fi ++ mv "$1/Makefile" "$1/Makefile.tmp" ++ [sed '/^POTFILES =/,/[^\\]$/ { ++ /^POTFILES =/!d ++ r $1/POTFILES ++ } ++ ' "$1/Makefile.tmp" >"$1/Makefile"] ++ rm -f "$1/Makefile.tmp" ++ mv "$1/stamp-it.tmp" "$1/stamp-it" ++ ]) ++])dnl ++]) ++ ++ ++# deprecated macros ++AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) ++# A hint is needed for aclocal from Automake <= 1.9.4: ++# AC_DEFUN([AC_PROG_INTLTOOL], ...) ++ ++ + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + + # serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL +@@ -8331,7 +8578,4 @@ + AC_SUBST([am__untar]) + ]) # _AM_PROG_TAR + +-m4_include([m4/gnome-doc-utils.m4]) +-m4_include([m4/intltool.m4]) +-m4_include([m4/python.m4]) + m4_include([acinclude.m4]) +diff -Nur deskbar-applet-2.19.91/configure deskbar-applet-2.19.91.new/configure +--- deskbar-applet-2.19.91/configure 2007-08-27 15:04:04.000000000 +0200 ++++ deskbar-applet-2.19.91.new/configure 2007-08-27 17:32:27.005483917 +0200 +@@ -22661,10 +22661,14 @@ + echo $ECHO_N "checking for headers required to compile python extensions... $ECHO_C" >&6; } + py_prefix=`$PYTHON -c "import sys; print sys.prefix"` + py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` ++if $PYTHON-config --help 2>/dev/null; then ++PYTHON_INCLUDES=`$PYTHON-config --includes 2>/dev/null` ++else + PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" + if test "$py_prefix" != "$py_exec_prefix"; then + PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" + fi ++fi + + save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" +diff -Nur deskbar-applet-2.19.91/data/art/Makefile.in deskbar-applet-2.19.91.new/data/art/Makefile.in +--- deskbar-applet-2.19.91/data/art/Makefile.in 2007-08-27 15:04:05.000000000 +0200 ++++ deskbar-applet-2.19.91.new/data/art/Makefile.in 2007-08-27 17:32:28.505561804 +0200 +@@ -35,9 +35,8 @@ + subdir = data/art + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \ +- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -Nur deskbar-applet-2.19.91/data/Makefile.in deskbar-applet-2.19.91.new/data/Makefile.in +--- deskbar-applet-2.19.91/data/Makefile.in 2007-08-27 15:04:05.000000000 +0200 ++++ deskbar-applet-2.19.91.new/data/Makefile.in 2007-08-27 17:32:28.005535961 +0200 +@@ -36,9 +36,8 @@ + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/deskbar-applet.pc.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \ +- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -Nur deskbar-applet-2.19.91/deskbar/core/gnomedesktop/Makefile.in deskbar-applet-2.19.91.new/deskbar/core/gnomedesktop/Makefile.in +--- deskbar-applet-2.19.91/deskbar/core/gnomedesktop/Makefile.in 2007-08-27 15:04:05.000000000 +0200 ++++ deskbar-applet-2.19.91.new/deskbar/core/gnomedesktop/Makefile.in 2007-08-27 17:32:28.505561804 +0200 +@@ -36,9 +36,8 @@ + DIST_COMMON = $(_gnomedesktop_PYTHON) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \ +- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -Nur deskbar-applet-2.19.91/deskbar/core/keybinder/Makefile.in deskbar-applet-2.19.91.new/deskbar/core/keybinder/Makefile.in +--- deskbar-applet-2.19.91/deskbar/core/keybinder/Makefile.in 2007-08-27 15:04:05.000000000 +0200 ++++ deskbar-applet-2.19.91.new/deskbar/core/keybinder/Makefile.in 2007-08-27 17:32:29.005587647 +0200 +@@ -36,9 +36,8 @@ + DIST_COMMON = $(_keybinder_PYTHON) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \ +- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -Nur deskbar-applet-2.19.91/deskbar/core/Makefile.in deskbar-applet-2.19.91.new/deskbar/core/Makefile.in +--- deskbar-applet-2.19.91/deskbar/core/Makefile.in 2007-08-27 15:04:05.000000000 +0200 ++++ deskbar-applet-2.19.91.new/deskbar/core/Makefile.in 2007-08-27 17:32:28.505561804 +0200 +@@ -35,9 +35,8 @@ + DIST_COMMON = $(deskbar_core_PYTHON) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \ +- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -Nur deskbar-applet-2.19.91/deskbar/core/updater/Makefile.in deskbar-applet-2.19.91.new/deskbar/core/updater/Makefile.in +--- deskbar-applet-2.19.91/deskbar/core/updater/Makefile.in 2007-08-27 15:04:05.000000000 +0200 ++++ deskbar-applet-2.19.91.new/deskbar/core/updater/Makefile.in 2007-08-27 17:32:29.005587647 +0200 +@@ -35,9 +35,8 @@ + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(updater_PYTHON) + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \ +- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -Nur deskbar-applet-2.19.91/deskbar/handlers/actions/Makefile.in deskbar-applet-2.19.91.new/deskbar/handlers/actions/Makefile.in +--- deskbar-applet-2.19.91/deskbar/handlers/actions/Makefile.in 2007-08-27 15:04:05.000000000 +0200 ++++ deskbar-applet-2.19.91.new/deskbar/handlers/actions/Makefile.in 2007-08-27 17:32:29.005587647 +0200 +@@ -35,9 +35,8 @@ + DIST_COMMON = $(deskbar_actions_PYTHON) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \ +- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -Nur deskbar-applet-2.19.91/deskbar/handlers/evolution/Makefile.in deskbar-applet-2.19.91.new/deskbar/handlers/evolution/Makefile.in +--- deskbar-applet-2.19.91/deskbar/handlers/evolution/Makefile.in 2007-08-27 15:04:05.000000000 +0200 ++++ deskbar-applet-2.19.91.new/deskbar/handlers/evolution/Makefile.in 2007-08-27 17:32:29.005587647 +0200 +@@ -36,9 +36,8 @@ + DIST_COMMON = $(_evolution_PYTHON) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \ +- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -Nur deskbar-applet-2.19.91/deskbar/handlers/gdmclient/Makefile.in deskbar-applet-2.19.91.new/deskbar/handlers/gdmclient/Makefile.in +--- deskbar-applet-2.19.91/deskbar/handlers/gdmclient/Makefile.in 2007-08-27 15:04:06.000000000 +0200 ++++ deskbar-applet-2.19.91.new/deskbar/handlers/gdmclient/Makefile.in 2007-08-27 17:32:29.505613489 +0200 +@@ -36,9 +36,8 @@ + DIST_COMMON = $(_gdmclient_PYTHON) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \ +- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -Nur deskbar-applet-2.19.91/deskbar/handlers/Makefile.in deskbar-applet-2.19.91.new/deskbar/handlers/Makefile.in +--- deskbar-applet-2.19.91/deskbar/handlers/Makefile.in 2007-08-27 15:04:05.000000000 +0200 ++++ deskbar-applet-2.19.91.new/deskbar/handlers/Makefile.in 2007-08-27 17:32:29.005587647 +0200 +@@ -38,9 +38,8 @@ + $(deskbar_handlers_modules_PYTHON) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \ +- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -Nur deskbar-applet-2.19.91/deskbar/interfaces/Makefile.in deskbar-applet-2.19.91.new/deskbar/interfaces/Makefile.in +--- deskbar-applet-2.19.91/deskbar/interfaces/Makefile.in 2007-08-27 15:04:06.000000000 +0200 ++++ deskbar-applet-2.19.91.new/deskbar/interfaces/Makefile.in 2007-08-27 17:32:29.505613489 +0200 +@@ -35,9 +35,8 @@ + DIST_COMMON = $(deskbar_interfaces_PYTHON) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \ +- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -Nur deskbar-applet-2.19.91/deskbar/Makefile.in deskbar-applet-2.19.91.new/deskbar/Makefile.in +--- deskbar-applet-2.19.91/deskbar/Makefile.in 2007-08-27 15:04:05.000000000 +0200 ++++ deskbar-applet-2.19.91.new/deskbar/Makefile.in 2007-08-27 17:32:28.505561804 +0200 +@@ -36,9 +36,8 @@ + DIST_COMMON = $(deskbar_PYTHON) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/defs.py.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \ +- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -Nur deskbar-applet-2.19.91/deskbar/osutils/Makefile.in deskbar-applet-2.19.91.new/deskbar/osutils/Makefile.in +--- deskbar-applet-2.19.91/deskbar/osutils/Makefile.in 2007-08-27 15:04:06.000000000 +0200 ++++ deskbar-applet-2.19.91.new/deskbar/osutils/Makefile.in 2007-08-27 17:32:29.505613489 +0200 +@@ -36,9 +36,8 @@ + DIST_COMMON = $(_osutils_PYTHON) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \ +- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -Nur deskbar-applet-2.19.91/deskbar/ui/cuemiac/Makefile.in deskbar-applet-2.19.91.new/deskbar/ui/cuemiac/Makefile.in +--- deskbar-applet-2.19.91/deskbar/ui/cuemiac/Makefile.in 2007-08-27 15:04:06.000000000 +0200 ++++ deskbar-applet-2.19.91.new/deskbar/ui/cuemiac/Makefile.in 2007-08-27 17:32:29.505613489 +0200 +@@ -35,9 +35,8 @@ + DIST_COMMON = $(deskbar_cuemiac_PYTHON) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \ +- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -Nur deskbar-applet-2.19.91/deskbar/ui/iconentry/Makefile.in deskbar-applet-2.19.91.new/deskbar/ui/iconentry/Makefile.in +--- deskbar-applet-2.19.91/deskbar/ui/iconentry/Makefile.in 2007-08-27 15:04:06.000000000 +0200 ++++ deskbar-applet-2.19.91.new/deskbar/ui/iconentry/Makefile.in 2007-08-27 17:32:30.005639332 +0200 +@@ -36,9 +36,8 @@ + DIST_COMMON = $(_iconentry_PYTHON) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \ +- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -Nur deskbar-applet-2.19.91/deskbar/ui/Makefile.in deskbar-applet-2.19.91.new/deskbar/ui/Makefile.in +--- deskbar-applet-2.19.91/deskbar/ui/Makefile.in 2007-08-27 15:04:06.000000000 +0200 ++++ deskbar-applet-2.19.91.new/deskbar/ui/Makefile.in 2007-08-27 17:32:29.505613489 +0200 +@@ -35,9 +35,8 @@ + DIST_COMMON = $(deskbar_ui_PYTHON) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \ +- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -Nur deskbar-applet-2.19.91/deskbar/ui/preferences/Makefile.in deskbar-applet-2.19.91.new/deskbar/ui/preferences/Makefile.in +--- deskbar-applet-2.19.91/deskbar/ui/preferences/Makefile.in 2007-08-27 15:04:06.000000000 +0200 ++++ deskbar-applet-2.19.91.new/deskbar/ui/preferences/Makefile.in 2007-08-27 17:32:30.005639332 +0200 +@@ -35,9 +35,8 @@ + DIST_COMMON = $(deskbar_preferences_PYTHON) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \ +- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -Nur deskbar-applet-2.19.91/help/Makefile.in deskbar-applet-2.19.91.new/help/Makefile.in +--- deskbar-applet-2.19.91/help/Makefile.in 2007-08-27 15:04:06.000000000 +0200 ++++ deskbar-applet-2.19.91.new/help/Makefile.in 2007-08-27 17:32:30.005639332 +0200 +@@ -59,9 +59,8 @@ + $(top_srcdir)/gnome-doc-utils.make ChangeLog + subdir = help + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \ +- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -Nur deskbar-applet-2.19.91/Makefile.in deskbar-applet-2.19.91.new/Makefile.in +--- deskbar-applet-2.19.91/Makefile.in 2007-08-27 15:04:06.000000000 +0200 ++++ deskbar-applet-2.19.91.new/Makefile.in 2007-08-27 17:32:30.005639332 +0200 +@@ -38,9 +38,8 @@ + TODO config.guess config.sub depcomp install-sh ltmain.sh \ + missing mkinstalldirs py-compile + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \ +- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ --- deskbar-applet-2.22.2.1.orig/debian/patches/05_fix_python_m4_macros.patch +++ deskbar-applet-2.22.2.1/debian/patches/05_fix_python_m4_macros.patch @@ -0,0 +1,94 @@ +# Description: requires change to do a python-dbg build +# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=499707 +# +diff -Nur deskbar-applet-2.19.6/acinclude.m4 deskbar-applet-2.19.6.new/acinclude.m4 +--- deskbar-applet-2.19.6/acinclude.m4 2007-08-06 13:17:52.000000000 +0200 ++++ deskbar-applet-2.19.6.new/acinclude.m4 2007-08-06 22:52:16.812967021 +0200 +@@ -38,3 +38,69 @@ + prefix=$prefix_save + exec_prefix=$exec_prefix_save + ]) ++## this one is commonly used with AM_PATH_PYTHONDIR ... ++dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]]) ++dnl Check if a module containing a given symbol is visible to python. ++AC_DEFUN([AM_CHECK_PYMOD], ++[AC_REQUIRE([AM_PATH_PYTHON]) ++py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'` ++AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1) ++AC_CACHE_VAL(py_cv_mod_$py_mod_var, [ ++ifelse([$2],[], [prog=" ++import sys ++try: ++ import $1 ++except ImportError: ++ sys.exit(1) ++except: ++ sys.exit(0) ++sys.exit(0)"], [prog=" ++import $1 ++$1.$2"]) ++if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC ++ then ++ eval "py_cv_mod_$py_mod_var=yes" ++ else ++ eval "py_cv_mod_$py_mod_var=no" ++ fi ++]) ++py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"` ++if test "x$py_val" != xno; then ++ AC_MSG_RESULT(yes) ++ ifelse([$3], [],, [$3 ++])dnl ++else ++ AC_MSG_RESULT(no) ++ ifelse([$4], [],, [$4 ++])dnl ++fi ++]) ++ ++dnl a macro to check for ability to create python extensions ++dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE]) ++dnl function also defines PYTHON_INCLUDES ++AC_DEFUN([AM_CHECK_PYTHON_HEADERS], ++[AC_REQUIRE([AM_PATH_PYTHON]) ++AC_MSG_CHECKING(for headers required to compile python extensions) ++dnl deduce PYTHON_INCLUDES ++py_prefix=`$PYTHON -c "import sys; print sys.prefix"` ++py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` ++if $PYTHON-config --help 2>/dev/null; then ++PYTHON_INCLUDES=`$PYTHON-config --includes 2>/dev/null` ++else ++PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" ++if test "$py_prefix" != "$py_exec_prefix"; then ++ PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" ++fi ++fi ++AC_SUBST(PYTHON_INCLUDES) ++dnl check if the headers exist: ++save_CPPFLAGS="$CPPFLAGS" ++CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" ++AC_TRY_CPP([#include ],dnl ++[AC_MSG_RESULT(found) ++$1],dnl ++[AC_MSG_RESULT(not found) ++$2]) ++CPPFLAGS="$save_CPPFLAGS" ++]) +diff -Nur deskbar-applet-2.19.6/m4/python.m4 deskbar-applet-2.19.6.new/m4/python.m4 +--- deskbar-applet-2.19.6/m4/python.m4 2007-08-06 13:17:43.000000000 +0200 ++++ deskbar-applet-2.19.6.new/m4/python.m4 2007-08-06 22:52:16.812967021 +0200 +@@ -45,10 +45,14 @@ + dnl deduce PYTHON_INCLUDES + py_prefix=`$PYTHON -c "import sys; print sys.prefix"` + py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` ++if $PYTHON-config --help 2>/dev/null; then ++PYTHON_INCLUDES=`$PYTHON-config --includes 2>/dev/null` ++else + PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" + if test "$py_prefix" != "$py_exec_prefix"; then + PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" + fi ++fi + AC_SUBST(PYTHON_INCLUDES) + dnl check if the headers exist: + save_CPPFLAGS="$CPPFLAGS" --- deskbar-applet-2.22.2.1.orig/debian/patches/100-enable-tracker.patch +++ deskbar-applet-2.22.2.1/debian/patches/100-enable-tracker.patch @@ -0,0 +1,11 @@ +--- a/data/deskbar-applet.schemas.in ++++ b/data/deskbar-applet.schemas.in +@@ -50,7 +50,7 @@ + deskbar + list + string +- [HistoryHandler,ProgramsHandler,EvolutionHandler,WebAddressHandler,FileFolderHandler,EpiphanyBookmarksHandler,EpiphanySearchHandler,MozillaBookmarksHandler,MozillaSearchHandler] ++ [HistoryHandler,ProgramsHandler,EvolutionHandler,WebAddressHandler,FileFolderHandler,EpiphanyBookmarksHandler,EpiphanySearchHandler,MozillaBookmarksHandler,MozillaSearchHandler,TrackerSearchToolHandler,TrackerLiveSearchHandler] + + Enabled handlers + The list of exported class names of the enabled handlers sorted by priority. Leftmost has highest priority --- deskbar-applet-2.22.2.1.orig/debian/patches/01_fix_python_interpreter.patch +++ deskbar-applet-2.22.2.1/debian/patches/01_fix_python_interpreter.patch @@ -0,0 +1,10 @@ +diff -Nur deskbar-applet-2.19.90/deskbar/deskbar-applet.py deskbar-applet-2.19.90.new/deskbar/deskbar-applet.py +--- deskbar-applet-2.19.90/deskbar/deskbar-applet.py 2007-08-13 19:07:20.000000000 +0200 ++++ deskbar-applet-2.19.90.new/deskbar/deskbar-applet.py 2007-08-14 11:03:16.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + import gtk, gtk.gdk + import sys + from os.path import abspath, join, dirname, exists + --- deskbar-applet-2.22.2.1.orig/debian/copyright +++ deskbar-applet-2.22.2.1/debian/copyright @@ -0,0 +1,27 @@ +This package was debianized by Tollef Fog Heen on +Tue, 4 Oct 2005 12:23:19 +0200. + +It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/deskbar-applet/ + +Copyright Holder: Nigel Tao + Raphael Slinckx + Mikkel Kamstrup Erlandsen + +License: + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +A full copy of the GPL can be found in /usr/share/common-licenses/GPL on most +Debian systems. --- deskbar-applet-2.22.2.1.orig/debian/watch +++ deskbar-applet-2.22.2.1/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://ftp.gnome.org/pub/gnome/sources/deskbar-applet/([\d.]+)[02468]/deskbar-applet-(.*).tar.gz --- deskbar-applet-2.22.2.1.orig/debian/control +++ deskbar-applet-2.22.2.1/debian/control @@ -0,0 +1,67 @@ +Source: deskbar-applet +Section: gnome +Priority: optional +Maintainer: Ubuntu Core developers +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: Debian GNOME Maintainers +Build-Depends: cdbs (>= 0.4.43), + debhelper (>= 5.0.38), + autotools-dev, + pkg-config (>= 0.9.0), + python-gtk2-dev (>= 2.10), + python-glade2 (>= 2.8.6-1), + python-gnome2-dev (>= 2.12.4-1), + python-gnome2-desktop-dev, + python-all-dev, + python-all-dbg, + python-gnome2-dbg, + python-gnome2-extras-dbg, + intltool (>= 0.33), + python-dev (>= 2.4), + libgtk2.0-dev (>= 2.10), + libebook1.2-dev, + libcamel1.2-dev, + libgnome-desktop-dev, + python-central (>= 0.5.6), + gnome-pkg-tools (>= 0.11), + gnome-doc-utils, + scrollkeeper, + python-dbus (>= 0.80) +Standards-Version: 3.7.3 +XS-Python-Version: >= 2.4 +XS-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/deskbar-applet + +Package: deskbar-applet +Architecture: any +XB-Python-Version: ${python:Versions} +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${python:Depends}, + python-gtk2 (>= 2.8.6-1), + python-glade2 (>= 2.8.6-1), + python-gnome2 (>= 2.12.4-1), + python-gnome2-desktop, + python-dbus +Recommends: python-beagle (>= 0.2.8), + python-soappy (>= 0.11.3-1.6), + gnome-utils (>= 2.14.0) +Provides: ${python:Provides} +Description: universal search and navigation bar for GNOME + Deskbar-applet is intended as a browser-like keyword-driven url bar. + You type a web address, or an email address, or a file name, or some + keyword then the arguments, and it shows a popup with possible choices + from there. Like 'Search google for foo'. + . + Homepage: http://raphael.slinckx.net/deskbar/ + +Package: deskbar-applet-dbg +Priority: extra +Architecture: any +XB-Python-Version: ${python:Versions} +Depends: deskbar-applet (= ${binary:Version}), python-dbg, python-dbus-dbg, python-gnome2-dbg, python-gtk2-dbg, python-gnome2-extras-dbg, python-glade2-dbg, python-gobject-dbg, ${shlibs:Depends} +Description: keyword-driven navigational bar for GNOME (python debug build) + this is a GNOME applet which allows easy access to search engines, + local files and programs based on keywords instead of having to type + a fully-qualified path. + . + This package contains the extensions built for the python debug interpreter. --- deskbar-applet-2.22.2.1.orig/debian/deskbar-applet.postinst +++ deskbar-applet-2.22.2.1/debian/deskbar-applet.postinst @@ -0,0 +1,15 @@ +#!/bin/sh -e + +# Version 2.18.1-1 started shipping /var/lib/scrollkeeper erroneously, +# hence the database was overwritten and needs a full rebuild. +if [ "$1" = "configure" ] \ + && dpkg --compare-versions "$2" ge "2.18.1-1" \ + && dpkg --compare-versions "$2" lt "2.18.1-2" \ + && which scrollkeeper-rebuilddb >/dev/null 2>&1; then + echo "Upgrade from broken deskbar-applet version detected, running scrollkeeper-rebuilddb..." + scrollkeeper-rebuilddb -q +fi + +#DEBHELPER# + +exit 0 --- deskbar-applet-2.22.2.1.orig/debian/rules +++ deskbar-applet-2.22.2.1/debian/rules @@ -0,0 +1,104 @@ +#! /usr/bin/make -f +# -*- makefile -*- + +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/gnome-pkg-tools/1/rules/uploaders.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +PY_VERSIONS := $(shell pyversions -vr) +PY_DEFAULT := $(shell pyversions -vd) +PY_OTHERVERS := $(filter-out $(PY_DEFAULT), $(PY_VERSIONS)) + +DEB_DBG_PACKAGE_deskbar-applet = deskbar-applet-dbg +DEB_COMPRESS_EXCLUDE = .py + +DEB_BUILDDIR := build-$(PY_DEFAULT) +DEB_DESTDIR = $(CURDIR)/debian/deskbar-applet + +# The --datadir option is required. If it is not manually set, the file +# deskbar/defs.py contains the line +# DATADIR = "${prefix}/share" +# which obviously won't work in Python code. See also bug #378080. +DEB_CONFIGURE_EXTRA_FLAGS += \ + --datadir=/usr/share \ + --disable-scrollkeeper + +# New python policy +binary-install/deskbar-applet:: + dh_pycentral -pdeskbar-applet handlers /usr/lib/deskbar-applet/handlers + +.PRECIOUS: configure-stamp-% dbg-configure-stamp-% + +configure/deskbar-applet:: + : # the help cannot be built in a separate builddir, take the cluebat + sed -i 's,`pwd`/\(\$$(_DOC_OMF_IN)\),\1,' $(DEB_BUILDDIR)/help/Makefile + [ -f configure-stamp-$(PY_DEFAULT) ] || touch configure-stamp-$(PY_DEFAULT) + +configure-stamp-%: + rm -rf build-$* + mkdir build-$* + cd build-$* && PYTHON=/usr/bin/python$* $(DEB_CONFIGURE_SCRIPT_ENV) \ + $(DEB_CONFIGURE_SCRIPT) \ + $(DEB_CONFIGURE_NORMAL_ARGS) \ + $(DEB_CONFIGURE_EXTRA_FLAGS) \ + $(DEB_CONFIGURE_USER_FLAGS) + touch $@ + +dbg-configure-stamp-%: + rm -rf dbg-build-$* + mkdir dbg-build-$* + cd dbg-build-$* && PYTHON=/usr/bin/python$*-dbg $(subst -O2,-O0,$(DEB_CONFIGURE_SCRIPT_ENV)) \ + $(DEB_CONFIGURE_SCRIPT) \ + $(DEB_CONFIGURE_NORMAL_ARGS) \ + $(DEB_CONFIGURE_EXTRA_FLAGS) \ + $(DEB_CONFIGURE_USER_FLAGS) + touch $@ + +configure/deskbar-applet:: $(addprefix configure-stamp-, $(PY_OTHERVERS)) +configure/deskbar-applet-dbg:: $(addprefix dbg-configure-stamp-, $(PY_VERSIONS)) + +build/deskbar-applet:: + [ -f build-stamp-$(PY_DEFAULT) ] || touch build-stamp-$(PY_DEFAULT) + cd po; intltool-update -p + +build-stamp-%: + # cdbs already built all for the default python + make -C build-$*/deskbar + touch $@ + +dbg-build-stamp-%: + make -C dbg-build-$*/deskbar + touch $@ + +build/deskbar-applet:: $(addprefix build-stamp-, $(PY_OTHERVERS)) +build/deskbar-applet-dbg:: $(addprefix dbg-build-stamp-, $(PY_VERSIONS)) + +install-stamp-%: + make -C build-$*/deskbar install \ + prefix=/usr DESTDIR=$(CURDIR)/debian/deskbar-applet + +dbg-install-stamp-%: + make -C dbg-build-$*/deskbar install \ + prefix=/usr DESTDIR=$(CURDIR)/debian/deskbar-applet-dbg + +install/deskbar-applet-dbg:: $(addprefix dbg-install-stamp-, $(PY_VERSIONS)) + for i in $$(find debian/desk*-dbg/usr/lib/py* -name '*.so'); do \ + b=$$(basename $$i .so); \ + mv $$i $$(dirname $$i)/$${b}_d.so; \ + done + find debian/desk*-dbg ! -type d ! -name '*_d.so' | xargs rm -f + find debian/desk*-dbg -depth -empty -exec rmdir {} \; + +install/deskbar-applet:: $(addprefix install-stamp-, $(PY_OTHERVERS)) + find debian/deskbar-applet -name '*.py[co]' -o -name '*.la' | xargs -r rm -f + rm -rf debian/deskbar-applet/var/lib/scrollkeeper + +binary-predeb/deskbar-applet-dbg:: + rm -rf debian/deskbar-applet-dbg/usr/share/doc/deskbar-applet-dbg + ln -s deskbar-applet debian/deskbar-applet-dbg/usr/share/doc/deskbar-applet-dbg + +clean:: + rm -f *-stamp-* + rm -rf build-* dbg-build-* --- deskbar-applet-2.22.2.1.orig/debian/changelog +++ deskbar-applet-2.22.2.1/debian/changelog @@ -0,0 +1,529 @@ +deskbar-applet (2.22.2.1-0ubuntu1) hardy-proposed; urgency=low + + * New upstream versions: + - Fixed bug #534972: Exception in DeliciousHandler + - When checking firefox version. Wait until the process terminated to + avoid zombie processes. (lp: #209662) + - Fixed bug #520278: Window in sticky mode too small + - desklicious.py: Replace all whitespaces in query with spaces. + Catch exception that might appear during parsing and cleanup correctly + in any case. + - yahoo.py: Catch exception that might appear during parsing and cleanup + correctly in any case. + - Adjust layout when applet is moved from one panel to another + - Fixed crash when two modules with same name should be loaded. + Warn instead. + - Fixed bug #530057: Catch GError when making beagle call + - Fixed bug #527023: KeyError in beagle-live, when only directories are + returned by beagle + - Fixed bug #522585: Crash when changing default browser + - Added support for iceweasel browser. When the default browser is changed + mozilla and iceweasel are supported, too. When Firefox is used and the + command must contain firefox instead of being exactly firefox + - Use subprocess module instead of os.popen. + Catch OSError when retrieving version + + -- Sebastien Bacher Wed, 28 May 2008 12:24:14 +0200 + +deskbar-applet (2.22.1-0ubuntu1) hardy; urgency=low + + * New upstream version: + - Fixed bug #522486: Use gtk.Tooltips to set tooltip + - Only store window position when window UI is used + - Catch dbus.DBusException in __is_nsm_available + - Fixed: Forgot to set priority for matches in mozilla and tomboy modules + - Fixed: Error dialog appears when installing a valid module after + an invalid one has been installed. + - When a command to open a file has arguments itsself move them over to + the arguments list + - Fixed exception when changing default browser while preferences + window is open + - load_icon returns None if fall back icon 'stock_unknown' is not present + in the theme + - Added check if SVG images are supported by gtk+ + + -- Sebastien Bacher Tue, 08 Apr 2008 00:02:15 +0200 + +deskbar-applet (2.22.0.1-0ubuntu1) hardy; urgency=low + + * New upstream release (LP: #200998) + - Fixed: Detect tomboy version correctly + + -- Pedro Fragoso Tue, 11 Mar 2008 13:54:28 +0000 + +deskbar-applet (2.22.0-0ubuntu1) hardy; urgency=low + + * New upstream release (LP: #200759) + - Provided better fix for bug #510769: list index out of range in CuemiacModel + - Fixed bug #513076: Entry doesn't get focus in sticky mode (LP: #187228) + - Fixed bug #518941: 'bool' object has no attribute 'find' + - When the default browser changes only stop those modules that have been enabled before. (fixes bug #513402) + - Fixed bug #518984: Pressing reload button more than once causes an exception. + - Updated translations + + -- Pedro Fragoso Mon, 10 Mar 2008 18:04:46 +0000 + +deskbar-applet (2.21.92-0ubuntu2) hardy; urgency=low + + * Rebuild with updated python-central. + + -- Matthias Klose Sun, 02 Mar 2008 18:38:58 +0000 + +deskbar-applet (2.21.92-0ubuntu1) hardy; urgency=low + + * New upstream release (lp: #195565) + - Check that Firefox is between 2.0.0 and 3.0.0 since FF 3.0 stores + everything in an sqlite db we cannot read + - Show lingering window when activating actions with the keyboard + + -- Pedro Fragoso Mon, 25 Feb 2008 20:32:45 +0000 + +deskbar-applet (2.21.91-0ubuntu1) hardy; urgency=low + + * New upstream release (LP: #191099) + - Added section about new UI to documentation + - Fixed bug #510769: list index out of range + in CuemiacModel (LP: #187228) + - Fixed bug #450960: Exception in epiphany module + - Fixed bug #506927: Ignore applications that have None as command + + -- Pedro Fragoso Mon, 11 Feb 2008 22:03:53 +0000 + +deskbar-applet (2.21.90.1-0ubuntu1) hardy; urgency=low + + * New upstream release (LP: #187173) + - Fixed AttributeError in remove_module method in ModuleList. + + -- Pedro Fragoso Tue, 29 Jan 2008 21:55:08 +0000 + +deskbar-applet (2.21.90-0ubuntu1) hardy; urgency=low + + * New upstream release (LP: #186839) + - Re-Introduced the old Button UI. + - Fixed bug #509126: Show hint that more beagle results are available + - Fixed bug #452205: Deskbar does not notice when preferred browser changed for web searches + - Added section about installing modules to documentation. + * Bump to Standards-Version 3.7.3 + * Fix minor lintian warnings (Source-Version -> binary:Version) + + -- Pedro Fragoso Mon, 28 Jan 2008 22:42:20 +0000 + +deskbar-applet (2.21.5-0ubuntu1) hardy; urgency=low + + * New upstream version: + - Added tomboy module + - Fixed bug #504875: cannot concatenate 'str' and 'NoneType' + objects in beagle-live.py + - Fixed bug #382127: devhelp handler is broken + - Fixed bug #350597: "Send a mail" to a contact list adds only the first + contact to "To:" + - Added button to preference to reload all modules. + Fixes bug #356008: a 'reload all scripts' button on the deskbar applet. + - Re-added LingeringSelectionWindow for CuemiacTreeView + and CuemiacActionsTreeView + - Catching RuntimeException in OpenFileAction.is_valid and return False + if it occurs + - Fixed bug #508326: The window title is not translatable + - Catch Exception when loading history to prevent + that bugzilla pops up when history file is corrupted + - Fixed bug #507414: AttributeError in del.ico.us module + - Be compatible with older versions of OpenDesktopFileAction.py that had + no attribute '_prog' + - Fixed bug #509058: list index out of range in tomboy.py + - Fixed bug #509127: Execute previous search (patch by Andreas Kühntopf). + When you cycle through previous searches with up/down keys pressing enter + will re-run the search. + + -- Sebastien Bacher Tue, 15 Jan 2008 11:41:08 +0100 + +deskbar-applet (2.21.4-0ubuntu1) hardy; urgency=low + + * New upstream version: + - Fixed: Doesn't load modules from one file when only one + of them has missing requirements + - load_icon returns "stock_unknown" icon if given icon is not available + - Fixed bug #351817: Adding gnome templates to deskbar applet + - Mark action as invalid if no default application is registered + to open the file. However, Deskbar-Applet does not respect + invalid actions, yet. + - Fixed bug #490297: Window role for search window. + Window role set to "deskbar-search-window" + + -- Sebastien Bacher Tue, 18 Dec 2007 10:38:57 +0100 + +deskbar-applet (2.21.3-0ubuntu1) hardy; urgency=low + + * New upstream version: + Changes: + - Added action to edit evolution contacts + - Changed icon for category people to stock_people + - Added icons for matches of gdmactions module + - Added has_requirements method for GnomeDictHandler, + GnomeSearchHandler and DevhelpHandler + - Load icons from user's modules dir, too + - Fixed bug #479091: KeyError in _on_snippet_closed + - Fixed bug #471672: 'NoneType' object has no attribute 'get_actions' + - Fixed bug #499706: add iceweasel as firefox equivalent + - Fixed bug #406100: Deskbar "Computer Actions" could ask for confirmation + * debian/patches/100-iceweasel-compat.patch: + - dropped, fixed with the new version + + -- Sebastien Bacher Tue, 04 Dec 2007 11:40:47 +0100 + +deskbar-applet (2.21.2-0ubuntu2) hardy; urgency=low + + * debian/control.in: + - updated dbg Build-Depends + + -- Sebastien Bacher Mon, 26 Nov 2007 13:34:14 +0100 + +deskbar-applet (2.21.2-0ubuntu1) hardy; urgency=low + + * New upstream version: + Changes: + - Fixed: Layout is destroyed when changing font size. + Used relative values instead of absolutes. + - Fixed bug #488047: Propagate the return value on + CuemiacEntry::key-press-event back to the entry so that 'handled' is + properly detected and ::key-press-event doesn't get emitted twice. + - Fixed bug #488066: deskbar applet should use complete vertical panel space + - Fixed: Doesn't unbind keybinding when it changes. + - Fixed bug #490981: Buttons aren't insensitive when no module is selected + - Fixed bug #472568: Deskbar launches file texts as programs + - Fixed: Cannot browse history when pressing up/down key. Show blank entry + when no newer history items are available. Skip ChooseFromHistoryAction + when browsing history. Show deskbar icon if history item has no icon + - Fixed bug #489312: action list didn't show binary names + - Remove on_key_press method of ProgramsHandler class and add new action + "Execute in terminal" + - Replaced Match's get_hash(self, text=None) with get_hash(self), + because second argument is never provided + - Always show description (get_verb() % get_name()) of default action + * debian/control.in: + - Build-Depends on python-all-dev + * debian/patches/100-gpm-methods.patch: + - dropped, the change is not correct + + -- Sebastien Bacher Mon, 26 Nov 2007 11:09:25 +0100 + +deskbar-applet (2.20.1-1ubuntu1) hardy; urgency=low + + * Sync with Debian + * debian/control.in: + - Build-Depends on python-all-dbg + - list debug variant + - updated maintainer information + - use XS-Vcs-Bzr tag + * debian/patches/01_fix_python_interpreter.patch: + - use "/usr/bin/python" rather than "env python" (Ubuntu: #79234) + * debian/patches/05_fix_python_m4_macros.patch: + - changes required for the debug build + * debian/patches/90_aclocal+autoconf+automake.patch: + - run autotools update + * debian/rules: + - build debug variant + + -- Sebastien Bacher Sun, 25 Nov 2007 11:32:21 +0100 + +deskbar-applet (2.20.1-1) unstable; urgency=low + + * New upstream stable release. + * debian/control.in: Add build-dep on python-dbus (>= 0.80). + * debian/patches/100-enable-tracker.patch: Also enable live search handler. + * debian/patches/200-gconf-schema-fix.patch: Dropped, merged upstream. + * debian/patches/200-browsermatch-crash.patch: Ditto. + + -- Romain Francoise Mon, 15 Oct 2007 20:59:00 +0200 + +deskbar-applet (2.20.0-1) unstable; urgency=low + + * New upstream release. + + * debian/control.in: Bump build-deps to match upstream requirements. + + * debian/patches/100-iceweasel-compat.patch: Resync against new upstream. + * debian/patches/100-gpm-methods.patch: Ditto. + * debian/patches/100-fix-pythonlib.patch: Dropped. + * debian/patches/100-enable-tracker.patch: New patch taken from Ubuntu + to enable the tracker plugin if present. + * debian/patches/200-gconf-schema-fix.patch: New patch, fixes missing + entries in gconf schema. + * debian/patches/200-browsermatch-crash.patch: New patch, fixes crash when + accessing a bookmark via a smart bookmark prefix. + + -- Romain Francoise Sat, 22 Sep 2007 14:03:36 +0200 + +deskbar-applet (2.18.1-2) unstable; urgency=low + + * debian/patches/100-gpm-methods.patch: New patch stolen from Ubuntu, + fixes the gnome-power-manager dbus calls in the gdm handler. + * debian/patches/100-fix-pythonlib.patch: New patch stolen from Ubuntu, + avoids hardcoding the Python version in deskbar-applet.py. + + * debian/rules: Pass --disable-scrollkeeper to avoid shipping + scrollkeeper files in the package. + * debian/deskbar-applet.postinst: Rebuild scrollkeeper database if + upgrading from a broken version. + + -- Romain Francoise Thu, 07 Jun 2007 20:54:19 +0200 + +deskbar-applet (2.18.1-1) unstable; urgency=low + + [ Romain Francoise ] + * New upstream release (closes: #388688): + + Builds with newer libebook versions (closes: #421132, #423597, #424508). + + Now groks opensearch engine definitions (closes: #404946). + + Handles Firefox Live Bookmarks correctly (closes: #387724). + + * Transfer ownership of this package to the Debian GNOME team: + + debian/control.in: New file copied from debian/control. + Set Maintainer to the team address, and use @GNOME_TEAM@ for + Uploaders. Add build-dependency on gnome-pkg-tools (>= 0.11). + + debian/rules: Include uploaders.mk from gnome-pkg-tools. + + Acknowledge NMUs, thanks to Steinar H. Gunderson (closes: #397746). + + * debian/patches/200-use-python-2.4.diff: Dropped; upstream and Debian + now use Python 2.4 by default. + * debian/patches/100-iceweasel-compat.patch: New patch; look for search + engines in Iceweasel's directories, thanks to Rene Hausleitner + (closes: #410629). + + * debian/control.in: + + Add dependency on python-dbus, needed by the new GDM actions handler. + + Add build-dependency on gnome-doc-utils and scrollkeeper. + * debian/watch: Update. + + [ Loic Minier ] + * Fix URL in copyright. + * Track all stable versions in watch file. + * Wrap build-deps and deps. + * Add debian/pycompat file with version 2. + * Add get-orig-source target to retrieve the upstream source. + + -- Romain Francoise Wed, 06 Jun 2007 20:47:23 +0200 + +deskbar-applet (2.14.2-4.2) unstable; urgency=medium + + * Non-maintainer upload. + * Switch to python-central instead of python-support, which should hopefully + work better with deskbar-applet (ie.: at least make the application start) + since it handles sys.path.insert() more gracefully; thanks to Loic Minier + for telling me about this. (Closes: #397600) + * Change XS-Python-Version: to >= 2.4, as the automake patches already assume + that. + + -- Steinar H. Gunderson Thu, 9 Nov 2006 00:50:48 +0100 + +deskbar-applet (2.14.2-4.1) unstable; urgency=medium + + * Non-maintainer upload. + * New python policy transition, using python-support; based on patch + from Luis Rodrigo Gallardo Cruz. (Closes: #394178, #380771) + * Build-depend versioned on cdbs and debhelper. + * Build-depend on python-all-dev instead of python2.4-dev. + * Build-depend on python-support (>= 0.5.3). + * Add XB-Python-Version and XS-Python-Version fields. + * Recommend python-beagle instead of python2.4-beagle. + * Add dh_pysupport call to the binary-install target in debian/rules. + * Add Provides: ${python:Provides}. + + -- Steinar H. Gunderson Tue, 7 Nov 2006 02:33:35 +0100 + +deskbar-applet (2.14.2-4) unstable; urgency=low + + * debian/control: Restored build dependencies. + + Closes: #378376 "FTBFS: No package 'pygtk-2.0' found" + + -- Sebastian Rittau Sat, 15 Jul 2006 21:07:14 +0200 + +deskbar-applet (2.14.2-3) unstable; urgency=low + + * debian/control: Removed build dependency on python-gnome2-extras-dev and + dependency on python-gnome2-extras. All required modules are now in + package python-gnome2-desktop. + * debian/control: Build dependency clean up: Removed some probably dead + build dependencies, upgraded minimum required versions of others. + * debian/control: Updated dependencies and recommends on several Python + packages to post-transition versions. This ensures that these packages + contain the Python 2.4 version of the module. + + Closes: #377041 "Traceback on start, import error on gobject" (Thanks, + Stéphane Rosi and John Halton for reporting this bug.) + * debian/control: Changed recommends from python-beagle to python2.4-beagle + for now, since beagle was not yet converted to the new Python policy. + + Closes: #377823 "Recommends unavailable python-beagle (>= 0.2.6-1)" + + -- Sebastian Rittau Sat, 15 Jul 2006 16:16:05 +0200 + +deskbar-applet (2.14.2-2) unstable; urgency=low + + * debian/control: (Build-) depend on python-gnome-desktop. + * debian/rules: Manually pass --datadir to ./configure. Otherwise + deskbar/defs.py would contain the line + DATA_DIR = "${prefix}/share" + which doesn't make much sense in Python. + + Closes: #378080 "${prefix} in icon path" + + -- Sebastian Rittau Thu, 13 Jul 2006 16:39:46 +0200 + +deskbar-applet (2.14.2-1) unstable; urgency=low + + * New upstream version. + + debian/patches/100-fix-mozilla-conf.diff: Removed, applied upstream. + + debian/patches/200-use-python-2.4.diff: Updated. + * debian/control: Recommend gnome-utils >= 2.14.0. + + Closes: #367695 "programs.GnomeDictMatch: cannot look up multi-word + definitions" + * debian/control: Changed dependencies on pythonX.Y-* to python-*. + * debian/control: Added dependency on python2.4. + * debian/control: Improved the package description. (Long description + taken from the Ubuntu package.) + + -- Sebastian Rittau Wed, 28 Jun 2006 21:24:03 +0200 + +deskbar-applet (2.14.1.1-4) unstable; urgency=low + + * Fix FTBFS. + + debian/control: For each python-*-dev package, depend on the + corresponding python2.4-* package explicitly. Otherwise only the Python + 2.3 versions of these packages will get pulled in and configure can't + find the modules. + + debian/control: Upgraded build dependencies on python-gnome2-dev to + >= 2.12. + + Closes: #366670 "FTBFS: misses gnomeapplet" + * debian/control: Upgraded standards version from 3.6.2 to 3.7.2. (No + changes required.) + * debian/watch: Added a watch file. + + -- Sebastian Rittau Wed, 10 May 2006 17:50:01 +0200 + +deskbar-applet (2.14.1.1-3) unstable; urgency=low + + * Switch packaging to CDBS. + + debian/rules: Rewritten. + + debian/control: Build-depend on cdbs. + * Rebuilt against latest evolution-data-server. + + Closes: #362611 "Will need rebuild against new evolution-data-server" + * Build against Python 2.4. + + debian/control: Changed (build-)dependencies accordingly. + + debian/patches/200-use-python-2.4.diff: New patch to force + deskbar-applet to use Python2.4. + + Closes: #360320 "empty popup menu" + + Closes: #361250 "pathprograms.py needs python2.4" + * Fix Web History/Web Search when Mozilla configuration misses the "Default" + section. + + debian/patches/100-fix-mozilla-conf.diff: New patch by P. Oscar Boykin. + + Closes: #363913 "Cannot Activate Web History / Web Searches" + * Recommend gnome-utils for the Dictionary and Files and Folder Search to + work correctly. + + debian/control: Add Recommends: gnome-utils + + Partly addresses #364839 "should recommend gnome-utils for + Dictionary/Files and Folder Search functions" + * debian/dirs: Removed, unnecessary. + + -- Sebastian Rittau Wed, 10 May 2006 09:24:47 +0200 + +deskbar-applet (2.14.1.1-2) unstable; urgency=low + + * Recommend python-beagle and python2.3-soappy. + + Closes: #363449 "should suggest python-soappy for the google handler" + (Thanks, Christophe Nowicki) + + -- Sebastian Rittau Thu, 20 Apr 2006 19:16:59 +0200 + +deskbar-applet (2.14.1.1-1) unstable; urgency=low + + * New upstream version. + + Closes: #362512 "Attempt to change behavior of 'Web Searches' fails" + + -- Sebastian Rittau Mon, 17 Apr 2006 15:07:10 +0200 + +deskbar-applet (2.14.1-1) unstable; urgency=low + + * New upstream version. + * Use debhelper compatibility level 5. + + debian/control: upgraded build-dependency on debhelper to >= 5.0.0 + + debian/compat: Set compatibility level from 4 to 5. + * Moved gconf schemas from /etc to /usr/share. + + debian/rules: call dh_gconf + + Closes: #340517 "package still ships gconf schemas in /etc" (thanks, + Josselin Mouette!) + * debian/control: build-dependency upgrades: + + python-gnome2-extras >= 2.12 to prevent problems with the applet mode + + intltool >= 0.33 as per the configure script + + pkg-config >= 0.9.0 as per the configure script + * debian/control: upgraded standards-version to 3.6.2 (no changes needed) + * debian/copyright: updated address of the FSF + + -- Sebastian Rittau Wed, 12 Apr 2006 20:08:12 +0200 + +deskbar-applet (2.14.0.1-2) unstable; urgency=low + + * Added missing build-dependency. + + debian/control: Added libgnome-desktop-dev to build dependencies. + + Closes: #360045 "FTBFS: No package 'gnome-desktop-2.0' found" + + -- Sebastian Rittau Fri, 31 Mar 2006 15:45:15 +0200 + +deskbar-applet (2.14.0.1-1) unstable; urgency=low + + * New maintainer with permission from Tollef. Thanks, Tollef, for your work! + + debian/control: Set myself as maintainer. + * Removed the .bzr files from debian directory. + + -- Sebastian Rittau Wed, 29 Mar 2006 18:16:28 +0200 + +deskbar-applet (2.14.0.1-0.3) unstable; urgency=low + + * debian/copyright: Updated the download location and author names. Added + full GPL boilerplate. + + -- Sebastian Rittau Tue, 28 Mar 2006 19:37:52 +0200 + +deskbar-applet (2.14.0.1-0.2) unstable; urgency=low + + * Bugs fixed by the new upstream version: + + Closes: #342646 "New upstream version available" + + Closes: #335648 "traceback on startup" + + Closes: #334832 "can't focus on applet" + * Bug fixed by recompile: + + Closes: #349884 "Incorrect dependencies" + * Fix dependency problems: + + debian/control: Depend on python-gnome2-extras and python-glade2; + build-depend on python-glade2 + + Closes: #339399 "deskbar-applet should depend on python2.3-gnome-extras" + + Closes: #337490 "deskbar-applet should depend on python-glade2" + + -- Sebastian Rittau Sun, 26 Mar 2006 14:48:06 +0200 + +deskbar-applet (2.14.0.1-0.1) unstable; urgency=low + + * New upstream release. + + -- Sebastian Rittau Fri, 24 Mar 2006 17:29:54 +0100 + +deskbar-applet (0.8.0-1) unstable; urgency=low + + * New upstream release. + + -- Tollef Fog Heen Mon, 24 Oct 2005 10:11:27 +0200 + +deskbar-applet (0.6-1) unstable; urgency=low + + * New upstream release, works with python2.3 (closes: #332850) + * Add missing depends on python-gtk/gnome modules. (closes: #333741) + + -- Tollef Fog Heen Mon, 17 Oct 2005 09:41:43 +0200 + +deskbar-applet (0.5.0-2) unstable; urgency=low + + * Clean up package a bit, fixing FHS compliance, correct depends and + such. + + -- Tollef Fog Heen Thu, 6 Oct 2005 11:08:25 +0200 + +deskbar-applet (0.5.0-1) unstable; urgency=low + + * Initial release. + + -- Tollef Fog Heen Tue, 4 Oct 2005 12:23:19 +0200 + --- deskbar-applet-2.22.2.1.orig/debian/pycompat +++ deskbar-applet-2.22.2.1/debian/pycompat @@ -0,0 +1 @@ +2 --- deskbar-applet-2.22.2.1.orig/debian/docs +++ deskbar-applet-2.22.2.1/debian/docs @@ -0,0 +1,3 @@ +NEWS +README +TODO --- deskbar-applet-2.22.2.1.orig/debian/control.in +++ deskbar-applet-2.22.2.1/debian/control.in @@ -0,0 +1,67 @@ +Source: deskbar-applet +Section: gnome +Priority: optional +Maintainer: Ubuntu Core developers +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: @GNOME_TEAM@ +Build-Depends: cdbs (>= 0.4.43), + debhelper (>= 5.0.38), + autotools-dev, + pkg-config (>= 0.9.0), + python-gtk2-dev (>= 2.10), + python-glade2 (>= 2.8.6-1), + python-gnome2-dev (>= 2.12.4-1), + python-gnome2-desktop-dev, + python-all-dev, + python-all-dbg, + python-gnome2-dbg, + python-gnome2-extras-dbg, + intltool (>= 0.33), + python-dev (>= 2.4), + libgtk2.0-dev (>= 2.10), + libebook1.2-dev, + libcamel1.2-dev, + libgnome-desktop-dev, + python-central (>= 0.5.6), + gnome-pkg-tools (>= 0.11), + gnome-doc-utils, + scrollkeeper, + python-dbus (>= 0.80) +Standards-Version: 3.7.3 +XS-Python-Version: >= 2.4 +XS-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/deskbar-applet + +Package: deskbar-applet +Architecture: any +XB-Python-Version: ${python:Versions} +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${python:Depends}, + python-gtk2 (>= 2.8.6-1), + python-glade2 (>= 2.8.6-1), + python-gnome2 (>= 2.12.4-1), + python-gnome2-desktop, + python-dbus +Recommends: python-beagle (>= 0.2.8), + python-soappy (>= 0.11.3-1.6), + gnome-utils (>= 2.14.0) +Provides: ${python:Provides} +Description: universal search and navigation bar for GNOME + Deskbar-applet is intended as a browser-like keyword-driven url bar. + You type a web address, or an email address, or a file name, or some + keyword then the arguments, and it shows a popup with possible choices + from there. Like 'Search google for foo'. + . + Homepage: http://raphael.slinckx.net/deskbar/ + +Package: deskbar-applet-dbg +Priority: extra +Architecture: any +XB-Python-Version: ${python:Versions} +Depends: deskbar-applet (= ${binary:Version}), python-dbg, python-dbus-dbg, python-gnome2-dbg, python-gtk2-dbg, python-gnome2-extras-dbg, python-glade2-dbg, python-gobject-dbg, ${shlibs:Depends} +Description: keyword-driven navigational bar for GNOME (python debug build) + this is a GNOME applet which allows easy access to search engines, + local files and programs based on keywords instead of having to type + a fully-qualified path. + . + This package contains the extensions built for the python debug interpreter. --- deskbar-applet-2.22.2.1.orig/debian/compat +++ deskbar-applet-2.22.2.1/debian/compat @@ -0,0 +1 @@ +5