From da70166fc826a7086b951e1fd53fc0850ebd9df0 Mon Sep 17 00:00:00 2001
From: Robert James Clay <jame@users.sourceforge.net>
Date: Thu, 10 Nov 2011 18:11:16 +0000
Subject: [PATCH] Do not use a dash in the primary Debian package name.

---
 debian/changelog |  2 +-
 debian/control   |  4 ++--
 debian/rules     | 24 ++++++++++++------------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6eab586..6cf1915 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-golded-plus (1.1.5-0) UNRELEASED; urgency=low
+goldedplus (1.1.5-0) UNRELEASED; urgency=low
 
   * Initial Release, debianized by Stas Degteff
 
diff --git a/debian/control b/debian/control
index f77c84e..e10ab1d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: golded-plus
+Source: goldedplus
 Section: mail
 Priority: optional
 Maintainer: Stas Degteff <stas_degteff@users.sourceforge.net>
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 7), libncurses5-dev
 Standards-Version: 3.9.1
 Vcs-Browser: http://golded-plus.cvs.sourceforge.net/golded-plus
 
-Package: golded-plus
+Package: goldedplus
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: Golded+ - an FTN message editor
diff --git a/debian/rules b/debian/rules
index 2054c30..17b0012 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,8 @@
 export DH_VERBOSE=1
 
 #export DEBIAN=1
-#export PACKAGE=golded-plus-snapshot
-PREFIX=$(CURDIR)/debian/golded-plus
+#export PACKAGE=goldedplus-snapshot
+PREFIX=$(CURDIR)/debian/goldedplus
 DOCS= docs/license.txt docs/notework.txt docs/readme.txt \
       docs/rusfaq.txt docs/rusfaq.koi8r docs/rusfaq.utf8 docs/tips.txt docs/todowork.txt \
       docs/tokencfg.txt docs/tokentpl.txt docs/notework.rus docs/notework.koi8r \
@@ -83,16 +83,16 @@ install: build
 	ln $(PREFIX)/usr/man/man1/golded.1 $(PREFIX)/usr/man/man1/gedlnx.1
 	ln $(PREFIX)/usr/man/man1/goldnode.1 $(PREFIX)/usr/man/man1/gnlnx.1
 	ln $(PREFIX)/usr/man/man1/rddt.1 $(PREFIX)/usr/man/man1/rddtlnx.1
-	install -d $(PREFIX)/usr/share/doc/golded-plus
-	install $(IMOPT) $(DOCS) $(PREFIX)/usr/share/doc/golded-plus
-	install -d $(PREFIX)/usr/share/doc/golded-plus/examples
-	install $(IMOPT) bin/openbsd-vt220.sh $(PREFIX)/usr/share/doc/golded-plus/examples/
-	cp -r cfgs/config $(PREFIX)/usr/share/doc/golded-plus/examples/
-	cp -r cfgs/template $(PREFIX)/usr/share/doc/golded-plus/examples/
-	install -d $(PREFIX)/usr/share/golded-plus/
-	cp -r cfgs/charset $(PREFIX)/usr/share/golded-plus/
-	cp -r cfgs/colorset $(PREFIX)/usr/share/golded-plus/
-	-find $(PREFIX)/usr/share/golded-plus/ $(PREFIX)/usr/share/doc/golded-plus/examples/ -name CVS -exec rm -r '{}' ';'
+	install -d $(PREFIX)/usr/share/doc/goldedplus
+	install $(IMOPT) $(DOCS) $(PREFIX)/usr/share/doc/goldedplus
+	install -d $(PREFIX)/usr/share/doc/goldedplus/examples
+	install $(IMOPT) bin/openbsd-vt220.sh $(PREFIX)/usr/share/doc/goldedplus/examples/
+	cp -r cfgs/config $(PREFIX)/usr/share/doc/goldedplus/examples/
+	cp -r cfgs/template $(PREFIX)/usr/share/doc/goldedplus/examples/
+	install -d $(PREFIX)/usr/share/goldedplus/
+	cp -r cfgs/charset $(PREFIX)/usr/share/goldedplus/
+	cp -r cfgs/colorset $(PREFIX)/usr/share/goldedplus/
+	-find $(PREFIX)/usr/share/goldedplus/ $(PREFIX)/usr/share/doc/goldedplus/examples/ -name CVS -exec rm -r '{}' ';'
 
 # Build architecture-independent files here.
 binary-indep: build install