r24409 - in /packages/unstable/memphis/debian: changelog control control.in libmemphis-0.2-dev.install patches/fix_circular_dependency.patch patches/series

bigon at users.alioth.debian.org bigon at users.alioth.debian.org
Thu May 27 19:12:33 UTC 2010 

Author: bigon
Date: Thu May 27 19:12:24 2010
New Revision: 24409

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24409
Log:
* Add Vala binding (Thanks to Łukasz Jernaś <deejay1 at srem.org>)
  - debian/patches/fix_circular_dependency.patch: fix circular dependency
    in configure when building vala bindings

Added:
    packages/unstable/memphis/debian/patches/fix_circular_dependency.patch
Modified:
    packages/unstable/memphis/debian/changelog
    packages/unstable/memphis/debian/control
    packages/unstable/memphis/debian/control.in
    packages/unstable/memphis/debian/libmemphis-0.2-dev.install
    packages/unstable/memphis/debian/patches/series

Modified: packages/unstable/memphis/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/memphis/debian/changelog?rev=24409&op=diff
==============================================================================
--- packages/unstable/memphis/debian/changelog [utf-8] (original)
+++ packages/unstable/memphis/debian/changelog [utf-8] Thu May 27 19:12:24 2010
@@ -1,3 +1,11 @@
+memphis (0.2.2-2) UNRELEASED; urgency=low
+
+  * Add Vala binding (Thanks to Łukasz Jernaś <deejay1 at srem.org>)
+    - debian/patches/fix_circular_dependency.patch: fix circular dependency
+      in configure when building vala bindings
+
+ -- Laurent Bigonville <bigon at debian.org>  Thu, 27 May 2010 21:01:34 +0200
+
 memphis (0.2.2-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/unstable/memphis/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/memphis/debian/control?rev=24409&op=diff
==============================================================================
--- packages/unstable/memphis/debian/control [utf-8] (original)
+++ packages/unstable/memphis/debian/control [utf-8] Thu May 27 19:12:24 2010
@@ -18,7 +18,8 @@
                libgirepository1.0-dev (>= 0.6.7),
                gir1.0-glib-2.0,
                gir1.0-freedesktop,
-               gtk-doc-tools (>= 0.12)
+               gtk-doc-tools (>= 0.12),
+               valac
 Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/memphis
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/packages/unstable/memphis/
@@ -47,7 +48,7 @@
  .
  It supports zoom level 12 to 18, projected with the Mercator projection. 
  .
- This package contains the developpement files.
+ This package contains the developpement files and Vala bindings.
 
 Package: libmemphis-doc
 Architecture: all

Modified: packages/unstable/memphis/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/memphis/debian/control.in?rev=24409&op=diff
==============================================================================
--- packages/unstable/memphis/debian/control.in [utf-8] (original)
+++ packages/unstable/memphis/debian/control.in [utf-8] Thu May 27 19:12:24 2010
@@ -13,7 +13,8 @@
                libgirepository1.0-dev (>= 0.6.7),
                gir1.0-glib-2.0,
                gir1.0-freedesktop,
-               gtk-doc-tools (>= 0.12)
+               gtk-doc-tools (>= 0.12),
+               valac
 Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/memphis
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/packages/unstable/memphis/
@@ -42,7 +43,7 @@
  .
  It supports zoom level 12 to 18, projected with the Mercator projection. 
  .
- This package contains the developpement files.
+ This package contains the developpement files and Vala bindings.
 
 Package: libmemphis-doc
 Architecture: all

Modified: packages/unstable/memphis/debian/libmemphis-0.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/memphis/debian/libmemphis-0.2-dev.install?rev=24409&op=diff
==============================================================================
--- packages/unstable/memphis/debian/libmemphis-0.2-dev.install [utf-8] (original)
+++ packages/unstable/memphis/debian/libmemphis-0.2-dev.install [utf-8] Thu May 27 19:12:24 2010
@@ -3,3 +3,4 @@
 usr/lib/libmemphis-0.2.a
 usr/lib/pkgconfig/memphis-0.2.pc
 usr/share/gir-1.0/Memphis-0.2.gir
+usr/share/vala/vapi/

Added: packages/unstable/memphis/debian/patches/fix_circular_dependency.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/memphis/debian/patches/fix_circular_dependency.patch?rev=24409&op=file
==============================================================================
--- packages/unstable/memphis/debian/patches/fix_circular_dependency.patch (added)
+++ packages/unstable/memphis/debian/patches/fix_circular_dependency.patch [utf-8] Thu May 27 19:12:24 2010
@@ -1,0 +1,76 @@
+diff -Nur memphis-orig/configure memphis-0.2.2/configure
+--- memphis-orig/configure	2010-05-24 18:46:34.000000000 +0200
++++ memphis-0.2.2/configure	2010-05-27 09:52:00.000000000 +0200
+@@ -11423,7 +11423,7 @@
+   if test x${VALAC} = x""; then
+     exit 0;
+   fi
+-  VALA_EXAMPLE_PACKAGES="--pkg cairo --pkg memphis-0.2"
++  VALA_EXAMPLE_PACKAGES="--pkg cairo"
+ 
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for VALA_EXAMPLE" >&5
+@@ -11434,12 +11434,12 @@
+         pkg_cv_VALA_EXAMPLE_CFLAGS="$VALA_EXAMPLE_CFLAGS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0, cairo, memphis-0.2\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "glib-2.0, cairo, memphis-0.2") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0, cairo\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "glib-2.0, cairo") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_VALA_EXAMPLE_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0, cairo, memphis-0.2" 2>/dev/null`
++  pkg_cv_VALA_EXAMPLE_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0, cairo" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -11452,12 +11452,12 @@
+         pkg_cv_VALA_EXAMPLE_LIBS="$VALA_EXAMPLE_LIBS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0, cairo, memphis-0.2\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "glib-2.0, cairo, memphis-0.2") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0, cairo\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "glib-2.0, cairo") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_VALA_EXAMPLE_LIBS=`$PKG_CONFIG --libs "glib-2.0, cairo, memphis-0.2" 2>/dev/null`
++  pkg_cv_VALA_EXAMPLE_LIBS=`$PKG_CONFIG --libs "glib-2.0, cairo" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -11476,14 +11476,14 @@
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        VALA_EXAMPLE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0, cairo, memphis-0.2"`
++	        VALA_EXAMPLE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0, cairo"`
+         else
+-	        VALA_EXAMPLE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0, cairo, memphis-0.2"`
++	        VALA_EXAMPLE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0, cairo"`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$VALA_EXAMPLE_PKG_ERRORS" >&5
+ 
+-	as_fn_error "Package requirements (glib-2.0, cairo, memphis-0.2) were not met:
++	as_fn_error "Package requirements (glib-2.0, cairo) were not met:
+ 
+ $VALA_EXAMPLE_PKG_ERRORS
+ 
+diff -Nur memphis-orig/configure.ac memphis-0.2.2/configure.ac
+--- memphis-orig/configure.ac	2010-05-24 18:37:36.000000000 +0200
++++ memphis-0.2.2/configure.ac	2010-05-27 09:46:14.000000000 +0200
+@@ -88,8 +88,8 @@
+   if test x${VALAC} = x""; then
+     exit 0;
+   fi
+-  VALA_EXAMPLE_PACKAGES="--pkg cairo --pkg memphis-0.2"
+-  PKG_CHECK_MODULES(VALA_EXAMPLE, [glib-2.0, cairo, memphis-0.2])
++  VALA_EXAMPLE_PACKAGES="--pkg cairo"
++  PKG_CHECK_MODULES(VALA_EXAMPLE, [glib-2.0, cairo])
+   AC_SUBST(VALA_EXAMPLE_CFLAGS)
+   AC_SUBST(VALA_EXAMPLE_LIBS)
+   AC_SUBST(VALA_EXAMPLE_PACKAGES)

Modified: packages/unstable/memphis/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/memphis/debian/patches/series?rev=24409&op=diff
==============================================================================
--- packages/unstable/memphis/debian/patches/series [utf-8] (original)
+++ packages/unstable/memphis/debian/patches/series [utf-8] Thu May 27 19:12:24 2010
@@ -1,1 +1,2 @@
 fix_configure.patch
+fix_circular_dependency.patch

More information about the pkg-gnome-commits mailing list