[Pkg-sql-ledger-commit] r708 - ledger-smb/branches/v1.3/debian

pkg-sql-ledger-commit-owner at lists.alioth.debian.org pkg-sql-ledger-commit-owner at lists.alioth.debian.org
Sat Jul 12 18:48:25 UTC 2014


Author: jame-guest
Date: 2014-07-12 18:48:24 +0000 (Sat, 12 Jul 2014)
New Revision: 708

Added:
   ledger-smb/branches/v1.3/debian/ledgersmb.doc-base.database
Modified:
   ledger-smb/branches/v1.3/debian/NEWS
   ledger-smb/branches/v1.3/debian/TODO
   ledger-smb/branches/v1.3/debian/changelog
   ledger-smb/branches/v1.3/debian/clean
   ledger-smb/branches/v1.3/debian/control
   ledger-smb/branches/v1.3/debian/copyright
   ledger-smb/branches/v1.3/debian/ledgersmb.install
   ledger-smb/branches/v1.3/debian/ledgersmb.postinst
   ledger-smb/branches/v1.3/debian/ledgersmb.postrm
   ledger-smb/branches/v1.3/debian/ledgersmb.preinst
Log:
LedgerSMB Package v1.3.40-1.

Modified: ledger-smb/branches/v1.3/debian/NEWS
===================================================================
--- ledger-smb/branches/v1.3/debian/NEWS	2014-07-11 16:13:46 UTC (rev 707)
+++ ledger-smb/branches/v1.3/debian/NEWS	2014-07-12 18:48:24 UTC (rev 708)
@@ -1,4 +1,4 @@
-ledgersmb (1.3.39-1) unstable; urgency=low
+ledgersmb (1.3.40-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)
@@ -7,13 +7,10 @@
   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
+  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 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
+ -- Robert James Clay <jame at rocasa.us>  Sat, 21 Jun 2014 10:42:27 -0400
 

Modified: ledger-smb/branches/v1.3/debian/TODO
===================================================================
--- ledger-smb/branches/v1.3/debian/TODO	2014-07-11 16:13:46 UTC (rev 707)
+++ ledger-smb/branches/v1.3/debian/TODO	2014-07-12 18:48:24 UTC (rev 708)
@@ -3,22 +3,40 @@
 
 ====================================================================================================
 
-- 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:
+------------------------------------------------------------------------------------
+
+
+- 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
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698298
+- 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.
 
-- 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/
+-As noted on http://i18n.debian.org/l10n-pkg-status/l/ledgersmb.html, there are
+22 'duplicate message' errors present in locale/po/hu.po. 
+https://sourceforge.net/p/ledger-smb/bugs/1174/
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752063
 
 - 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
+Languages in LSMB 1.3.40: "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.
+System|Language|Add Language. 
 
