From 036e00b72b8e8ee0996f3d4875d502cae05f0913 Mon Sep 17 00:00:00 2001
From: Philip Heron <phil@sanslogic.co.uk>
Date: Sun, 20 Jun 2010 01:24:57 +0100
Subject: [PATCH] Stop dl-fldigi files conflicting with fldigi package.

---
 data/{fldigi.xpm => dl-fldigi.xpm}                | 0
 doc/Makefile.am                                   | 8 ++++----
 doc/{fldigi-shell.1.txt => dl-fldigi-shell.1.txt} | 0
 scripts/{fldigi-shell => dl-fldigi-shell}         | 0
 src/Makefile.am                                   | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename data/{fldigi.xpm => dl-fldigi.xpm} (100%)
 rename doc/{fldigi-shell.1.txt => dl-fldigi-shell.1.txt} (100%)
 rename scripts/{fldigi-shell => dl-fldigi-shell} (100%)

diff --git a/data/fldigi.xpm b/data/dl-fldigi.xpm
similarity index 100%
rename from data/fldigi.xpm
rename to data/dl-fldigi.xpm
diff --git a/doc/Makefile.am b/doc/Makefile.am
index f570a747..bba56a71 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -3,15 +3,15 @@
 
 ASCIIDOC_CONF = asciidoc.conf
 
-ASCIIDOC_SRC = dl-fldigi.1.txt fldigi-shell.1.txt flarq.1.txt guide.txt
-ASCIIDOC_MAN_DIST = dl-fldigi.1 fldigi-shell.1 flarq.1
+ASCIIDOC_SRC = dl-fldigi.1.txt dl-fldigi-shell.1.txt flarq.1.txt guide.txt
+ASCIIDOC_MAN_DIST = dl-fldigi.1 dl-fldigi-shell.1 flarq.1
 ASCIIDOC_MAN_INST =
 ASCIIDOC_HTML =
 
 if WANT_FLDIGI
     ASCIIDOC_MAN_INST += dl-fldigi.1
 if ENABLE_XMLRPC
-        ASCIIDOC_MAN_INST += fldigi-shell.1
+        ASCIIDOC_MAN_INST += dl-fldigi-shell.1
 endif
     ASCIIDOC_HTML += guide.html
 endif
@@ -47,7 +47,7 @@ endif
 #$(ASCIIDOC_MAN_INST): asciidoc.conf
 #	a2x $(A2X_ARGS) $@.txt
 #fldigi.1: fldigi.1.txt
-#fldigi-shell.1: fldigi-shell.1.txt
+#dl-fldigi-shell.1: dl-fldigi-shell.1.txt
 
 # The rest of the Makefile is enabled only if we have asciidoc
 if HAVE_ASCIIDOC
diff --git a/doc/fldigi-shell.1.txt b/doc/dl-fldigi-shell.1.txt
similarity index 100%
rename from doc/fldigi-shell.1.txt
rename to doc/dl-fldigi-shell.1.txt
diff --git a/scripts/fldigi-shell b/scripts/dl-fldigi-shell
similarity index 100%
rename from scripts/fldigi-shell
rename to scripts/dl-fldigi-shell
diff --git a/src/Makefile.am b/src/Makefile.am
index 8143773a..c1289069 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -116,9 +116,9 @@ endif
 install-exec-local:
 if WANT_FLDIGI
 if ENABLE_XMLRPC
-	if test -f $(srcdir)/../scripts/fldigi-shell; then \
+	if test -f $(srcdir)/../scripts/dl-fldigi-shell; then \
 	    $(mkinstalldirs) $(DESTDIR)/$(bindir); \
-            $(INSTALL_SCRIPT) $(srcdir)/../scripts/fldigi-shell $(DESTDIR)/$(bindir); \
+            $(INSTALL_SCRIPT) $(srcdir)/../scripts/dl-fldigi-shell $(DESTDIR)/$(bindir); \
         fi
 endif
 endif
@@ -151,7 +151,7 @@ endif
 
 uninstall-local:
 if WANT_FLDIGI
-	rm -f $(DESTDIR)$(bindir)/fldigi-shell
+	rm -f $(DESTDIR)$(bindir)/dl-fldigi-shell
 	rm -f $(DESTDIR)/$(datadir)/pixmaps/fldigi.xpm
 	rm -f $(DESTDIR)/$(datadir)/applications/dl-fldigi.desktop
 	rm -f $(DESTDIR)/$(datadir)/applications/dl-fldigi-hab.desktop
@@ -603,7 +603,7 @@ flarq_SOURCES += \
 EXTRA_DIST = \
 	$(srcdir)/../scripts/mkappbundle.sh \
 	$(srcdir)/../scripts/mkhamlibstatic.sh \
-	$(srcdir)/../scripts/fldigi-shell \
+	$(srcdir)/../scripts/dl-fldigi-shell \
 	$(srcdir)/../scripts/tests/cr.sh \
 	$(srcdir)/../scripts/tests/config-h.sh \
 	$(srcdir)/../data/fldigi-psk.png \