[Pkg-erlang-commits] r1738 - in wings3d/trunk/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Tue Nov 17 10:29:52 UTC 2015
Author: sgolovan
Date: 2015-11-17 10:29:52 +0000 (Tue, 17 Nov 2015)
New Revision: 1738
Added:
wings3d/trunk/debian/patches/e3d_hrl.diff
Removed:
wings3d/trunk/debian/menu
wings3d/trunk/debian/patches/r18.diff
Modified:
wings3d/trunk/debian/changelog
wings3d/trunk/debian/patches/series
wings3d/trunk/debian/rules
Log:
[wings3d]
* New upstream release.
* Removed unnecessary patches.
* Added a patch which allows one to build Wings3d plugins without the
previous version installed system-wide.
* Removed the Wings3d menu file because the desktop file is replacing it.
Modified: wings3d/trunk/debian/changelog
===================================================================
--- wings3d/trunk/debian/changelog 2015-11-13 08:44:27 UTC (rev 1737)
+++ wings3d/trunk/debian/changelog 2015-11-17 10:29:52 UTC (rev 1738)
@@ -1,8 +1,12 @@
-wings3d (1.5.3-4) UNRELEASED; urgency=medium
+wings3d (1.5.4-1) unstable; urgency=medium
- * NOT RELEASED YET
+ * New upstream release.
+ * Removed unnecessary patches.
+ * Added a patch which allows one to build Wings3d plugins without the
+ previous version installed system-wide.
+ * Removed the Wings3d menu file because the desktop file is replacing it.
- -- Sergei Golovan <sgolovan at debian.org> Tue, 04 Aug 2015 11:18:15 +0300
+ -- Sergei Golovan <sgolovan at debian.org> Tue, 17 Nov 2015 13:24:41 +0300
wings3d (1.5.3-3) unstable; urgency=medium
Deleted: wings3d/trunk/debian/menu
===================================================================
--- wings3d/trunk/debian/menu 2015-11-13 08:44:27 UTC (rev 1737)
+++ wings3d/trunk/debian/menu 2015-11-17 10:29:52 UTC (rev 1738)
@@ -1,7 +0,0 @@
-?package(wings3d):needs="x11" \
- section="Applications/Graphics" \
- title="Wings3D polygon mesh modeller" \
- longtitle="Create and edit 3D models of objects" \
- command="/usr/bin/wings3d -noshell -noinput -detached" \
- icon="/usr/share/icons/wings3d.xpm"
-
Added: wings3d/trunk/debian/patches/e3d_hrl.diff
===================================================================
--- wings3d/trunk/debian/patches/e3d_hrl.diff (rev 0)
+++ wings3d/trunk/debian/patches/e3d_hrl.diff 2015-11-17 10:29:52 UTC (rev 1738)
@@ -0,0 +1,16 @@
+Author: Sergei Golovan
+Description: Patch uses ordinary -include() directive instead of -include_lib() which
+ searches for "e3d.hrl" in system wide directories instead of local directory.
+Last-Modified: Mon, 16 Nov 2015 13:07:05 +0300
+
+--- wings-1.5.4/plugins_src/import_export/wpc_lwo.erl 2015-08-06 13:38:19.000000000 +0300
++++ wings-1.5.3/plugins_src/import_export/wpc_lwo.erl 2014-04-13 12:03:46.000000000 +0400
+@@ -13,7 +13,7 @@
+
+ -module(wpc_lwo).
+ -export([init/0, menu/2, command/2, export/1]).
+--include_lib("wings/e3d/e3d.hrl").
++-include("e3d.hrl").
+
+ init() ->
+ true.
Deleted: wings3d/trunk/debian/patches/r18.diff
===================================================================
--- wings3d/trunk/debian/patches/r18.diff 2015-11-13 08:44:27 UTC (rev 1737)
+++ wings3d/trunk/debian/patches/r18.diff 2015-11-17 10:29:52 UTC (rev 1738)
@@ -1,64 +0,0 @@
-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-11-13 08:44:27 UTC (rev 1737)
+++ wings3d/trunk/debian/patches/series 2015-11-17 10:29:52 UTC (rev 1738)
@@ -4,4 +4,4 @@
#lang.diff
wx.diff
stl.diff
-r18.diff
+e3d_hrl.diff
Modified: wings3d/trunk/debian/rules
===================================================================
--- wings3d/trunk/debian/rules 2015-11-13 08:44:27 UTC (rev 1737)
+++ wings3d/trunk/debian/rules 2015-11-17 10:29:52 UTC (rev 1738)
@@ -38,7 +38,7 @@
>> debian/wings3d.substvars
get-orig-source:
- wget -O wings3d_1.5.3.orig.tar.bz2 \
- http://prdownloads.sourceforge.net/wings/wings-1.5.3.tar.bz2
+ wget -O wings3d_1.5.4.orig.tar.bz2 \
+ http://prdownloads.sourceforge.net/wings/wings-1.5.4.tar.bz2
.PHONY: override_dh_clean override_dh_auto_build override_dh_install get-orig-source
More information about the Pkg-erlang-commits
mailing list