[Pkg-ocaml-maint-commits] [SCM] mldonkey packaging branch, master, updated. debian/3.0.0-2-8-g3f44d2f

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit da41b6cfc26081cc4248b4d7ac48f4407084f2b2
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date:   Sat Jul 4 21:36:39 2009 +0200

    Add a patch to remove bashism from script make_buginfo, Closes: #530141

diff --git a/debian/changelog b/debian/changelog
index 434724b..e4018b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ mldonkey (3.0.0-3) UNRELEASED; urgency=low
   * Remove useless file: /var/log/mldonkey/mldonkey-server.log.
   * Update build-dependencies to ease OCaml 3.11.1 transition.
   * Add a patch ocaml_3.11.1 to let mldonkey build with OCaml 3.11.1.
+  * Add a patch to remove bashism from script make_buginfo, Closes: #530141.
 
  -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Mon, 20 Apr 2009 14:25:17 +0200
 
diff --git a/debian/patches/00list b/debian/patches/00list
index f112b77..d40d0c3 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,2 +1,3 @@
 01_see
 ocaml_3.11.1
+remove_bashism
diff --git a/debian/patches/remove_bashism.dpatch b/debian/patches/remove_bashism.dpatch
new file mode 100755
index 0000000..a27ee48
--- /dev/null
+++ b/debian/patches/remove_bashism.dpatch
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## remove_bashism.dpatch by Mehdi Dogguy <dogguy at pps.jussieu.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad mldonkey~/distrib/make_buginfo mldonkey/distrib/make_buginfo
+--- mldonkey~/distrib/make_buginfo	2009-07-04 21:30:34.000000000 +0200
++++ mldonkey/distrib/make_buginfo	2009-07-04 21:30:50.000000000 +0200
+@@ -21,14 +21,14 @@
+ rm -f buginfo.tar.gz
+ mkdir -p buginfo
+ cp -f *.ini buginfo/
+-uname -a &> buginfo/uname
+-df &> buginfo/df
+-(ls -lR; df .) &> buginfo/mldonkey.directory
+-(cd incoming; ls -lR; df .) &> buginfo/incoming.directory
+-(cd temp; ls -lR; df .) &> buginfo/temp.directory
+-(cd torrents; ls -lR; df .) &> buginfo/torrents.directory
+-id &> buginfo/id
+-ifconfig &> buginfo/computer
++uname -a >buginfo/uname 2>&1
++df >buginfo/df 2>&1
++(ls -lR; df .) >buginfo/mldonkey.directory 2>&1
++(cd incoming; ls -lR; df .) >buginfo/incoming.directory 2>&1
++(cd temp; ls -lR; df .) >buginfo/temp.directory 2>&1
++(cd torrents; ls -lR; df .) >buginfo/torrents.directory 2>&1
++id >buginfo/id 2>&1
++ifconfig >buginfo/computer 2>&1
+ 
+ tar cf buginfo.tar buginfo
+ rm -rf buginfo

-- 
mldonkey packaging