[Pkg-erlang-commits] r1586 - in erlang/trunk/debian: . patches

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2014-01-27 17:57:56 +0000 (Mon, 27 Jan 2014)
New Revision: 1586

Added:
   erlang/trunk/debian/patches/javascript.patch
Modified:
   erlang/trunk/debian/changelog
   erlang/trunk/debian/control
   erlang/trunk/debian/erlang-common-test.links.in
   erlang/trunk/debian/patches/series
   erlang/trunk/debian/rules
Log:
  * New upstream bugfix release.
  * Removed lib/common_test/priv/*.js from the source because they are
    minified Javascript files without source. Also, added libjs-jquery and
    libjs-jquery-tablesorter to the erlang-common-test dependencies
    (closes: #735896).
  * Bumped standards version to 3.9.5.


Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog	2014-01-18 11:37:21 UTC (rev 1585)
+++ erlang/trunk/debian/changelog	2014-01-27 17:57:56 UTC (rev 1586)
@@ -1,8 +1,14 @@
-erlang (1:16.b.3-dfsg-2) UNRELEASED; urgency=low
+erlang (1:16.b.3.1-dfsg-1) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream bugfix release.
+  * Refreshed patches.
+  * Removed lib/common_test/priv/*.js from the source because they are
+    minified Javascript files without source. Also, added libjs-jquery and
+    libjs-jquery-tablesorter to the erlang-common-test dependencies
+    (closes: #735896).
+  * Bumped standards version to 3.9.5.
 
- -- Sergei Golovan <sgolovan at debian.org>  Thu, 12 Dec 2013 12:35:37 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Mon, 27 Jan 2014 21:46:45 +0400
 
 erlang (1:16.b.3-dfsg-1) unstable; urgency=low
 

Modified: erlang/trunk/debian/control
===================================================================
--- erlang/trunk/debian/control	2014-01-18 11:37:21 UTC (rev 1585)
+++ erlang/trunk/debian/control	2014-01-27 17:57:56 UTC (rev 1586)
@@ -3,7 +3,7 @@
 Uploaders: Sergei Golovan <sgolovan at debian.org>
 Section: interpreters
 Priority: optional
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Build-Depends: debhelper (>= 8.0.0), autoconf (>= 2.50), openssl, libssl-dev, m4,
  libncurses5-dev, autotools-dev, unixodbc-dev, bison, flex, ed,
  libwxgtk3.0-dev, dctrl-tools, xsltproc,
@@ -77,7 +77,7 @@
 
 Package: erlang-common-test
 Architecture: any
-Depends: ${erlang-base}, erlang-crypto (= ${binary:Version}), erlang-debugger (= ${binary:Version}), erlang-inets (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), erlang-snmp (= ${binary:Version}), erlang-ssh (= ${binary:Version}), erlang-test-server (= ${binary:Version}), erlang-tools (= ${binary:Version}), erlang-webtool (= ${binary:Version}), erlang-xmerl (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${erlang-base}, erlang-crypto (= ${binary:Version}), erlang-debugger (= ${binary:Version}), erlang-inets (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), erlang-snmp (= ${binary:Version}), erlang-ssh (= ${binary:Version}), erlang-test-server (= ${binary:Version}), erlang-tools (= ${binary:Version}), erlang-webtool (= ${binary:Version}), erlang-xmerl (= ${binary:Version}), libjs-jquery, libjs-jquery-tablesorter, ${shlibs:Depends}, ${misc:Depends}
 Suggests: erlang, erlang-manpages, erlang-doc
 Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc (<< ${source:Upstream-Version}), erlang-doc (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
 Description: Erlang/OTP application for automated testing

Modified: erlang/trunk/debian/erlang-common-test.links.in
===================================================================
--- erlang/trunk/debian/erlang-common-test.links.in	2014-01-18 11:37:21 UTC (rev 1585)
+++ erlang/trunk/debian/erlang-common-test.links.in	2014-01-27 17:57:56 UTC (rev 1586)
@@ -1 +1,3 @@
 usr/lib/erlang/bin/ct_run	usr/bin/ct_run
+usr/share/javascript/jquery/jquery.min.js   usr/lib/erlang/lib/common-test- at COMMON_TEST_VSN@/priv/jquery-latest.js
+usr/share/javascript/jquery-tablesorter/jquery.tablesorter.min.js   usr/lib/erlang/lib/common-test- at COMMON_TEST_VSN@/priv/jquery.tablesorter.min.js

Added: erlang/trunk/debian/patches/javascript.patch
===================================================================
--- erlang/trunk/debian/patches/javascript.patch	                        (rev 0)
+++ erlang/trunk/debian/patches/javascript.patch	2014-01-27 17:57:56 UTC (rev 1586)
@@ -0,0 +1,11 @@
+--- a/lib/common_test/priv/Makefile.in
++++ b/lib/common_test/priv/Makefile.in
+@@ -60,7 +60,7 @@
+ SCRIPTS = 
+ IMAGES = tile1.jpg
+ CSS = ct_default.css
+-JS = jquery-latest.js jquery.tablesorter.min.js 
++JS =
+ 
+ #
+ # Rules

Modified: erlang/trunk/debian/patches/series
===================================================================
--- erlang/trunk/debian/patches/series	2014-01-18 11:37:21 UTC (rev 1585)
+++ erlang/trunk/debian/patches/series	2014-01-27 17:57:56 UTC (rev 1586)
@@ -8,3 +8,4 @@
 java.patch
 hppa.patch
 powerpc.patch
+javascript.patch

Modified: erlang/trunk/debian/rules
===================================================================
--- erlang/trunk/debian/rules	2014-01-18 11:37:21 UTC (rev 1585)
+++ erlang/trunk/debian/rules	2014-01-27 17:57:56 UTC (rev 1586)
@@ -489,9 +489,9 @@
 
 binary: binary-indep binary-arch
 
-REL=R16B03
-RELDIR=R16B03
-DEB_REL=16.b.3-dfsg
+REL=R16B03-1
+RELDIR=R16B03-1
+DEB_REL=16.b.3.1-dfsg
 
 get-orig-source:
 	CURDIR=`pwd` && TMPDIR=`mktemp -d /tmp/erlang.XXXXXX` && \
@@ -502,6 +502,7 @@
 	 for f in `cat prebuilt.files` ; do rm -f $$f ; done) && \
 	rm -rvf otp_src_$(RELDIR)/lib/*/doc/standard/ && \
 	rm -rvf otp_src_$(RELDIR)/lib/*/doc/archive/ && \
+	rm -rvf otp_src_$(RELDIR)/lib/common_test/priv/*.js && \
 	tar -Jcf $$CURDIR/erlang_$(DEB_REL).orig.tar.xz otp_src_$(RELDIR) && \
 	rm -rf $$TMPDIR