+- Most of the upstream locale/po/* files, and also how they are referenced in
+debian/copyright, need to be reviewed and/or updated.  (LedgerSMB.pot was
+updated with LedgerSMB v1.3.40.)
+
 - 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?
@@ -26,13 +44,21 @@
 - 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?
-
 - 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"?
 
+- Review the tools/* shell and perl scripts to determine what patches may be
+necessary to make them usable on a Debian installation. 
 
- -- Robert James Clay <jame at rocasa.us>  Tue,  7 Apr 2014 09:54:12 -0400
+- 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
+the apache config need to be updated to allow that?)
+
+
+
+
+ -- Robert James Clay <jame at rocasa.us>  Thu, 19 Jun 2014 04:21 -0400
+

Modified: ledger-smb/branches/v1.3/debian/changelog
===================================================================
--- ledger-smb/branches/v1.3/debian/changelog	2014-07-11 16:13:46 UTC (rev 707)
+++ ledger-smb/branches/v1.3/debian/changelog	2014-07-12 18:48:24 UTC (rev 708)
@@ -1,3 +1,15 @@
+ledgersmb (1.3.40-1) unstable; urgency=medium
+
+  * New upstream release.
+    - 'Duplicate entry' error fixed in the locale/po/es_AR.po file.
+  * Rewrite the 'purge' stanza in the debian/ledgersmb.postrm script.
+  * Correct package version for the mv_conffile stanzas in maintainer scripts.
+  * Add debian/ledgersmb.doc-base.database to register database information.
+  * Correct errors installing the httpd configuration files for Apache v2.2 and
+    v2.4. (Closes: #749347)
+
+ -- Robert James Clay <jame at rocasa.us>  Sat, 21 Jun 2014 13:17:56 -0400
+
 ledgersmb (1.3.39-1) unstable; urgency=low
 
   * New upstream release. (Closes: #732997)
@@ -28,7 +40,11 @@
   * Add empty directory 'UI/logout/' to ledgersmb.lintian-overrides file.
   * Update README.Debian, TODO.Debian, and NEWS.Debian files for new release.
 
+<<<<<<< HEAD
  -- Robert James Clay <jame at rocasa.us>  Tue, 08 Apr 2014 17:33:54 -0400
+=======
+ -- Robert James Clay <jame at rocasa.us>  Mon, 21 Apr 2014 17:56:33 -0400
+>>>>>>> 8ea2af24f6a73d14f642cb609e436fe5ed7b073b
 
 ledgersmb (1.3.25-1) unstable; urgency=low
 

Modified: ledger-smb/branches/v1.3/debian/clean
===================================================================
--- ledger-smb/branches/v1.3/debian/clean	2014-07-11 16:13:46 UTC (rev 707)
+++ ledger-smb/branches/v1.3/debian/clean	2014-07-12 18:48:24 UTC (rev 708)
@@ -1,3 +1,3 @@
 pos.conf.pl
 ledgersmb.conf
-ledgersmb-httpd-2.0-2.2.conf
+ledgersmb-httpd-2.0-2.2.conf.template

Modified: ledger-smb/branches/v1.3/debian/control
===================================================================
--- ledger-smb/branches/v1.3/debian/control	2014-07-11 16:13:46 UTC (rev 707)
+++ ledger-smb/branches/v1.3/debian/control	2014-07-12 18:48:24 UTC (rev 708)
@@ -3,7 +3,7 @@
 Priority: optional
 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
+Build-Depends: debhelper (>= 8), libmodule-install-perl, po-debconf
 Standards-Version: 3.9.5
 Homepage: http://www.ledgersmb.org/
 Vcs-Svn: svn://anonscm.debian.org/pkg-sql-ledger/ledger-smb/trunk
@@ -11,16 +11,39 @@
 
 Package: ledgersmb
 Architecture: all
-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,
-  libcgi-simple-perl, libfile-mimeinfo-perl, libio-stringy-perl,
-  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, libplack-perl,
-  libimage-size-perl
+Depends: apache2 | httpd-cgi,
+         dbconfig-common,
+         libcgi-simple-perl,
+         libconfig-any-perl,
+         libconfig-std-perl,
+         libdatetime-perl,
+         libdbd-pg-perl,
+         libdbi-perl,
+         liberror-perl,
+         libfile-mimeinfo-perl,
+         libhtml-parser-perl,
+         libio-stringy-perl,
+         liblocale-maketext-lexicon-perl (>= 0.62-1),
+         liblog-log4perl-perl,
+         libmime-lite-perl,
+         libtemplate-perl (>=2.14-1),
+         perl (>= 5.8.1-1),
+         postgresql-client,
+         postgresql-contrib,
+         ${misc:Depends},
+         ${perl:Depends}
+Recommends: default-mta | mail-transport-agent,
+            libmath-bigint-gmp-perl,
+            libopenoffice-oodoc-perl,
+            libparse-recdescent-perl,
+            libtemplate-plugin-latex-perl,
+            texlive-latex-recommended
+Suggests: latex-cjk-all,
+          libimage-size-perl,
+          libnet-tclink-perl,
+          libplack-perl,
+          postgresql,
+          lpr
 Conflicts: ledger-smb
 Replaces: ledger-smb
 Description: financial accounting and ERP program

Modified: ledger-smb/branches/v1.3/debian/copyright
===================================================================
--- ledger-smb/branches/v1.3/debian/copyright	2014-07-11 16:13:46 UTC (rev 707)
+++ ledger-smb/branches/v1.3/debian/copyright	2014-07-12 18:48:24 UTC (rev 708)
@@ -16,7 +16,7 @@
             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> 
+            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>
@@ -32,18 +32,18 @@
 
 Files: tools/prepare-company-database.*
 Copyright: 2012, The LedgerSMB Core Team
-License:
- All rights reserved. 
+License: BSD-2-clause
+ All rights reserved.
  .
  Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met: 
+ 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. 
+ 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. 
+ 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
@@ -63,7 +63,7 @@
 
 Files: debian/*
 Comment: Copyright and License for debian directory files.
-Copyright: 2006-2007, Seneca Cunningham <tetragon at ledgersmb.org> 
+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-2014, Robert James Clay <jame at rocasa.us>
@@ -191,7 +191,7 @@
 
 Files: locale/po/es_CO.po
 Comment: Spanish (Columbia) texts. Adoption to Colombian Accounting Terms.
-Copyright:  2005, Dirk Enrique Seiffert <info at caribenet.com> 
+Copyright:  2005, Dirk Enrique Seiffert <info at caribenet.com>
             2005, Lourdes Mejía Martinez <lourdes at caribenet.com>
             2005, Silfredo Godoy Chavez <silfredo at caribenet.com>
 License: GPL-2+

Added: ledger-smb/branches/v1.3/debian/ledgersmb.doc-base.database
===================================================================
--- ledger-smb/branches/v1.3/debian/ledgersmb.doc-base.database	                        (rev 0)
+++ ledger-smb/branches/v1.3/debian/ledgersmb.doc-base.database	2014-07-12 18:48:24 UTC (rev 708)
@@ -0,0 +1,10 @@
+Document: ledgersmb-database
+Title: LedgerSMB Database Information
+Author: The LedgerSMB Core Team
+Abstract: Database Information for LedgerSMB
+Section: Office
+
+Format: HTML
+Index: /usr/share/doc/ledgersmb/database/ledgersmb.html
+Files: /usr/share/doc/ledgersmb/database/ledgersmb.html
+

Modified: ledger-smb/branches/v1.3/debian/ledgersmb.install
===================================================================
--- ledger-smb/branches/v1.3/debian/ledgersmb.install	2014-07-11 16:13:46 UTC (rev 707)
+++ ledger-smb/branches/v1.3/debian/ledgersmb.install	2014-07-12 18:48:24 UTC (rev 708)
@@ -1,21 +1,23 @@
 *.conf etc/ledgersmb
-pos.conf.pl etc/ledgersmb
-favicon.ico usr/share/ledgersmb
-index.html usr/share/ledgersmb
+LedgerSMB/* usr/share/ledgersmb/LedgerSMB
+UI/* usr/share/ledgersmb/UI
 VERSION usr/share/ledgersmb
+bin/*.pl usr/share/ledgersmb/bin
 blib/lib/* usr/share/ledgersmb
-bin/*.pl usr/share/ledgersmb/bin
 contrib/* usr/share/ledgersmb/contrib
 css/* /usr/share/ledgersmb/css
+debian/adm/sql/pgsql usr/share/dbconfig-common/data/ledgersmb/install-dbadmin
 drivers/* usr/share/ledgersmb/drivers
+favicon.ico usr/share/ledgersmb
 images/*.gif usr/share/ledgersmb/images
 images/*.png usr/share/ledgersmb/images
-LedgerSMB/* usr/share/ledgersmb/LedgerSMB
+index.html usr/share/ledgersmb
+ledgersmb-httpd-2.0-2.2.conf.template usr/share/ledgersmb
+ledgersmb-httpd-2.4.conf.template usr/share/ledgersmb
 locale/* usr/share/ledgersmb/locale
+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
-UI/* usr/share/ledgersmb/UI
-templates/* /usr/share/ledgersmb/templates
-debian/adm/sql/pgsql usr/share/dbconfig-common/data/ledgersmb/install-dbadmin

Modified: ledger-smb/branches/v1.3/debian/ledgersmb.postinst
===================================================================
--- ledger-smb/branches/v1.3/debian/ledgersmb.postinst	2014-07-11 16:13:46 UTC (rev 707)
+++ ledger-smb/branches/v1.3/debian/ledgersmb.postinst	2014-07-12 18:48:24 UTC (rev 708)
@@ -55,14 +55,14 @@
             # 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-http-2.4.conf.template /etc/apache2/conf-available/ledgersmb.conf
+                    [ -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-http-2.0-2.2.conf.template /etc/apache2/conf.d/ledgersmb.conf
+                    [ -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
@@ -78,7 +78,7 @@
             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 -- "$@"
+                    /etc/apache2/conf.d/ledgersmb-httpd.conf /etc/apache2/conf.d/ledgersmb.conf 1.3.18-2~ ledgersmb -- "$@"
             fi
             #   Remove these settings for /etc/ledgersmb/*, as dpkg-statoverride
             # is no longer being used in debian/postinst to set it.

Modified: ledger-smb/branches/v1.3/debian/ledgersmb.postrm
===================================================================
--- ledger-smb/branches/v1.3/debian/ledgersmb.postrm	2014-07-11 16:13:46 UTC (rev 707)
+++ ledger-smb/branches/v1.3/debian/ledgersmb.postrm	2014-07-12 18:48:24 UTC (rev 708)
@@ -59,16 +59,21 @@
         if [ -d "/var/lib/ledgersmb/templates" ]; then
             rm -rf /var/lib/ledgersmb/templates
         fi
+        # When being purged; if /etc/ledgersmb-httpd-2.0-2.2.conf exists, remove it.
+        if [ -h "/etc/ledgersmb/ledgersmb-httpd-2.0-2.2.conf" ]; then
+            rm -f /etc/ledgersmb/ledgersmb-httpd-2.0-2.2.conf
+        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
+        if [ -f "/etc/apache2/conf.d/ledgersmb.conf" ]; then
+            rm -f /etc/apache2/conf.d/ledgersmb.conf
         fi
-        if [ -d "/etc/apache2/conf.d/ledgersmb.conf" ]; then
-            rm -rf /etc/apache2/conf.d/ledgersmb.conf
+        # When being purged; if /etc/ledgersmb-httpd-2.4.conf exists, remove it.
+        if [ -h "/etc/ledgersmb/ledgersmb-httpd-2.4.conf" ]; then
+            rm -f /etc/ledgersmb/ledgersmb-httpd-2.4.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
+        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
@@ -89,6 +94,14 @@
        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
+    ;;
+
     remove|failed-upgrade|disappear)
     ;;
 

Modified: ledger-smb/branches/v1.3/debian/ledgersmb.preinst
===================================================================
--- ledger-smb/branches/v1.3/debian/ledgersmb.preinst	2014-07-11 16:13:46 UTC (rev 707)
+++ ledger-smb/branches/v1.3/debian/ledgersmb.preinst	2014-07-12 18:48:24 UTC (rev 708)
@@ -43,7 +43,7 @@
                 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 -- "$@"
+                    /etc/apache2/conf.d/ledgersmb-httpd.conf /etc/apache2/conf.d/ledgersmb.conf 1.3.18-2~ ledgersmb -- "$@"
                 fi
             fi
         fi




More information about the Pkg-sql-ledger-commit mailing list