From 975170048cf84a93a17333a18e4e76abcf67ff34 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Wed, 23 Oct 2013 16:13:25 -0600 Subject: [PATCH] lower tar's mailcap priority --- debian/changelog | 4 +++- debian/gbp.conf | 46 ---------------------------------------------- debian/tar.mime | 6 +++--- 3 files changed, 6 insertions(+), 50 deletions(-) delete mode 100644 debian/gbp.conf diff --git a/debian/changelog b/debian/changelog index b1cb3829..5b10a56b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ tar (1.27-3) UNRELEASED; urgency=low * honor DEB_BUILD_OPTIONS parallel=, honor dpkg-buildflags in build target in addition to configure target, closes: #727196 + * lower mime priority to 1 so interactive packages using the default + priority of 5 win, closes: #727303 - -- Bdale Garbee Wed, 23 Oct 2013 09:53:31 -0600 + -- Bdale Garbee Wed, 23 Oct 2013 16:13:07 -0600 tar (1.27-2) unstable; urgency=low diff --git a/debian/gbp.conf b/debian/gbp.conf deleted file mode 100644 index f2eb723b..00000000 --- a/debian/gbp.conf +++ /dev/null @@ -1,46 +0,0 @@ -# Configuration file for git-buildpackage and friends - -[DEFAULT] -# the default build command: -#builder = debuild -i\.git/ -I.git -# the default clean command: -#cleaner = debuild clean -# the default branch for upstream sources: -upstream-branch = dfsg-orig -# the default branch for the debian patch: -debian-branch = dfsg-debian -# the default tag formats used: -#upstream-tag = upstream/%(version)s -#debian-tag = debian/%(version)s -# use pristine-tar: -pristine-tar = True - -# Options only affecting git-buildpackage -[git-buildpackage] -#upstream-branch = dfsgclean -# uncomment this to automatically GPG sign tags -#sign-tags = True -# keyid to GPG sign tags with -#keyid = 0xdeadbeef -# push to a remote repository after a successful tag: -posttag = git push --mirror -# use this for more svn-buildpackage like behaviour: -export-dir = ../build-area/tar/ -#tarball-dir = ../tarballs/ - -# Options only affecting git-import-orig -[git-import-orig] -#upstream-branch = newupstream -#debian-branch = dfsgclean -#filter = .svn - -# Options only affecting git-import-dsc -[git-import-dsc] -#upstream-branch = svn-upstream -#filter = [ 'CVS', '.cvsignore' ] - -# Options only affecting git-dch -[git-dch] -#git-log = --no-merges -#snapshot-number = snapshot + 1 - diff --git a/debian/tar.mime b/debian/tar.mime index 09d17db2..41929b46 100644 --- a/debian/tar.mime +++ b/debian/tar.mime @@ -1,3 +1,3 @@ -application/x-tar; /bin/tar tvf '%s'; print=/bin/tar tvf - | print text/plain:-; copiousoutput -application/x-gtar; /bin/tar tvf '%s'; print=/bin/tar tvf - | print text/plain:-; copiousoutput -application/x-ustar; /bin/tar tvf '%s'; print=/bin/tar tvf - | print text/plain:-; copiousoutput +application/x-tar; /bin/tar tvf '%s'; print=/bin/tar tvf - | print text/plain:-; copiousoutput ; priority=1 +application/x-gtar; /bin/tar tvf '%s'; print=/bin/tar tvf - | print text/plain:-; copiousoutput ; priority=1 +application/x-ustar; /bin/tar tvf '%s'; print=/bin/tar tvf - | print text/plain:-; copiousoutput ; priority=1 -- 2.30.2