[Pkg-haskell-commits] darcs: haskell-simple-sendfile: New upstream version 0.2.14.

Clint Adams clint at debian.org
Thu Jun 19 15:02:24 UTC 2014


Thu Jun 19 15:01:51 UTC 2014  Clint Adams <clint at debian.org>
  * New upstream version 0.2.14.

    M ./changelog -2 +8
    M ./control -5 +13
    R ./patches/kfreebsd.patch
    A ./patches/missing-test-file.diff
    A ./patches/no-network-conduit.diff
    M ./patches/series -1 +2
    M ./rules +2

Thu Jun 19 15:01:51 UTC 2014  Clint Adams <clint at debian.org>
  * New upstream version 0.2.14.
diff -rN -u old-haskell-simple-sendfile/changelog new-haskell-simple-sendfile/changelog
--- old-haskell-simple-sendfile/changelog	2014-06-19 15:02:24.594462945 +0000
+++ new-haskell-simple-sendfile/changelog	2014-06-19 15:02:24.598462944 +0000
@@ -1,8 +1,14 @@
-haskell-simple-sendfile (0.2.11-3) UNRELEASED; urgency=low
+haskell-simple-sendfile (0.2.14-1) unstable; urgency=medium
 
+  [ Joachim Breitner ]
   * Adjust watch file to new hackage layout
 
- -- Joachim Breitner <nomeata at debian.org>  Sat, 05 Oct 2013 18:21:42 +0200
+  [ Clint Adams ]
+  * New upstream version.
+    - should fix FTBFS on kfreebsd/hurd.  closes: #752053.
+  * Enable testsuite.
+
+ -- Clint Adams <clint at debian.org>  Thu, 19 Jun 2014 10:38:00 -0400
 
 haskell-simple-sendfile (0.2.11-2) unstable; urgency=low
 
diff -rN -u old-haskell-simple-sendfile/control new-haskell-simple-sendfile/control
--- old-haskell-simple-sendfile/control	2014-06-19 15:02:24.594462945 +0000
+++ new-haskell-simple-sendfile/control	2014-06-19 15:02:24.598462944 +0000
@@ -3,7 +3,6 @@
 Priority: extra
 Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
 Uploaders: Iulian Udrea <iulian at linux.com>, Clint Adams <clint at debian.org>
-DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 9)
   , cdbs
   , haskell-devscripts (>= 0.8.15)
@@ -11,15 +10,24 @@
   , ghc-prof
   , libghc-network-dev
   , libghc-network-prof
-  , libghc-conduit-dev (>> 0.4.1) [hurd-any kfreebsd-any]
-  , libghc-conduit-dev (<< 1.1) [hurd-any kfreebsd-any]
+  , libghc-conduit-dev (>= 1.0)
+  , libghc-conduit-dev (<< 1.2)
   , libghc-conduit-prof [hurd-any kfreebsd-any]
-  , libghc-transformers-dev (>> 0.2.2) [hurd-any kfreebsd-any]
+  , libghc-conduit-extra-dev (>= 1.0)
+  , libghc-conduit-extra-dev (<< 1.2)
+  , libghc-conduit-extra-prof [hurd-any kfreebsd-any]
+  , libghc-resourcet-dev
+  , libghc-resourcet-prof
+  , libghc-transformers-dev (>= 0.2.2) [hurd-any kfreebsd-any]
   , libghc-transformers-dev (<< 0.4) [hurd-any kfreebsd-any]
   , libghc-transformers-prof [hurd-any kfreebsd-any]
+  , libghc-hspec-dev (>= 1.3)
 Build-Depends-Indep: ghc-doc
   , libghc-network-doc
