[Pkg-ocaml-maint-commits] [dose3] 04/06: remove patches distcheck-fg-bg and getrealname

[Johannes Schauer]

This is an automated email from the git hooks/post-receive script.

josch pushed a commit to branch master
in repository dose3.

commit 51e02db519ae5f2b8a8e6185d79dbd4e870bac88
Author: Johannes Schauer <josch at debian.org>
Date:   Thu Sep 8 22:52:58 2016 +0200

    remove patches distcheck-fg-bg and getrealname
---
 debian/changelog               |  2 ++
 debian/patches/distcheck-fg-bg | 18 ------------------
 debian/patches/getrealname     | 31 -------------------------------
 debian/patches/series          |  2 --
 4 files changed, 2 insertions(+), 51 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e03ed34..d1475c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 dose3 (5.0.1-1) UNRELEASED; urgency=medium
 
   * new upstream release
+  * remove patches distcheck-fg-bg and getrealname as they have been
+    incorporated upstream
 
  -- Johannes Schauer <josch at debian.org>  Thu, 08 Sep 2016 22:50:19 +0200
 
diff --git a/debian/patches/distcheck-fg-bg b/debian/patches/distcheck-fg-bg
deleted file mode 100644
index da57268..0000000
--- a/debian/patches/distcheck-fg-bg
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Ralf Treinen <treinen at debian.org>
-Description: fix distcheck handling of --fg and --bg arguments
-Debian-bug: #830957
-Upstream-commit: 0b73c05b71b0c37099b12e306b1e5b5c3966728c
-
-diff --git a/applications/distcheck.ml b/applications/distcheck.ml
-index 48c323f..cd5829b 100644
---- a/applications/distcheck.ml
-+++ b/applications/distcheck.ml
-@@ -133,7 +133,7 @@ let main () =
-         fatal "Cannot find any package corresponding to the selector %s" 
-         (Util.string_of_list ~sep:", " Pef.Printer.string_of_vpkg co)
-       |l -> l
--    end else if bg_pkglist = [] then fg_pkglist else []
-+    end else fg_pkglist
-   in
- 
-   let coinstlist = 
diff --git a/debian/patches/getrealname b/debian/patches/getrealname
deleted file mode 100644
index 7f43148..0000000
--- a/debian/patches/getrealname
+++ /dev/null
@@ -1,31 +0,0 @@
-Author: Ralf Treinen <treinen at debian.org>
-Description: get_real_name: remove both --virtual prefix and arch suffix
-Upstream-commit: b09a011b8c9b5aa0391d466a6e004acc4ccfb2d8
-
-diff --git a/deb/debcudf.ml b/deb/debcudf.ml
-index fd4b980..8c83f0d 100644
---- a/deb/debcudf.ml
-+++ b/deb/debcudf.ml
-@@ -224,13 +224,15 @@ let get_cudf_version tables (package,version) =
- let get_real_name name = 
-   (* Remove --virtual- and architecture encoding *)
-   let dn = (CudfAdd.decode name) in
--  if ExtString.String.starts_with dn "--vir" then
--    (ExtString.String.slice ~first:10 dn,None)
--  else
--    try
--      let (n,a) = ExtString.String.split dn ":" in
--      if n = "src" then (a,None) else (n,Some a)
--    with Invalid_string -> (dn,None)
-+  let no_virtual =
-+    if ExtString.String.starts_with dn "--vir"
-+    then ExtString.String.slice ~first:10 dn
-+    else dn
-+  in
-+  try
-+    let (n,a) = ExtString.String.split no_virtual ":" in
-+    if n = "src" then (a,None) else (n,Some a)
-+  with Invalid_string -> (no_virtual,None)
- 
- let get_real_version tables (cudfname,cudfversion) =
-   let (debname,arch) = get_real_name cudfname in
diff --git a/debian/patches/series b/debian/patches/series
index c0f50fb..9dceec7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 binaries-prefix-edos
-distcheck-fg-bg
-getrealname

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git