[Pkg-xfce-commits] [Git][xfce-team/apps/parole][debian/master] 5 commits: d/patches: include upstream patch to replace DATADIRNAME
Yves-Alexis Perez (@corsac)
gitlab at salsa.debian.org
Mon Jan 2 13:20:10 GMT 2023
Yves-Alexis Perez pushed to branch debian/master at xfce / apps / parole
Commits:
3e992ebe by Yves-Alexis Perez at 2022-12-31T10:44:18+01:00
d/patches: include upstream patch to replace DATADIRNAME
- - - - -
0d7ae162 by Yves-Alexis Perez at 2022-12-31T10:45:11+01:00
update changelog
- - - - -
9d099b83 by Yves-Alexis Perez at 2023-01-02T13:58:43+01:00
d/control: update standards version to 4.6.1
- - - - -
c94d3f1e by Yves-Alexis Perez at 2023-01-02T13:59:02+01:00
finalize changelog
- - - - -
83fc2c10 by Yves-Alexis Perez at 2023-01-02T13:59:16+01:00
upload parole 4.16.0-2 to unstable
- - - - -
5 changed files:
- debian/changelog
- debian/control
- − debian/patches/0001-Replace-DATADIRNAME-by-datarootdir-in-configure.ac.patch
- + debian/patches/0001-build-Replace-DATADIRNAME-no-longer-set-by-xfce4-dev.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,13 +1,14 @@
-parole (4.16.0-2) UNRELEASED; urgency=medium
+parole (4.16.0-2) unstable; urgency=medium
[ Debian Janitor ]
* Apply multi-arch hints. + parole-dev: Add Multi-Arch: same.
[ Yves-Alexis Perez ]
- * d/patches: add patch to replace DATADIRNAME by datarootdir in configure.ac
+ * d/patches: include upstream patch to replace DATADIRNAME in configure.ac
(Closes: #1026648)
+ * d/control: update standards version to 4.6.1
- -- Yves-Alexis Perez <corsac at debian.org> Thu, 22 Dec 2022 18:44:22 +0100
+ -- Yves-Alexis Perez <corsac at debian.org> Mon, 02 Jan 2023 13:59:11 +0100
parole (4.16.0-1) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -19,7 +19,7 @@ Build-Depends: debhelper-compat (= 12),
libxfconf-0-dev (>= 4.10),
pkg-config,
xfce4-dev-tools
-Standards-Version: 4.5.1
+Standards-Version: 4.6.1
Homepage: https://goodies.xfce.org/projects/applications/parole
Vcs-Git: https://salsa.debian.org/xfce-team/apps/parole.git
Vcs-Browser: https://salsa.debian.org/xfce-team/apps/parole
=====================================
debian/patches/0001-Replace-DATADIRNAME-by-datarootdir-in-configure.ac.patch deleted
=====================================
@@ -1,29 +0,0 @@
-From: Yves-Alexis Perez <corsac at debian.org>
-Date: Wed, 21 Dec 2022 16:28:15 +0100
-Subject: Replace DATADIRNAME by datarootdir in configure.ac
-
-DATADIRNAME seems gone from gettext.m4 so pixmapsdir ends up wrong
----
- configure.ac | 9 ++-------
- 1 file changed, 2 insertions(+), 7 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 94c5d0a..ed33e9a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -146,13 +146,8 @@ XDT_CHECK_LIBX11()
- # ===================================================== #
- # Pixmaps files #
- # ===================================================== #
--if test "x${prefix}" = "xNONE"; then
-- AC_DEFINE_UNQUOTED(PIXMAPS_DIR, "${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps", [pixmaps directory])
-- pixmapsdir="${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
--else
-- AC_DEFINE_UNQUOTED(PIXMAPS_DIR, "${prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps", [pixmaps directory])
-- pixmapsdir="${prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
--fi
-+AC_DEFINE_UNQUOTED(PIXMAPS_DIR, "${datarootdir}/${PACKAGE}/pixmaps", [pixmaps directory])
-+pixmapsdir="${datarootdir}/${PACKAGE}/pixmaps"
-
- AC_SUBST(pixmapsdir)
-
=====================================
debian/patches/0001-build-Replace-DATADIRNAME-no-longer-set-by-xfce4-dev.patch
=====================================
@@ -0,0 +1,83 @@
+From: =?utf-8?q?Ga=C3=ABl_Bonithon?= <gael at xfce.org>
+Date: Thu, 29 Dec 2022 19:10:48 +0100
+Subject: build: Replace DATADIRNAME no longer set by xfce4-dev-tools >=
+ 4.17.0
+
+Fixes: #115
+---
+ configure.ac | 15 ---------------
+ data/pixmaps/Makefile.am | 2 ++
+ src/Makefile.am | 1 +
+ src/misc/Makefile.am | 1 +
+ 4 files changed, 4 insertions(+), 15 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 94c5d0a..84399be 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -142,20 +142,6 @@ GST_LIBS="$GST_LIBS -lgstbase-$GST_API_VERSION -lgstvideo-$GST_API_VERSION -lgst
+
+ XDT_CHECK_LIBX11()
+
+-# Taken from Gnome system tools
+-# ===================================================== #
+-# Pixmaps files #
+-# ===================================================== #
+-if test "x${prefix}" = "xNONE"; then
+- AC_DEFINE_UNQUOTED(PIXMAPS_DIR, "${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps", [pixmaps directory])
+- pixmapsdir="${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
+-else
+- AC_DEFINE_UNQUOTED(PIXMAPS_DIR, "${prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps", [pixmaps directory])
+- pixmapsdir="${prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
+-fi
+-
+-AC_SUBST(pixmapsdir)
+-
+ # ===================================================== #
+ # Check XF86keysysm #
+ # ===================================================== #
+@@ -289,7 +275,6 @@ echo "
+ Installation:
+ =============
+ prefix: $prefix
+- pixmapsdir: $pixmapsdir
+ Debug: $enable_debug
+ Building plugin api docs: ${enable_gtk_doc}
+ GStreamer API version: ${gstreamer_api_version}
+diff --git a/data/pixmaps/Makefile.am b/data/pixmaps/Makefile.am
+index 377f9aa..017f274 100644
+--- a/data/pixmaps/Makefile.am
++++ b/data/pixmaps/Makefile.am
+@@ -3,6 +3,8 @@ pixmaps = \
+ replay.png \
+ no-cover.png
+
++pixmapsdir = $(datadir)/parole/pixmaps
++
+ pixmaps_DATA = \
+ $(pixmaps)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 2dd0736..967bf1f 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -19,6 +19,7 @@ INCLUDES = \
+ -DG_LOG_DOMAIN=\"parole\" \
+ -DPAROLE_PLUGINS_DIR=\"$(libdir)/parole-$(PAROLE_VERSION_API)\"\
+ -DPAROLE_PLUGINS_DATA_DIR=\"$(datadir)/parole/parole-plugins-$(PAROLE_VERSION_API)\"\
++ -DPIXMAPS_DIR=\"$(datadir)/parole/pixmaps\" \
+ -DPAROLE_COMPILATION \
+ $(GTHREAD_CFLAGS) \
+ $(GIO_CFLAGS) \
+diff --git a/src/misc/Makefile.am b/src/misc/Makefile.am
+index 0a8eda3..7d73821 100644
+--- a/src/misc/Makefile.am
++++ b/src/misc/Makefile.am
+@@ -5,6 +5,7 @@ INCLUDES = \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/src \
+ -DLOCALEDIR=\"$(localedir)\" \
++ -DPIXMAPS_DIR=\"$(datadir)/parole/pixmaps\" \
+ -DPAROLE_COMPILATION
+
+ INST_HFILES = \
=====================================
debian/patches/series
=====================================
@@ -1 +1 @@
-0001-Replace-DATADIRNAME-by-datarootdir-in-configure.ac.patch
+0001-build-Replace-DATADIRNAME-no-longer-set-by-xfce4-dev.patch
View it on GitLab: https://salsa.debian.org/xfce-team/apps/parole/-/compare/152a914a2110a17bb9f9331121b505f6e9acbed8...83fc2c10fbe84a590a652367d018aca47605f09a
--
View it on GitLab: https://salsa.debian.org/xfce-team/apps/parole/-/compare/152a914a2110a17bb9f9331121b505f6e9acbed8...83fc2c10fbe84a590a652367d018aca47605f09a
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-xfce-commits/attachments/20230102/abf47e34/attachment-0001.htm>
More information about the Pkg-xfce-commits
mailing list