summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergeiTrofimovich <>2014-05-29 15:37:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2014-05-29 15:37:00 (GMT)
commit4417e98ec47a6ab3a321cb6e4732cff14b037e24 (patch)
treeb45de81b33aee7f7035b5f330995392f7d3b6bef
parentee05b9e4ba9a9d373aceb9325cc65a9ec4dab597 (diff)
version 0.4.20.4.2
-rw-r--r--Merge/Dependencies.hs1
-rw-r--r--hackport.cabal2
-rwxr-xr-xmk_release_tarball.bash2
3 files changed, 2 insertions, 3 deletions
diff --git a/Merge/Dependencies.hs b/Merge/Dependencies.hs
index b211d09..3347205 100644
--- a/Merge/Dependencies.hs
+++ b/Merge/Dependencies.hs
@@ -125,7 +125,6 @@ resolveDependencies overlay pkg compiler ghc_package_names merged_cabal_pkg_name
_ | otherwise -> raw_haskell_deps
test_deps :: Portage.Dependency
test_deps = Portage.mkUseDependency (True, Portage.Use "test") $
- Portage.set_build_slot $
Portage.DependAllOf $
-- remove depends present in common section
filter (\d -> not (Portage.dep_as_broad_as d raw_haskell_deps)) $
diff --git a/hackport.cabal b/hackport.cabal
index e6a30ba..44cb691 100644
--- a/hackport.cabal
+++ b/hackport.cabal
@@ -1,5 +1,5 @@
Name: hackport
-Version: 0.4.1
+Version: 0.4.2
License: GPL
License-file: LICENSE
Author: Henning G√ľnther, Duncan Coutts, Lennart Kolmodin
diff --git a/mk_release_tarball.bash b/mk_release_tarball.bash
index 7fba135..b486c3c 100755
--- a/mk_release_tarball.bash
+++ b/mk_release_tarball.bash
@@ -23,6 +23,6 @@ tarball_name="${srcdir}/${P}.tar.gz"
# cabal is not able to unpack long tar names
rm -rf -- cabal/Cabal/tests
)
- tar -czf "${tarball_name}" "${P}"/
+ TAR_OPTIONS=--format=ustar tar -czf "${tarball_name}" "${P}"/
)
rm -rf -- "${tempdir}"