[med-svn] [king-probe] 02/03: To be compatible with the scripts which use 'probe' name, the patch rename_binary_result is removed, and some other changes are applied. Both of the king-probe and probe commands are now available. Refer to NEWS.Debian

[Malihe Asemani]

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

mali-guest pushed a commit to branch master
in repository king-probe.

commit 38b245b8b24116947af7f521badc113dd8add6b4
Author: Malihe Asemani <ml.asemani at gmail.com>
Date:   Tue Aug 18 06:03:22 2015 +0000

    To be compatible with the scripts which use 'probe' name, the patch
    rename_binary_result is removed, and some other changes are applied.
    Both of the king-probe and probe commands are now available.
    Refer to NEWS.Debian
---
 debian/NEWS.Debian                        | 25 +++++++++++++++++++++++++
 debian/dirs                               |  1 +
 debian/install                            |  2 +-
 debian/links                              |  2 ++
 debian/patches/rename_binary_result.patch | 31 -------------------------------
 debian/patches/series                     |  1 -
 debian/rules                              |  2 +-
 7 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian
new file mode 100644
index 0000000..3e13220
--- /dev/null
+++ b/debian/NEWS.Debian
@@ -0,0 +1,25 @@
+king-probe (2.13.110909-1) unstable; urgency=low
+
+  Due to a name conflict with /usr/bin/probe from ssh the manin
+  executable needs to be renamed. The king-probe packag provides
+  the binary
+  
+    /usr/bin/king-probe
+
+  To remain compatible with local user scripts using the name probe
+  the real executable is provided under the PATH
+  
+    /usr/lib/debian-med/bin/probe
+
+  So if you want to use plink1 with its original name just do the
+  following:  Set the PATH variable like
+
+    export PATH=/usr/lib/debian-med/bin:$PATH
+
+  The PATH can be set very easily by making use of the feature of
+  the med-config package of the Debian Med Blend.  Once med-config
+  is installed for Bash users who create a file ${HOME}/.blends
+  containing the string "debian-med" the PATH is automatically
+  extended and thus users who consider themselves Debian Med users
+  have access to the originally named executables.
+
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..17027e7
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1 @@
+usr/lib/debian-med/bin/
\ No newline at end of file
diff --git a/debian/install b/debian/install
index b2996f8..6cbb05d 100644
--- a/debian/install
+++ b/debian/install
@@ -1 +1 @@
-king-probe	usr/bin
+probe	usr/lib/debian-med/bin/
diff --git a/debian/links b/debian/links
new file mode 100644
index 0000000..4395a29
--- /dev/null
+++ b/debian/links
@@ -0,0 +1,2 @@
+# For compatibility reasons (i.e. scripts written using probe package <= 2.13.110909) 
+usr/lib/debian-med/bin/probe	usr/bin/king-probe
diff --git a/debian/patches/rename_binary_result.patch b/debian/patches/rename_binary_result.patch
deleted file mode 100644
index fa0e99c..0000000
--- a/debian/patches/rename_binary_result.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Rename the binary file from probe to king-probe
-              Using probe leads to some confilicts with mirmon package 
-Author: Malihe Asemani <ml.asemani at gmail.com>
-Last-Update: Mon Aug 10 04:57:49 UTC 2015
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- king-probe.orig/Makefile.linux
-+++ king-probe/Makefile.linux
-@@ -7,17 +7,17 @@
- .c.o:
- 	cc -c $*.c $(CFLAGS)
- 
--probe: probe.o $(OBJLIST)
-+king-probe: probe.o $(OBJLIST)
- 	cc -o $@ probe.o $(OBJLIST) $(LFLAGS)
- 
- clean:
- 	@rm -f *.o *.ckp
- 
--install: probe
--	mv probe /local/bin
-+install: king-probe
-+	mv king-probe /local/bin
- 
--installtest: probe
--	mv probe /local/bin/probeTest
-+installtest: king-probe
-+	mv king-probe /local/bin/probeTest
- 
- # DO NOT DELETE THIS LINE -- make depend uses it
- abin.o:	./abin.h	./geom3d.h	./utility.h	abin.c
diff --git a/debian/patches/series b/debian/patches/series
index a5b3882..cc1eda2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 fix_build_issue.patch
-rename_binary_result.patch
diff --git a/debian/rules b/debian/rules
index 4d4e9c7..f7474ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,4 +20,4 @@
 	dh $@
 
 override_dh_auto_build:
-	dh_auto_build --buildsystem=makefile -- -f Makefile.linux king-probe
+	dh_auto_build --buildsystem=makefile -- -f Makefile.linux probe

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/king-probe.git