[Pkg-javascript-commits] [SCM] Yahoo! User Interface Toolkit (yui) branch, master, updated. debian/2.8.1-1-10-g9fa2f48

Fri Jun 29 21:18:11 UTC 2012

The following commit has been merged in the master branch:
commit 9fa2f488aeddfcda5b96c0bf41b8df42b0180a51
Author: Jaldhar H. Vyas <jaldhar at debian.org>
Date:   Fri Jun 29 16:08:36 2012 -0400

    A few final packaging changes.

diff --git a/debian/changelog b/debian/changelog
index 9f4b278..c2b83b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
 yui (2.9.0-1) unstable; urgency=low
 
   * New upstream version.
-
- -- Jaldhar H. Vyas <jaldhar at debian.org>  Fri, 29 Jun 2012 02:20:10 -0400
+  * Several of the .swf files are now built from source and the rest have
+    been removed from the package.  (Closes: #591199)  
+  * Unfortunately the charts module also had to be removed even though there
+    is source code because it can only be compiled with Adobe Flash CS3 which
+    is non-free.  If anyone can figure out how to compile it with free software
+    I'll bring it back.
+
+ -- Jaldhar H. Vyas <jaldhar at debian.org>  Fri, 29 Jun 2012 15:39:52 -0400
 
 yui (2.8.2r1-1) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 447d477..2aba1cb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,38 +1,16 @@
-Author: Yahoo! Inc. http://groups.yahoo.com/group/ydn-javascript/
-Download: http://developer.yahoo.com/yui/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+upstream-Name: Yahoo! User Interface Toolkit V2
+Upstream-Contact: Yahoo! Inc. http://groups.yahoo.com/group/ydn-javascript/
+Source: http://developer.yahoo.com/yui2/
 
 Files: *
-Copyright: (C) 2006-2008 Yahoo! Inc.
+Copyright: (C) 2007-2012 Yahoo! Inc.
 License: BSD
- Redistribution and use of this software in source and binary forms,
- with or without modification, are permitted provided that the
- following conditions are met:
- .
-   * Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
- .
-   * Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
- .
-   * Neither the name of Yahoo! Inc. nor the names of its contributors
-     may be used to endorse or promote products derived from this
-     software without specific prior written permission of Yahoo! Inc.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Files: debian/*
-Copyright: (C) 2007-2008 Jaldhar H. Vyas <jaldhar at debian.org>
+Copyright: (C) 2007-2012 Jaldhar H. Vyas <jaldhar at debian.org>
+License: BSD
+
 License: BSD
  Redistribution and use of this software in source and binary forms,
  with or without modification, are permitted provided that the
diff --git a/debian/libjs-yui.NEWS.Debian b/debian/libjs-yui.NEWS.Debian
index 0b1ee0b..7a871d2 100644
--- a/debian/libjs-yui.NEWS.Debian
+++ b/debian/libjs-yui.NEWS.Debian
@@ -1,3 +1,12 @@
+yui (2.9.0-1) unstable; urgency=low
+
+  * The charts module and its examples have been removed from the package
+    because the charts flash applet can only be built with non-free software. 
+    If you can figure out how to compile it with free tools, I'll bring it 
+    back.
+    
+ -- Jaldhar H. Vyas <jaldhar at debian.org>  Fri, 29 Jun 2012 15:57:56 -0400
+
 yui (2.6.0-2) experimental; urgency=low
 
   The documentation and examples which used to be in this package have been 
diff --git a/debian/rules b/debian/rules
index 7c5b2d6..7dd7174 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,15 +32,20 @@ override_dh_install:
 	mv swfstore.swf ../../../build/swfstore
 
 override_dh_clean:
-	dh_clean
+	-rm -rf as-docs/Charts.html as-docs/com/yahoo/astra/fl/charts \
+	    as-docs/com/yahoo/yui/charts build/charts examples/charts examples/swf \
+	    examples/treeview/assets/css/default/tree.css.orig \
+	    releasenotes/README.charts
 	-find build -name "*.swf" | xargs rm
 	-find examples -name "*.swf" | xargs rm
+	dh_clean
 
 override_dh_compress:
 	dh_compress -i -X.js -X-js -X.json -X.php
 
 override_dh_installdocs:
 	dh_installdocs
+	dh_installexamples
 
 	# Adjusting file locations
 
@@ -61,3 +66,6 @@ override_dh_installdocs:
 
 	find debian/libjs-yui-doc/usr/share/doc/libjs-yui-doc/examples -name "*.html" | \
 	xargs perl -pi -e 's#\Q../../docs#/doc/libjs-yui-doc\E#g;'
+
+override_dh_installexamples:
+	# Examples are built along with the docs so file locations can be adjusted.

-- 
Yahoo! User Interface Toolkit (yui)

