From: Peter Michael Green <plugwash@raspbian.org>
Date: Sun, 12 Jan 2020 01:52:39 +0000 (+0000)
Subject: Commit Debian 3.0 (quilt) metadata
X-Git-Tag: archive/raspbian/14.2.5-3+rpi1~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bc0bcd9a49bfe910134af6f6903b23bb82575102;p=ceph.git

Commit Debian 3.0 (quilt) metadata

[dgit (9.9) quilt-fixup]
---

diff --git a/debian/patches/remove-problematic-gitattributes-files.patch b/debian/patches/remove-problematic-gitattributes-files.patch
new file mode 100644
index 000000000..7e3359cef
--- /dev/null
+++ b/debian/patches/remove-problematic-gitattributes-files.patch
@@ -0,0 +1,92 @@
+From: Raspbian forward porter <root@raspbian.org>
+Subject: remove gitattributes files that cause problems for dgit.
+
+--- ceph-14.2.5.orig/src/civetweb/.gitattributes
++++ /dev/null
+@@ -1,33 +0,0 @@
+-# Auto detect text files and perform LF normalization
+-* -text
+-
+-# Custom for Visual Studio
+-*.cs     diff=csharp
+-*.sln    merge=union
+-*.csproj merge=union
+-*.vbproj merge=union
+-*.fsproj merge=union
+-*.dbproj merge=union
+-
+-# Standard to msysgit
+-*.doc    diff=astextplain
+-*.DOC    diff=astextplain
+-*.docx   diff=astextplain
+-*.DOCX   diff=astextplain
+-*.dot    diff=astextplain
+-*.DOT    diff=astextplain
+-*.pdf    diff=astextplain
+-*.PDF    diff=astextplain
+-*.rtf    diff=astextplain
+-*.RTF    diff=astextplain
+-
+-# Preserver Windows specfic lines endings
+-*.cmd text eol=crlf
+-
+-
+-# Settings for github syntax highlighting
+-# see https://github.com/github/linguist/blob/master/README.md
+-docs/* linguist-documentation
+-*.inl linguist-language=C
+-*.h linguist-language=C
+-include/CivetServer.h linguist-language=C++
+--- ceph-14.2.5.orig/src/rapidjson/.gitattributes
++++ /dev/null
+@@ -1,22 +0,0 @@
+-# Set the default behavior, in case people don't have core.autocrlf set.
+-* text=auto
+-
+-# Explicitly declare text files you want to always be normalized and converted
+-# to native line endings on checkout.
+-*.cpp text
+-*.h text
+-*.txt text
+-*.md text
+-*.cmake text
+-*.svg text
+-*.dot text
+-*.yml text
+-*.in text
+-*.sh text
+-*.autopkg text
+-Dockerfile text
+-
+-# Denote all files that are truly binary and should not be modified.
+-*.png binary
+-*.jpg binary
+-*.json binary
+\ No newline at end of file
+--- ceph-14.2.5.orig/src/zstd/.gitattributes
++++ /dev/null
+@@ -1,24 +0,0 @@
+-# Set the default behavior
+-* text eol=lf
+-
+-# Explicitly declare source files
+-*.c text eol=lf
+-*.h text eol=lf
+-
+-# Denote files that should not be modified.
+-*.odt binary
+-*.png binary
+-
+-# Visual Studio
+-*.sln text eol=crlf
+-*.vcxproj* text eol=crlf
+-*.vcproj* text eol=crlf
+-*.suo binary
+-*.rc text eol=crlf
+-
+-# Windows
+-*.bat text eol=crlf
+-*.cmd text eol=crlf
+-
+-# .travis.yml merging
+-.travis.yml merge=ours
diff --git a/debian/patches/series b/debian/patches/series
index e1396eb54..d533c4f2d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ fix-bash-completion-location
 32466.patch-1
 32466.patch-2
 detect-raspbian.diff
+remove-problematic-gitattributes-files.patch