diff -Nru wolf4sdl-1.7+svn262+dfsg1/debian/changelog wolf4sdl-1.7+svn262+dfsg1/debian/changelog
--- wolf4sdl-1.7+svn262+dfsg1/debian/changelog	2017-03-04 17:25:10.000000000 +0000
+++ wolf4sdl-1.7+svn262+dfsg1/debian/changelog	2018-04-30 09:40:39.000000000 +0000
@@ -1,3 +1,12 @@
+wolf4sdl (1.7+svn262+dfsg1-5) unstable; urgency=medium
+
+  * Team upload
+  * Set Priority to optional
+  * Update Vcs-* for move to salsa.debian.org
+  * Remove traditional Debian menu file (Policy §9.6)
+
+ -- Simon McVittie <smcv@debian.org>  Mon, 30 Apr 2018 10:40:39 +0100
+
 wolf4sdl (1.7+svn262+dfsg1-4) unstable; urgency=medium
 
   * Team upload.
diff -Nru wolf4sdl-1.7+svn262+dfsg1/debian/control wolf4sdl-1.7+svn262+dfsg1/debian/control
--- wolf4sdl-1.7+svn262+dfsg1/debian/control	2017-03-04 17:25:10.000000000 +0000
+++ wolf4sdl-1.7+svn262+dfsg1/debian/control	2018-04-30 09:40:39.000000000 +0000
@@ -1,6 +1,6 @@
 Source: wolf4sdl
 Section: contrib/games
-Priority: extra
+Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
 Uploaders: Fabian Greffrath <fabian+debian@greffrath.com>
 Build-Depends: debhelper (>= 9),
@@ -8,14 +8,15 @@
  libsdl-mixer1.2-dev
 Standards-Version: 3.9.6
 Homepage: http://www.chaos-software.de.vu/
-Vcs-Git: git://anonscm.debian.org/pkg-games/wolf4sdl.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/wolf4sdl.git;a=summary
+Vcs-Git: https://salsa.debian.org/games-team/wolf4sdl.git
+Vcs-Browser: https://salsa.debian.org/games-team/wolf4sdl
 
 Package: wolf4sdl
 Architecture: any
 Depends: ${shlibs:Depends},
  ${misc:Depends},
- wolf3d-data | game-data-packager (>= 27)
+Recommends:
+ game-data-packager
 Description: SDL-Port of Wolfenstein 3-D and Spear of Destiny
  Maybe it was the fact that people got to blow away Nazis. Maybe it was the
  sheer challenge of it all. For whatever reason, Wolfenstein 3-D and Spear of
diff -Nru wolf4sdl-1.7+svn262+dfsg1/debian/rules wolf4sdl-1.7+svn262+dfsg1/debian/rules
--- wolf4sdl-1.7+svn262+dfsg1/debian/rules	2017-03-04 17:25:10.000000000 +0000
+++ wolf4sdl-1.7+svn262+dfsg1/debian/rules	2018-04-30 09:40:39.000000000 +0000
@@ -20,9 +20,6 @@
 	)
 endef
 
-debian/wolf4sdl.xpm: debian/wolf4sdl.png
-	convert $^ $@
-
 debian/wolf4sdl.png: debian/wolf4sdl.svg
 	inkscape --export-png=$@ $^
 
diff -Nru wolf4sdl-1.7+svn262+dfsg1/debian/wolf4sdl.install wolf4sdl-1.7+svn262+dfsg1/debian/wolf4sdl.install
--- wolf4sdl-1.7+svn262+dfsg1/debian/wolf4sdl.install	2017-03-04 17:25:10.000000000 +0000
+++ wolf4sdl-1.7+svn262+dfsg1/debian/wolf4sdl.install	2018-04-30 09:40:39.000000000 +0000
@@ -3,4 +3,3 @@
 debian/wolf4sdl.desktop usr/share/applications
 debian/wolf4sdl.png usr/share/icons/hicolor/32x32/apps
 debian/wolf4sdl.svg usr/share/icons/hicolor/scalable/apps
