update remove-problematic-gitattributes-files.patch

diff --git a/debian/patches/remove-problematic-gitattributes-files.patch b/debian/patches/remove-problematic-gitattributes-files.patch
index 7e3359cef3036779ff9bbda36cf5cef9578396d5..579217aebfd08762dcac067e0327d9bb6b3cb2ca 100644 (file)
--- a/debian/patches/remove-problematic-gitattributes-files.patch
+++ b/debian/patches/remove-problematic-gitattributes-files.patch
@@ -1,7 +1,10 @@
 From: Raspbian forward porter <root@raspbian.org>
 Subject: remove gitattributes files that cause problems for dgit.
 
---- ceph-14.2.5.orig/src/civetweb/.gitattributes
+diff --git a/src/civetweb/.gitattributes b/src/civetweb/.gitattributes
+deleted file mode 100644
+index 5c528676b..000000000
+--- a/src/civetweb/.gitattributes
 +++ /dev/null
 @@ -1,33 +0,0 @@
 -# Auto detect text files and perform LF normalization
@@ -37,7 +40,10 @@ Subject: remove gitattributes files that cause problems for dgit.
 -*.inl linguist-language=C
 -*.h linguist-language=C
 -include/CivetServer.h linguist-language=C++
---- ceph-14.2.5.orig/src/rapidjson/.gitattributes
+diff --git a/src/rapidjson/.gitattributes b/src/rapidjson/.gitattributes
+deleted file mode 100644
+index 6f598bb7f..000000000
+--- a/src/rapidjson/.gitattributes
 +++ /dev/null
 @@ -1,22 +0,0 @@
 -# Set the default behavior, in case people don't have core.autocrlf set.
@@ -63,9 +69,12 @@ Subject: remove gitattributes files that cause problems for dgit.
 -*.jpg binary
 -*.json binary
 \ No newline at end of file
---- ceph-14.2.5.orig/src/zstd/.gitattributes
+diff --git a/src/zstd/.gitattributes b/src/zstd/.gitattributes
+deleted file mode 100644
+index 6212bd405..000000000
+--- a/src/zstd/.gitattributes
 +++ /dev/null
-@@ -1,24 +0,0 @@
+@@ -1,21 +0,0 @@
 -# Set the default behavior
 -* text eol=lf
 -
@@ -87,6 +96,3 @@ Subject: remove gitattributes files that cause problems for dgit.
 -# Windows
 -*.bat text eol=crlf
 -*.cmd text eol=crlf
--
--# .travis.yml merging
--.travis.yml merge=ours