diff --git a/p/haskell-git-mediate/debian/changelog b/p/haskell-git-mediate/debian/changelog new file mode 100644 index 0000000..f88ff5a --- /dev/null +++ b/p/haskell-git-mediate/debian/changelog @@ -0,0 +1,5 @@ +haskell-git-mediate (1.0.8.1-1) unstable; urgency=low + + * Initial release. closes: #1041232. + + -- Clint Adams Sun, 16 Jul 2023 07:38:19 -0400 diff --git a/p/haskell-git-mediate/debian/compat b/p/haskell-git-mediate/debian/compat new file mode 100644 index 0000000..f599e28 --- /dev/null +++ b/p/haskell-git-mediate/debian/compat @@ -0,0 +1 @@ +10 diff --git a/p/haskell-git-mediate/debian/control b/p/haskell-git-mediate/debian/control new file mode 100644 index 0000000..cc0e064 --- /dev/null +++ b/p/haskell-git-mediate/debian/control @@ -0,0 +1,66 @@ +Source: haskell-git-mediate +Maintainer: Debian Haskell Group +Uploaders: Clint Adams +Priority: optional +Section: haskell +Rules-Requires-Root: no +Build-Depends: debhelper (>= 10), + haskell-devscripts-minimal | haskell-devscripts (>= 0.13), + cdbs, + ghc, + ghc-prof, + libghc-diff-dev (>= 0.4), + libghc-diff-prof (>= 0.4), + libghc-ansi-terminal-dev (>= 0.6.2), + libghc-ansi-terminal-prof (>= 0.6.2), + libghc-base-compat-dev (>= 0.8.2), + libghc-base-compat-prof (>= 0.8.2), + libghc-optparse-applicative-dev (>= 0.11), + libghc-optparse-applicative-prof (>= 0.11), + libghc-unix-compat-dev (>= 0.4.2.0), + libghc-unix-compat-prof (>= 0.4.2.0), +Standards-Version: 4.6.2 +Homepage: https://github.com/Peaker/git-mediate +X-Description: tool to help resolving git conflicts + In any conflicted state - git-mediate shows you + the 2 diffs involved. By applying these diffs to + the base version and the other version, you + emulate the situation where the patch had already + existed when the other had been applied. + . + Reapply git-mediate, it will validate that you've + indeed applied it correctly, and bam: conflict + disappeared! + . + Git-mediate also lets you handle modify/delete + conflicts (there's no sane way in git to show + what the modification actually was) + . + Git-mediate also streamlines jumping to the + conflicts with your editor, either with the `-e` + option to invoke your editor, or via the standard + line number format, which is parsed by all major + editors, to allow use of "jump to next error" + keys. + . + Git-mediate especially shines with automatic + source transformation tools such as renamers. + . + In a conflicted state, re-apply a rename that + caused the conflict, run git-mediate without + opening any files, and the conflicts are gone! + +Package: git-mediate +Architecture: any +Section: vcs +Depends: ${haskell:Depends}, + ${misc:Depends}, + ${shlibs:Depends}, +Recommends: ${haskell:Recommends}, +Suggests: ${haskell:Suggests}, +Conflicts: ${haskell:Conflicts}, +Provides: ${haskell:Provides}, +Description: ${haskell:ShortDescription}${haskell:ShortBlurb} + ${haskell:LongDescription} + . + ${haskell:Blurb} diff --git a/p/haskell-git-mediate/debian/copyright b/p/haskell-git-mediate/debian/copyright new file mode 100644 index 0000000..ad129c2 --- /dev/null +++ b/p/haskell-git-mediate/debian/copyright @@ -0,0 +1,18 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: git-mediate +Upstream-Contact: Eyal Lotem +Source: https://hackage.haskell.org/package/git-mediate + +Files: * +Copyright: Eyal Lotem +License: GPL-2 + +Files: debian/* +Copyright: held by the contributors mentioned in debian/changelog +License: GPL-2+ + +License: GPL-2 + See /usr/share/common-licenses/GPL-2 on your Debian-based system. + +License: GPL-2+ + See /usr/share/common-licenses/GPL-2 on your Debian-based system. diff --git a/p/haskell-git-mediate/debian/git-mediate.install b/p/haskell-git-mediate/debian/git-mediate.install new file mode 100644 index 0000000..c52fee0 --- /dev/null +++ b/p/haskell-git-mediate/debian/git-mediate.install @@ -0,0 +1 @@ +dist-ghc/build/git-mediate/git-mediate usr/bin diff --git a/p/haskell-git-mediate/debian/rules b/p/haskell-git-mediate/debian/rules new file mode 100755 index 0000000..47d071f --- /dev/null +++ b/p/haskell-git-mediate/debian/rules @@ -0,0 +1,10 @@ +#!/usr/bin/make -f + +DEB_SETUP_BIN_NAME = debian/hlibrary.setup +DEB_CABAL_PACKAGE = git-mediate +DEB_DEFAULT_COMPILER = ghc + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/hlibrary.mk + +build/git-mediate:: build-ghc-stamp diff --git a/p/haskell-git-mediate/debian/source/format b/p/haskell-git-mediate/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/p/haskell-git-mediate/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/p/haskell-git-mediate/debian/watch b/p/haskell-git-mediate/debian/watch new file mode 100644 index 0000000..0939b30 --- /dev/null +++ b/p/haskell-git-mediate/debian/watch @@ -0,0 +1,2 @@ +version=3 +https://hackage.haskell.org/package/git-mediate/distro-monitor .*-([0-9\.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))