[Pkg-sql-ledger-commit] r719 - in ledger-smb/trunk/debian: . adm adm/sql patches
pkg-sql-ledger-commit-owner at lists.alioth.debian.org
pkg-sql-ledger-commit-owner at lists.alioth.debian.org
Sun May 3 15:32:48 UTC 2015
Author: jame-guest
Date: 2015-05-03 15:32:48 +0000 (Sun, 03 May 2015)
New Revision: 719
Added:
ledger-smb/trunk/debian/adm/config-lsmb-db-user.sh
ledger-smb/trunk/debian/ledgersmb.prerm
Removed:
ledger-smb/trunk/debian/adm/sql/pgsql
Modified:
ledger-smb/trunk/debian/NEWS
ledger-smb/trunk/debian/README.Debian
ledger-smb/trunk/debian/TODO
ledger-smb/trunk/debian/changelog
ledger-smb/trunk/debian/control
ledger-smb/trunk/debian/ledgersmb.config
ledger-smb/trunk/debian/ledgersmb.install
ledger-smb/trunk/debian/ledgersmb.lintian-overrides
ledger-smb/trunk/debian/ledgersmb.postinst
ledger-smb/trunk/debian/ledgersmb.postrm
ledger-smb/trunk/debian/ledgersmb.preinst
ledger-smb/trunk/debian/patches/05_confdir.patch
Log:
Released LedgerSMB Package v1.3.46-1.
Modified: ledger-smb/trunk/debian/NEWS
===================================================================
--- ledger-smb/trunk/debian/NEWS 2014-12-17 18:02:17 UTC (rev 718)
+++ ledger-smb/trunk/debian/NEWS 2015-05-03 15:32:48 UTC (rev 719)
@@ -1,16 +1,15 @@
ledgersmb (1.3.46-1) unstable; urgency=medium
- Language specific HTML, LaTeX, and Text templates can be edited online but
- the language specific directory (like /var/ledgersmb/templates/demo/en_US)
- first needs to be manually created and the template file copied there.
+ The default for the experimental dbconfig/debconf for configuring LedgerSMB
+ during the package installation is to not use it; instead, the LedgerSMB
+ database super-user can be manually created and that can then be used on the
+ setup page at http://localhost/ledgersmb/setup.pl to create the company
+ databases for use. See README.Debian for further information.
- An experimental dbconfig/debconf for configuring LedgerSMB during the package
- installation is available. Because it is experimental, the default is to not
- use it; instead what can be done is to manually create the ledgersmb database
- user and use that on the http://localhost/ledgersmb/setup.pl page to create
- the company databases for use. More information regarding this is available
- in /usr/share/doc/ledgersmb/README.Debian.
+ The default for the contrib_dir directive in /etc/ledgersmb/ledgersmb.conf is
+ now for PostgreSQL v9.4. The setting will need to be verified to be correct
+ for the actual installed version of PostgreSQL before using LedgerSMB.
- -- Robert James Clay <jame at rocasa.us> Wed, 5 Nov 2014 07:19:55 -0400
+ -- Robert James Clay <jame at rocasa.us> Sun, 12 Apr 2015 12:52:15 -0400
Modified: ledger-smb/trunk/debian/README.Debian
===================================================================
--- ledger-smb/trunk/debian/README.Debian 2014-12-17 18:02:17 UTC (rev 718)
+++ ledger-smb/trunk/debian/README.Debian 2015-05-03 15:32:48 UTC (rev 719)
@@ -31,7 +31,8 @@
Besides assuming that a database superuser is known, the setup.pl script
also assumes that the contrib_dir directive is already set correctly in
/etc/ledgersmb/ledgersmb.conf for the location of the PostgreSQL contrib
- scripts. For v9.1 it would be /usr/share/postresql/9.1/extension.
+ scripts. For v9.4 it would be /usr/share/postresql/9.4/extension and for
+ v9.1 it would be /usr/share/postresql/9.1/extension.
Configuration files for Apache 2.2 or 2.4 are installed as necessary, with
an example Apache fastcgi configuration available at lsmb_13-fcgi.conf in
@@ -43,6 +44,10 @@
files are installed there from the example files during an package install.
There is also a URL related configuration item in ledgersmb.conf, cssdir.
+ Language specific HTML, LaTeX, and Text templates can be edited online but
+ the language specific directory (like /var/ledgersmb/templates/demo/en_US)
+ first needs to be manually created and the template file copied there.
+
The PDF/Postscript support for the 'xedemo' LaTex templates is available as
the package texlive-xetex if it is not already installed.
@@ -95,4 +100,4 @@
- -- Robert James Clay <jame at rocasa.us> Thu, 11 Dec 2014 04:18:28 -0400
+ -- Robert James Clay <jame at rocasa.us> Sun, 12 Apr 2015 12:07:18 -0400
Modified: ledger-smb/trunk/debian/TODO
===================================================================
--- ledger-smb/trunk/debian/TODO 2014-12-17 18:02:17 UTC (rev 718)
+++ ledger-smb/trunk/debian/TODO 2015-05-03 15:32:48 UTC (rev 719)
@@ -1,25 +1,12 @@
debian/TODO for LedgerSMB v1.3
+- If an 'apache2_invoke enmod' for the rewrite module is added to the
+postinst section for apache 2.4; the restart of apache done for that
+just hangs. An apache reload done for 'apache2_invoke enconf' of the
+2.4 apache configuration for ledgersmb.conf does seem to complete,
+though shouldn't just do one or the other, with the restart overriding
+the reload?
-====================================================================================================
-
------------------------------------------------------------------------------------
-
-- An Ubuntu bug was submitted about setup.pl not working after selecting
-an automatic config during the install and setting a password:
-https://bugs.launchpad.net/bugs/1078817
-- Created a Debian bug for the same issue, # 698298, & pointed the ubuntu bug
-to that. Assigned the ubuntu bug to the Ubuntu LSMB team.
-- The dbconfig-common based database configuration that is being used during
-installations and upgrades needs to be reviewed and improved. It is capable
-of creating the 'ledgersmb' database administrative user but it is not getting
-created with the necessary permissions. It is also apparently automatically
-creating a database named ledgersmb with the current way that user is being
-created, which is not really needed for the application.
-- Investigate dropping the use of dbcommon-config altogether. Debconf already
-gets the necessary admin user and password; only need that in perhaps one
-liners that creates the user as neccessary and sets the password.
-
- A debian/po debconf Japanese translation has been provided. Currently,
there is no LSMB locale/po/ja.po file. Checked System|Lanaguage|List
Languages in LSMB 1.3.40: "ja" is not in the default list. It's also not
@@ -35,7 +22,7 @@
then register it with doc-base?
- Now that versions of v1.4 are available; create a new package ledgersmb-1.3,
-for any needed support for v1.3.x versions of LedgerSMB.
+for any needed further support for v1.3.x versions of LedgerSMB.
- Instead of a sym link to point to the /etc/ledgersmb config file(s),
patch config file to add '/etc/' to the config file setting. (Would
@@ -43,4 +30,4 @@
- -- Robert James Clay <jame at rocasa.us> Thu, 11 Dec 2014 02:33 -0500
+ -- Robert James Clay <jame at rocasa.us> Wed, 29 Apr 2015 01:00 -0400
Added: ledger-smb/trunk/debian/adm/config-lsmb-db-user.sh
===================================================================
--- ledger-smb/trunk/debian/adm/config-lsmb-db-user.sh (rev 0)
+++ ledger-smb/trunk/debian/adm/config-lsmb-db-user.sh 2015-05-03 15:32:48 UTC (rev 719)
@@ -0,0 +1,40 @@
+#!/bin/bash
+# Configure the LedgerSMB database administrator user
+#
+# Copyright (C) 2015 Robert James Clay <jame at rocasa.us>
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+
+# First parameter is the user name
+LSMBDBUSER=$1
+# Second parameter is the password
+LSMBDBPW=$2
+
+su - postgres -c psql <<EOT
+DO
+\$\$
+DECLARE num_users integer;
+BEGIN
+ SELECT count(*)
+ into num_users
+ FROM pg_user
+ WHERE usename = '$LSMBDBUSER';
+
+ IF num_users = 0 THEN
+ CREATE ROLE $LSMBDBUSER WITH SUPERUSER LOGIN NOINHERIT ENCRYPTED PASSWORD '$LSMBDBPW';
+ ELSE
+ ALTER ROLE $LSMBDBUSER WITH SUPERUSER LOGIN NOINHERIT ENCRYPTED PASSWORD '$LSMBDBPW';
+ END IF;
+END
+\$\$
+;
+EOT
Property changes on: ledger-smb/trunk/debian/adm/config-lsmb-db-user.sh
___________________________________________________________________
Added: svn:executable
+ *
Deleted: ledger-smb/trunk/debian/adm/sql/pgsql
===================================================================
--- ledger-smb/trunk/debian/adm/sql/pgsql 2014-12-17 18:02:17 UTC (rev 718)
+++ ledger-smb/trunk/debian/adm/sql/pgsql 2015-05-03 15:32:48 UTC (rev 719)
@@ -1,2 +0,0 @@
-# Configure ledgersmb user permissions
-ALTER ROLE ledgersmb WITH SUPERUSER LOGIN NOINHERIT;
Modified: ledger-smb/trunk/debian/changelog
===================================================================
--- ledger-smb/trunk/debian/changelog 2014-12-17 18:02:17 UTC (rev 718)
+++ ledger-smb/trunk/debian/changelog 2015-05-03 15:32:48 UTC (rev 719)
@@ -2,22 +2,31 @@
* New upstream release. (Closes: #771822)
- Fixes 'Duplicate message' errors in locale/po/hu.po. (Closes: #752063)
- * Add texlive-xetex as a 'Suggests' in debian/control.
* Add new Dutch debconf translation. (Closes: #767242)
- * Minor updates and corrections to debian/README.Debian.
- * Add libjs-prototype & libjs-scriptaculous to Build-Depends.
+ * Changes to debian/README.Debian:
+ - Add a note regarding the texlive-xetex package.
+ - Update note regarding the contrib_dir directive.
+ - Add a note about the usage of the template files.
* Correct a copyright email address in the debian/copyright file.
* Set permissions on ledgersmb/bin/gl.pl correctly in debian/rules.
- * Add a note regarding texlive-xetex to the debian/README.Debian file.
- * Set Standards-Version to 3.9.6 in debian/control, no changes required.
- * The contrib_dir setting in 05_confdir.patch is only needed for Pg v9.1.
+ * Change how the LedgerSMB Database administrative user related processing is
+ being done, including dropping the use of dbconfig-common for the database
+ related processing. (Closes: #698298, #758140, LP#1078817)
+ * Update how the Apache related processing is done in the maintainer scripts.
+ * Set default for contrib_dir in 05_confdir.patch to be for PostgreSQL v9.4
+ instead of PostgreSQL v9.1.
* Remove the use of drop_statoverride function from the maintainer scripts.
+ * Changes in debian/control:
+ - Add texlive-xetex package as a suggested package.
+ - Add libjs-prototype & libjs-scriptaculous to Build-Depends.
+ - Add dpkg equal to version 1.15.7.2 or above as a Pre-Depends.
+ - Set Standards-Version to 3.9.6 in debian/control, no changes required.
* Use dh-linktree for embedded libjs-prototype and libjs-libjs-scriptaculous
libraries.
* Only include the overrides for the 'custom' empty directories in the
ledgersmb.lintian-overrides.
- -- Robert James Clay <jame at rocasa.us> Wed, 17 Dec 2014 05:08:48 -0500
+ -- Robert James Clay <jame at rocasa.us> Wed, 29 Apr 2015 01:36:52 -0400
ledgersmb (1.3.40-1) unstable; urgency=medium
Modified: ledger-smb/trunk/debian/control
===================================================================
--- ledger-smb/trunk/debian/control 2014-12-17 18:02:17 UTC (rev 718)
+++ ledger-smb/trunk/debian/control 2015-05-03 15:32:48 UTC (rev 719)
@@ -16,8 +16,8 @@
Package: ledgersmb
Architecture: all
+Pre-Depends: dpkg (>= 1.15.7.2)
Depends: apache2 | httpd-cgi,
- dbconfig-common,
libcgi-simple-perl,
libconfig-any-perl,
libconfig-std-perl,
Modified: ledger-smb/trunk/debian/ledgersmb.config
===================================================================
--- ledger-smb/trunk/debian/ledgersmb.config 2014-12-17 18:02:17 UTC (rev 718)
+++ ledger-smb/trunk/debian/ledgersmb.config 2015-05-03 15:32:48 UTC (rev 719)
@@ -4,25 +4,11 @@
. /usr/share/debconf/confmodule
-# need to compare in future version
-dbc_first_version="1.3.14-2"
-
-if [ -f /usr/share/dbconfig-common/dpkg/config ]; then
- dbc_dbtypes="pgsql"
- dbc_authmethod_user="password"
-
- . /usr/share/dbconfig-common/dpkg/config
-fi
-
db_input high ledgersmb/debconf_install || true
db_go || true
db_get ledgersmb/debconf_install
if [ "$RET" = true ];then
- if [ -f /usr/share/dbconfig-common/dpkg/config ]; then
- dbc_go ledgersmb $@
- fi
-
db_input high ledgersmb/admin_login || true
db_input high ledgersmb/admin_password || true
db_go || true
Modified: ledger-smb/trunk/debian/ledgersmb.install
===================================================================
--- ledger-smb/trunk/debian/ledgersmb.install 2014-12-17 18:02:17 UTC (rev 718)
+++ ledger-smb/trunk/debian/ledgersmb.install 2015-05-03 15:32:48 UTC (rev 719)
@@ -5,8 +5,8 @@
bin/*.pl usr/share/ledgersmb/bin
blib/lib/* usr/share/ledgersmb
contrib/* usr/share/ledgersmb/contrib
-css/* /usr/share/ledgersmb/css
-debian/adm/sql/pgsql usr/share/dbconfig-common/data/ledgersmb/install-dbadmin
+css/* usr/share/ledgersmb/css
+debian/adm/config-lsmb-db-user.sh usr/share/ledgersmb/tools
drivers/* usr/share/ledgersmb/drivers
favicon.ico usr/share/ledgersmb
images/*.gif usr/share/ledgersmb/images
@@ -18,6 +18,6 @@
pos.conf.pl etc/ledgersmb
scripts/* usr/share/ledgersmb/scripts
sql/* usr/share/ledgersmb/sql
-templates/* /usr/share/ledgersmb/templates
-tools/* /usr/share/ledgersmb/tools
-utils/* /usr/share/ledgersmb/utils
+templates/* usr/share/ledgersmb/templates
+tools/* usr/share/ledgersmb/tools
+utils/* usr/share/ledgersmb/utils
Modified: ledger-smb/trunk/debian/ledgersmb.lintian-overrides
===================================================================
--- ledger-smb/trunk/debian/ledgersmb.lintian-overrides 2014-12-17 18:02:17 UTC (rev 718)
+++ ledger-smb/trunk/debian/ledgersmb.lintian-overrides 2015-05-03 15:32:48 UTC (rev 719)
@@ -1,4 +1,5 @@
# Upstream includes empty directory intentionally, as standard locations for custom scripts
ledgersmb binary: package-contains-empty-directory usr/share/ledgersmb/bin/custom/
ledgersmb binary: package-contains-empty-directory usr/share/ledgersmb/scripts/custom/
+ledgersmb binary: package-contains-empty-directory usr/share/ledgersmb/LedgerSMB/Reconciliation/CSV/Formats/
Modified: ledger-smb/trunk/debian/ledgersmb.postinst
===================================================================
--- ledger-smb/trunk/debian/ledgersmb.postinst 2014-12-17 18:02:17 UTC (rev 718)
+++ ledger-smb/trunk/debian/ledgersmb.postinst 2015-05-03 15:32:48 UTC (rev 719)
@@ -20,12 +20,11 @@
# Set old_version variable for use later in the script.
old_version=$2
-dbc_first_version="1.3.14-2"
-dbc_dbtypes="pgsql"
+# Source debconf
+if [ -f /usr/share/debconf/confmodule ]; then
+ . /usr/share/debconf/confmodule
+fi
-. /usr/share/debconf/confmodule
-. /usr/share/dbconfig-common/dpkg/postinst.pgsql
-
case "$1" in
configure)
# Only do these if this is the initial install.
@@ -40,39 +39,43 @@
cp -r /usr/share/ledgersmb/templates /var/lib/ledgersmb
chown -R www-data:www-data /var/lib/ledgersmb/templates
fi
- # Do Apache related processing if it is present.
- if [ -d "/etc/apache2" ]; then
- if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
- [ -d /etc/apache2/conf-available/ ] && [ ! -e /etc/apache2/conf-available/ledgersmb.conf ] && cp /usr/share/ledgersmb/ledgersmb-httpd-2.4.conf.template /etc/apache2/conf-available/ledgersmb.conf
- . /usr/share/apache2/apache2-maintscript-helper
- apache2_invoke enconf ledgersmb.conf
- ln -s /etc/apache2/conf-available/ledgersmb.conf /etc/ledgersmb/ledgersmb-httpd-2.4.conf
- elif dpkg-query -f '${Version}' -W 'apache2.2-common' > /dev/null 2>&1 ; then
- # if the configuration uses <IfVersion> uncomment the next line
- # a2enmod -q version
- [ -d /etc/apache2/conf.d/ ] && [ ! -l /etc/apache2/conf.d/ledgersmb.conf ] && cp /usr/share/ledgersmb/ledgersmb-httpd-2.0-2.2.conf.template /etc/apache2/conf.d/ledgersmb.conf
- ln -s /etc/apache2/conf.d/ledgersmb.conf /etc/ledgersmb/ledgersmb-httpd-2.0-2.2.conf
- # Enable Apache mod_rewrite
- if [ -x "`which a2enmod 2>/dev/null`" ]; then
- a2enmod rewrite
- fi
- # Restart apache
- if [ -x "/etc/init.d/apache2" ]; then
- invoke-rc.d apache2 restart 3>/dev/null || true
- fi
+ fi
+ # Do Apache related processing if it is present.
+ if [ -d "/etc/apache2" ]; then
+ # If the old ledgersmb-httpd.conf is present, rename it.
+ dpkg-maintscript-helper mv_conffile \
+ /etc/apache2/conf.d/ledgersmb-httpd.conf /etc/apache2/conf.d/ledgersmb.conf 1.3.46-1~ ledgersmb -- "$@"
+ if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+ [ -d /etc/apache2/conf-available/ ] && [ ! -e /etc/apache2/conf-available/ledgersmb.conf ] && cp /usr/share/ledgersmb/ledgersmb-httpd-2.4.conf.template /etc/apache2/conf-available/ledgersmb.conf
+ . /usr/share/apache2/apache2-maintscript-helper
+ apache2_invoke enconf ledgersmb.conf || exit $?
+ [ ! -h /etc/ledgersmb/ledgersmb-httpd-2.4.conf ] && ln -s /etc/apache2/conf-available/ledgersmb.conf /etc/ledgersmb/ledgersmb-httpd-2.4.conf
+ elif dpkg-query -f '${Version}' -W 'apache2.2-common' > /dev/null 2>&1 ; then
+ # if the configuration uses <IfVersion> uncomment the next line
+ # a2enmod -q version
+ [ -d /etc/apache2/conf.d/ ] && [ ! -e /etc/apache2/conf.d/ledgersmb.conf ] && cp /usr/share/ledgersmb/ledgersmb-httpd-2.0-2.2.conf.template /etc/apache2/conf.d/ledgersmb.conf
+ [ ! -h /etc/ledgersmb/ledgersmb-httpd-2.0-2.2.conf ] && ln -s /etc/apache2/conf.d/ledgersmb.conf /etc/ledgersmb/ledgersmb-httpd-2.0-2.2.conf
+ # Enable Apache mod_rewrite
+ if [ -x "`which a2enmod 2>/dev/null`" ]; then
+ a2enmod rewrite
fi
+ # Restart apache
+ if [ -x "/etc/init.d/apache2" ]; then
+ invoke-rc.d apache2 restart 3>/dev/null || true
+ fi
fi
- else
- if dpkg-maintscript-helper supports mv_conffile; then
- # If the old ledgersmb-httpd.conf is present, rename it.
- dpkg-maintscript-helper mv_conffile \
- /etc/apache2/conf.d/ledgersmb-httpd.conf /etc/apache2/conf.d/ledgersmb.conf 1.3.18-2~ ledgersmb -- "$@"
- fi
fi
# If enabled, do the debconf supported configuration
db_get ledgersmb/debconf_install
if [ "$RET" = true ]; then
- dbc_go ledgersmb $@
+ # Get user name.
+ db_get ledgersmb/admin_login
+ LSMBDBUSER=$RET
+ # Get password
+ db_get ledgersmb/admin_password
+ LSMBDBPW=$RET
+ # Configure database administrative user
+ /usr/share/ledgersmb/tools/config-lsmb-db-user.sh $LSMBDBUSER $LSMBDBPW
fi
;;
Modified: ledger-smb/trunk/debian/ledgersmb.postrm
===================================================================
--- ledger-smb/trunk/debian/ledgersmb.postrm 2014-12-17 18:02:17 UTC (rev 718)
+++ ledger-smb/trunk/debian/ledgersmb.postrm 2015-05-03 15:32:48 UTC (rev 719)
@@ -18,18 +18,13 @@
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
-if [ -f /usr/share/debconf/confmodule ]; then
- . /usr/share/debconf/confmodule
-fi
-
-if [ -f /usr/share/dbconfig-common/dpkg/postrm ]; then
- . /usr/share/dbconfig-common/dpkg/postrm
-
- dbc_go ledgersmb $@
-fi
-
case "$1" in
purge)
+ # If Apache 2.4 in use, disable use of ledgersmb.conf.
+ if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+ . /usr/share/apache2/apache2-maintscript-helper
+ apache2_invoke disconf ledgersmb.conf || exit $?
+ fi
# When being purged; if /var/lib/ledgersmb/css exists, remove it.
if [ -d "/var/lib/ledgersmb/css" ]; then
rm -rf /var/lib/ledgersmb/css
@@ -54,34 +49,23 @@
if [ -f "/etc/apache2/conf-available/ledgersmb.conf" ]; then
rm -f /etc/apache2/conf-available/ledgersmb.conf
fi
- if [ -d "/etc/apache2/conf-available/ledgersmb.conf" ]; then
- rm -rf /etc/apache2/conf-available/ledgersmb.conf
- fi
- if [ -h "/etc/ledgersmb/ledgersmb-httpd-2.0-2.2.conf" ]; then
- rm -f /etc/ledgersmb/ledgersmb-httpd-2.0-2.2.conf
- fi
- if [ -h "/etc/ledgersmb/ledgersmb-httpd-2.4.conf" ]; then
- rm -f /etc/ledgersmb/ledgersmb-httpd-2.4.conf
- fi
;;
- abort-install|abort-upgrade)
- if dpkg-maintscript-helper supports mv_conffile; then
- # If the old ledgersmb-httpd.conf was present, rename it back.
- dpkg-maintscript-helper mv_conffile \
- /etc/apache2/conf.d/ledgersmb-httpd.conf /etc/apache2/conf.d/ledgersmb.conf 1.3.25-1 ledgersmb -- "$@"
- fi
+ remove)
+ # If Apache 2.4 in use, disable use of ledgersmb.conf.
+ if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+ . /usr/share/apache2/apache2-maintscript-helper
+ apache2_invoke disconf ledgersmb.conf || exit $?
+ fi
;;
abort-install|abort-upgrade)
- if dpkg-maintscript-helper supports mv_conffile; then
- # If the old ledgersmb-httpd.conf was present, rename it back.
- dpkg-maintscript-helper mv_conffile \
- /etc/apache2/conf.d/ledgersmb-httpd.conf /etc/apache2/conf.d/ledgersmb.conf 1.3.18-2~ ledgersmb -- "$@"
- fi
+ # If the old ledgersmb-httpd.conf was present, rename it back.
+ dpkg-maintscript-helper mv_conffile \
+ /etc/apache2/conf.d/ledgersmb-httpd.conf /etc/apache2/conf.d/ledgersmb.conf 1.3.46-1~ ledgersmb -- "$@"
;;
- upgrade|remove|failed-upgrade|disappear)
+ upgrade|failed-upgrade|disappear)
;;
*)
Modified: ledger-smb/trunk/debian/ledgersmb.preinst
===================================================================
--- ledger-smb/trunk/debian/ledgersmb.preinst 2014-12-17 18:02:17 UTC (rev 718)
+++ ledger-smb/trunk/debian/ledgersmb.preinst 2015-05-03 15:32:48 UTC (rev 719)
@@ -37,16 +37,9 @@
rm -f /usr/share/ledgersmb/templates
fi
fi
- if dpkg --compare-versions $old_version lt 1.3.35-1; then
- # If the old ledgersmb-httpd.conf is present, rename it
- if [ -f "/etc/apache2/conf.d/ledgersmb-httpd.conf" ]; then
- if dpkg-maintscript-helper supports mv_conffile; then
- # If the old ledgersmb-httpd.conf is present, rename it.
- dpkg-maintscript-helper mv_conffile \
- /etc/apache2/conf.d/ledgersmb-httpd.conf /etc/apache2/conf.d/ledgersmb.conf 1.3.18-2~ ledgersmb -- "$@"
- fi
- fi
- fi
+ # If the old ledgersmb-httpd.conf is present, rename it.
+ dpkg-maintscript-helper mv_conffile \
+ /etc/apache2/conf.d/ledgersmb-httpd.conf /etc/apache2/conf.d/ledgersmb.conf 1.3.46-1~ ledgersmb -- "$@"
;;
install|abort-upgrade)
Added: ledger-smb/trunk/debian/ledgersmb.prerm
===================================================================
--- ledger-smb/trunk/debian/ledgersmb.prerm (rev 0)
+++ ledger-smb/trunk/debian/ledgersmb.prerm 2015-05-03 15:32:48 UTC (rev 719)
@@ -0,0 +1,43 @@
+#!/bin/sh
+# prerm script for #PACKAGE#
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <prerm> `remove'
+# * <old-prerm> `upgrade' <new-version>
+# * <new-prerm> `failed-upgrade' <old-version>
+# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+# * <deconfigured's-prerm> `deconfigure' `in-favour'
+# <package-being-installed> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+ deconfigure)
+ # If Apache 2.4 in use, disable use of ledgersmb.conf.
+ if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+ . /usr/share/apache2/apache2-maintscript-helper
+ apache2_invoke disconf ledgersmb.conf || exit $?
+ fi
+ ;;
+
+ remove|upgrade|failed-upgrade)
+ ;;
+
+ *)
+ echo "prerm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
Modified: ledger-smb/trunk/debian/patches/05_confdir.patch
===================================================================
--- ledger-smb/trunk/debian/patches/05_confdir.patch 2014-12-17 18:02:17 UTC (rev 718)
+++ ledger-smb/trunk/debian/patches/05_confdir.patch 2015-05-03 15:32:48 UTC (rev 719)
@@ -1,6 +1,6 @@
Author: Robert James Clay <jame at rocasa.us>
Description: Change default directories
-Last-Update: 2014-08-13
+Last-Update: 2015-04-12
--- a/LedgerSMB/Sysconfig.pm
+++ b/LedgerSMB/Sysconfig.pm
@@ -20,8 +20,8 @@
@@ -92,7 +92,7 @@
#contrib_dir PG_CONTRIB_DIR
#with postgresql-9.1 this stuff is in /usr/share/postgresql/9.1/extension and is injected in database with create extension pg_trgm,btree_gist...
-contrib_dir = /usr/share/pgsql/contrib/
-+contrib_dir = /usr/share/postgresql/9.1/extension
++contrib_dir = /usr/share/postgresql/9.4/extension
# sslmode can be require, allow, prefer, or disable. Defaults to prefer.
sslmode = prefer
More information about the Pkg-sql-ledger-commit
mailing list