Control: tags -1 + patch Hello
Attached is a patch for your package. A web application that doesn't work with the web server really is an important bug that should be fixed. Enjoy -- Nirgal
commit 26fa59b4796f32dc0ceeb13242ac3e02ed0a41a4
Author: Jean-Michel Nirgal Vourgère <jmv_...@nirgal.com>
Date: Mon Dec 1 01:33:12 2014 +0100
Apache2.4 transition
* Move conffile etc/simpleid/apache.conf to etc/apache2/conf-available/simpleid.conf
- New simpleid.maintscript with mv_conffile command.
- Add Pre-Depends: dpkg (>= 1.15.7.2).
- Remove link to apache.conf from d/simpleid.links.
- Change patched filename in d/rules.
* Let dh_apache2 handle the script activation:
- New d/simpleid.apache2.
- New Build-Depends on dh-apache2|apache2-dev.
- Change Depends: apache2|lighttpd|httpd to Recommends: ${misc:Recommends}
- Add dh_apache2 to d/rules.
- Don't install debian/conf/apache.conf in d/simpleid.install, rename it to d/conf/simpleid.conf, let dh_apache2 make the copy.
diff --git a/debian/conf/apache.conf b/debian/conf/apache.conf
deleted file mode 100644
index 1395e2a..0000000
--- a/debian/conf/apache.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-
-Alias /simpleid /usr/share/simpleid/www
-
diff --git a/debian/control b/debian/control
index cb66f1d..c771515 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: web
Priority: extra
Maintainer: Debian Authentication Maintainers <pkg-auth-maintain...@lists.alioth.debian.org>
Uploaders: Daniel Pocock <dan...@pocock.com.au>
-Build-Depends: debhelper (>= 8), cdbs (>= 0.4.89)
+Build-Depends: debhelper (>= 8), cdbs (>= 0.4.89), dh-apache2 | apache2-dev
Standards-Version: 3.9.3
Homepage: http://www.simpleid.org/
Vcs-Git: git://git.debian.org/pkg-auth/simpleid.git
@@ -11,9 +11,11 @@ Vcs-Browser: http://git.debian.org/?p=pkg-auth/simpleid.git;a=summary
Package: simpleid
Architecture: all
-Depends: debconf | debconf-2.0, apache2 | lighttpd | httpd,
+Pre-Depends: dpkg (>= 1.15.7.2)
+Depends: debconf | debconf-2.0,
libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5,
libjs-jquery, ${misc:Depends}
+Recommends: ${misc:Recommends}
Description: simple OpenID provider implemented in PHP
SimpleID is a simple, personal OpenID provider written in PHP. OpenID
is a way to provide for a single digital identity across the Internet.
diff --git a/debian/rules b/debian/rules
index f51f284..6fe135f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
DEB_INSTALL_CHANGELOGS_ALL = CHANGELOG.txt
-SIMPLEID_WEB_CONF = etc/simpleid/apache.conf
+SIMPLEID_WEB_CONF = etc/apache2/conf-available/simpleid.conf
binary-install/simpleid::
echo -n "<?php define('SIMPLEID_VERSION', '"$(DEB_VERSION)"'); ?>" > debian/simpleid/usr/share/simpleid/www/version.inc.php
@@ -14,6 +14,7 @@ binary-fixup/simpleid::
chmod 0750 debian/simpleid/var/lib/simpleid/identities
chown www-data.www-data debian/simpleid/var/lib/simpleid/cache debian/simpleid/var/lib/simpleid/store
chmod 0770 debian/simpleid/var/lib/simpleid/cache debian/simpleid/var/lib/simpleid/store
+ dh_apache2
echo '<Directory "/usr/share/simpleid/www">' >> debian/simpleid/$(SIMPLEID_WEB_CONF)
cat www/.htaccess.dist >> debian/simpleid/$(SIMPLEID_WEB_CONF)
echo '</Directory>' >> debian/simpleid/$(SIMPLEID_WEB_CONF)
diff --git a/debian/simpleid.apache2 b/debian/simpleid.apache2
new file mode 100644
index 0000000..9e2ae82
--- /dev/null
+++ b/debian/simpleid.apache2
@@ -0,0 +1 @@
+conf debian/conf/simpleid.conf lighttpd
diff --git a/debian/simpleid.install b/debian/simpleid.install
index f663813..beeae9a 100644
--- a/debian/simpleid.install
+++ b/debian/simpleid.install
@@ -1,3 +1,3 @@
identities/example.identity.dist usr/share/simpleid/sample
www usr/share/simpleid
-debian/conf/* etc/simpleid
+debian/conf/config.inc etc/simpleid
diff --git a/debian/simpleid.links b/debian/simpleid.links
index 618b4f2..d655ab0 100644
--- a/debian/simpleid.links
+++ b/debian/simpleid.links
@@ -1,3 +1,2 @@
etc/simpleid/config.inc usr/share/simpleid/www/config.inc
-etc/simpleid/apache.conf etc/apache2/conf.d/simpleid.conf
usr/share/javascript/jquery/jquery.min.js usr/share/simpleid/www/html/jquery.js
diff --git a/debian/simpleid.maintscript b/debian/simpleid.maintscript
new file mode 100644
index 0000000..ac06f46
--- /dev/null
+++ b/debian/simpleid.maintscript
@@ -0,0 +1 @@
+mv_conffile /etc/simpleid/apache.conf /etc/apache2/conf-available/simpleid.conf 0.8.3-1~
signature.asc
Description: OpenPGP digital signature
