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

[Thadeu Lima de Souza Cascardo]

The following commit has been merged in the master branch:
commit 090c4ac6a750f2ff007e429da4a38d02cfaf4832
Author: Thadeu Lima de Souza Cascardo <cascardo at holoscopio.com>
Date:   Fri Aug 20 23:05:58 2010 -0300

    Do not use jsmin and pack file using PHP Javascript Packer.

diff --git a/Makefile b/Makefile
index 0474ae5..16668a0 100644
--- a/Makefile
+++ b/Makefile
@@ -8,9 +8,9 @@ src/JSJaCJID.js src/JSJaCKeys.js src/JSJaCPacket.js src/JSJaCConnection.js \
 src/JSJaCHttpBindingConnection.js src/JSJaCHttpPollingConnection.js \
 src/JSJaC.js
 
-all: clean utils install doc
+all: clean pack install doc
 
-install: build uncompressed crunch  
+install: build uncompressed
 	@echo "done."
 
 build: 
@@ -20,17 +20,7 @@ build:
 		cat "$$i" >> $(OUTFILE); \
 	done
 
-crunch: 
-	@echo "crunching ..."
-	@if [ -e $(OUTFILE) ]; then \
-		utils/jsmin < $(OUTFILE) > $(OUTFILE).tmp && \
-		cat src/header.js > $(OUTFILE) && \
-		cat src/JSJaCConfig.js >> $(OUTFILE) && \
-		cat $(OUTFILE).tmp >> $(OUTFILE) && \
-		rm $(OUTFILE).tmp; \
-	fi
-
-pack: clean utils build moo crunch doc
+pack: clean build moo doc
 
 moo:	
 	@echo "packing..."
@@ -47,14 +37,11 @@ moo:
 doc: 
 	@utils/JSDoc/jsdoc.pl --project-name JSJaC -d doc src/
 
-utils:
-	@make -C utils
 clean:
 	@rm -f $(OUTFILE) 2>/dev/null
 	@rm -f $(PACKFILE) 2>/dev/null
 	@rm -f $(UNCOMPRESSED) 2>/dev/null
 	@rm -rf doc/
-	@make -C utils clean
 
 uncompressed: 
 	@if [ -e $(OUTFILE) ]; then \
diff --git a/debian/control b/debian/control
index b5a20ae..9ba00a6 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@ Priority: optional
 Maintainer: Debian XMPP Maintainers <pkg-xmpp-devel at lists.alioth.debian.org>
 Uploaders: Marcelo Jorge Vieira (metal) <metal at alucinados.com>,
  Thadeu Lima de Souza Cascardo <cascardo at minaslivre.org>
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7), php5-cli, perl (>= 5.10),
+ libhtml-template-perl
 Standards-Version: 3.8.0
 Homepage: http://zeank.in-berlin.de/jsjac/
 Vcs-Git: git://git.debian.org/git/pkg-xmpp/jsjac.git/

-- 
jsjac package from xmpp team