-debian/wolf4sdl.xpm usr/share/pixmaps
diff -Nru wolf4sdl-1.7+svn262+dfsg1/debian/wolf4sdl.menu wolf4sdl-1.7+svn262+dfsg1/debian/wolf4sdl.menu
--- wolf4sdl-1.7+svn262+dfsg1/debian/wolf4sdl.menu	2017-03-04 17:25:10.000000000 +0000
+++ wolf4sdl-1.7+svn262+dfsg1/debian/wolf4sdl.menu	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-?package(wolf4sdl):needs="X11" section="Games/Action"\
-  title="Wolf4SDL"\
-  longtitle="SDL-Port of Wolfenstein 3-D and Spear of Destiny"\
-  command="/usr/games/wolf4sdl"\
-  icon="/usr/share/pixmaps/wolf4sdl.xpm"
diff -Nru wolf4sdl-1.7+svn262+dfsg1/debian/wolf4sdl.xpm wolf4sdl-1.7+svn262+dfsg1/debian/wolf4sdl.xpm
--- wolf4sdl-1.7+svn262+dfsg1/debian/wolf4sdl.xpm	2017-03-04 17:25:10.000000000 +0000
+++ wolf4sdl-1.7+svn262+dfsg1/debian/wolf4sdl.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,178 +0,0 @@
-/* XPM */
-static char *wolf4sdl[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 140 2 ",
-"   c black",
-".  c #010000",
-"X  c #010101",
-"o  c #020000",
-"O  c #030000",
-"+  c #020202",
-"@  c gray1",
-"#  c #050000",
-"$  c #050101",
-"%  c #050202",
-"&  c #060303",
-"*  c #040404",
-"=  c gray2",
-"-  c #060606",
-";  c #070707",
-":  c #090303",
-">  c #0E0000",
-",  c #080404",
-"<  c #0B0404",
-"1  c #0B0505",
-"2  c #0E0606",
-"3  c gray3",
-"4  c #090909",
-"5  c gray4",
-"6  c #0B0B0B",
-"7  c #0C0C0C",
-"8  c gray5",
-"9  c #0E0E0E",
-"0  c gray6",
-"q  c #120000",
-"w  c #140000",
-"e  c #160000",
-"r  c #190000",
-"t  c #1E0000",
-"y  c #180909",
-"u  c #111111",
-"i  c gray7",
-"p  c #131313",
-"a  c gray9",
-"s  c #1B1B1B",
-"d  c #1D1D1D",
-"f  c gray12",
-"g  c #260000",
-"h  c #2A0000",
-"j  c #2C0000",
-"k  c #280707",
-"l  c #220C0C",
-"z  c #2C0C0C",
-"x  c #300000",
-"c  c #2C1414",
-"v  c gray13",
-"b  c gray14",
-"n  c gray15",
-"m  c #282828",
-"M  c gray16",
-"N  c gray17",
-"B  c #2C2C2C",
-"V  c #2F2F2F",
-"C  c #373737",
-"Z  c gray22",
-"A  c gray23",
-"S  c #430000",
-"D  c #4D0000",
-"F  c #560000",
-"G  c #590000",
-"H  c #560E0E",
-"J  c #661111",
-"K  c #721313",
-"L  c #532121",
-"P  c #6B2C2C",
-"I  c #7E2222",
-"U  c #7C2B2B",
-"Y  c #753434",
-"T  c #414141",
-"R  c gray26",
-"E  c #444444",
-"W  c gray27",
-"Q  c #4C4C4C",
-"!  c gray32",
-"~  c gray33",
-"^  c #565656",
-"/  c #5D5D5D",
-"(  c gray37",
-")  c #646464",
-"_  c #656565",
-"`  c gray40",
-"'  c #686868",
-"]  c DimGray",
-"[  c #6C6C6C",
-"{  c gray43",
-"}  c #717171",
-"|  c #727272",
-" . c gray46",
-".. c #797979",
-"X. c #7B7B7B",
-"o. c #7E7E7E",
-"O. c #8C2626",
-"+. c #903F3F",
-"@. c #A33939",
-"#. c #A63A3A",
-"$. c #BC4C4C",
-"%. c #BF4D4D",
-"&. c #D86060",
-"*. c #D96060",
-"=. c #818181",
-"-. c #848484",
-";. c gray52",
-":. c gray53",
-">. c #888888",
-",. c #898989",
-"<. c gray54",
-"1. c #909090",
-"2. c gray57",
-"3. c #959595",
-"4. c #9A9A9A",
-"5. c #9B9B9B",
-"6. c gray62",
-"7. c gray63",
-"8. c gray64",
-"9. c gray66",
-"0. c #AAAAAA",
-"q. c gray67",
-"w. c #ACACAC",
-"e. c gray68",
-"r. c #B2B2B2",
-"t. c gray70",
-"y. c #B4B4B4",
-"u. c #B6B6B6",
-"i. c #BBBBBB",
-"p. c gray75",
-"a. c #C8C8C8",
-"s. c gray82",
-"d. c gray84",
-"f. c #D7D7D7",
-"g. c #DADADA",
-"h. c #E4E4E4",
-"j. c #ECECEC",
-"k. c #F6F6F6",
-"l. c gray100",
-"z. c None",
-/* pixels */
-"z.z.z.z.z.z.z.z.= z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.",
-"z.z.z.z.z.z.= 6 R u = z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.",
-"z.z.z.z.z.= f ` [ ] V + z.z.z.z.z.z.z.z.z.z.z.z.= z.z.z.z.z.z.z.",
-"z.z.z.z.= C  . . . . .^ 6 = z.z.z.z.z.z.z.z.= v ^ u 6 z.z.z.z.z.",
-"z.z.z.= R o.o.o.-.o.o.o. .b = z.z.z.z.z.z.= ! o.o...A = z.z.z.z.",
-"z.z.6 E ,.,.,.:.,.,.:.:.,.,.! + z.z.z.= a  .,.,.,.:.:.` 6 = z.z.",
-"z.z.f 1.1.1.1.1.1.1.1.1.1.1.1.+ z.z.z.0 ,.1.1.1.1.1.1.1.,.M 6 z.",
-"z.= :.4.4.4.4.` b 4.6.4.4.4.4.+ z.z.= -.4.4.4.4.4.4.4.4.4.4.( + ",
-"z.a 8.8.8.8.( 6 + 8.8.8.8.8.8.+ z.z.s 8.8.8.8.8.8.8.8.8.8.8.8.+ ",
-"z.A w.w.9...6 z.+ 9.w.w.w.9.w.+ z.z.E w.w.w.w.[ B w.w.9.w.w.9.+ ",
-"+ ( u.u.r.6 z.z.+ u.u.u.u.u.u.+ z.6 ] u.u.u.o.6 + u.u.u.u.u.u.+ ",
-"z.R p.p.4.0 z.z.+ p.p.p.p.p.p.+ z.z.Q p.p.i.6 z.+ p.p.p.p.p.p.+ ",
-"z.f a.a.-.u z.z.+ a.a.a.a.a.a.+ z.z.v a.a.8.0 z.+ a.a.a.a.a.a.+ ",
-"z.= u.s.9.0 z.z.+ s.s.f.s.s.s.+ z.z.= 8.s.8.0 z.+ s.s.s.s.s.s.+ ",
-"z.z.M f.f.6 z.z.+ f.f.f.f.f.g.+ z.z.z.0 w.f.6 z.+ f.g.g.f.f.f.+ ",
-"z.z.0 | h.6.6 z.+ h.h.h.h.h.h.+ z.z.z.z.0 9.3.6 + h.h.h.h.h.h.+ ",
-"z.z.z.6 r.j.[ 0 + j.j.j.j.j.j.+ z.z.z.z.z.6 u z.+ j.j.j.j.j.j.+ ",
-"z.z.z.z.0 ,.0 z.+ k.k.k.k.k.k.+ z.z.z.z.z.z.z.z.+ k.k.k.k.k.k.+ ",
-"z.z.z.z.z.0 z.z.+ l.l.l.l.l.l.+ z.6 + + + + 6 z.+ l.l.l.l.l.l.+ ",
-"z.z.z.z.z.z.z.z.+ 9.w.w.9.9.9.+ z.M 9.9.9.9.+ z.+ 9.9.w.9.9.9.+ ",
-"z.z.z.z.z.z.z.z.+ ^ ^ ^ ^ ^ ^ + = B ^ ^ ^ ^ + z.+ ^ ^ ^ ^ ^ ^ + ",
-"z.z.z.z.z.z.z.z.+ + + + + + + + + + + + + + + z.+ + + + + + + + ",
-"z.z.z.z.z.z.z.z.+ e e e e e e + + e e e e e + z.+ e e e e e q + ",
-"z.z.z.z.z.z.z.z.+ j h h j h h + q j j j h h + + r h j j h h # z.",
-"z.z.z.z.z.z.z.z.+ S S S S S S + x S S S S S + q S S S S S e + z.",
-"z.z.z.z.z.z.z.z.+ G F G G G G g F G G F G G t D G G G G j # z.z.",
-"z.z.z.z.z.z.z.z.+ K K K K K K K K K J k K K K K K K K H # z.z.z.",
-"z.z.z.z.z.z.z.z.+ O.O.O.O.O.O.O.O.O.z + O.O.O.O.O.O.I : z.z.z.z.",
-"z.z.z.z.z.z.z.z.# @.#.#.#.#.@.@.@.U : + @.#.#.#.@.@.l z.z.z.z.z.",
-"z.z.z.z.z.z.z., P $.%.%.%.%.%.%.%.y z.+ %.$.%.%.%.L 1 z.z.z.z.z.",
-"z.z.z.z.z.z.z.c &.&.*.*.*.*.*.*.Y 1 z.+ &.*.*.*.+.1 z.z.z.z.z.z.",
-"z.z.z.z.z.z.1 + + + + + + + + + , z.z.# + + + + , z.z.z.z.z.z.z."
-};