[Pkg-javascript-commits] [dojo] 10/18: Imported Debian patch 1.4.3+dfsg1-1

David Prévot taffit at alioth.debian.org
Fri Oct 25 19:59:06 UTC 2013


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository dojo.

commit 44b350a36dec93c67923b0b4f0f1dfff12aea09c
Merge: 8182891 9200980
Author: Jason Morawski <rpgdude1 at gmail.com>
Date:   Sun Aug 8 19:55:01 2010 -0400

    Imported Debian patch 1.4.3+dfsg1-1

 .pc/.quilt_patches                                |    1 -
 .pc/.quilt_series                                 |    1 -
 .pc/.version                                      |    1 -
 debian/README.Debian                              |    8 +
 debian/README.source                              |    8 +
 debian/changelog                                  |   10 +
 debian/control                                    |    1 -
 debian/libjs-dojo-dojox.README.Debian             |    3 +-
 debian/libjs-dojo-dojox.dirs                      |    1 -
 debian/rules                                      |    3 -
 dojox/form/resources/uploader.swf                 |  Bin 16890 -> 0 bytes
 dojox/storage/AirDBStorageProvider.js             |  177 ---------
 dojox/storage/AirEncryptedLocalStorageProvider.js |  168 ---------
 dojox/storage/AirFileStorageProvider.js           |  174 ---------
 dojox/storage/FlashStorageProvider.js             |  211 -----------
 dojox/storage/GearsStorageProvider.js             |  230 ------------
 dojox/storage/Provider.js                         |   69 ----
 dojox/storage/README                              |   76 ----
 dojox/storage/Storage.as                          |  402 ---------------------
 dojox/storage/Storage.swf                         |  Bin 3325 -> 0 bytes
 dojox/storage/WhatWGStorageProvider.js            |  156 --------
 dojox/storage/_common.js                          |   17 -
 dojox/storage/buildFlashStorage.sh                |    4 -
 dojox/storage/manager.js                          |  117 ------
 dojox/storage/storage_dialog.fla                  |  Bin 344064 -> 0 bytes
 dojox/storage/storage_dialog.swf                  |  Bin 26980 -> 0 bytes
 26 files changed, 27 insertions(+), 1811 deletions(-)

diff --cc debian/README.Debian
index 22fa41d,0000000..ee45ae8
mode 100644,000000..100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@@ -1,10 -1,0 +1,18 @@@
 +dojo for Debian
 +---------------
 +
 +In order to make use of dojo in your html, include the following lines in
 +your html header:
 +
 +        <script type="text/javascript" src="/javascript/dojo/dojo.js">
 +	</script>
 +
 + -- Jason Morawski <rpgdude1 at gmail.com>  Fri, 14 Aug 2009 16:19:42 -0400
++
++If you use dojox.form.FileUploader, make sure you set the force property to
++html:
++
++	<div dojoType="dojox.form.FileUploader" force="html">
++	</div>
++
++ -- Jason Morawski <rpgdude1 at gmail.com>  Sun, 8 Aug 2010 19:47:00 -0400
diff --cc debian/README.source
index 001760a,0000000..50db468
mode 100644,000000..100644
--- a/debian/README.source
+++ b/debian/README.source
@@@ -1,5 -1,0 +1,13 @@@
 +The tarball on http://dojotoolkit.org/ does not include source code for the swf
 +files included in the dojox.av project. In addition to this, the dojox.av
 +project includes an mov file which is not redistributable and therefore does
 +not comply with the DFSG. The dojox.av project is therefore removed from the
 +dojo tarball until these issues are resolved upstream.
