Browse Source

* debian/rules: switch hardening to use dh9 mode

* debian/compat: use mode 9.
* debian/control:
  - drop build-dep on hardening-includes
  - bump debhelper build-dep to 8.9.4 for dh9 compat mode.
  - add Pre-depends on ${misc:Pre-Depends}.
* debian/rules: use multi-arch path in various rules.
* debian/xfce4-panel-dev.install, debian/xfce4-panel.install: use
  multi-arch path.
* debian/patches/01_support-non-multiarch-modules.patch: support modules
  installed in /usr/lib/$triplet and /usr/lib, to hopefully migrate smoothly
  panel plugins to multiarch path over time without breakage.

git-svn-id: svn://anonscm.debian.org/pkg-xfce/desktop/trunk/xfce4-panel@6105 0c9b3bff-18ee-0310-b944-d1aa2700132f
suites/jessie
mrpouit-guest 10 years ago
parent
commit
33109af6e1
8 changed files with 81 additions and 18 deletions
  1. +12
    -0
      debian/changelog
  2. +1
    -1
      debian/compat
  3. +3
    -2
      debian/control
  4. +53
    -0
      debian/patches/01_support-non-multiarch-modules.patch
  5. +1
    -0
      debian/patches/series
  6. +4
    -8
      debian/rules
  7. +3
    -3
      debian/xfce4-panel-dev.install
  8. +4
    -4
      debian/xfce4-panel.install

+ 12
- 0
debian/changelog View File

@@ -4,6 +4,18 @@ xfce4-panel (4.8.6-1) UNRELEASED; urgency=low
- Fix segfault with not-existing menu. lp: #760939
- Fix typo in fr.po for the directory menu plugin. lp: #846386
* debian/xfce4-panel.1: fix path to upstream docs. Closes: #638204
* debian/rules: switch hardening to use dh9 mode
* debian/compat: use mode 9.
* debian/control:
- drop build-dep on hardening-includes
- bump debhelper build-dep to 8.9.4 for dh9 compat mode.
- add Pre-depends on ${misc:Pre-Depends}.
* debian/rules: use multi-arch path in various rules.
* debian/xfce4-panel-dev.install, debian/xfce4-panel.install: use
multi-arch path.
* debian/patches/01_support-non-multiarch-modules.patch: support modules
installed in /usr/lib/$triplet and /usr/lib, to hopefully migrate smoothly
panel plugins to multiarch path over time without breakage.

-- Lionel Le Folgoc <mrpouit@gmail.com> Wed, 21 Sep 2011 23:33:47 +0200



+ 1
- 1
debian/compat View File

@@ -1 +1 @@
7
9

+ 3
- 2
debian/control View File

@@ -4,12 +4,12 @@ Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel@lists.alioth.debian.org>
Uploaders: Yves-Alexis Perez <corsac@debian.org>,
Lionel Le Folgoc <mrpouit@gmail.com>
Build-Depends: debhelper (>= 7.0.50~), libxfce4util-dev (>= 4.8.0),
Build-Depends: debhelper (>= 8.9.4), libxfce4util-dev (>= 4.8.0),
libgarcon-1-0-dev (>= 0.1.4), libxfce4ui-1-dev (>= 4.8.0),
libxfconf-0-dev (>= 4.8.0), libexo-1-dev (>= 0.6.0),
libgtk2.0-dev (>= 2.14.0), libglib2.0-dev (>= 2.18.0),
libdbus-glib-1-dev (>= 0.73), libcairo2-dev (>= 1.0.0),
libwnck-dev (>= 2.22), libxml-parser-perl, intltool, hardening-includes
libwnck-dev (>= 2.22), libxml-parser-perl, intltool
Standards-Version: 3.9.2
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-panel/
@@ -18,6 +18,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-panel/
Package: xfce4-panel
Section: xfce
Architecture: any
Pre-depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}, exo-utils
Description: panel for Xfce4 desktop environment
This is the panel provided by the Xfce4 desktop project. If you want a


+ 53
- 0
debian/patches/01_support-non-multiarch-modules.patch View File

