From: Peter Michael Green <plugwash@raspbian.org>
Date: Mon, 31 Dec 2018 10:31:58 +0000 (+0000)
Subject: Remove .gitattributes file, it seems to break dgit.
X-Git-Tag: archive/raspbian/1.3.5+dfsg-2+rpi1~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c1713c5e804a7b379e38c88ebade8d13bf8e8e2a;p=libzstd.git

Remove .gitattributes file, it seems to break dgit.
---

diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 9eb12c0..0000000
--- a/.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/changelog b/debian/changelog
index 8a03cc2..3b07bf5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ libzstd (1.3.5+dfsg-2+rpi1) buster-staging; urgency=medium
   [changes brought forward from 1.3.3+dfsg-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 14 Jan 2018 16:35:02 +0000]
   * Disable testsuite.
 
+  [changes introduced in 1.3.5+dfsg-2+rpi1 by Peter Michael Green]
+  * Remove .gitattributes file, it seems to break dgit.
+
  -- Raspbian forward porter <root@raspbian.org>  Mon, 31 Dec 2018 10:03:56 +0000
 
 libzstd (1.3.5+dfsg-2) unstable; urgency=medium