Renamed libldmgreeter to liblightdm

diff --git a/.bzrignore b/.bzrignore
index cfdb1d7bb4238af2ba92bd799851c856cd5505dd..75e8379120539dd8d5ae0a79a000396514104b4a 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -32,14 +32,14 @@ doc/*.txt
 doc/xml
 greeters/ldm-gtk-greeter
 greeters/ldm-webkit-greeter
-libldmgreeter-gobject/*.gir
-libldmgreeter-gobject/*.typelib
-libldmgreeter-gobject/libldmgreeter-gobject-0.pc
-libldmgreeter-qt/libldmgreeter-qt-0.pc
-libldmgreeter-qt/displayinterface.cpp
-libldmgreeter-qt/displayinterface.h
-libldmgreeter-qt/usermanagerinterface.cpp
-libldmgreeter-qt/usermanagerinterface.h       
+liblightdm-gobject/*.gir
+liblightdm-gobject/*.typelib
+liblightdm-gobject/liblightdm-gobject-0.pc
+liblightdm-qt/liblightdm-qt-0.pc
+liblightdm-qt/displayinterface.cpp
+liblightdm-qt/displayinterface.h
+liblightdm-qt/usermanagerinterface.cpp
+liblightdm-qt/usermanagerinterface.h       
 po/POTFILES
 po/stamp-it
 src/display-glue.h

diff --git a/Makefile.am b/Makefile.am
index 67d0e963b5eb93d47d2e438f1b94a9217d932bd5..f62dd513ef248ed2465225ab9b6ba206db1ac0e2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = libldmgreeter-gobject libldmgreeter-qt data greeters po src themes doc
+SUBDIRS = liblightdm-gobject liblightdm-qt data greeters po src themes doc
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc
 

diff --git a/NEWS b/NEWS
index 210b7271e79f29fa3d64eecb23d841390f5e5165..9b2508968e8a3e3545b543a2f5043452e10c6127 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ Overview of changes in lightdm 0.2.1
     * Rename libldmgreeter to libldmgreeter-gobject
     * Add libldmgreeter-qt (David Edmundson)
     * Fix gobject-introspection build
+    * Renamed libldmgreeter to liblightdm
 
 Overview of changes in lightdm 0.2.0
 

diff --git a/configure.ac b/configure.ac
index 61f83abdb725dc841a2ec1c8e28a112c880cf895..94304d93ec4d4e8e0a95d3c460f1d42f86e8a140 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ PKG_CHECK_MODULES(LIGHTDM, [
     xdmcp
 ])
 
-PKG_CHECK_MODULES(LIBLDMGREETER_GOBJECT, [
+PKG_CHECK_MODULES(LIBLIGHTDM_GOBJECT, [
     glib-2.0
     gio-unix-2.0
     gobject-2.0
@@ -40,7 +40,7 @@ PKG_CHECK_MODULES(LIBLDMGREETER_GOBJECT, [
     x11
 ])
 
-PKG_CHECK_MODULES(LIBLDMGREETER_QT, [
+PKG_CHECK_MODULES(LIBLIGHTDM_QT, [
     QtCore
     QtGui
 ], have_qt=yes, have_qt=no)
@@ -219,10 +219,10 @@ data/Makefile
 data/init/Makefile
 doc/Makefile
 greeters/Makefile
-libldmgreeter-gobject/libldmgreeter-gobject-0.pc
-libldmgreeter-gobject/Makefile
-libldmgreeter-qt/libldmgreeter-qt-0.pc
-libldmgreeter-qt/Makefile
+liblightdm-gobject/liblightdm-gobject-0.pc
+liblightdm-gobject/Makefile
+liblightdm-qt/liblightdm-qt-0.pc
+liblightdm-qt/Makefile
 po/Makefile.in
 src/Makefile
 themes/Makefile
@@ -252,9 +252,9 @@ echo "
         Theme:                    $GREETER_THEME
 
         Greeters:
-        libldmgreeter-gobject:    yes
+        liblightdm-gobject:       yes
         GObject introspection:    $found_introspection
-        libldmgreeter-qt:         $have_qt
+        liblightdm-qt:            $have_qt
         GTK+:                     $have_gtk
         Webkit:                   $have_webkit
 "

diff --git a/doc/Makefile.am b/doc/Makefile.am
index e3d2d42209bd13f642c48cb110a456a8b3afa2c5..366c47be9195e1411bf9249b4b4a384ecaaa6561 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,18 +2,18 @@ DOC_MODULE=ldmgreeter
 
 DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
 
-DOC_SOURCE_DIR=$(top_srcdir)/libldmgreeter-gobject
+DOC_SOURCE_DIR=$(top_srcdir)/liblightdm-gobject
 
-HFILE_GLOB=$(top_srcdir)/libldmgreeter-gobject/*.h
-CFILE_GLOB=$(top_srcdir)/libldmgreeter-gobject/*.c
+HFILE_GLOB=$(top_srcdir)/liblightdm-gobject/*.h
+CFILE_GLOB=$(top_srcdir)/liblightdm-gobject/*.c
 
 INCLUDES = \
-       $(LIBLDMGREETER_GOBJECT_CFLAGS) \
-       -I$(top_srcdir)/libldmgreeter-gobject
+       $(LIBLIGHTDM_GOBJECT_CFLAGS) \
+       -I$(top_srcdir)/liblightdm-gobject
 
 GTKDOC_LIBS = \
-       $(LIBLDMGREETER_GOBJECT_LIBS) \
-       $(top_builddir)/libldmgreeter-gobject/libldmgreeter-gobject.la
+       $(LIBLIGHTDM_GOBJECT_LIBS) \
+       $(top_builddir)/liblightdm-gobject/liblightdm-gobject.la
 
 MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=ldm
 

diff --git a/greeters/Makefile.am b/greeters/Makefile.am
index 1beeefbfea53711b687216bde37abca9355876de..a9b57bd3d5ff357ed87a1c632a2764902066f829 100644 (file)
--- a/greeters/Makefile.am
+++ b/greeters/Makefile.am
@@ -7,18 +7,18 @@ if HAVE_WEBKIT_GREETER
 libexec_PROGRAMS += ldm-webkit-greeter
 endif
 
-LIBGREETER_LIB = $(top_builddir)/libldmgreeter-gobject/libldmgreeter-gobject.la
-LIBGREETER_CFLAGS = \
-       -I$(top_srcdir)/libldmgreeter-gobject
-LIBGREETER_LDADD = \
-       -L$(top_builddir)/libldmgreeter-gobject \
-       -lldmgreeter-gobject
+LIBLIGHTDM_LIB = $(top_builddir)/liblightdm-gobject/liblightdm-gobject.la
+LIBLIGHTDM_CFLAGS = \
+       -I$(top_srcdir)/liblightdm-gobject
+LIBLIGHTDM_LDADD = \
+       -L$(top_builddir)/liblightdm-gobject \
+       -llightdm-gobject
 
 ldm_gtk_greeter_SOURCES = \
        ldm-gtk-greeter.c
 
 ldm_gtk_greeter_CFLAGS = \
-       $(LIBGREETER_CFLAGS) \
+       $(LIBLIGHTDM_CFLAGS) \
        $(LIGHTDM_GTK_GREETER_CFLAGS) \
        $(WARN_CFLAGS) \
        -DVERSION=\"$(VERSION)\" \
@@ -27,14 +27,14 @@ ldm_gtk_greeter_CFLAGS = \
        -DLIGHTDM_GTK_GREETER_BINARY=\"ldm-gtk-greeter\"
 
 ldm_gtk_greeter_LDADD = \
-       $(LIBGREETER_LDADD) \
+       $(LIBLIGHTDM_LDADD) \
        $(LIGHTDM_GTK_GREETER_LIBS)
 
 ldm_webkit_greeter_SOURCES = \
        ldm-webkit-greeter.c
 
 ldm_webkit_greeter_CFLAGS = \
-       $(LIBGREETER_CFLAGS) \
+       $(LIBLIGHTDM_CFLAGS) \
        $(LIGHTDM_WEBKIT_GREETER_CFLAGS) \
        $(WARN_CFLAGS) \
        -DVERSION=\"$(VERSION)\" \
@@ -43,7 +43,7 @@ ldm_webkit_greeter_CFLAGS = \
        -DLIGHTDM_WEBKIT_GREETER_BINARY=\"ldm-webkit-greeter\"
 
 ldm_webkit_greeter_LDADD = \
-       $(LIBGREETER_LDADD) \
+       $(LIBLIGHTDM_LDADD) \
        $(LIGHTDM_WEBKIT_GREETER_LIBS)
 
 DISTCLEANFILES = \

diff --git a/libldmgreeter-gobject/Makefile.am b/liblightdm-gobject/Makefile.am
similarity index 56%
rename from libldmgreeter-gobject/Makefile.am
rename to liblightdm-gobject/Makefile.am
index cc6d0222d6ab58dae61d9f7a675e7b610c82fdb4..080758f6c34732f777061e84765e15e1763ba793 100644 (file)
--- a/libldmgreeter-gobject/Makefile.am
+++ b/liblightdm-gobject/Makefile.am
@@ -1,24 +1,24 @@
-lib_LTLIBRARIES = libldmgreeter-gobject.la
+lib_LTLIBRARIES = liblightdm-gobject.la
 
-libldmgreeter_gobjectinclude_HEADERS = \
+liblightdm_gobjectinclude_HEADERS = \
        greeter.h \
        language.h \
        layout.h \
        session.h \
        user.h
-libldmgreeter_gobjectincludedir=$(includedir)/lightdm-gobject-0/lightdm
+liblightdm_gobjectincludedir=$(includedir)/lightdm-gobject-0/lightdm
 
-libldmgreeter_gobject_la_LIBADD = $(LIBLDMGREETER_GOBJECT_LIBS)
-libldmgreeter_gobject_la_CFLAGS = $(LIBLDMGREETER_GOBJECT_CFLAGS) \
+liblightdm_gobject_la_LIBADD = $(LIBLIGHTDM_GOBJECT_LIBS)
+liblightdm_gobject_la_CFLAGS = $(LIBLIGHTDM_GOBJECT_CFLAGS) \
        -DXSESSIONS_DIR=\"$(XSESSIONS_DIR)\"
 
-libldmgreeter_gobject_la_SOURCES= \
+liblightdm_gobject_la_SOURCES= \
        greeter.c \
        language.c \
        layout.c \
        session.c \
        user.c \
-       $(libldmgreeter_gobjectinclude_HEADERS)
+       $(liblightdm_gobjectinclude_HEADERS)
 
 if HAVE_INTROSPECTION
 
@@ -28,11 +28,11 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 
 INTROSPECTION_GIRS = LightDMGreeter-0.gir
 
-LightDMGreeter-0.gir: libldmgreeter-gobject.la
+LightDMGreeter-0.gir: liblightdm-gobject.la
 LightDMGreeter_0_gir_INCLUDES = GObject-2.0
 LightDMGreeter_0_gir_CFLAGS = $(INCLUDES) --identifier-prefix=Ldm
-LightDMGreeter_0_gir_LIBS = libldmgreeter-gobject.la
-LightDMGreeter_0_gir_FILES = $(libldmgreeter_gobject_la_SOURCES)
+LightDMGreeter_0_gir_LIBS = liblightdm-gobject.la
+LightDMGreeter_0_gir_FILES = $(liblightdm_gobject_la_SOURCES)
 
 girdir = $(datadir)/gir-1.0
 gir_DATA = LightDMGreeter-0.gir
@@ -43,7 +43,7 @@ typelib_DATA = LightDMGreeter-0.typelib
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libldmgreeter-gobject-0.pc
+pkgconfig_DATA = liblightdm-gobject-0.pc
 
 DISTCLEANFILES = \
        Makefile.in \

diff --git a/libldmgreeter-gobject/greeter.c b/liblightdm-gobject/greeter.c
similarity index 100%
rename from libldmgreeter-gobject/greeter.c
rename to liblightdm-gobject/greeter.c

diff --git a/libldmgreeter-gobject/greeter.h b/liblightdm-gobject/greeter.h
similarity index 100%
rename from libldmgreeter-gobject/greeter.h
rename to liblightdm-gobject/greeter.h

diff --git a/libldmgreeter-gobject/language.c b/liblightdm-gobject/language.c
similarity index 100%
rename from libldmgreeter-gobject/language.c
rename to liblightdm-gobject/language.c

diff --git a/libldmgreeter-gobject/language.h b/liblightdm-gobject/language.h
similarity index 100%
rename from libldmgreeter-gobject/language.h
rename to liblightdm-gobject/language.h

diff --git a/libldmgreeter-gobject/layout.c b/liblightdm-gobject/layout.c
similarity index 100%
rename from libldmgreeter-gobject/layout.c
rename to liblightdm-gobject/layout.c

diff --git a/libldmgreeter-gobject/layout.h b/liblightdm-gobject/layout.h
similarity index 100%
rename from libldmgreeter-gobject/layout.h
rename to liblightdm-gobject/layout.h

diff --git a/libldmgreeter-gobject/libldmgreeter-gobject-0.pc.in b/liblightdm-gobject/liblightdm-gobject-0.pc.in
similarity index 79%
rename from libldmgreeter-gobject/libldmgreeter-gobject-0.pc.in
rename to liblightdm-gobject/liblightdm-gobject-0.pc.in
index 139f675c9c4a61b3f0bfa042e8c235d65dfbd3e3..5577d819269f3fc43e5430c57566a47c4d012b6b 100644 (file)
--- a/libldmgreeter-gobject/libldmgreeter-gobject-0.pc.in
+++ b/liblightdm-gobject/liblightdm-gobject-0.pc.in
@@ -5,8 +5,8 @@ includedir=@includedir@
 
 themedir=@THEME_DIR@
 
-Name: libldmgreeter-gobject
-Description: LightDM greeter library
+Name: liblightdm-gobject
+Description: LightDM client library
 Version: @VERSION@
 Requires: glib-2.0 dbus-glib-1 libxklavier
 Libs: -L${libdir} -lldmgreeter-gobject

diff --git a/libldmgreeter-gobject/session.c b/liblightdm-gobject/session.c
similarity index 100%
rename from libldmgreeter-gobject/session.c
rename to liblightdm-gobject/session.c

diff --git a/libldmgreeter-gobject/session.h b/liblightdm-gobject/session.h
similarity index 100%
rename from libldmgreeter-gobject/session.h
rename to liblightdm-gobject/session.h

diff --git a/libldmgreeter-gobject/user.c b/liblightdm-gobject/user.c
similarity index 100%
rename from libldmgreeter-gobject/user.c
rename to liblightdm-gobject/user.c

diff --git a/libldmgreeter-gobject/user.h b/liblightdm-gobject/user.h
similarity index 100%
rename from libldmgreeter-gobject/user.h
rename to liblightdm-gobject/user.h

diff --git a/libldmgreeter-qt/Makefile.am b/liblightdm-qt/Makefile.am
similarity index 76%
rename from libldmgreeter-qt/Makefile.am
rename to liblightdm-qt/Makefile.am
index 1d44b938ffe52a6e36fcf67d4a2d58af7bacde50..3573974d60a2adc7f2d5b77855cb8019861d3d05 100644 (file)
--- a/libldmgreeter-qt/Makefile.am
+++ b/liblightdm-qt/Makefile.am
@@ -1,5 +1,5 @@
 if HAVE_QT
-lib_LTLIBRARIES = libldmgreeter-qt.la
+lib_LTLIBRARIES = liblightdm-qt.la
 endif
 
 GENERATED_FILES = \
@@ -15,7 +15,7 @@ usermanagerinterface.cpp usermanagerinterface.h: $(top_srcdir)/src/user-manager.
 
 ldmgreeter.cpp: displayinterface.h usermanagerinterface.h    
 
-libldmgreeter_qtinclude_HEADERS = \
+liblightdm_qtinclude_HEADERS = \
        consolekitinterface.h \
        displayinterface.h \
        ldmauthrequest.h \
@@ -25,13 +25,13 @@ libldmgreeter_qtinclude_HEADERS = \
        ldmuser.h \
        powermanagementinterface.h \
        usermanagerinterface.h
-libldmgreeter_qtincludedir=$(includedir)/lightdm-qt-0/lightdm
+liblightdm_qtincludedir=$(includedir)/lightdm-qt-0/lightdm
 
-libldmgreeter_qt_la_LIBADD = $(LIBLDMGREETER_QT_LIBS)
-libldmgreeter_qt_la_CXXFLAGS = $(LIBLDMGREETER_QT_CFLAGS) \
+liblightdm_qt_la_LIBADD = $(LIBLIGHTDM_QT_LIBS)
+liblightdm_qt_la_CXXFLAGS = $(LIBLIGHTDM_QT_CFLAGS) \
        -DXSESSIONS_DIR=\"$(XSESSIONS_DIR)\"
 
-libldmgreeter_qt_la_SOURCES= \
+liblightdm_qt_la_SOURCES= \
        consolekitinterface.cpp \
        displayinterface.cpp \
        ldmauthrequest.cpp \
@@ -43,7 +43,7 @@ libldmgreeter_qt_la_SOURCES= \
        usermanagerinterface.cpp
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libldmgreeter-qt-0.pc
+pkgconfig_DATA = liblightdm-qt-0.pc
 
 CLEANFILES = \
        $(GENERATED_FILES)

diff --git a/libldmgreeter-qt/consolekitinterface.cpp b/liblightdm-qt/consolekitinterface.cpp
similarity index 100%
rename from libldmgreeter-qt/consolekitinterface.cpp
rename to liblightdm-qt/consolekitinterface.cpp

diff --git a/libldmgreeter-qt/consolekitinterface.h b/liblightdm-qt/consolekitinterface.h
similarity index 100%
rename from libldmgreeter-qt/consolekitinterface.h
rename to liblightdm-qt/consolekitinterface.h

diff --git a/libldmgreeter-qt/ldmauthrequest.cpp b/liblightdm-qt/ldmauthrequest.cpp
similarity index 100%
rename from libldmgreeter-qt/ldmauthrequest.cpp
rename to liblightdm-qt/ldmauthrequest.cpp

diff --git a/libldmgreeter-qt/ldmauthrequest.h b/liblightdm-qt/ldmauthrequest.h
similarity index 100%
rename from libldmgreeter-qt/ldmauthrequest.h
rename to liblightdm-qt/ldmauthrequest.h

diff --git a/libldmgreeter-qt/ldmgreeter.cpp b/liblightdm-qt/ldmgreeter.cpp
similarity index 100%
rename from libldmgreeter-qt/ldmgreeter.cpp
rename to liblightdm-qt/ldmgreeter.cpp

diff --git a/libldmgreeter-qt/ldmgreeter.h b/liblightdm-qt/ldmgreeter.h
similarity index 100%
rename from libldmgreeter-qt/ldmgreeter.h
rename to liblightdm-qt/ldmgreeter.h

diff --git a/libldmgreeter-qt/ldmlanguage.cpp b/liblightdm-qt/ldmlanguage.cpp
similarity index 100%
rename from libldmgreeter-qt/ldmlanguage.cpp
rename to liblightdm-qt/ldmlanguage.cpp

diff --git a/libldmgreeter-qt/ldmlanguage.h b/liblightdm-qt/ldmlanguage.h
similarity index 100%
rename from libldmgreeter-qt/ldmlanguage.h
rename to liblightdm-qt/ldmlanguage.h

diff --git a/libldmgreeter-qt/ldmsession.cpp b/liblightdm-qt/ldmsession.cpp
similarity index 100%
rename from libldmgreeter-qt/ldmsession.cpp
rename to liblightdm-qt/ldmsession.cpp

diff --git a/libldmgreeter-qt/ldmsession.h b/liblightdm-qt/ldmsession.h
similarity index 100%
rename from libldmgreeter-qt/ldmsession.h
rename to liblightdm-qt/ldmsession.h

diff --git a/libldmgreeter-qt/ldmuser.cpp b/liblightdm-qt/ldmuser.cpp
similarity index 100%
rename from libldmgreeter-qt/ldmuser.cpp
rename to liblightdm-qt/ldmuser.cpp

diff --git a/libldmgreeter-qt/ldmuser.h b/liblightdm-qt/ldmuser.h
similarity index 100%
rename from libldmgreeter-qt/ldmuser.h
rename to liblightdm-qt/ldmuser.h

diff --git a/libldmgreeter-qt/libldmgreeter-qt-0.pc.in b/liblightdm-qt/liblightdm-qt-0.pc.in
similarity index 78%
rename from libldmgreeter-qt/libldmgreeter-qt-0.pc.in
rename to liblightdm-qt/liblightdm-qt-0.pc.in
index 11c7c050050d11c66cc22df629b21f0d1951d42e..1b90cfd4d8724990764db4a6df2fa473a55a6b98 100644 (file)
--- a/libldmgreeter-qt/libldmgreeter-qt-0.pc.in
+++ b/liblightdm-qt/liblightdm-qt-0.pc.in
@@ -5,8 +5,8 @@ includedir=@includedir@
 
 themedir=@THEME_DIR@
 
-Name: libldmgreeter-qt
-Description: LightDM greeter library
+Name: liblightdm-qt
+Description: LightDM client library
 Version: @VERSION@
 Requires: QtCore QtGui
 Libs: -L${libdir} -lldmgreeter-qt

diff --git a/libldmgreeter-qt/powermanagementinterface.cpp b/liblightdm-qt/powermanagementinterface.cpp
similarity index 100%
rename from libldmgreeter-qt/powermanagementinterface.cpp
rename to liblightdm-qt/powermanagementinterface.cpp

diff --git a/libldmgreeter-qt/powermanagementinterface.h b/liblightdm-qt/powermanagementinterface.h
similarity index 100%
rename from libldmgreeter-qt/powermanagementinterface.h
rename to liblightdm-qt/powermanagementinterface.h

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 030988c3dfa7df375402c00e93cd311a889ce499..a2fadd3570fd10ecda1826c14198a42b81cd451e 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,11 +3,11 @@
 [encoding: UTF-8]
 greeters/ldm-gtk-greeter.c
 greeters/ldm-webkit-greeter.c
-libldmgreeter-gobject/greeter.c
-libldmgreeter-gobject/language.c
-libldmgreeter-gobject/layout.c
-libldmgreeter-gobject/session.c
-libldmgreeter-gobject/user.c
+liblightdm-gobject/greeter.c
+liblightdm-gobject/language.c
+liblightdm-gobject/layout.c
+liblightdm-gobject/session.c
+liblightdm-gobject/user.c
 src/display.c
 src/display-manager.c
 src/lightdm.c