[Pkg-sql-ledger-commit] r722 - in ledger-smb/trunk/debian: . patches

pkg-sql-ledger-commit-owner at lists.alioth.debian.org pkg-sql-ledger-commit-owner at lists.alioth.debian.org
Sat Apr 9 15:05:01 UTC 2016


Author: jame-guest
Date: 2016-04-09 15:05:01 +0000 (Sat, 09 Apr 2016)
New Revision: 722

Added:
   ledger-smb/trunk/debian/patches/22_SpellingErrors.patch
Modified:
   ledger-smb/trunk/debian/README.Debian
   ledger-smb/trunk/debian/changelog
   ledger-smb/trunk/debian/control
   ledger-smb/trunk/debian/copyright
   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/20_BashPath.patch
   ledger-smb/trunk/debian/patches/21_lsmb_13-fcgi-conf.patch
   ledger-smb/trunk/debian/patches/series
   ledger-smb/trunk/debian/templates
Log:
Released LedgerSMB Package v1.3.46-1.

Modified: ledger-smb/trunk/debian/README.Debian
===================================================================
--- ledger-smb/trunk/debian/README.Debian	2015-05-03 16:05:22 UTC (rev 721)
+++ ledger-smb/trunk/debian/README.Debian	2016-04-09 15:05:01 UTC (rev 722)
@@ -87,7 +87,7 @@
     If you want to perform the installation of the company database completely
     manually, you should consult the 'prepare-company-database.sh' or the
     'dbsetup.pl' scripts which are available in the /usr/share/ledgersmb/tools/
-    directory as the authorative documentation of the steps to perform.
+    directory as the authoritative documentation of the steps to perform.
 
 
 Company database removal

