[Pkg-sql-ledger-commit] r716 - in ledger-smb/branches/v1.3/debian: . po

pkg-sql-ledger-commit-owner at lists.alioth.debian.org pkg-sql-ledger-commit-owner at lists.alioth.debian.org
Wed Dec 17 11:19:05 UTC 2014


Author: jame-guest
Date: 2014-12-17 11:19:05 +0000 (Wed, 17 Dec 2014)
New Revision: 716

Added:
   ledger-smb/branches/v1.3/debian/po/nl.po
Modified:
   ledger-smb/branches/v1.3/debian/NEWS
   ledger-smb/branches/v1.3/debian/README.Debian
   ledger-smb/branches/v1.3/debian/TODO
   ledger-smb/branches/v1.3/debian/changelog
   ledger-smb/branches/v1.3/debian/control
   ledger-smb/branches/v1.3/debian/ledgersmb.postinst
   ledger-smb/branches/v1.3/debian/ledgersmb.postrm
   ledger-smb/branches/v1.3/debian/rules
Log:
Merge 1.3.46-1 from 'debian1.3' into 'pkgsvn-v1_3'.

Modified: ledger-smb/branches/v1.3/debian/NEWS
===================================================================
--- ledger-smb/branches/v1.3/debian/NEWS	2014-11-05 11:37:07 UTC (rev 715)
+++ ledger-smb/branches/v1.3/debian/NEWS	2014-12-17 11:19:05 UTC (rev 716)
@@ -1,4 +1,4 @@
-ledgersmb (1.3.46~rc2-1) unstable; urgency=medium
+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)
@@ -12,5 +12,5 @@
   in /usr/share/doc/ledgersmb/README.Debian.
 
 
- -- Robert James Clay <jame at rocasa.us>  Fri, 31 Oct 2014 13:55:25 -0400
+ -- Robert James Clay <jame at rocasa.us>  Wed,  5 Nov 2014 07:19:55 -0400
 

Modified: ledger-smb/branches/v1.3/debian/README.Debian
===================================================================
--- ledger-smb/branches/v1.3/debian/README.Debian	2014-11-05 11:37:07 UTC (rev 715)
+++ ledger-smb/branches/v1.3/debian/README.Debian	2014-12-17 11:19:05 UTC (rev 716)
@@ -26,23 +26,22 @@
 
 CREATE ROLE ledgersmb WITH SUPERUSER LOGIN NOINHERIT ENCRYPTED PASSWORD 'password';
 
+    You can use 'ALTER' instead of 'CREATE' if it was created incorrectly.
+
     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; or for
-    v9.3 that would be /usr/share/postgresql/9.3/extension.
+    scripts. 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 
-    the /usr/share/ledgersmb/tools directory. Also; some information for use 
+    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.
+    There is also a URL related configuration item in ledgersmb.conf, cssdir.
 
     The PDF/Postscript support for the 'xedemo' LaTex templates is available as
     the package texlive-xetex if it is not already installed.
@@ -96,4 +95,4 @@
 
 
 
- -- Robert James Clay <jame at rocasa.us>  Sat,  5 Apr 2014 13:28:40 -0400
+ -- Robert James Clay <jame at rocasa.us>  Thu, 11 Dec 2014 04:18:28 -0400

Modified: ledger-smb/branches/v1.3/debian/TODO
===================================================================
--- ledger-smb/branches/v1.3/debian/TODO	2014-11-05 11:37:07 UTC (rev 715)
+++ ledger-smb/branches/v1.3/debian/TODO	2014-12-17 11:19:05 UTC (rev 716)
@@ -20,22 +20,13 @@
 gets the necessary admin user and password; only need that in perhaps one
 liners that creates the user as neccessary and sets the password.
 
-- 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.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?
@@ -43,19 +34,13 @@
 - Create an HTML and/or PDF file of templateing/templating-guide.tex? And
 then register it with 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"?
+- 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.
 
