From a421d8d58e9e601b355ef61460cd9338eef7d0ba Mon Sep 17 00:00:00 2001 From: Carl Keinath Date: Tue, 4 Mar 2025 23:00:48 +0100 Subject: [PATCH 1/9] added gbp conf --- debian/gbp.conf | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 debian/gbp.conf diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..6f440a2 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,4 @@ +[DEFAULT] +debian-branch = debian/latest +upstream-branch = upstream/latest +pristine-tar = True \ No newline at end of file From b15154c97a82246fa4d4d5722e259e97a89161c3 Mon Sep 17 00:00:00 2001 From: Carl Keinath Date: Tue, 4 Mar 2025 23:01:42 +0100 Subject: [PATCH 2/9] simplified watch file --- debian/watch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/watch b/debian/watch index 7338efc..7ac8c31 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,4 @@ version=4 -opts="searchmode=html" \ - https://github.com/hyprwm/hyprutils/tags \ - https://github.com/hyprwm/hyprutils/archive/refs/tags/v(\d+)\.(\d+)\.(\d+)?\.?tar\.gz +opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE@-$1.tar.gz%" \ + https://github.com/hyprwm/hyprutils/tags \ + (?:.*?/)?v?(\d[\d.]*)\.tar\.gz From 3166b44dd98afa046f02a6289adbdd0ab0f532be Mon Sep 17 00:00:00 2001 From: Carl Keinath Date: Tue, 4 Mar 2025 23:02:44 +0100 Subject: [PATCH 3/9] updated copyright file --- debian/copyright | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/copyright b/debian/copyright index 09c1c1a..c6a1caf 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,13 +6,13 @@ Upstream-Contact: vaxerski Files: * Copyright: - 2024, Hypr Development + 2024-2025 Hypr Development License: BSD-3-Clause Files: debian/* Copyright: - 2024 Alan M Varghese (NyxTrail) + 2024-2025 Alan M Varghese (NyxTrail) License: BSD-3-Clause License: BSD-3-Clause From 4c36534103b780a4f17f503d7b1d599bc99a9afa Mon Sep 17 00:00:00 2001 From: Carl Keinath Date: Tue, 4 Mar 2025 23:03:08 +0100 Subject: [PATCH 4/9] removed unecessary build rules --- debian/rules | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/debian/rules b/debian/rules index 73b7533..d8309f6 100755 --- a/debian/rules +++ b/debian/rules @@ -1,26 +1,6 @@ #!/usr/bin/make -f -# See debhelper(7) (uncomment to enable). -# Output every command that modifies files on the build system. -#export DH_VERBOSE = 1 - - -# See FEATURE AREAS in dpkg-buildflags(1). export DEB_BUILD_MAINT_OPTIONS = hardening=+all -# See ENVIRONMENT in dpkg-buildflags(1). -# Package maintainers to append CFLAGS. -#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic -# Package maintainers to append LDFLAGS. -#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed - - %: dh $@ - - -override_dh_auto_configure: - dh_auto_configure -- \ - -DCMAKE_BUILD_TYPE:STRING=Release - -DCMAKE_INSTALL_PREFIX:PATH=/usr - # -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) From 24ab61ee7a12b4711ff60b1ebe46993912a95e6c Mon Sep 17 00:00:00 2001 From: Carl Keinath Date: Wed, 5 Mar 2025 09:52:34 +0100 Subject: [PATCH 6/9] added salsa-ci config --- debian/salsa-ci.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 debian/salsa-ci.yml diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml new file mode 100644 index 0000000..8424db4 --- /dev/null +++ b/debian/salsa-ci.yml @@ -0,0 +1,3 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml From 4daf58d97b25d57238e3f6e40656705813658b02 Mon Sep 17 00:00:00 2001 From: Carl Keinath Date: Wed, 5 Mar 2025 13:12:02 +0100 Subject: [PATCH 7/9] use 4.7.0 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index d323d47..413ab30 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: cmake, libpixman-1-dev, pkgconf, -Standards-Version: 4.7.2 +Standards-Version: 4.7.0 Homepage: https://github.com/hyprwm/hyprutils Vcs-Browser: https://salsa.debian.org/NyxTrail/hyprutils Vcs-Git: https://salsa.debian.org/NyxTrail/hyprutils.git From b248a86df860959e599de04f9c3fbbdbe8691d61 Mon Sep 17 00:00:00 2001 From: Carl Keinath Date: Wed, 5 Mar 2025 14:47:40 +0100 Subject: [PATCH 8/9] Revert "use 4.7.0" This reverts commit 4daf58d97b25d57238e3f6e40656705813658b02. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 413ab30..d323d47 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: cmake, libpixman-1-dev, pkgconf, -Standards-Version: 4.7.0 +Standards-Version: 4.7.2 Homepage: https://github.com/hyprwm/hyprutils Vcs-Browser: https://salsa.debian.org/NyxTrail/hyprutils Vcs-Git: https://salsa.debian.org/NyxTrail/hyprutils.git From 642d037adf804c0b4f4395243b3f60e211d92d0f Mon Sep 17 00:00:00 2001 From: Carl Keinath Date: Thu, 6 Mar 2025 10:10:00 +0100 Subject: [PATCH 9/9] added fix for floating point issues --- debian/rules | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/rules b/debian/rules index d8309f6..5ac5481 100755 --- a/debian/rules +++ b/debian/rules @@ -2,5 +2,9 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all +ifeq ($(DEB_HOST_ARCH),i386) + export DEB_CXXFLAGS_MAINT_APPEND += -ffloat-store +endif + %: dh $@