-Standards-Version: 3.9.4
+  , libghc-conduit-doc [hurd-any kfreebsd-any]
+  , libghc-conduit-extra-doc [hurd-any kfreebsd-any]
+  , libghc-resourcet-doc
+Standards-Version: 3.9.5
 Homepage: http://hackage.haskell.org/package/simple-sendfile
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-simple-sendfile
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-simple-sendfile
diff -rN -u old-haskell-simple-sendfile/patches/kfreebsd.patch new-haskell-simple-sendfile/patches/kfreebsd.patch
--- old-haskell-simple-sendfile/patches/kfreebsd.patch	2014-06-19 15:02:24.594462945 +0000
+++ new-haskell-simple-sendfile/patches/kfreebsd.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-Description: Add allow-bsd flag for Debian GNU/kFreeBSD
- On Debian GNU/kFreeBSD (FreeBSD kernel plus glibc), the BSD flavour of
- sendfile is not usable (struct sf_hdtr is declared with -D_BSD_SOURCE=1,
- but has no definition), and the Linux flavour doesn't work either since
- MSG_MORE is absent.  However, the fallback version works fine.
- .
- Unfortunately, Cabal treats kfreebsdgnu as os(freebsd), and os(kfreebsdgnu)
- doesn't work.  So, to make it possible to select the fallback
- implementation on GNU/kFreeBSD, I believe a flag is necessary.
-Author: Colin Watson <cjwatson at debian.org>
-Forwarded: https://github.com/kazu-yamamoto/simple-sendfile/pull/13
-Last-Update: 2013-06-14
-
-Index: b/simple-sendfile.cabal
-===================================================================
---- a/simple-sendfile.cabal
-+++ b/simple-sendfile.cabal
-@@ -12,6 +12,10 @@
- Cabal-Version:          >= 1.10
- Build-Type:             Simple
- 
-+Flag allow-bsd
-+  Description:          Allow use of BSD sendfile (disable on GNU/kFreeBSD)
-+  Default:              True
-+
- Library
-   Default-Language:     Haskell2010
-   GHC-Options:          -Wall
-@@ -21,7 +25,7 @@
-                       , network
-                       , bytestring
-   -- NetBSD and OpenBSD don't have sendfile
--  if os(freebsd)
-+  if os(freebsd) && flag(allow-bsd)
-     CPP-Options:        -DOS_BSD
-     Other-Modules:      Network.Sendfile.BSD
-                         Network.Sendfile.IOVec
diff -rN -u old-haskell-simple-sendfile/patches/missing-test-file.diff new-haskell-simple-sendfile/patches/missing-test-file.diff
--- old-haskell-simple-sendfile/patches/missing-test-file.diff	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-simple-sendfile/patches/missing-test-file.diff	2014-06-19 15:02:24.618462937 +0000
@@ -0,0 +1,76208 @@
+--- /dev/null
++++ b/test/inputFile
+@@ -0,0 +1,76205 @@
++A acid
++abacus major
++abacus pythagoricus
++A battery
++abbey counter
++abbey laird
++abbey lands
++abbey lubber
++abbot cloth
++Abbott papyrus
++abb wool
++A-b-c book
++A-b-c method
++abdomino-uterotomy
++Abdul-baha
++a-be
++aberrant duct
++aberration constant
++abiding place
++able-bodied
++able-bodiedness
++able-minded
++able-mindedness
++able seaman
++aboli fruit
++A bond
++Abor-miri
++a-borning
++about-face
++about ship
++about-sledge
++above-cited
++above-found
++above-given
++above-mentioned
++above-named
++above-quoted
++above-reported
++above-said
++above-water
++above-written
++Abraham-man
++abraum salts
++abraxas stone
++Abri audit culture
++abruptly acuminate
++abruptly pinnate
++absciss layer
++absence state
++absentee voting
++absent-minded
++absent-mindedly
++absent-mindedness
++absent treatment
++absent voter
++Absent voting
++absinthe green
++absinthe oil
++absorption bands
++absorption circuit
++absorption coefficient
++absorption current
++absorption dynamometer
++absorption factor
++absorption lines
++absorption pipette
++absorption screen
++absorption spectrum
++absorption system
++A b station
++abstinence theory
++abstract group
++Abt system
++abundance declaree
++aburachan seed
++abutment arch
++abutment pier
++abutting joint
++acacia veld
++academy blue
++academy board
++academy figure
++acajou balsam
++acanthosis nigricans
++acanthus family
++acanthus leaf
++acaroid resin
++Acca larentia
++acceleration note
++accelerator nerve
++accent mark
++acceptance bill
++acceptance house
++acceptance supra protest
++acceptor supra protest
++accession book
++accession number
++accession service
++access road
++accident insurance
++acclamation medal
++acclimation fever
++accommodate distribution
++accommodation acceptance
++accommodation bill
++accommodation draft
++accommodation group
++accommodation ladder
++accommodation train
++accommodation works
++accompaniment figure
++accompanying fire
++accountant general
++account book
++account current
++account days
++account duty
++account render
++account rendered
++account sales
++accounts payable
++accounts payable ledger
++accounts receivable
++account stated
++accretion borer
++accretion cutting
++accrual basis
++accrued interest
++accrued liability
++accumulation factor
++accusative-dative
++ace-high
++ace point
++acetate green
++acetone alcohol
++acetone body
++acetone chloroform
++acetone oil
++acetous fermentation
++acetyl benzoyl peroxide
++acetyl bromide
++acetyl carbinol
++acetyl chloride
++acetylene acid
++acetylene alcohol
++acetylene black
++acetylene burner
++acetylene dichloride
++acetylene dinitrile
++acetylene gas
++acetylene generator
++acetylene linkage
++acetylene series
++acetylene tetrabromide
++acetylene tetrachloride
++acetylene torch
++acetylene urea
++acetylene welder
++acetylene welding
++acetyl index
++acetyl number
++acetyl oxide
++acetyl value
++acey-deucy
++Achaean league
++achemon sphinx
++achievement age
++achievement quotient
++achievement test
++achylia gastrica
++acid albumin
++acid albuminate
++acid alizarin black
++acid alizarin red
++acid amide
++acid anhydride
++acid anthracene brown
++acid azide
++acid bath
++acid bessemer process
++acid-binding
++acid black
++acid blast
++acid blower
++acid boiler
++acid bronze
++acid brown
++acid burner
++acid casein
++acid cell
++acid color
++acid concentrator
++acid dipper
++acid dye
++acid dyspepsia
++acid egg
++acid ester
++acid-fast
++acid-fastness
++acid-forming
++acid fuchsine
++acid gloss
++acid green
++acid halide
++acid honey
++acid hydrolysis
++acidity coefficient
++acid kiln
++acid metaprotein
++acid-mordant dye
++acid nitrile
++acid number
++acid oil
++acidophilus milk
++acid phosphate
++acid ponceau
++acid process
++acid purifier
++acid radical
++acid reaction
++acid reserve
++acid resist
++acid salt
++acid sludge
++acid sodium carbonate
++acid steel
++acid test
++acid tide
++acid-treat
++acid value
++acid violet
++acid wood
++acid worker
++acid works
++acid yellow
++ack-ack
++ack emma
++ack-pirate
++aclinic line
++acme harrow
++acme screw thread
++acme thread
++aconite violet
++acorn barnacle
++acorn chair
++acorn cup
++acorn duck
++acorn moth
++acorn shell
++acorn squash
++acorn tube
++acorn weevil
++acorn worm
++acouchi resin
++acquittance roll
++acre-dale
++acre-foot
++acre-inch
++acridine dyes
++acridine yellow
++across-the-board
++acrylic acid series
++act drop
++actinium emanation
++action busher
++action consciousness
++action current
++action extension
++action filer
++action finisher
++action forger
++action freer
++action jointer
++action machiner
++action noun
++action rail
++action regulator
++action sermon
++action-taking
++action theory
++action time
++action viewer
++activated sludge
++activated-sludge process
++active-bodied
++active-limbed
++active list
++active-minded
++activity coefficient
++activity stream
++activity theory
++actor-manager
++actor-proof
++act psychology
++Act term
++actuality theory
++acute angle
++acute-angled
++acuyari palm
++acuyari wood
++acyclic co-ordinates
++Adam-and-eve
++Adamkiewicz reaction
++Adamson act
++Adamson flue
++Adamson ring
++Adam tiler
++add-add
++addendum circle
++adder bead
++adder fly
++adder gem
++adder pike
++adder stone
++adding machine
++addition algebra
++addition axiom
++addition compound
++addition logarithm
++addition product
++addition table
++addition theorem
++addle egg
++addressing machine
++adductor canal
++adductor impressions
++Adelie penguin
++adenosine triphosphate
++A derrick
++ader wax
++Adi-buddha
++ad infinitum
++ad interim
++adjective equivalent
++adjective pronoun
++adjoint curve
++adjustment bond
++adjustment mortgage
++adjutant bird
++adjutant crane
++adjutant general
++ad lib
++ad libitum
++ad limina
++administrative engineer
++administrator ad litem
++admiral shell
++Admiral togo
++admiralty alloy
++admiralty bond
++admiralty brass
++Admiralty constants
++Admiralty flag
++admiralty law
++admiralty mile
++admiration mark
++Admission day
++adobe bug
++adobe lily
++adobe tick
++adolescent stream
++Adrianople red
++adsorption compound
++adsorption isotherm
++adult education
++ad valorem
++advance note
++advance party
++advance sheets
++advance signal
++advance tracks
++advancing color
++advantage ground
++Advent sunday
++adverb equivalent
++advertisement canvasser
++advertisement contractor
++advice boat
++advocatus ecclesiae
++adz block
++adz eye
++adzuki bean
++Aeginetan marbles
++aerating root
++aero arrow
++aero-otitis
++aero-otitis media
++aerosol bomb
++Aesop prawn
++affine connection
++affine geometry
++affine transformation
++affinity constant
++aff loof
++afghani rupee
++afghan stitch
++A-flat
++A-flat major
++afore-acted
++afore-cited
++afore-coming
++afore-decried
++afore-given
++afore-going
++afore-granted
++afore-heard
++afore-known
++afore-mentioned
++afore-planned
++afore-quoted
++afore-running
++afore-seeing
++afore-seen
++afore-spoken
++afore-stated
++afore-told
++Afrikander bond
++Afro-american
++Afro-asiatic
++Afro-european
++Afro-semitic
++after-acquired
++afterbirth weed
++after-born
++after bridge
++after-described
++after-designed
++after-dinner
++after-mentioned
++after-named
++afternoon lady
++after-specified
++after-stampable
++after-theater
++after-theatre
++after-written
++Agadir incident
++agal-agal
++agar-agar
++agate glass
++agate gray
++agate jasper
++agate opal
++agate shell
++agate snail
++agave cactus
++age-adorning
++age-bent
++age class
++age coating
++age-coeval
++age-cracked
++age-despoiled
++age-dispelling
++age distribution
++age-enfeebled
++age grade
++age-harden
++age-honored
++age-lasting
++age limit
++age norm
++agent-general
++agent intellect
++agent noun
++age-old
++age-peeled
++ageratum blue
++age score
++age society
++age-struck
++age-weary
++age-weathered
++age-worn
++agger nasi
++aggregate fruit
++aggregate polarization
++aggressor nation
++Agin court
++agitator feed
++agnus castus
++Agnus scythicus
++agony column
++agreed case
++agrimony bark
++agrimony water hemp
++Agudath yisrael
++ague bark
++ague cake
++ague drop
++ague-faced
++ague grass
++ague-plagued
++ague-rid
++ague-sore
++ague-struck
++ague tree
++aguja volador
++Ahura-mazda
++Aich metal
++Aida canvas
++aide-de-camp
++aide-de-campship
++aid grant
++aid prayer
++aid station
++ailanthus family
++ailanthus moth
++ailanthus silkworm
++aiming point
++air age
++air arm
++air base
++air bath
++air bed
++air bell
++air belt
++air bends
++air billow
++air-bind
++air bladder
++air blast
++air-blasted
++air blow
++air-blown
++air blue
++air-born
++air-borne
++air box
++air brake
++air-braked
++air-braving
++air-break switch
++air-breathing
++air-bred
++air brick
++air bridge
++air bubble
++air-built
++air bump
++air casing
++air castle
++air cataract
++air cell
++air chamber
++air-chambered
++air-cheeked
++air chest
++air chuck
++air circuit breaker
++air cleaner
++air-clear
++air-clutch reverse
++air cock
++air compressor
++air condenser
++air-condition
++air-conditioned
++air conditioner
++air conditioning
++air control
++air-conveying
++air-cool
++air-cooled
++air cooling
++Air corps
++air corridor
++Air council
++aircraft carrier
++aircraft division
++aircraft section
++aircraft station
++air crossing
++air-cure
++air cushion
++air cylinder
++air-defiling
++air drain
++air drainage
++air-drawn
++air drill
++air-driven
++air-dry
++air duct
++Airedale terrier
++air ejector
++air embolism
++air-embraced
++air engine
++air express
++air-faring
++air-filled
++air filter
++air fleet
++air float
++air-floated
++air force
++air-formed
++air furnace
++air gap
++air gas
++air gauge
++air gun
++air hammer
++air harbor
++air-hardening
++air-hardening steel
++air-heating
++air hoist
++air hole
++air horn
++air hunger
++air injection
++air injector
++air-insulated
++air jack
++air jacket
++air lance
++air lane
++air law
++air layering
++air leak
++airle-penny
++air letter
++air level
++air lift
++air line
++air lock
++air log
++air machine
++air map
++air mass
++air mattress
++Air medal
++air meter
++air-minded
++air-mindedness
++Air minister
++Air ministry
++air motor
++air oven
++air passage
++air-pervious
++air philately
++air photography
++air pillow
++airplane carrier
++airplane cloth
++airplane flare
++air plant
++air plug
++air pocket
++air pore
++air post
++air potato
++air propeller
++air pump
++air raid
++air raider
++air remover
++air rifle
++air sac
++air scoop
++air scout
++air scuttle
++air-season
++air-seasoned
++air separation
++air service
++air shaft
++air shovel
++air-shy
++air-slake
++air sleeve
++air sock
++air space
++air spade
++air speed
++air-speed indicator
++air-spray
++air sprayer
++air spring
++air-spun
++air station
++air-stirring
++air stone
++air stove
++air strainer
++air stream
++air strike
++air survey
++air-swallowing
++air system
++air thermometer
++air thread
++air-threatening
++air train
++air-trampling
++air trap
++air trumpet
++air trunk
++air twist
++air-twisted
++air valve
++air vent
++air vesicle
++air volcano
++air washer
++air well
++air-wise
++air-wiseness
++air wood
++airy sign
++air zone
++aisle seat
++Aix-la-chapelle
++Ajanen fir
++ajowan oil
++akamushi mite
++Akas-mukhi
++Akeley camera
++a la
++a la king
++A la marengo
++A la maryland
++a la mire
++alamo vine
++alang-alang
++alang grass
++alant camphor
++Al araf
++alar cartilages
++alar ligaments
++alarm bell
++alarm bird
++alarm clock
++alarm gauge
++alarm post
++alarm valve
++alar septum
++alar thoracic artery
++Al bali
++Alban saint
++albatross cloth
++albedo unguis
++Albee operation
++Alberti bass
++Albion ware
++albite law
++Alb sunday
++album board
++Album elegans
++Album graecum
++Album grandiflorum
++albuminoid ammonia
++albumin tannate
++album paper
++Al chiba
++alcohol acid
++alcohol engine
++alco-ometer
++alco-ometric
++alco-ometrical
++alco-ometry
++Alcora porcelain
++alcresta ipecac
++aldehyde ammonia
++aldehyde collidine
++aldehyde group
++aldehyde resin
++alder blight
++alder buckthorn
++alder dogwood
++alder fly
++alder flycatcher
++alder-leaved
++alderman lizard
++aldol condensation
++ale-blown
++ale-born
++ale brewer
++ale brewing
++ale drinker
++ale drinking
++ale feast
++ale-fed
++ale gallon
++ale garland
++ale glass
++alekey trout
++Alencon diamond
++Alencon lace
++ale pitcher
++ale seller
++ale selling
++ale stain
++ale-swilling
++ale tun
++aleurone grains
++aleurone layer
++A level
++ale vinegar
++ale-washed
++Alexandrine liturgies
++Alexandrine rat
++alfalfa butterfly
++alfalfa caterpillar
++alfalfa hopper
++alfalfa looper
++alfalfa meal
++alfalfa weevil
++algae layer
++algae zone
++algal-algal
++algal disease
++algal fungus
++algarroba bean
++algid cholera
++algid fever
++Algol variable
++alias dictus
++alias writ
++Alice blue
++alienable right
++alienation office
++alien corporation
++alien enemy
++alien priory
++alien property custodian
++alien water
++alignment chart
++aliquot tone
++alizarin black s
++alizarin blue black s
++alizarin blue s
++alizarin brown
++alizarin cyanine
++alizarin cyanine green
++alizarin dye
++alizarin red
++alizarin saphirol
++alizarin yellow
++alkali albumin
++alkali blue
++alkali cellulose
++alkali chlorosis
++alkali disease
++alkali grass
++alkali heath
++alkali metal
++alkali mustard
++alkaline cell
++alkaline-earth metals
++alkaline earths
++alkaline metal
++alkaline reaction
++alkaline tide
++alkaline water
++alkali reserve
++alkali waste
++alkali weed
++alkali yellow r
++alk gum
++alk gum tree
++alkyl cyanide
++alkyl halide
++alkyl hydrosulphide
++all-abhorred
++all-able
++all abroad
++all-absorbing
++all-accomplished
++all-acting
++all-admired
++all-admiring
++all-advised
++all-affecting
++all-afflicting
++all-aged
++all-air
++all along
++all-amazed
++All-american
++all-a-mort
++allan hawk
++all-appaled
++all-appointing
++all-approved
++all-approving
++all-armed
++all-around
++all-arraigning
++all-arranging
++all-assistless
++all-atoning
++all-attempting
++all-availing
++all-bearing
++all-beauteous
++all-beautiful
++all-beholding
++all-bestowing
++all-binding
++all-bitter
++all-black
++all-blasting
++all-blessing
++all-bounteous
++all-bountiful
++all-bright
++all-brilliant
++All-british
++all but
++All-caucasian
++all-changing
++all-cheering
++all clear
++all-collected
++all-colored
++all comers
++all-comfortless
++all-commander
++all-commanding
++all-compelling
++all-complying
++all-composing
++all-comprehending
++all-comprehensive
++all-concealing
++all-conceiving
++all-concerning
++all-confounding
++all-conquering
++all-conscious
++all-considering
++all-constant
++all-constraining
++all-consuming
++all-content
++all-controlling
++all-convincing
++all-convincingly
++all-covering
++all-creating
++all-creator
++all-curing
++all-daring
++all-day
++all-dazzling
++all-deciding
++all-defiance
++all-defying
++all-depending
++all-designing
++all-desired
++all-despising
++all-destroyer
++all-destroying
++all-devastating
++all-devouring
++all-dimming
++all-directing
++all-discerning
++all-discovering
++all-disgraced
++all-dispensing
++all-disposer
++all-disposing
++all-divine
++all-divining
++all-dreaded
++all-dreadful
++all-drowsy
++all-earnest
++all-eating
++allee couvert[...incomplete...]



More information about the Pkg-haskell-commits mailing list