[Pkg-erlang-commits] r1809 - in erlang/branches/r19rc/debian: . manpages patches patterns scripts

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Sat Aug 13 07:56:23 UTC 2016 

Author: sgolovan
Date: 2016-08-13 07:56:23 +0000 (Sat, 13 Aug 2016)
New Revision: 1809

Removed:
   erlang/branches/r19rc/debian/erlang-webtool.links.in
   erlang/branches/r19rc/debian/erlang-webtool.manpages
   erlang/branches/r19rc/debian/patterns/erlang-webtool.patterns
Modified:
   erlang/branches/r19rc/debian/changelog
   erlang/branches/r19rc/debian/control
   erlang/branches/r19rc/debian/erlang-manpages.postinst
   erlang/branches/r19rc/debian/manpages/erlang-depends.1
   erlang/branches/r19rc/debian/patches/clean.patch
   erlang/branches/r19rc/debian/patterns/erlang-src.patterns
   erlang/branches/r19rc/debian/rules
   erlang/branches/r19rc/debian/scripts/analyse
Log:
[erlang-experimental]
  * New upstream bugfix release.
  * Dropped the erlang-webtool binary package since the corresponding
    application has been removed from the upstream distribution.


Modified: erlang/branches/r19rc/debian/changelog
===================================================================
--- erlang/branches/r19rc/debian/changelog	2016-07-31 04:22:32 UTC (rev 1808)
+++ erlang/branches/r19rc/debian/changelog	2016-08-13 07:56:23 UTC (rev 1809)
@@ -1,8 +1,10 @@
-erlang (1:19.0.2+dfsg-2) UNRELEASED; urgency=medium
+erlang (1:19.0.4+dfsg-1) experimental; urgency=medium
 
-  * NOT RELEASED YET
+  * New upstream bugfix release.
+  * Dropped the erlang-webtool binary package since the corresponding
+    application has been removed from the upstream distribution.
 
- -- Sergei Golovan <sgolovan at debian.org>  Fri, 15 Jul 2016 16:33:23 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Sat, 13 Aug 2016 10:52:09 +0300
 
 erlang (1:19.0.2+dfsg-1) experimental; urgency=medium
 
@@ -40,7 +42,7 @@
     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.
+  * Bumped standards version to 3.9.8.
 
  -- Sergei Golovan <sgolovan at debian.org>  Wed, 15 Jun 2016 15:19:45 +0300
 

Modified: erlang/branches/r19rc/debian/control
===================================================================
--- erlang/branches/r19rc/debian/control	2016-07-31 04:22:32 UTC (rev 1808)
+++ erlang/branches/r19rc/debian/control	2016-08-13 07:56:23 UTC (rev 1809)
@@ -68,7 +68,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}), libjs-jquery, libjs-jquery-tablesorter, ${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-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
@@ -308,7 +308,7 @@
 
 Package: erlang-observer
 Architecture: any
-Depends: ${erlang-base}, erlang-et (= ${binary:Version}), erlang-inets (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), erlang-webtool (= ${binary:Version}), erlang-wx (= ${binary:Version}), ${misc:Depends}
+Depends: ${erlang-base}, erlang-et (= ${binary:Version}), erlang-inets (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), erlang-wx (= ${binary:Version}), ${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 investigating distributed systems
@@ -455,7 +455,7 @@
 
 Package: erlang-tools
 Architecture: any
-Depends: ${erlang-base}, erlang-inets (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), erlang-webtool (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${erlang-base}, erlang-inets (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), ${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 various tools
@@ -490,16 +490,6 @@
  in Erlang code. It uses Dialyzer to infer variable types.
 
 
-Package: erlang-webtool
-Architecture: any
-Depends: ${erlang-base}, erlang-inets (= ${binary:Version}), ${misc:Depends}
-Suggests: erlang-observer (= ${binary:Version}), 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 helper for web-based tools
- WebTool provides an easy way to use web-based tools with Erlang/OTP.
- It configures and starts a web server as well as all available tools.
-
-
 Package: erlang-wx
 Architecture: any
 Depends: ${erlang-base}, ${shlibs:Depends}, ${misc:Depends}
@@ -591,7 +581,7 @@
  erlang-ic, erlang-inets, erlang-mnesia, erlang-odbc, erlang-os-mon,
  erlang-parsetools, erlang-percept, erlang-public-key, erlang-runtime-tools,
  erlang-snmp, erlang-ssh, erlang-ssl, erlang-syntax-tools, erlang-tools,
- erlang-webtool, erlang-xmerl, ${misc:Depends}
+ erlang-xmerl, ${misc:Depends}
 Suggests: erlang, erlang-manpages, erlang-doc
 Description: Erlang/OTP applications that don't require X Window System
  This package is a dummy package which will install all Erlang/OTP
@@ -622,8 +612,7 @@
  erlang-os-mon, erlang-parsetools, erlang-percept,
  erlang-public-key, erlang-reltool, erlang-runtime-tools, erlang-snmp,
  erlang-ssh, erlang-ssl, erlang-syntax-tools, erlang-test-server,
- erlang-tools, erlang-typer, erlang-webtool,
- erlang-wx, erlang-xmerl, ${misc:Depends}
+ erlang-tools, erlang-typer, erlang-wx, erlang-xmerl, ${misc:Depends}
 Recommends: erlang-jinterface, erlang-ic-java, erlang-mode, erlang-src,
  erlang-examples
 Suggests: erlang-manpages, erlang-doc

Modified: erlang/branches/r19rc/debian/erlang-manpages.postinst
===================================================================
--- erlang/branches/r19rc/debian/erlang-manpages.postinst	2016-07-31 04:22:32 UTC (rev 1808)
+++ erlang/branches/r19rc/debian/erlang-manpages.postinst	2016-08-13 07:56:23 UTC (rev 1809)
@@ -13,8 +13,7 @@
 		erlc \
 		escript \
 		run_erl \
-		start \
-		start_webtool ; do
+		start ; do
 	dpkg-divert --package erlang-manpages --remove --rename \
 		    --divert /usr/share/man/man1/$name.erlang.1.gz \
 			     /usr/share/man/man1/$name.1.gz >/dev/null

Deleted: erlang/branches/r19rc/debian/erlang-webtool.links.in
===================================================================
--- erlang/branches/r19rc/debian/erlang-webtool.links.in	2016-07-31 04:22:32 UTC (rev 1808)
+++ erlang/branches/r19rc/debian/erlang-webtool.links.in	2016-08-13 07:56:23 UTC (rev 1809)
@@ -1 +0,0 @@
-usr/lib/erlang/lib/webtool- at WEBTOOL_VSN@/priv/bin/start_webtool	usr/bin/start_webtool

Deleted: erlang/branches/r19rc/debian/erlang-webtool.manpages
===================================================================
--- erlang/branches/r19rc/debian/erlang-webtool.manpages	2016-07-31 04:22:32 UTC (rev 1808)
+++ erlang/branches/r19rc/debian/erlang-webtool.manpages	2016-08-13 07:56:23 UTC (rev 1809)
@@ -1 +0,0 @@
-#debian/erlang-docs/usr/lib/erlang/man/man1/start_webtool.1

Modified: erlang/branches/r19rc/debian/manpages/erlang-depends.1
===================================================================
--- erlang/branches/r19rc/debian/manpages/erlang-depends.1	2016-07-31 04:22:32 UTC (rev 1808)
+++ erlang/branches/r19rc/debian/manpages/erlang-depends.1	2016-08-13 07:56:23 UTC (rev 1809)
@@ -125,7 +125,7 @@
 .\" ========================================================================
 .\"
 .IX Title "ERLANG-DEPENDS 1"
-.TH ERLANG-DEPENDS 1 "2014\-10\-05" "1:17.3\-dfsg\-2" "Erlang packages for Debian GNU/Linux"
+.TH ERLANG-DEPENDS 1 "2016\-08\-13" "1:19.0.4\-dfsg\-2" "Erlang packages for Debian GNU/Linux"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -183,7 +183,6 @@
 ${erlang\-test-server:Depends},
 ${erlang\-tools:Depends},
 ${erlang\-typer:Depends},
-${erlang\-webtool:Depends},
 ${erlang\-wx:Depends},
 ${erlang\-xmerl:Depends}.
 .PP
@@ -211,6 +210,10 @@
 were dropped in version 1:17.3\-dfsg\-2 of erlang\-dev package because the
 pman, toolbar and tv applications were removed from the Erlang distribution.
 .PP
+Variable ${erlang\-webtool:Depends} was dropped in version 1:19.0.4+dfsg\-1
+of erlang\-dev package because the webtool application was removed from the
+Erlang distribution.
+.PP
 For compatibility with older versions the variables
 ${erlang\-nox:Depends} and ${erlang\-x11:Depends} also work (even since the
 corresponding packages turned into dummy packages).

Modified: erlang/branches/r19rc/debian/patches/clean.patch
===================================================================
--- erlang/branches/r19rc/debian/patches/clean.patch	2016-07-31 04:22:32 UTC (rev 1808)
+++ erlang/branches/r19rc/debian/patches/clean.patch	2016-08-13 07:56:23 UTC (rev 1809)
@@ -13,7 +13,7 @@
  
  distclean: clean
  	find . -type f -name SKIP              -print | xargs $(RM)
-@@ -1121,3 +1122,209 @@
+@@ -1121,3 +1122,208 @@
  		|| $(MAKE) BOOTSTRAP_ROOT=$(BOOTSTRAP_ROOT) bootstrap_root_clean
  
  # ----------------------------------------------------------------------
@@ -171,7 +171,6 @@
 +	rm -rf $(ERL_TOP)/lib/test_server/src/configure
 +	rm -rf $(ERL_TOP)/lib/tools/c_src/$(TARGET)
 +	rm -rf $(ERL_TOP)/lib/tools/src/xref_parser.erl
-+	rm -rf $(ERL_TOP)/lib/webtool/ebin/webtool.appup
 +	rm -rf $(ERL_TOP)/lib/wx/config.log
 +	rm -rf $(ERL_TOP)/lib/wx/config.mk
 +	rm -rf $(ERL_TOP)/lib/wx/c_src/$(TARGET)

Modified: erlang/branches/r19rc/debian/patterns/erlang-src.patterns
===================================================================
--- erlang/branches/r19rc/debian/patterns/erlang-src.patterns	2016-07-31 04:22:32 UTC (rev 1808)
+++ erlang/branches/r19rc/debian/patterns/erlang-src.patterns	2016-08-13 07:56:23 UTC (rev 1809)
@@ -63,7 +63,6 @@
 ./usr/lib/erlang/lib/tools-.*/c_src/
 ./usr/lib/erlang/lib/tools-.*/src/
 ./usr/lib/erlang/lib/typer-.*/src/
-./usr/lib/erlang/lib/webtool-.*/src/
 ./usr/lib/erlang/lib/wx-.*/src/
 ./usr/lib/erlang/lib/xmerl-.*/src/
 ./usr/lib/erlang/releases/.*\.src

Deleted: erlang/branches/r19rc/debian/patterns/erlang-webtool.patterns
===================================================================
--- erlang/branches/r19rc/debian/patterns/erlang-webtool.patterns	2016-07-31 04:22:32 UTC (rev 1808)
+++ erlang/branches/r19rc/debian/patterns/erlang-webtool.patterns	2016-08-13 07:56:23 UTC (rev 1809)
@@ -1 +0,0 @@
-./usr/lib/erlang/lib/webtool-.*/

Modified: erlang/branches/r19rc/debian/rules
===================================================================
--- erlang/branches/r19rc/debian/rules	2016-07-31 04:22:32 UTC (rev 1808)
+++ erlang/branches/r19rc/debian/rules	2016-08-13 07:56:23 UTC (rev 1809)
@@ -16,7 +16,6 @@
 -include ${ROOT_DIR}/lib/jinterface/vsn.mk
 -include ${ROOT_DIR}/lib/ic/vsn.mk
 -include ${ROOT_DIR}/lib/tools/vsn.mk
--include ${ROOT_DIR}/lib/webtool/vsn.mk
 -include ${ROOT_DIR}/lib/common_test/vsn.mk
 -include ${ROOT_DIR}/lib/snmp/vsn.mk
 -include ${ROOT_DIR}/lib/hipe/vsn.mk
@@ -299,13 +298,13 @@
 	dh_testdir
 	target=$$(basename $$(find make -type d |grep /)) ; \
 	PATH=$(ROOT_DIR)/bin:$$PATH ; \
-	for m in lib/diameter lib/snmp lib/dialyzer lib/erl_interface lib/common_test lib/webtool erts ; do \
+	for m in lib/diameter lib/snmp lib/dialyzer lib/erl_interface lib/common_test erts ; do \
 	    ${MAKE} -j ${JOBS} -C $$m/doc/src man ERL_TOP=$(ROOT_DIR) TARGET=$$target ; \
 	done
 	#
 	install -d $(MAN_DIR)/man1 $(MAN_DIR)/man3 ; \
 	install lib/dialyzer/doc/man3/*.3 $(MAN_DIR)/man3 ; \
-	for m in lib/diameter lib/snmp lib/erl_interface lib/common_test lib/webtool erts ; do \
+	for m in lib/diameter lib/snmp lib/erl_interface lib/common_test erts ; do \
 	    install $$m/doc/man1/*.1 $(MAN_DIR)/man1 ; \
 	done
 	#
@@ -374,7 +373,6 @@
 	     	-e's/@EI_VSN@/$(EI_VSN)/g' \
 	     	-e's/@JINTERFACE_VSN@/$(JINTERFACE_VSN)/g' \
 	     	-e's/@IC_VSN@/$(IC_VSN)/g' \
-		-e's/@WEBTOOL_VSN@/$(WEBTOOL_VSN)/g' \
 		-e's/@COMMON_TEST_VSN@/$(COMMON_TEST_VSN)/g' \
 		-e's/@SNMP_VSN@/$(SNMP_VSN)/g' \
 		-e's/@DIAMETER_VSN@/$(DIAMETER_VSN)/g' \
@@ -501,9 +499,9 @@
 
 binary: binary-indep binary-arch
 
-REL=19.0.2
+REL=19.0.4
 RELDIR=$(REL)
-DEB_REL=19.0.2+dfsg
+DEB_REL=19.0.4+dfsg
 
 get-orig-source:
 	CURDIR=`pwd` && TMPDIR=`mktemp -d /tmp/erlang.XXXXXX` && \

Modified: erlang/branches/r19rc/debian/scripts/analyse
===================================================================
--- erlang/branches/r19rc/debian/scripts/analyse	2016-07-31 04:22:32 UTC (rev 1808)
+++ erlang/branches/r19rc/debian/scripts/analyse	2016-08-13 07:56:23 UTC (rev 1809)
@@ -59,7 +59,7 @@
 	  edoc eldap erl-docgen et eunit gs ic-java ic inets jinterface megaco mnesia
 	  observer odbc os-mon parsetools percept public-key reltool
 	  runtime-tools snmp ssh ssl syntax-tools test-server tools
-	  typer webtool wx xmerl'
+	  typer wx xmerl'
 
 CMD='grep -v -E -e ./usr/lib/erlang/usr/include |
      grep -v -E -f debian/patterns/erlang-base.patterns |

More information about the Pkg-erlang-commits mailing list