-- Review the tools/* shell and perl scripts to determine what patches may be
-necessary to make them usable on a Debian installation. 
-
-- Instead of a sym link to point to the /etc/ledgersmb config file(s), 
+- 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
+ -- Robert James Clay <jame at rocasa.us>  Thu, 11 Dec 2014 02:33 -0500

Modified: ledger-smb/branches/v1.3/debian/changelog
===================================================================
--- ledger-smb/branches/v1.3/debian/changelog	2014-11-05 11:37:07 UTC (rev 715)
+++ ledger-smb/branches/v1.3/debian/changelog	2014-12-17 11:19:05 UTC (rev 716)
@@ -1,17 +1,23 @@
-ledgersmb (1.3.46~rc2-1) testing; urgency=medium
+ledgersmb (1.3.46-1) unstable; urgency=medium
 
-  * New upstream release.
+  * 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.
   * 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.
+  * Remove the use of drop_statoverride function from the maintainer scripts.
   * 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>  Sat, 01 Nov 2014 12:20:02 -0400
+ -- Robert James Clay <jame at rocasa.us>  Wed, 17 Dec 2014 05:08:48 -0500
 
 ledgersmb (1.3.40-1) unstable; urgency=medium
 

Modified: ledger-smb/branches/v1.3/debian/control
===================================================================
--- ledger-smb/branches/v1.3/debian/control	2014-11-05 11:37:07 UTC (rev 715)
+++ ledger-smb/branches/v1.3/debian/control	2014-12-17 11:19:05 UTC (rev 716)
@@ -9,7 +9,7 @@
                dh-linktree,
                libjs-prototype,
                libjs-scriptaculous
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 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/

Modified: ledger-smb/branches/v1.3/debian/ledgersmb.postinst
===================================================================
--- ledger-smb/branches/v1.3/debian/ledgersmb.postinst	2014-11-05 11:37:07 UTC (rev 715)
+++ ledger-smb/branches/v1.3/debian/ledgersmb.postinst	2014-12-17 11:19:05 UTC (rev 716)
@@ -20,18 +20,6 @@
 #  Set old_version variable for use later in the script.
 old_version=$2
 
-#   Remove these settings for /etc/ledgersmb/*, as dpkg-statoverride
-# is no longer being used in debian/postinst to set it
-drop_statoverride() {
-    for file in /etc/ledgersmb /etc/ledgersmb/images \
-        /etc/ledgersmb/images/demo /etc/ledgersmb/template ;
-    do
-        if dpkg-statoverride --list $file >/dev/null; then
-            dpkg-statoverride --remove $file
-        fi
-    done
-}
-
 dbc_first_version="1.3.14-2"
 dbc_dbtypes="pgsql"
 
@@ -80,11 +68,6 @@
                     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 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
         # If enabled, do the debconf supported configuration
         db_get ledgersmb/debconf_install

Modified: ledger-smb/branches/v1.3/debian/ledgersmb.postrm
===================================================================
--- ledger-smb/branches/v1.3/debian/ledgersmb.postrm	2014-11-05 11:37:07 UTC (rev 715)
+++ ledger-smb/branches/v1.3/debian/ledgersmb.postrm	2014-12-17 11:19:05 UTC (rev 716)
@@ -18,19 +18,6 @@
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
-#   Remove these settings for /etc/ledgersmb/*, as dpkg-statoverride
-# is no longer being used in debian/postinst to set it
-drop_statoverride() {
-    for file in /etc/ledgersmb /etc/ledgersmb/images \
-        /etc/ledgersmb/images/demo /etc/ledgersmb/templates \
-        /etc/ledgersmb/templates/*;
-    do
-        if dpkg-statoverride --list $file >/dev/null; then
-            dpkg-statoverride --remove $file
-        fi
-    done
-}
-
 if [ -f /usr/share/debconf/confmodule ]; then
     . /usr/share/debconf/confmodule
 fi
@@ -42,14 +29,6 @@
 fi
 
 case "$1" in
-    upgrade)
-        #   Remove these settings for /etc/ledgersmb/*, as dpkg-statoverride
-        # is no longer being used in debian/postinst to set it.
-        if dpkg --compare-versions $2 lt 1.3.9-2; then
-            drop_statoverride;
-        fi
-    ;;
-
     purge)
         # When being purged; if /var/lib/ledgersmb/css exists, remove it.
         if [ -d "/var/lib/ledgersmb/css" ]; then
@@ -102,7 +81,7 @@
        fi
     ;;
 
-    remove|failed-upgrade|disappear)
+    upgrade|remove|failed-upgrade|disappear)
     ;;
 
     *)

Added: ledger-smb/branches/v1.3/debian/po/nl.po
===================================================================
--- ledger-smb/branches/v1.3/debian/po/nl.po	                        (rev 0)
+++ ledger-smb/branches/v1.3/debian/po/nl.po	2014-12-17 11:19:05 UTC (rev 716)
@@ -0,0 +1,83 @@
+# Dutch translation of ledgersmb debconf templates.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the ledgersmb package.
+# Frans Spiesschaert <Frans.Spiesschaert at yucom.be>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ledgersmb\n"
+"Report-Msgid-Bugs-To: ledgersmb at packages.debian.org\n"
+"POT-Creation-Date: 2012-06-07 08:21+0200\n"
+"PO-Revision-Date: 2014-10-16 15:00+0200\n"
+"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
+"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n"
+"Language: nl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid "Database administrative user login:"
+msgstr "Gebruikersnaam van de databasebeheerder:"
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid ""
+"Please enter the login of the LedgerSMB database administrative user. This "
+"login is needed for the administrative web user interface, typically at "
+"http://localhost/ledgersmb/setup.pl."
+msgstr ""
+"Gelieve de gebruikersnaam in te voeren van de beheerder van de LedgerSMB-"
+"database. Deze gebruikersnaam is nodig voor de op het web gebaseerde "
+"gebruikersinterface voor beheerstaken, die gewoonlijk als adres http://"
+"localhost/ledgersmb/setup.pl heeft."
+
+#. Type: password
+#. Description
+#: ../templates:3001
+msgid "Database administrative user password:"
+msgstr "Wachtwoord van de databasebeheerder:"
+
+#. Type: password
+#. Description
+#: ../templates:3001
+msgid ""
+"Please enter the password of the LedgerSMB database administrative user. "
+"This password is needed for the administrative web user interface, typically "
+"at http://localhost/ledgersmb/setup.pl."
+msgstr ""
+"Gelieve het wachtwoord in te voeren van de beheerder van de LedgerSMB-"
+"database. Dit wachtwoord is nodig voor de op het web gebaseerde "
+"gebruikersinterface voor beheerstaken, die gewoonlijk als adres http://"
+"localhost/ledgersmb/setup.pl heeft."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid "Configure LedgerSMB automatically?"
+msgstr "LedgerSMB automatisch instellen?"
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"The configuration program for the package can automatically configure some "
+"aspects of LedgerSMB, such as the LedgerSMB database user."
+msgstr ""
+"Het configuratieprogramma van het pakket kan sommige aspecten van LedgerSMB "
+"automatisch instellen, zoals de gebruiker van het gegevensbestand van "
+"LedgerSMB."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"More general information about the initial configuration of the application "
+"can be found in /usr/share/doc/ledgersmb/README.Debian."
+msgstr ""
+"Meer algemene informatie over de initiële configuratie van deze toepassing "
+"vindt u in /usr/share/doc/ledgersmb/README.Debian."

Modified: ledger-smb/branches/v1.3/debian/rules
===================================================================
--- ledger-smb/branches/v1.3/debian/rules	2014-11-05 11:37:07 UTC (rev 715)
+++ ledger-smb/branches/v1.3/debian/rules	2014-12-17 11:19:05 UTC (rev 716)
@@ -22,6 +22,7 @@
 
 override_dh_fixperms:
 	dh_fixperms
+	chmod -x debian/ledgersmb/usr/share/ledgersmb/bin/gl.pl
 	chmod -x debian/ledgersmb/usr/share/ledgersmb/locale/po/*
 	chmod -x debian/ledgersmb/usr/share/ledgersmb/locale/html/splash.html
 	chmod +x debian/ledgersmb/usr/share/ledgersmb/Reconciliation.pl




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