Package: cairo
Version: 0.5.0-2
Tags: patch
The following patch uses -release instead of -version-info to
determine the soname for the shared library. It looks like upstream
doesn't care about the soname until they get at version 1.0, but we
have to. Once 1.0 is released, this patch can be reverted again.
Matthias
diff -urN d/cairo-0.5.0/debian/changelog cairo-0.5.0/debian/changelog
--- d/cairo-0.5.0/debian/changelog 2005-06-18 13:08:54.037710200 +0000
+++ cairo-0.5.0/debian/changelog 2005-06-18 12:54:30.171037896 +0000
@@ -1,3 +1,10 @@
+cairo (0.5.0-2.1) unstable; urgency=low
+
+ * Don't use -version-info for the library flags, but -release to
+ create a uniq soname.
+
+ -- Matthias Klose <[EMAIL PROTECTED]> Sat, 18 Jun 2005 12:51:55 +0000
+
cairo (0.5.0-2) unstable; urgency=low
* Fix the shlibs dependencies for libcairo0.5
diff -urN d/cairo-0.5.0/configure.in cairo-0.5.0/configure.in
--- d/cairo-0.5.0/configure.in 2005-05-18 01:38:23.000000000 +0000
+++ cairo-0.5.0/configure.in 2005-06-18 12:45:35.528315944 +0000
@@ -24,6 +24,9 @@
VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
AC_SUBST(VERSION_INFO)
+LIBRARY_RELEASE="$(echo $CAIRO_VERSION | awk -F. '{OFS="."; print $1, $2}')"
+AC_SUBST(LIBRARY_RELEASE)
+
dnl ===========================================================================
AM_INIT_AUTOMAKE(cairo, $CAIRO_VERSION)
diff -urN d/cairo-0.5.0/configure cairo-0.5.0/configure
--- d/cairo-0.5.0/configure 2005-05-18 01:40:14.000000000 +0000
+++ cairo-0.5.0/configure 2005-06-18 12:45:41.683380232 +0000
@@ -463,7 +463,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION_INFO
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL
AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP
INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar
am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS
CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE
AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP
build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP
LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE
am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL
PKG_CONFIG XRENDER_CFLAGS XRENDER_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS
CAIRO_HAS_XLIB_SURFACE_TRUE CAIRO_HAS_XLIB_SURFACE_FALSE XLIB_SURFACE_FEATURE
XRENDER_REQUIRES CAIRO_HAS_QUARTZ_SURFACE_TRUE CAIRO_HAS_QUARTZ_SURFACE_FALSE
QUARTZ_SURFACE_FEATURE XCB_CFLAGS XCB_LIBS CAIRO_HAS_XCB_SURFACE_TRUE
CAIRO_HAS_XCB_SURFACE_FALSE XCB_SURFACE_FEATURE CAIRO_HAS_WIN32_SURFACE_TRUE
CAIRO_HAS_WIN32_SURFACE_FALSE WIN32_SURFACE_FEATURE CAIRO_HAS_WIN32_FONT_TRUE
CAIRO_HAS_WIN32_FONT_FALSE WIN32_FONT_FEATURE CAIRO_HAS_PS_SURFACE_TRUE
CAIRO_HAS_PS_SURFACE_FALSE PS_SURFACE_FEATURE PS_LIBS PNG_CFLAGS PNG_LIBS
CAIRO_HAS_PNG_FUNCTIONS_TRUE CAIRO_HAS_PNG_FUNCTIONS_FALSE
PNG_FUNCTIONS_FEATURE PNG_REQUIRES GLITZ_CFLAGS GLITZ_LIBS
CAIRO_HAS_GLITZ_SURFACE_TRUE CAIRO_HAS_GLITZ_SURFACE_FALSE
GLITZ_SURFACE_FEATURE GLITZ_REQUIRES PIXMAN_CFLAGS PIXMAN_LIBS
FONTCONFIG_CFLAGS FONTCONFIG_LIBS FREETYPE_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS
FREETYPE_REQUIRES CAIRO_HAS_FT_FONT_TRUE CAIRO_HAS_FT_FONT_FALSE
FT_FONT_FEATURE CAIRO_HAS_PDF_SURFACE_TRUE CAIRO_HAS_PDF_SURFACE_FALSE
PDF_SURFACE_FEATURE PDF_LIBS CAIRO_HAS_ATSUI_FONT_TRUE
CAIRO_HAS_ATSUI_FONT_FALSE ATSUI_FONT_FEATURE CAIRO_CFLAGS CAIRO_LIBS HTML_DIR
ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE
GTK_DOC_USE_LIBTOOL_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION_INFO
LIBRARY_RELEASE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE
VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP
ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR
am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS
LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE
AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP
build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP
LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE
am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL
PKG_CONFIG XRENDER_CFLAGS XRENDER_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS
CAIRO_HAS_XLIB_SURFACE_TRUE CAIRO_HAS_XLIB_SURFACE_FALSE XLIB_SURFACE_FEATURE
XRENDER_REQUIRES CAIRO_HAS_QUARTZ_SURFACE_TRUE CAIRO_HAS_QUARTZ_SURFACE_FALSE
QUARTZ_SURFACE_FEATURE XCB_CFLAGS XCB_LIBS CAIRO_HAS_XCB_SURFACE_TRUE
CAIRO_HAS_XCB_SURFACE_FALSE XCB_SURFACE_FEATURE CAIRO_HAS_WIN32_SURFACE_TRUE
CAIRO_HAS_WIN32_SURFACE_FALSE WIN32_SURFACE_FEATURE CAIRO_HAS_WIN32_FONT_TRUE
CAIRO_HAS_WIN32_FONT_FALSE WIN32_FONT_FEATURE CAIRO_HAS_PS_SURFACE_TRUE
CAIRO_HAS_PS_SURFACE_FALSE PS_SURFACE_FEATURE PS_LIBS PNG_CFLAGS PNG_LIBS
CAIRO_HAS_PNG_FUNCTIONS_TRUE CAIRO_HAS_PNG_FUNCTIONS_FALSE
PNG_FUNCTIONS_FEATURE PNG_REQUIRES GLITZ_CFLAGS GLITZ_LIBS
CAIRO_HAS_GLITZ_SURFACE_TRUE CAIRO_HAS_GLITZ_SURFACE_FALSE
GLITZ_SURFACE_FEATURE GLITZ_REQUIRES PIXMAN_CFLAGS PIXMAN_LIBS
FONTCONFIG_CFLAGS FONTCONFIG_LIBS FREETYPE_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS
FREETYPE_REQUIRES CAIRO_HAS_FT_FONT_TRUE CAIRO_HAS_FT_FONT_FALSE
FT_FONT_FEATURE CAIRO_HAS_PDF_SURFACE_TRUE CAIRO_HAS_PDF_SURFACE_FALSE
PDF_SURFACE_FEATURE PDF_LIBS CAIRO_HAS_ATSUI_FONT_TRUE
CAIRO_HAS_ATSUI_FONT_FALSE ATSUI_FONT_FEATURE CAIRO_CFLAGS CAIRO_LIBS HTML_DIR
ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE
GTK_DOC_USE_LIBTOOL_FALSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1535,6 +1535,9 @@
VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
+LIBRARY_RELEASE="$(echo $CAIRO_VERSION | awk -F. '{OFS="."; print $1, $2}')"
+
+
am__api_version="1.9"
ac_aux_dir=
@@ -24458,6 +24391,7 @@
s,@ECHO_T@,$ECHO_T,;t t
s,@LIBS@,$LIBS,;t t
s,@VERSION_INFO@,$VERSION_INFO,;t t
+s,@LIBRARY_RELEASE@,$LIBRARY_RELEASE,;t t
s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
s,@INSTALL_DATA@,$INSTALL_DATA,;t t
diff -urN d/cairo-0.5.0/debian/libcairo0.5.install
cairo-0.5.0/debian/libcairo0.5.install
--- d/cairo-0.5.0/debian/libcairo0.5.install 2005-06-18 13:08:54.037710200
+0000
+++ cairo-0.5.0/debian/libcairo0.5.install 2005-06-18 12:50:30.904411952
+0000
@@ -1 +1 @@
-debian/tmp/usr/lib/libcairo.so.* /usr/lib
+debian/tmp/usr/lib/libcairo-*.so /usr/lib
diff -urN d/cairo-0.5.0/debian/libcairo0.5.shlibs
cairo-0.5.0/debian/libcairo0.5.shlibs
--- d/cairo-0.5.0/debian/libcairo0.5.shlibs 2005-06-18 13:08:54.039709896
+0000
+++ cairo-0.5.0/debian/libcairo0.5.shlibs 1970-01-01 00:00:00.000000000
+0000
@@ -1 +0,0 @@
-libcairo 1 libcairo0.5 (>= 0.5.0)
diff -urN d/cairo-0.5.0/src/Makefile.am cairo-0.5.0/src/Makefile.am
--- d/cairo-0.5.0/src/Makefile.am 2005-05-17 16:01:09.000000000 +0000
+++ cairo-0.5.0/src/Makefile.am 2005-06-18 12:43:59.240953848 +0000
@@ -121,7 +121,7 @@
$(libcairo_win32_sources)\
cairoint.h
-libcairo_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
+libcairo_la_LDFLAGS = -release @LIBRARY_RELEASE@ -no-undefined
INCLUDES = -I$(srcdir) $(CAIRO_CFLAGS)
diff -urN d/cairo-0.5.0/src/Makefile.in cairo-0.5.0/src/Makefile.in
--- d/cairo-0.5.0/src/Makefile.in 2005-05-18 01:40:12.000000000 +0000
+++ cairo-0.5.0/src/Makefile.in 2005-06-18 12:44:13.016859592 +0000
@@ -378,7 +378,7 @@
$(libcairo_win32_sources)\
cairoint.h
-libcairo_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
+libcairo_la_LDFLAGS = -release @LIBRARY_RELEASE@ -no-undefined
INCLUDES = -I$(srcdir) $(CAIRO_CFLAGS)
libcairo_la_LIBADD = $(CAIRO_LIBS)
all: all-am
