[Pkg-erlang-commits] r1777 - erlang/trunk/debian

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2016-06-15 12:25:52 +0000 (Wed, 15 Jun 2016)
New Revision: 1777

Modified:
   erlang/trunk/debian/changelog
   erlang/trunk/debian/control
   erlang/trunk/debian/rules
Log:
[erlang]
  * New upstream minor release (closes: #827363).
  * Switched to Github for downloading the code because the minor updates
    haven't been released as tarballs on erlang.org.
  * Added libxml2-utils to the build dependencies because of xmllint (it
    is required for building docs).
  * Bumped standards version to 3.9.7.


Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog	2016-04-03 07:30:12 UTC (rev 1776)
+++ erlang/trunk/debian/changelog	2016-06-15 12:25:52 UTC (rev 1777)
@@ -1,8 +1,13 @@
-erlang (1:18.3-dfsg-2) UNRELEASED; urgency=medium
+erlang (1:18.3.4+dfsg-1) unstable; urgency=medium
 
-  * NOT RELEASED YET
+  * New upstream minor release (closes: #827363).
+  * Switched to Github for downloading the code because the minor updates
+    haven't been released as tarballs on erlang.org.
+  * Added libxml2-utils to the build dependencies because of xmllint (it
+    is required for building docs).
+  * Bumped standards version to 3.9.7.
 
- -- Sergei Golovan <sgolovan at debian.org>  Thu, 17 Mar 2016 22:51:19 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Wed, 15 Jun 2016 15:19:45 +0300
 
 erlang (1:18.3-dfsg-1) unstable; urgency=medium
 

Modified: erlang/trunk/debian/control
===================================================================
--- erlang/trunk/debian/control	2016-04-03 07:30:12 UTC (rev 1776)
+++ erlang/trunk/debian/control	2016-06-15 12:25:52 UTC (rev 1777)
@@ -3,13 +3,13 @@
 Uploaders: Sergei Golovan <sgolovan at debian.org>
 Section: interpreters
 Priority: optional
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
 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,
  libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev,
  libsctp-dev [linux-any], libsystemd-dev [linux-any], dh-systemd
-Build-Depends-Indep: fop, default-jdk | sun-java6-jdk
+Build-Depends-Indep: libxml2-utils, fop, default-jdk | sun-java6-jdk
 Build-Conflicts: autoconf2.13, libwxgtk2.4-dev, libwxgtk2.6-dev, libwxgtk2.8-dev
 Homepage: http://www.erlang.org/
 Vcs-Svn: svn://anonscm.debian.org/pkg-erlang/erlang/trunk/

Modified: erlang/trunk/debian/rules
===================================================================
--- erlang/trunk/debian/rules	2016-04-03 07:30:12 UTC (rev 1776)
+++ erlang/trunk/debian/rules	2016-06-15 12:25:52 UTC (rev 1777)
@@ -103,6 +103,7 @@
 	for i in `find ${ROOT_DIR} -name 'config.sub~'` ; do \
 	    mv $$i $${i%%\~} ; \
 	done
+	rm -f lib/configure.in
 	#
 	# Remove files, which were generated from templates
 	for i in debian/*.in debian/scripts/*.in ; do \
@@ -163,11 +164,8 @@
 	done
 	#
 	# Regenerate configure scripts using autoconf
-	for i in `find ${ROOT_DIR} -not \( -wholename '*/.pc' -prune \) \
-				    -a -name 'configure.in' -printf "%h\n"`; do \
-	    echo "autoconf'ing $${i}"; \
-	    (cd $${i} && autoconf) \
-	done
+	./otp_build autoconf
+	#
 	touch automake-stamp
 
 configure-hipe: configure-hipe-stamp
@@ -503,22 +501,24 @@
 
 binary: binary-indep binary-arch
 
-REL=18.3
+REL=18.3.4
 RELDIR=$(REL)
-DEB_REL=$(REL)-dfsg
+DEB_REL=$(REL)+dfsg
 
 get-orig-source:
 	CURDIR=`pwd` && TMPDIR=`mktemp -d /tmp/erlang.XXXXXX` && \
 	cd $$TMPDIR && \
-	wget -O - http://www.erlang.org/download/otp_src_$(REL).tar.gz | tar -zx && \
-	(cd otp_src_$(RELDIR) && \
+	wget -O - https://github.com/erlang/otp/archive/OTP-$(REL).tar.gz | tar -zx && \
+	(cd otp-OTP-$(REL) && \
 	 if ./otp_build save_bootstrap ; then \
 	    for f in `cat prebuilt.files` ; do rm -f $$f ; done \
 	 fi) && \
-	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) && \
+	(cd otp-OTP-$(REL)/erts && autoheader) && \
+	(cd otp-OTP-$(REL)/lib/erl_interface && autoheader) && \
+	rm -rvf otp-OTP-$(REL)/lib/*/doc/standard/ && \
+	rm -rvf otp-OTP-$(REL)/lib/*/doc/archive/ && \
+	rm -rvf otp-OTP-$(REL)/lib/common_test/priv/*.js && \
+	tar -Jcf $$CURDIR/erlang_$(DEB_REL).orig.tar.xz otp-OTP-$(REL) && \
 	rm -rf $$TMPDIR
 
 .PHONY: clean automake install build build-arch build-indep