Commit 9b1be678 authored by Ilias Tsitsimpis's avatar Ilias Tsitsimpis

Merge branch 'master' into experimental

parents b4f3c962 f954bea2
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Type=Application
Name=Allure of the Stars
Comment=Explore an abandoned spaceship with a party of adventurers
Keywords=game;strategy;tactics;roguelike;scifi;
Exec=allure
Icon=allure
Terminal=false
Categories=Game;
StartupNotify=true
usr/games
usr/share/icons
......@@ -10,3 +10,5 @@
./LICENSE usr/share/allure/.
./README.md usr/share/allure/.
dist-ghc/build/Allure/Allure usr/games
debian/allure.desktop /usr/share/applications
debian/allure.png /usr/share/icons
allure (0.8.3.0-3) UNRELEASED; urgency=medium
allure (0.8.3.0-3) unstable; urgency=medium
* Attempt to force 'cabal test' to run
* Add an icon and .desktop file
-- Mikolaj Konarski <mikolaj.konarski@funktory.com> Fri, 06 Jul 2018 02:05:45 +0200
-- Mikolaj Konarski <mikolaj.konarski@funktory.com> Fri, 20 Jul 2018 02:05:45 +0200
allure (0.8.3.0-2) unstable; urgency=medium
......
......@@ -24,13 +24,6 @@ ghc (8.4.3-4) experimental; urgency=medium
-- Gianfranco Costamagna <locutusofborg@debian.org> Fri, 20 Jul 2018 00:24:43 +0200
ghc (8.2.2-6) unstable; urgency=medium
* debian/patches/{risc-support,e175aaf6918bb2b497b83618dc4c270a0d231a1c}.patch
- add upstream patches to support risc* platforms (Closes: #904096)
-- Gianfranco Costamagna <locutusofborg@debian.org> Thu, 19 Jul 2018 19:24:01 +0200
ghc (8.4.3-3) experimental; urgency=medium
* Switch configure.ac to search for llvm 6.0
......@@ -83,6 +76,13 @@ ghc (8.4.1-1) experimental; urgency=medium
-- Gianfranco Costamagna <locutusofborg@debian.org> Mon, 09 Apr 2018 15:54:00 +0200
ghc (8.2.2-6) unstable; urgency=medium
* debian/patches/{risc-support,e175aaf6918bb2b497b83618dc4c270a0d231a1c}.patch
- add upstream patches to support risc* platforms (Closes: #904096)
-- Gianfranco Costamagna <locutusofborg@debian.org> Thu, 19 Jul 2018 19:24:01 +0200
ghc (8.2.2-5) unstable; urgency=medium
* Apply patch to disable -Bsymbolic on unregisterised
......
haskell-hoogle (5.0.17.3+dfsg1-3) unstable; urgency=low
* Re-upload, because of failed previous upload.
-- Sven Bartscher <kritzefitz@debian.org> Thu, 02 Aug 2018 16:46:46 +0200
haskell-hoogle (5.0.17.3+dfsg1-2) unstable; urgency=low
* Repack to remove embedded copies of libjs-jquery-cookie and
libjs-chosen that had been accidentally shipped in the last versions.
-- Sven Bartscher <kritzefitz@debian.org> Thu, 02 Aug 2018 07:47:53 +0200
haskell-hoogle (5.0.17.3-1) unstable; urgency=medium
* Set Rules-Requires-Root to no.
......
haskell-hopenpgp-tools (0.21.2-1) unstable; urgency=medium
* New upstream version.
- hkt no longer defaults to anything if --keyring is omitted.
closes: #868769.
-- Clint Adams <clint@debian.org> Sun, 29 Jul 2018 18:18:43 +0800
haskell-hopenpgp-tools (0.21.1-1) unstable; urgency=medium
* Set Rules-Requires-Root to no.
......
haskell-hopenpgp (2.7.2-1) unstable; urgency=medium
* New upstream release
-- Clint Adams <clint@debian.org> Sun, 29 Jul 2018 09:51:30 +0800
haskell-hopenpgp (2.7.1-1) unstable; urgency=medium
* New upstream version.
......
haskell-parsec-numbers (0.1.0-1) unstable; urgency=low
* Initial release (Closes: #905337)
-- Aggelos Avgerinos <evaggelos.avgerinos@gmail.com> Wed, 12 Sep 2018 15:17:56 +0300
Source: haskell-parsec-numbers
Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
Uploaders: Aggelos Avgerinos <evaggelos.avgerinos@gmail.com>
Priority: optional
Section: haskell
Build-Depends: debhelper (>= 10),
haskell-devscripts-minimal | haskell-devscripts (>= 0.9),
cdbs,
ghc,
ghc-prof,
libghc-parsec3-dev,
libghc-parsec3-prof,
Build-Depends-Indep: ghc-doc,
libghc-parsec3-doc,
Standards-Version: 4.2.1
Homepage: http://hackage.haskell.org/package/parsec-numbers
Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/cabal-debian/debian
Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/haskell-parsec-numbers]
X-Description: Utilities for parsing numbers from strings
parsec-numbers provides the number parsers without the need to
use a large (and unportable) token parser
Package: libghc-parsec-numbers-dev
Architecture: any
Depends: ${haskell:Depends},
${misc:Depends},
${shlibs:Depends},
Recommends: ${haskell:Recommends},
Suggests: ${haskell:Suggests},
Conflicts: ${haskell:Conflicts},
Provides: ${haskell:Provides},
Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
${haskell:LongDescription}
.
${haskell:Blurb}
Package: libghc-parsec-numbers-prof
Architecture: any
Depends: ${haskell:Depends},
${misc:Depends},
Recommends: ${haskell:Recommends},
Suggests: ${haskell:Suggests},
Conflicts: ${haskell:Conflicts},
Provides: ${haskell:Provides},
Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
${haskell:LongDescription}
.
${haskell:Blurb}
Package: libghc-parsec-numbers-doc
Architecture: all
Section: doc
Depends: ${haskell:Depends},
${misc:Depends},
Recommends: ${haskell:Recommends},
Suggests: ${haskell:Suggests},
Conflicts: ${haskell:Conflicts},
Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
${haskell:LongDescription}
.
${haskell:Blurb}
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: parsec-numbers
Upstream-Contact: chr.maeder@web.de
Source: https://hackage.haskell.org/package/parsec-numbers
Files: *
Copyright: 2011-2018 Christian Maeder <chr.maeder@web.de>
License: BSD-3-Clause
Files: debian/*
Copyright: held by the contributors mentioned in debian/changelog
License: BSD-3-Clause
License: BSD-3-Clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of descriptive nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#!/usr/bin/make -f
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
DEB_SETUP_BIN_NAME = debian/hlibrary.setup
DEB_CABAL_PACKAGE = parsec-numbers
DEB_DEFAULT_COMPILER = ghc
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/hlibrary.mk
version=3
https://hackage.haskell.org/package/parsec-numbers/distro-monitor .*-([0-9\.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
haskell-shake (0.16.4-3) UNRELEASED; urgency=medium
haskell-shake (0.16.4+dfsg-1) unstable; urgency=medium
[ Gianfranco Costamagna ]
* Repack tarball, since we should exclude viz.js file.
- thanks Sven Bartscher for the hint
[ Clint Adams ]
* Set Rules-Requires-Root to no.
-- Clint Adams <clint@debian.org> Sun, 06 May 2018 22:10:33 -0400
-- Gianfranco Costamagna <locutusofborg@debian.org> Mon, 30 Jul 2018 10:35:31 +0200
haskell-shake (0.16.4-2) unstable; urgency=medium
......
haskell-store (0.4.3.2-5) UNRELEASED; urgency=medium
haskell-store (0.4.3.2-5) unstable; urgency=medium
[ Clint Adams ]
* Set Rules-Requires-Root to no.
-- Clint Adams <clint@debian.org> Sun, 06 May 2018 22:10:37 -0400
[ Sven Bartscher ]
* Patch for newer smallcheck
-- Sven Bartscher <kritzefitz@debian.org> Sat, 04 Aug 2018 13:48:23 +0200
haskell-store (0.4.3.2-4) unstable; urgency=medium
......
--- a/test/Data/StoreSpec.hs
+++ b/test/Data/StoreSpec.hs
@@ -91,7 +91,7 @@
@@ -91,8 +91,6 @@
, ''CUIntMax, ''CPtrdiff, ''CSChar, ''CShort, ''CUInt, ''CLLong
, ''CLong, ''CInt, ''CChar, ''CSsize, ''CPid
, ''COff, ''CMode, ''CIno, ''CDev
- , ''Word8, ''Word16, ''Word32, ''Word64, ''Word
+ , ''Word8, ''Word16, ''Word32, ''Word64
, ''Int8, ''Int16, ''Int32, ''Int64
- , ''Int8, ''Int16, ''Int32, ''Int64
, ''PortNumber
#if MIN_VERSION_base(4,10,0)
, ''CBool, ''CClockId, ''CKey, ''CId
@@ -283,14 +281,18 @@
omitTys <- sequence
[ [t| PV.Vector Addr |]
, [t| CUIntPtr |]
+ , [t| PV.Vector CUIntPtr |]
, [t| CIntPtr |]
+ , [t| PV.Vector CIntPtr |]
, [t| IntPtr |]
, [t| WordPtr |]
, [t| TypeHash |]
, [t| Fd |]
+ , [t| PV.Vector Fd |]
, [t| NameFlavour |]
#if MIN_VERSION_base(4,10,0)
, [t| CTimer |]
+ , [t| PV.Vector CTimer |]
#endif
]
let f ty = isMonoType ty && ty `notElem` omitTys
haskell-token-bucket (0.1.0.1-7) UNRELEASED; urgency=medium
haskell-token-bucket (0.1.0.1-7) unstable; urgency=medium
[ Clint Adams ]
* Set Rules-Requires-Root to no.
-- Clint Adams <clint@debian.org> Sun, 06 May 2018 22:10:46 -0400
[ Sven Bartscher ]
* Patch test suite to work around timing issues that broke the build on
arm and mips architectures
-- Sven Bartscher <kritzefitz@debian.org> Fri, 03 Aug 2018 17:24:13 +0200
haskell-token-bucket (0.1.0.1-6) unstable; urgency=medium
......
Description: Resolve timing issue in the test
Creating the TokenBucket far away from the actual tests means that
the TokenBucket can accumulate a partial token before the start time
for the first test is taken. After the first requested token
exhausts the burst size it doesn't take the full time that would
usually be required before the second token can be allocated. Most
of the time this doesn't seem to be a problem, but on some
architectures (armhf, mipsel) it seems to cause semi-consistent test
failurses. Strictly speaking the same problem still exists with this
patch, as the TokenBucket is still created before the start time of
the test is taken, but with the current layout this inaccuracy
usually balances out with the time added at the end, because the end
time of the test is taken slightly after the last token is
allocated.
This also fixes that the test was overly lenient for all but the
first test. All test are run with n+1 iterations to account for the
initial burst token contained in the freshly created bucket, but
only the first test gets to actually allocate that token. All others
have to wait for a new token to be generated.
This patch has not been forwarded to upstream yet, because at the
time of writing it, I did not have access to my GitHub account. One
I have I will (hopefully) forward it in a timely manner.
Bug: https://github.com/haskell-hvr/token-bucket/issues/3
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=867858
Forwarded: no
Author: Sven Bartscher <kritzefitz@debian.org>
--- a/test-tb.hs
+++ b/test-tb.hs
@@ -31,23 +31,22 @@
main = runInUnboundThread $ do
putStrLn "testing tocket-bucket..."
- !tb <- newTokenBucket
-
replicateM_ 3 $ do
- check tb 10 10.0
- check tb 20 20.0
- check tb 50 50.0
- check tb 100 100.0
- check tb 200 200.0
- check tb 500 500.0
- check tb 1000 1000.0
+ check 10 10.0
+ check 20 20.0
+ check 50 50.0
+ check 100 100.0
+ check 200 200.0
+ check 500 500.0
+ check 1000 1000.0
putStrLn "============================================="
where
- check :: TokenBucket -> Int -> Double -> IO ()
- check tb n rate = do
+ check :: Int -> Double -> IO ()
+ check n rate = do
-- threadDelay 100000
putStrLn $ "running "++show n++"+1 iterations with "++show rate++" Hz rate-limit..."
+ !tb <- newTokenBucket
dt <- timeIO_ (replicateM_ (n+1) $ (tokenBucketWait tb 1 (toInvRate rate)))
let rate' = fromIntegral n/dt
unless (rate' <= rate) $ do
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment