Merge lp:~agateau/libdbusmenu/noqt into lp:libdbusmenu/0.5

[Aurélien Gâteau]

[Aurélien Gâteau (agateau)]

The libdbusmenu-qt dir is empty and the produced dummy lib keeps overwriting the real libdbusmenu-qt on my machine whenever I install libdbusmenu.

=== modified file 'Makefile.am'
--- Makefile.am	2009-12-10 19:00:56 +0000
+++ Makefile.am	2010-01-07 17:28:18 +0000
@@ -1,3 +1,3 @@
 
-SUBDIRS = libdbusmenu-glib libdbusmenu-gtk libdbusmenu-qt tools tests po
+SUBDIRS = libdbusmenu-glib libdbusmenu-gtk tools tests po
 

=== modified file 'configure.ac'
--- configure.ac	2009-12-18 21:22:07 +0000
+++ configure.ac	2010-01-07 17:28:18 +0000
@@ -104,8 +104,6 @@
 libdbusmenu-glib/dbusmenu-glib.pc
 libdbusmenu-gtk/Makefile
 libdbusmenu-gtk/dbusmenu-gtk.pc
-libdbusmenu-qt/Makefile
-libdbusmenu-qt/dbusmenu-qt.pc
 tools/Makefile
 tests/Makefile
 ])

=== removed directory 'libdbusmenu-qt'
=== removed file 'libdbusmenu-qt/Makefile.am'
--- libdbusmenu-qt/Makefile.am	2009-03-25 20:09:14 +0000
+++ libdbusmenu-qt/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-
-EXTRA_DIST = \
-	dbusmenu-qt.pc.in
-
-lib_LTLIBRARIES = \
-	libdbusmenu-qt.la
-
-libdbusmenu_qtincludedir=$(includedir)/libdbusmenu-0.1/libdbusmenu-qt/
-
-libdbusmenu_qtinclude_HEADERS = \
-	test.h
-
-libdbusmenu_qt_la_SOURCES = \
-	test.c
-
-libdbusmenu_qt_la_LDFLAGS = \
-	-version-info $(LIBDBUSMENU_CURRENT):$(LIBDBUSMENU_REVISION):$(LIBDBUSMENU_AGE) \
-	-no-undefined \
-	-export-symbols-regex "^[^_].*"
-
-libdbusmenu_qt_la_CFLAGS = \
-	$(LIBDBUSMENU_QT_CFLAGS)
-
-libdbusmenu_qt_la_LIBADD = \
-	$(LIBDBUSMENU_QT_LIBS)
-
-pkgconfig_DATA = dbusmenu-qt.pc
-pkgconfigdir = $(libdir)/pkgconfig
-

=== removed file 'libdbusmenu-qt/dbusmenu-qt.pc.in'
--- libdbusmenu-qt/dbusmenu-qt.pc.in	2009-03-25 20:09:14 +0000
+++ libdbusmenu-qt/dbusmenu-qt.pc.in	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-bindir=@bindir@
-includedir=@includedir@
-
-Cflags: -I${includedir}/libdbusmenu-0.1
-Requires: dbus-glib-1 dbusmenu-glib
-Libs: -L${libdir} -ldbusmenu-qt
-
-Name: libdbusmenu-qt
-Description: libdbusmenu-qt.
-Version: @VERSION@
-

=== removed file 'libdbusmenu-qt/test.c'
--- libdbusmenu-qt/test.c	2009-03-25 20:09:14 +0000
+++ libdbusmenu-qt/test.c	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-
-void mysymbol (void) {
-	return;
-}

=== removed file 'libdbusmenu-qt/test.h'
--- libdbusmenu-qt/test.h	2009-03-25 20:09:14 +0000
+++ libdbusmenu-qt/test.h	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-
-void mysymbol (void);