[SCM] mate-control-center Debian package branch, master, updated. c87d3f9c8cf2a08fc9e5380532b62278ca58c6ba
Mike Gabriel
sunweaver at moszumanska.debian.org
Fri May 2 14:14:46 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-control-center.git;a=commitdiff;h=b8416a9
The following commit has been merged in the master branch:
commit b8416a9720df803b18d5d64282d7cb3e378f9ad4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri May 2 13:08:24 2014 +0200
Rename libslab to libmate-slab to avoid package version conflicts with earlier packages of that name in Debian.
---
debian/control | 21 ++--
debian/libmate-slab-dev.install | 6 +-
debian/libmate-slab0.install | 2 +-
debian/libmate-slab0.symbols | 2 +-
debian/mate-slab/mate-slab.pc.in | 12 +++
.../1005_rename-libslab-to-libmate-slab0.patch | 114 +++++++++++++++++++++
.../2001_omit-gfdl-licensed-help-files.patch | 2 +-
debian/patches/series | 1 +
debian/rules | 1 +
9 files changed, 141 insertions(+), 20 deletions(-)
diff --git a/debian/control b/debian/control
index e9741f6..be73366 100644
--- a/debian/control
+++ b/debian/control
@@ -135,11 +135,6 @@ Package: libmate-slab0
Section: libs
Architecture: any
Multi-Arch: same
-Breaks: gnome-main-menu (<< 0.9.14),
- libslab0,
- libslab0a,
-Replaces: libslab0,
- libslab0a,
Depends: ${shlibs:Depends},
${misc:Depends},
Description: beautification app library
@@ -152,29 +147,27 @@ Package: libmate-slab-dev
Section: libdevel
Architecture: any
Multi-Arch: same
+Provides: libmate-slab0-dev,
Depends: ${misc:Depends},
libmate-slab0 (= ${binary:Version}),
-Breaks: libslab-dev,
-Replaces: libslab-dev,
Description: beautification app library (development headers)
- The libslab library provides functionality to create applications like MATE
- control center and the application-browser from gnome-main-menu.
+ The libmate-slab library provides functionality to create applications
+ like MATE control center and the application-browser from gnome-main-menu.
.
- This package contains the development files for libslab.
+ This package contains the development files for libmate-slab.
Package: libmate-slab0-dbg
Section: debug
Priority: extra
Architecture: any
Multi-Arch: same
-Provides: libmate-slab-dbg
Depends: ${misc:Depends},
libmate-slab0 (= ${binary:Version}),
Description: beautification app library (window settings debugging symbols)
- The libslab library provides functionality to create applications like MATE
- control center and the application-browser from gnome-main-menu.
+ The libmate-slab library provides functionality to create applications
+ like MATE control center and the application-browser from gnome-main-menu.
.
- This package contains the debugging symbols for the MATE window settings
+ This package contains the debugging symbols for the libmate-slab
library.
.
They are installed into /usr/lib/debug and will automatically used by gdb.
diff --git a/debian/libmate-slab-dev.install b/debian/libmate-slab-dev.install
index 99755b6..50422a7 100644
--- a/debian/libmate-slab-dev.install
+++ b/debian/libmate-slab-dev.install
@@ -1,3 +1,3 @@
-usr/include/libslab/
-usr/lib/*/libslab.so
-usr/lib/*/pkgconfig/libslab.pc
\ No newline at end of file
+usr/include/libmate-slab/
+usr/lib/*/libmate-slab.so
+usr/lib/*/pkgconfig/mate-slab.pc
\ No newline at end of file
diff --git a/debian/libmate-slab0.install b/debian/libmate-slab0.install
index 3666223..b226c97 100644
--- a/debian/libmate-slab0.install
+++ b/debian/libmate-slab0.install
@@ -1 +1 @@
-usr/lib/*/libslab.so.*
+usr/lib/*/libmate-slab.so.*
diff --git a/debian/libmate-slab0.symbols b/debian/libmate-slab0.symbols
index c3ec2e8..c4292c4 100644
--- a/debian/libmate-slab0.symbols
+++ b/debian/libmate-slab0.symbols
@@ -1,4 +1,4 @@
-libslab.so.0 libmate-slab0 #MINVER#
+libmate-slab.so.0 libmate-slab0 #MINVER#
app_resizer_get_type at Base 1.8.1
app_resizer_layout_table_default at Base 1.8.1
app_resizer_new at Base 1.8.1
diff --git a/debian/mate-slab/mate-slab.pc.in b/debian/mate-slab/mate-slab.pc.in
new file mode 100644
index 0000000..c6f26ec
--- /dev/null
+++ b/debian/mate-slab/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+- at GTK_API_VERSION@ mate-desktop-2.0 libmate-menu
+Requires.private: gdk- at GTK_API_VERSION@ librsvg-2.0
+Version: @VERSION@
+Libs: -L${libdir} -lmate-slab
+Cflags: -I${includedir}/libmate-slab
diff --git a/debian/patches/1005_rename-libslab-to-libmate-slab0.patch b/debian/patches/1005_rename-libslab-to-libmate-slab0.patch
new file mode 100644
index 0000000..153c864
--- /dev/null
+++ b/debian/patches/1005_rename-libslab-to-libmate-slab0.patch
@@ -0,0 +1,114 @@
+Description: Rename libslab to libmate-slab
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+Abstract:
+ 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.
+--- 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 @@
+ 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 @@
+ 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 "\' > $@; \
+--- a/configure.ac
++++ b/configure.ac
+@@ -182,20 +182,20 @@
+ PKG_CHECK_MODULES(GLIB, glib-2.0 $GMODULE_ADD)
+
+ dnl
+-dnl Check dependencies of libslab
++dnl Check dependencies of libmate-slab
+ dnl
+ PKG_CHECK_MODULES(LIBSLAB, [
+ gio-2.0 mate-desktop-2.0 librsvg-2.0 libmate-menu pango
+ ],
+- have_libslab=yes,
+- have_libslab=no)
++ have_libmateslab=yes,
++ have_libmateslab=no)
+ WARN_CFLAGS="-Wall"
+
+-AC_SUBST(LIBSLAB_CFLAGS)
+-AC_SUBST(LIBSLAB_LIBS)
++AC_SUBST(LIBMATESLAB_CFLAGS)
++AC_SUBST(LIBMATESLAB_LIBS)
+ AC_SUBST(WARN_CFLAGS)
+
+-AM_CONDITIONAL(HAVE_LIBSLAB, [test $have_libslab = yes])
++AM_CONDITIONAL(HAVE_LIBMATESLAB, [test $have_libmateslab = yes])
+
+ dnl
+ dnl Check for Xft version 2; we build in extra functionality to the font capplet
+@@ -371,7 +371,7 @@
+ libwindow-settings/Makefile
+ libwindow-settings/mate-window-settings-2.0.pc
+ po/Makefile.in
+-libslab/libslab.pc
++libslab/mate-slab.pc
+ libslab/Makefile
+ shell/Makefile
+ shell/matecc.desktop.in
+@@ -390,7 +390,7 @@
+
+ GTK+ API version: ${GTK_API_VERSION}
+ Appindicator: ${enable_appindicator}
+- Libslab: ${have_libslab}
++ Libmate-slab: ${have_libmateslab}
+ XCursor support: ${have_xcursor}
+ XInput support: ${have_xinput}
+ Ubuntu hacks: ${enable_ubuntu}
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,11 +1,11 @@
+ SUBDIRS = po libwindow-settings capplets font-viewer help
+ DIST_SUBDIRS = po libwindow-settings capplets font-viewer help libslab shell typing-break
+
+-if HAVE_LIBSLAB
++if HAVE_LIBMATESLAB
+ SUBDIRS += libslab
+ endif
+
+-if HAVE_LIBSLAB
++if HAVE_LIBMATESLAB
+ SUBDIRS += shell
+ endif
+
+--- a/shell/Makefile.am
++++ b/shell/Makefile.am
+@@ -1,5 +1,5 @@
+ REAL_LIBSLAB_CFLAGS = -I$(top_srcdir)/libslab
+-REAL_LIBSLAB_LIBS = $(top_builddir)/libslab/libslab.la
++REAL_LIBSLAB_LIBS = $(top_builddir)/libslab/libmate-slab.la
+
+ AM_CPPFLAGS = \
+ -I$(top_srcdir) \
diff --git a/debian/patches/2001_omit-gfdl-licensed-help-files.patch b/debian/patches/2001_omit-gfdl-licensed-help-files.patch
index c72a1a4..a71bc72 100644
--- a/debian/patches/2001_omit-gfdl-licensed-help-files.patch
+++ b/debian/patches/2001_omit-gfdl-licensed-help-files.patch
@@ -8,7 +8,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+SUBDIRS = po libwindow-settings capplets font-viewer
+DIST_SUBDIRS = po libwindow-settings capplets font-viewer libslab shell typing-break
- if HAVE_LIBSLAB
+ if HAVE_LIBMATESLAB
SUBDIRS += libslab
--- a/configure.ac
+++ b/configure.ac
diff --git a/debian/patches/series b/debian/patches/series
index 9089170..44ca71d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
1002_spelling-check-in-man-pages.patch
1003_add-keywords-key-to-desktop-files.patch
1004_add-main-category-to-categories-key-in-desktop-file.patch
+1005_rename-libslab-to-libmate-slab0.patch
2001_omit-gfdl-licensed-help-files.patch
diff --git a/debian/rules b/debian/rules
index eb79986..adbb4f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,7 @@ override_dh_install:
dh_install --list-missing
override_dh_auto_configure:
+ cp debian/mate-slab/mate-slab.pc.in libslab/mate-slab.pc.in
# upstream tarball is without configure. autogen.sh will create it
NOCONFIGURE=1 ./autogen.sh
dh_auto_configure $(DHFLAGS) -- \
--
mate-control-center Debian package
More information about the pkg-mate-commits
mailing list