[Xlibs] libXfont shared library version

[Eric Anholt]

--=-0IlWMLi+foB9iAD1e05W
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

On Sat, 2003-11-08 at 19:02, Keith Packard wrote:
> Around 18 o'clock on Nov 8, Eric Anholt wrote:
> 
> > The libXfont shared library from freedesktop.org has major version 0
> > (libXfont.so.0), while the XFree86 one from 4.3.0 is version 1.  Is this
> > intentional?  Also, have any of the changes at freedesktop.org been to
> > public interfaces which would require a bump of the major number?
> 
> Oops.  They apparently ship it as version 1.4.  Note that this number is 
> incompatible with the libtool --version-info numbering scheme (which would 
> make this produce different version numbers on BSD and Linux), so you'll 
> want to use the libtool 1.5 --version-number scheme instead.
> 
> I'd set the version number to 1.4.1.

Like this?  What should the package version be?  Some of the xlibs have
a package version equal to the shared lib version, others don't.

-- 
Eric Anholt                                eta@lclark.edu          
http://people.freebsd.org/~anholt/         anholt@FreeBSD.org


--=-0IlWMLi+foB9iAD1e05W
Content-Disposition: attachment; filename=libXfont-version.diff
Content-Type: text/x-patch; name=libXfont-version.diff; charset=iso-8859-1
Content-Transfer-Encoding: 7bit

Index: Makefile.am
===================================================================
RCS file: /cvs/xlibs/Xfont/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- Makefile.am	29 Oct 2003 16:11:40 -0000	1.4
+++ Makefile.am	9 Nov 2003 03:19:03 -0000
@@ -66,7 +66,7 @@
 #
 # Shared library version info.  This is not the same as the package version
 #
-libXfont_la_LDFLAGS = -version-info @LT_VERSION_INFO@
+libXfont_la_LDFLAGS = -version-number 1:4:1
 
 libXfontincludedir = $(includedir)/X11/fonts
 libXfontinclude_HEADERS = \
@@ -78,7 +78,7 @@
 	include/X11/fonts/fontproto.h \
 	include/X11/fonts/fontstruct.h \
 	include/X11/fonts/fsmasks.h
-	
+
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xfont.pc
Index: configure.ac
===================================================================
RCS file: /cvs/xlibs/Xfont/configure.ac,v
retrieving revision 1.9
diff -u -r1.9 configure.ac
--- configure.ac	9 Nov 2003 03:08:03 -0000	1.9
+++ configure.ac	9 Nov 2003 03:19:52 -0000
@@ -26,7 +26,7 @@
 AC_PREREQ([2.57])
 
 AC_INIT([libXfont],
-	0.0.1,
+	1.4.1,
 	[keithp@keithp.com],
 	libXfont)
 dnl
@@ -40,20 +40,6 @@
 AC_CONFIG_AUX_DIR(.)
 AC_CONFIG_HEADERS([include/X11/fonts/fontconf.h])
 
-dnl libtool versioning
-LT_CURRENT=0
-LT_REVISION=0
-LT_AGE=0
-
-AC_SUBST(LT_CURRENT)
-AC_SUBST(LT_REVISION)
-
-LT_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
-AC_SUBST(LT_VERSION_INFO)
-
-LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
-AC_SUBST(LT_CURRENT_MINUS_AGE)
-
 # Check for progs
 AC_PROG_CC
 AC_PROG_LIBTOOL

--=-0IlWMLi+foB9iAD1e05W--