[Pkg-javascript-commits] [simile-timeline] 01/01: add changes by stapelberg at debian.org for version 2.3.0+dfsg-0.1 to git repository

[Wolfgang Borgert]

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

debacle pushed a commit to branch master
in repository simile-timeline.

commit 862ed362095bcbc14509ac5d089e81bc425be947
Author: Michael Stapelberg <stapelberg at debian.org>
Date:   Sat Jan 17 11:46:49 2015 +0100

    add changes by stapelberg at debian.org for version 2.3.0+dfsg-0.1 to git repository
---
 debian/changelog                   |  8 +++++
 debian/control                     |  2 +-
 debian/patches/ant-build-xml.patch | 61 ++++++++++++++++++++++++++++++++++++++
 debian/rules                       | 11 +++++++
 4 files changed, 81 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e3a8bf4..0bc6055 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+simile-timeline (2.3.0+dfsg-0.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Use timeline_source instead of timeline_libraries as orig tarball since
+    the latter contains already-minified scripts (Closes: #645133)
+
+ -- Michael Stapelberg <stapelberg at debian.org>  Wed, 05 Dec 2012 20:12:41 +0100
+
 simile-timeline (2.3.0-1) unstable; urgency=low
 
   * Initial release. (Closes: #511548)
diff --git a/debian/control b/debian/control
index c00e85e..a325983 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: web
 Priority: optional
 Maintainer: Debian Javascript Maintainers <pkg-javascript-devel at lists.alioth.debian.org>
 Uploaders: Chris Lamb <lamby at debian.org>
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7), ant | ant1.7, yui-compressor
 Standards-Version: 3.8.1
 Homepage: http://www.simile-widgets.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-javascript/simile-timeline.git
diff --git a/debian/patches/ant-build-xml.patch b/debian/patches/ant-build-xml.patch
new file mode 100644
index 0000000..ec206a2
--- /dev/null
+++ b/debian/patches/ant-build-xml.patch
@@ -0,0 +1,61 @@
+--- simile-timeline-2.3.0/build.xml	2009-03-05 18:06:44.000000000 +0100
++++ O3/build.xml	2012-12-05 21:32:56.223655366 +0100
+@@ -14,15 +14,9 @@
+   
+   <target name="all" depends="timeline_source.zip, timeline_libraries.zip" />
+ 
+-  <target name="tasks">
+-    <taskdef name="jsmin"
+-        classname="edu.mit.simile.jsminTask.JSMinTask"
+-        classpath="tools/jsminTask.jar"/>
+-  </target>
+-  	
+-  <target name="bundle" depends="tasks">
++  <target name="bundle">
+     <!-- SimileAjax -->
+-    <jsmin output="src/ajax/api/simile-ajax-bundle.js">
++    <concat destfile="src/ajax/api/simile-ajax-bundle.uncompressed.js">
+         <fileset dir="src/ajax/api/scripts">
+             <include name="jquery*.js" />
+             <include name="platform.js" />
+@@ -33,15 +27,29 @@
+             <exclude name="jquery*.js" />
+             <exclude name="platform.js" />
+         </fileset>
+-    </jsmin>
++    </concat>
+   	
++    <exec executable="yui-compressor">
++      <arg value="-o"/>
++      <arg value="src/ajax/api/simile-ajax-bundle.js"/>
++      <arg line="src/ajax/api/simile-ajax-bundle.uncompressed.js"/>
++    </exec>
++
+   	<!-- Timeline -->
+-    <jsmin output="src/webapp/api/timeline-bundle.js">
++    <concat destfile="src/webapp/api/timeline-bundle.uncompressed.js">
+         <fileset dir="src/webapp/api/scripts">
+         	<include name="*.js" />
+         </fileset>
+-  	</jsmin>
++    </concat>
+   	
++    <exec executable="yui-compressor">
++      <arg value="-o"/>
++      <arg value="src/webapp/api/timeline-bundle.js"/>
++      <arg value="src/webapp/api/timeline-bundle.uncompressed.js"/>
++    </exec>
++
++    <delete file="src/webapp/api/timeline-bundle.uncompressed.js"/>
++
+     <concat destfile="src/webapp/api/timeline-bundle.css">
+         <fileset dir="src/webapp/api/styles">
+         	<include name="**/*.css" />
+@@ -136,7 +144,6 @@
+          duplicate="fail"
+          includes="timeline_${version}/**"
+     />  
+-    <delete dir="timeline_${version}"/>
+   </target>
+ 
+ </project>
diff --git a/debian/rules b/debian/rules
index cbe925d..4917414 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,3 +1,14 @@
 #!/usr/bin/make -f
+
+override_dh_auto_clean:
+	rm -rf timeline_2.3.0
+	rm -f timeline_libraries.zip
+
+override_dh_auto_build:
+	ant timeline_libraries.zip
+
+override_dh_auto_install:
+	cp -r timeline_2.3.0/* $(CURDIR)/
+
 %:
 	dh $@

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