From 7cde88457278bf9a14fd0dd6643a8f793e829555 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 11 May 2014 11:37:51 +0200 Subject: Rename libslab to libmate-slab https://github.com/mate-desktop/mate-control-center/issues/100 This is to avoid package name and version conflicts with libslab0 / libslab0a which existed in Debian until squeeze. MATE components (currently only gnome-main-menu) depending on libmate-slab0 have to be patch accordingly. --- libslab/Makefile.am | 12 ++++++------ libslab/app-resizer.h | 2 +- libslab/app-shell.h | 4 ++-- libslab/application-tile.h | 2 +- libslab/directory-tile.h | 2 +- libslab/libslab.pc.in | 12 ------------ libslab/mate-slab.pc.in | 12 ++++++++++++ libslab/nameplate-tile.h | 2 +- libslab/shell-window.h | 2 +- libslab/slab.h | 36 ++++++++++++++++++------------------ libslab/system-tile.h | 2 +- 11 files changed, 44 insertions(+), 44 deletions(-) delete mode 100644 libslab/libslab.pc.in create mode 100644 libslab/mate-slab.pc.in (limited to 'libslab') diff --git a/libslab/Makefile.am b/libslab/Makefile.am index 95e42237..96bf3d9d 100644 --- a/libslab/Makefile.am +++ b/libslab/Makefile.am @@ -1,5 +1,5 @@ pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libslab.pc +pkgconfig_DATA = mate-slab.pc AM_CPPFLAGS = \ -I$(top_srcdir) \ @@ -28,9 +28,9 @@ HEADER_FILES= \ system-tile.h \ tile.h -lib_LTLIBRARIES = libslab.la +lib_LTLIBRARIES = libmate-slab.la -libslab_la_SOURCES = \ +libmate_slab_la_SOURCES = \ $(MARSHAL_GENERATED) \ app-resizer.c \ app-shell.c \ @@ -55,9 +55,9 @@ libslab_la_SOURCES = \ tile-action.c \ tile.c -libslab_includedir = $(includedir)/libslab -libslab_include_HEADERS = $(HEADER_FILES) -libslab_la_LIBADD = $(LIBSLAB_LIBS) +libmate_slab_includedir = $(includedir)/libmate-slab +libmate_slab_include_HEADERS = $(HEADER_FILES) +libmate_slab_la_LIBADD = $(LIBSLAB_LIBS) search-entry-watermark.h: search-entry-watermark.svg echo '#define SEARCH_ENTRY_WATERMARK_SVG "\' > $@; \ diff --git a/libslab/app-resizer.h b/libslab/app-resizer.h index af974653..353120b3 100644 --- a/libslab/app-resizer.h +++ b/libslab/app-resizer.h @@ -24,7 +24,7 @@ #include #include -#include +#include "app-shell.h" #ifdef __cplusplus extern "C" { diff --git a/libslab/app-shell.h b/libslab/app-shell.h index ab944dbe..6c8e3b83 100644 --- a/libslab/app-shell.h +++ b/libslab/app-shell.h @@ -28,8 +28,8 @@ #include #include -#include -#include +#include "slab-section.h" +#include "tile.h" #ifdef __cplusplus extern "C" { diff --git a/libslab/application-tile.h b/libslab/application-tile.h index 31511857..4a06da50 100644 --- a/libslab/application-tile.h +++ b/libslab/application-tile.h @@ -21,7 +21,7 @@ #ifndef __APPLICATION_TILE_H__ #define __APPLICATION_TILE_H__ -#include +#include "nameplate-tile.h" #include diff --git a/libslab/directory-tile.h b/libslab/directory-tile.h index 374faa2b..55a6fdbf 100644 --- a/libslab/directory-tile.h +++ b/libslab/directory-tile.h @@ -23,7 +23,7 @@ #include -#include +#include "nameplate-tile.h" #ifdef __cplusplus extern "C" { diff --git a/libslab/libslab.pc.in b/libslab/libslab.pc.in deleted file mode 100644 index 8f341ed6..00000000 --- a/libslab/libslab.pc.in +++ /dev/null @@ -1,12 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: libslab -Description: Beautiful App Slab -Requires: glib-2.0 gobject-2.0 gio-2.0 gtk+-@GTK_API_VERSION@ mate-desktop-2.0 libmate-menu -Requires.private: gdk-@GTK_API_VERSION@ librsvg-2.0 -Version: @VERSION@ -Libs: -L${libdir} -lslab -Cflags: -I${includedir}/libslab diff --git a/libslab/mate-slab.pc.in b/libslab/mate-slab.pc.in new file mode 100644 index 00000000..c6f26ec3 --- /dev/null +++ b/libslab/mate-slab.pc.in @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: mate-slab +Description: Beautiful App Slab +Requires: glib-2.0 gobject-2.0 gio-2.0 gtk+-@GTK_API_VERSION@ mate-desktop-2.0 libmate-menu +Requires.private: gdk-@GTK_API_VERSION@ librsvg-2.0 +Version: @VERSION@ +Libs: -L${libdir} -lmate-slab +Cflags: -I${includedir}/libmate-slab diff --git a/libslab/nameplate-tile.h b/libslab/nameplate-tile.h index 00a1e17a..8e8d0cff 100644 --- a/libslab/nameplate-tile.h +++ b/libslab/nameplate-tile.h @@ -21,7 +21,7 @@ #ifndef __NAMEPLATE_TILE_H__ #define __NAMEPLATE_TILE_H__ -#include +#include "tile.h" #include diff --git a/libslab/shell-window.h b/libslab/shell-window.h index a9ee85c0..05cdcf70 100644 --- a/libslab/shell-window.h +++ b/libslab/shell-window.h @@ -25,7 +25,7 @@ #include #include -#include +#include "app-shell.h" #ifdef __cplusplus extern "C" { diff --git a/libslab/slab.h b/libslab/slab.h index cacf7a9c..b4ecb87c 100644 --- a/libslab/slab.h +++ b/libslab/slab.h @@ -22,24 +22,24 @@ #ifndef __SLAB_H__ #define __SLAB_H__ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "app-resizer.h" +#include "app-shell.h" +#include "application-tile.h" +#include "bookmark-agent.h" +#include "directory-tile.h" +#include "document-tile.h" +#include "double-click-detector.h" +#include "mate-utils.h" +#include "libslab-utils.h" +#include "nameplate-tile.h" +#include "search-bar.h" +#include "search-context-picker.h" +#include "search-entry.h" +#include "shell-window.h" +#include "slab-mate-util.h" +#include "slab-section.h" +#include "system-tile.h" +#include "tile.h" #endif /* __SLAB_H__ */ diff --git a/libslab/system-tile.h b/libslab/system-tile.h index 71f11654..f08e7c73 100644 --- a/libslab/system-tile.h +++ b/libslab/system-tile.h @@ -21,7 +21,7 @@ #ifndef __SYSTEM_TILE_H__ #define __SYSTEM_TILE_H__ -#include +#include "nameplate-tile.h" #include -- cgit v1.2.1