[Pkg-tcltk-commits] r1674 - in openacs/trunk/debian: . patches source
geox-guest at alioth.debian.org
geox-guest at alioth.debian.org
Fri Oct 24 15:03:40 UTC 2014
Author: geox-guest
Date: 2014-10-24 15:03:40 +0000 (Fri, 24 Oct 2014)
New Revision: 1674
Removed:
openacs/trunk/debian/missing-sources/
Modified:
openacs/trunk/debian/README.Debian
openacs/trunk/debian/changelog
openacs/trunk/debian/control
openacs/trunk/debian/copyright
openacs/trunk/debian/openacs.lintian-overrides
openacs/trunk/debian/openacs.postinst
openacs/trunk/debian/patches/config.patch
openacs/trunk/debian/patches/xinha-iconset.patch
openacs/trunk/debian/repackage-upstream-src
openacs/trunk/debian/rules
openacs/trunk/debian/source/lintian-overrides
Log:
* New upstream release.
* Policy bumped to 3.9.6 without changes.
* missing-sources directory is no longer needed, as upstream included
unminified javascript files in the original tarball.
- Modified copyright file accordingly.
Modified: openacs/trunk/debian/README.Debian
===================================================================
--- openacs/trunk/debian/README.Debian 2014-09-11 05:36:37 UTC (rev 1673)
+++ openacs/trunk/debian/README.Debian 2014-10-24 15:03:40 UTC (rev 1674)
@@ -10,9 +10,6 @@
* /usr/share/openacs/packages/acs-templating/www/resources/xinha-nightly/images/tango/*
* /usr/share/openacs/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/media/img/flv_player.swf
* /usr/share/openacs/packages/acs-templating/www/resources/tinymce/examples/media/sample.swf
-* /usr/share/openacs/packages/acs-templating/www/resources/xinha-nightly/plugins/ImageManager/swfobject/expressinstall.swf
-* /usr/share/openacs/packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Assets/Swiff.Uploader.swf
-* /usr/share/openacs/packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Assets/dewplayer.swf
* /usr/share/openacs/packages/acs-content-repository/java/PerlTools.jar
- After Install
@@ -34,4 +31,4 @@
* http://openacs.org/xowiki/
- -- Hector Romojaro <hector.romojaro at gmail.com> Tue, 29 Dec 2009 12:16:39 +0100
+ -- Hector Romojaro <hector.romojaro at gmail.com> Tue, 21 Oct 2014 12:16:39 +0100
Modified: openacs/trunk/debian/changelog
===================================================================
--- openacs/trunk/debian/changelog 2014-09-11 05:36:37 UTC (rev 1673)
+++ openacs/trunk/debian/changelog 2014-10-24 15:03:40 UTC (rev 1674)
@@ -1,3 +1,13 @@
+openacs (5.8.1+dfsg-1) unstable; urgency=low
+
+ * New upstream release.
+ * Policy bumped to 3.9.6 without changes.
+ * missing-sources directory is no longer needed, as upstream included
+ unminified javascript files in the original tarball.
+ - Modified copyright file accordingly.
+
+ -- Hector Romojaro <hector.romojaro at gmail.com> Mon, 20 Oct 2014 12:13:22 +0200
+
openacs (5.8.0+dfsg-1) unstable; urgency=low
* New upstream release.
Modified: openacs/trunk/debian/control
===================================================================
--- openacs/trunk/debian/control 2014-09-11 05:36:37 UTC (rev 1673)
+++ openacs/trunk/debian/control 2014-10-24 15:03:40 UTC (rev 1674)
@@ -5,7 +5,7 @@
Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
Build-Depends-Indep: po-debconf
Build-Depends: debhelper (>=9)
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-tcltk/openacs/trunk
Vcs-Svn: svn://anonscm.debian.org/pkg-tcltk/openacs/trunk
Homepage: http://www.openacs.org/
Modified: openacs/trunk/debian/copyright
===================================================================
--- openacs/trunk/debian/copyright 2014-09-11 05:36:37 UTC (rev 1673)
+++ openacs/trunk/debian/copyright 2014-10-24 15:03:40 UTC (rev 1674)
@@ -33,23 +33,6 @@
License version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.
-Files: packages/acs-templating/www/resources/xinha-nightly/iconsets/Crystal/*
-Copyright: Copyright (c) 2006-2007 Everaldo Coelho.
-License: LGPL-2.1
-
-Files: packages/acs-templating/www/resources/tinymce/*
-Copyright: Copyright (c) 2003-2006 Moxiecode Systems AB
-License: LGPL-2.1
-
-Files: missing-sources/tinymce/*
-Copyright: Copyright (c) 2003-2006 Moxiecode Systems AB
-License: LGPL-2.1
-
-License: LGPL-2.1
- On Debian systems the full text of the GNU Lesser General Public
- License 2.1 can be found in the `/usr/share/common-licenses/LGPL-2.1'
- file.
-
Files: packages/acs-templating/www/resources/xinha-nightly/*
Copyright: Copyright (c) 2002-2004, interactivetools.com, inc.
Copyright (c) 2003-2004 dynarch.com
@@ -89,6 +72,19 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
+Files: packages/acs-templating/www/resources/xinha-nightly/iconsets/Crystal/*
+Copyright: Copyright (c) 2006-2007 Everaldo Coelho.
+License: LGPL-2.1
+
+Files: packages/acs-templating/www/resources/tinymce/*
+Copyright: Copyright (c) 2003-2006 Moxiecode Systems AB
+License: LGPL-2.1
+
+License: LGPL-2.1
+ On Debian systems the full text of the GNU Lesser General Public
+ License 2.1 can be found in the `/usr/share/common-licenses/LGPL-2.1'
+ file.
+
Files: packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/*
Copyright: Copyright (c) 2009 Christoph Pojer
License: Expat
Modified: openacs/trunk/debian/openacs.lintian-overrides
===================================================================
--- openacs/trunk/debian/openacs.lintian-overrides 2014-09-11 05:36:37 UTC (rev 1673)
+++ openacs/trunk/debian/openacs.lintian-overrides 2014-10-24 15:03:40 UTC (rev 1674)
@@ -19,12 +19,11 @@
openacs: script-not-executable usr/share/openacs/packages/acs-core-docs/www/files/startlsnr.txt
openacs: script-not-executable usr/share/openacs/packages/acs-core-docs/www/files/stoplsnr.txt
openacs: script-not-executable usr/share/openacs/packages/acs-core-docs/www/files/svgroup.txt
+openacs: script-not-executable usr/share/openacs/packages/acs-developer-support/www/doc/editlocal.sh.txt
# Override because the tinymce version provided is modified
-openacs: embedded-javascript-library usr/share/openacs/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/tiny_mce.js
-openacs: embedded-javascript-library usr/share/openacs/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/tiny_mce_popup.js
-openacs: embedded-javascript-library usr/share/openacs/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/tiny_mce_src.js
+openacs: embedded-javascript-library usr/share/openacs/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/tiny_mce_popup.js please use tinymce2?
+openacs: embedded-javascript-library usr/share/openacs/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/tiny_mce.js please use tinymce2?
+openacs: embedded-javascript-library usr/share/openacs/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/tiny_mce_src.js please use tinymce2?
# Mootools Debian package is a different version than this one.
-openacs: embedded-javascript-library usr/share/openacs/packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Demos/mootools-core.js
-openacs: embedded-javascript-library usr/share/openacs/packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Demos/mootools-more.js
-# libjs-swfobject Debian package is a different version than this one.
-openacs: embedded-javascript-library usr/share/openacs/packages/acs-templating/www/resources/xinha-nightly/plugins/ImageManager/swfobject/swfobject.js
+openacs: embedded-javascript-library usr/share/openacs/packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Demos/mootools-core.js please use libjs-mootools
+openacs: embedded-javascript-library usr/share/openacs/packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Demos/mootools-more.js please use libjs-mootools
Modified: openacs/trunk/debian/openacs.postinst
===================================================================
--- openacs/trunk/debian/openacs.postinst 2014-09-11 05:36:37 UTC (rev 1673)
+++ openacs/trunk/debian/openacs.postinst 2014-10-24 15:03:40 UTC (rev 1674)
@@ -74,6 +74,7 @@
# generated by other debhelper scripts.
#DEBHELPER#
+
db_stop
exit 0
Modified: openacs/trunk/debian/patches/config.patch
===================================================================
--- openacs/trunk/debian/patches/config.patch 2014-09-11 05:36:37 UTC (rev 1673)
+++ openacs/trunk/debian/patches/config.patch 2014-10-24 15:03:40 UTC (rev 1674)
@@ -99,15 +99,17 @@
}
# ns_section ns/db/pool/pool4
-@@ -627,7 +631,7 @@
+@@ -627,8 +631,8 @@
}
# nsthread library which should become standard in 5.3
-- ns_param libthread [lindex [glob ${homedir}/lib/thread*/libthread*[info sharedlibextension]] 0]
+- ns_param libthread [lindex [glob ${homedir}/lib/thread*/libthread*[info sharedlibextension]] end]
+-
+ ns_param libthread [lindex [glob /usr/lib/tcltk/thread*/libthread*-aolserver[info sharedlibextension]] 0]
-
++
if {[ns_info version] >= 4.5} {
ns_limits set default -maxupload [ns_config ns/server/${server}/module/nssock maxinput]
+ }
--- a/etc/daemontools/run
+++ b/etc/daemontools/run
@@ -9,7 +9,11 @@
Modified: openacs/trunk/debian/patches/xinha-iconset.patch
===================================================================
--- openacs/trunk/debian/patches/xinha-iconset.patch 2014-09-11 05:36:37 UTC (rev 1673)
+++ openacs/trunk/debian/patches/xinha-iconset.patch 2014-10-24 15:03:40 UTC (rev 1674)
@@ -7,6 +7,6 @@
<if @::acs_blank_master__htmlareas@ defined and @::xinha_dir@ defined and @::xinha_lang@ defined>
<script type="text/javascript">
+_editor_icons = "Classic";
- _editor_url = "@::xinha_dir@";
- _editor_lang = "@::xinha_lang@";
+ _editor_url = "@::xinha_dir;literal@";
+ _editor_lang = "@::xinha_lang;literal@";
</script>
Modified: openacs/trunk/debian/repackage-upstream-src
===================================================================
--- openacs/trunk/debian/repackage-upstream-src 2014-09-11 05:36:37 UTC (rev 1673)
+++ openacs/trunk/debian/repackage-upstream-src 2014-10-24 15:03:40 UTC (rev 1674)
@@ -17,10 +17,7 @@
--exclude "*/packages/acs-templating/www/resources/xinha-nightly/images/tango" \
--exclude "*/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/media/img/flv_player.swf" \
--exclude "*/packages/acs-templating/www/resources/tinymce/examples/media/sample.swf" \
- --exclude "*/packages/acs-templating/www/resources/xinha-nightly/plugins/ImageManager/swfobject/expressinstall.swf" \
- --exclude "*/packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Assets/Swiff.Uploader.swf" \
- --exclude "*/packages/acs-content-repository/java/PerlTools.jar" \
- --exclude "*/packages/acs-templating/www/resources/xinha-nightly/plugins/MootoolsFileManager/mootools-filemanager/Assets/dewplayer.swf"
+ --exclude "*/packages/acs-content-repository/java/PerlTools.jar"
# Repack as DFSG
tar cz -f $FILE $DIR
Modified: openacs/trunk/debian/rules
===================================================================
--- openacs/trunk/debian/rules 2014-09-11 05:36:37 UTC (rev 1673)
+++ openacs/trunk/debian/rules 2014-10-24 15:03:40 UTC (rev 1674)
@@ -26,7 +26,6 @@
# Deleting some unneeded files
rm debian/openacs/var/log/aolserver4/openacs/log.txt
- rm debian/openacs/usr/share/openacs/packages/acs-templating/www/resources/xinha-nightly/plugins/ImageManager/img/Thumbs.db
# Fixing permissions
find debian/openacs/usr -type f -exec chmod 0644 {} \;
Modified: openacs/trunk/debian/source/lintian-overrides
===================================================================
--- openacs/trunk/debian/source/lintian-overrides 2014-09-11 05:36:37 UTC (rev 1673)
+++ openacs/trunk/debian/source/lintian-overrides 2014-10-24 15:03:40 UTC (rev 1674)
@@ -84,7 +84,6 @@
openacs source: source-is-missing packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js
openacs source: source-contains-prebuilt-javascript-object packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/editor_template.js *
openacs source: source-is-missing packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/simple/editor_template.js
-# Source available in debian/missing-sources/tinymce/ (please read debian/missing-sources/README for details)
openacs source: source-contains-prebuilt-javascript-object packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/tiny_mce_popup.js *
openacs source: source-is-missing packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/tiny_mce_popup.js
openacs source: source-contains-prebuilt-javascript-object packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/langs/ar.js *
More information about the Pkg-tcltk-commits
mailing list