@@ -0,0 +1,53 @@
From ea41593b670a894a6ef1daa4295bd5b5723baa97 Mon Sep 17 00:00:00 2001
From: Lionel Le Folgoc <lionel@lefolgoc.net>
Date: Fri, 7 Oct 2011 22:28:38 +0200
Subject: Look for modules in {non-,}multiarch LIBDIRs

This will let a multiarch enabled xfce4-panel find plugins built against a
non-multiarch panel (load plugins from both /usr/lib/$triplet and /usr/lib).
---
panel/panel-module.c | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/panel/panel-module.c b/panel/panel-module.c
index ba39320..de4c52e 100644
--- a/panel/panel-module.c
+++ b/panel/panel-module.c
@@ -38,6 +38,12 @@
#define PANEL_PLUGINS_LIB_DIR (LIBDIR G_DIR_SEPARATOR_S "panel" G_DIR_SEPARATOR_S "plugins")
#define PANEL_PLUGINS_LIB_DIR_OLD (LIBDIR G_DIR_SEPARATOR_S "panel-plugins")
+static const gchar *compat_paths[] =
+{
+ PANEL_PLUGINS_LIB_DIR_OLD,
+ "/usr/lib/xfce4/panel/plugins",
+ "/usr/lib/xfce4/panel-plugins"
+};
typedef enum _PanelModuleRunMode PanelModuleRunMode;
typedef enum _PanelModuleUnique PanelModuleUnique;
@@ -303,6 +309,7 @@ panel_module_new_from_desktop_file (const gchar *filename,
const gchar *module_exec;
const gchar *module_unique;
gboolean found;
+ gsize i;
panel_return_val_if_fail (!exo_str_is_empty (filename), NULL);
panel_return_val_if_fail (!exo_str_is_empty (name), NULL);
@@ -343,11 +350,11 @@ panel_module_new_from_desktop_file (const gchar *filename,
path = g_module_build_path (PANEL_PLUGINS_LIB_DIR, module_name);
found = g_file_test (path, G_FILE_TEST_EXISTS);
- if (!found)
+ for (i = 0; !found && i < G_N_ELEMENTS (compat_paths); ++i)
{
/* deprecated location for module plugin directories */
g_free (path);
- path = g_module_build_path (PANEL_PLUGINS_LIB_DIR_OLD, module_name);
+ path = g_module_build_path (compat_paths[i], module_name);
found = g_file_test (path, G_FILE_TEST_EXISTS);
}
--
1.7.6.3


+ 1
- 0
debian/patches/series View File

@@ -0,0 +1 @@
01_support-non-multiarch-modules.patch

+ 4
- 8
debian/rules View File

@@ -1,16 +1,12 @@
#!/usr/bin/make -f

include /usr/share/hardening-includes/hardening.make
export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1
export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow

CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
CFLAGS+=$(HARDENING_CFLAGS)

export CFLAGS LDFLAGS
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)

override_dh_install:
rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/panel/plugins/*.a
rm -f $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel/plugins/*.a
dh_install --fail-missing --sourcedir=debian/tmp -X .la

override_dh_strip:


+ 3
- 3
debian/xfce4-panel-dev.install View File

@@ -1,5 +1,5 @@
usr/include/
usr/lib/pkgconfig/
usr/lib/lib*.a
usr/lib/lib*.so
usr/lib/*/pkgconfig/
usr/lib/*/lib*.a
usr/lib/*/lib*.so
usr/share/gtk-doc/

+ 4
- 4
debian/xfce4-panel.install View File

@@ -1,8 +1,8 @@
usr/bin/
usr/lib/lib*.so.*
usr/lib/xfce4/panel/migrate
usr/lib/xfce4/panel/wrapper
usr/lib/xfce4/panel/plugins/*.so
usr/lib/*/lib*.so.*
usr/lib/*/xfce4/panel/migrate
usr/lib/*/xfce4/panel/wrapper
usr/lib/*/xfce4/panel/plugins/*.so
etc/
usr/share/applications/
usr/share/doc/xfce4-panel/


Loading…
Cancel
Save