[Pkg-sql-ledger-commit] r707 - in ledger-smb/trunk: . debian debian/patches
pkg-sql-ledger-commit-owner at lists.alioth.debian.org
pkg-sql-ledger-commit-owner at lists.alioth.debian.org
Fri Jul 11 16:13:46 UTC 2014
Author: jame-guest
Date: 2014-07-11 16:13:46 +0000 (Fri, 11 Jul 2014)
New Revision: 707
Added:
ledger-smb/trunk/debian/adm/
ledger-smb/trunk/debian/ledgersmb.doc-base.notes
ledger-smb/trunk/debian/patches/20_BashPath.patch
ledger-smb/trunk/debian/patches/21_lsmb_13-fcgi-conf.patch
Removed:
ledger-smb/trunk/debian/sql/
Modified:
ledger-smb/trunk/
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/clean
ledger-smb/trunk/debian/control
ledger-smb/trunk/debian/copyright
ledger-smb/trunk/debian/ledgersmb.docs
ledger-smb/trunk/debian/ledgersmb.examples
ledger-smb/trunk/debian/ledgersmb.install
ledger-smb/trunk/debian/ledgersmb.links
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
ledger-smb/trunk/debian/patches/10_httpdconf.patch
ledger-smb/trunk/debian/patches/15_UI-setup-credentials.patch
ledger-smb/trunk/debian/patches/series
ledger-smb/trunk/debian/rules
Log:
Merge debian directory for 1.3.39-1 to trunk.
Property changes on: ledger-smb/trunk
___________________________________________________________________
Added: svn:mergeinfo
+ /ledger-smb/branches/v1.3:658-706
Modified: ledger-smb/trunk/debian/NEWS
===================================================================
--- ledger-smb/trunk/debian/NEWS 2014-04-08 22:04:00 UTC (rev 706)
+++ ledger-smb/trunk/debian/NEWS 2014-07-11 16:13:46 UTC (rev 707)
@@ -1,41 +1,19 @@
-ledgersmb (1.3.21-2) unstable; urgency=low
+ledgersmb (1.3.39-1) unstable; urgency=low
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.
+ the language specific directory (like /var/ledgersmb/templates/demo/en_US)
+ first needs to be manually created and the template file copied there.
- -- Robert James Clay <jame at rocasa.us> Sun, 26 Aug 2012 09:49:25 -0400
-
-ledgersmb (1.3.18-1) unstable; urgency=low
-
- Empty language specific HTML, LaTeX, and Text directories are no longer being
- installed with the package. In order to edit templates online for a particular
- language; create the language specific directory, like templates/demo/en_US,
- then manually copy the default version of the template to that directory.
-
- The application css directory is /var/lib/ledgersmb/css and the default files
- for it are now installed there from the example files during an initial package
- install. There is also a new URL related configuration item in ledgersmb.conf,
- cssdir, which will need to be updated manually when upgrading from a previous
- version.
-
- -- Robert James Clay <jame at rocasa.us> Sun, 10 Jun 2012 18:25:17 -0400
-
-ledgersmb (1.3.17-1) unstable; urgency=low
-
- The templates directory is now at /var/lib/ledgersmb/templates instead of
- being at /etc/ledgersmb/templates. For upgrades, the templates path in
- /etc/ledgersmb/ledgersmb.conf will need to be updated manually.
-
- -- Robert James Clay <jame at rocasa.us> Sat, 02 Jun 2012 20:17:26 -0400
-
-ledgersmb (1.3.16-1) unstable; urgency=low
-
- Now have experimental dbconfig/debconf usage for configuring LedgerSMB during
- the package installation. Because it is experimental, the default is to not
- use it; instead what can be done is to manually create the ledgersmb database
+ 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 in the http://localhost/ledgersmb/setup.pl script to create
the company databases for use. More information regarding this is available
in /usr/share/doc/ledgersmb/README.Debian.
- -- Robert James Clay <jame at rocasa.us> Tue, 08 May 2012 08:49:46 -0400
+ The contrib_dir configuration in /etc/ledgersmb/ledgersmb.conf now defaults
+ to being for Postgresql 9.3, and should be updated if being used with a
+ different version.
+
+ -- Robert James Clay <jame at rocasa.us> Sat, 05 Apr 2014 13:27:08 -0400
+
Modified: ledger-smb/trunk/debian/README.Debian
===================================================================
--- ledger-smb/trunk/debian/README.Debian 2014-04-08 22:04:00 UTC (rev 706)
+++ ledger-smb/trunk/debian/README.Debian 2014-07-11 16:13:46 UTC (rev 707)
@@ -29,10 +29,22 @@
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 v8.4 it would be /usr/share/postresql/8.4/contrib; or for
- v9.1 that would be /usr/share/postgresql/9.1/extension.
+ scripts. For v9.1 it would be /usr/share/postresql/9.1/extension; or for
+ v9.3 that would be /usr/share/postgresql/9.3/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
+ the /usr/share/ledgersmb/tools directory. Also; some information for use
+ with Plack is available in README.plack, and for use with nginx is in the
+ /usr/share/ledgersmb/contrib/nginx-fcgiwrap directory.
+ The application css directory is /var/lib/ledgersmb/css and defaults for the
+ files are installed there from the example files during an package install.
+ There is also a URL related configuration item in ledgersmb.conf, cssdir,
+ which will need to be updated manually when upgrading from a previous
+ version.
+
+
Optional Perl modules
=====================
@@ -41,6 +53,7 @@
Template::Plugin::Latex [Support for Postscript and PDF output]
Parse::RecDescent [Support for the *experimental* scripting engine]
Image::Size [Support for image size detection in templates]
+ Plack [Support for using Plack to run LedgerSMB]
The credit card processing support for TrustCommerce is available as
the package libnet-tclink-perl if not already installed.
@@ -57,7 +70,10 @@
The support for size detection for images for embedding in LaTex templates
is available as libimage-size-perl if it is not already installed.
+ The support for running LedgerSMB using Plack is available as libplack-perl
+ if it is not already installed.
+
Manual addition of a company database
=====================================
@@ -77,4 +93,4 @@
- -- Robert James Clay <jame at rocasa.us> Mon, 4 May 2012 08:40:54 -0400
+ -- Robert James Clay <jame at rocasa.us> Sat, 5 Apr 2014 13:28:40 -0400
Modified: ledger-smb/trunk/debian/TODO
===================================================================
--- ledger-smb/trunk/debian/TODO 2014-04-08 22:04:00 UTC (rev 706)
+++ ledger-smb/trunk/debian/TODO 2014-07-11 16:13:46 UTC (rev 707)
@@ -1,45 +1,38 @@
debian/TODO for LedgerSMB v1.3
-- 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.
-- Most of the upstream locale/po/* files need to be reviewed and/or updated;
-several of the files have fatal errors in them which need to be resolved.
+====================================================================================================
-- Upstream uses pdflatex to create distribution LedgerSMB-manual.pdf from the
-source file doc/manual/LedgerSMB-manual.tex. Use the same source file to create
-an HTML version?
+- If an automatic configuration is attempted during the package install, the default database
+administrative user 'ledgersmb' is not being configured with the correct permissions. See also:
+https://bugs.launchpad.net/bugs/1078817
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698298
+- http://i18n.debian.org/l10n-pkg-status/l/ledgersmb.html shows the following error:
+msgfmt: found 1 fatal error, "Duplicate message definition in locale/po/es_AR.po"
+https://sourceforge.net/p/ledger-smb/bugs/1096/
+
+- 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.25: "ja" is not in the default list. It's also not
+listed as an available language when editing templates, and presumably
+those lists come from the same source. It can be added manually using
+System|Language|Add Language.
+
+- Upstream uses pdflatex to create the distribution LedgerSMB-manual.pdf from
+the source file doc/manual/LedgerSMB-manual.tex. Use the same source file to
+create an HTML version?
+
- Create an HTML and/or PDF file of templateing/templating-guide.tex? And
then register it with doc-base?
- Add registration of at least database/ledgersmb.html to doc-base?
-- The doc/release-notes file is getting installed with the package; should it
-be referenced in README.Debian?
+- Add an installation option for a versioned installation directory name?
+Or add a package build time option to create a versioned package name and
+installation? Or change to using at least binary package names that also
+include info about the version, like "ledgersmb13" or "ledgersmb1.4" or
+"ledgersmb-1.3"?
-- Add installation option for a versioned directory name? Or add a package
-build time option to create a versioned package name?
-- Review the tools/* shell and perl scripts to determine what changes may be
-necessary to make them usable on a Debian installation.
-
-- New 1.3 version of LedgerSMB contains an embedded javascript library. The
-embedded version appears to be 1.8.2. The library is available in Debian as the
-package libjs-scriptaculous: v1.8.1 in lenny, v1.8.3 in lenny-backports and
-squeeze, v1.9.0 in wheezy and sid. Provide a Lintian override with description
-of issue, until otherwise resolved.
- From Chris Travers in the Ledger-smb-devel mailing list:
- "I don't know of any testing we have done on other versions. We don't use a
- lot of advanced stuff so I would expect it would work. If bugs are found,
- though, we can correct them."
-Test usage of libjs-scriptaculous and change over to using that when it is found
-to be operational with it.
--> Instead of patching the files that use it directly, try using dh_linktree to
-create the set of links to the debian packages?
-
- -- Robert James Clay <jame at rocasa.us> Sat, 18 Aug 2012 10:18:31 -0400
+ -- Robert James Clay <jame at rocasa.us> Tue, 7 Apr 2014 09:54:12 -0400
Modified: ledger-smb/trunk/debian/changelog
===================================================================
--- ledger-smb/trunk/debian/changelog 2014-04-08 22:04:00 UTC (rev 706)
+++ ledger-smb/trunk/debian/changelog 2014-07-11 16:13:46 UTC (rev 707)
@@ -1,8 +1,34 @@
-ledgersmb (1.4.0~beta1-1~1) UNRELEASED; urgency=low
+ledgersmb (1.3.39-1) unstable; urgency=low
- * Start development of v1.4 beta packages.
+ * New upstream release. (Closes: #732997)
+ * Changes to debian/copyright:
+ - Update the LedgerSMB Core Team related information.
+ - Add a file stanza for the locale/po/es_AR.po file.
+ - Add an entry for utils/notify_short/.*pl and it README file.
+ - Add an entry for the tools/prepare-company-database.* scripts.
+ * Changes to debian/control:
+ - Update Standards-Version in debian/control.
+ - Add the libplack-perl package as a Suggests.
+ - Update the Vcs-Svn base URL from 'svn.debian.org' to 'anomscm.debian.org'.
+ * Changes to debian/rules:
+ - Add line to make tools/system/lsmb* scripts executables.
+ - Remove the line used to copy the ledgersmb.conf.template file as it is
+ no longer needed.
+ * Changes to debian/patches/:
+ - Add usage of 'Last-Update' field in all *.patch files.
+ - Update default 'contrib-dir' to be for Postgresql 9.3 in 05_confdir.patch.
+ - Add 20_BashPath.patch to resolve bash path issues in tools/ scripts.
+ - Add 21_lsmb_13-fcgi-conf.patch for setting its directory paths.
+ * Update packaging for installation of ledgersmb-httpd configuration for
+ Apache v2.2 and v2.4. (Closes: #725758)
+ * Changes to debian/ledgersmb.docs:
+ - Add README.git to the installed documents list.
+ - Add README.plack to the installed documents list.
+ * Register the release notes using debian/ledgersmb.doc-base.notes.
+ * Add empty directory 'UI/logout/' to ledgersmb.lintian-overrides file.
+ * Update README.Debian, TODO.Debian, and NEWS.Debian files for new release.
- -- Robert James Clay <jame at rocasa.us> Sat, 15 Dec 2012 13:36:12 -0500
+ -- Robert James Clay <jame at rocasa.us> Tue, 08 Apr 2014 17:33:54 -0400
ledgersmb (1.3.25-1) unstable; urgency=low
Modified: ledger-smb/trunk/debian/clean
===================================================================
--- ledger-smb/trunk/debian/clean 2014-04-08 22:04:00 UTC (rev 706)
+++ ledger-smb/trunk/debian/clean 2014-07-11 16:13:46 UTC (rev 707)
@@ -1,3 +1,3 @@
pos.conf.pl
ledgersmb.conf
-ledgersmb-httpd.conf
+ledgersmb-httpd-2.0-2.2.conf
Modified: ledger-smb/trunk/debian/control
===================================================================
--- ledger-smb/trunk/debian/control 2014-04-08 22:04:00 UTC (rev 706)
+++ ledger-smb/trunk/debian/control 2014-07-11 16:13:46 UTC (rev 707)
@@ -4,14 +4,14 @@
Maintainer: Debian LedgerSMB Team <pkg-sql-ledger-discussion at lists.alioth.debian.org>
Uploaders: Robert James Clay <jame at rocasa.us>
Build-Depends: debhelper (>= 8), po-debconf, libmodule-install-perl
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Homepage: http://www.ledgersmb.org/
-Vcs-Svn: svn://svn.debian.org/pkg-sql-ledger/ledger-smb/trunk
+Vcs-Svn: svn://anonscm.debian.org/pkg-sql-ledger/ledger-smb/trunk
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-sql-ledger/ledger-smb/trunk/
Package: ledgersmb
Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}, perl (>= 5.8.0-1), libconfig-std-perl,
+Depends: ${perl:Depends}, ${misc:Depends}, perl (>= 5.8.1-1), libconfig-std-perl,
libconfig-any-perl, libmime-lite-perl, libdbi-perl, libdbd-pg-perl, liberror-perl,
liblocale-maketext-lexicon-perl (>= 0.62-1), libtemplate-perl (>=2.14-1),
libhtml-parser-perl, liblog-log4perl-perl, libdatetime-perl, apache2 | httpd-cgi,
@@ -19,7 +19,7 @@
postgresql-client, postgresql-contrib, dbconfig-common
Recommends: default-mta | mail-transport-agent, texlive-latex-recommended, libopenoffice-oodoc-perl,
libmath-bigint-gmp-perl, libparse-recdescent-perl, libtemplate-plugin-latex-perl
-Suggests: postgresql, lpr, libnet-tclink-perl, latex-cjk-all,
+Suggests: postgresql, lpr, libnet-tclink-perl, latex-cjk-all, libplack-perl,
libimage-size-perl
Conflicts: ledger-smb
Replaces: ledger-smb
Modified: ledger-smb/trunk/debian/copyright
===================================================================
--- ledger-smb/trunk/debian/copyright 2014-04-08 22:04:00 UTC (rev 706)
+++ ledger-smb/trunk/debian/copyright 2014-07-11 16:13:46 UTC (rev 707)
@@ -5,31 +5,68 @@
Comment: LedgerSMB is a drop-in replacement for SQL-Ledger, from which it was
derived in 2006. The fork was from SQL-Ledger 2.6.17. Note also that the
'The LedgerSMB Core Team' consists of the following people: Chris Travers,
- Christopher Murtagh, Joshua Drake, and Seneca Cunningham. For a full list
- including contact information of contributors, maintainers, and copyright
- holders, see the CONTRIBUTORS file.
-Copyright: 2006-2012, The LedgerSMB Core Team
+ Erik Huelsmann, Havard Sorli, John Locke, Pongracz Istvan, Herman Vierendeels,
+ and Robert James Clay. For a full list including contact information of
+ contributors, maintainers, and copyright holders, see the CONTRIBUTORS file.
+Copyright: 2006-2014, The LedgerSMB Core Team
1999-2006, DWS Systems Inc.
Files: *
-Copyright: 2006-2012, Chris Travers <chris at metatrontech.com>
+Copyright: 2006-2014, Chris Travers <chris at metatrontech.com>
+ 2007-2014, Pongracz Istvan <pongracz.istvan at gmail.com>
+ 2012-2013, Havard Sorli <havard at anix no>
+ 2011-2014, Erik Huelsmann <ehuels at gmail.com>
+ 2011-2014, John Locke <john at freelock.com>
+ 2013-2014, Herman Vierendeels <herman.vierendeels at gmail.com>
+ 2012-2013, Robert James Clay <jame at rocasa.us>
+ 2006-2011, Seneca Cunningham <tentra at gmail.com>
+ 2006-2011, Jason Rodrigues <jasonjayr+ledgersmb at gmail.com>
2006-2007, Christopher Murtagh <christopher.murtagh at gmail.com>
2006-2007, Joshua Drake <jd at commandprompt.com>
- 2006-2011, Seneca Cunningham <tentra at gmail.com>
- 2006-2011, Jason Rodrigues <jasonjayr+ledgersmb at gmail.com>
License: GPL-2+
Files: bin/*
-Copyright: 2006-2012, The LedgerSMB Core Team
+Copyright: 2006-2014, The LedgerSMB Core Team
1999-2005, DWS Systems Inc. and Dieter Simader <dsimader at sql-ledger.org>
License: GPL-2+
+Files: tools/prepare-company-database.*
+Copyright: 2012, The LedgerSMB Core Team
+License:
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ .
+ Redistributions in binary form must reproduce the above copyright notice, this
+ list of conditions and the following disclaimer in the documentation and/or
+ other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE LEDGERSMB CORE TEAM AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL LEDGERSMB CORE TEAM OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+
+Files: utils/notify_short/*.pl utils/notify_short/README
+Copyright: 2006-2011, Chris Travers <chris at metatrontech.com>
+License: GPL-2+
+
Files: debian/*
Comment: Copyright and License for debian directory files.
Copyright: 2006-2007, Seneca Cunningham <tetragon at ledgersmb.org>
2008-2009, Elizabeth Krumbach <lyz at princessleia.com>
2008, Roberto C. Sanchez <robert at debian.org>
- 2009-2012, Robert James Clay <jame at rocasa.us>
+ 2009-2014, Robert James Clay <jame at rocasa.us>
License: GPL
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -43,10 +80,6 @@
.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-Files: doc/ledgersmb-manual.pdf doc/manual/*
-Copyright: 2006-2012, The LedgerSMB Project
-License:
Redistribution and use in source (LaTeX) and 'compiled' forms (SGML,
HTML, PDF, PostScript, RTF and so forth) with or without modification, are
permitted provided that the following conditions are met:
@@ -120,6 +153,7 @@
Comment: Danish texts
Copyright: 2001, Keld Jørn Simonsen <keld at dkuug.dk>
2001, Jonas Smedegaard <jonas at jones.dk>
+ 2006, Mads Kiilerich <mads at kiilerich.com>
License: GPL-2+
Files: locale/po/de.po
@@ -134,7 +168,7 @@
Comment: Swiss-German texts
Copyright: 2006, Alain Haymoz <alain.haymoz at leanux.ch>
2006, Fabian Schiltknecht <fabian.schiltknecht at leanux.ch>
- 2006, Martin Elmer <martin.elmer at leanux.ch>
+ 2006, Martin Elmer <martin.elmer at leanux.ch>
License: GPL-2+
Files: locale/po/el.po
@@ -150,6 +184,11 @@
2002, Tomás Pereira <topec at percar.com>
License: GPL-2+
+Files: locale/po/es_AR.po
+Comment: Spanish (Argentina) texts
+Copyright: 2012, Andres Basile <basile at gmail.com>
+License: GPL-2+
+
Files: locale/po/es_CO.po
Comment: Spanish (Columbia) texts. Adoption to Colombian Accounting Terms.
Copyright: 2005, Dirk Enrique Seiffert <info at caribenet.com>
@@ -230,7 +269,7 @@
Files: locale/po/hu.po
Comment: Hungarian texts
-Copyright: 2003, Pongrácz István <pongracz.istvan at osbusiness.hu>
+Copyright: 2013, Pongrácz István <pongracz.istvan@@startit.hu>
License: GPL-2+
Files: locale/po/id.po
@@ -258,11 +297,11 @@
Files: locale/po/nb.po
Comment: Norwegian Bokmål texts
-Copyright: 2001, 2004, Keld Jørn Simonsen <keld at dkuug.dk>
- 2001, 2004, Morten Pedersen <morten at workzone.no>
- 2001, 2004, Finn-Arne Johansen <faj at bzz.no>
- 2001, 2004, Petter Reinholdtsen <pere at hungry.com>
- 2001, 2004, Erik Inge Bolsø <knan at tvilsom.org>
+Copyright: 2001, 2004, 2012, Keld Jørn Simonsen <keld at dkuug.dk>
+ 2001, 2004, 2012, Morten Pedersen <morten at workzone.no>
+ 2001, 2004, 2012, Finn-Arne Johansen <faj at bzz.no>
+ 2001, 2004, 2012, Petter Reinholdtsen <pere at hungry.com>
+ 2001, 2004, 2012, Erik Inge Bolsø <knan at tvilsom.org>
License: GPL-2+
Files: locale/po/nl.po
Copied: ledger-smb/trunk/debian/ledgersmb.doc-base.notes (from rev 706, ledger-smb/branches/v1.3/debian/ledgersmb.doc-base.notes)
===================================================================
--- ledger-smb/trunk/debian/ledgersmb.doc-base.notes (rev 0)
+++ ledger-smb/trunk/debian/ledgersmb.doc-base.notes 2014-07-11 16:13:46 UTC (rev 707)
@@ -0,0 +1,8 @@
+Document: ledgersmb-notes
+Title: LedgerSMB Release Notes
+Author: The LedgerSMB Core Team
+Abstract: Release Notes for LedgerSMB
+Section: Office
+
+Format: text
+Files: /usr/share/doc/ledgersmb/release_notes.gz
Modified: ledger-smb/trunk/debian/ledgersmb.docs
===================================================================
--- ledger-smb/trunk/debian/ledgersmb.docs 2014-04-08 22:04:00 UTC (rev 706)
+++ ledger-smb/trunk/debian/ledgersmb.docs 2014-07-11 16:13:46 UTC (rev 707)
@@ -1,13 +1,15 @@
BUGS
CONTRIBUTORS
+README.plack
README.translations
UPGRADE
debian/README.source
+doc/README.git
doc/LedgerSMB-manual.pdf
doc/coding-standard.pdf
-doc/release_notes
doc/faq.html
doc/API
doc/database
doc/samples
+doc/release_notes
doc/templating
Modified: ledger-smb/trunk/debian/ledgersmb.examples
===================================================================
--- ledger-smb/trunk/debian/ledgersmb.examples 2014-04-08 22:04:00 UTC (rev 706)
+++ ledger-smb/trunk/debian/ledgersmb.examples 2014-07-11 16:13:46 UTC (rev 707)
@@ -1,4 +1,5 @@
ledgersmb.conf.default
-ledgersmb-httpd.conf.template
+ledgersmb-httpd-2.0-2.2.conf.template
+ledgersmb-httpd-2.4.conf.template
pos.conf.pl.template
utils
Modified: ledger-smb/trunk/debian/ledgersmb.install
===================================================================
--- ledger-smb/trunk/debian/ledgersmb.install 2014-04-08 22:04:00 UTC (rev 706)
+++ ledger-smb/trunk/debian/ledgersmb.install 2014-07-11 16:13:46 UTC (rev 707)
@@ -1,6 +1,5 @@
*.conf etc/ledgersmb
pos.conf.pl etc/ledgersmb
-ledgersmb-httpd.conf etc/apache2/conf.d
favicon.ico usr/share/ledgersmb
index.html usr/share/ledgersmb
VERSION usr/share/ledgersmb
@@ -19,4 +18,4 @@
utils/* /usr/share/ledgersmb/utils
UI/* usr/share/ledgersmb/UI
templates/* /usr/share/ledgersmb/templates
-debian/sql/pgsql usr/share/dbconfig-common/data/ledgermsb/install-dbadmin
+debian/adm/sql/pgsql usr/share/dbconfig-common/data/ledgersmb/install-dbadmin
Modified: ledger-smb/trunk/debian/ledgersmb.links
===================================================================
--- ledger-smb/trunk/debian/ledgersmb.links 2014-04-08 22:04:00 UTC (rev 706)
+++ ledger-smb/trunk/debian/ledgersmb.links 2014-07-11 16:13:46 UTC (rev 707)
@@ -1,3 +1,2 @@
/etc/ledgersmb/ledgersmb.conf /usr/share/ledgersmb/ledgersmb.conf
/etc/ledgersmb/pos.conf.pl /usr/share/ledgersmb/pos.conf.pl
-/etc/apache2/conf.d/ledgersmb-httpd.conf /etc/ledgersmb/ledgersmb-httpd.conf
Modified: ledger-smb/trunk/debian/ledgersmb.lintian-overrides
===================================================================
--- ledger-smb/trunk/debian/ledgersmb.lintian-overrides 2014-04-08 22:04:00 UTC (rev 706)
+++ ledger-smb/trunk/debian/ledgersmb.lintian-overrides 2014-07-11 16:13:46 UTC (rev 707)
@@ -3,6 +3,7 @@
ledgersmb binary: package-contains-empty-directory usr/share/ledgersmb/scripts/custom/
# Upstream includes empty directory intentionally.
+ledgersmb binary: package-contains-empty-directory usr/share/ledgersmb/UI/logout/
ledgersmb binary: package-contains-empty-directory usr/share/ledgersmb/sql/coa/ar/gifi/
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-04-08 22:04:00 UTC (rev 706)
+++ ledger-smb/trunk/debian/ledgersmb.postinst 2014-07-11 16:13:46 UTC (rev 707)
@@ -54,21 +54,38 @@
fi
# Do Apache related processing if it is present.
if [ -d "/etc/apache2" ]; then
- # Enable Apache mod_rewrite
- if [ -x "`which a2enmod 2>/dev/null`" ]; then
- a2enmod rewrite
+ 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-http-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-http-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
- # 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.25-1 ledgersmb -- "$@"
+ fi
+ # Remove these settings for /etc/ledgersmb/*, as dpkg-statoverride
+ # is no longer being used in debian/postinst to set it.
+ if dpkg --compare-versions $old_version lt 1.3.9-2; then
+ drop_statoverride
+ fi
fi
- # Remove these settings for /etc/ledgersmb/*, as dpkg-statoverride
- # is no longer being used in debian/postinst to set it.
- if [ -n "$old_version" ] && dpkg --compare-versions $old_version lt 1.3.9-2; then
- drop_statoverride
- fi
# If enabled, do the debconf supported configuration
db_get ledgersmb/debconf_install
if [ "$RET" = true ]; then
Modified: ledger-smb/trunk/debian/ledgersmb.postrm
===================================================================
--- ledger-smb/trunk/debian/ledgersmb.postrm 2014-04-08 22:04:00 UTC (rev 706)
+++ ledger-smb/trunk/debian/ledgersmb.postrm 2014-07-11 16:13:46 UTC (rev 707)
@@ -59,11 +59,39 @@
if [ -d "/var/lib/ledgersmb/templates" ]; then
rm -rf /var/lib/ledgersmb/templates
fi
+ # When being purged; if /etc/apache2/conf.d/ledgersmb.conf exists, remove it.
+ if [ -d "/etc/ledgersmb/ledgersmb-httpd-2.0-2.2.conf" ]; then
+ rm -rf /etc/ledgersmb/ledgersmb-httpd-2.0-2.2.conf
+ fi
+ if [ -d "/etc/apache2/conf.d/ledgersmb.conf" ]; then
+ rm -rf /etc/apache2/conf.d/ledgersmb.conf
+ fi
+ # When being purged; if /etc/apache2/conf-available/ledgersmb.conf exists, remove it.
+ if [ -d "/etc/apache2/conf-available/ledgersmb.conf" ]; then
+ rm -rf /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
;;
- remove|failed-upgrade|abort-install|abort-upgrade|disappear)
+ 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|failed-upgrade|disappear)
+ ;;
+
*)
echo "postrm called with unknown argument \`$1'" >&2
exit 1
Modified: ledger-smb/trunk/debian/ledgersmb.preinst
===================================================================
--- ledger-smb/trunk/debian/ledgersmb.preinst 2014-04-08 22:04:00 UTC (rev 706)
+++ ledger-smb/trunk/debian/ledgersmb.preinst 2014-07-11 16:13:46 UTC (rev 707)
@@ -37,6 +37,16 @@
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.25-1 ledgersmb -- "$@"
+ fi
+ fi
+ fi
;;
install|abort-upgrade)
Modified: ledger-smb/trunk/debian/patches/05_confdir.patch
===================================================================
--- ledger-smb/trunk/debian/patches/05_confdir.patch 2014-04-08 22:04:00 UTC (rev 706)
+++ ledger-smb/trunk/debian/patches/05_confdir.patch 2014-07-11 16:13:46 UTC (rev 707)
@@ -1,5 +1,6 @@
Author: Robert James Clay <jame at rocasa.us>
Description: Change default directories
+Last-Update: 2014-04-03
--- a/LedgerSMB/Sysconfig.pm
+++ b/LedgerSMB/Sysconfig.pm
@@ -20,8 +20,8 @@
@@ -91,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.3/extension
# sslmode can be require, allow, prefer, or disable. Defaults to prefer.
sslmode = prefer
Modified: ledger-smb/trunk/debian/patches/10_httpdconf.patch
===================================================================
--- ledger-smb/trunk/debian/patches/10_httpdconf.patch 2014-04-08 22:04:00 UTC (rev 706)
+++ ledger-smb/trunk/debian/patches/10_httpdconf.patch 2014-07-11 16:13:46 UTC (rev 707)
@@ -1,5 +1,6 @@
Author: Robert James Clay <jame at rocasa.us>
Description: Changing paths in Apache config
+Last-Update: 2014-03-11
--- a/ledgersmb-httpd.conf.template
+++ b/ledgersmb-httpd.conf.template
@@ -1,8 +1,8 @@
@@ -61,3 +62,52 @@
+ Deny from All
+</Directory>
+
+--- a/ledgersmb-httpd-2.4.conf.template
++++ b/ledgersmb-httpd-2.4.conf.template
+@@ -1,8 +1,8 @@
+ # This file must be edited to substitute the current path with WORKING_DIR
+
+-Alias /ledgersmb WORKING_DIR/
++Alias /ledgersmb /usr/share/ledgersmb/
+
+-<Directory WORKING_DIR>
++<Directory /usr/share/ledgersmb>
+
+ # Rewrite rule to allow HTTP Authorization information to the scripts only
+ # from this directory.
+@@ -35,22 +35,30 @@
+ </Files>
+ </Directory>
+
+-<Directory WORKING_DIR/bin>
++<Directory /usr/share/ledgersmb/bin>
+ Require all denied
+ </Directory>
+
+-<Directory WORKING_DIR/utils>
++<Directory /usr/share/ledgersmb/utils>
+ Require all denied
+ </Directory>
+
+-<Directory WORKING_DIR/spool>
++<Directory /usr/share/ledgersmb/spool>
+ Require all denied
+ </Directory>
+
+-<Directory WORKING_DIR/templates>
++<Directory /var/share/ledgersmb/templates>
+ Require all denied
+ </Directory>
+
+-<Directory WORKING_DIR/LedgerSMB>
++<Directory /usr/share/ledgersmb/LedgerSMB>
+ Require all denied
+ </Directory>
++
++Alias /lsmbcss /var/lib/ledgersmb/css/
++<Directory /var/lib/ledgersmb/css>
++ Order Deny,Allow
++ Allow from 127.0.0.1
++ Allow from localhost
++ Deny from All
++</Directory>
Modified: ledger-smb/trunk/debian/patches/15_UI-setup-credentials.patch
===================================================================
--- ledger-smb/trunk/debian/patches/15_UI-setup-credentials.patch 2014-04-08 22:04:00 UTC (rev 706)
+++ ledger-smb/trunk/debian/patches/15_UI-setup-credentials.patch 2014-07-11 16:13:46 UTC (rev 707)
@@ -1,5 +1,6 @@
Author: Robert James Clay <jame at rocasa.us>
Description: Set 'ledgersmb' as the default database superuser in setup.pl.
+Last-Update: 2012-04-18
--- a/UI/setup/credentials.html
+++ b/UI/setup/credentials.html
@@ -10,7 +10,7 @@
Copied: ledger-smb/trunk/debian/patches/20_BashPath.patch (from rev 706, ledger-smb/branches/v1.3/debian/patches/20_BashPath.patch)
===================================================================
--- ledger-smb/trunk/debian/patches/20_BashPath.patch (rev 0)
+++ ledger-smb/trunk/debian/patches/20_BashPath.patch 2014-07-11 16:13:46 UTC (rev 707)
@@ -0,0 +1,27 @@
+Author: Robert James Clay <jame at rocasa.us>
+Description: Correct path for Bash in tools scripts.
+Last-Update: 2013-01-30
+--- a/tools/rebuild_pot.sh
++++ b/tools/rebuild_pot.sh
+@@ -1,4 +1,4 @@
+-#!/usr/bin/bash
++#!/bin/bash
+
+ # EXTRACTING DB STRINGS
+ echo "select 'text(''' || label || ''')' FROM menu_node" |
+--- a/tools/system/lsmbstart
++++ b/tools/system/lsmbstart
+@@ -1,4 +1,4 @@
+-#!/usr/bin/bash
++#!/bin/bash
+
+ cd /usr/share/ledgersmb
+ plackup -s FCGI -D --listen /var/run/httpd/fastcgi/lsmb.sock
+--- a/tools/system/lsmbstop
++++ b/tools/system/lsmbstop
+@@ -1,4 +1,4 @@
+-#!/usr/bin/bash
++#!/bin/bash
+
+ killall perl-fcgi-pm
+
Copied: ledger-smb/trunk/debian/patches/21_lsmb_13-fcgi-conf.patch (from rev 706, ledger-smb/branches/v1.3/debian/patches/21_lsmb_13-fcgi-conf.patch)
===================================================================
--- ledger-smb/trunk/debian/patches/21_lsmb_13-fcgi-conf.patch (rev 0)
+++ ledger-smb/trunk/debian/patches/21_lsmb_13-fcgi-conf.patch 2014-07-11 16:13:46 UTC (rev 707)
@@ -0,0 +1,61 @@
+Author: Robert James Clay <jame at rocasa.us>
+Description: Set WORKDIR path in LedgerSMB Apache FCGI confiuration files.
+Last-Update: 2014-03-23
+--- a/tools/lsmb_13-fcgi.conf
++++ b/tools/lsmb_13-fcgi.conf
+@@ -1,13 +1,13 @@
+ # This file must be edited to substitute the current path with WORKING_DIR
+
+-Alias /ledgersmb_1.3 WORKING_DIR/
++Alias /ledgersmb_1.3 /usr/share/ledgersmb/
+ LoadModule fastcgi_module modules/mod_fastcgi.so
+
+ LogLevel debug
+
+-FastCgiExternalServer WORKING_DIR/ledgersmb.fcgi -socket /var/run/httpd/fastcgi/lsmb.sock -idle-timeout 240 -pass-header Authorization
++FastCgiExternalServer /usr/share/ledgersmb/ledgersmb.fcgi -socket /var/lib/ledgersmb/lsmb.sock -idle-timeout 240 -pass-header Authorization
+
+-<Directory WORKING_DIR>
++<Directory /usr/share/ledgersmb>
+
+ # Rewrite rule to allow HTTP Authorization information to the scripts only
+ # from this directory.
+@@ -32,32 +32,32 @@
+ </Files>
+ </Directory>
+
+-<Directory WORKING_DIR/users>
++<Directory /usr/share/ledgersmb/users>
+ Order Deny,Allow
+ Deny from All
+ </Directory>
+
+-<Directory WORKING_DIR/bin>
++<Directory /usr/share/ledgersmb/bin>
+ Order Deny,Allow
+ Deny from All
+ </Directory>
+
+-<Directory WORKING_DIR/utils>
++<Directory /usr/share/ledgersmb/utils>
+ Order Deny,Allow
+ Deny from All
+ </Directory>
+
+-<Directory WORKING_DIR/spool>
++<Directory /usr/share/ledgersmb/spool>
+ Order Deny,Allow
+ Deny from All
+ </Directory>
+
+-<Directory WORKING_DIR/templates>
++<Directory /usr/share/ledgersmb/templates>
+ Order Deny,Allow
+ Deny from All
+ </Directory>
+
+-<Directory WORKING_DIR/LedgerSMB>
++<Directory /usr/share/ledgersmb/LedgerSMB>
+ Order Deny,Allow
+ Deny from All
+ </Directory>
Modified: ledger-smb/trunk/debian/patches/series
===================================================================
--- ledger-smb/trunk/debian/patches/series 2014-04-08 22:04:00 UTC (rev 706)
+++ ledger-smb/trunk/debian/patches/series 2014-07-11 16:13:46 UTC (rev 707)
@@ -1,3 +1,5 @@
05_confdir.patch
10_httpdconf.patch
15_UI-setup-credentials.patch
+20_BashPath.patch
+21_lsmb_13-fcgi-conf.patch
Modified: ledger-smb/trunk/debian/rules
===================================================================
--- ledger-smb/trunk/debian/rules 2014-04-08 22:04:00 UTC (rev 706)
+++ ledger-smb/trunk/debian/rules 2014-07-11 16:13:46 UTC (rev 707)
@@ -8,8 +8,7 @@
# Per upstream; remove these empty directories if present, as they are not
# needed for an installed LedgerSMB directory.
rm -rf LedgerSMB/Assets LedgerSMB/Entity
- cp ledgersmb.conf.default ledgersmb.conf
- cp ledgersmb-httpd.conf.template ledgersmb-httpd.conf
+ cp ledgersmb-httpd.conf.template ledgersmb-httpd-2.0-2.2.conf.template
cp pos.conf.pl.template pos.conf.pl
dh_auto_configure
@@ -19,7 +18,7 @@
override_dh_install:
rm -f blib/lib/install_interactive.pl
- dh_install -XMIT-LICENSE
+ dh_install -XMIT-LICENSE -XGPL.txt
override_dh_fixperms:
dh_fixperms
@@ -27,6 +26,7 @@
chmod -x debian/ledgersmb/usr/share/ledgersmb/locale/html/splash.html
chmod +x debian/ledgersmb/usr/share/ledgersmb/Reconciliation.pl
chmod +x debian/ledgersmb/usr/share/ledgersmb/tools/*.pl
+ chmod +x debian/ledgersmb/usr/share/ledgersmb/tools/system/lsmb*
find debian/ledgersmb/usr/share/ledgersmb -name '*.sh' -exec chmod +x '{}' \;
find debian/ledgersmb/usr/share/ledgersmb -name '*.pm' -exec chmod -x '{}' \;
find debian/ledgersmb/usr/share/ledgersmb -name '*.sql' -exec chmod -x '{}' \;
More information about the Pkg-sql-ledger-commit
mailing list