From 22384b680bac8343ec4393de5d7184e61a6c7192 Mon Sep 17 00:00:00 2001
From: cdfrey <cdfrey>
Date: Fri, 12 Oct 2007 19:42:28 +0000
Subject: [PATCH] - renamed ktrans and translate to bktrans and btranslate to
 avoid        file name clashes with libtranslate of Gnome

---
 ChangeLog                             | 6 ++++++
 debian/barry-util.install             | 4 ++--
 rpm/barry.spec                        | 7 +++++--
 tools/Makefile.am                     | 8 ++++----
 tools/{ktrans.cc => bktrans.cc}       | 0
 tools/{translate.cc => btranslate.cc} | 0
 6 files changed, 17 insertions(+), 8 deletions(-)
 rename tools/{ktrans.cc => bktrans.cc} (100%)
 rename tools/{translate.cc => btranslate.cc} (100%)

diff --git a/ChangeLog b/ChangeLog
index 7c40ca89..f9dde862 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Release: version 0.9.2 - 2007/10/12
+------------------------------------------------------------------------------
+2007/10/12
+	- renamed ktrans and translate to bktrans and btranslate to avoid
+		file name clashes with libtranslate of Gnome
+
 Release: version 0.9 - 2007/10/12
 ------------------------------------------------------------------------------
 2007/09/29
diff --git a/debian/barry-util.install b/debian/barry-util.install
index f599cfe3..3f110270 100644
--- a/debian/barry-util.install
+++ b/debian/barry-util.install
@@ -1,7 +1,7 @@
 debian/tmp/usr/bin/btool
-debian/tmp/usr/bin/ktrans
+debian/tmp/usr/bin/bktrans
 debian/tmp/usr/bin/upldif
-debian/tmp/usr/bin/translate
+debian/tmp/usr/bin/btranslate
 debian/tmp/usr/sbin/breset
 debian/tmp/usr/sbin/bcharge
 debian/tmp/usr/sbin/pppob
diff --git a/rpm/barry.spec b/rpm/barry.spec
index 9b928bfb..a1b77a0c 100644
--- a/rpm/barry.spec
+++ b/rpm/barry.spec
@@ -175,8 +175,8 @@ cd ../
 %attr(0755,root,root) %{_sbindir}/pppob
 %attr(0755,root,root) %{_bindir}/btool
 %attr(0755,root,root) %{_bindir}/upldif
-%attr(0755,root,root) %{_bindir}/ktrans
-%attr(0755,root,root) %{_bindir}/translate
+%attr(0755,root,root) %{_bindir}/bktrans
+%attr(0755,root,root) %{_bindir}/btranslate
 %attr(0644,root,root) %{_mandir}/man1/btool*
 %attr(0644,root,root) %{_mandir}/man1/bcharge*
 %attr(0644,root,root) %config %{_sysconfdir}/udev/rules.d/*
@@ -210,6 +210,9 @@ cd ../
 /sbin/ldconfig
 
 %changelog
+* Fri Oct 12 2007 Chris Frey <cdfrey@foursquare.net> 0.9-2
+- removed ktrans and translate from rpm package
+
 * Thu Aug 09 2007 Chris Frey <cdfrey@foursquare.net> 0.9-1
 - version bump
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 73edeb7b..d1efa503 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = $(LIBUSB_CFLAGS)
 #AM_CXXFLAGS = -ansi -Wall -fno-strict-aliasing -g
 AM_CXXFLAGS = -ansi -Wall -g
 
-bin_PROGRAMS = btool upldif translate ktrans
+bin_PROGRAMS = btool upldif btranslate bktrans
 sbin_PROGRAMS = bcharge breset pppob
 
 btool_SOURCES = btool.cc
@@ -22,10 +22,10 @@ endif
 upldif_SOURCES = upldif.cc
 upldif_LDADD = ../src/libbarry.la $(LIBUSB_LIBS)
 
-translate_SOURCES = translate.cc
+btranslate_SOURCES = btranslate.cc
 
-ktrans_SOURCES = ktrans.cc
-ktrans_LDADD = ../src/libbarry.la
+bktrans_SOURCES = bktrans.cc
+bktrans_LDADD = ../src/libbarry.la
 
 bcharge_SOURCES = bcharge.cc
 bcharge_LDADD = $(LIBUSB_LIBS)
diff --git a/tools/ktrans.cc b/tools/bktrans.cc
similarity index 100%
rename from tools/ktrans.cc
rename to tools/bktrans.cc
diff --git a/tools/translate.cc b/tools/btranslate.cc
similarity index 100%
rename from tools/translate.cc
rename to tools/btranslate.cc
-- 
2.11.4.GIT