[Git][haskell-team/DHG_packages][master] add git-mediate

[Clint Adams (@clint)]

Clint Adams pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
36d4745a by Clint Adams at 2023-07-16T08:00:54-04:00
add git-mediate

- - - - -


8 changed files:

- + p/haskell-git-mediate/debian/changelog
- + p/haskell-git-mediate/debian/compat
- + p/haskell-git-mediate/debian/control
- + p/haskell-git-mediate/debian/copyright
- + p/haskell-git-mediate/debian/git-mediate.install
- + p/haskell-git-mediate/debian/rules
- + p/haskell-git-mediate/debian/source/format
- + p/haskell-git-mediate/debian/watch


Changes:

=====================================
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 <clint at debian.org>  Sun, 16 Jul 2023 07:38:19 -0400


=====================================
p/haskell-git-mediate/debian/compat
=====================================
@@ -0,0 +1 @@
+10


=====================================
p/haskell-git-mediate/debian/control
=====================================
@@ -0,0 +1,66 @@
+Source: haskell-git-mediate
+Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
+Uploaders: Clint Adams <clint at debian.org>
+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}


=====================================
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 <eyal.lotem at gmail.com>
+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.


=====================================
p/haskell-git-mediate/debian/git-mediate.install
=====================================
@@ -0,0 +1 @@
+dist-ghc/build/git-mediate/git-mediate usr/bin


=====================================
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


=====================================
p/haskell-git-mediate/debian/source/format
=====================================
@@ -0,0 +1 @@
+3.0 (quilt)


=====================================
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)))



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/36d4745a52bb40a56be6c015ed963a05773f4a29

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/36d4745a52bb40a56be6c015ed963a05773f4a29
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/20230716/c74e297a/attachment-0001.htm>