Modified: ledger-smb/trunk/debian/changelog
===================================================================
--- ledger-smb/trunk/debian/changelog	2015-05-03 16:05:22 UTC (rev 721)
+++ ledger-smb/trunk/debian/changelog	2016-04-09 15:05:01 UTC (rev 722)
@@ -1,3 +1,41 @@
+ledgersmb (1.3.47-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Changes to debian/control:
+    - Set the Vcs-Browser URL to use 'https' instead of 'http'.
+    - Set Standards-Version to 3.9.8, no package changes required.
+    - Change texlive-xetex from 'Suggests' to 'Recommends' to work around issues
+      with using liblatex-driver-perl needed for printing.
+  * Changes to debian/copyright:
+    - Add 'Nick Prater' copyright information.
+    - Correct spelling of 'Portugese' to 'Portuguese'.
+    - Update end years in debian/copyright as necessary.
+  * Changes to debian/patches/*:
+    - Create debian/patches/22_SpellingErrors.patch.
+    - Add 'Origin: vendor' to the debian/patches/*.patch files.
+    - Remove unneeded line 5 in debian/patches/20_BashPath.patch.
+    - Refresh debian/patches/10_httpdconf.patch for updated package.
+    - Set default for the 'contrib_dir' setting in 05_confdir.patch to be for
+      v9.5 instead of v9.1.
+  * Correct spelling of 'authorative' as 'authoritative' in the file
+    debian/README.Debian.
+  * Default to 'true' in debian/templates to automatically configure package.
+  * Changes to debian/ledgersmb.preinst and debian/ledgersmb.postrm:
+    - Update the package version to v1.3.18-2 that is being checked for in the
+      ledgersmb apache config file renaming.
+  * Changes to debian/ledgersmb.postinst:
+    - Explicitly do 'db_stop' after operations with debconf have completed.
+    - Rewrite how apache 2.4 modules are enabled and how the apache v2.2 related
+      configuration files are handled. (Closes: #800036, #819481, LP#1513691)
+
+ -- Robert James Clay <jame at rocasa.us>  Fri, 08 Apr 2016 11:15:15 -0400
+
+ledgersmb (1.3.46-1~bpo8+1) jessie-backports; urgency=medium
+
+  * Rebuild for jessie-backports.
+
+ -- Robert James Clay <jame at rocasa.us>  Tue, 26 May 2015 09:36:37 -0400
+
 ledgersmb (1.3.46-1) unstable; urgency=medium
 
   * New upstream release. (Closes: #771822)

Modified: ledger-smb/trunk/debian/control
===================================================================
--- ledger-smb/trunk/debian/control	2015-05-03 16:05:22 UTC (rev 721)
+++ ledger-smb/trunk/debian/control	2016-04-09 15:05:01 UTC (rev 722)
@@ -9,10 +9,10 @@
                dh-linktree,
                libjs-prototype,
                libjs-scriptaculous
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Homepage: http://www.ledgersmb.org/
 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/
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-sql-ledger/ledger-smb/trunk/
 
 Package: ledgersmb
 Architecture: all
@@ -44,9 +44,9 @@
             libopenoffice-oodoc-perl,
             libparse-recdescent-perl,
             libtemplate-plugin-latex-perl,
-            texlive-latex-recommended
-Suggests: texlive-xetex,
-          latex-cjk-all,
+            texlive-latex-recommended,
+            texlive-xetex
+Suggests: latex-cjk-all,
           libimage-size-perl,
           libnet-tclink-perl,
           libplack-perl,

Modified: ledger-smb/trunk/debian/copyright
===================================================================
--- ledger-smb/trunk/debian/copyright	2015-05-03 16:05:22 UTC (rev 721)
+++ ledger-smb/trunk/debian/copyright	2016-04-09 15:05:01 UTC (rev 722)
@@ -12,11 +12,12 @@
             1999-2006, DWS Systems Inc.
 
 Files: *
-Copyright:  2006-2014, Chris Travers <chris at metatrontech.com>
+Copyright:  2006-2015, 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-2015, Erik Huelsmann <ehuels at gmail.com>
             2011-2014, John Locke <john at freelock.com>
+                 2014, Nick Prater <nick at npbroadcast.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>
@@ -66,7 +67,7 @@
 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>
+           2009-2016, 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
@@ -305,7 +306,7 @@
 License: GPL-2+
 
 Files: locale/po/pt.po
-Comment: Portugese texts
+Comment: Portuguese texts
 Copyright:  2001, Paulo Rodrigues <prodrigues at vianetworks.pt>
 License: GPL-2+
 

Modified: ledger-smb/trunk/debian/ledgersmb.postinst
===================================================================
--- ledger-smb/trunk/debian/ledgersmb.postinst	2015-05-03 16:05:22 UTC (rev 721)
+++ ledger-smb/trunk/debian/ledgersmb.postinst	2016-04-09 15:05:01 UTC (rev 722)
@@ -44,11 +44,17 @@
         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 -- "$@"
+                /etc/apache2/conf.d/ledgersmb-httpd.conf /etc/apache2/conf.d/ledgersmb.conf 1.3.18-2~ 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 $?
+                if ! a2query -qm cgi ; then
+                    apache2_invoke enmod cgi || exit $?
+                fi
+                if ! a2query -qm rewrite ; then
+                    apache2_invoke enmod rewrite || exit $?
+                fi
                 [ ! -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
@@ -57,6 +63,7 @@
                 [ ! -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 cgi
                     a2enmod rewrite
                 fi
                 # Restart apache
@@ -77,6 +84,7 @@
             # Configure database administrative user
             /usr/share/ledgersmb/tools/config-lsmb-db-user.sh $LSMBDBUSER $LSMBDBPW
         fi
+        db_stop
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: ledger-smb/trunk/debian/ledgersmb.postrm
===================================================================
--- ledger-smb/trunk/debian/ledgersmb.postrm	2015-05-03 16:05:22 UTC (rev 721)
+++ ledger-smb/trunk/debian/ledgersmb.postrm	2016-04-09 15:05:01 UTC (rev 722)
@@ -62,7 +62,7 @@
     abort-install|abort-upgrade)
         # 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 -- "$@"
+        /etc/apache2/conf.d/ledgersmb-httpd.conf /etc/apache2/conf.d/ledgersmb.conf 1.3.18-2~ ledgersmb -- "$@"
     ;;
 
     upgrade|failed-upgrade|disappear)

Modified: ledger-smb/trunk/debian/ledgersmb.preinst
===================================================================
--- ledger-smb/trunk/debian/ledgersmb.preinst	2015-05-03 16:05:22 UTC (rev 721)
+++ ledger-smb/trunk/debian/ledgersmb.preinst	2016-04-09 15:05:01 UTC (rev 722)
@@ -39,7 +39,7 @@
         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 -- "$@"
+        /etc/apache2/conf.d/ledgersmb-httpd.conf /etc/apache2/conf.d/ledgersmb.conf 1.3.18-2~ ledgersmb -- "$@"
     ;;
 
     install|abort-upgrade)

Modified: ledger-smb/trunk/debian/patches/05_confdir.patch
===================================================================
--- ledger-smb/trunk/debian/patches/05_confdir.patch	2015-05-03 16:05:22 UTC (rev 721)
+++ ledger-smb/trunk/debian/patches/05_confdir.patch	2016-04-09 15:05:01 UTC (rev 722)
@@ -1,6 +1,7 @@
 Author: Robert James Clay <jame at rocasa.us>
 Description: Change default directories
-Last-Update: 2015-04-12
+Origin: vendor
+Last-Update: 2016-04-06
 --- a/LedgerSMB/Sysconfig.pm
 +++ b/LedgerSMB/Sysconfig.pm
 @@ -20,8 +20,8 @@
@@ -92,7 +93,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.4/extension
++contrib_dir = /usr/share/postgresql/9.5/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	2015-05-03 16:05:22 UTC (rev 721)
+++ ledger-smb/trunk/debian/patches/10_httpdconf.patch	2016-04-09 15:05:01 UTC (rev 722)
@@ -1,6 +1,7 @@
 Author: Robert James Clay <jame at rocasa.us>
 Description: Changing paths in Apache config
-Last-Update: 2014-03-11
+Origin: vendor
+Last-Update: 2016-03-11
 --- a/ledgersmb-httpd.conf.template
 +++ b/ledgersmb-httpd.conf.template
 @@ -1,8 +1,8 @@
@@ -75,7 +76,7 @@
  
    # Rewrite rule to allow HTTP Authorization information to the scripts only
    # from this directory.
-@@ -35,22 +35,30 @@
+@@ -35,22 +35,29 @@
    </Files>
  </Directory>
  
@@ -101,13 +102,12 @@
  
 -<Directory WORKING_DIR/LedgerSMB>
 +<Directory /usr/share/ledgersmb/LedgerSMB>
-   Require all denied
- </Directory>
++  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>
++  Require ip 127.0.0.1
++  Require host localhost
+   Require all denied
+ </Directory>

Modified: ledger-smb/trunk/debian/patches/15_UI-setup-credentials.patch
===================================================================
--- ledger-smb/trunk/debian/patches/15_UI-setup-credentials.patch	2015-05-03 16:05:22 UTC (rev 721)
+++ ledger-smb/trunk/debian/patches/15_UI-setup-credentials.patch	2016-04-09 15:05:01 UTC (rev 722)
@@ -1,6 +1,7 @@
 Author: Robert James Clay <jame at rocasa.us>
 Description: Set 'ledgersmb' as the default database superuser in setup.pl.
-Last-Update: 2012-04-18
+Origin: vendor
+Last-Update: 2015-12-09
 --- a/UI/setup/credentials.html
 +++ b/UI/setup/credentials.html
 @@ -10,7 +10,7 @@

Modified: ledger-smb/trunk/debian/patches/20_BashPath.patch
===================================================================
--- ledger-smb/trunk/debian/patches/20_BashPath.patch	2015-05-03 16:05:22 UTC (rev 721)
+++ ledger-smb/trunk/debian/patches/20_BashPath.patch	2016-04-09 15:05:01 UTC (rev 722)
@@ -1,6 +1,7 @@
 Author: Robert James Clay <jame at rocasa.us>
 Description: Correct path for Bash in tools scripts.
-Last-Update: 2013-01-30
+Origin: vendor
+Last-Update: 2015-12-09
 --- a/tools/rebuild_pot.sh
 +++ b/tools/rebuild_pot.sh
 @@ -1,4 +1,4 @@

Modified: ledger-smb/trunk/debian/patches/21_lsmb_13-fcgi-conf.patch
===================================================================
--- ledger-smb/trunk/debian/patches/21_lsmb_13-fcgi-conf.patch	2015-05-03 16:05:22 UTC (rev 721)
+++ ledger-smb/trunk/debian/patches/21_lsmb_13-fcgi-conf.patch	2016-04-09 15:05:01 UTC (rev 722)
@@ -1,6 +1,7 @@
 Author: Robert James Clay <jame at rocasa.us>
 Description: Set WORKDIR path in LedgerSMB Apache FCGI confiuration files.
-Last-Update: 2014-03-23
+Origin: vendor
+Last-Update: 2015-12-09
 --- a/tools/lsmb_13-fcgi.conf
 +++ b/tools/lsmb_13-fcgi.conf
 @@ -1,13 +1,13 @@

Added: ledger-smb/trunk/debian/patches/22_SpellingErrors.patch
===================================================================
--- ledger-smb/trunk/debian/patches/22_SpellingErrors.patch	                        (rev 0)
+++ ledger-smb/trunk/debian/patches/22_SpellingErrors.patch	2016-04-09 15:05:01 UTC (rev 722)
@@ -0,0 +1,46 @@
+Author: Robert James Clay <jame at rocasa.us>
+Description: Correct minor spelling errors in LedgerSMB/DBObject/Payment.pm.
+Origin: vendor
+Last-Update: 2016-03-31
+--- a/LedgerSMB/DBObject/Payment.pm
++++ b/LedgerSMB/DBObject/Payment.pm
+@@ -281,7 +281,7 @@
+ =item $payment->get_open_invoice()
+ 
+ This function is an especific case of get_open_invoices(), because get_open_invoice() 
+-can search for a specific invoice, wich can be searched by the $payment->{invnumber} 
++can search for a specific invoice, which can be searched by the $payment->{invnumber} 
+ variable 
+ 
+ =back
+@@ -421,7 +421,7 @@
+ This method gets a list of the open currencies inside the database, it requires that  
+ $self->{account_class} (must be 1 or 2)  exist to work. 
+ 
+-WARNING THIS IS NOT BEEING USED BY THE SINGLE PAYMENT SYSTEM.... 
++WARNING THIS IS NOT BEING USED BY THE SINGLE PAYMENT SYSTEM.... 
+ 
+ =back
+ 
+--- a/LedgerSMB/DBObject.pm
++++ b/LedgerSMB/DBObject.pm
+@@ -36,7 +36,7 @@
+ it will be up to the application to handle any exceptions.
+ 
+ =item __validate__ is called on every new() invocation.  It is blank in this 
+-module but can be overridden in decendant modules.
++module but can be overridden in descendant modules.
+ 
+ =item _db_array_scalars(@elements) creates a db array from scalars.
+ 
+--- a/LedgerSMB/File.pm
++++ b/LedgerSMB/File.pm
+@@ -279,7 +279,7 @@
+ 
+ =item get
+ 
+-Retrives a file.  ID and file_class properties must be set.
++Retrieves a file.  ID and file_class properties must be set.
+ 
+ =cut
+ 

Modified: ledger-smb/trunk/debian/patches/series
===================================================================
--- ledger-smb/trunk/debian/patches/series	2015-05-03 16:05:22 UTC (rev 721)
+++ ledger-smb/trunk/debian/patches/series	2016-04-09 15:05:01 UTC (rev 722)
@@ -3,3 +3,4 @@
 15_UI-setup-credentials.patch
 20_BashPath.patch
 21_lsmb_13-fcgi-conf.patch
+22_SpellingErrors.patch

Modified: ledger-smb/trunk/debian/templates
===================================================================
--- ledger-smb/trunk/debian/templates	2015-05-03 16:05:22 UTC (rev 721)
+++ ledger-smb/trunk/debian/templates	2016-04-09 15:05:01 UTC (rev 722)
@@ -25,7 +25,7 @@
 
 Template: ledgersmb/debconf_install
 Type: boolean
-Default: false
+Default: true
 _Description: Configure LedgerSMB automatically?
  The configuration program for the package can automatically configure
  some aspects of LedgerSMB, such as the LedgerSMB database user.




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