++
++The tarball also does not include source code for the uploader.swf file
++included in the dojox.form project. This file is also removed to comply with
++the DFSG.
++
++The dojox.storage project uses a swf file (storage_dialog.swf) that cannot be
++compiled using free build tools. The dojox.storage project is therefore removed
++from the dojo tarball.
diff --cc debian/changelog
index d79e0b6,0000000..9045746
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,0 +1,36 @@@
++dojo (1.4.3+dfsg1-1) unstable; urgency=low
++
++  * Removed uploader.swf and dojox.storage to comply with the DFSG
++    (Closes: #591961)
++  * Removed mtasc from libjs-dojo-dojox Suggests due to removal of the
++    dojox.storage project
++  * Updated README files to reflect DFSG changes
++
++ -- Jason Morawski <rpgdude1 at gmail.com>  Sun, 08 Aug 2010 19:55:01 -0400
++
 +dojo (1.4.3+dfsg-1) unstable; urgency=low
 +
 +  * New upstream version
 +
 + -- Jason Morawski <rpgdude1 at gmail.com>  Mon, 07 Jun 2010 08:40:01 -0400
 +
 +dojo (1.4.2+dfsg-1) unstable; urgency=low
 +
 +  * New upstream version
 +  * Cleaned up rules
 +  * Made corrections to libjs-dojo-dojox.README.Debian
 +
 + -- Jason Morawski <rpgdude1 at gmail.com>  Thu, 18 Mar 2010 18:03:37 -0400
 +
 +dojo (1.4.1+dfsg-1) unstable; urgency=low
 +
 +  * New upstream version (Closes: #568562)
 +
 + -- Jason Morawski <rpgdude1 at gmail.com>  Tue, 02 Feb 2010 18:56:56 -0500
 +
 +dojo (1.3.2+dfsg-1) unstable; urgency=low
 +
 +  * Initial release (Closes: #515637)
 +  * Removed dojox.av project to comply with the DFSG
 +
 + -- Jason Morawski <rpgdude1 at gmail.com>  Wed, 16 Aug 2009 16:19:42 -0400
diff --cc debian/control
index 662786e,0000000..4495d97
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,41 -1,0 +1,40 @@@
 +Source: dojo
 +Section: web
 +Priority: optional
 +Maintainer: Jason Morawski <rpgdude1 at gmail.com>
 +Uploaders: Frank Habermann <lordlamer at lordlamer.de>
 +Build-Depends: debhelper (>= 7)
 +Standards-Version: 3.8.4
 +Homepage: http://dojotoolkit.org
 +
 +Package: libjs-dojo-core
 +Architecture: all
 +Depends: ${misc:Depends}
 +Recommends: javascript-common, libjs-dojo-dijit, libjs-dojo-dojox
 +Description: Modular JavaScript toolkit
 + Dojo Toolkit is an open source modular JavaScript library
 + designed to ease the rapid development of cross platform,
 + JavaScript/Ajax based applications and web sites.
 + .
 + This package contains the core Dojo project.
 +
 +Package: libjs-dojo-dijit
 +Architecture: all
 +Depends: libjs-dojo-core (= ${binary:Version}), ${misc:Depends}
 +Recommends: libjs-dojo-dojox
 +Description: Modular JavaScript toolkit - Dijit
 + Dojo Toolkit is an open source modular JavaScript library
 + designed to ease the rapid development of cross platform,
 + JavaScript/Ajax based applications and web sites.
 + .
 + This package contains the Dijit widget system.
 +
 +Package: libjs-dojo-dojox
 +Architecture: all
 +Depends: libjs-dojo-dijit (= ${binary:Version}), ${misc:Depends}
- Suggests: mtasc
 +Description: Modular JavaScript toolkit - DojoX
 + Dojo Toolkit is an open source modular JavaScript library
 + designed to ease the rapid development of cross platform,
 + JavaScript/Ajax based applications and web sites.
 + .
 + This package contains modules from the DojoX project.
diff --cc debian/libjs-dojo-dojox.README.Debian
index c46a770,0000000..a8cf717
mode 100644,000000..100644
--- a/debian/libjs-dojo-dojox.README.Debian
+++ b/debian/libjs-dojo-dojox.README.Debian
@@@ -1,9 -1,0 +1,8 @@@
 +dojox for Debian
 +---------------
 +
 +Some files have been moved to /usr/share/doc/libjs-dojo-dojox/examples
 +These files include:
-       Source code for dojox.flash project
-       Scripts for rebuilding dojox/storage/Storage.swf
++      Source code for the dojox.flash project
 +
 + -- Jason Morawski <rpgdude1 at gmail.com>, Thu, 18 Mar 2010 18:18:19 -0400
diff --cc debian/libjs-dojo-dojox.dirs
index 95dba76,0000000..0514de2
mode 100644,000000..100644
--- a/debian/libjs-dojo-dojox.dirs
+++ b/debian/libjs-dojo-dojox.dirs
@@@ -1,2 -1,0 +1,1 @@@
 +usr/share/doc/libjs-dojo-dojox/examples/dojox/flash
- usr/share/doc/libjs-dojo-dojox/examples/dojox/storage
diff --cc debian/rules
index f91ba59,0000000..2723ce9
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,33 -1,0 +1,30 @@@
 +#!/usr/bin/make -f
 +
 +export DH_ALWAYS_EXCLUDE=LICENSE:build.txt
 +
 +clean:
 +	dh_testdir
 +	dh_testroot
 +	dh_clean
 +
 +build:
 +
 +binary: binary-indep
 +
 +binary-arch:
 +
 +binary-indep:
 +	dh_testdir
 +	dh_testroot
 +	dh_installchangelogs
 +	dh_installdirs
 +	dh_installdocs
 +	dh_install
 +	mv debian/libjs-dojo-dojox/usr/share/javascript/dojox/flash/*.as debian/libjs-dojo-dojox/usr/share/doc/libjs-dojo-dojox/examples/dojox/flash/
- 	mv debian/libjs-dojo-dojox/usr/share/javascript/dojox/storage/*.as debian/libjs-dojo-dojox/usr/share/doc/libjs-dojo-dojox/examples/dojox/storage/
- 	mv debian/libjs-dojo-dojox/usr/share/javascript/dojox/storage/*.fla debian/libjs-dojo-dojox/usr/share/doc/libjs-dojo-dojox/examples/dojox/storage/
- 	mv debian/libjs-dojo-dojox/usr/share/javascript/dojox/storage/*.sh debian/libjs-dojo-dojox/usr/share/doc/libjs-dojo-dojox/examples/dojox/storage/
 +	dh_compress
 +	dh_fixperms
 +	dh_gencontrol
 +	dh_md5sums
 +	dh_builddeb
 +
 +.PHONY: clean build install binary binary-arch binary-indep

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/dojo.git



More information about the Pkg-javascript-commits mailing list