r20524 - in /desktop/unstable/anjuta/debian: anjuta-common.install anjuta-dev.install anjuta.install changelog control control.in patches/ patches/01_gda_optional.patch patches/90_relibtoolize.patch patches/series rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Mon Jun 29 20:51:33 UTC 2009
Author: joss
Date: Mon Jun 29 20:51:33 2009
New Revision: 20524
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20524
Log:
* Conflict/Replace libgbf-1-2. It's been integrated into Anjuta.
* debian/anjuta_import.sh.1: Removed, the script is not shipped
upstream anymore.
* Install the documentation from the new location.
* anjuta-dbg is in the debug section.
* 01_gda_optional.patch: new patch. Make the symboldb plugin optional
since libgda4 is not in Debian yet.
* 90_relibtoolize.patch: relibtoolize accordingly.
* Remove chrpath calls, rely on relibtoolizing instead.
* Don’t install libanjuta.la.
* Correctly install OMF files.
* Install the catalog for glade3.
Added:
desktop/unstable/anjuta/debian/patches/
desktop/unstable/anjuta/debian/patches/01_gda_optional.patch
desktop/unstable/anjuta/debian/patches/90_relibtoolize.patch
desktop/unstable/anjuta/debian/patches/series
Modified:
desktop/unstable/anjuta/debian/anjuta-common.install
desktop/unstable/anjuta/debian/anjuta-dev.install
desktop/unstable/anjuta/debian/anjuta.install
desktop/unstable/anjuta/debian/changelog
desktop/unstable/anjuta/debian/control
desktop/unstable/anjuta/debian/control.in
desktop/unstable/anjuta/debian/rules
Modified: desktop/unstable/anjuta/debian/anjuta-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/anjuta-common.install?rev=20524&op=diff
==============================================================================
--- desktop/unstable/anjuta/debian/anjuta-common.install (original)
+++ desktop/unstable/anjuta/debian/anjuta-common.install Mon Jun 29 20:51:33 2009
@@ -6,4 +6,5 @@
debian/tmp/usr/share/gnome
debian/tmp/usr/share/mime
debian/tmp/usr/share/omf
+debian/tmp/usr/share/glade3
debian/tmp/etc/gconf
Modified: desktop/unstable/anjuta/debian/anjuta-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/anjuta-dev.install?rev=20524&op=diff
==============================================================================
--- desktop/unstable/anjuta/debian/anjuta-dev.install (original)
+++ desktop/unstable/anjuta/debian/anjuta-dev.install Mon Jun 29 20:51:33 2009
@@ -1,3 +1,2 @@
-debian/tmp/usr/lib/*.la
debian/tmp/usr/include
debian/tmp/usr/lib/pkgconfig
Modified: desktop/unstable/anjuta/debian/anjuta.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/anjuta.install?rev=20524&op=diff
==============================================================================
--- desktop/unstable/anjuta/debian/anjuta.install (original)
+++ desktop/unstable/anjuta/debian/anjuta.install Mon Jun 29 20:51:33 2009
@@ -2,7 +2,8 @@
debian/tmp/usr/share/man
debian/tmp/usr/share/doc
debian/tmp/usr/bin
-debian/tmp/usr/lib/anjuta
+debian/tmp/usr/lib/anjuta/*.plugin
+debian/tmp/usr/lib/anjuta/*.so
debian/tmp/usr/lib/*.so.*
debian/tmp/usr/share/applications
debian/tmp/usr/lib/glade3/modules/*.so
Modified: desktop/unstable/anjuta/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/changelog?rev=20524&op=diff
==============================================================================
--- desktop/unstable/anjuta/debian/changelog (original)
+++ desktop/unstable/anjuta/debian/changelog Mon Jun 29 20:51:33 2009
@@ -1,4 +1,4 @@
-anjuta (2:2.26.2.2-2) UNRELEASED; urgency=low
+anjuta (2:2.26.2.2-1) unstable; urgency=low
[ Emilio Pozuelo Monfort ]
* debian/rules,
@@ -10,23 +10,27 @@
- Disable scrollkeeper during the build. Taken from Ubuntu.
* debian/anjuta-common.install:
- Install the GConf schemas.
+ * Conflict/Replace libgbf-1-2. It's been integrated into Anjuta.
+ * debian/anjuta_import.sh.1: Removed, the script is not shipped
+ upstream anymore.
+ * Install the documentation from the new location.
+ * anjuta-dbg is in the debug section.
[ Josselin Mouette ]
* Add libglib2.0-doc and libgtk2.0-doc to b-d-i to ensure proper
xrefs.
* Remove scrollkeeper dependency.
-
- [ Emilio Pozuelo Monfort ]
* New upstream release.
* Update build-dependencies.
- * debian/anjuta_import.sh.1: Removed, the script is not shipped
- upstream anymore.
- * Remove patch system as we have no patches to apply.
- * anjuta-dbg is in the debug section.
- * Install the documentation from the new location.
- * Conflict/Replace libgbf-1-2. It's been integrated into Anjuta.
-
- -- Emilio Pozuelo Monfort <pochu at ubuntu.com> Sat, 20 Dec 2008 16:11:37 +0100
+ * 01_gda_optional.patch: new patch. Make the symboldb plugin optional
+ since libgda4 is not in Debian yet.
+ * 90_relibtoolize.patch: relibtoolize accordingly.
+ * Remove chrpath calls, rely on relibtoolizing instead.
+ * Don’t install libanjuta.la.
+ * Correctly install OMF files.
+ * Install the catalog for glade3.
+
+ -- Josselin Mouette <joss at debian.org> Mon, 29 Jun 2009 22:01:00 +0200
anjuta (2:2.24.2-1) unstable; urgency=low
Modified: desktop/unstable/anjuta/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/control?rev=20524&op=diff
==============================================================================
--- desktop/unstable/anjuta/debian/control (original)
+++ desktop/unstable/anjuta/debian/control Mon Jun 29 20:51:33 2009
@@ -2,19 +2,16 @@
Section: gnome
Priority: optional
Maintainer: Rob Bradford <robster at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at ubuntu.com>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>
Build-Depends: debhelper (>= 5.0.0),
cdbs,
- chrpath,
+ quilt,
gnome-common,
- gtk-doc-tools,
gnome-doc-utils,
- intltool,
- scrollkeeper,
libglib2.0-dev (>= 2.16.0),
libgtk2.0-dev (>= 2.12.10),
liborbit2-dev (>= 1:2.6.0),
- libglade2-dev (>= 2.3.0),
+ libglade2-dev (>= 1:2.3.0),
libgnome2-dev (>= 2.12.0),
libgnomeui-dev (>= 2.12.0),
libgconf2-dev (>= 2.12.0),
@@ -24,21 +21,23 @@
libgdl-1-dev (>= 2.26.0),
libgladeui-1-dev (>= 3.6.0),
libgraphviz-dev (>= 1.0),
+ libneon27-dev (>= 0.28.2),
libsvn-dev (>= 1.5.0),
libgtksourceview2.0-dev (>= 2.4.0),
binutils-dev (>= 2.15.92),
libwnck-dev (>= 2.12),
- libgda4-dev (>= 3.99.7),
libunique-dev (>= 1.0.0),
libwebkit-dev,
libxslt1-dev,
+ pkg-config,
liblocale-gettext-perl,
- automake1.9,
+ intltool (>= 0.35.0),
+ gtk-doc-tools (>= 1.4),
autogen,
gnome-pkg-tools (>= 0.11)
Build-Depends-Indep: libglib2.0-doc,
libgtk2.0-doc
-Standards-Version: 3.8.0
+Standards-Version: 3.8.2
Homepage: http://www.anjuta.org
Package: anjuta
@@ -54,12 +53,14 @@
autogen,
intltool,
gdb,
- libtool
+ libtool,
+ liblocale-gettext-perl
Suggests: libgtk2.0-dev,
libgtkmm2.0-dev,
libgnome2-dev,
libgnomemm2.0-dev,
glade-gnome
+Conflicts: libgbf-1-2
Replaces: anjuta-common (<< 2:2.4.2-1),
libgbf-1-2
Description: A GNOME development IDE, for C/C++
@@ -85,8 +86,8 @@
Depends: anjuta (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
- libgnomeui-dev,
- libglade2-dev
+ libgnomeui-dev (>= 2.12.0),
+ libglade2-dev (>= 1:2.3.0)
Conflicts: anjuta (<= 2.0.0)
Replaces: anjuta (<= 2.0.0)
Description: A GNOME development IDE, for C/C++ - development files
Modified: desktop/unstable/anjuta/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/control.in?rev=20524&op=diff
==============================================================================
--- desktop/unstable/anjuta/debian/control.in (original)
+++ desktop/unstable/anjuta/debian/control.in Mon Jun 29 20:51:33 2009
@@ -5,16 +5,13 @@
Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>= 5.0.0),
cdbs,
- chrpath,
+ quilt,
gnome-common,
- gtk-doc-tools,
gnome-doc-utils,
- intltool,
- scrollkeeper,
libglib2.0-dev (>= 2.16.0),
libgtk2.0-dev (>= 2.12.10),
liborbit2-dev (>= 1:2.6.0),
- libglade2-dev (>= 2.3.0),
+ libglade2-dev (>= 1:2.3.0),
libgnome2-dev (>= 2.12.0),
libgnomeui-dev (>= 2.12.0),
libgconf2-dev (>= 2.12.0),
@@ -24,21 +21,23 @@
libgdl-1-dev (>= 2.26.0),
libgladeui-1-dev (>= 3.6.0),
libgraphviz-dev (>= 1.0),
+ libneon27-dev (>= 0.28.2),
libsvn-dev (>= 1.5.0),
libgtksourceview2.0-dev (>= 2.4.0),
binutils-dev (>= 2.15.92),
libwnck-dev (>= 2.12),
- libgda4-dev (>= 3.99.7),
libunique-dev (>= 1.0.0),
libwebkit-dev,
libxslt1-dev,
+ pkg-config,
liblocale-gettext-perl,
- automake1.9,
+ intltool (>= 0.35.0),
+ gtk-doc-tools (>= 1.4),
autogen,
gnome-pkg-tools (>= 0.11)
Build-Depends-Indep: libglib2.0-doc,
libgtk2.0-doc
-Standards-Version: 3.8.0
+Standards-Version: 3.8.2
Homepage: http://www.anjuta.org
Package: anjuta
@@ -54,7 +53,8 @@
autogen,
intltool,
gdb,
- libtool
+ libtool,
+ liblocale-gettext-perl
Suggests: libgtk2.0-dev,
libgtkmm2.0-dev,
libgnome2-dev,
@@ -86,8 +86,8 @@
Depends: anjuta (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
- libgnomeui-dev,
- libglade2-dev
+ libgnomeui-dev (>= 2.12.0),
+ libglade2-dev (>= 1:2.3.0)
Conflicts: anjuta (<= 2.0.0)
Replaces: anjuta (<= 2.0.0)
Description: A GNOME development IDE, for C/C++ - development files
Added: desktop/unstable/anjuta/debian/patches/01_gda_optional.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/patches/01_gda_optional.patch?rev=20524&op=file
==============================================================================
--- desktop/unstable/anjuta/debian/patches/01_gda_optional.patch (added)
+++ desktop/unstable/anjuta/debian/patches/01_gda_optional.patch Mon Jun 29 20:51:33 2009
@@ -1,0 +1,49 @@
+Index: anjuta-2.26.2.2/configure.in
+===================================================================
+--- anjuta-2.26.2.2.orig/configure.in 2009-06-29 22:06:02.370432042 +0200
++++ anjuta-2.26.2.2/configure.in 2009-06-29 22:14:00.202429473 +0200
+@@ -358,7 +358,11 @@ fi
+ AM_CONDITIONAL(HAVE_PLUGIN_SCINTILLA, [test x$scintilla = xyes])
+
+ PKG_CHECK_MODULES(PLUGIN_SYMBOL_DB,
+- [libgda-4.0 >= $GDA_REQUIRED])
++ [libgda-4.0 >= $GDA_REQUIRED],
++ [symboldb_plugin="yes"],
++ [symboldb_plugin="no"])
++
++AM_CONDITIONAL(HAVE_PLUGIN_SYMBOLDB, [test x$symboldb_plugin = xyes])
+
+ dnl Valgrind plugin
+ dnl check for libbfd
+@@ -1056,6 +1060,12 @@ if [ test x$scintilla = xyes ]; then
+ else
+ echo "Building Scintilla based editor: .......................NO"
+ fi
++
++if [ test x$symboldb_plugin = xyes ]; then
++ echo "Building symbol database plugin: .......................YES"
++else
++ echo "Building symbol database plugin: .......................NO"
++fi
+ echo "-------------------------------------------------------------------"
+ #echo "AM_CFLAGS = $AM_CFLAGS"
+ #echo "AM_CXXFLAGS = $AM_CXXFLAGS"
+Index: anjuta-2.26.2.2/plugins/symbol-db/Makefile.am
+===================================================================
+--- anjuta-2.26.2.2.orig/plugins/symbol-db/Makefile.am 2009-06-29 22:15:39.986429254 +0200
++++ anjuta-2.26.2.2/plugins/symbol-db/Makefile.am 2009-06-29 22:16:42.417936463 +0200
+@@ -1,3 +1,5 @@
++if HAVE_PLUGIN_SYMBOLDB
++
+ SUBDIRS = images test
+
+ symbol_db_datadir = $(anjuta_data_dir)
+@@ -77,6 +79,8 @@ libanjuta_symbol_db_la_LIBADD = \
+ prefs_glade_files = anjuta-symbol-db.glade
+ include $(top_srcdir)/scripts/build-schemas.mk
+
++endif
++
+ EXTRA_DIST = \
+ $(plugin_in_files) \
+ $(symbol_db_plugin_DATA) \
Added: desktop/unstable/anjuta/debian/patches/90_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/patches/90_relibtoolize.patch?rev=20524&op=file
==============================================================================
--- desktop/unstable/anjuta/debian/patches/90_relibtoolize.patch (added)
+++ desktop/unstable/anjuta/debian/patches/90_relibtoolize.patch Mon Jun 29 20:51:33 2009
@@ -1,0 +1,1376 @@
+libtoolize --force --copy
+aclocal
+automake -acf -Wno-portability
+autoheader
+autoconf
+rm -rf config.h.in~ autom4te.cache
+
+Index: anjuta-2.26.2.2/INSTALL
+===================================================================
+--- anjuta-2.26.2.2.orig/INSTALL 2009-06-29 22:21:03.258432746 +0200
++++ anjuta-2.26.2.2/INSTALL 2009-06-29 22:20:34.149926427 +0200
+@@ -2,15 +2,15 @@ Installation Instructions
+ *************************
+
+ Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+-2006, 2007 Free Software Foundation, Inc.
++2006, 2007, 2008 Free Software Foundation, Inc.
+
+-This file is free documentation; the Free Software Foundation gives
++ This file is free documentation; the Free Software Foundation gives
+ unlimited permission to copy, distribute and modify it.
+
+ Basic Installation
+ ==================
+
+-Briefly, the shell commands `./configure; make; make install' should
++ Briefly, the shell commands `./configure; make; make install' should
+ configure, build, and install this package. The following
+ more-detailed instructions are generic; see the `README' file for
+ instructions specific to this package.
+@@ -73,9 +73,9 @@ The simplest way to compile this package
+ Compilers and Options
+ =====================
+
+-Some systems require unusual options for compilation or linking that the
+-`configure' script does not know about. Run `./configure --help' for
+-details on some of the pertinent environment variables.
++ Some systems require unusual options for compilation or linking that
++the `configure' script does not know about. Run `./configure --help'
++for details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+ by setting variables in the command line or in the environment. Here
+@@ -88,7 +88,7 @@ is an example:
+ Compiling For Multiple Architectures
+ ====================================
+
+-You can compile the package for more than one kind of computer at the
++ You can compile the package for more than one kind of computer at the
+ same time, by placing the object files for each architecture in their
+ own directory. To do this, you can use GNU `make'. `cd' to the
+ directory where you want the object files and executables to go and run
+@@ -100,10 +100,24 @@ architecture at a time in the source cod
+ installed the package for one architecture, use `make distclean' before
+ reconfiguring for another architecture.
+
++ On MacOS X 10.5 and later systems, you can create libraries and
++executables that work on multiple system types--known as "fat" or
++"universal" binaries--by specifying multiple `-arch' options to the
++compiler but only a single `-arch' option to the preprocessor. Like
++this:
++
++ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
++ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
++ CPP="gcc -E" CXXCPP="g++ -E"
++
++ This is not guaranteed to produce working output in all cases, you
++may have to build one architecture at a time and combine the results
++using the `lipo' tool if you have problems.
++
+ Installation Names
+ ==================
+
+-By default, `make install' installs the package's commands under
++ By default, `make install' installs the package's commands under
+ `/usr/local/bin', include files under `/usr/local/include', etc. You
+ can specify an installation prefix other than `/usr/local' by giving
+ `configure' the option `--prefix=PREFIX'.
+@@ -126,7 +140,7 @@ option `--program-prefix=PREFIX' or `--p
+ Optional Features
+ =================
+
+-Some packages pay attention to `--enable-FEATURE' options to
++ Some packages pay attention to `--enable-FEATURE' options to
+ `configure', where FEATURE indicates an optional part of the package.
+ They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+ is something like `gnu-as' or `x' (for the X Window System). The
+@@ -138,14 +152,36 @@ find the X include and library files aut
+ you can use the `configure' options `--x-includes=DIR' and
+ `--x-libraries=DIR' to specify their locations.
+
++Particular systems
++==================
++
++ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
++CC is not installed, it is recommended to use the following options in
++order to use an ANSI C compiler:
++
++ ./configure CC="cc -Ae"
++
++and if that doesn't work, install pre-built binaries of GCC for HP-UX.
++
++ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
++parse its `<wchar.h>' header file. The option `-nodtk' can be used as
++a workaround. If GNU CC is not installed, it is therefore recommended
++to try
++
++ ./configure CC="cc"
++
++and if that doesn't work, try
++
++ ./configure CC="cc -nodtk"
++
+ Specifying the System Type
+ ==========================
+
+-There may be some features `configure' cannot figure out automatically,
+-but needs to determine by the type of machine the package will run on.
+-Usually, assuming the package is built to be run on the _same_
+-architectures, `configure' can figure that out, but if it prints a
+-message saying it cannot guess the machine type, give it the
++ There may be some features `configure' cannot figure out
++automatically, but needs to determine by the type of machine the package
++will run on. Usually, assuming the package is built to be run on the
++_same_ architectures, `configure' can figure that out, but if it prints
++a message saying it cannot guess the machine type, give it the
+ `--build=TYPE' option. TYPE can either be a short name for the system
+ type, such as `sun4', or a canonical name which has the form:
+
+@@ -171,9 +207,9 @@ eventually be run) with `--host=TYPE'.
+ Sharing Defaults
+ ================
+
+-If you want to set default values for `configure' scripts to share, you
+-can create a site shell script called `config.site' that gives default
+-values for variables like `CC', `cache_file', and `prefix'.
++ If you want to set default values for `configure' scripts to share,
++you can create a site shell script called `config.site' that gives
++default values for variables like `CC', `cache_file', and `prefix'.
+ `configure' looks for `PREFIX/share/config.site' if it exists, then
+ `PREFIX/etc/config.site' if it exists. Or, you can set the
+ `CONFIG_SITE' environment variable to the location of the site script.
+@@ -182,7 +218,7 @@ A warning: not all `configure' scripts l
+ Defining Variables
+ ==================
+
+-Variables not defined in a site shell script can be set in the
++ Variables not defined in a site shell script can be set in the
+ environment passed to `configure'. However, some packages may run
+ configure again during the build, and the customized values of these
+ variables may be lost. In order to avoid this problem, you should set
+@@ -201,11 +237,19 @@ an Autoconf bug. Until the bug is fixed
+ `configure' Invocation
+ ======================
+
+-`configure' recognizes the following options to control how it operates.
++ `configure' recognizes the following options to control how it
++operates.
+
+ `--help'
+ `-h'
+- Print a summary of the options to `configure', and exit.
++ Print a summary of all of the options to `configure', and exit.
++
++`--help=short'
++`--help=recursive'
++ Print a summary of the options unique to this package's
++ `configure', and exit. The `short' variant lists options used
++ only in the top level, while the `recursive' variant lists options
++ also present in any nested packages.
+
+ `--version'
+ `-V'
+@@ -232,6 +276,16 @@ an Autoconf bug. Until the bug is fixed
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
++`--prefix=DIR'
++ Use DIR as the installation prefix. *Note Installation Names::
++ for more details, including other options available for fine-tuning
++ the installation locations.
++
++`--no-create'
++`-n'
++ Run the configure checks, but stop before creating any output
++ files.
++
+ `configure' also accepts some other, not widely useful, options. Run
+ `configure --help' for more details.
+
+Index: anjuta-2.26.2.2/aclocal.m4
+===================================================================
+--- anjuta-2.26.2.2.orig/aclocal.m4 2009-06-29 22:21:03.665938796 +0200
++++ anjuta-2.26.2.2/aclocal.m4 2009-06-29 22:20:06.474429415 +0200
+@@ -55,10 +55,11 @@ AC_DEFUN([AM_GCONF_SOURCE_2],
+ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
+
+ AC_ARG_ENABLE(schemas-install,
+- [ --disable-schemas-install Disable the schemas installation],
++ AC_HELP_STRING([--disable-schemas-install],
++ [Disable the schemas installation]),
+ [case ${enableval} in
+ yes|no) ;;
+- *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;;
++ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
+ esac])
+ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
+ ])
+@@ -5183,6 +5184,9 @@ dnl Note also adjust exclude_expsyms for
+ openbsd*)
+ with_gnu_ld=no
+ ;;
++ linux* | k*bsd*-gnu)
++ _LT_TAGVAR(link_all_deplibs, $1)=no
++ ;;
+ esac
+
+ _LT_TAGVAR(ld_shlibs, $1)=yes
+@@ -9369,61 +9373,59 @@ _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
+-#serial 5
++#serial 4
+
+ # _AM_OUTPUT_DEPENDENCY_COMMANDS
+ # ------------------------------
+ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+-[{
+- # Autoconf 2.62 quotes --file arguments for eval, but not when files
+- # are listed without --file. Let's play safe and only enable the eval
+- # if we detect the quoting.
+- case $CONFIG_FILES in
+- *\'*) eval set x "$CONFIG_FILES" ;;
+- *) set x $CONFIG_FILES ;;
+- esac
+- shift
+- for mf
+- do
+- # Strip MF so we end up with the name of the file.
+- mf=`echo "$mf" | sed -e 's/:.*$//'`
+- # Check whether this is an Automake generated Makefile or not.
+- # We used to match only the files named `Makefile.in', but
+- # some people rename them; so instead we look at the file content.
+- # Grep'ing the first line is not enough: some people post-process
+- # each Makefile.in and add a new line on top of each file to say so.
+- # Grep'ing the whole file is not good either: AIX grep has a line
+- # limit of 2048, but all sed's we know have understand at least 4000.
+- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+- dirpart=`AS_DIRNAME("$mf")`
+- else
+- continue
+- fi
+- # Extract the definition of DEPDIR, am__include, and am__quote
+- # from the Makefile without running `make'.
+- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+- test -z "$DEPDIR" && continue
+- am__include=`sed -n 's/^am__include = //p' < "$mf"`
+- test -z "am__include" && continue
+- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+- # When using ansi2knr, U may be empty or an underscore; expand it
+- U=`sed -n 's/^U = //p' < "$mf"`
+- # Find all dependency output files, they are included files with
+- # $(DEPDIR) in their names. We invoke sed twice because it is the
+- # simplest approach to changing $(DEPDIR) to its actual value in the
+- # expansion.
+- for file in `sed -n "
+- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+- # Make sure the directory exists.
+- test -f "$dirpart/$file" && continue
+- fdir=`AS_DIRNAME(["$file"])`
+- AS_MKDIR_P([$dirpart/$fdir])
+- # echo "creating $dirpart/$file"
+- echo '# dummy' > "$dirpart/$file"
+- done
++[# Autoconf 2.62 quotes --file arguments for eval, but not when files
++# are listed without --file. Let's play safe and only enable the eval
++# if we detect the quoting.
++case $CONFIG_FILES in
++*\'*) eval set x "$CONFIG_FILES" ;;
++*) set x $CONFIG_FILES ;;
++esac
++shift
++for mf
++do
++ # Strip MF so we end up with the name of the file.
++ mf=`echo "$mf" | sed -e 's/:.*$//'`
++ # Check whether this is an Automake generated Makefile or not.
++ # We used to match only the files named `Makefile.in', but
++ # some people rename them; so instead we look at the file content.
++ # Grep'ing the first line is not enough: some people post-process
++ # each Makefile.in and add a new line on top of each file to say so.
++ # Grep'ing the whole file is not good either: AIX grep has a line
++ # limit of 2048, but all sed's we know have understand at least 4000.
++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
++ dirpart=`AS_DIRNAME("$mf")`
++ else
++ continue
++ fi
++ # Extract the definition of DEPDIR, am__include, and am__quote
++ # from the Makefile without running `make'.
++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
++ test -z "$DEPDIR" && continue
++ am__include=`sed -n 's/^am__include = //p' < "$mf"`
++ test -z "am__include" && continue
++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
++ # When using ansi2knr, U may be empty or an underscore; expand it
++ U=`sed -n 's/^U = //p' < "$mf"`
++ # Find all dependency output files, they are included files with
++ # $(DEPDIR) in their names. We invoke sed twice because it is the
++ # simplest approach to changing $(DEPDIR) to its actual value in the
++ # expansion.
++ for file in `sed -n "
++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
++ # Make sure the directory exists.
++ test -f "$dirpart/$file" && continue
++ fdir=`AS_DIRNAME(["$file"])`
++ AS_MKDIR_P([$dirpart/$fdir])
++ # echo "creating $dirpart/$file"
++ echo '# dummy' > "$dirpart/$file"
+ done
+-}
++done
+ ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+
+
+Index: anjuta-2.26.2.2/config.guess
+===================================================================
+--- anjuta-2.26.2.2.orig/config.guess 2009-06-29 22:21:03.533937322 +0200
++++ anjuta-2.26.2.2/config.guess 2009-06-29 22:20:19.593927693 +0200
+@@ -4,7 +4,7 @@
+ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+ # Free Software Foundation, Inc.
+
+-timestamp='2008-01-23'
++timestamp='2009-04-27'
+
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -324,6 +324,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ case `/usr/bin/uname -p` in
+ sparc) echo sparc-icl-nx7; exit ;;
+ esac ;;
++ s390x:SunOS:*:*)
++ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++ exit ;;
+ sun4H:SunOS:5.*:*)
+ echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+@@ -331,7 +334,20 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++ eval $set_cc_for_build
++ SUN_ARCH="i386"
++ # If there is a compiler, see if it is configured for 64-bit objects.
++ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
++ # This test works for both compilers.
++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++ grep IS_64BIT_ARCH >/dev/null
++ then
++ SUN_ARCH="x86_64"
++ fi
++ fi
++ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+ sun4*:SunOS:6*:*)
+ # According to config.sub, this is the proper way to canonicalize
+@@ -796,7 +812,7 @@ EOF
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+- EM64T | authenticamd)
++ EM64T | authenticamd | genuineintel)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ IA64)
+@@ -935,6 +951,9 @@ EOF
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ exit ;;
++ padre:Linux:*:*)
++ echo sparc-unknown-linux-gnu
++ exit ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+@@ -985,9 +1004,6 @@ EOF
+ a.out-i386-linux)
+ echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+ exit ;;
+- coff-i386)
+- echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+- exit ;;
+ "")
+ # Either a pre-BFD a.out linker (linux-gnuoldld) or
+ # one that does not give us useful --help.
+@@ -1102,8 +1118,11 @@ EOF
+ pc:*:*:*)
+ # Left here for compatibility:
+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
+- # the processor, so we play safe by assuming i386.
+- echo i386-pc-msdosdjgpp
++ # the processor, so we play safe by assuming i586.
++ # Note: whatever this is, it MUST be the same as what config.sub
++ # prints for the "djgpp" host, or else GDB configury will decide that
++ # this is a cross-build.
++ echo i586-pc-msdosdjgpp
+ exit ;;
+ Intel:Mach:3*:*)
+ echo i386-pc-mach3
+@@ -1141,6 +1160,16 @@ EOF
+ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && { echo i486-ncr-sysv4; exit; } ;;
++ NCR*:*:4.2:* | MPRAS*:*:4.2:*)
++ OS_REL='.3'
++ test -r /etc/.relid \
++ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
++ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
++ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+ echo m68k-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+@@ -1216,6 +1245,9 @@ EOF
+ BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
+ echo i586-pc-beos
+ exit ;;
++ BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
++ echo i586-pc-haiku
++ exit ;;
+ SX-4:SUPER-UX:*:*)
+ echo sx4-nec-superux${UNAME_RELEASE}
+ exit ;;
+@@ -1324,6 +1356,9 @@ EOF
+ i*86:rdos:*:*)
+ echo ${UNAME_MACHINE}-pc-rdos
+ exit ;;
++ i*86:AROS:*:*)
++ echo ${UNAME_MACHINE}-pc-aros
++ exit ;;
+ esac
+
+ #echo '(No uname command or uname output not recognized.)' 1>&2
+Index: anjuta-2.26.2.2/config.sub
+===================================================================
+--- anjuta-2.26.2.2.orig/config.sub 2009-06-29 22:21:03.418427532 +0200
++++ anjuta-2.26.2.2/config.sub 2009-06-29 22:20:19.622427962 +0200
+@@ -4,7 +4,7 @@
+ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+ # Free Software Foundation, Inc.
+
+-timestamp='2008-01-16'
++timestamp='2009-04-17'
+
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -122,6 +122,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-
+ case $maybe_os in
+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
++ kopensolaris*-gnu* | \
+ storm-chaos* | os2-emx* | rtmk-nova*)
+ os=-$maybe_os
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+@@ -249,13 +250,16 @@ case $basic_machine in
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | i370 | i860 | i960 | ia64 \
+ | ip2k | iq2000 \
++ | lm32 \
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+- | maxq | mb | microblaze | mcore | mep \
++ | maxq | mb | microblaze | mcore | mep | metag \
+ | mips | mipsbe | mipseb | mipsel | mipsle \
+ | mips16 \
+ | mips64 | mips64el \
+- | mips64vr | mips64vrel \
++ | mips64octeon | mips64octeonel \
+ | mips64orion | mips64orionel \
++ | mips64r5900 | mips64r5900el \
++ | mips64vr | mips64vrel \
+ | mips64vr4100 | mips64vr4100el \
+ | mips64vr4300 | mips64vr4300el \
+ | mips64vr5000 | mips64vr5000el \
+@@ -268,6 +272,7 @@ case $basic_machine in
+ | mipsisa64sr71k | mipsisa64sr71kel \
+ | mipstx39 | mipstx39el \
+ | mn10200 | mn10300 \
++ | moxie \
+ | mt \
+ | msp430 \
+ | nios | nios2 \
+@@ -277,7 +282,7 @@ case $basic_machine in
+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | pyramid \
+ | score \
+- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
++ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh64 | sh64le \
+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+@@ -286,7 +291,7 @@ case $basic_machine in
+ | v850 | v850e \
+ | we32k \
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+- | z8k)
++ | z8k | z80)
+ basic_machine=$basic_machine-unknown
+ ;;
+ m6811 | m68hc11 | m6812 | m68hc12)
+@@ -329,14 +334,17 @@ case $basic_machine in
+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ | i*86-* | i860-* | i960-* | ia64-* \
+ | ip2k-* | iq2000-* \
++ | lm32-* \
+ | m32c-* | m32r-* | m32rle-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+- | m88110-* | m88k-* | maxq-* | mcore-* \
++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ | mips16-* \
+ | mips64-* | mips64el-* \
+- | mips64vr-* | mips64vrel-* \
++ | mips64octeon-* | mips64octeonel-* \
+ | mips64orion-* | mips64orionel-* \
++ | mips64r5900-* | mips64r5900el-* \
++ | mips64vr-* | mips64vrel-* \
+ | mips64vr4100-* | mips64vr4100el-* \
+ | mips64vr4300-* | mips64vr4300el-* \
+ | mips64vr5000-* | mips64vr5000el-* \
+@@ -358,20 +366,20 @@ case $basic_machine in
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ | pyramid-* \
+ | romp-* | rs6000-* \
+- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
++ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ | sparclite-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+ | tahoe-* | thumb-* \
+- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+ | tron-* \
+ | v850-* | v850e-* | vax-* \
+ | we32k-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | xstormy16-* | xtensa*-* \
+ | ymp-* \
+- | z8k-*)
++ | z8k-* | z80-*)
+ ;;
+ # Recognize the basic CPU types without company name, with glob match.
+ xtensa*)
+@@ -439,6 +447,10 @@ case $basic_machine in
+ basic_machine=m68k-apollo
+ os=-bsd
+ ;;
++ aros)
++ basic_machine=i386-pc
++ os=-aros
++ ;;
+ aux)
+ basic_machine=m68k-apple
+ os=-aux
+@@ -459,6 +471,10 @@ case $basic_machine in
+ basic_machine=c90-cray
+ os=-unicos
+ ;;
++ cegcc)
++ basic_machine=arm-unknown
++ os=-cegcc
++ ;;
+ convex-c1)
+ basic_machine=c1-convex
+ os=-bsd
+@@ -526,6 +542,10 @@ case $basic_machine in
+ basic_machine=m88k-motorola
+ os=-sysv3
+ ;;
++ dicos)
++ basic_machine=i686-pc
++ os=-dicos
++ ;;
+ djgpp)
+ basic_machine=i586-pc
+ os=-msdosdjgpp
+@@ -1128,6 +1148,10 @@ case $basic_machine in
+ basic_machine=z8k-unknown
+ os=-sim
+ ;;
++ z80-*-coff)
++ basic_machine=z80-unknown
++ os=-sim
++ ;;
+ none)
+ basic_machine=none-none
+ os=-none
+@@ -1166,7 +1190,7 @@ case $basic_machine in
+ we32k)
+ basic_machine=we32k-att
+ ;;
+- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
++ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+ basic_machine=sh-unknown
+ ;;
+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+@@ -1238,8 +1262,9 @@ case $os in
+ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
++ | -kopensolaris* \
+ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+- | -aos* \
++ | -aos* | -aros* \
+ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+@@ -1248,7 +1273,7 @@ case $os in
+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+- | -chorusos* | -chorusrdb* \
++ | -chorusos* | -chorusrdb* | -cegcc* \
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
+@@ -1388,6 +1413,9 @@ case $os in
+ -zvmoe)
+ os=-zvmoe
+ ;;
++ -dicos*)
++ os=-dicos
++ ;;
+ -none)
+ ;;
+ *)
+Index: anjuta-2.26.2.2/configure
+===================================================================
+--- anjuta-2.26.2.2.orig/configure 2009-06-29 22:21:03.090431922 +0200
++++ anjuta-2.26.2.2/configure 2009-06-29 22:20:53.266426992 +0200
+@@ -865,6 +865,8 @@ LIBANJUTA_CFLAGS
+ HAVE_PLUGIN_VALGRIND_FALSE
+ HAVE_PLUGIN_VALGRIND_TRUE
+ PLUGIN_VALGRIND_LIBS
++HAVE_PLUGIN_SYMBOLDB_FALSE
++HAVE_PLUGIN_SYMBOLDB_TRUE
+ PLUGIN_SYMBOL_DB_LIBS
+ PLUGIN_SYMBOL_DB_CFLAGS
+ HAVE_PLUGIN_SCINTILLA_FALSE
+@@ -1811,7 +1813,8 @@ Optional Features:
+ --enable-fast-install[=PKGS]
+ optimize for fast installation [default=yes]
+ --disable-libtool-lock avoid locking (might break parallel builds)
+- --disable-schemas-install Disable the schemas installation
++ --disable-schemas-install
++ Disable the schemas installation
+ --disable-plugin-devhelp
+ Disable devhelp plugin support in Anjuta.
+ --disable-plugin-glade Disable glade plugin support in Anjuta.
+@@ -6511,13 +6514,13 @@ if test "${lt_cv_nm_interface+set}" = se
+ else
+ lt_cv_nm_interface="BSD nm"
+ echo "int some_variable = 0;" > conftest.$ac_ext
+- (eval echo "\"\$as_me:6514: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:6517: $ac_compile\"" >&5)
+ (eval "$ac_compile" 2>conftest.err)
+ cat conftest.err >&5
+- (eval echo "\"\$as_me:6517: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:6520: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+ cat conftest.err >&5
+- (eval echo "\"\$as_me:6520: output\"" >&5)
++ (eval echo "\"\$as_me:6523: output\"" >&5)
+ cat conftest.out >&5
+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+ lt_cv_nm_interface="MS dumpbin"
+@@ -7712,7 +7715,7 @@ ia64-*-hpux*)
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 7715 "configure"' > conftest.$ac_ext
++ echo '#line 7718 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -9838,11 +9841,11 @@ else
+ -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:9841: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9844: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:9845: \$? = $ac_status" >&5
++ echo "$as_me:9848: \$? = $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.
+@@ -10177,11 +10180,11 @@ else
+ -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:10180: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10183: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:10184: \$? = $ac_status" >&5
++ echo "$as_me:10187: \$? = $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.
+@@ -10282,11 +10285,11 @@ else
+ -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:10285: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10288: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:10289: \$? = $ac_status" >&5
++ echo "$as_me:10292: \$? = $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
+@@ -10337,11 +10340,11 @@ else
+ -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:10340: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10343: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:10344: \$? = $ac_status" >&5
++ echo "$as_me:10347: \$? = $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
+@@ -10456,6 +10459,9 @@ $as_echo_n "checking whether the $compil
+ openbsd*)
+ with_gnu_ld=no
+ ;;
++ linux* | k*bsd*-gnu)
++ link_all_deplibs=no
++ ;;
+ esac
+
+ ld_shlibs=yes
+@@ -13150,7 +13156,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 13153 "configure"
++#line 13159 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -13246,7 +13252,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 13249 "configure"
++#line 13255 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -15266,11 +15272,11 @@ else
+ -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:15269: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15275: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:15273: \$? = $ac_status" >&5
++ echo "$as_me:15279: \$? = $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.
+@@ -15365,11 +15371,11 @@ else
+ -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:15368: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15374: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:15372: \$? = $ac_status" >&5
++ echo "$as_me:15378: \$? = $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
+@@ -15417,11 +15423,11 @@ else
+ -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:15420: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15426: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:15424: \$? = $ac_status" >&5
++ echo "$as_me:15430: \$? = $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
+@@ -18522,62 +18528,29 @@ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$PLUGIN_SYMBOL_DB_PKG_ERRORS" >&5
+
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (libgda-4.0 >= $GDA_REQUIRED) were not met:
+-
+-$PLUGIN_SYMBOL_DB_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables PLUGIN_SYMBOL_DB_CFLAGS
+-and PLUGIN_SYMBOL_DB_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (libgda-4.0 >= $GDA_REQUIRED) were not met:
+-
+-$PLUGIN_SYMBOL_DB_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables PLUGIN_SYMBOL_DB_CFLAGS
+-and PLUGIN_SYMBOL_DB_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&2;}
+- { (exit 1); exit 1; }; }
++ { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++ symboldb_plugin="no"
+ elif test $pkg_failed = untried; then
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables PLUGIN_SYMBOL_DB_CFLAGS
+-and PLUGIN_SYMBOL_DB_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables PLUGIN_SYMBOL_DB_CFLAGS
+-and PLUGIN_SYMBOL_DB_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++ symboldb_plugin="no"
+ else
+ PLUGIN_SYMBOL_DB_CFLAGS=$pkg_cv_PLUGIN_SYMBOL_DB_CFLAGS
+ PLUGIN_SYMBOL_DB_LIBS=$pkg_cv_PLUGIN_SYMBOL_DB_LIBS
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
+- :
++ symboldb_plugin="yes"
++fi
++
++ if test x$symboldb_plugin = xyes; then
++ HAVE_PLUGIN_SYMBOLDB_TRUE=
++ HAVE_PLUGIN_SYMBOLDB_FALSE='#'
++else
++ HAVE_PLUGIN_SYMBOLDB_TRUE='#'
++ HAVE_PLUGIN_SYMBOLDB_FALSE=
+ fi
+
+
++
+ # Check whether --enable-plugin-valgrind was given.
+ if test "${enable_plugin_valgrind+set}" = set; then
+ enableval=$enable_plugin_valgrind; if test "$enableval" = "no"; then
+@@ -25590,6 +25563,13 @@ $as_echo "$as_me: error: conditional \"H
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
++if test -z "${HAVE_PLUGIN_SYMBOLDB_TRUE}" && test -z "${HAVE_PLUGIN_SYMBOLDB_FALSE}"; then
++ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_PLUGIN_SYMBOLDB\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++$as_echo "$as_me: error: conditional \"HAVE_PLUGIN_SYMBOLDB\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++ { (exit 1); exit 1; }; }
++fi
+ if test -z "${HAVE_PLUGIN_VALGRIND_TRUE}" && test -z "${HAVE_PLUGIN_VALGRIND_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_PLUGIN_VALGRIND\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+@@ -27272,28 +27252,27 @@ $as_echo "$as_me: executing $ac_file com
+
+
+ case $ac_file$ac_mode in
+- "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+- # Autoconf 2.62 quotes --file arguments for eval, but not when files
+- # are listed without --file. Let's play safe and only enable the eval
+- # if we detect the quoting.
+- case $CONFIG_FILES in
+- *\'*) eval set x "$CONFIG_FILES" ;;
+- *) set x $CONFIG_FILES ;;
+- esac
+- shift
+- for mf
+- do
+- # Strip MF so we end up with the name of the file.
+- mf=`echo "$mf" | sed -e 's/:.*$//'`
+- # Check whether this is an Automake generated Makefile or not.
+- # We used to match only the files named `Makefile.in', but
+- # some people rename them; so instead we look at the file content.
+- # Grep'ing the first line is not enough: some people post-process
+- # each Makefile.in and add a new line on top of each file to say so.
+- # Grep'ing the whole file is not good either: AIX grep has a line
+- # limit of 2048, but all sed's we know have understand at least 4000.
+- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+- dirpart=`$as_dirname -- "$mf" ||
++ "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
++# are listed without --file. Let's play safe and only enable the eval
++# if we detect the quoting.
++case $CONFIG_FILES in
++*\'*) eval set x "$CONFIG_FILES" ;;
++*) set x $CONFIG_FILES ;;
++esac
++shift
++for mf
++do
++ # Strip MF so we end up with the name of the file.
++ mf=`echo "$mf" | sed -e 's/:.*$//'`
++ # Check whether this is an Automake generated Makefile or not.
++ # We used to match only the files named `Makefile.in', but
++ # some people rename them; so instead we look at the file content.
++ # Grep'ing the first line is not enough: some people post-process
++ # each Makefile.in and add a new line on top of each file to say so.
++ # Grep'ing the whole file is not good either: AIX grep has a line
++ # limit of 2048, but all sed's we know have understand at least 4000.
++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
++ dirpart=`$as_dirname -- "$mf" ||
+ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$mf" : 'X\(//\)[^/]' \| \
+ X"$mf" : 'X\(//\)$' \| \
+@@ -27316,28 +27295,28 @@ $as_echo X"$mf" |
+ q
+ }
+ s/.*/./; q'`
+- else
+- continue
+- fi
+- # Extract the definition of DEPDIR, am__include, and am__quote
+- # from the Makefile without running `make'.
+- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+- test -z "$DEPDIR" && continue
+- am__include=`sed -n 's/^am__include = //p' < "$mf"`
+- test -z "am__include" && continue
+- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+- # When using ansi2knr, U may be empty or an underscore; expand it
+- U=`sed -n 's/^U = //p' < "$mf"`
+- # Find all dependency output files, they are included files with
+- # $(DEPDIR) in their names. We invoke sed twice because it is the
+- # simplest approach to changing $(DEPDIR) to its actual value in the
+- # expansion.
+- for file in `sed -n "
+- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+- # Make sure the directory exists.
+- test -f "$dirpart/$file" && continue
+- fdir=`$as_dirname -- "$file" ||
++ else
++ continue
++ fi
++ # Extract the definition of DEPDIR, am__include, and am__quote
++ # from the Makefile without running `make'.
++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
++ test -z "$DEPDIR" && continue
++ am__include=`sed -n 's/^am__include = //p' < "$mf"`
++ test -z "am__include" && continue
++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
++ # When using ansi2knr, U may be empty or an underscore; expand it
++ U=`sed -n 's/^U = //p' < "$mf"`
++ # Find all dependency output files, they are included files with
++ # $(DEPDIR) in their names. We invoke sed twice because it is the
++ # simplest approach to changing $(DEPDIR) to its actual value in the
++ # expansion.
++ for file in `sed -n "
++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
++ # Make sure the directory exists.
++ test -f "$dirpart/$file" && continue
++ fdir=`$as_dirname -- "$file" ||
+ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$file" : 'X\(//\)[^/]' \| \
+ X"$file" : 'X\(//\)$' \| \
+@@ -27360,7 +27339,7 @@ $as_echo X"$file" |
+ q
+ }
+ s/.*/./; q'`
+- { as_dir=$dirpart/$fdir
++ { as_dir=$dirpart/$fdir
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+@@ -27401,11 +27380,10 @@ $as_echo X"$as_dir" |
+ } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+ $as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+ { (exit 1); exit 1; }; }; }
+- # echo "creating $dirpart/$file"
+- echo '# dummy' > "$dirpart/$file"
+- done
++ # echo "creating $dirpart/$file"
++ echo '# dummy' > "$dirpart/$file"
+ done
+-}
++done
+ ;;
+ "libtool":C)
+
+@@ -28333,6 +28311,12 @@ if test x$scintilla = xyes ; then
+ else
+ echo "Building Scintilla based editor: .......................NO"
+ fi
++
++if test x$symboldb_plugin = xyes ; then
++ echo "Building symbol database plugin: .......................YES"
++else
++ echo "Building symbol database plugin: .......................NO"
++fi
+ echo "-------------------------------------------------------------------"
+ #echo "AM_CFLAGS = $AM_CFLAGS"
+ #echo "AM_CXXFLAGS = $AM_CXXFLAGS"
+Index: anjuta-2.26.2.2/ltmain.sh
+===================================================================
+--- anjuta-2.26.2.2.orig/ltmain.sh 2009-06-29 22:21:03.797933440 +0200
++++ anjuta-2.26.2.2/ltmain.sh 2009-06-29 22:19:38.166437672 +0200
+@@ -65,7 +65,7 @@
+ # compiler: $LTCC
+ # compiler flags: $LTCFLAGS
+ # linker: $LD (gnu? $with_gnu_ld)
+-# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-1ubuntu1
++# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4
+ # automake: $automake_version
+ # autoconf: $autoconf_version
+ #
+@@ -73,7 +73,7 @@
+
+ PROGRAM=ltmain.sh
+ PACKAGE=libtool
+-VERSION="2.2.6 Debian-2.2.6a-1ubuntu1"
++VERSION="2.2.6 Debian-2.2.6a-4"
+ TIMESTAMP=""
+ package_revision=1.3012
+
+@@ -5347,19 +5347,19 @@ func_mode_link ()
+ # It is a libtool convenience library, so add in its objects.
+ convenience="$convenience $ladir/$objdir/$old_library"
+ old_convenience="$old_convenience $ladir/$objdir/$old_library"
++ tmp_libs=
++ for deplib in $dependency_libs; do
++ deplibs="$deplib $deplibs"
++ if $opt_duplicate_deps ; then
++ case "$tmp_libs " in
++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++ esac
++ fi
++ tmp_libs="$tmp_libs $deplib"
++ done
+ elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ func_fatal_error "\`$lib' is not a convenience library"
+ fi
+- tmp_libs=
+- for deplib in $dependency_libs; do
+- deplibs="$deplib $deplibs"
+- if $opt_duplicate_deps ; then
+- case "$tmp_libs " in
+- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+- esac
+- fi
+- tmp_libs="$tmp_libs $deplib"
+- done
+ continue
+ fi # $pass = conv
+
+@@ -5896,6 +5896,7 @@ func_mode_link ()
+ if test "$link_all_deplibs" != no; then
+ # Add the search paths of all dependency libraries
+ for deplib in $dependency_libs; do
++ path=
+ case $deplib in
+ -L*) path="$deplib" ;;
+ *.la)
+Index: anjuta-2.26.2.2/plugins/symbol-db/Makefile.in
+===================================================================
+--- anjuta-2.26.2.2.orig/plugins/symbol-db/Makefile.in 2009-06-29 22:21:04.877935586 +0200
++++ anjuta-2.26.2.2/plugins/symbol-db/Makefile.in 2009-06-29 22:20:32.982426871 +0200
+@@ -62,18 +62,40 @@ am__installdirs = "$(DESTDIR)$(plugindir
+ pluginLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(plugin_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-libanjuta_symbol_db_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+-am_libanjuta_symbol_db_la_OBJECTS = plugin.lo readtags.lo \
+- symbol-db-engine-iterator.lo symbol-db-view.lo \
+- symbol-db-view-locals.lo symbol-db-view-search.lo \
+- symbol-db-engine-iterator-node.lo symbol-db-system.lo \
+- symbol-db-prefs.lo symbol-db-engine-queries.lo \
+- symbol-db-engine-utils.lo symbol-db-engine-core.lo
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@libanjuta_symbol_db_la_DEPENDENCIES = \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ $(am__DEPENDENCIES_1) \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ $(am__DEPENDENCIES_1) \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ $(am__DEPENDENCIES_1)
++am__libanjuta_symbol_db_la_SOURCES_DIST = plugin.c plugin.h readtags.c \
++ readtags.h symbol-db-engine-iterator.c \
++ symbol-db-engine-iterator.h symbol-db-view.h symbol-db-view.c \
++ symbol-db-view-locals.c symbol-db-view-locals.h \
++ symbol-db-view-search.h symbol-db-view-search.c \
++ symbol-db-engine-iterator-node.h \
++ symbol-db-engine-iterator-node.c symbol-db-system.h \
++ symbol-db-system.c symbol-db-prefs.h symbol-db-prefs.c \
++ symbol-db-engine-queries.c symbol-db-engine-queries.h \
++ symbol-db-engine-utils.c symbol-db-engine-utils.h \
++ symbol-db-engine-priv.h symbol-db-engine-core.c \
++ symbol-db-engine-core.h symbol-db-engine.h
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@am_libanjuta_symbol_db_la_OBJECTS = \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ plugin.lo readtags.lo \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ symbol-db-engine-iterator.lo \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ symbol-db-view.lo \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ symbol-db-view-locals.lo \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ symbol-db-view-search.lo \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ symbol-db-engine-iterator-node.lo \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ symbol-db-system.lo \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ symbol-db-prefs.lo \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ symbol-db-engine-queries.lo \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ symbol-db-engine-utils.lo \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ symbol-db-engine-core.lo
+ libanjuta_symbol_db_la_OBJECTS = $(am_libanjuta_symbol_db_la_OBJECTS)
+ libanjuta_symbol_db_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(libanjuta_symbol_db_la_LDFLAGS) $(LDFLAGS) -o $@
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@am_libanjuta_symbol_db_la_rpath = -rpath \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ $(plugindir)
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -87,7 +109,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
+ SOURCES = $(libanjuta_symbol_db_la_SOURCES)
+-DIST_SOURCES = $(libanjuta_symbol_db_la_SOURCES)
++DIST_SOURCES = $(am__libanjuta_symbol_db_la_SOURCES_DIST)
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+@@ -108,7 +130,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re
+ distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+-DIST_SUBDIRS = $(SUBDIRS)
++DIST_SUBDIRS = images test
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALL_LINGUAS = @ALL_LINGUAS@
+@@ -352,26 +374,26 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = images test
+-symbol_db_datadir = $(anjuta_data_dir)
+-symbol_db_data_DATA = tables.sql
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@SUBDIRS = images test
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@symbol_db_datadir = $(anjuta_data_dir)
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@symbol_db_data_DATA = tables.sql
+
+ # Plugin UI file
+-symbol_db_uidir = $(anjuta_ui_dir)
+-symbol_db_ui_DATA = anjuta-symbol-db-plugin.ui
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@symbol_db_uidir = $(anjuta_ui_dir)
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@symbol_db_ui_DATA = anjuta-symbol-db-plugin.ui
+
+ # Plugin Glade file
+-symbol_db_gladedir = $(anjuta_glade_dir)
+-symbol_db_glade_DATA = anjuta-symbol-db.glade
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@symbol_db_gladedir = $(anjuta_glade_dir)
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@symbol_db_glade_DATA = anjuta-symbol-db.glade
+
+ # Plugin Icon file
+-symbol_db_pixmapsdir = $(anjuta_image_dir)
+-symbol_db_pixmaps_DATA = anjuta-symbol-db-plugin-48.png
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@symbol_db_pixmapsdir = $(anjuta_image_dir)
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@symbol_db_pixmaps_DATA = anjuta-symbol-db-plugin-48.png
+
+ # Plugin description file
+-plugin_in_files = symbol-db.plugin.in
+-symbol_db_plugindir = $(anjuta_plugin_dir)
+-symbol_db_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@plugin_in_files = symbol-db.plugin.in
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@symbol_db_plugindir = $(anjuta_plugin_dir)
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@symbol_db_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+
+ # NOTE :
+ # The naming convention is very intentional
+@@ -382,55 +404,55 @@ symbol_db_plugin_DATA = $(plugin_in_file
+ # plugin 'libpython.so' needs to link with the real 'libpython.so'
+
+ # Include paths
+-AM_CPPFLAGS = \
+- $(WARN_CFLAGS) \
+- $(DEPRECATED_FLAGS) \
+- $(GDL_CFLAGS) \
+- $(LIBANJUTA_CFLAGS) \
+- $(PLUGIN_SYMBOL_DB_CFLAGS) \
+- -DG_LOG_DOMAIN=\"libanjuta-symbol-db\"
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@AM_CPPFLAGS = \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ $(WARN_CFLAGS) \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ $(DEPRECATED_FLAGS) \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ $(GDL_CFLAGS) \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ $(LIBANJUTA_CFLAGS) \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ $(PLUGIN_SYMBOL_DB_CFLAGS) \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ -DG_LOG_DOMAIN=\"libanjuta-symbol-db\"
+
+
+ # Where to install the plugin
+-plugindir = $(anjuta_plugin_dir)
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@plugindir = $(anjuta_plugin_dir)
+
+ # The plugin
+-plugin_LTLIBRARIES = libanjuta-symbol-db.la
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@plugin_LTLIBRARIES = libanjuta-symbol-db.la
+
+ # Plugin sources
+-libanjuta_symbol_db_la_SOURCES = plugin.c plugin.h \
+- readtags.c readtags.h \
+- symbol-db-engine-iterator.c \
+- symbol-db-engine-iterator.h \
+- symbol-db-view.h \
+- symbol-db-view.c \
+- symbol-db-view-locals.c \
+- symbol-db-view-locals.h \
+- symbol-db-view-search.h \
+- symbol-db-view-search.c \
+- symbol-db-engine-iterator-node.h \
+- symbol-db-engine-iterator-node.c \
+- symbol-db-system.h \
+- symbol-db-system.c symbol-db-prefs.h \
+- symbol-db-prefs.c symbol-db-engine-queries.c \
+- symbol-db-engine-queries.h symbol-db-engine-utils.c \
+- symbol-db-engine-utils.h symbol-db-engine-priv.h \
+- symbol-db-engine-core.c symbol-db-engine-core.h \
+- symbol-db-engine.h
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@libanjuta_symbol_db_la_SOURCES = plugin.c plugin.h \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ readtags.c readtags.h \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ symbol-db-engine-iterator.c \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ symbol-db-engine-iterator.h \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ symbol-db-view.h \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ symbol-db-view.c \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ symbol-db-view-locals.c \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ symbol-db-view-locals.h \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ symbol-db-view-search.h \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ symbol-db-view-search.c \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ symbol-db-engine-iterator-node.h \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ symbol-db-engine-iterator-node.c \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ symbol-db-system.h \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ symbol-db-system.c symbol-db-prefs.h \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ symbol-db-prefs.c symbol-db-engine-queries.c \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ symbol-db-engine-queries.h symbol-db-engine-utils.c \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ symbol-db-engine-utils.h symbol-db-engine-priv.h \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ symbol-db-engine-core.c symbol-db-engine-core.h \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ symbol-db-engine.h
+
+-libanjuta_symbol_db_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@libanjuta_symbol_db_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
+
+ # Plugin dependencies
+-libanjuta_symbol_db_la_LIBADD = \
+- $(GDL_LIBS) \
+- $(LIBANJUTA_LIBS) \
+- $(PLUGIN_SYMBOL_DB_LIBS)
+-
+-prefs_glade_files = anjuta-symbol-db.glade
+-prefs_glade_schemasdir = @GCONF_SCHEMA_FILE_DIR@
+-prefs_glade_schemas = $(prefs_glade_files:.glade=.schemas)
+-prefs_glade_schemas_DATA = $(prefs_glade_schemas)
+-CLEANFILES = $(prefs_glade_schemas)
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@libanjuta_symbol_db_la_LIBADD = \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ $(GDL_LIBS) \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ $(LIBANJUTA_LIBS) \
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ $(PLUGIN_SYMBOL_DB_LIBS)
++
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@prefs_glade_files = anjuta-symbol-db.glade
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@prefs_glade_schemasdir = @GCONF_SCHEMA_FILE_DIR@
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@prefs_glade_schemas = $(prefs_glade_files:.glade=.schemas)
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@prefs_glade_schemas_DATA = $(prefs_glade_schemas)
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@CLEANFILES = $(prefs_glade_schemas)
+ EXTRA_DIST = \
+ $(plugin_in_files) \
+ $(symbol_db_plugin_DATA) \
+@@ -500,7 +522,7 @@ clean-pluginLTLIBRARIES:
+ rm -f "$${dir}/so_locations"; \
+ done
+ libanjuta-symbol-db.la: $(libanjuta_symbol_db_la_OBJECTS) $(libanjuta_symbol_db_la_DEPENDENCIES)
+- $(libanjuta_symbol_db_la_LINK) -rpath $(plugindir) $(libanjuta_symbol_db_la_OBJECTS) $(libanjuta_symbol_db_la_LIBADD) $(LIBS)
++ $(libanjuta_symbol_db_la_LINK) $(am_libanjuta_symbol_db_la_rpath) $(libanjuta_symbol_db_la_OBJECTS) $(libanjuta_symbol_db_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -856,6 +878,8 @@ distclean-generic:
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
++ at HAVE_PLUGIN_SYMBOLDB_FALSE@uninstall-local:
++ at HAVE_PLUGIN_SYMBOLDB_FALSE@install-data-local:
+ clean: clean-recursive
+
+ clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
+@@ -947,26 +971,26 @@ uninstall-am: uninstall-local uninstall-
+ uninstall-symbol_db_pixmapsDATA uninstall-symbol_db_pluginDATA \
+ uninstall-symbol_db_uiDATA
+
+-%.plugin: %.plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@%.plugin: %.plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+
+-%.schemas: %.glade
+- $(top_srcdir)/scripts/glade2schema.pl $(srcdir)/$(?) > $(@)
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@%.schemas: %.glade
++ at HAVE_PLUGIN_SYMBOLDB_TRUE@ $(top_srcdir)/scripts/glade2schema.pl $(srcdir)/$(?) > $(@)
+
+- at GCONF_SCHEMAS_INSTALL_TRUE@install-data-local: $(prefs_glade_schemas)
+- at GCONF_SCHEMAS_INSTALL_TRUE@ for p in $(prefs_glade_schemas) ; do \
+- at GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p ; \
+- at GCONF_SCHEMAS_INSTALL_TRUE@ done
+- at GCONF_SCHEMAS_INSTALL_TRUE@ @killall -1 gconfd-2 || true
+-
+- at GCONF_SCHEMAS_INSTALL_TRUE@uninstall-local: $(prefs_glade_schemas)
+- at GCONF_SCHEMAS_INSTALL_TRUE@ for p in $(prefs_glade_schemas) ; do \
+- at GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $$p ; \
+- at GCONF_SCHEMAS_INSTALL_TRUE@ done
+- at GCONF_SCHEMAS_INSTALL_TRUE@ @killall -1 gconfd-2 || true
++ at GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_PLUGIN_SYMBOLDB_TRUE at install-data-local: $(prefs_glade_schemas)
++ at GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_PLUGIN_SYMBOLDB_TRUE@ for p in $(prefs_glade_schemas) ; do \
++ at GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_PLUGIN_SYMBOLDB_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p ; \
++ at GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_PLUGIN_SYMBOLDB_TRUE@ done
++ at GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_PLUGIN_SYMBOLDB_TRUE@ @killall -1 gconfd-2 || true
++
++ at GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_PLUGIN_SYMBOLDB_TRUE at uninstall-local: $(prefs_glade_schemas)
++ at GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_PLUGIN_SYMBOLDB_TRUE@ for p in $(prefs_glade_schemas) ; do \
++ at GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_PLUGIN_SYMBOLDB_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $$p ; \
++ at GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_PLUGIN_SYMBOLDB_TRUE@ done
++ at GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_PLUGIN_SYMBOLDB_TRUE@ @killall -1 gconfd-2 || true
+
+- at GCONF_SCHEMAS_INSTALL_FALSE@install-data-local:
++ at GCONF_SCHEMAS_INSTALL_FALSE@@HAVE_PLUGIN_SYMBOLDB_TRUE at install-data-local:
+
+- at GCONF_SCHEMAS_INSTALL_FALSE@uninstall-local:
++ at GCONF_SCHEMAS_INSTALL_FALSE@@HAVE_PLUGIN_SYMBOLDB_TRUE at uninstall-local:
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
Added: desktop/unstable/anjuta/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/patches/series?rev=20524&op=file
==============================================================================
--- desktop/unstable/anjuta/debian/patches/series (added)
+++ desktop/unstable/anjuta/debian/patches/series Mon Jun 29 20:51:33 2009
@@ -1,0 +1,3 @@
+# no patch in series
+01_gda_optional.patch
+90_relibtoolize.patch
Modified: desktop/unstable/anjuta/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/rules?rev=20524&op=diff
==============================================================================
--- desktop/unstable/anjuta/debian/rules (original)
+++ desktop/unstable/anjuta/debian/rules Mon Jun 29 20:51:33 2009
@@ -3,6 +3,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/cdbs/1/class/autotools-files.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
@@ -13,21 +14,14 @@
DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
-DEB_CONFIGURE_SCRIPT := ./autogen.sh
DEB_DH_INSTALLMIME_ARGS += mime/anjuta.xml
DEB_DH_MAKESHLIBS_ARGS_anjuta += -Xusr/lib/anjuta/
install/anjuta::
- chrpath -d debian/tmp/usr/bin/anjuta
- chrpath -d debian/tmp/usr/lib/libanjuta.so.0.0.0
- chrpath -d debian/tmp/usr/lib/glade3/modules/libgladeanjuta.so
- rm -f debian/tmp/usr/lib/anjuta/*.la
cd debian/tmp/usr/lib/anjuta/ && \
rm -f libfile-manager.so.0 libfile-manager.so && \
mv libfile-manager.so.0.0.0 libfile-manager.so
- rm -f debian/tmp/usr/share/doc/anjuta/COPYING
- rm -f debian/tmp/usr/share/doc/anjuta/INSTALL
clean::
rm -vf anjuta.desktop
More information about the pkg-gnome-commits
mailing list