[Git][haskell-team/DHG_packages][master] xmobar: Upgrading from 0.36 to 0.43
Ilias Tsitsimpis (@iliastsi)
gitlab at salsa.debian.org
Wed Aug 3 13:01:49 BST 2022
Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
550fc550 by Ilias Tsitsimpis at 2022-08-03T14:58:25+03:00
xmobar: Upgrading from 0.36 to 0.43
- - - - -
9 changed files:
- p/xmobar/debian/changelog
- + p/xmobar/debian/compat
- p/xmobar/debian/control
- p/xmobar/debian/patches/0001-Fix-typo-in-src-Parsers.hs-fix-lintian-warning.patch
- p/xmobar/debian/rules
- p/xmobar/debian/watch
- p/xmobar/debian/xmobar.1
- p/xmobar/debian/xmobar.docs
- p/xmobar/debian/xmobar.install
Changes:
=====================================
p/xmobar/debian/changelog
=====================================
@@ -1,8 +1,11 @@
-xmobar (0.36-3) UNRELEASED; urgency=medium
+xmobar (0.43-1) unstable; urgency=medium
+ * New upstream release (Closes: #985305)
* Declare compliance with Debian policy 4.6.1
+ * Update homepage (Closes: #986391)
+ * Build package using haskell-devscripts
- -- Ilias Tsitsimpis <iliastsi at debian.org> Tue, 28 Jun 2022 15:33:30 +0300
+ -- Ilias Tsitsimpis <iliastsi at debian.org> Wed, 03 Aug 2022 09:27:10 +0300
xmobar (0.36-2) unstable; urgency=medium
=====================================
p/xmobar/debian/compat
=====================================
@@ -0,0 +1 @@
+10
=====================================
p/xmobar/debian/control
=====================================
@@ -1,38 +1,54 @@
Source: xmobar
-Section: x11
-Priority: optional
Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
-Uploaders: Apollon Oikonomopoulos <apoikos at debian.org>,
- Aggelos Avgerinos <evaggelos.avgerinos at gmail.com>,
+Uploaders:
+ Apollon Oikonomopoulos <apoikos at debian.org>,
+ Aggelos Avgerinos <evaggelos.avgerinos at gmail.com>,
+Priority: optional
+Section: x11
+Build-Depends: debhelper (>= 10),
+ haskell-devscripts-minimal | haskell-devscripts (>= 0.13),
+ cdbs,
+ ghc,
+ libghc-x11-dev (>= 1.6.1),
+ libghc-aeson-dev (>= 1.4.7.1),
+ libghc-async-dev,
+ libghc-extensible-exceptions-dev (>= 0.1),
+ libghc-extensible-exceptions-dev (<< 0.2),
+ libghc-http-client-tls-dev,
+ libghc-http-conduit-dev,
+ libghc-http-types-dev,
+ libghc-old-locale-dev,
+ libghc-parsec-numbers-dev (>= 0.1.0),
+ libghc-regex-compat-dev,
+ libghc-utf8-string-dev (>= 0.3),
+ libghc-utf8-string-dev (<< 1.1),
+ libxrandr-dev,
+ libxrender-dev,
+ libghc-hspec-dev (>= 2),
+ libghc-hspec-dev (<< 3),
+ libghc-temporary-dev,
+ libghc-alsa-core-dev (>= 0.5),
+ libghc-alsa-mixer-dev (>= 0.3),
+ libghc-x11-xft-dev (>= 0.2),
+ libghc-dbus-dev [linux-any],
+ libghc-hinotify-dev [linux-any],
+ libghc-iwlib-dev (>= 0.1.0) [linux-any],
+ libiw-dev [linux-any],
+ libxpm-dev,
Standards-Version: 4.6.1
-Build-Depends: debhelper-compat (=12),
- ghc,
- libghc-alsa-core-dev (>= 0.5),
- libghc-alsa-mixer-dev (>= 0.3),
- libghc-dbus-dev [linux-any],
- libghc-extensible-exceptions-dev,
- libghc-hinotify-dev [linux-any],
- libghc-http-conduit-dev,
- libghc-http-dev (>= 1:4000),
- libghc-iwlib-dev (>= 0.1.0) [linux-any],
- libghc-mtl-dev,
- libghc-parsec-numbers-dev,
- libghc-parsec3-dev,
- libghc-regex-compat-dev,
- libghc-stm-dev (>= 2.3),
- libghc-x11-dev (>= 1.6.0),
- libghc-x11-xft-dev (>= 0.2),
- libiw-dev [linux-any],
- libxpm-dev,
-Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/xmobar
-Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/xmobar]
-Homepage: http://projects.haskell.org/xmobar/
+Homepage: https://codeberg.org/xmobar/xmobar
+Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/haskell-xmobar
+Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git
Package: xmobar
Architecture: any
-Depends: ${misc:Depends},
- ${shlibs:Depends},
-Suggests: xmonad,
+Depends: ${haskell:Depends},
+ ${misc:Depends},
+ ${shlibs:Depends},
+Recommends: ${haskell:Recommends},
+Suggests: ${haskell:Suggests}, xmonad,
+Conflicts: ${haskell:Conflicts},
+Provides: ${haskell:Provides},
Description: lightweight status bar for X11 window managers
xmobar is a lightweight text-based status bar for X11 desktops written in
Haskell and designed to work with (but not limited to) xmonad. It has a
=====================================
p/xmobar/debian/patches/0001-Fix-typo-in-src-Parsers.hs-fix-lintian-warning.patch
=====================================
@@ -6,9 +6,11 @@ Subject: Fix typo in src/Parsers.hs (fix lintian warning)
src/Parsers.hs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
+Index: b/src/Xmobar/Config/Parse.hs
+===================================================================
--- a/src/Xmobar/Config/Parse.hs
+++ b/src/Xmobar/Config/Parse.hs
-@@ -167,7 +167,7 @@
+@@ -175,7 +175,7 @@ parseConfig defaultConfig =
commandsErr :: String
commandsErr = "commands: this usually means that a command could not" ++
"\nbe parsed." ++
=====================================
p/xmobar/debian/rules
=====================================
@@ -1,41 +1,20 @@
#!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-include /usr/share/dpkg/architecture.mk
-
-GHC_OPTIONS = -optl -Wl,-z,relro -optl -Wl,-z,now -optl -Wl,--as-needed
+DEB_ENABLE_TESTS = yes
# Work-around a bug in GHC on 64-bit unregistered platforms.
# https://ghc.haskell.org/trac/ghc/ticket/15853
ifneq (,$(filter $(DEB_BUILD_ARCH),mips64el s390x alpha ia64 riscv64 sparc64))
- GHC_OPTIONS += -O0
+ DEB_SETUP_GHC_CONFIGURE_ARGS += --ghc-options="-O0"
endif
-CONFIGURE_OPTS = --ghc-options="$(GHC_OPTIONS)"
-
ifeq ($(DEB_HOST_ARCH_OS),linux)
- CONFIGURE_OPTS += --flags="with_xft with_inotify with_iwlib with_mpris with_dbus with_xpm with_uvmeter with_weather with_alsa"
+ DEB_SETUP_GHC_CONFIGURE_ARGS += --flags="with_xft with_inotify with_iwlib with_mpris with_dbus with_xpm with_uvmeter with_weather with_alsa"
else
- CONFIGURE_OPTS += --flags="with_xft with_xpm"
+ DEB_SETUP_GHC_CONFIGURE_ARGS += --flags="with_xft with_xpm"
endif
-%:
- dh $@
-
-override_dh_auto_configure:
- ghc --make setup.*hs -o setup-ghc
- ./setup-ghc configure --ghc --prefix=/usr $(CONFIGURE_OPTS)
-
-override_dh_auto_build:
- ./setup-ghc build
-
-override_dh_auto_install:
- ./setup-ghc copy --destdir=debian/tmp/
-
-override_dh_auto_clean:
- -./setup-ghc clean
- -rm -f Setup.o Setup.hi setup-ghc
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/hlibrary.mk
-.PHONY: override_dh_auto_configure override_dh_auto_build \
- override_dh_auto_install override_dh_auto_clean
+build/xmobar:: build-ghc-stamp check-ghc-stamp
=====================================
p/xmobar/debian/watch
=====================================
@@ -1,3 +1,2 @@
-version=3
-
-https://github.com/jaor/xmobar/tags .*/archive/([\d.]+)\.tar\.gz
+version=4
+https://hackage.haskell.org/package/xmobar/distro-monitor .*-([0-9\.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
=====================================
p/xmobar/debian/xmobar.1
=====================================
@@ -83,7 +83,7 @@ This is the list of command line options (the output of xmobar
\f[]
.SH CONFIGURATION
-For full details of the available configuration options, please refer to /usr/share/doc/xmobar/readme.md.gz.
+For full details of the available configuration options, please refer to /usr/share/doc/xmobar/readme.org.gz.
.SH AUTHOR
.PP
=====================================
p/xmobar/debian/xmobar.docs
=====================================
@@ -1,2 +1,2 @@
changelog.md
-readme.md
+readme.org
=====================================
p/xmobar/debian/xmobar.install
=====================================
@@ -1 +1 @@
-usr/bin/xmobar
+dist-ghc/build/xmobar/xmobar usr/bin
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/550fc550ab3f91f941e57f308a826cb3e2978030
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/550fc550ab3f91f941e57f308a826cb3e2978030
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/20220803/1f31d786/attachment-0001.htm>
More information about the Pkg-haskell-commits
mailing list