[topmenu-gtk] 01/01: All over the package: whitespace-cleanup at EOL.
Mike Gabriel
sunweaver at debian.org
Fri Feb 19 05:32:50 UTC 2016
This is an automated email from the git hooks/post-receive script.
sunweaver pushed a commit to branch master
in repository topmenu-gtk.
commit 436a2fc2250d209ba15afa32202c0b18b3b85ad5
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Feb 19 06:32:27 2016 +0100
All over the package: whitespace-cleanup at EOL.
---
debian/changelog | 4 ++--
debian/control | 4 ++--
debian/copyright | 2 +-
debian/patches/1002_pkgconfig-x11.patch | 22 +++++++++++-----------
.../1003_fix-g-log-domain-lxpanel-applet.patch | 4 ++--
debian/rules | 2 +-
6 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2b4d1c1..d94cecc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
topmenu-gtk (0.2.1+git20151210.8c6108f-1) unstable; urgency=medium
-
+
* Initial release. (Closes: #814077).
Built from upstream commit: 8c6108f10c9b91e71c0a55604aff06bac094c15b.
-
+
-- Mike Gabriel <sunweaver at debian.org> Tue, 16 Feb 2016 10:47:28 +0100
diff --git a/debian/control b/debian/control
index 8d2b573..48cfcf5 100644
--- a/debian/control
+++ b/debian/control
@@ -259,7 +259,7 @@ Description: Topmenu applet for the MATE panel (debug symbols)
Package: xfce4-topmenu-plugin
Architecture: any
-Depends: xfce4-panel (>= 4.8),
+Depends: xfce4-panel (>= 4.8),
libtopmenu-client-gtk2-0 (= ${binary:Version}),
topmenu-gtk-common (>= ${source:Version}),
${shlibs:Depends},
@@ -288,7 +288,7 @@ Description: Topmenu panel plugin for the Xfce4 desktop (debug symbols)
Package: lxpanel-plugin-topmenu
Architecture: any
-Depends: lxpanel (>= 8),
+Depends: lxpanel (>= 8),
libtopmenu-client-gtk2-0 (= ${binary:Version}),
topmenu-gtk-common (>= ${source:Version}),
${shlibs:Depends},
diff --git a/debian/copyright b/debian/copyright
index 855d97d..b24b292 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -54,7 +54,7 @@ Copyright: 1995-1997, Peter Mattis, Spencer Kimball and Josh MacDonald
2014, Javier S. Pedro <maemo at javispedro.com>
License: LGPL-3+
-Files:
+Files:
COPYING
COPYING.LESSER
ChangeLog
diff --git a/debian/patches/1002_pkgconfig-x11.patch b/debian/patches/1002_pkgconfig-x11.patch
index 4a1a94c..d9ebff9 100644
--- a/debian/patches/1002_pkgconfig-x11.patch
+++ b/debian/patches/1002_pkgconfig-x11.patch
@@ -4,11 +4,11 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
--- a/configure.ac
+++ b/configure.ac
@@ -58,6 +58,7 @@
-
+
# Checks for libraries.
PKG_CHECK_MODULES([GTK], [gtk+-x11-$with_gtk.0])
+PKG_CHECK_MODULES([X11], [x11])
-
+
AS_IF([test "x$with_gtk" = x3],
[AS_IF([test "x$with_wnck" = xwnck3 -o "x$with_wnck" = xcheck],
--- a/libtopmenu-client/Makefile.am
@@ -21,9 +21,9 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-libtopmenu_client_gtk3_la_LIBADD = $(GTK_LIBS)
+libtopmenu_client_gtk3_la_CPPFLAGS = $(X11_CFLAGS) $(GTK_CFLAGS) -DG_LOG_DOMAIN=\"topmenu-client\"
+libtopmenu_client_gtk3_la_LIBADD = $(X11_LIBS) $(GTK_LIBS)
-
+
else
-
+
@@ -13,8 +13,8 @@
libtopmenu_client_gtk2_la_SOURCES = topmenu-client.c topmenu-client.h \
topmenu-monitor.c topmenu-monitor.h \
@@ -32,28 +32,28 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-libtopmenu_client_gtk2_la_LIBADD = $(GTK_LIBS)
+libtopmenu_client_gtk2_la_CPPFLAGS = $(X11_CFLAGS) $(GTK_CFLAGS) -DG_LOG_DOMAIN=\"topmenu-client\"
+libtopmenu_client_gtk2_la_LIBADD = $(X11_LIBS) $(GTK_LIBS)
-
+
endif
-
+
--- a/libtopmenu-server/Makefile.am
+++ b/libtopmenu-server/Makefile.am
@@ -2,15 +2,15 @@
-
+
lib_LTLIBRARIES = libtopmenu-server-gtk3.la
libtopmenu_server_gtk3_la_SOURCES = topmenu-server.c topmenu-server.h topmenu-widget.c topmenu-widget.h
-libtopmenu_server_gtk3_la_CPPFLAGS = $(GTK_CFLAGS) $(WNCK3_CFLAGS) -DG_LOG_DOMAIN=\"topmenu-server\"
-libtopmenu_server_gtk3_la_LIBADD = $(GTK_LIBS) $(WNCK3_LIBS)
+libtopmenu_server_gtk3_la_CPPFLAGS = $(X11_CFLAGS) $(GTK_CFLAGS) $(WNCK3_CFLAGS) -DG_LOG_DOMAIN=\"topmenu-server\"
+libtopmenu_server_gtk3_la_LIBADD = $(X11_LIBS) $(GTK_LIBS) $(WNCK3_LIBS)
-
+
else
-
+
lib_LTLIBRARIES = libtopmenu-server-gtk2.la
libtopmenu_server_gtk2_la_SOURCES = topmenu-server.c topmenu-server.h topmenu-widget.c topmenu-widget.h
-libtopmenu_server_gtk2_la_CPPFLAGS = $(GTK_CFLAGS) $(WNCK1_CFLAGS) $(MATEWNCK_CFLAGS) -DG_LOG_DOMAIN=\"topmenu-server\"
-libtopmenu_server_gtk2_la_LIBADD = $(GTK_LIBS) $(WNCK1_LIBS) $(MATEWNCK_LIBS)
+libtopmenu_server_gtk2_la_CPPFLAGS = $(X11_CFLAGS) $(GTK_CFLAGS) $(WNCK1_CFLAGS) $(MATEWNCK_CFLAGS) -DG_LOG_DOMAIN=\"topmenu-server\"
+libtopmenu_server_gtk2_la_LIBADD = $(X11_LIBS) $(GTK_LIBS) $(WNCK1_LIBS) $(MATEWNCK_LIBS)
-
+
endif
-
+
diff --git a/debian/patches/1003_fix-g-log-domain-lxpanel-applet.patch b/debian/patches/1003_fix-g-log-domain-lxpanel-applet.patch
index cdf1645..15f3155 100644
--- a/debian/patches/1003_fix-g-log-domain-lxpanel-applet.patch
+++ b/debian/patches/1003_fix-g-log-domain-lxpanel-applet.patch
@@ -5,10 +5,10 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+++ b/lxpanel-plugin/Makefile.am
@@ -4,7 +4,7 @@
plugin_LTLIBRARIES = libtopmenu.la
-
+
libtopmenu_la_SOURCES = topmenu-lxpanel-plugin.c
-libtopmenu_la_CPPFLAGS = $(GTK_CFLAGS) $(LXPANELPLUGIN_CFLAGS) -DG_LOG_DOMAIN=\"topmenu-xfce-panel-applet\"
+libtopmenu_la_CPPFLAGS = $(GTK_CFLAGS) $(LXPANELPLUGIN_CFLAGS) -DG_LOG_DOMAIN=\"topmenu-lxde-panel-applet\"
libtopmenu_la_LIBADD = $(GTK_LIBS) $(LXPANELPLUGIN_LIBS) ../libtopmenu-server/libtopmenu-server-gtk$(GTK_VERSION).la
libtopmenu_la_LDFLAGS = -avoid-version -shared -no-undefined
-
+
diff --git a/debian/rules b/debian/rules
index adb0b61..5f3dc2e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ NULL =
PKD = $(word 1,$(abspath $(dir $(MAKEFILE_LIST))))
PKG = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
UVER = $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s+(?:\d+:)?(\d.*)(?:\-\d+.*)};')
-DTYPE =
+DTYPE =
VER ?= $(subst $(DTYPE),,$(UVER))
UURL = https://git.javispedro.com/topmenu-gtk.git
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/topmenu-gtk.git
More information about the pkg-mate-commits
mailing list