Both libraries are now version 1 and have API and ABI guarantees

diff --git a/NEWS b/NEWS
index 522874f4d442092a2b5b337811745a93018bc232..eada266055502d9fb944d0605879a36c53b3302d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,7 @@ Overview of changes in lightdm 0.9.0
       - Split the user accounts configuration into /etc/lightdm/users.conf so the
         main config can be private.
     * liblightdm API changes:
+      - Both libraries are now version 1 and have API and ABI guarantees.
       - Added a session-failed signal to indicate if the session didn't start
         and the greeter should try authorizing again.
       - liblightdm-gobject now uses lightdm_ prefix instead of ldm_

diff --git a/configure.ac b/configure.ac
index 1bf46196b3cff021912e1a3f64d54f71191719ad..8f2df4205ecd63948a5b95d4cfb645dd2670d6bd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -175,11 +175,11 @@ doc/Makefile
 greeters/Makefile
 greeters/gtk/Makefile
 greeters/qt/Makefile
-liblightdm-gobject/liblightdm-gobject-0.pc
+liblightdm-gobject/liblightdm-gobject-1.pc
 liblightdm-gobject/Makefile
 liblightdm-gobject/lightdm/Makefile
 liblightdm-qt/Makefile
-liblightdm-qt/QLightDM/liblightdm-qt-0.pc
+liblightdm-qt/QLightDM/liblightdm-qt-1.pc
 liblightdm-qt/QLightDM/Makefile
 po/Makefile.in
 src/Makefile

diff --git a/doc/Makefile.am b/doc/Makefile.am
index c054b8af486f728918085f5d3d5cf70ad0735aee..54675dd389f03acd140bac9439f8f3b969b8ec82 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-DOC_MODULE=lightdm-gobject-0
+DOC_MODULE=lightdm-gobject-1
 
 DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
 
@@ -13,7 +13,7 @@ INCLUDES = \
 
 GTKDOC_LIBS = \
        $(LIBLIGHTDM_GOBJECT_LIBS) \
-       $(top_builddir)/liblightdm-gobject/liblightdm-gobject-0.la
+       $(top_builddir)/liblightdm-gobject/liblightdm-gobject-1.la
 
 MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=LightDM
 

diff --git a/doc/lightdm-gobject-0-docs.sgml b/doc/lightdm-gobject-1-docs.sgml
similarity index 100%
rename from doc/lightdm-gobject-0-docs.sgml
rename to doc/lightdm-gobject-1-docs.sgml

diff --git a/doc/lightdm-gobject-0-sections.txt b/doc/lightdm-gobject-1-sections.txt
similarity index 100%
rename from doc/lightdm-gobject-0-sections.txt
rename to doc/lightdm-gobject-1-sections.txt

diff --git a/doc/lightdm-gobject-0.types b/doc/lightdm-gobject-1.types
similarity index 100%
rename from doc/lightdm-gobject-0.types
rename to doc/lightdm-gobject-1.types

diff --git a/greeters/gtk/Makefile.am b/greeters/gtk/Makefile.am
index 8b01748cc6ecf403fe0ccbd801d1858eb62f0cc8..5cf30a0dcbb4c96cc768585fd7a32e681e78e7b6 100644 (file)
--- a/greeters/gtk/Makefile.am
+++ b/greeters/gtk/Makefile.am
@@ -17,7 +17,7 @@ lightdm_gtk_greeter_CFLAGS = \
 
 lightdm_gtk_greeter_LDADD = \
        -L$(top_builddir)/liblightdm-gobject \
-       -llightdm-gobject-0 \
+       -llightdm-gobject-1 \
        $(LIGHTDM_GTK_GREETER_LIBS)
 
 DISTCLEANFILES = \

diff --git a/greeters/qt/Makefile.am b/greeters/qt/Makefile.am
index 0448ff7226567c0439843a255120b62047d98044..d35751c6c2dfa2777930c54b5b27d3d12874561e 100644 (file)
--- a/greeters/qt/Makefile.am
+++ b/greeters/qt/Makefile.am
@@ -36,7 +36,7 @@ lightdm_qt_greeter_CXXFLAGS = \
 
 lightdm_qt_greeter_LDADD = \
        -L$(top_builddir)/liblightdm-qt/QLightDM \
