drop patched merged upstream & update changelog

8 files changed, 1 insertions, 255 deletions

diff --git a/debian/changelog b/debian/changelog
index 5b2e505..ae3ee79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-zxcvbn-c (0.20150103-1) unstable; urgency=medium
+zxcvbn-c (0.20160925-1) UNRELEASED; urgency=medium
 
   * Initial release (Closes: #838492).
 
diff --git a/debian/patches/angled-include-zxcvbn.h.patch b/debian/patches/angled-include-zxcvbn.h.patch
deleted file mode 100644
index 6692b00..0000000
--- a/debian/patches/angled-include-zxcvbn.h.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Sean Whitton <spwhitton@spwhitton.name>
-Date: Sat, 24 Sep 2016 07:56:26 -0700
-Subject: angled include zxcvbn.h
-
-Since we're building & testing it as shared and static libraries.
-
-Forwarded: https://github.com/tsyrogit/zxcvbn-c/pull/8
----
- test.c   | 2 +-
- zxcvbn.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/test.c b/test.c
-index 9d74ce5..bb0f8bd 100644
---- a/test.c
-+++ b/test.c
-@@ -34,7 +34,7 @@
- #include <string.h>
- #include <stdlib.h>
- #include <sys/time.h>
--#include "zxcvbn.h"
-+#include <zxcvbn.h>
- 
- /* For pre-compiled headers under windows */
- #ifdef _WIN32
-diff --git a/zxcvbn.c b/zxcvbn.c
-index c801ae0..bfb40b3 100644
---- a/zxcvbn.c
-+++ b/zxcvbn.c
-@@ -30,7 +30,7 @@
-  * 
-  **********************************************************************************/
- 
--#include "zxcvbn.h"
-+#include <zxcvbn.h>
- #include <ctype.h>
- #include <string.h>
- #include <stdint.h>
diff --git a/debian/patches/conditionally-define-CFLAGS.patch b/debian/patches/conditionally-define-CFLAGS.patch
deleted file mode 100644
index ae9dde6..0000000
--- a/debian/patches/conditionally-define-CFLAGS.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Sean Whitton <spwhitton@spwhitton.name>
-Date: Sat, 24 Sep 2016 07:45:04 -0700
-Subject: conditionally define CFLAGS
-
-So Debian CFLAGS take precedence.
-
-Forwarded: https://github.com/tsyrogit/zxcvbn-c/pull/7
----
- makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/makefile b/makefile
-index fa234c1..ca5c352 100644
---- a/makefile
-+++ b/makefile
-@@ -1,5 +1,5 @@
--CFLAGS = -O2 -Wall -Wextra -Wdeclaration-after-statement
--CPPFLAGS = -O2 -Wall -Wextra
-+CFLAGS ?= -O2 -Wall -Wextra -Wdeclaration-after-statement
-+CPPFLAGS ?= -O2 -Wall -Wextra
- 
- WORDS = words-10k-pass.txt words-english.txt words-female.txt words-male.txt words-surname.txt
- 
diff --git a/debian/patches/fix-upstream-clean-target.patch b/debian/patches/fix-upstream-clean-target.patch
deleted file mode 100644
index db2aa40..0000000
--- a/debian/patches/fix-upstream-clean-target.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Sean Whitton <spwhitton@spwhitton.name>
-Date: Sat, 24 Sep 2016 16:29:55 -0700
-Subject: fix upstream clean target
-
-Some build products are not cleaned.
-
-Forwarded: https://github.com/tsyrogit/zxcvbn-c/pull/5
----
- makefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/makefile b/makefile
-index 2007411..fa234c1 100644
---- a/makefile
-+++ b/makefile
-@@ -56,5 +56,6 @@ test: test-file test-inline test-c++inline test-c++file testcases.txt
- clean:
- 	rm -f test-file zxcvbn-file.o test-c++file zxcvbn-c++file.o 
- 	rm -f test-inline zxcvbn-inline.o test-c++inline zxcvbn-c++inline.o
-+	rm -f dict-*.h zxcvbn.dict zxcvbn.cpp test.cpp
- 	rm -f dictgen
- 	
-\ No newline at end of file
diff --git a/debian/patches/missing-cast-for-CXX11.patch b/debian/patches/missing-cast-for-CXX11.patch
deleted file mode 100644
index d188690..0000000
--- a/debian/patches/missing-cast-for-CXX11.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Sean Whitton <spwhitton@spwhitton.name>
-Date: Sat, 24 Sep 2016 14:17:05 -0700
-Subject: missing cast for CXX11
-
-Fixes build with gcc 5+
-
-Forwarded: https://github.com/tsyrogit/zxcvbn-c/pull/6
----
- zxcvbn.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/zxcvbn.c b/zxcvbn.c
-index c29c20c..c801ae0 100644
---- a/zxcvbn.c
-+++ b/zxcvbn.c
-@@ -212,7 +212,7 @@ static inline void MyOpenFile(FileHandle & f, const char *Name)
- }
- static inline bool MyReadFile(FileHandle & f, void *Buf, unsigned int Num)
- {
--    return f.read((char *)Buf, Num);
-+    return (bool)f.read((char *)Buf, Num);
- }
- static inline void MyCloseFile(FileHandle & f)
- {
diff --git a/debian/patches/series b/debian/patches/series
index 16a66fe..252c97d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1 @@
-fix-upstream-clean-target.patch
-missing-cast-for-CXX11.patch
 patch-README-for-Debian.patch
-conditionally-define-CFLAGS.patch
-angled-include-zxcvbn.h.patch
-targets-to-build-shlib.patch
-targets-to-build-static-lib.patch
diff --git a/debian/patches/targets-to-build-shlib.patch b/debian/patches/targets-to-build-shlib.patch
deleted file mode 100644
index 8af535a..0000000
--- a/debian/patches/targets-to-build-shlib.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From: Sean Whitton <spwhitton@spwhitton.name>
-Date: Sat, 24 Sep 2016 09:43:49 -0700
-Subject: targets to build shlib
-
-Upstream suggests embedding this library in projects that require it.
-This patch adds targets to build a shared library, instead.
-
-Forwarded: https://github.com/tsyrogit/zxcvbn-c/pull/8
----
- makefile | 29 +++++++++++++++++++++++++----
- 1 file changed, 25 insertions(+), 4 deletions(-)
-
-diff --git a/makefile b/makefile
-index ca5c352..143818b 100644
---- a/makefile
-+++ b/makefile
-@@ -1,9 +1,25 @@
- CFLAGS ?= -O2 -Wall -Wextra -Wdeclaration-after-statement
- CPPFLAGS ?= -O2 -Wall -Wextra
- 
-+# need zxcvbn.h prior to package installation
-+CFLAGS += -I.
-+CPPFLAGS += -I.
-+
-+# library metadata
-+TARGET_LIB = libzxcvbn.so.0.0.0
-+SONAME = libzxcvbn.so.0
-+
- WORDS = words-10k-pass.txt words-english.txt words-female.txt words-male.txt words-surname.txt
- 
--all: test-file test-inline test-c++inline test-c++file
-+all: test-file test-inline test-c++inline test-c++file test-shlib
-+
-+test-shlib: test.c $(TARGET_LIB)
-+	if [ ! -e libzxcvbn.so ]; then ln -s $(TARGET_LIB) libzxcvbn.so; fi
-+	gcc $(CFLAGS) -o $@ $< -L. -lzxcvbn -lm
-+
-+$(TARGET_LIB): zxcvbn-inline-pic.o
-+	gcc $(CFLAGS) $(LDFLAGS) -fPIC -shared -Wl,-soname,$(SONAME) -o $@ $^ -lm
-+	if [ ! -e $(SONAME) ]; then ln -s $(TARGET_LIB) $(SONAME); fi
- 
- test-file: test.c zxcvbn-file.o
- 	gcc $(CFLAGS) -DUSE_DICT_FILE -o test-file test.c zxcvbn-file.o -lm
-@@ -14,6 +30,9 @@ zxcvbn-file.o: zxcvbn.c dict-crc.h zxcvbn.h
- test-inline: test.c zxcvbn-inline.o
- 	gcc $(CFLAGS) -o test-inline test.c zxcvbn-inline.o -lm
- 
-+zxcvbn-inline-pic.o: zxcvbn.c dict-src.h zxcvbn.h
-+	gcc $(CFLAGS) -fPIC -c -o $@ $<
-+
- zxcvbn-inline.o: zxcvbn.c dict-src.h zxcvbn.h
- 	gcc $(CFLAGS) -c -o zxcvbn-inline.o zxcvbn.c
- 
-@@ -42,11 +61,13 @@ zxcvbn-c++file.o: zxcvbn.c dict-crc.h zxcvbn.h
- 	if [ ! -e zxcvbn.cpp ]; then ln -s zxcvbn.c zxcvbn.cpp; fi
- 	g++ $(CPPFLAGS) -DUSE_DICT_FILE -c -o zxcvbn-c++file.o zxcvbn.cpp
- 
--test: test-file test-inline test-c++inline test-c++file testcases.txt
-+test: test-file test-inline test-c++inline test-c++file test-shlib testcases.txt
- 	@echo Testing C build, dictionary from file
- 	./test-file -t testcases.txt
- 	@echo Testing C build, dictionary in executable
- 	./test-inline -t testcases.txt
-+	@echo Testing C shlib, dictionary in shlib
-+	LD_LIBRARY_PATH=. ./test-shlib -t testcases.txt
- 	@echo Testing C++ build, dictionary from file
- 	./test-c++file -t testcases.txt
- 	@echo Testing C++ build, dictionary in executable
-@@ -55,7 +76,7 @@ test: test-file test-inline test-c++inline test-c++file testcases.txt
- 
- clean:
- 	rm -f test-file zxcvbn-file.o test-c++file zxcvbn-c++file.o 
--	rm -f test-inline zxcvbn-inline.o test-c++inline zxcvbn-c++inline.o
-+	rm -f test-inline zxcvbn-inline.o zxcvbn-inline-pic.o test-c++inline zxcvbn-c++inline.o
- 	rm -f dict-*.h zxcvbn.dict zxcvbn.cpp test.cpp
- 	rm -f dictgen
--	
-\ No newline at end of file
-+	rm -f ${TARGET_LIB} ${SONAME} libzxcvbn.so test-shlib
diff --git a/debian/patches/targets-to-build-static-lib.patch b/debian/patches/targets-to-build-static-lib.patch
deleted file mode 100644
index d55e573..0000000
--- a/debian/patches/targets-to-build-static-lib.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From: Sean Whitton <spwhitton@spwhitton.name>
-Date: Sat, 24 Sep 2016 15:20:43 -0700
-Subject: targets to build static lib
-
-Per Debian Policy, it's usual to provide the static lib in the -dev
-package.
-
-Forwarded: https://github.com/tsyrogit/zxcvbn-c/pull/8
----
- makefile | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/makefile b/makefile
-index 143818b..adf3c9b 100644
---- a/makefile
-+++ b/makefile
-@@ -11,7 +11,7 @@ SONAME = libzxcvbn.so.0
- 
- WORDS = words-10k-pass.txt words-english.txt words-female.txt words-male.txt words-surname.txt
- 
--all: test-file test-inline test-c++inline test-c++file test-shlib
-+all: test-file test-inline test-c++inline test-c++file test-shlib test-statlib
- 
- test-shlib: test.c $(TARGET_LIB)
- 	if [ ! -e libzxcvbn.so ]; then ln -s $(TARGET_LIB) libzxcvbn.so; fi
-@@ -21,6 +21,12 @@ $(TARGET_LIB): zxcvbn-inline-pic.o
- 	gcc $(CFLAGS) $(LDFLAGS) -fPIC -shared -Wl,-soname,$(SONAME) -o $@ $^ -lm
- 	if [ ! -e $(SONAME) ]; then ln -s $(TARGET_LIB) $(SONAME); fi
- 
-+test-statlib: test.c libzxcvbn.a
-+	gcc $(CFLAGS) $(LDFLAGS) -o $@ $^ -lm
-+
-+libzxcvbn.a: zxcvbn-inline.o
-+	ar cvq $@ $^
-+
- test-file: test.c zxcvbn-file.o
- 	gcc $(CFLAGS) -DUSE_DICT_FILE -o test-file test.c zxcvbn-file.o -lm
- 
-@@ -61,13 +67,15 @@ zxcvbn-c++file.o: zxcvbn.c dict-crc.h zxcvbn.h
- 	if [ ! -e zxcvbn.cpp ]; then ln -s zxcvbn.c zxcvbn.cpp; fi
- 	g++ $(CPPFLAGS) -DUSE_DICT_FILE -c -o zxcvbn-c++file.o zxcvbn.cpp
- 
--test: test-file test-inline test-c++inline test-c++file test-shlib testcases.txt
-+test: test-file test-inline test-c++inline test-c++file test-shlib test-statlib testcases.txt
- 	@echo Testing C build, dictionary from file
- 	./test-file -t testcases.txt
- 	@echo Testing C build, dictionary in executable
- 	./test-inline -t testcases.txt
- 	@echo Testing C shlib, dictionary in shlib
- 	LD_LIBRARY_PATH=. ./test-shlib -t testcases.txt
-+	@echo Testing C static lib, dictionary in lib
-+	./test-statlib -t testcases.txt
- 	@echo Testing C++ build, dictionary from file
- 	./test-c++file -t testcases.txt
- 	@echo Testing C++ build, dictionary in executable
-@@ -79,4 +87,4 @@ clean:
- 	rm -f test-inline zxcvbn-inline.o zxcvbn-inline-pic.o test-c++inline zxcvbn-c++inline.o
- 	rm -f dict-*.h zxcvbn.dict zxcvbn.cpp test.cpp
- 	rm -f dictgen
--	rm -f ${TARGET_LIB} ${SONAME} libzxcvbn.so test-shlib
-+	rm -f ${TARGET_LIB} ${SONAME} libzxcvbn.so test-shlib libzxcvbn.a test-statlib