~ubuntu-branches/debian/sid/docky/sid

Index: docky/configure.ac

===================================================================

--- docky.orig/configure.ac

+++ docky/configure.ac

@@ -138,7 +138,18 @@

 DOCKY_WINDOWING_LIBS="-r:$(pwd)/build/Docky.Windowing.dll"

 AC_SUBST([DOCKY_WINDOWING_LIBS])

 

-GIO_SHARP_LIBS="-r:$(pwd)/build/gio-sharp.dll"

+dnl gio-sharp is an unstable api library

+GIO_SHARP_REQUIRED_VERSION=2.22.2

+PKG_CHECK_MODULES([GIO_SHARP], [gio-sharp-2.0 >= $GIO_SHARP_REQUIRED_VERSION])

+files="`$PKG_CONFIG --variable=Libraries gio-sharp-2.0`"

+for file in $files; do

+       [ mkdir -p $top_srcdir/build ] && [ cp -vu $file $top_srcdir/build/ ]

+       GIO_SHARP_ASSEMBLIES="$GIO_SHARP_ASSEMBLIES $top_srcdir/build/$(basename $file)"

+       GIO_SHARP_LIBS="$GIO_SHARP_LIBS -r:$top_srcdir/build/$(basename $file)"

+       [[ -r "$file.config" ]] && [ mkdir -p $top_srcdir/build ] && [ cp -vu $file.config $top_srcdir/build/ ]

+       [[ -r "$file.config" ]] && GIO_SHARP_ASSEMBLIES="$GIO_SHARP_ASSEMBLIES $top_srcdir/build/$(basename $file).config"

+done

+AC_SUBST([GIO_SHARP_ASSEMBLIES])

 AC_SUBST([GIO_SHARP_LIBS])

 

 PKG_CHECK_MODULES([NUNIT], [nunit], have_nunit=yes, have_nunit=no)

@@ -175,9 +186,6 @@

 

 AC_CONFIG_FILES([

 lib/Makefile

-lib/gio-sharp/Makefile

-lib/gio-sharp/generator/Makefile

-lib/gio-sharp/gio/Makefile

 scripts/Makefile

 scripts/docky/Makefile

 scripts/docky/docky.py

Index: docky/Makefile.am

===================================================================

--- docky.orig/Makefile.am

+++ docky/Makefile.am

@@ -5,11 +5,15 @@

 

 ACLOCAL_AMFLAGS = -I m4 -I m4/shamrock

 

+# Install copied assemblies to our libdir

+copiedlibsdir = $(pkglibdir)

+copiedlibs_DATA = \

+       $(GIO_SHARP_ASSEMBLIES)

+

 SUBDIRS = \

        . \

        data \

        scripts \

-       lib \

        po \

        Docky.CairoHelper \

        Docky.Services \