-       -llightdm-qt-0 \
+       -llightdm-qt-1 \
        $(LIGHTDM_QT_GREETER_LIBS)
 
 CLEANFILES = \

diff --git a/liblightdm-gobject/Makefile.am b/liblightdm-gobject/Makefile.am
index 473794544fc682beed41063a89b4e67b9f25e2ee..73a08c10e83e86a8fc73413452ca83af57c5118a 100644 (file)
--- a/liblightdm-gobject/Makefile.am
+++ b/liblightdm-gobject/Makefile.am
@@ -1,15 +1,15 @@
 SUBDIRS = lightdm
 
-lib_LTLIBRARIES = liblightdm-gobject-0.la
+lib_LTLIBRARIES = liblightdm-gobject-1.la
 
 CLEANFILES =
 
-liblightdm_gobject_0_la_LIBADD = $(LIBLIGHTDM_GOBJECT_LIBS)
-liblightdm_gobject_0_la_CFLAGS = $(LIBLIGHTDM_GOBJECT_CFLAGS) \
+liblightdm_gobject_1_la_LIBADD = $(LIBLIGHTDM_GOBJECT_LIBS)
+liblightdm_gobject_1_la_CFLAGS = $(LIBLIGHTDM_GOBJECT_CFLAGS) \
        $(WARN_CFLAGS) \
        -DXSESSIONS_DIR=\"$(datadir)/xsessions\"
 
-liblightdm_gobject_0_la_SOURCES= \
+liblightdm_gobject_1_la_SOURCES= \
        greeter.c \
        language.c \
        layout.c \
@@ -28,27 +28,27 @@ if HAVE_INTROSPECTION
 INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
 INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 
-INTROSPECTION_GIRS = LightDM-0.gir
+INTROSPECTION_GIRS = LightDM-1.gir
 
-LightDM-0.gir: liblightdm-gobject-0.la
-LightDM_0_gir_INCLUDES = GObject-2.0
-LightDM_0_gir_CFLAGS = $(INCLUDES) --identifier-prefix=LightDM
-LightDM_0_gir_LIBS = liblightdm-gobject-0.la
-LightDM_0_gir_FILES = $(liblightdm_gobject_0_la_SOURCES)
+LightDM-1.gir: liblightdm-gobject-1.la
+LightDM_1_gir_INCLUDES = GObject-2.0
+LightDM_1_gir_CFLAGS = $(INCLUDES) --identifier-prefix=LightDM
+LightDM_1_gir_LIBS = liblightdm-gobject-1.la
+LightDM_1_gir_FILES = $(liblightdm_gobject_1_la_SOURCES)
 
 girdir = $(datadir)/gir-1.0
-gir_DATA = LightDM-0.gir
+gir_DATA = LightDM-1.gir
 
 typelibdir = $(libdir)/girepository-1.0
-typelib_DATA = LightDM-0.typelib
+typelib_DATA = LightDM-1.typelib
 
 endif
 
 vapidir = $(datadir)/vala/vapi
-dist_vapi_DATA = liblightdm-gobject-0.vapi
+dist_vapi_DATA = liblightdm-gobject-1.vapi
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = liblightdm-gobject-0.pc
+pkgconfig_DATA = liblightdm-gobject-1.pc
 
 DISTCLEANFILES = \
        Makefile.in \

diff --git a/liblightdm-gobject/liblightdm-gobject-0.pc.in b/liblightdm-gobject/liblightdm-gobject-1.pc.in
similarity index 72%
rename from liblightdm-gobject/liblightdm-gobject-0.pc.in
rename to liblightdm-gobject/liblightdm-gobject-1.pc.in
index f21aeece4515c984ae31e82b551fe57e133b3e6a..551382b70b7ac1468e6a2315c5ad4fa9a9296a8d 100644 (file)
--- a/liblightdm-gobject/liblightdm-gobject-0.pc.in
+++ b/liblightdm-gobject/liblightdm-gobject-1.pc.in
@@ -7,5 +7,5 @@ Name: liblightdm-gobject
 Description: LightDM client library
 Version: @VERSION@
 Requires: glib-2.0 dbus-glib-1 libxklavier
