From b982a5aba37c2b0368f2aeb958e40f35d8fa8f58 Mon Sep 17 00:00:00 2001
From: Bastian Kleineidam <bastian.kleineidam@web.de>
Date: Fri, 22 Feb 2013 18:31:33 +0100
Subject: [PATCH] Remove .gitignore from deb package.

---
 Makefile                    |   1 +
 tests/archives/test_lzop.py |   8 ++++----
 tests/data/t.lzo            | Bin 58 -> 0 bytes
 tests/data/t.lzo.foo        | Bin 58 -> 0 bytes
 tests/data/t.txt.lzo        | Bin 0 -> 61 bytes
 tests/data/t.txt.lzo.foo    | Bin 0 -> 61 bytes
 tests/test_mime.py          |   6 +++---
 7 files changed, 8 insertions(+), 7 deletions(-)
 delete mode 100644 tests/data/t.lzo
 delete mode 100644 tests/data/t.lzo.foo
 create mode 100644 tests/data/t.txt.lzo
 create mode 100644 tests/data/t.txt.lzo.foo

diff --git a/Makefile b/Makefile
index 42eec0b..4cabf57 100644
--- a/Makefile
+++ b/Makefile
@@ -135,6 +135,7 @@ deb:
 	  cd $(CURDIR); \
 	  git checkout debian; \
 	  cp -r debian $(DEBPACKAGEDIR); \
+	  rm -f $(DEBPACKAGEDIR)/debian/.gitignore; \
 	  git checkout master)
 	$(MAKE) -C $(DEBUILDDIR) $(LAPPNAME)_clean $(LAPPNAME)
 
diff --git a/tests/archives/test_lzop.py b/tests/archives/test_lzop.py
index 81689e5..d092ebc 100644
--- a/tests/archives/test_lzop.py
+++ b/tests/archives/test_lzop.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 Bastian Kleineidam
+# Copyright (C) 2010-2013 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -13,7 +13,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-from . import ArchiveTest
+from . import ArchiveTest, Content
 from .. import needs_program
 
 class TestLzop (ArchiveTest):
@@ -22,10 +22,10 @@ class TestLzop (ArchiveTest):
 
     @needs_program(program)
     def test_lzop(self):
-        self.archive_commands('t.lzo', singlefile=True)
+        self.archive_commands('t.txt.lzo', check=Content.Singlefile)
 
     @needs_program('file')
     @needs_program(program)
     def test_lzop_file(self):
-        self.archive_commands('t.lzo.foo', skip_create=True)
+        self.archive_commands('t.txt.lzo.foo', skip_create=True, check=Content.Singlefile)
 
diff --git a/tests/data/t.lzo b/tests/data/t.lzo
deleted file mode 100644
index 100be4dcdfc7187346a15032322dda5677b316c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 58
zcmeD5iSlRQ<&xqOP*5=7bYNs<W?*1sU}#+6-B6m(00fLBdYLSeKn75Pftit)q0q#L
H3nT#m1KkIE

diff --git a/tests/data/t.lzo.foo b/tests/data/t.lzo.foo
deleted file mode 100644
index 100be4dcdfc7187346a15032322dda5677b316c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 58
zcmeD5iSlRQ<&xqOP*5=7bYNs<W?*1sU}#+6-B6m(00fLBdYLSeKn75Pftit)q0q#L
H3nT#m1KkIE

diff --git a/tests/data/t.txt.lzo b/tests/data/t.txt.lzo
new file mode 100644
index 0000000000000000000000000000000000000000..a4b393b40f9300d602d2f42259992a15bebc1f12
GIT binary patch
literal 61
zcmeD5iSlRQ<&xqOFi=R~bYNs<W?*1sU}#(taKST#0SH)2^hzp9yr!}K1#+0ccn(9l
Ii4jN+0A!g91poj5

literal 0
HcmV?d00001

diff --git a/tests/data/t.txt.lzo.foo b/tests/data/t.txt.lzo.foo
new file mode 100644
index 0000000000000000000000000000000000000000..a4b393b40f9300d602d2f42259992a15bebc1f12
GIT binary patch
literal 61
zcmeD5iSlRQ<&xqOFi=R~bYNs<W?*1sU}#(taKST#0SH)2^hzp9yr!}K1#+0ccn(9l
Ii4jN+0A!g91poj5

literal 0
HcmV?d00001

diff --git a/tests/test_mime.py b/tests/test_mime.py
index 3c257a0..2d32ed4 100644
--- a/tests/test_mime.py
+++ b/tests/test_mime.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 Bastian Kleineidam
+# Copyright (C) 2010-2013 Bastian Kleineidam
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -66,8 +66,8 @@ class TestMime (unittest.TestCase):
         #self.mime_test_file("t.lzma.foo", "application/x-lzma", None)
         self.mime_test_file("t.txt.lz", "application/x-lzip", None)
         self.mime_test_file("t.txt.lz.foo", "application/x-lzip", None)
-        self.mime_test_file("t.lzo", "application/x-lzop", None)
-        self.mime_test_file("t.lzo.foo", "application/x-lzop", None)
+        self.mime_test_file("t.txt.lzo", "application/x-lzop", None)
+        self.mime_test_file("t.txt.lzo.foo", "application/x-lzop", None)
         self.mime_test_file("t.rar", "application/x-rar", None)
         self.mime_test_file("t.rar.foo", "application/x-rar", None)
         self.mime_test_file("t.rpm", "application/x-rpm", None)