diff -Nru yi-0.18.0/debian/changelog yi-0.18.0/debian/changelog --- yi-0.18.0/debian/changelog 2020-02-08 11:21:45.000000000 +0000 +++ yi-0.18.0/debian/changelog 2019-07-21 11:04:29.000000000 +0000 @@ -1,20 +1,13 @@ -yi (0.18.0-1build3) focal; urgency=medium +yi (0.18.0-2) unstable; urgency=medium - * No-change rebuild with fixed binutils on arm64. + [ Marcel Fourné] + * make pango dependency optional and use vty frontend by default + * install icons again + * fix .desktop files + * follow xmonad way of handling dependencies for optional reconfiguration + * lintian fixes - -- Matthias Klose Sat, 08 Feb 2020 11:21:45 +0000 - -yi (0.18.0-1build2) focal; urgency=medium - - * No-change rebuild for libffi soname change. - - -- Matthias Klose Sun, 12 Jan 2020 09:06:44 +0000 - -yi (0.18.0-1build1) eoan; urgency=medium - - * Rebuild against new GHC abi. - - -- Gianfranco Costamagna Thu, 08 Aug 2019 16:08:19 +0200 + -- Marcel Fourné Sun, 21 Jul 2019 13:04:29 +0200 yi (0.18.0-1) unstable; urgency=medium diff -Nru yi-0.18.0/debian/control yi-0.18.0/debian/control --- yi-0.18.0/debian/control 2018-11-07 14:03:33.000000000 +0000 +++ yi-0.18.0/debian/control 2019-07-21 11:04:29.000000000 +0000 @@ -6,21 +6,31 @@ Section: haskell Rules-Requires-Root: no Build-Depends: - alex (>= 3.0.3), cdbs, debhelper (>= 10), ghc (>= 8.4.3), - haskell-devscripts (>= 0.13), + ghc-prof, + haskell-devscripts-minimal (>= 0.13) | haskell-devscripts (>= 0.13), libghc-microlens-platform-dev (>= 0.3.4.0), + libghc-microlens-platform-prof, libghc-optparse-applicative-dev (>= 0.13.0.0), + libghc-optparse-applicative-prof, libghc-yi-core-dev (>= 0.18), + libghc-yi-core-prof, libghc-yi-frontend-vty-dev (>= 0.18), + libghc-yi-frontend-vty-prof, libghc-yi-keymap-emacs-dev (>= 0.18), + libghc-yi-keymap-emacs-prof, libghc-yi-keymap-vim-dev (>= 0.18), + libghc-yi-keymap-vim-prof, libghc-yi-misc-modes-dev (>= 0.18), + libghc-yi-misc-modes-prof, libghc-yi-mode-haskell-dev (>= 0.18), + libghc-yi-mode-haskell-prof, libghc-yi-mode-javascript-dev (>= 0.18), + libghc-yi-mode-javascript-prof, libghc-yi-rope-dev (>= 0.10), + libghc-yi-rope-prof, Standards-Version: 4.1.4 Homepage: https://github.com/yi-editor/yi#readme Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/yi @@ -30,10 +40,13 @@ Architecture: any Section: editors Depends: - libghc-yi-frontend-pango-dev, ${haskell:Depends}, ${misc:Depends}, ${shlibs:Depends}, +Recommends: libghc-yi-misc-modes-dev, + libghc-yi-mode-haskell-dev, + libghc-yi-keymap-emacs-dev | libghc-yi-keymap-vim-dev, + libghc-yi-frontend-vty-dev | libghc-yi-frontend-pango-dev Description: Haskell-Scriptable Editor Yi is a text editor written in Haskell and extensible in Haskell. The goal of the Yi project is to provide a flexible, powerful, and correct editor diff -Nru yi-0.18.0/debian/rules yi-0.18.0/debian/rules --- yi-0.18.0/debian/rules 2018-11-07 14:03:33.000000000 +0000 +++ yi-0.18.0/debian/rules 2019-07-21 11:04:29.000000000 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/make -f -DEB_SETUP_GHC_CONFIGURE_ARGS := -fpango -f-testing --datasubdir=yi --ghc-options='-optl -z -optl relro' +DEB_SETUP_GHC_CONFIGURE_ARGS := -fvty -f-testing --datasubdir=yi --ghc-options='-optl -z -optl relro' include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/hlibrary.mk @@ -9,3 +9,4 @@ binary-fixup/yi:: install -m 755 -s -D dist-ghc/build/yi/yi debian/yi/usr/bin/yi || true install -m 644 -D debian/*.desktop debian/yi/usr/share/applications || true + install -m 644 -D art/*.xpm debian/yi/usr/share/yi/art || true diff -Nru yi-0.18.0/debian/yi-emacs.desktop yi-0.18.0/debian/yi-emacs.desktop --- yi-0.18.0/debian/yi-emacs.desktop 2016-06-11 16:29:35.000000000 +0000 +++ yi-0.18.0/debian/yi-emacs.desktop 2019-07-21 11:04:29.000000000 +0000 @@ -4,9 +4,9 @@ GenericName=Text Editor Comment=View and edit files MimeType=text/plain;text/x-haskell;text/x-literatehaskell -Exec=/usr/bin/yi -fpango --as=emacs %F -TryExec=yi -Icon=/usr/share/yi-0.6.7.0/art/yi+lambda-fat-32.png +Exec=/usr/bin/yi -f vty -k emacs %F +TryExec=/usr/bin/yi +Icon=/usr/share/yi/art/yi+lambda-fat-32.xpm Type=Application -Terminal=false +Terminal=true Categories=Utility;Development;TextEditor; diff -Nru yi-0.18.0/debian/yi.menu yi-0.18.0/debian/yi.menu --- yi-0.18.0/debian/yi.menu 2016-06-11 16:29:35.000000000 +0000 +++ yi-0.18.0/debian/yi.menu 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -?package(yi):\ - needs="X11"\ - section="Applications/Editors"\ - title="Yi (Pango, Emacs)"\ - command="/usr/bin/yi -fpango --as=emacs"\ - icon16x16="/usr/share/yi/art/yi+lambda-fat-16.xpm"\ - icon32x32="/usr/share/yi/art/yi+lambda-fat-32.xpm"\ - hints="Text" - -?package(yi):\ - needs="X11"\ - section="Applications/Editors"\ - title="Yi (Pango, Vim)"\ - command="/usr/bin/yi -fpango --as=vim"\ - icon16x16="/usr/share/yi/art/yi+lambda-fat-16.xpm"\ - icon32x32="/usr/share/yi/art/yi+lambda-fat-32.xpm"\ - hints="Text" - -?package(yi):\ - needs="text"\ - section="Applications/Editors"\ - title="Yi (Vty, Emacs)"\ - command="/usr/bin/yi -fvty --as=emacs"\ - icon16x16="/usr/share/yi/art/yi+lambda-fat-16.xpm"\ - icon32x32="/usr/share/yi/art/yi+lambda-fat-32.xpm"\ - hints="Text" - -?package(yi):\ - needs="text"\ - section="Applications/Editors"\ - title="Yi (Vty, Vim)"\ - command="/usr/bin/yi -fvty --as=vim"\ - icon16x16="/usr/share/yi/art/yi+lambda-fat-16.xpm"\ - icon32x32="/usr/share/yi/art/yi+lambda-fat-32.xpm"\ - hints="Text" - - diff -Nru yi-0.18.0/debian/yi-vim.desktop yi-0.18.0/debian/yi-vim.desktop --- yi-0.18.0/debian/yi-vim.desktop 2016-06-11 16:29:35.000000000 +0000 +++ yi-0.18.0/debian/yi-vim.desktop 2019-07-21 11:04:29.000000000 +0000 @@ -4,9 +4,9 @@ GenericName=Text Editor Comment=View and edit files MimeType=text/plain;text/x-haskell;text/x-literatehaskell -Exec=/usr/bin/yi -fpango --as=vim %F -TryExec=yi -Icon=/usr/share/yi-0.6.7.0/art/yi+lambda-fat-32.png +Exec=/usr/bin/yi -f vty -k vim %F +TryExec=/usr/bin/yi +Icon=/usr/share/yi/art/yi+lambda-fat-32.xpm Type=Application -Terminal=false +Terminal=true Categories=Utility;Development;TextEditor;