diff -Nru gav-0.9.0/aarg.h gav-0.9.0/aarg.h
--- gav-0.9.0/aarg.h	2022-11-30 08:42:11.000000000 +0000
+++ gav-0.9.0/aarg.h	2004-09-09 06:19:38.000000000 +0000
@@ -7,7 +7,6 @@
 #include <unistd.h>
 #include <map>
 #include <string>
-#include <cstring>
 #include <sstream>
 
 class Aargh
diff -Nru gav-0.9.0/CommonHeader gav-0.9.0/CommonHeader
--- gav-0.9.0/CommonHeader	2022-11-30 08:42:11.000000000 +0000
+++ gav-0.9.0/CommonHeader	2005-12-30 14:41:12.000000000 +0000
@@ -24,10 +24,10 @@
 LD = ld
 CXX = g++
 
-CXXFLAGS += `sdl-config --cflags` -g -Wall -DAUDIO
+CXXFLAGS= `sdl-config --cflags` -g -Wall -DAUDIO
 
 ifndef NET
-CXXFLAGS += -DNONET
+CXXFLAGS+= -DNONET
 endif
 
 ifdef NET
diff -Nru gav-0.9.0/debian/changelog gav-0.9.0/debian/changelog
--- gav-0.9.0/debian/changelog	2022-11-30 08:42:11.000000000 +0000
+++ gav-0.9.0/debian/changelog	2022-11-29 17:36:04.000000000 +0000
@@ -1,3 +1,11 @@
+gav (0.9.0-3.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Convert to 3.0 source format. (Closes: #1007617)
+  * d/copyright: Convert to machine-readable format.
+
+ -- Bastian Germann <bage@debian.org>  Tue, 29 Nov 2022 18:36:04 +0100
+
 gav (0.9.0-3.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru gav-0.9.0/debian/copyright gav-0.9.0/debian/copyright
--- gav-0.9.0/debian/copyright	2022-11-30 08:42:11.000000000 +0000
+++ gav-0.9.0/debian/copyright	2022-11-29 17:36:04.000000000 +0000
@@ -1,11 +1,12 @@
-This package was debianized by Ari Pollak <ari@debian.org> on
-Thu, 13 Feb 2003 22:32:29 -0500.
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Comment:
+ This package was debianized by Ari Pollak <ari@debian.org> on
+ Thu, 13 Feb 2003 22:32:29 -0500.
+Source: http://sourceforge.net/projects/gav
+Upstream-Contact: https://github.com/ctrl-z-bg/gav/issues
 
-It was downloaded from <http://sourceforge.net/projects/gav>
-
-Upstream Authors: GAV Team
-
-Copyright:
-
-Licensed under the GPL.
-On Debian systems, it is available at: /usr/share/common-licenses/GPL.
+Files: *
+Copyright: GAV Team
+License: GPL
+ Licensed under the GPL.
+ On Debian systems, it is available at: /usr/share/common-licenses/GPL.
diff -Nru gav-0.9.0/debian/patches/debian.patch gav-0.9.0/debian/patches/debian.patch
--- gav-0.9.0/debian/patches/debian.patch	1970-01-01 00:00:00.000000000 +0000
+++ gav-0.9.0/debian/patches/debian.patch	2022-11-29 17:36:04.000000000 +0000
@@ -0,0 +1,55 @@
+--- gav-0.9.0.orig/CommonHeader
++++ gav-0.9.0/CommonHeader
+@@ -24,10 +24,10 @@ NET = true
+ LD = ld
+ CXX = g++
+ 
+-CXXFLAGS= `sdl-config --cflags` -g -Wall -DAUDIO
++CXXFLAGS += `sdl-config --cflags` -g -Wall -DAUDIO
+ 
+ ifndef NET
+-CXXFLAGS+= -DNONET
++CXXFLAGS += -DNONET
+ endif
+ 
+ ifdef NET
+--- gav-0.9.0.orig/Makefile
++++ gav-0.9.0/Makefile
+@@ -39,7 +39,6 @@ $(ALL_OBJ):
+ 
+ gav:	$(ALL_OBJ) $(OFILES)
+ 	$(CXX) -o gav $(OFILES) $(ALL_OBJ) $(LDFLAGS)
+-	strip gav
+ 
+ clean:
+ 	for i in $(SUBDIRS) ; do \
+@@ -54,7 +53,7 @@ bindist: all
+ 	rm -f *~ *.o
+ 
+ install: all
+-	install gav $(ROOT)/usr/bin
++	install gav $(ROOT)/usr/games
+ 	install -d $(ROOT)/usr/share/games/gav/themes
+ 	cp -r themes/* $(ROOT)/usr/share/games/gav/themes
+ 
+--- gav-0.9.0.orig/Makefile.Linux
++++ gav-0.9.0/Makefile.Linux
+@@ -54,7 +54,7 @@ bindist: all
+ 	rm -f *~ *.o
+ 
+ install: all
+-	install gav $(ROOT)/usr/bin
++	install gav $(ROOT)/usr/games
+ 	install -d $(ROOT)/usr/share/games/gav/themes
+ 	cp -r themes/* $(ROOT)/usr/share/games/gav/themes
+ 
+--- gav-0.9.0.orig/aarg.h
++++ gav-0.9.0/aarg.h
+@@ -7,6 +7,7 @@
+ #include <unistd.h>
+ #include <map>
+ #include <string>
++#include <cstring>
+ #include <sstream>
+ 
+ class Aargh
diff -Nru gav-0.9.0/debian/patches/series gav-0.9.0/debian/patches/series
--- gav-0.9.0/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ gav-0.9.0/debian/patches/series	2022-11-29 17:36:04.000000000 +0000
@@ -0,0 +1 @@
+debian.patch
diff -Nru gav-0.9.0/debian/source/format gav-0.9.0/debian/source/format
--- gav-0.9.0/debian/source/format	1970-01-01 00:00:00.000000000 +0000
+++ gav-0.9.0/debian/source/format	2022-11-29 17:36:04.000000000 +0000
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru gav-0.9.0/debian/watch gav-0.9.0/debian/watch
--- gav-0.9.0/debian/watch	1970-01-01 00:00:00.000000000 +0000
+++ gav-0.9.0/debian/watch	2022-11-29 17:36:04.000000000 +0000
@@ -0,0 +1,2 @@
+version=4
+https://github.com/ctrl-z-bg/gav/tags .*/v([\d\.]+)\.tar\.gz
diff -Nru gav-0.9.0/Makefile gav-0.9.0/Makefile
--- gav-0.9.0/Makefile	2022-11-30 08:42:11.000000000 +0000
+++ gav-0.9.0/Makefile	2003-02-11 11:47:40.000000000 +0000
@@ -39,6 +39,7 @@
 
 gav:	$(ALL_OBJ) $(OFILES)
 	$(CXX) -o gav $(OFILES) $(ALL_OBJ) $(LDFLAGS)
+	strip gav
 
 clean:
 	for i in $(SUBDIRS) ; do \
@@ -53,7 +54,7 @@
 	rm -f *~ *.o
 
 install: all
-	install gav $(ROOT)/usr/games
+	install gav $(ROOT)/usr/bin
 	install -d $(ROOT)/usr/share/games/gav/themes
 	cp -r themes/* $(ROOT)/usr/share/games/gav/themes
 
diff -Nru gav-0.9.0/Makefile.Linux gav-0.9.0/Makefile.Linux
--- gav-0.9.0/Makefile.Linux	2022-11-30 08:42:11.000000000 +0000
+++ gav-0.9.0/Makefile.Linux	2003-02-07 14:49:14.000000000 +0000
@@ -54,7 +54,7 @@
 	rm -f *~ *.o
 
 install: all
-	install gav $(ROOT)/usr/games
+	install gav $(ROOT)/usr/bin
 	install -d $(ROOT)/usr/share/games/gav/themes
 	cp -r themes/* $(ROOT)/usr/share/games/gav/themes