[Pkg-haskell-commits] darcs: rss2irc: Update
Clint Adams
clint at debian.org
Tue Mar 4 01:43:43 UTC 2014
Tue Mar 4 01:40:31 UTC 2014 Clint Adams <clint at debian.org>
* Update
M ./changelog -2 +2
M ./control -8 +12
A ./patches/
A ./patches/newer-http-conduit.diff
A ./patches/series
M ./rules -69 +3
Tue Mar 4 01:40:31 UTC 2014 Clint Adams <clint at debian.org>
* Update
diff -rN -u old-rss2irc/changelog new-rss2irc/changelog
--- old-rss2irc/changelog 2014-03-04 01:43:43.008251309 +0000
+++ new-rss2irc/changelog 2014-03-04 01:43:43.008251309 +0000
@@ -1,4 +1,4 @@
-rss2irc (1.0.5-1) UNRELEASED; urgency=low
+rss2irc (1.0.5-1) unstable; urgency=low
[ Joachim Breitner ]
* Adjust watch file to new hackage layout
@@ -6,7 +6,7 @@
[ Clint Adams ]
* New upstream version.
- -- Clint Adams <clint at debian.org> Mon, 03 Mar 2014 12:34:29 -0500
+ -- Clint Adams <clint at debian.org> Mon, 03 Mar 2014 15:07:50 -0500
rss2irc (1.0.3-2) unstable; urgency=low
diff -rN -u old-rss2irc/control new-rss2irc/control
--- old-rss2irc/control 2014-03-04 01:43:43.008251309 +0000
+++ new-rss2irc/control 2014-03-04 01:43:43.008251309 +0000
@@ -4,6 +4,8 @@
Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
Uploaders: Clint Adams <clint at debian.org>
Build-Depends: haskell-devscripts (>= 0.8.13)
+ , cdbs
+ , debhelper (>= 9)
, ghc
, ghc-prof
, ghc-ghci
@@ -14,26 +16,28 @@
, libghc-feed-dev (>= 0.3.8)
, libghc-feed-dev (<< 0.4)
, libghc-http-conduit-dev (>> 1.9)
- , libghc-http-conduit-dev (<< 2.0)
+ , libghc-http-conduit-dev (<< 2.1)
, libghc-http-types-dev (>= 0.6.4)
, libghc-http-types-dev (<< 0.9)
- , libghc-io-storage-dev (>> 0.3)
+ , libghc-io-storage-dev (>= 0.3)
, libghc-io-storage-dev (<< 0.4)
- , libghc-network-dev (>> 2.4)
+ , libghc-network-dev (>= 2.4)
, libghc-network-dev (<< 2.5)
, libghc-parsec3-dev
- , libghc-regexpr-dev (>> 0.5)
+ , libghc-regexpr-dev (>= 0.5)
, libghc-regexpr-dev (<< 0.6)
- , libghc-resourcet-dev (>> 0.4.4)
+ , libghc-resourcet-dev (>= 0.4.4)
, libghc-resourcet-dev (<< 0.5)
- , libghc-safe-dev (>> 0.2)
+ , libghc-safe-dev (>= 0.2)
, libghc-safe-dev (<< 0.4)
- , libghc-split-dev (>> 0.2)
+ , libghc-split-dev (>= 0.2)
, libghc-split-dev (<< 0.3)
, libghc-text-dev (>= 0.11)
, libghc-text-dev (<< 0.12)
+ , libghc-transformers-dev (>= 0.2)
+ , libghc-transformers-dev (<< 0.4)
, libghc-utf8-string-dev
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Homepage: http://hackage.haskell.org/package/rss2irc
Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/rss2irc
Vcs-Darcs: http://darcs.debian.org/pkg-haskell/rss2irc
diff -rN -u old-rss2irc/patches/newer-http-conduit.diff new-rss2irc/patches/newer-http-conduit.diff
--- old-rss2irc/patches/newer-http-conduit.diff 1970-01-01 00:00:00.000000000 +0000
+++ new-rss2irc/patches/newer-http-conduit.diff 2014-03-04 01:43:43.008251309 +0000
@@ -0,0 +1,31 @@
+--- a/rss2irc.cabal
++++ b/rss2irc.cabal
+@@ -36,7 +36,7 @@
+ ,deepseq
+ ,irc >= 0.5 && < 0.6
+ ,feed >= 0.3.8 && < 0.3.9.2
+- ,http-conduit >= 1.9 && < 2.0
++ ,http-conduit >= 1.9 && < 2.1
+ ,resourcet >= 0.4.4 && < 0.5
+ ,http-types >= 0.6.4 && < 0.9
+ ,io-storage >= 0.3 && < 0.4
+--- a/rss2irc.hs
++++ b/rss2irc.hs
+@@ -18,7 +18,7 @@
+ import Data.Time.Clock (getCurrentTime)
+ import Prelude hiding (log)
+ import Network (withSocketsDo)
+-import Network.HTTP.Conduit (newManager, def)
++import Network.HTTP.Conduit (newManager, conduitManagerSettings)
+ import System.Console.CmdArgs
+ import System.Exit (ExitCode(ExitSuccess), exitFailure, exitSuccess)
+ import System.IO
+@@ -70,7 +70,7 @@
+ withStore "globals" $ do -- for readFeedFile
+ -- http-conduit stuff
+ withSocketsDo $ do -- for ms windows
+- manager <- io $ newManager Network.HTTP.Conduit.def
++ manager <- io $ newManager conduitManagerSettings
+ (opts,reader,bot) <- getRss2IrcArgs
+ let app = App{aOpts=opts,aReader=reader{httpManager=Just manager},aBot=bot}
+ when (delay opts > 0) $ threadDelay $ (delay opts) * minutes
diff -rN -u old-rss2irc/patches/series new-rss2irc/patches/series
--- old-rss2irc/patches/series 1970-01-01 00:00:00.000000000 +0000
+++ new-rss2irc/patches/series 2014-03-04 01:43:43.008251309 +0000
@@ -0,0 +1 @@
+newer-http-conduit.diff
diff -rN -u old-rss2irc/rules new-rss2irc/rules
--- old-rss2irc/rules 2014-03-04 01:43:43.004251309 +0000
+++ new-rss2irc/rules 2014-03-04 01:43:43.008251309 +0000
@@ -1,72 +1,6 @@
#!/usr/bin/make -f
-INSTALL = install
-INSTALL_FILE = $(INSTALL) -p -o root -g root -m 644
-INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755
-INSTALL_SCRIPT = $(INSTALL) -p -o root -g root -m 755
-INSTALL_DIR = $(INSTALL) -p -d -o root -g root -m 755
+# DEB_ENABLE_TESTS = yes
-package=rss2irc
-
-clean: checkroot
- rm -f debian/rss2irc.setup build-arch stamp-configure
- rm -rf debian/$(package)
-
-debian/rss2irc.setup:
- ghc Setup.lhs -o $@
-
-build: build-arch build-indep
-build-indep:
-
-build-arch: stamp-configure
- $(checkdir)
-
- debian/rss2irc.setup build
-
- touch build-arch
-
-stamp-configure: debian/rss2irc.setup
- $(checkdir)
-
- debian/rss2irc.setup configure --prefix=/usr
-
- touch stamp-configure
-
-binary: binary-arch
-
-binary-indep: checkroot build
-
-binary-arch: checkroot build
- $(checkdir)
-
- debian/rss2irc.setup copy --destdir=$(CURDIR)/debian/$(package)
- rm -rf debian/$(package)/usr/share/doc/$(package)-*
- cd debian/$(package) && $(INSTALL_DIR) \
- usr/bin \
- usr/share/doc/$(package) \
- DEBIAN
-
- $(INSTALL_FILE) debian/copyright debian/$(package)/usr/share/doc/$(package)/copyright
-
- $(INSTALL_FILE) debian/changelog debian/$(package)/usr/share/doc/$(package)/changelog.Debian
- gzip -9f debian/$(package)/usr/share/doc/$(package)/changelog.Debian
-
- dpkg-shlibdeps -Tdebian/substvars -dDepends debian/$(package)/usr/bin/*
- dpkg-gencontrol -ldebian/changelog -isp -p$(package) -Tdebian/substvars -Pdebian/$(package)
-
- cd debian/$(package) && find * -type f ! -regex '^DEBIAN/.*' -print0 | xargs -r0 md5sum > DEBIAN/md5sums
-
- chown -R root:root debian/$(package)
- chmod -R go=rX debian/$(package)
-
- dpkg --build debian/$(package) ..
-
-define checkdir
- test -f debian/rules
-endef
-
-checkroot:
- $(checkdir)
- test root = "`whoami`"
-
-.PHONY: binary binary-arch binary-indep clean checkroot build build-indep
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/hlibrary.mk
More information about the Pkg-haskell-commits
mailing list