Hi

Running additionnal tests, I discovered the previous nmu was flawed.

FastCGIExternalServer requires the full docroot path /var/www/html/.

Attached is the revised nmu, that fixes that.

I just uploaded it to delayed/6, where the old one was.

Regards

-- 
Nirgal
diff -Nru openjpeg-1.5.2/debian/changelog openjpeg-1.5.2/debian/changelog
--- openjpeg-1.5.2/debian/changelog	2014-10-04 13:51:33.000000000 +0200
+++ openjpeg-1.5.2/debian/changelog	2015-05-22 00:36:58.000000000 +0200
@@ -1,3 +1,22 @@
+openjpeg (1:1.5.2-3.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Apache 2.4 transition: (Closes: #786332)
+    - d/openjpip.conf: Changed documentroot path to /var/www/html;
+      changed localhost by 127.0.0.1 to support ipv6 enabled hosts.
+    - Use dh_apache2:
+      . d/rules: Added --with apache2.
+      . d/openjpip-server.install: Drop installs to /etc/apache2/mods-available
+      . Drop d/openjpip-server.prerm.
+      . d/control: Add build-depends on dh-apache2, replace depends on
+        apache2.2-bin by ${misc:Recommends}, add recommends on
+        libapache2-mod-fastcgi.
+      . New d/openjpip-server.apache2 to set up the configuration.
+      . Install as a conf-available: Renamed openjpip.conf to
+        openjpip-server.conf, removed openjpip.load, new maintscript.
+
+ -- Jean-Michel Vourgère <nir...@debian.org>  Wed, 20 May 2015 21:52:22 +0200
+
 openjpeg (1:1.5.2-3) unstable; urgency=medium
 
   * epoch upload to resolve #760874 completely
diff -Nru openjpeg-1.5.2/debian/control openjpeg-1.5.2/debian/control
--- openjpeg-1.5.2/debian/control	2014-04-01 12:39:01.000000000 +0200
+++ openjpeg-1.5.2/debian/control	2015-05-20 22:46:15.000000000 +0200
@@ -8,6 +8,7 @@
 Homepage: http://www.openjpeg.org
 Build-Depends:
  debhelper (>= 9)
+ , dh-apache2
  , cmake (>= 2.8.0)
  , javahelper (>= 0.37~)
  , default-jdk
@@ -120,7 +121,8 @@
 Section: graphics
 Architecture: any
 Multi-Arch: foreign
-Depends: ${shlibs:Depends}, ${misc:Depends}, libwww-perl, apache2.2-bin, spawn-fcgi (>= 1.6.1)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libwww-perl, spawn-fcgi (>= 1.6.1)
+Recommends: ${misc:Recommends}, libapache2-mod-fastcgi
 Description: JPIP server for JPEG 2000 files
  OpenJPIP software is an implementation of JPEG 2000 Part9: Interactivity tools,
  APIs and protocols (JPIP). For more info about JPIP, check the website:
diff -Nru openjpeg-1.5.2/debian/openjpip.conf openjpeg-1.5.2/debian/openjpip.conf
--- openjpeg-1.5.2/debian/openjpip.conf	2014-04-01 12:39:01.000000000 +0200
+++ openjpeg-1.5.2/debian/openjpip.conf	1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-# This is the config file for openjpip-server
-<IfModule mod_fastcgi.c>
-FastCGIExternalServer /var/www/openjpip -host localhost:3000
-</IfModule>
diff -Nru openjpeg-1.5.2/debian/openjpip-server.apache2 openjpeg-1.5.2/debian/openjpip-server.apache2
--- openjpeg-1.5.2/debian/openjpip-server.apache2	1970-01-01 01:00:00.000000000 +0100
+++ openjpeg-1.5.2/debian/openjpip-server.apache2	2015-05-20 22:25:39.000000000 +0200
@@ -0,0 +1 @@
+conf  debian/openjpip-server.conf
diff -Nru openjpeg-1.5.2/debian/openjpip-server.conf openjpeg-1.5.2/debian/openjpip-server.conf
--- openjpeg-1.5.2/debian/openjpip-server.conf	1970-01-01 01:00:00.000000000 +0100
+++ openjpeg-1.5.2/debian/openjpip-server.conf	2015-05-22 00:34:55.000000000 +0200
@@ -0,0 +1,4 @@
+# This is the config file for openjpip-server
+<IfModule mod_fastcgi.c>
+FastCGIExternalServer /var/www/html/openjpip -host 127.0.0.1:3000
+</IfModule>
diff -Nru openjpeg-1.5.2/debian/openjpip-server.install openjpeg-1.5.2/debian/openjpip-server.install
--- openjpeg-1.5.2/debian/openjpip-server.install	2014-04-01 12:39:01.000000000 +0200
+++ openjpeg-1.5.2/debian/openjpip-server.install	2015-05-20 22:01:41.000000000 +0200
@@ -1,3 +1 @@
 usr/bin/opj_server usr/lib/openjpip-server
-debian/openjpip.load /etc/apache2/mods-available
-debian/openjpip.conf /etc/apache2/mods-available
diff -Nru openjpeg-1.5.2/debian/openjpip-server.maintscript openjpeg-1.5.2/debian/openjpip-server.maintscript
--- openjpeg-1.5.2/debian/openjpip-server.maintscript	1970-01-01 01:00:00.000000000 +0100
+++ openjpeg-1.5.2/debian/openjpip-server.maintscript	2015-05-20 22:21:44.000000000 +0200
@@ -0,0 +1,2 @@
+mv_conffile /etc/apache2/mods-available/openjpip.conf /etc/apache2/conf-available/openjpip-server.conf 1:1.5.2-3.1~
+rm_conffile /etc/apache2/mods-available/openjpip.load 1:1.5.2-3.1~
diff -Nru openjpeg-1.5.2/debian/openjpip-server.prerm openjpeg-1.5.2/debian/openjpip-server.prerm
--- openjpeg-1.5.2/debian/openjpip-server.prerm	2014-04-01 12:39:01.000000000 +0200
+++ openjpeg-1.5.2/debian/openjpip-server.prerm	1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -e
-
-#DEBHELPER#
-
-if [ "$1" != "remove" -a "$1" != "purge" ]; then
-	exit 0
-fi
-
-if [ -e /etc/apache2/apache2.conf ]; then
-	a2dismod openjpip || true
-fi
-
-exit 0
diff -Nru openjpeg-1.5.2/debian/rules openjpeg-1.5.2/debian/rules
--- openjpeg-1.5.2/debian/rules	2014-04-01 13:58:17.000000000 +0200
+++ openjpeg-1.5.2/debian/rules	2015-05-20 22:26:31.000000000 +0200
@@ -9,7 +9,7 @@
 JAVA_HOME=/usr/lib/jvm/default-java
 
 %:
-	dh $@ --buildsystem=cmake --parallel --with javahelper
+	dh $@ --buildsystem=cmake --parallel --with javahelper,apache2
 
 CMAKE_EXTRA_FLAGS += -DCMAKE_SKIP_RPATH=ON \
 	-DCMAKE_BUILD_TYPE:STRING=None \

Reply via email to