[Pkg-xmpp-commits] [SCM] jsjac package from xmpp team branch, master, updated. upstream/1.3.1-43-g3d66874

Thadeu Lima de Souza Cascardo cascardo at holoscopio.com
Tue Aug 24 17:30:24 UTC 2010


The following commit has been merged in the master branch:
commit 7b735b71aa9dfa03401e1496579c45bd858549e1
Author: Thadeu Lima de Souza Cascardo <cascardo at holoscopio.com>
Date:   Mon Aug 23 00:30:12 2010 -0300

    jsjac currently does not work without its copy of xmlextras.
    
    This reverts commit 34f2c85bfceda310ba0eda86916d1f218cd9af30:
    "libjs-jac should depend on libjs-xmlextras, instead of shiping its copy."
    
    This reverts commit 7b123a42acb77eb6231b7f0a51a4e9d2b90b7860:
    "Adding xmlextras references in README.Debian"

diff --git a/Makefile b/Makefile
index 577b714..16668a0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 OUTFILE=./jsjac.js
 PACKFILE=./jsjac.packed.js
 UNCOMPRESSED=./jsjac.uncompressed.js
-SRC=src/jsextras.js src/crypt.js src/JSJaCJSON.js \
+SRC=src/jsextras.js src/crypt.js src/JSJaCJSON.js src/xmlextras.js \
 src/JSJaCBuilder.js src/JSJaCConstants.js \
 src/JSJaCConsoleLogger.js src/JSJaCCookie.js src/JSJaCError.js \
 src/JSJaCJID.js src/JSJaCKeys.js src/JSJaCPacket.js src/JSJaCConnection.js \
diff --git a/debian/README.Debian b/debian/README.Debian
index a46ea6b..1ec79c1 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -5,9 +5,7 @@ In order to make use of jsjac in your html, include the following lines in
 your html header:
 
 	<script language="javascript" type="text/javascript"
-	src="/javascript/xmlextras/xmlextras.js"></script>
-
-	<script language="javascript" type="text/javascript"
 	src="/javascript/jsjac/jsjac.js"></script>
 
+
  -- Marcelo Jorge Vieira (metal) <metal at alucinados.com>  Sat, 05 Apr 2008 12:14:09 -0300
diff --git a/debian/changelog b/debian/changelog
index edf317d..1d8011c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,6 @@ jsjac (1.3.2+dfsg-1) unstable; urgency=high
   * Imported Upstream version 1.3.2
   * Changing my email for Debian address
   * Using minified file instead of creating a symlink to it
-  * Adding xmlextras references in README.Debian
 
   [ Thadeu Lima de Souza Cascardo (with mentoring from metal) ]
   * Imported Upstream version 1.3.2+dfsg. Remove some non-free files.
diff --git a/debian/control b/debian/control
index 705fc24..ac8415f 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xmpp/jsjac.git;a=summary
 
 Package: libjs-jac
 Architecture: all
-Depends: ${misc:Depends}, libjs-xmlextras
+Depends: ${misc:Depends}
 Recommends: javascript-common
 Suggests: ejabberd
 Description: JavaScript Jabber Client Library

-- 
jsjac package from xmpp team



More information about the Pkg-xmpp-commits mailing list