-Libs: -L${libdir} -llightdm-gobject-0
-Cflags: -I${includedir}/lightdm-gobject-0
+Libs: -L${libdir} -llightdm-gobject-1
+Cflags: -I${includedir}/lightdm-gobject-1

diff --git a/liblightdm-gobject/liblightdm-gobject-0.vapi b/liblightdm-gobject/liblightdm-gobject-1.vapi
similarity index 100%
rename from liblightdm-gobject/liblightdm-gobject-0.vapi
rename to liblightdm-gobject/liblightdm-gobject-1.vapi

diff --git a/liblightdm-qt/QLightDM/Makefile.am b/liblightdm-qt/QLightDM/Makefile.am
index 89e6cadc5e72b8da7e2e5278b21bb970c6507412..f1f2ddb012a1a3d96f133c490cfcf343ffec216c 100644 (file)
--- a/liblightdm-qt/QLightDM/Makefile.am
+++ b/liblightdm-qt/QLightDM/Makefile.am
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = liblightdm-qt-0.la
+lib_LTLIBRARIES = liblightdm-qt-1.la
 
 # Generate metadata for QObjects
 MOC_FILES = \
@@ -14,7 +14,7 @@ usersmodel_moc.cpp: usersmodel.h
        moc $< -o $@
 
 
-liblightdm_qt_0include_HEADERS = \
+liblightdm_qt_1include_HEADERS = \
        greeter.h \
        language.h \
        sessionsmodel.h \
@@ -26,13 +26,13 @@ liblightdm_qt_0include_HEADERS = \
        SessionsModel \
        User
 
-liblightdm_qt_0includedir=$(includedir)/lightdm-qt-0/QLightDM
+liblightdm_qt_1includedir=$(includedir)/lightdm-qt-1/QLightDM
 
-liblightdm_qt_0_la_LIBADD = $(LIBLIGHTDM_QT_LIBS)
-liblightdm_qt_0_la_CXXFLAGS = $(LIBLIGHTDM_QT_CFLAGS) \
+liblightdm_qt_1_la_LIBADD = $(LIBLIGHTDM_QT_LIBS)
+liblightdm_qt_1_la_CXXFLAGS = $(LIBLIGHTDM_QT_CFLAGS) \
        -DXSESSIONS_DIR=\"$(datadir)/xsessions\"
 
-liblightdm_qt_0_la_SOURCES = \
+liblightdm_qt_1_la_SOURCES = \
        greeter.cpp \
        language.cpp \
        sessionsmodel.cpp \
@@ -41,7 +41,7 @@ liblightdm_qt_0_la_SOURCES = \
        $(MOC_FILES)
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = liblightdm-qt-0.pc
+pkgconfig_DATA = liblightdm-qt-1.pc
 
 CLEANFILES = \
        $(MOC_FILES)

diff --git a/liblightdm-qt/QLightDM/liblightdm-qt-0.pc.in b/liblightdm-qt/QLightDM/liblightdm-qt-1.pc.in
similarity index 100%
rename from liblightdm-qt/QLightDM/liblightdm-qt-0.pc.in
rename to liblightdm-qt/QLightDM/liblightdm-qt-1.pc.in

diff --git a/tests/src/Makefile.am b/tests/src/Makefile.am
index e59bf7a0ae634f45d4e480309b74d9f8872ffbdf..cc4522c9b001bcb2619bd031777e155e82d0e331 100644 (file)
--- a/tests/src/Makefile.am
+++ b/tests/src/Makefile.am
@@ -33,7 +33,7 @@ test_gobject_greeter_CFLAGS = \
        $(XCB_CFLAGS)
 test_gobject_greeter_LDADD = \
        -L$(top_builddir)/liblightdm-gobject \
-       -llightdm-gobject-0 \
+       -llightdm-gobject-1 \
        $(GLIB_LIBS) \
        $(GOBJECT_LIBS) \
        $(XCB_LIBS)