Control: tags -1 + patch
Hello pollux
As promised in my last mail, here is a patch for apache 2.4.
diff -u ocsinventory-server-2.0.5/debian/changelog ocsinventory-server-2.0.5/debian/changelog
--- ocsinventory-server-2.0.5/debian/changelog
+++ ocsinventory-server-2.0.5/debian/changelog
@@ -1,3 +1,27 @@
+ocsinventory-server (2.0.5-1.2) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Add support for apache2.4: (Closes: #718475)
+- debian/conf/ocsinventory.conf: Minimal patch for require directive.
+- debian/rules: Add dh_apache2.
+- renamed files in debian/conf/ to match package names.
+- debian/control: Add build-depends on dh-apache2|apache2-dev, drop hard
+ depends on apache2 for recommends on ${misc:Recommends}.
+- debian/*apache2: New files to setup conf snipet in apache.
+- (pre|post)(inst|rm):
+ . Uses apache2-maintscript-helper to enable modules
+ . Remove apache conf files setup, let dh_apache2 do it.
+ . Delete obsolete links in /etc/apache2/conf.d/.
+ . Detect user change in non-conffile /etc/ocsinventory/ocsinventory.conf
+and delete it or move it to new location in
+/etc/apache2/conf-available. Fix common incompatible change in require
+directive syntax.
+- New ocsinventory-reports.maintscript for moving the other real conffile.
+ * Refreshed patch 01-compat_with_other_agents.patch, create missing series
+quilt file.
+
+ -- Jean-Michel Nirgal Vourgère jmv_...@nirgal.com Sun, 09 Nov 2014 17:42:58 +0100
+
ocsinventory-server (2.0.5-1.1) unstable; urgency=low
* Non-maintainer upload.
reverted:
--- ocsinventory-server-2.0.5/debian/conf/ocsinventory.conf
+++ ocsinventory-server-2.0.5.orig/debian/conf/ocsinventory.conf
@@ -1,306 +0,0 @@
-
-#
-# OCS Inventory NG Communication Server Perl Module Setup
-#
-# Copyleft 2006 Pascal DANEK
-# Web: http://www.ocsinventory-ng.org
-#
-# This code is open source and may be copied and modified as long as the source
-# code is always made freely available.
-# Please refer to the General Public Licence http://www.gnu.org/ or Licence.txt
-
-
-IfModule mod_perl.c
-
- # Which version of mod_perl we are using
- # For mod_perl = 1.999_21, replace VERSION_MP by 1
- # For mod_perl 1.999_21, replace VERSION_MP by 2
- PerlSetEnv OCS_MODPERL_VERSION 2
-
- # Master Database settings
- # Replace DATABASE_SERVER by hostname or ip of MySQL server for WRITE
- PerlSetEnv OCS_DB_HOST localhost
- # Replace DATABASE_PORT by port where running MySQL server, generally 3306
- PerlSetEnv OCS_DB_PORT 3306
- # Name of database
- PerlSetEnv OCS_DB_NAME ocsweb
- PerlSetEnv OCS_DB_LOCAL ocsweb
- # User allowed to connect to database
- PerlSetEnv OCS_DB_USER ocs
- # Password for user
- PerlSetVar OCS_DB_PWD ocs
-
- #Â Slave Database settings
- # Replace DATABASE_SERVER by hostname or ip of MySQL server for READ
- # Useful if you handle mysql slave databases
- # PerlSetEnv OCS_DB_SL_HOST DATABASE_SERVER
- # Replace DATABASE_PORT by port where running MySQL server, generally 3306
- # PerlSetEnv OCS_DB_SL_PORT_SLAVE DATABASE_PORT
- # User allowed to connect to database
- # PerlSetEnv OCS_DB_SL_USER ocs
- # Name of the database
- # PerlSetEnv OCS_DB_SL_NAME ocsweb
- # Password for user
- # PerlSetVar OCS_DB_SL_PWD ocs
-
- # Path to log directory (must be writeable)
- PerlSetEnv OCS_OPT_LOGPATH /var/log/ocsinventory-server/
-
- # If you need to specify a mysql socket that the client's built-in
- #PerlSetEnv OCS_OPT_DBI_MYSQL_SOCKET path/to/mysql/unix/socket
- # DBI verbosity
- PerlSetEnv OCS_OPT_DBI_PRINT_ERROR 0
-
- # Unicode support
- PerlSetEnv OCS_OPT_UNICODE_SUPPORT 1
-
- # If you are using a multi server architecture,
- # Put the ip addresses of the slaves on the master
- # (This is read as perl regular expressions)
- PerlAddVar OCS_OPT_TRUSTED_IP 127.0.0.1
- #PerlAddVar OCS_OPT_TRUSTED_IP XXX.XXX.XXX.XXX
-
-# = WEB SERVICE (SOAP) SETTINGS =
-
- PerlSetEnv OCS_OPT_WEB_SERVICE_ENABLED 0
- PerlSetEnv OCS_OPT_WEB_SERVICE_RESULTS_LIMIT 100
- # PerlSetEnv OCS_OPT_WEB_SERVICE_PRIV_MODS_CONF WEBSERV_PRIV_MOD_CONF_FILE
-
-# Be careful: you must restart apache to make settings taking effects
-
- # Configure engine to use the settings from this file
- PerlSetEnv OCS_OPT_OPTIONS_NOT_OVERLOADED 0
-
- # Try to use other compress algorythm than raw zlib
- # GUNZIP and clear XML are supported
- PerlSetEnv OCS_OPT_COMPRESS_TRY_OTHERS 1
-
-##
-# = OPTIONS BELOW ARE OVERLOADED IF YOU USE OCS GUI =#
-##
-
-# NOTE: IF YOU WANT TO USE THIS CONFIG FILE INSTEAD, set OCS_OPT_OPTIONS_NOT_OVERLOADED to '1'
-
-# = MAIN SETTINGS =
-
- # Enable engine
