[libdmapsharing] Bump version and bump API to 3.0 Signed-off-by: W. Michael Petullo <mike flyn org>
- From: W. Michael Petullo <wmpetullo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libdmapsharing] Bump version and bump API to 3.0 Signed-off-by: W. Michael Petullo <mike flyn org>
- Date: Wed, 22 Dec 2010 19:41:50 +0000 (UTC)
commit 370233f7e46b0c577e68dcadd5d6c50a93adbaa6
Author: W. Michael Petullo <mike flyn org>
Date: Sun Dec 19 21:48:57 2010 -0600
Bump version and bump API to 3.0
Signed-off-by: W. Michael Petullo <mike flyn org>
configure.ac | 6 +-
libdmapsharing.pc.in | 2 +-
libdmapsharing/Makefile.am | 16 +++---
tests/Makefile.am | 6 +-
vala/Makefile.am | 50 ++++++++++----------
.../libdmapsharing-3.0.excludes} | 0
.../libdmapsharing-3.0.files} | 0
.../libdmapsharing-3.0.metadata} | 0
.../libdmapsharing-3.0.namespace} | 0
.../libdmapsharing-3.0.excludes} | 0
.../libdmapsharing-3.0.files} | 0
.../libdmapsharing-3.0.metadata} | 0
.../libdmapsharing-3.0.namespace} | 0
.../libdmapsharing-3.0.excludes} | 0
.../libdmapsharing-3.0.files} | 0
.../libdmapsharing-3.0.metadata} | 0
.../libdmapsharing-3.0.namespace} | 0
.../libdmapsharing-2.2-custom.vala | 1 +
.../libdmapsharing-3.0.excludes} | 0
.../libdmapsharing-3.0.files} | 0
.../libdmapsharing-3.0.metadata} | 0
.../libdmapsharing-3.0.namespace} | 0
22 files changed, 41 insertions(+), 40 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8dd358b..c2044f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,13 +1,13 @@
-AC_INIT(libdmapsharing, 2.1.13)
+AC_INIT(libdmapsharing, 2.9.0)
dnl when going to/from release please set the nano (fourth number) right !
dnl releases only do Wall, cvs and prerelease does Werror too
-AS_VERSION(libdmapsharing, LIBDMAPSHARING, 2, 1, 13, LIBDMAPSHARING_CVS="no", LIBDMAPSHARING_CVS="yes")
+AS_VERSION(libdmapsharing, LIBDMAPSHARING, 2, 9, 0, LIBDMAPSHARING_CVS="no", LIBDMAPSHARING_CVS="yes")
dnl FIXME:
dnl would like to automate this off the above definitions, but API might be 2.2 with version 2.1.
dnl see also Makefile.am, libdmapsharing/Makefile.am and libdmapsharing.pc.in
-API_VERSION=2.2
+API_VERSION=3.0
#AC_DEFINE(API_VERSION, $API_VERSION, [library API version])
AC_SUBST(API_VERSION)
diff --git a/libdmapsharing.pc.in b/libdmapsharing.pc.in
index c95a5cf..c46f912 100644
--- a/libdmapsharing.pc.in
+++ b/libdmapsharing.pc.in
@@ -7,5 +7,5 @@ Name: libdmapsharing
Description: libdmapsharing
Version: @VERSION@
Requires: glib-2.0 libsoup-2.4
-Libs: -L${libdir} -ldmapsharing
+Libs: -L${libdir} -ldmapsharing- API_VERSION@
Cflags: -I${includedir}/libdmapsharing- API_VERSION@
diff --git a/libdmapsharing/Makefile.am b/libdmapsharing/Makefile.am
index e26367b..54e97bf 100644
--- a/libdmapsharing/Makefile.am
+++ b/libdmapsharing/Makefile.am
@@ -1,8 +1,8 @@
-lib_LTLIBRARIES = libdmapsharing.la
+lib_LTLIBRARIES = libdmapsharing-3.0.la
BUILT_SOURCES = dmap-marshal.c dmap-marshal.h dmap-enums.c dmap-enums.h
-libdmapsharing_la_SOURCES = \
+libdmapsharing_3_0_la_SOURCES = \
$(BUILT_SOURCES) \
daap-connection.c \
daap-record.c \
@@ -24,15 +24,15 @@ libdmapsharing_la_SOURCES = \
dpap-share.c
if USE_HOWL
-libdmapsharing_la_SOURCES += \
+libdmapsharing_3_0_la_SOURCES += \
dmap-mdns-browser-howl.c
else
if USE_DNS_SD
-libdmapsharing_la_SOURCES += \
+libdmapsharing_3_0_la_SOURCES += \
dmap-mdns-browser-dnssd.c \
dmap-mdns-publisher-dnssd.c
else
-libdmapsharing_la_SOURCES += \
+libdmapsharing_3_0_la_SOURCES += \
dmap-mdns-avahi.c \
dmap-mdns-browser-avahi.c \
dmap-mdns-publisher-avahi.c
@@ -40,14 +40,14 @@ endif
endif
if USE_GSTREAMERAPP
-libdmapsharing_la_SOURCES += \
+libdmapsharing_3_0_la_SOURCES += \
g-gst-input-stream.c \
g-gst-mp3-input-stream.c \
g-gst-wav-input-stream.c \
gst-util.c
endif
-libdmapsharing_la_CFLAGS = \
+libdmapsharing_3_0_la_CFLAGS = \
-DG_LOG_DOMAIN=\"libdmapsharing\" \
-I$(top_srcdir) \
$(GDKPIXBUF_CFLAGS) \
@@ -55,7 +55,7 @@ libdmapsharing_la_CFLAGS = \
$(GSTREAMERAPP_CFLAGS) \
$(MDNS_CFLAGS)
-libdmapsharing_la_LDFLAGS = \
+libdmapsharing_3_0_la_LDFLAGS = \
-version-info @SO_VERSION@ \
$(GLIB_LIBS) \
$(GTHREAD_LIBS) \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d2b4208..6fb3e7f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -13,7 +13,7 @@ test_dmap_client_SOURCES = \
test-dmap-client.c
test_dmap_client_LDADD = \
- $(top_builddir)/libdmapsharing/libdmapsharing.la \
+ $(top_builddir)/libdmapsharing/libdmapsharing-3.0.la \
$(GLIB_LIBS) \
$(GTHREAD_LIBS) \
$(GOBJECT_LIBS) \
@@ -33,7 +33,7 @@ test_dmap_server_SOURCES = \
test-dpap-record-factory.c
test_dmap_server_LDADD = \
- $(top_builddir)/libdmapsharing/libdmapsharing.la \
+ $(top_builddir)/libdmapsharing/libdmapsharing-3.0.la \
$(GLIB_LIBS) \
$(GTHREAD_LIBS) \
$(GOBJECT_LIBS) \
@@ -61,7 +61,7 @@ dpapview_SOURCES = \
$(dpapview_VALABUILTSOURCES)
dpapview_LDADD = \
- $(top_builddir)/libdmapsharing/libdmapsharing.la \
+ $(top_builddir)/libdmapsharing/libdmapsharing-3.0.la \
$(GTK_LIBS) \
$(GEE_LIBS)
endif
diff --git a/vala/Makefile.am b/vala/Makefile.am
index 2273ab1..93d6f53 100644
--- a/vala/Makefile.am
+++ b/vala/Makefile.am
@@ -43,30 +43,30 @@ all: libdmapsharing- API_VERSION@.vapi
endif
EXTRA_DIST = \
- libdmapsharing- API_VERSION@-daap/libdmapsharing-2.2.excludes \
- libdmapsharing- API_VERSION@-daap/libdmapsharing-2.2.files \
- libdmapsharing- API_VERSION@-daap/libdmapsharing-2.2.metadata \
- libdmapsharing- API_VERSION@-daap/libdmapsharing-2.2.namespace \
- libdmapsharing- API_VERSION@-dacp/libdmapsharing-2.2.excludes \
- libdmapsharing- API_VERSION@-dacp/libdmapsharing-2.2.files \
- libdmapsharing- API_VERSION@-dacp/libdmapsharing-2.2.metadata \
- libdmapsharing- API_VERSION@-dacp/libdmapsharing-2.2.namespace \
- libdmapsharing- API_VERSION@-dmap/libdmapsharing-2.2.excludes \
- libdmapsharing- API_VERSION@-dmap/libdmapsharing-2.2.files \
- libdmapsharing- API_VERSION@-dmap/libdmapsharing-2.2.metadata \
- libdmapsharing- API_VERSION@-dmap/libdmapsharing-2.2.namespace \
- libdmapsharing- API_VERSION@-dpap/libdmapsharing-2.2.excludes \
- libdmapsharing- API_VERSION@-dpap/libdmapsharing-2.2.files \
- libdmapsharing- API_VERSION@-dpap/libdmapsharing-2.2.metadata \
- libdmapsharing- API_VERSION@-dpap/libdmapsharing-2.2.namespace
+ libdmapsharing- API_VERSION@-daap/libdmapsharing- API_VERSION@.excludes \
+ libdmapsharing- API_VERSION@-daap/libdmapsharing- API_VERSION@.files \
+ libdmapsharing- API_VERSION@-daap/libdmapsharing- API_VERSION@.metadata \
+ libdmapsharing- API_VERSION@-daap/libdmapsharing- API_VERSION@.namespace \
+ libdmapsharing- API_VERSION@-dacp/libdmapsharing- API_VERSION@.excludes \
+ libdmapsharing- API_VERSION@-dacp/libdmapsharing- API_VERSION@.files \
+ libdmapsharing- API_VERSION@-dacp/libdmapsharing- API_VERSION@.metadata \
+ libdmapsharing- API_VERSION@-dacp/libdmapsharing- API_VERSION@.namespace \
+ libdmapsharing- API_VERSION@-dmap/libdmapsharing- API_VERSION@.excludes \
+ libdmapsharing- API_VERSION@-dmap/libdmapsharing- API_VERSION@.files \
+ libdmapsharing- API_VERSION@-dmap/libdmapsharing- API_VERSION@.metadata \
+ libdmapsharing- API_VERSION@-dmap/libdmapsharing- API_VERSION@.namespace \
+ libdmapsharing- API_VERSION@-dpap/libdmapsharing- API_VERSION@.excludes \
+ libdmapsharing- API_VERSION@-dpap/libdmapsharing- API_VERSION@.files \
+ libdmapsharing- API_VERSION@-dpap/libdmapsharing- API_VERSION@.metadata \
+ libdmapsharing- API_VERSION@-dpap/libdmapsharing- API_VERSION@.namespace
CLEANFILES = \
- libdmapsharing- API_VERSION@-daap/libdmapsharing-2.2.gi \
- libdmapsharing- API_VERSION@-dacp/libdmapsharing-2.2.gi \
- libdmapsharing- API_VERSION@-dmap/libdmapsharing-2.2.gi \
- libdmapsharing- API_VERSION@-dpap/libdmapsharing-2.2.gi \
- libdmapsharing-2.2-daap.vapi \
- libdmapsharing-2.2-dacp.vapi \
- libdmapsharing-2.2-dmap.vapi \
- libdmapsharing-2.2-dpap.vapi \
- libdmapsharing-2.2.vapi
+ libdmapsharing- API_VERSION@-daap/libdmapsharing- API_VERSION@.gi \
+ libdmapsharing- API_VERSION@-dacp/libdmapsharing- API_VERSION@.gi \
+ libdmapsharing- API_VERSION@-dmap/libdmapsharing- API_VERSION@.gi \
+ libdmapsharing- API_VERSION@-dpap/libdmapsharing- API_VERSION@.gi \
+ libdmapsharing- API_VERSION@-daap.vapi \
+ libdmapsharing- API_VERSION@-dacp.vapi \
+ libdmapsharing- API_VERSION@-dmap.vapi \
+ libdmapsharing- API_VERSION@-dpap.vapi \
+ libdmapsharing- API_VERSION@.vapi
diff --git a/vala/libdmapsharing-2.2-daap/libdmapsharing-2.2.excludes b/vala/libdmapsharing-3.0-daap/libdmapsharing-3.0.excludes
similarity index 100%
rename from vala/libdmapsharing-2.2-daap/libdmapsharing-2.2.excludes
rename to vala/libdmapsharing-3.0-daap/libdmapsharing-3.0.excludes
diff --git a/vala/libdmapsharing-2.2-daap/libdmapsharing-2.2.files b/vala/libdmapsharing-3.0-daap/libdmapsharing-3.0.files
similarity index 100%
rename from vala/libdmapsharing-2.2-daap/libdmapsharing-2.2.files
rename to vala/libdmapsharing-3.0-daap/libdmapsharing-3.0.files
diff --git a/vala/libdmapsharing-2.2-daap/libdmapsharing-2.2.metadata b/vala/libdmapsharing-3.0-daap/libdmapsharing-3.0.metadata
similarity index 100%
rename from vala/libdmapsharing-2.2-daap/libdmapsharing-2.2.metadata
rename to vala/libdmapsharing-3.0-daap/libdmapsharing-3.0.metadata
diff --git a/vala/libdmapsharing-2.2-daap/libdmapsharing-2.2.namespace b/vala/libdmapsharing-3.0-daap/libdmapsharing-3.0.namespace
similarity index 100%
rename from vala/libdmapsharing-2.2-daap/libdmapsharing-2.2.namespace
rename to vala/libdmapsharing-3.0-daap/libdmapsharing-3.0.namespace
diff --git a/vala/libdmapsharing-2.2-dacp/libdmapsharing-2.2.excludes b/vala/libdmapsharing-3.0-dacp/libdmapsharing-3.0.excludes
similarity index 100%
rename from vala/libdmapsharing-2.2-dacp/libdmapsharing-2.2.excludes
rename to vala/libdmapsharing-3.0-dacp/libdmapsharing-3.0.excludes
diff --git a/vala/libdmapsharing-2.2-dacp/libdmapsharing-2.2.files b/vala/libdmapsharing-3.0-dacp/libdmapsharing-3.0.files
similarity index 100%
rename from vala/libdmapsharing-2.2-dacp/libdmapsharing-2.2.files
rename to vala/libdmapsharing-3.0-dacp/libdmapsharing-3.0.files
diff --git a/vala/libdmapsharing-2.2-dacp/libdmapsharing-2.2.metadata b/vala/libdmapsharing-3.0-dacp/libdmapsharing-3.0.metadata
similarity index 100%
rename from vala/libdmapsharing-2.2-dacp/libdmapsharing-2.2.metadata
rename to vala/libdmapsharing-3.0-dacp/libdmapsharing-3.0.metadata
diff --git a/vala/libdmapsharing-2.2-dacp/libdmapsharing-2.2.namespace b/vala/libdmapsharing-3.0-dacp/libdmapsharing-3.0.namespace
similarity index 100%
rename from vala/libdmapsharing-2.2-dacp/libdmapsharing-2.2.namespace
rename to vala/libdmapsharing-3.0-dacp/libdmapsharing-3.0.namespace
diff --git a/vala/libdmapsharing-2.2-dmap/libdmapsharing-2.2.excludes b/vala/libdmapsharing-3.0-dmap/libdmapsharing-3.0.excludes
similarity index 100%
rename from vala/libdmapsharing-2.2-dmap/libdmapsharing-2.2.excludes
rename to vala/libdmapsharing-3.0-dmap/libdmapsharing-3.0.excludes
diff --git a/vala/libdmapsharing-2.2-dmap/libdmapsharing-2.2.files b/vala/libdmapsharing-3.0-dmap/libdmapsharing-3.0.files
similarity index 100%
rename from vala/libdmapsharing-2.2-dmap/libdmapsharing-2.2.files
rename to vala/libdmapsharing-3.0-dmap/libdmapsharing-3.0.files
diff --git a/vala/libdmapsharing-2.2-dmap/libdmapsharing-2.2.metadata b/vala/libdmapsharing-3.0-dmap/libdmapsharing-3.0.metadata
similarity index 100%
rename from vala/libdmapsharing-2.2-dmap/libdmapsharing-2.2.metadata
rename to vala/libdmapsharing-3.0-dmap/libdmapsharing-3.0.metadata
diff --git a/vala/libdmapsharing-2.2-dmap/libdmapsharing-2.2.namespace b/vala/libdmapsharing-3.0-dmap/libdmapsharing-3.0.namespace
similarity index 100%
rename from vala/libdmapsharing-2.2-dmap/libdmapsharing-2.2.namespace
rename to vala/libdmapsharing-3.0-dmap/libdmapsharing-3.0.namespace
diff --git a/vala/libdmapsharing-3.0-dpap/libdmapsharing-2.2-custom.vala b/vala/libdmapsharing-3.0-dpap/libdmapsharing-2.2-custom.vala
new file mode 120000
index 0000000..7b509ac
--- /dev/null
+++ b/vala/libdmapsharing-3.0-dpap/libdmapsharing-2.2-custom.vala
@@ -0,0 +1 @@
+../libdmapsharing-2.2-dmap.vapi
\ No newline at end of file
diff --git a/vala/libdmapsharing-2.2-dpap/libdmapsharing-2.2.excludes b/vala/libdmapsharing-3.0-dpap/libdmapsharing-3.0.excludes
similarity index 100%
rename from vala/libdmapsharing-2.2-dpap/libdmapsharing-2.2.excludes
rename to vala/libdmapsharing-3.0-dpap/libdmapsharing-3.0.excludes
diff --git a/vala/libdmapsharing-2.2-dpap/libdmapsharing-2.2.files b/vala/libdmapsharing-3.0-dpap/libdmapsharing-3.0.files
similarity index 100%
rename from vala/libdmapsharing-2.2-dpap/libdmapsharing-2.2.files
rename to vala/libdmapsharing-3.0-dpap/libdmapsharing-3.0.files
diff --git a/vala/libdmapsharing-2.2-dpap/libdmapsharing-2.2.metadata b/vala/libdmapsharing-3.0-dpap/libdmapsharing-3.0.metadata
similarity index 100%
rename from vala/libdmapsharing-2.2-dpap/libdmapsharing-2.2.metadata
rename to vala/libdmapsharing-3.0-dpap/libdmapsharing-3.0.metadata
diff --git a/vala/libdmapsharing-2.2-dpap/libdmapsharing-2.2.namespace b/vala/libdmapsharing-3.0-dpap/libdmapsharing-3.0.namespace
similarity index 100%
rename from vala/libdmapsharing-2.2-dpap/libdmapsharing-2.2.namespace
rename to vala/libdmapsharing-3.0-dpap/libdmapsharing-3.0.namespace
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]