[Pkg-sql-ledger-commit] r712 - in ledger-smb/branches/v1.3/debian: . patches
pkg-sql-ledger-commit-owner at lists.alioth.debian.org
pkg-sql-ledger-commit-owner at lists.alioth.debian.org
Thu Aug 14 14:11:49 UTC 2014
Author: jame-guest
Date: 2014-08-14 14:11:49 +0000 (Thu, 14 Aug 2014)
New Revision: 712
Added:
ledger-smb/branches/v1.3/debian/ledgersmb.linktrees
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/copyright
ledger-smb/branches/v1.3/debian/ledgersmb.lintian-overrides
ledger-smb/branches/v1.3/debian/patches/05_confdir.patch
ledger-smb/branches/v1.3/debian/rules
Log:
Merge (squash) 1.3.41-1~4 from the 'debian13-dev' branch
Modified: ledger-smb/branches/v1.3/debian/NEWS
===================================================================
--- ledger-smb/branches/v1.3/debian/NEWS 2014-08-06 07:11:50 UTC (rev 711)
+++ ledger-smb/branches/v1.3/debian/NEWS 2014-08-14 14:11:49 UTC (rev 712)
@@ -1,4 +1,4 @@
-ledgersmb (1.3.40-1) unstable; urgency=medium
+ledgersmb (1.3.41-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> Sat, 21 Jun 2014 10:42:27 -0400
+ -- Robert James Clay <jame at rocasa.us> Thu, 17 Jul 2014 13:25:44 -0400
Modified: ledger-smb/branches/v1.3/debian/README.Debian
===================================================================
--- ledger-smb/branches/v1.3/debian/README.Debian 2014-08-06 07:11:50 UTC (rev 711)
+++ ledger-smb/branches/v1.3/debian/README.Debian 2014-08-14 14:11:49 UTC (rev 712)
@@ -44,7 +44,10 @@
which will need to be updated manually when upgrading from a previous
version.
+ The PDF/Postscript support for the 'xedemo' LaTex templates is available as
+ the package texlive-xetex if it is not already installed.
+
Optional Perl modules
=====================
@@ -62,7 +65,7 @@
it is not already installed.
The PDF/Postscript support is available as libtemplate-plugin-latex-perl
- if it is not already installed.
+ if it is not already installed.
The scripting engine support is available as libparse-recdescent-perl
if it is not already installed.
Modified: ledger-smb/branches/v1.3/debian/TODO
===================================================================
--- ledger-smb/branches/v1.3/debian/TODO 2014-08-06 07:11:50 UTC (rev 711)
+++ ledger-smb/branches/v1.3/debian/TODO 2014-08-14 14:11:49 UTC (rev 712)
@@ -3,9 +3,7 @@
====================================================================================================
-------------------------------------------------------------------------------------
-
- 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
@@ -21,7 +19,7 @@
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
+- 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
@@ -59,6 +57,4 @@
-
-- 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-08-06 07:11:50 UTC (rev 711)
+++ ledger-smb/branches/v1.3/debian/changelog 2014-08-14 14:11:49 UTC (rev 712)
@@ -1,3 +1,18 @@
+ledgersmb (1.3.41-1~4) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ * Correct a copyright email address in the debian/copyright file.
+ * Use dh-linktree for embedded libjs-prototype and libjs-libjs-scriptaculous
+ libraries.
+ * Add libjs-prototype & libjs-scriptaculous to Build-Depends in debian/control.
+ * Add texlive-xetex as a 'Suggests' in debian/control.
+ * The contrib_dir setting in 05_confdir.patch only needed for Pg v9.1,
+ * Add note regarding texlive-xetex to the debian/README.Debian file.
+ * Only include the overrides for the 'custom' empty directories in the
+ ledgersmb.lintian-overrides.
+
+ -- Robert James Clay <jame at rocasa.us> Thu, 14 Aug 2014 08:18:37 -0400
+
ledgersmb (1.3.40-1) unstable; urgency=medium
* New upstream release.
Modified: ledger-smb/branches/v1.3/debian/control
===================================================================
--- ledger-smb/branches/v1.3/debian/control 2014-08-06 07:11:50 UTC (rev 711)
+++ ledger-smb/branches/v1.3/debian/control 2014-08-14 14:11:49 UTC (rev 712)
@@ -3,7 +3,12 @@
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), libmodule-install-perl, po-debconf
+Build-Depends: debhelper (>= 8),
+ po-debconf,
+ libmodule-install-perl,
+ dh-linktree,
+ libjs-prototype,
+ libjs-scriptaculous
Standards-Version: 3.9.5
Homepage: http://www.ledgersmb.org/
Vcs-Svn: svn://anonscm.debian.org/pkg-sql-ledger/ledger-smb/trunk
@@ -23,6 +28,8 @@
libfile-mimeinfo-perl,
libhtml-parser-perl,
libio-stringy-perl,
+ libjs-prototype,
+ libjs-scriptaculous,
liblocale-maketext-lexicon-perl (>= 0.62-1),
liblog-log4perl-perl,
libmime-lite-perl,
@@ -38,7 +45,8 @@
libparse-recdescent-perl,
libtemplate-plugin-latex-perl,
texlive-latex-recommended
-Suggests: latex-cjk-all,
+Suggests: texlive-xetex,
+ latex-cjk-all,
libimage-size-perl,
libnet-tclink-perl,
libplack-perl,
Modified: ledger-smb/branches/v1.3/debian/copyright
===================================================================
--- ledger-smb/branches/v1.3/debian/copyright 2014-08-06 07:11:50 UTC (rev 711)
+++ ledger-smb/branches/v1.3/debian/copyright 2014-08-14 14:11:49 UTC (rev 712)
@@ -14,7 +14,7 @@
Files: *
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>
+ 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>
@@ -104,30 +104,16 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-Files: UI/ajax/scriptaculous/*
-Comment: Licensing and copyright of the embedded Scriptaculous Javascript library,
+Files: UI/ajax/scriptaculous/lib/prototype.js
+Comment: Licensing and copyright of the embedded Prototype Javascript library.
+Copyright: 2005-2008 Sam Stephenson
+License: MIT
+
+Files: UI/ajax/scriptaculous/src/*
+Comment: Licensing and copyright of the embedded Scriptaculous Javascript library.
Copyright: 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
License: MIT
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
- .
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
Files: locale/po/ar_EG.po
Comment: Egypt Arabic texts
Copyright: 2003, Omar BaheyEldin <o at ab2.com>
@@ -388,3 +374,24 @@
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
Added: ledger-smb/branches/v1.3/debian/ledgersmb.linktrees
===================================================================
--- ledger-smb/branches/v1.3/debian/ledgersmb.linktrees (rev 0)
+++ ledger-smb/branches/v1.3/debian/ledgersmb.linktrees 2014-08-14 14:11:49 UTC (rev 712)
@@ -0,0 +1,10 @@
+replace usr/share/javascript/scriptaculous/builder.js usr/share/ledgersmb/UI/ajax/scriptaculous/src/builder.js
+replace usr/share/javascript/scriptaculous/controls.js usr/share/ledgersmb/UI/ajax/scriptaculous/src/controls.js
+replace usr/share/javascript/scriptaculous/dragdrop.js usr/share/ledgersmb/UI/ajax/scriptaculous/src/dragdrop.js
+replace usr/share/javascript/scriptaculous/effects.js usr/share/ledgersmb/UI/ajax/scriptaculous/src/effects.js
+replace usr/share/javascript/prototype/prototype.js usr/share/ledgersmb/UI/ajax/scriptaculous/lib/prototype.js
+replace usr/share/javascript/scriptaculous/scriptaculous.js usr/share/ledgersmb/UI/ajax/scriptaculous/src/scriptaculous.js
+replace usr/share/javascript/scriptaculous/slider.js usr/share/ledgersmb/UI/ajax/scriptaculous/src/slider.js
+replace usr/share/javascript/scriptaculous/sound.js usr/share/ledgersmb/UI/ajax/scriptaculous/src/sound.js
+replace usr/share/javascript/scriptaculous/unittest.js usr/share/ledgersmb/UI/ajax/scriptaculous/src/unittest.js
+
Modified: ledger-smb/branches/v1.3/debian/ledgersmb.lintian-overrides
===================================================================
--- ledger-smb/branches/v1.3/debian/ledgersmb.lintian-overrides 2014-08-06 07:11:50 UTC (rev 711)
+++ ledger-smb/branches/v1.3/debian/ledgersmb.lintian-overrides 2014-08-14 14:11:49 UTC (rev 712)
@@ -2,15 +2,3 @@
ledgersmb binary: package-contains-empty-directory usr/share/ledgersmb/bin/custom/
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/
-
-# Upstream now includes an embedded copy of the Scriptaculous Javascript Library. There is a package for it
-# available in Debian but not of the same version they are using. They have not done any testing but they
-# do not use "a lot of advanced stuff" so it may work. Override warning until it can be tested with the
-# versions that are available in Debian.
-ledgersmb binary: embedded-javascript-library usr/share/ledgersmb/UI/ajax/scriptaculous/lib/prototype.js
-ledgersmb binary: embedded-javascript-library usr/share/ledgersmb/UI/ajax/scriptaculous/src/scriptaculous.js
-#
Modified: ledger-smb/branches/v1.3/debian/patches/05_confdir.patch
===================================================================
--- ledger-smb/branches/v1.3/debian/patches/05_confdir.patch 2014-08-06 07:11:50 UTC (rev 711)
+++ ledger-smb/branches/v1.3/debian/patches/05_confdir.patch 2014-08-14 14:11:49 UTC (rev 712)
@@ -1,6 +1,6 @@
Author: Robert James Clay <jame at rocasa.us>
Description: Change default directories
-Last-Update: 2014-04-03
+Last-Update: 2014-08-13
--- a/LedgerSMB/Sysconfig.pm
+++ b/LedgerSMB/Sysconfig.pm
@@ -20,8 +20,8 @@
@@ -92,7 +92,7 @@
#contrib_dir PG_CONTRIB_DIR
#with postgresql-9.1 this stuff is in /usr/share/postgresql/9.1/extension and is injected in database with create extension pg_trgm,btree_gist...
-contrib_dir = /usr/share/pgsql/contrib/
-+contrib_dir = /usr/share/postgresql/9.3/extension
++contrib_dir = /usr/share/postgresql/9.1/extension
# sslmode can be require, allow, prefer, or disable. Defaults to prefer.
sslmode = prefer
Modified: ledger-smb/branches/v1.3/debian/rules
===================================================================
--- ledger-smb/branches/v1.3/debian/rules 2014-08-06 07:11:50 UTC (rev 711)
+++ ledger-smb/branches/v1.3/debian/rules 2014-08-14 14:11:49 UTC (rev 712)
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
%:
- dh $@
+ dh $@ --with linktree
override_dh_auto_configure:
rm -f Build.PL
More information about the Pkg-sql-ledger-commit
mailing list