Bug#1089447: swish-e: diff for NMU version 2.4.7-6.3

[Niels Thykier]

Control: tags 1089447 + patch
Control: tags 1089447 + pending


Dear maintainer,

I've prepared an NMU for swish-e (versioned as 2.4.7-6.3) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru swish-e-2.4.7/debian/changelog swish-e-2.4.7/debian/changelog
--- swish-e-2.4.7/debian/changelog      2023-08-15 19:36:06.000000000 +0000
+++ swish-e-2.4.7/debian/changelog      2025-01-01 11:50:35.000000000 +0000
@@ -1,3 +1,11 @@
+swish-e (2.4.7-6.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Remove need for root when building the package.
+    (Closes: #1089447)
+
+ -- Niels Thykier <ni...@thykier.net>  Wed, 01 Jan 2025 11:50:35 +0000
+
 swish-e (2.4.7-6.2) unstable; urgency=medium
    * Non-maintainer upload.
diff -Nru swish-e-2.4.7/debian/control swish-e-2.4.7/debian/control
--- swish-e-2.4.7/debian/control        2023-08-15 19:36:06.000000000 +0000
+++ swish-e-2.4.7/debian/control        2025-01-01 11:49:48.000000000 +0000
@@ -2,6 +2,7 @@
 Section: web
 Priority: optional
 Maintainer: Ludovic Drolez <ldro...@debian.org>
+Rules-Requires-Root: no
 Standards-Version: 4.1.1

 diff -Nru swish-e-2.4.7/debian/rules swish-e-2.4.7/debian/rules
--- swish-e-2.4.7/debian/rules  2023-08-15 19:36:06.000000000 +0000
+++ swish-e-2.4.7/debian/rules  2025-01-01 11:50:35.000000000 +0000
@@ -56,6 +56,7 @@
        sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`
        # perl
        (cd perl;$(MAKE) install DESTDIR=$(DEST))
+       chmod u+rwX -R $(DEST)
        # docs

        dh_installman
@@ -66,9 +67,10 @@
        (cd $(DEST)/usr/share/man/man1; ln -s swish-e.1 swish-search.1) 
        # let's make lintian happy
        mv $(DEST)/usr/bin/swish-filter-test $(DOCDIR)/examples/
-       find $(DOCDIR)/examples -name '*' -exec chmod 644 {} \;
-       find $(DOCDIR)/examples -name '*.in' -exec rm {} \;
-       find $(DEST)/usr/lib/swish-e/perl -name '*.pm' -exec chmod 644 {} \;
+       find $(DOCDIR)/examples -name '*' -type d -exec chmod 755 {} +
+       find $(DOCDIR)/examples -name '*' -type f -exec chmod 644 {} +
+       find $(DOCDIR)/examples -name '*.in' -exec rm {} +
+       find $(DEST)/usr/lib/swish-e/perl -name '*.pm' -exec chmod 644 {} +
        cp -f debian/swish_filter.pl $(DOCDIR)/examples/filter-bin/
        chmod 755 $(DOCDIR)/examples/filter-bin/*.pl
        chmod 755 $(DOCDIR)/examples/filter-bin/*.sh
@@ -88,7 +90,7 @@
        dh_installdeb
        dh_perl
        dh_shlibdeps -l$(DEST)/usr/lib/
-       dh_gencontrol -a
+       dh_gencontrol
        dh_md5sums
        dh_builddeb

Build-Depends: debhelper (>= 5), zlib1g-dev, perl, libxml2-dev (>= 2.4.3), sharutils, autotools-dev (cd example;pod2man -s 7 swish.cgi >../swish.cgi.7 ;pod2man -s 7 search.cgi >../search.cgi.7)

OpenPGP_signature.asc
Description: OpenPGP digital signature