Remove .gitignore from deb package.

This commit is contained in:
Bastian Kleineidam 2013-02-22 18:31:33 +01:00
parent 4dcc876c7e
commit b982a5aba3
7 changed files with 8 additions and 7 deletions

View File

@ -135,6 +135,7 @@ deb:
cd $(CURDIR); \ cd $(CURDIR); \
git checkout debian; \ git checkout debian; \
cp -r debian $(DEBPACKAGEDIR); \ cp -r debian $(DEBPACKAGEDIR); \
rm -f $(DEBPACKAGEDIR)/debian/.gitignore; \
git checkout master) git checkout master)
$(MAKE) -C $(DEBUILDDIR) $(LAPPNAME)_clean $(LAPPNAME) $(MAKE) -C $(DEBUILDDIR) $(LAPPNAME)_clean $(LAPPNAME)

View File

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- 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 # 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 # 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 # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
from . import ArchiveTest from . import ArchiveTest, Content
from .. import needs_program from .. import needs_program
class TestLzop (ArchiveTest): class TestLzop (ArchiveTest):
@ -22,10 +22,10 @@ class TestLzop (ArchiveTest):
@needs_program(program) @needs_program(program)
def test_lzop(self): 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('file')
@needs_program(program) @needs_program(program)
def test_lzop_file(self): 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)

Binary file not shown.

Binary file not shown.

BIN
tests/data/t.txt.lzo Normal file

Binary file not shown.

BIN
tests/data/t.txt.lzo.foo Normal file

Binary file not shown.

View File

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- 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 # 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 # 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.lzma.foo", "application/x-lzma", None)
self.mime_test_file("t.txt.lz", "application/x-lzip", 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.txt.lz.foo", "application/x-lzip", None)
self.mime_test_file("t.lzo", "application/x-lzop", None) self.mime_test_file("t.txt.lzo", "application/x-lzop", None)
self.mime_test_file("t.lzo.foo", "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", "application/x-rar", None)
self.mime_test_file("t.rar.foo", "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) self.mime_test_file("t.rpm", "application/x-rpm", None)