From d29bc08d8ce800d6c2ca13373bdea16896e411e6 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sat, 24 Sep 2016 16:30:45 -0700 Subject: d/clean -> patch to upstream clean target --- debian/clean | 4 ---- debian/patches/conditionally-define-CFLAGS.patch | 2 +- debian/patches/fix-upstream-clean-target.patch | 21 +++++++++++++++++++++ debian/patches/series | 1 + debian/patches/targets-to-build-shlib.patch | 6 +++--- debian/patches/targets-to-build-static-lib.patch | 6 +++--- 6 files changed, 29 insertions(+), 11 deletions(-) delete mode 100644 debian/clean create mode 100644 debian/patches/fix-upstream-clean-target.patch diff --git a/debian/clean b/debian/clean deleted file mode 100644 index f4a2cb1..0000000 --- a/debian/clean +++ /dev/null @@ -1,4 +0,0 @@ -dict-*.h -test.cpp -zxcvbn.cpp -zxcvbn.dict diff --git a/debian/patches/conditionally-define-CFLAGS.patch b/debian/patches/conditionally-define-CFLAGS.patch index c1eb19b..235b647 100644 --- a/debian/patches/conditionally-define-CFLAGS.patch +++ b/debian/patches/conditionally-define-CFLAGS.patch @@ -8,7 +8,7 @@ So Debian CFLAGS take precedence. 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makefile b/makefile -index 2007411..2b06881 100644 +index fa234c1..ca5c352 100644 --- a/makefile +++ b/makefile @@ -1,5 +1,5 @@ diff --git a/debian/patches/fix-upstream-clean-target.patch b/debian/patches/fix-upstream-clean-target.patch new file mode 100644 index 0000000..d169458 --- /dev/null +++ b/debian/patches/fix-upstream-clean-target.patch @@ -0,0 +1,21 @@ +From: Sean Whitton +Date: Sat, 24 Sep 2016 16:29:55 -0700 +Subject: fix upstream clean target + +Some build products are not cleaned. +--- + 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/series b/debian/patches/series index 9dc3255..16a66fe 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ +fix-upstream-clean-target.patch missing-cast-for-CXX11.patch patch-README-for-Debian.patch conditionally-define-CFLAGS.patch diff --git a/debian/patches/targets-to-build-shlib.patch b/debian/patches/targets-to-build-shlib.patch index 4351148..1f25165 100644 --- a/debian/patches/targets-to-build-shlib.patch +++ b/debian/patches/targets-to-build-shlib.patch @@ -9,7 +9,7 @@ This patch adds targets to build a shared library, instead. 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/makefile b/makefile -index 2b06881..d8cf510 100644 +index ca5c352..7165ce2 100644 --- a/makefile +++ b/makefile @@ -1,9 +1,24 @@ @@ -53,9 +53,9 @@ index 2b06881..d8cf510 100644 @echo Testing C++ build, dictionary from file ./test-c++file -t testcases.txt @echo Testing C++ build, dictionary in executable -@@ -57,4 +74,4 @@ clean: - rm -f test-file zxcvbn-file.o test-c++file zxcvbn-c++file.o +@@ -58,4 +75,4 @@ clean: 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/targets-to-build-static-lib.patch b/debian/patches/targets-to-build-static-lib.patch index 0dbfa49..82035b8 100644 --- a/debian/patches/targets-to-build-static-lib.patch +++ b/debian/patches/targets-to-build-static-lib.patch @@ -7,7 +7,7 @@ Subject: targets to build static lib 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/makefile b/makefile -index d8cf510..fe7dda1 100644 +index 7165ce2..f0bc552 100644 --- a/makefile +++ b/makefile @@ -11,7 +11,7 @@ SONAME = libzxcvbn.so.0 @@ -49,9 +49,9 @@ index d8cf510..fe7dda1 100644 @echo Testing C++ build, dictionary from file ./test-c++file -t testcases.txt @echo Testing C++ build, dictionary in executable -@@ -74,4 +82,4 @@ clean: - rm -f test-file zxcvbn-file.o test-c++file zxcvbn-c++file.o +@@ -75,4 +83,4 @@ clean: 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 - rm -f ${TARGET_LIB} libzxcvbn.so test-shlib + rm -f ${TARGET_LIB} libzxcvbn.so test-shlib libzxcvbn.a test-statlib -- cgit v1.2.3