Bump liblightdm-qt ABI

diff --git a/.bzrignore b/.bzrignore
index 0af43c337b2e52f98dc281f8fd73418b27c7e0f0..894064c0e51139aaa9d718dd6f503c167992a619 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -41,7 +41,7 @@ greeters/qt/ui_*.h
 liblightdm-gobject/*.gir
 liblightdm-gobject/*.typelib
 liblightdm-gobject/liblightdm-gobject-*.pc
-liblightdm-qt/liblightdm-qt4-*.pc
+liblightdm-qt/liblightdm-qt-*.pc
 liblightdm-qt/liblightdm-qt5-*.pc
 liblightdm-qt/*_moc*.cpp
 m4/*

diff --git a/configure.ac b/configure.ac
index b5c907d69f1a6b81d879f75992e084d072860897..614a940f93461fa05c57ce3632674d0a9eeb0da6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -199,8 +199,8 @@ help/Makefile
 liblightdm-gobject/liblightdm-gobject-1.pc
 liblightdm-gobject/Makefile
 liblightdm-qt/Makefile
-liblightdm-qt/liblightdm-qt-2.pc
-liblightdm-qt/liblightdm-qt5-2.pc
+liblightdm-qt/liblightdm-qt-3.pc
+liblightdm-qt/liblightdm-qt5-3.pc
 po/Makefile.in
 src/Makefile
 tests/Makefile

diff --git a/liblightdm-qt/Makefile.am b/liblightdm-qt/Makefile.am
index d16cf96603bebfae89eaf9dbb4b25903af338c8d..3bb33b4ad2f228501d3406023be7bfb7837236ab 100644 (file)
--- a/liblightdm-qt/Makefile.am
+++ b/liblightdm-qt/Makefile.am
@@ -7,10 +7,10 @@
 common_libadd = \
        -L$(top_builddir)/liblightdm-gobject \
        -llightdm-gobject-1
-liblightdm_qt_2_la_LIBADD = \
+liblightdm_qt_3_la_LIBADD = \
        $(LIBLIGHTDM_QT4_LIBS) \
        $(common_libadd)
-liblightdm_qt5_2_la_LIBADD = \
+liblightdm_qt5_3_la_LIBADD = \
        $(LIBLIGHTDM_QT5_LIBS) \
        $(common_libadd)
 
@@ -18,10 +18,10 @@ common_cflags = \
        -I$(top_srcdir)/liblightdm-gobject \
        $(LIBLIGHTDM_GOBJECT_CFLAGS) \
        -DXSESSIONS_DIR=\"$(datadir)/xsessions\"
-liblightdm_qt_2_la_CXXFLAGS = \
+liblightdm_qt_3_la_CXXFLAGS = \
        $(LIBLIGHTDM_QT4_CFLAGS) \
        $(common_cflags)
-liblightdm_qt5_2_la_CXXFLAGS = \
+liblightdm_qt5_3_la_CXXFLAGS = \
        -fPIC \
        -DQT_DISABLE_DEPRECATED_BEFORE="QT_VERSION_CHECK(4, 0, 0)" \
        $(LIBLIGHTDM_QT5_CFLAGS) \
@@ -37,20 +37,20 @@ common_headers = \
        QLightDM/sessionsmodel.h \
        QLightDM/usersmodel.h
 
-liblightdm_qt_2includedir=$(includedir)/lightdm-qt-2/QLightDM
-liblightdm_qt5_2includedir=$(includedir)/lightdm-qt5-2/QLightDM
+liblightdm_qt_3includedir=$(includedir)/lightdm-qt-3/QLightDM
+liblightdm_qt5_3includedir=$(includedir)/lightdm-qt5-3/QLightDM
 
 common_sources = \
        greeter.cpp \
        power.cpp \
        sessionsmodel.cpp \
        usersmodel.cpp
-liblightdm_qt_2_la_SOURCES = \
+liblightdm_qt_3_la_SOURCES = \
        $(common_sources) \
-       $(liblightdm_qt_2include_HEADERS)
-liblightdm_qt5_2_la_SOURCES = \
+       $(liblightdm_qt_3include_HEADERS)
+liblightdm_qt5_3_la_SOURCES = \
        $(common_sources) \
-       $(liblightdm_qt5_2include_HEADERS)
+       $(liblightdm_qt5_3include_HEADERS)
 
 pkgconfigdir = $(libdir)/pkgconfig
 
@@ -66,15 +66,15 @@ BUILT_SOURCES =
 pkgconfig_DATA =
 
 if COMPILE_LIBLIGHTDM_QT4
-lib_LTLIBRARIES += liblightdm-qt-2.la
-liblightdm_qt_2include_HEADERS = $(common_headers)
+lib_LTLIBRARIES += liblightdm-qt-3.la
+liblightdm_qt_3include_HEADERS = $(common_headers)
 BUILT_SOURCES += $(common_sources:.cpp=_moc4.cpp)
-pkgconfig_DATA += liblightdm-qt-2.pc
+pkgconfig_DATA += liblightdm-qt-3.pc
 endif
 
 if COMPILE_LIBLIGHTDM_QT5
-lib_LTLIBRARIES += liblightdm-qt5-2.la
-liblightdm_qt5_2include_HEADERS = $(common_headers)
+lib_LTLIBRARIES += liblightdm-qt5-3.la
+liblightdm_qt5_3include_HEADERS = $(common_headers)
 BUILT_SOURCES += $(common_sources:.cpp=_moc5.cpp)
-pkgconfig_DATA += liblightdm-qt5-2.pc
+pkgconfig_DATA += liblightdm-qt5-3.pc
 endif

diff --git a/liblightdm-qt/liblightdm-qt-2.pc.in b/liblightdm-qt/liblightdm-qt-3.pc.in
similarity index 100%
rename from liblightdm-qt/liblightdm-qt-2.pc.in
rename to liblightdm-qt/liblightdm-qt-3.pc.in

diff --git a/liblightdm-qt/liblightdm-qt5-2.pc.in b/liblightdm-qt/liblightdm-qt5-3.pc.in
similarity index 100%
rename from liblightdm-qt/liblightdm-qt5-2.pc.in
rename to liblightdm-qt/liblightdm-qt5-3.pc.in