[Git][haskell-team/DHG_packages][master] 2 commits: bytestring-progress: Upgrading from 1.0.9 to 1.2
Clint Adams
gitlab at salsa.debian.org
Wed Jul 4 03:07:04 BST 2018
Clint Adams pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
33b08295 by Clint Adams at 2018-07-03T22:06:06-04:00
bytestring-progress: Upgrading from 1.0.9 to 1.2
- - - - -
98d0464c by Clint Adams at 2018-07-03T22:06:37-04:00
charsetdetect-ae: Upgrading from 1.1.0.3 to 1.1.0.4
- - - - -
7 changed files:
- p/haskell-bytestring-progress/debian/changelog
- p/haskell-bytestring-progress/debian/control
- − p/haskell-bytestring-progress/debian/patches/Update-for-terminal-progress-bar-0.2.patch
- − p/haskell-bytestring-progress/debian/patches/series
- p/haskell-charsetdetect-ae/debian/changelog
- − p/haskell-charsetdetect-ae/debian/patches/arm64.patch
- p/haskell-charsetdetect-ae/debian/patches/series
Changes:
=====================================
p/haskell-bytestring-progress/debian/changelog
=====================================
--- a/p/haskell-bytestring-progress/debian/changelog
+++ b/p/haskell-bytestring-progress/debian/changelog
@@ -1,8 +1,9 @@
-haskell-bytestring-progress (1.0.9-3) UNRELEASED; urgency=medium
+haskell-bytestring-progress (1.2-1) unstable; urgency=medium
* Set Rules-Requires-Root to no.
+ * New upstream release
- -- Clint Adams <clint at debian.org> Sun, 06 May 2018 22:09:20 -0400
+ -- Clint Adams <clint at debian.org> Tue, 03 Jul 2018 22:03:11 -0400
haskell-bytestring-progress (1.0.9-2) unstable; urgency=medium
=====================================
p/haskell-bytestring-progress/debian/control
=====================================
--- a/p/haskell-bytestring-progress/debian/control
+++ b/p/haskell-bytestring-progress/debian/control
@@ -8,9 +8,9 @@ Rules-Requires-Root: no
Build-Depends:
cdbs,
debhelper (>= 9),
+ haskell-devscripts (>= 0.13),
ghc (>= 8),
ghc-prof,
- haskell-devscripts (>= 0.13),
libghc-terminal-progress-bar-dev (>= 0.2),
libghc-terminal-progress-bar-dev (<< 0.3),
libghc-terminal-progress-bar-prof,
=====================================
p/haskell-bytestring-progress/debian/patches/Update-for-terminal-progress-bar-0.2.patch deleted
=====================================
--- a/p/haskell-bytestring-progress/debian/patches/Update-for-terminal-progress-bar-0.2.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From fd1da00d4f63bed9ea6d8bd324336e51dfa7238d Mon Sep 17 00:00:00 2001
-From: Adam Wick <awick at uhsure.com>
-Date: Tue, 24 Apr 2018 08:13:22 -0700
-Subject: [PATCH] Update for terminal-progress-bar 0.2.
-
----
- System/ProgressBar/ByteString.hs | 4 ++--
- bytestring-progress.cabal | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
---- a/System/ProgressBar/ByteString.hs
-+++ b/System/ProgressBar/ByteString.hs
-@@ -10,7 +10,7 @@
- import Data.ByteString.Lazy.Progress
- import System.IO(Handle,hSetBuffering,hPutChar,hPutStr,BufferMode(..))
- import System.IO(openFile,hFileSize,IOMode(..))
--import System.ProgressBar(Label, mkProgressBar)
-+import System.ProgressBar(Label, Progress(Progress), mkProgressBar)
-
- type ℤ = Integer
-
-@@ -33,7 +33,7 @@
- | otherwise = 16384
- updateProgressBar = mkProgressBar prefix postfix width
- updateFunction _ now =
-- tracker $ updateProgressBar (fromIntegral now) size
-+ tracker $ updateProgressBar (Progress (fromIntegral now) size)
-
- -- |As mkByteStringProgressBar, but simply print the output to the given
- -- Handle instead of using a callback.
---- a/bytestring-progress.cabal
-+++ b/bytestring-progress.cabal
-@@ -29,7 +29,7 @@
- Exposed-Modules: Data.ByteString.Lazy.Progress
-
- if flag(use-system-progressbar)
-- Build-Depends: terminal-progress-bar >= 0.0.1 && < 0.1.2
-+ Build-Depends: terminal-progress-bar >= 0.2 && < 0.3
- Exposed-Modules: System.ProgressBar.ByteString
-
-
=====================================
p/haskell-bytestring-progress/debian/patches/series deleted
=====================================
--- a/p/haskell-bytestring-progress/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-Update-for-terminal-progress-bar-0.2.patch
=====================================
p/haskell-charsetdetect-ae/debian/changelog
=====================================
--- a/p/haskell-charsetdetect-ae/debian/changelog
+++ b/p/haskell-charsetdetect-ae/debian/changelog
@@ -1,8 +1,9 @@
-haskell-charsetdetect-ae (1.1.0.3-3) UNRELEASED; urgency=medium
+haskell-charsetdetect-ae (1.1.0.4-1) unstable; urgency=medium
* Set Rules-Requires-Root to no.
+ * New upstream release
- -- Clint Adams <clint at debian.org> Sun, 06 May 2018 22:09:22 -0400
+ -- Clint Adams <clint at debian.org> Tue, 03 Jul 2018 22:04:34 -0400
haskell-charsetdetect-ae (1.1.0.3-2) unstable; urgency=medium
=====================================
p/haskell-charsetdetect-ae/debian/patches/arm64.patch deleted
=====================================
--- a/p/haskell-charsetdetect-ae/debian/patches/arm64.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Provided by Edmund Grimley Evans and obtained from
-https://chromium.googlesource.com/chromium/src/+/2c03ccaa0ef2f8faa77254f93795df4a639a57ec%5E!/
-
-
-Index: charsetdetect-ae-1.0.1/libcharsetdetect/nspr-emu/prcpucfg_linux.h
-===================================================================
---- charsetdetect-ae-1.0.1.orig/libcharsetdetect/nspr-emu/prcpucfg_linux.h 2015-06-17 10:36:01.106498119 +0200
-+++ charsetdetect-ae-1.0.1/libcharsetdetect/nspr-emu/prcpucfg_linux.h 2015-06-17 10:36:01.102498065 +0200
-@@ -509,6 +509,59 @@
- #define PR_BYTES_PER_WORD_LOG2 2
- #define PR_BYTES_PER_DWORD_LOG2 3
-
-+#elif defined(__aarch64__)
-+
-+#ifdef __AARCH64EB__
-+#undef IS_LITTLE_ENDIAN
-+#define IS_BIG_ENDIAN 1
-+#elif defined(__AARCH64EL__)
-+#define IS_LITTLE_ENDIAN 1
-+#undef IS_BIG_ENDIAN
-+#else
-+#error "Unknown Aarch64 endianness."
-+#endif
-+#define IS_64
-+
-+#define PR_BYTES_PER_BYTE 1
-+#define PR_BYTES_PER_SHORT 2
-+#define PR_BYTES_PER_INT 4
-+#define PR_BYTES_PER_INT64 8
-+#define PR_BYTES_PER_LONG 8
-+#define PR_BYTES_PER_FLOAT 4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD 8
-+#define PR_BYTES_PER_DWORD 8
-+
-+#define PR_BITS_PER_BYTE 8
-+#define PR_BITS_PER_SHORT 16
-+#define PR_BITS_PER_INT 32
-+#define PR_BITS_PER_INT64 64
-+#define PR_BITS_PER_LONG 64
-+#define PR_BITS_PER_FLOAT 32
-+#define PR_BITS_PER_DOUBLE 64
-+#define PR_BITS_PER_WORD 64
-+
-+#define PR_BITS_PER_BYTE_LOG2 3
-+#define PR_BITS_PER_SHORT_LOG2 4
-+#define PR_BITS_PER_INT_LOG2 5
-+#define PR_BITS_PER_INT64_LOG2 6
-+#define PR_BITS_PER_LONG_LOG2 6
-+#define PR_BITS_PER_FLOAT_LOG2 5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2 6
-+
-+#define PR_ALIGN_OF_SHORT 2
-+#define PR_ALIGN_OF_INT 4
-+#define PR_ALIGN_OF_LONG 8
-+#define PR_ALIGN_OF_INT64 8
-+#define PR_ALIGN_OF_FLOAT 4
-+#define PR_ALIGN_OF_DOUBLE 8
-+#define PR_ALIGN_OF_POINTER 8
-+#define PR_ALIGN_OF_WORD 8
-+
-+#define PR_BYTES_PER_WORD_LOG2 3
-+#define PR_BYTES_PER_DWORD_LOG2 3
-+
- #elif defined(__hppa__)
-
- #undef IS_LITTLE_ENDIAN
=====================================
p/haskell-charsetdetect-ae/debian/patches/series
=====================================
--- a/p/haskell-charsetdetect-ae/debian/patches/series
+++ b/p/haskell-charsetdetect-ae/debian/patches/series
@@ -1,2 +1 @@
-arm64.patch
kfreebsd
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/compare/a65a41d1590a2b689499b1828d371a5e7a44cad2...98d0464c9549060406f9bfbcf32d63406ae719c7
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/compare/a65a41d1590a2b689499b1828d371a5e7a44cad2...98d0464c9549060406f9bfbcf32d63406ae719c7
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20180704/640f5bac/attachment-0001.html>
More information about the Pkg-haskell-commits
mailing list