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

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2015-08-03 07:37:27 +0000 (Mon, 03 Aug 2015)
New Revision: 1714

Added:
   wings3d/trunk/debian/patches/r18.diff
Modified:
   wings3d/trunk/debian/changelog
   wings3d/trunk/debian/control
   wings3d/trunk/debian/patches/series
Log:
[wings3d]
  * Fixed FTBFS with Erlang 18 due to calling deprecated function
    erlang:now/0 (closes: #791415).
  * Bumped standards version to 3.9.6.


Modified: wings3d/trunk/debian/changelog
===================================================================
--- wings3d/trunk/debian/changelog	2015-07-05 14:26:48 UTC (rev 1713)
+++ wings3d/trunk/debian/changelog	2015-08-03 07:37:27 UTC (rev 1714)
@@ -1,8 +1,10 @@
-wings3d (1.5.3-3) UNRELEASED; urgency=medium
+wings3d (1.5.3-3) unstable; urgency=medium
 
-  * NOT RELEASED YET
+  * Fixed FTBFS with Erlang 18 due to calling deprecated function
+    erlang:now/0 (closes: #791415).
+  * Bumped standards version to 3.9.6.
 
- -- Sergei Golovan <sgolovan at debian.org>  Mon, 29 Sep 2014 23:20:58 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Mon, 03 Aug 2015 10:30:37 +0300
 
 wings3d (1.5.3-2) unstable; urgency=low
 

Modified: wings3d/trunk/debian/control
===================================================================
--- wings3d/trunk/debian/control	2015-07-05 14:26:48 UTC (rev 1713)
+++ wings3d/trunk/debian/control	2015-08-03 07:37:27 UTC (rev 1714)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 8.0.0), grep-dctrl,
  erlang-dev (>= 1:15.b), erlang-esdl-dev (>= 1.2), erlang-cl,
  libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libjpeg-dev
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: http://www.wings3d.com
 
 

Added: wings3d/trunk/debian/patches/r18.diff
===================================================================
--- wings3d/trunk/debian/patches/r18.diff	                        (rev 0)
+++ wings3d/trunk/debian/patches/r18.diff	2015-08-03 07:37:27 UTC (rev 1714)
@@ -0,0 +1,64 @@
+Author: Sergei Golovan
+Description: Patch temporarily removes -Werror from the Erlang compiler
+ invocations to prevent FTBFS from using deprecated function erlang:now/0.
+ Also, incorrect tuple() type usage is fixed. This patch will be gone
+ after either the next upstream version will be released (where the
+ deprecated functions will not be called) or Erlang 19 will be released
+ (in which case an alternative approach will have to be applied).
+Last-Modified: Mon, 03 Aug 2015 10:28:16 +0300
+
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -132,7 +132,7 @@
+ # ----------------------------------------------------
+ # FLAGS
+ # ----------------------------------------------------
+-ERL_COMPILE_FLAGS += -Werror -I ../e3d $(TYPE_FLAGS) \
++ERL_COMPILE_FLAGS += -I ../e3d $(TYPE_FLAGS) \
+ '-Dwings_version="$(WINGS_VSN)"' -pa $(WINGS_INTL) $(USE_WX)
+ 
+ # ----------------------------------------------------
+--- a/src/wings_menu.erl
++++ b/src/wings_menu.erl
+@@ -43,7 +43,7 @@
+ 	 sel=none :: 'none'|pos_integer(),	%Selected item (1..tuple_size(Menu))
+ 	 sel_side=left :: 'left'|'right',	%Selection on left or right.
+ 	 ns=[],					%Name stack.
+-	 menu :: tuple(menu_item()),		%Normalized menu.
++	 menu :: menu_item(),			%Normalized menu.
+ 	 timer=make_ref(),			%Active submenu timer.
+ 	 level=?INITIAL_LEVEL,			%Menu level.
+ 	 type :: 'plain'|'popup',	        %Type of menu.
+--- a/plugins_src/import_export/Makefile
++++ b/plugins_src/import_export/Makefile
+@@ -51,7 +51,7 @@
+ # ----------------------------------------------------
+ # FLAGS
+ # ----------------------------------------------------
+-ERL_COMPILE_FLAGS += -Werror \
++ERL_COMPILE_FLAGS += \
+   -pa $(WINGS_EBIN) -pa $(WINGS_INTL) -I $(WINGS_INTL) \
+   -I $(WINGS_SRC) -I $(WINGS_E3D) $(TYPE_FLAGS) +debug_info
+ 
+--- a/plugins_src/commands/Makefile
++++ b/plugins_src/commands/Makefile
+@@ -69,7 +69,7 @@
+ # ----------------------------------------------------
+ # FLAGS
+ # ----------------------------------------------------
+-ERL_COMPILE_FLAGS += -Werror -pa $(WINGS_EBIN) -I $(WINGS_SRC) \
++ERL_COMPILE_FLAGS += -pa $(WINGS_EBIN) -I $(WINGS_SRC) \
+    -I $(WINGS_E3D) $(TYPE_FLAGS) \
+   +debug_info -pa $(WINGS_INTL) -I $(WINGS_INTL)
+ 
+--- a/plugins_src/autouv/Makefile
++++ b/plugins_src/autouv/Makefile
+@@ -45,7 +45,7 @@
+ # ----------------------------------------------------
+ # FLAGS
+ # ----------------------------------------------------
+-ERL_COMPILE_FLAGS += -Werror -pa $(WINGS_EBIN) -pa $(WINGS_INTL) -I $(WINGS_SRC) -I $(WINGS_E3D) $(TYPE_FLAGS) +debug_info
++ERL_COMPILE_FLAGS += -pa $(WINGS_EBIN) -pa $(WINGS_INTL) -I $(WINGS_SRC) -I $(WINGS_E3D) $(TYPE_FLAGS) +debug_info
+ 
+ # ----------------------------------------------------
+ # Targets

Modified: wings3d/trunk/debian/patches/series
===================================================================
--- wings3d/trunk/debian/patches/series	2015-07-05 14:26:48 UTC (rev 1713)
+++ wings3d/trunk/debian/patches/series	2015-08-03 07:37:27 UTC (rev 1714)
@@ -4,3 +4,4 @@
 #lang.diff
 wx.diff
 stl.diff
+r18.diff