sync in missing bits from v3.3 releasev3.3

3 files changed, 17 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index 2923441..4b4512a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 NAME = monitor-edid
-VERSION = 3.2
+VERSION = 3.3
 FILES = $(shell ls | grep -v CVS | grep -vF .tar)
 SVNPATH = svn+ssh://svn.mageia.org/svn/soft/monitor-edid
 
@@ -48,20 +48,16 @@ endif
 
 clean:
 	$(RM) $(TARGETS) *.a *.o *~
-	rm -rf $(NAME)-$(VERSION) $(NAME)-$(VERSION).tar.bz2
+	rm -rf $(NAME)-$(VERSION) $(NAME)-$(VERSION).tar.xz
 
 %.o: %.c
 	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
 
 
-dis:
-	rm -rf $(NAME)-$(VERSION) ../$(NAME)-$(VERSION).tar*
-	svn export -q -rBASE . $(NAME)-$(VERSION)
-	find $(NAME)-$(VERSION) -name .cvsignore |xargs rm -rf
-	tar cf ../$(NAME)-$(VERSION).tar $(NAME)-$(VERSION)
-	bzip2 -9f ../$(NAME)-$(VERSION).tar
-	rm -rf $(NAME)-$(VERSION)
+dist: dis
+dis: clean
+	@git archive --prefix=$(NAME)-$(VERSION)/ HEAD | xz > $(NAME)-$(VERSION).tar.xz;
+	$(info $(NAME)-$(VERSION).tar.xz is ready)
 
-
-svntag:
-	svn cp -m 'version $(VERSION)' $(SVNPATH)/trunk $(SVNPATH)/tags/v$(VERSION)
+tag:
+	git tag $(VERSION)
diff --git a/NEWS b/NEWS
index 4d47feb..ce26a6f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+Version 3.3 - 29 August 2020
+
+- monitor-get-edid-using-vbe:
+  o fix multiple definition of 'verbose' variable
+  o add missing include of stdint.h
+- monitor-parse-edid
+  o restore to_MonitorsDB() function
+
 Version 3.2 - 12 February 2018, by Shlomi Fish
 
 - monitor-parse-edid
diff --git a/get-edid.h b/get-edid.h
index 2f72f0e..b3f95f6 100644
--- a/get-edid.h
+++ b/get-edid.h
@@ -1,6 +1,6 @@
 #define EDID_BLOCK_SIZE		128
 #define MAX_EXTENSION_COUNT	4
 
-int verbose;
+extern int verbose;
 
 int get_edid(char *edid, int port, int skip_vbe_check);