[Pkg-cli-apps-commits] [SCM] docky branch, master, updated. debian/2.0.5-1-6-g63b2127

[Rico Tzschichholz]

The following commit has been merged in the master branch:
commit 63b21275bcb99dd4d8c6013e2b894b0a3c4efb23
Author: Rico Tzschichholz <ricotz at t-online.de>
Date:   Fri Sep 3 08:04:41 2010 +0200

    Fixing up packaging and build-system for gio-sharp >= 2.22.2

diff --git a/debian/changelog b/debian/changelog
index 9c1f66b..e5ace98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ docky (2.0.6-1) UNRELEASED; urgency=low
       - fix crash and leak in Gmail
   * debian/patches:
     + drop 01_use_cli_for_wrapper.patch
+  * patch build-system and bump dependency for new gio-sharp >= 2.22.2
+    + update debian/patches/use-system-gio-sharp.patch 
 
  -- Rico Tzschichholz <ricotz at t-online.de>  Wed, 01 Sep 2010 09:37:14 +0200
 
diff --git a/debian/control b/debian/control
index bf7ca98..4d59b39 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,7 @@ Build-Depends-Indep:
  libgtk2.0-dev,
  libglib2.0-dev,
  libgconf2-dev,
- libgio2.0-cil-dev,
+ libgio2.0-cil-dev (>= 2.22.2),
 Standards-Version: 3.9.1
 XS-Python-Version: >= 2.5
 Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/docky.git
diff --git a/debian/patches/use-system-gio-sharp.patch b/debian/patches/use-system-gio-sharp.patch
index 715af4c..edfe054 100644
--- a/debian/patches/use-system-gio-sharp.patch
+++ b/debian/patches/use-system-gio-sharp.patch
@@ -1,17 +1,28 @@
 Index: docky/configure.ac
 ===================================================================
---- docky.orig/configure.ac	2010-05-31 21:02:35.577466139 +1000
-+++ docky/configure.ac	2010-05-31 21:41:51.636241823 +1000
-@@ -138,7 +138,7 @@
+--- 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"
-+PKG_CHECK_MODULES([GIO_SHARP], [gio-sharp-2.0])
++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 +175,6 @@
+@@ -175,9 +186,6 @@
  
  AC_CONFIG_FILES([
  lib/Makefile
@@ -23,9 +34,18 @@ Index: docky/configure.ac
  scripts/docky/docky.py
 Index: docky/Makefile.am
 ===================================================================
---- docky.orig/Makefile.am	2010-05-31 21:41:58.956209626 +1000
-+++ docky/Makefile.am	2010-05-31 21:42:11.246235746 +1000
-@@ -9,7 +9,6 @@
+--- 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 \

-- 
docky