diff --git a/debian/TODO.Debian b/debian/TODO.Debian new file mode 100644 index 0000000..22d95f7 --- /dev/null +++ b/debian/TODO.Debian @@ -0,0 +1 @@ +- is there some official policy for packaging Apache modules? e.g. enable/disable by default diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control index 81577a3..be8b07c 100644 --- a/debian/control +++ b/debian/control @@ -1,16 +1,7 @@ Source: libapache2-mod-qos Priority: optional Maintainer: Daniel Baumann -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), +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 Standards-Version: 4.3.0 Section: httpd Homepage: http://mod-qos.sourceforge.net/ @@ -19,9 +10,7 @@ Vcs-Browser: https://salsa.debian.org/sk-guest/libapache2-mod-qos Package: libapache2-mod-qos Architecture: any -Depends: - ${misc:Depends}, - ${shlibs:Depends}, +Depends: ${shlibs:Depends}, ${misc: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 17f1110..5bccf56 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 c2ae5b2..9d27655 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 5cd6527..67f1694 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 diff --git a/debian/patches/debian/0001-ftbfs-gcc-14.patch b/debian/patches/debian/0001-ftbfs-gcc-14.patch new file mode 100644 index 0000000..d48cc81 --- /dev/null +++ b/debian/patches/debian/0001-ftbfs-gcc-14.patch @@ -0,0 +1,28 @@ +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 new file mode 100644 index 0000000..2dfad7f --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +debian/0001-ftbfs-gcc-14.patch