From 997f9d35af6dca11a3f7c329cf79cf5a09906ec4 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 24 Mar 2025 13:03:49 +0100 Subject: [PATCH 1/3] Removing TODO, not needed anymore. Signed-off-by: Daniel Baumann --- debian/TODO.Debian | 1 - 1 file changed, 1 deletion(-) delete mode 100644 debian/TODO.Debian diff --git a/debian/TODO.Debian b/debian/TODO.Debian deleted file mode 100644 index 22d95f7..0000000 --- a/debian/TODO.Debian +++ /dev/null @@ -1 +0,0 @@ -- is there some official policy for packaging Apache modules? e.g. enable/disable by default From 3dad20051bf40e3207f980320658b060e06df9b9 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 24 Mar 2025 13:05:17 +0100 Subject: [PATCH 2/3] Removing ftbfs-gcc-14.patch, not needed anymore. Signed-off-by: Daniel Baumann --- debian/compat | 1 - debian/control | 2 +- debian/patches/debian/0001-ftbfs-gcc-14.patch | 28 ------------------- debian/patches/series | 1 - 4 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 debian/compat delete mode 100644 debian/patches/debian/0001-ftbfs-gcc-14.patch delete mode 100644 debian/patches/series diff --git a/debian/compat b/debian/compat deleted file mode 100644 index ec63514..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/debian/control b/debian/control index be8b07c..fb4eb55 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: libapache2-mod-qos Priority: optional Maintainer: Daniel Baumann -Build-Depends: debhelper (>= 9), libssl-dev (>= 0.9.8g), libapr1-dev, libaprutil1-dev, libpcre2-dev, libpng-dev, dh-apache2, apache2-dev (>= 2.4.53-1~), dh-autoreconf +Build-Depends: debhelper-compat (= 13), libssl-dev (>= 0.9.8g), libapr1-dev, libaprutil1-dev, libpcre2-dev, libpng-dev, dh-apache2, apache2-dev (>= 2.4.53-1~), dh-autoreconf Standards-Version: 4.3.0 Section: httpd Homepage: http://mod-qos.sourceforge.net/ diff --git a/debian/patches/debian/0001-ftbfs-gcc-14.patch b/debian/patches/debian/0001-ftbfs-gcc-14.patch deleted file mode 100644 index d48cc81..0000000 --- a/debian/patches/debian/0001-ftbfs-gcc-14.patch +++ /dev/null @@ -1,28 +0,0 @@ -Author: Daniel Baumann -Description: Building without qsfilter2 and qsrotate, they are removed in later upstream version (Closes: #1075142). - -diff -Naurp libapache2-mod-qos.orig/tools/src/Makefile.am libapache2-mod-qos/tools/src/Makefile.am ---- libapache2-mod-qos.orig/tools/src/Makefile.am -+++ libapache2-mod-qos/tools/src/Makefile.am -@@ -1,6 +1,6 @@ - # $Id: Makefile.am 2486 2018-09-03 20:22:17Z pbuchbinder $ - --bin_PROGRAMS=qsfilter2 qslog qspng qsrotate qssign qstail qshead qsgrep qsexec qscheck qsgeo qslogger qsdt qsrespeed qsre -+bin_PROGRAMS=qslog qspng qssign qstail qshead qsgrep qsexec qscheck qsgeo qslogger qsdt qsrespeed qsre - - qsfilter2_SOURCES= \ - qsfilter2.c qs_util.c -diff -Naurp libapache2-mod-qos.orig/tools/src/Makefile.in libapache2-mod-qos/tools/src/Makefile.in ---- libapache2-mod-qos.orig/tools/src/Makefile.in -+++ libapache2-mod-qos/tools/src/Makefile.in -@@ -88,8 +88,8 @@ POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --bin_PROGRAMS = qsfilter2$(EXEEXT) qslog$(EXEEXT) qspng$(EXEEXT) \ -- qsrotate$(EXEEXT) qssign$(EXEEXT) qstail$(EXEEXT) \ -+bin_PROGRAMS = qslog$(EXEEXT) qspng$(EXEEXT) \ -+ qssign$(EXEEXT) qstail$(EXEEXT) \ - qshead$(EXEEXT) qsgrep$(EXEEXT) qsexec$(EXEEXT) \ - qscheck$(EXEEXT) qsgeo$(EXEEXT) qslogger$(EXEEXT) \ - qsdt$(EXEEXT) qsrespeed$(EXEEXT) qsre$(EXEEXT) diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 2dfad7f..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -debian/0001-ftbfs-gcc-14.patch From b90e04a2fd3a0ed20aad08cbd70b25ee91258db4 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 24 Mar 2025 13:05:43 +0100 Subject: [PATCH 3/3] Wrap and sorting debian files. Signed-off-by: Daniel Baumann --- debian/control | 15 +++++++++++++-- debian/libapache2-mod-qos.docs | 2 +- debian/libapache2-mod-qos.install | 6 +++--- debian/libapache2-mod-qos.manpages | 2 +- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/debian/control b/debian/control index fb4eb55..81577a3 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,16 @@ Source: libapache2-mod-qos Priority: optional Maintainer: Daniel Baumann -Build-Depends: debhelper-compat (= 13), libssl-dev (>= 0.9.8g), libapr1-dev, libaprutil1-dev, libpcre2-dev, libpng-dev, dh-apache2, apache2-dev (>= 2.4.53-1~), dh-autoreconf +Build-Depends: + debhelper-compat (= 13), + dh-apache2, + dh-autoreconf, + apache2-dev (>= 2.4.53-1~), + libapr1-dev, + libaprutil1-dev, + libpcre2-dev, + libpng-dev, + libssl-dev (>= 0.9.8g), Standards-Version: 4.3.0 Section: httpd Homepage: http://mod-qos.sourceforge.net/ @@ -10,7 +19,9 @@ Vcs-Browser: https://salsa.debian.org/sk-guest/libapache2-mod-qos Package: libapache2-mod-qos Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: + ${misc:Depends}, + ${shlibs:Depends}, Description: quality of service module for the apache2 This is a quality of service module (QoS) for the Apache web server implementing control mechanisms that can provide different priority diff --git a/debian/libapache2-mod-qos.docs b/debian/libapache2-mod-qos.docs index 5bccf56..17f1110 100644 --- a/debian/libapache2-mod-qos.docs +++ b/debian/libapache2-mod-qos.docs @@ -1,5 +1,5 @@ README.TXT +doc/*.gif doc/favicon.ico doc/index.html -doc/*.gif doc/q*.html diff --git a/debian/libapache2-mod-qos.install b/debian/libapache2-mod-qos.install index 9d27655..c2ae5b2 100644 --- a/debian/libapache2-mod-qos.install +++ b/debian/libapache2-mod-qos.install @@ -1,7 +1,7 @@ +tools/src/qsexec usr/bin/ +tools/src/qsgrep usr/bin/ tools/src/qslog usr/bin/ +tools/src/qslogger usr/bin/ tools/src/qspng usr/bin/ tools/src/qssign usr/bin/ tools/src/qstail usr/bin/ -tools/src/qsgrep usr/bin/ -tools/src/qsexec usr/bin/ -tools/src/qslogger usr/bin/ diff --git a/debian/libapache2-mod-qos.manpages b/debian/libapache2-mod-qos.manpages index 67f1694..5cd6527 100644 --- a/debian/libapache2-mod-qos.manpages +++ b/debian/libapache2-mod-qos.manpages @@ -1,7 +1,7 @@ tools/man1/qsexec.1 tools/man1/qsgrep.1 tools/man1/qslog.1 +tools/man1/qslogger.1 tools/man1/qspng.1 tools/man1/qssign.1 tools/man1/qstail.1 -tools/man1/qslogger.1