[cairo-commit] cairo-java AUTHORS, 1.1, 1.2 ChangeLog, 1.73, 1.74 MAINTAINERS, NONE, 1.1 autogen.sh, 1.3, 1.4 configure.ac, 1.9, 1.10

[Andrew Frederick Cowie]

Committed by: afcowie

Update of /cvs/cairo/cairo-java
In directory gabe:/tmp/cvs-serv15665

Modified Files:
	AUTHORS ChangeLog autogen.sh configure.ac 
Added Files:
	MAINTAINERS 
Log Message:
Migrate base library dependency from jg-common to glib-java.
Move org.gnu.javagnome.Handle back to org.gnu.glib.Handle


Index: AUTHORS
===================================================================
RCS file: /cvs/cairo/cairo-java/AUTHORS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- AUTHORS	23 Feb 2005 18:17:52 -0000	1.1
+++ AUTHORS	13 Sep 2005 03:14:10 -0000	1.2
@@ -1,5 +1,3 @@
 Jeffrey Morgan <kuzman at gmail.com>
 Massi Fr <massifr at fastwebnet.it>
 Soorya Kuloor <sooryak at otii.com>
-
-

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo-java/ChangeLog,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- ChangeLog	20 Aug 2005 16:42:18 -0000	1.73
+++ ChangeLog	13 Sep 2005 03:14:10 -0000	1.74
@@ -1,3 +1,51 @@
+2005-09-13  Andrew Cowie  <andrew at operationaldynamics.com>
+
+	* autogen.sh:
+	* configure.ac:
+	* src/java/org/freedesktop/cairo/Antialias.java:
+	* src/java/org/freedesktop/cairo/CairoObject.java:
+	* src/java/org/freedesktop/cairo/Content.java:
+	* src/java/org/freedesktop/cairo/Context.java: (Context):
+	* src/java/org/freedesktop/cairo/Extend.java:
+	* src/java/org/freedesktop/cairo/FillRule.java:
+	* src/java/org/freedesktop/cairo/Filter.java:
+	* src/java/org/freedesktop/cairo/FontExtents.java:
+	* src/java/org/freedesktop/cairo/FontFace.java:
+	* src/java/org/freedesktop/cairo/FontOptions.java:
+	* src/java/org/freedesktop/cairo/FontSlant.java:
+	* src/java/org/freedesktop/cairo/FontWeight.java:
+	* src/java/org/freedesktop/cairo/Format.java:
+	* src/java/org/freedesktop/cairo/Glyph.java: (Glyph):
+	* src/java/org/freedesktop/cairo/Gradient.java:
+	* src/java/org/freedesktop/cairo/HintMetrics.java:
+	* src/java/org/freedesktop/cairo/HintStyle.java:
+	* src/java/org/freedesktop/cairo/ImageSurface.java:
+	* src/java/org/freedesktop/cairo/LineCap.java:
+	* src/java/org/freedesktop/cairo/LineJoin.java:
+	* src/java/org/freedesktop/cairo/Matrix.java:
+	* src/java/org/freedesktop/cairo/Operator.java:
+	* src/java/org/freedesktop/cairo/PDFSurface.java:
+	* src/java/org/freedesktop/cairo/Path.java:
+	* src/java/org/freedesktop/cairo/PathElement.java:
+	* src/java/org/freedesktop/cairo/PathElementType.java:
+	* src/java/org/freedesktop/cairo/Pattern.java:
+	* src/java/org/freedesktop/cairo/ScaledFont.java:
+	* src/java/org/freedesktop/cairo/Status.java:
+	* src/java/org/freedesktop/cairo/SubpixelOrder.java:
+	* src/java/org/freedesktop/cairo/Surface.java:
+	* src/java/org/freedesktop/cairo/TextExtents.java:
+	* src/jni/org_freedesktop_cairo_Context.c:
+	* src/jni/org_freedesktop_cairo_FontExtents.c:
+	* src/jni/org_freedesktop_cairo_FontOptions.c:
+	* src/jni/org_freedesktop_cairo_Glyph.c:
+	* src/jni/org_freedesktop_cairo_Matrix.c:
+	* src/jni/org_freedesktop_cairo_PDFSurface.c:
+	* src/jni/org_freedesktop_cairo_Pattern.c:
+	* src/jni/org_freedesktop_cairo_ScaledFont.c:
+	* src/jni/org_freedesktop_cairo_Surface.c:
+	Migrate base library dependency from jg-common to glib-java.
+	Move org.gnu.javagnome.Handle back to org.gnu.glib.Handle
+
 2005-08-20  Jeffrey Morgan  <kuzman at gmail.com>
 
 	* src/java/org/freedesktop/cairo/Status.java: added new

--- NEW FILE: MAINTAINERS ---
Andrew Cowie <andrew at operationaldynamics.com>
Ismael Juma <ismael at juma.me.uk>

Index: autogen.sh
===================================================================
RCS file: /cvs/cairo/cairo-java/autogen.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- autogen.sh	16 Apr 2005 12:35:28 -0000	1.3
+++ autogen.sh	13 Sep 2005 03:14:10 -0000	1.4
@@ -68,7 +68,7 @@
 
 libtoolize --force || exit $?
 
-JAVAGNOME_MACROS=`pkg-config --variable macro_dir jg-common`
+JAVAGNOME_MACROS=`pkg-config --variable macro_dir glib-java`
 aclocal -I $JAVAGNOME_MACROS
 
 

Index: configure.ac
===================================================================
RCS file: /cvs/cairo/cairo-java/configure.ac,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- configure.ac	15 Aug 2005 23:38:17 -0000	1.9
+++ configure.ac	13 Sep 2005 03:14:10 -0000	1.10
@@ -18,15 +18,14 @@
 
 AC_INIT(src/jni/org_freedesktop_cairo_Context.c)
 AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE(cairo-java, 0.9.3)
+AM_INIT_AUTOMAKE(cairo-java, 1.0.0_rc1)
 
 AM_PROG_GCJ
 
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 
-apiversion="0.9"
-VERSION="0.9.3"
+apiversion="1.0"
 
 INSTALLED_CLASSPATH=\${prefix}/share/java/cairo${apiversion}-${VERSION}.jar 
 INSTALLED_JNI_DIR=\${prefix}/lib/
@@ -46,11 +45,11 @@
 JG_COMMON
 AM_PROG_CC_C_O
 
-PKG_CHECK_MODULES(CAIRO, cairo >= 0.9.3)
+PKG_CHECK_MODULES(CAIRO, cairo >= 1.0.0)
 AC_SUBST(CAIRO_CFLAGS)
 AC_SUBST(CAIRO_LIBS)
 
-PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 2.3.2)
+PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 2.3.1)
 AC_SUBST(FONTCONFIG_CFLAGS)
 AC_SUBST(FONTCONFIG_LIBS)