From 4efdb7c3aa65910959e26cfcabedfea15f73391d Mon Sep 17 00:00:00 2001 From: Mikkel Kruse Johnsen Date: Wed, 5 Nov 2014 15:06:03 +0100 Subject: [PATCH] Seperate pkgconfig version from package version --- configure.ac | 5 ++++- gdk/gdk-sharp-3.0.pc.in | 2 +- gio/gio-sharp-3.0.pc.in | 2 +- glib/glib-sharp-3.0.pc.in | 2 +- gtk/gtk-sharp-3.0.pc.in | 2 +- gtkdotnet/gtk-dotnet-3.0.pc.in | 2 +- parser/gapi-3.0.pc.in | 2 +- 7 files changed, 10 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 7b9fcc490..ecf1b1ada 100644 --- a/configure.ac +++ b/configure.ac @@ -7,13 +7,16 @@ AC_CONFIG_HEADERS(config.h) AM_MAINTAINER_MODE AC_CONFIG_MACRO_DIR([m4]) -API_VERSION=3.0.0.0 +API_VERSION=3.12.0.0 AC_SUBST(API_VERSION) CAIRO_API_VERSION=1.12.0.0 AC_SUBST(CAIRO_API_VERSION) POLICY_VERSIONS="" AC_SUBST(POLICY_VERSIONS) +PKG_VERSION=3.12.0 +AC_SUBST(PKG_VERSION) + PACKAGE_VERSION=gtk-sharp-3.0 AC_SUBST(PACKAGE_VERSION) diff --git a/gdk/gdk-sharp-3.0.pc.in b/gdk/gdk-sharp-3.0.pc.in index b93391215..fbba15f36 100644 --- a/gdk/gdk-sharp-3.0.pc.in +++ b/gdk/gdk-sharp-3.0.pc.in @@ -6,7 +6,7 @@ gapidir=${prefix}/share/gapi-3.0 Name: Gdk# Description: Gdk# - GDK .NET Binding -Version: @VERSION@ +Version: @PKG_VERSION@ Cflags: -I:${gapidir}/gdk-api.xml Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/gdk-sharp.dll Requires: glib-sharp-3.0 diff --git a/gio/gio-sharp-3.0.pc.in b/gio/gio-sharp-3.0.pc.in index efb3810e3..fd39c6796 100644 --- a/gio/gio-sharp-3.0.pc.in +++ b/gio/gio-sharp-3.0.pc.in @@ -6,7 +6,7 @@ gapidir=${prefix}/share/gapi-3.0 Name: GIO# Description: GIO# - GIO .NET Binding -Version: @VERSION@ +Version: @PKG_VERSION@ Cflags: -I:${gapidir}/gio-api.xml Libs: -r:${assemblies_dir}/gio-sharp.dll Requires: glib-sharp-3.0 diff --git a/glib/glib-sharp-3.0.pc.in b/glib/glib-sharp-3.0.pc.in index fcf0fb72c..429f32ca2 100644 --- a/glib/glib-sharp-3.0.pc.in +++ b/glib/glib-sharp-3.0.pc.in @@ -6,7 +6,7 @@ gapidir=${prefix}/share/gapi-3.0 Name: GLib# Description: GLib# - .NET Binding for the glib library. -Version: @VERSION@ +Version: @PKG_VERSION@ Cflags: -I:${gapidir}/glib-api.xml Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/glib-sharp.dll diff --git a/gtk/gtk-sharp-3.0.pc.in b/gtk/gtk-sharp-3.0.pc.in index a5ed3ca2c..c7097d0a6 100644 --- a/gtk/gtk-sharp-3.0.pc.in +++ b/gtk/gtk-sharp-3.0.pc.in @@ -6,7 +6,7 @@ gapidir=${prefix}/share/gapi-3.0 Name: Gtk# Description: Gtk# - GNOME .NET Binding -Version: @VERSION@ +Version: @PKG_VERSION@ Cflags: -I:${gapidir}/cairo-api.xml -I:${gapidir}/pango-api.xml -I:${gapidir}/atk-api.xml -I:${gapidir}/gtk-api.xml Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/cairo-sharp.dll -r:${libdir}/mono/@PACKAGE_VERSION@/pango-sharp.dll -r:${libdir}/mono/@PACKAGE_VERSION@/atk-sharp.dll -r:${libdir}/mono/@PACKAGE_VERSION@/gtk-sharp.dll Requires: glib-sharp-3.0 gio-sharp-3.0 gdk-sharp-3.0 diff --git a/gtkdotnet/gtk-dotnet-3.0.pc.in b/gtkdotnet/gtk-dotnet-3.0.pc.in index e8afe6830..8bf1741e7 100644 --- a/gtkdotnet/gtk-dotnet-3.0.pc.in +++ b/gtkdotnet/gtk-dotnet-3.0.pc.in @@ -5,6 +5,6 @@ libdir=${exec_prefix}/lib Name: Gtk.DotNet Description: .NET Extensions for Gtk -Version: @VERSION@ +Version: @PKG_VERSION@ Requires:gtk-sharp-3.0 Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/gtk-dotnet.dll diff --git a/parser/gapi-3.0.pc.in b/parser/gapi-3.0.pc.in index 665d02608..fdf2d6a11 100644 --- a/parser/gapi-3.0.pc.in +++ b/parser/gapi-3.0.pc.in @@ -3,4 +3,4 @@ prefix=${pcfiledir}/../.. Name: GAPI Description: GObject .NET API Wrapping Tool -Version: @VERSION@ +Version: @PKG_VERSION@