Finalise the package for git-absorb

diff --git a/src/git-absorb/debian/TODO b/src/git-absorb/debian/TODO
deleted file mode 100644 (file)
index 22ad86d..0000000
--- a/src/git-absorb/debian/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-- needs git2 0.13
-- needs memchr 2.3

diff --git a/src/git-absorb/debian/changelog b/src/git-absorb/debian/changelog
index efc46795791e0373e37948f410f10526299814b0..6b64cb613335f90afcec7b8d0bf784163dbcc8ed 100644 (file)
--- a/src/git-absorb/debian/changelog
+++ b/src/git-absorb/debian/changelog
@@ -2,4 +2,4 @@ rust-git-absorb (0.6.6-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=mediu
 
   * Package git-absorb 0.6.6 from crates.io using debcargo 2.4.3
 
- -- Andrej Shadura <andrewsh@debian.org>  Wed, 04 Nov 2020 23:15:14 +0100
+ -- Andrej Shadura <andrewsh@debian.org>  Thu, 05 Nov 2020 09:47:43 +0100

diff --git a/src/git-absorb/debian/debcargo.toml b/src/git-absorb/debian/debcargo.toml
index 7d31b23f627db10875e608719ab68c2422f72acc..2c7198ea7407064a228c2ffe118bbea931280a6a 100644 (file)
--- a/src/git-absorb/debian/debcargo.toml
+++ b/src/git-absorb/debian/debcargo.toml
@@ -1,2 +1,10 @@
 overlay = "."
 uploaders = ["Andrej Shadura <andrewsh@debian.org>"]
+
+[packages.bin]
+section = "vcs"
+description = """
+git-absorb is a port of hg absorb to Git.
+
+git absorb automatically identifies which commits are safe to modify, and which indexed changes belong to each of those commits. It then writes fixup! commits for each of those changes. These fixups can later be folded into the feature branch with Git's built-in autosquash functionality.
+"""

diff --git a/src/git-absorb/debian/git-absorb.docs b/src/git-absorb/debian/git-absorb.docs
new file mode 100644 (file)
index 0000000..b43bf86
--- /dev/null
+++ b/src/git-absorb/debian/git-absorb.docs
@@ -0,0 +1 @@
+README.md

diff --git a/src/git-absorb/debian/git-absorb.manpages b/src/git-absorb/debian/git-absorb.manpages
new file mode 100644 (file)
index 0000000..8357e42
--- /dev/null
+++ b/src/git-absorb/debian/git-absorb.manpages
@@ -0,0 +1 @@
+debian/doc/*.1

diff --git a/src/git-absorb/debian/manpages b/src/git-absorb/debian/manpages
deleted file mode 100644 (file)
index 8357e42..0000000
--- a/src/git-absorb/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/doc/*.1

diff --git a/src/git-absorb/debian/patches/deps.patch b/src/git-absorb/debian/patches/deps.patch
new file mode 100644 (file)
index 0000000..b61e5b0
--- /dev/null
+++ b/src/git-absorb/debian/patches/deps.patch
@@ -0,0 +1,35 @@
+This reverts commit 9a1983982a3e0ac012231e34d5688cfd76b2aaa5.
+
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -32,11 +32,11 @@ version = "~1.0"
+ version = "~2.33"
+ 
+ [dependencies.git2]
+-version = "~0.13"
++version = ">= 0.9"
+ default-features = false
+ 
+ [dependencies.memchr]
+-version = "~2.3"
++version = ">= 2.2"
+ 
+ [dependencies.slog]
+ version = "~2.5"
+diff --git a/src/stack.rs b/src/stack.rs
+index ff7015c..d7cf3c8 100644
+--- a/src/stack.rs
++++ b/src/stack.rs
+@@ -29,9 +29,9 @@ pub fn working_stack<'repo>(
+     }
+ 
+     let mut revwalk = repo.revwalk()?;
+-    revwalk.set_sorting(git2::Sort::TOPOLOGICAL)?;
++    revwalk.set_sorting(git2::Sort::TOPOLOGICAL);
+     revwalk.push_head()?;
+-    revwalk.simplify_first_parent()?;
++    revwalk.simplify_first_parent();
+     debug!(logger, "head pushed"; "head" => head.name());
+ 
+     let base_commit = match user_provided_base {
+

diff --git a/src/git-absorb/debian/patches/series b/src/git-absorb/debian/patches/series
new file mode 100644 (file)
index 0000000..7d1a202
--- /dev/null
+++ b/src/git-absorb/debian/patches/series
@@ -0,0 +1 @@
+deps.patch

diff --git a/src/git-absorb/debian/rules b/src/git-absorb/debian/rules
new file mode 100755 (executable)
index 0000000..d42b498
--- /dev/null
+++ b/src/git-absorb/debian/rules
@@ -0,0 +1,8 @@
+#!/usr/bin/make -f
+%:
+       dh $@ --buildsystem cargo
+
+override_dh_auto_install:
+       dh_auto_install
+       mkdir -p debian/git-absorb/usr/lib/git-core
+       mv debian/git-absorb/usr/bin/* debian/git-absorb/usr/lib/git-core

diff --git a/src/git-absorb/debian/rules.debcargo.hint b/src/git-absorb/debian/rules.debcargo.hint
new file mode 100755 (executable)
index 0000000..044c1c2
--- /dev/null
+++ b/src/git-absorb/debian/rules.debcargo.hint
@@ -0,0 +1,3 @@
+#!/usr/bin/make -f
+%:
+       dh $@ --buildsystem cargo