From a81828fdd27436b0577b048d6fad7cc1c70ac23e Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Tue, 13 Jul 2010 14:35:28 +0200 Subject: [PATCH] Get rid of SHERLOCK_VERSION and use UCW_VERSION everywhere --- charset/libcharset.pc | 2 +- images/libimages.pc | 2 +- shxml/libshxml.pc | 2 +- ucw/default.cfg | 6 ++---- ucw/libucw.pc | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/charset/libcharset.pc b/charset/libcharset.pc index 6d14cbe4..19e74021 100644 --- a/charset/libcharset.pc +++ b/charset/libcharset.pc @@ -5,7 +5,7 @@ incdir=. Name: libcharset Description: Character set conversion library -Version: @SHERLOCK_VERSION@ +Version: @UCW_VERSION@ Cflags: -I${incdir} Libs: -L${libdir} -lcharset Requires: @DEPS@ diff --git a/images/libimages.pc b/images/libimages.pc index 3bf4c2e3..10f6e4f1 100644 --- a/images/libimages.pc +++ b/images/libimages.pc @@ -5,7 +5,7 @@ incdir=. Name: libimages Description: Sherlock image library -Version: @SHERLOCK_VERSION@ +Version: @UCW_VERSION@ Cflags: -I${incdir} Libs: -L${libdir} -limages -lm -lpthread @LIBIMAGES_LIBS@ Requires: @DEPS@ diff --git a/shxml/libshxml.pc b/shxml/libshxml.pc index c2172b39..877b7a43 100644 --- a/shxml/libshxml.pc +++ b/shxml/libshxml.pc @@ -5,7 +5,7 @@ incdir=. Name: libshxml Description: XML parser for Sherlock project -Version: @SHERLOCK_VERSION@ +Version: @UCW_VERSION@ Cflags: -I${incdir} Libs: -L${libdir} -lshxml Requires: @DEPS@ diff --git a/ucw/default.cfg b/ucw/default.cfg index 705421da..938f8f40 100644 --- a/ucw/default.cfg +++ b/ucw/default.cfg @@ -2,10 +2,8 @@ # (c) 2005--2009 Martin Mares # Version of the whole package -Set("SHERLOCK_VERSION" => "4.0.1-dev"); -Set("SHERLOCK_VERSION_CODE" => 4000000); -Set("UCW_VERSION" => Get("SHERLOCK_VERSION")); -Set("UCW_VERSION_CODE" => Get("SHERLOCK_VERSION_CODE")); +Set("UCW_VERSION" => "4.0.1-dev"); +Set("UCW_VERSION_CODE" => 4000001); # Compile everything with debug information and ASSERT's UnSet("CONFIG_DEBUG"); diff --git a/ucw/libucw.pc b/ucw/libucw.pc index 5e6801fa..c4784eb2 100644 --- a/ucw/libucw.pc +++ b/ucw/libucw.pc @@ -21,6 +21,6 @@ build_system=@INSTALL_SHARE_DIR@/ucw/build Name: libucw Description: A library of utility functions and data structures -Version: @SHERLOCK_VERSION@ +Version: @UCW_VERSION@ Cflags: -I${incdir} Libs: -L${libdir} -lucw ${threads} ${regex} -- 2.39.2