Control: tags -1 + patch
Hello
Attached is a patch for apache new version.
If you are not available, an NMU to sponsor is available at
https://mentors.debian.net/package/phppgadmin
diff -Nru phppgadmin-5.1/debian/changelog phppgadmin-5.1/debian/changelog
--- phppgadmin-5.1/debian/changelog 2013-04-18 10:37:03.000000000 +0000
+++ phppgadmin-5.1/debian/changelog 2013-07-22 14:14:45.000000000 +0000
@@ -1,3 +1,20 @@
+phppgadmin (5.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Changes for apache2.4 settings (Closes: #669837)
+ . Upgrade phppgadmin.conf restriction to localhost to 2.4 format.
+ . Update rules:
+ Use "--with apache2" in rules.
+ No longer copying apache.conf, dh_apache2 does that.
+ . Rename apache.conf into phppgadmin.conf.
+ . Drop /etc/apache2/conf.d from dirs.
+ . Remove manual reload of apache in maintainer scripts, dh_apache2 does it
+ automatically.
+ . Build-depends on dh-apache2.
+ . Use {$misc:Suggests} so apache2 is no longer a direct Depends.
+
+ -- Jean-Michel Vourgère <[email protected]> Mon, 22 Jul 2013 13:01:15 +0000
+
phppgadmin (5.1-1) unstable; urgency=low
* New upstream release.
diff -Nru phppgadmin-5.1/debian/control phppgadmin-5.1/debian/control
--- phppgadmin-5.1/debian/control 2013-04-18 09:39:06.000000000 +0000
+++ phppgadmin-5.1/debian/control 2013-07-22 13:41:45.000000000 +0000
@@ -3,7 +3,7 @@
Uploaders: Peter Eisentraut <[email protected]>
Section: web
Priority: extra
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 7.0.50~), dh-apache2
Standards-Version: 3.9.3
Homepage: http://phppgadmin.sourceforge.net/
Vcs-Git: git://anonscm.debian.org/pkg-postgresql/phppgadmin.git
@@ -11,9 +11,9 @@
Package: phppgadmin
Architecture: all
-Depends: ${misc:Depends}, libapache2-mod-php5 | php5-cgi, php5-pgsql, apache2 | httpd,
+Depends: ${misc:Depends}, libapache2-mod-php5 | php5-cgi, php5-pgsql,
libjs-jquery
-Recommends: postgresql-doc
+Recommends: ${misc:Recommends}, postgresql-doc
Suggests: postgresql, slony1-bin
Description: web-based administration tool for PostgreSQL
phpPgAdmin is a web-based administration tool for PostgreSQL. It is perfect
diff -Nru phppgadmin-5.1/debian/dirs phppgadmin-5.1/debian/dirs
--- phppgadmin-5.1/debian/dirs 2013-04-18 09:39:06.000000000 +0000
+++ phppgadmin-5.1/debian/dirs 2013-07-22 13:12:28.000000000 +0000
@@ -1,4 +1,3 @@
usr/share/phppgadmin
usr/share/phppgadmin/conf
etc/phppgadmin
-etc/apache2/conf.d
diff -Nru phppgadmin-5.1/debian/phppgadmin.apache2 phppgadmin-5.1/debian/phppgadmin.apache2
--- phppgadmin-5.1/debian/phppgadmin.apache2 1970-01-01 00:00:00.000000000 +0000
+++ phppgadmin-5.1/debian/phppgadmin.apache2 2013-07-22 13:05:46.000000000 +0000
@@ -0,0 +1 @@
+conf debian/phppgadmin.conf
diff -Nru phppgadmin-5.1/debian/phppgadmin.conf phppgadmin-5.1/debian/phppgadmin.conf
--- phppgadmin-5.1/debian/phppgadmin.conf 1970-01-01 00:00:00.000000000 +0000
+++ phppgadmin-5.1/debian/phppgadmin.conf 2013-07-22 13:26:52.000000000 +0000
@@ -0,0 +1,29 @@
+Alias /phppgadmin /usr/share/phppgadmin
+
+<Directory /usr/share/phppgadmin>
+
+DirectoryIndex index.php
+AllowOverride None
+
+# Only allow connections from localhost:
+Require local
+
+<IfModule mod_php5.c>
+ php_flag magic_quotes_gpc Off
+ php_flag track_vars On
+ #php_value include_path .
+</IfModule>
+<IfModule !mod_php5.c>
+ <IfModule mod_actions.c>
+ <IfModule mod_cgi.c>
+ AddType application/x-httpd-php .php
+ Action application/x-httpd-php /cgi-bin/php
+ </IfModule>
+ <IfModule mod_cgid.c>
+ AddType application/x-httpd-php .php
+ Action application/x-httpd-php /cgi-bin/php
+ </IfModule>
+ </IfModule>
+</IfModule>
+
+</Directory>
diff -Nru phppgadmin-5.1/debian/phppgadmin.postinst phppgadmin-5.1/debian/phppgadmin.postinst
--- phppgadmin-5.1/debian/phppgadmin.postinst 2013-04-18 09:39:06.000000000 +0000
+++ phppgadmin-5.1/debian/phppgadmin.postinst 2013-07-22 13:18:42.000000000 +0000
@@ -2,10 +2,6 @@
set -e
-if [ "$1" = configure ]; then
- test ! -e /etc/init.d/apache2 || invoke-rc.d apache2 reload
-fi
-
# conffile converted from symlink to plain file in 5.0.3-2
if test -x /usr/bin/dpkg-maintscript-helper && dpkg-maintscript-helper supports mv_conffile 2>/dev/null ; then
dpkg-maintscript-helper mv_conffile /etc/phppgadmin/apache.conf /etc/apache2/conf.d/phppgadmin 5.0.3-1 -- "$@"
diff -Nru phppgadmin-5.1/debian/rules phppgadmin-5.1/debian/rules
--- phppgadmin-5.1/debian/rules 2013-04-18 09:52:59.000000000 +0000
+++ phppgadmin-5.1/debian/rules 2013-07-22 13:57:52.000000000 +0000
@@ -20,8 +20,7 @@
dh_link
install: build
- dh $@
- cp debian/apache.conf debian/phppgadmin/etc/apache2/conf.d/phppgadmin
+ dh $@ --with apache2
rm debian/phppgadmin/usr/share/phppgadmin/libraries/adodb/*.txt
rm debian/phppgadmin/usr/share/phppgadmin/lang/langcheck
rm debian/phppgadmin/usr/share/phppgadmin/lang/synch
@@ -29,6 +28,6 @@
binary-arch:
binary binary-indep: install
- dh $@
+ dh $@ --with apache2
.PHONY: build build-indep install clean binary binary-indep
