[hamradio-commits] [pydxcluster] 03/08: Patches main script to account for file installation dirs

[Ana Custura]

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

ana.c-guest pushed a commit to branch master
in repository pydxcluster.

commit 6074d244be315033852917c84ff843a2fe77c35a
Author: Ana C. Custura <ana at netstat.org.uk>
Date:   Sun May 29 14:11:42 2016 +0100

    Patches main script to account for file installation dirs
---
 .pc/.quilt_patches              |  1 +
 .pc/.quilt_series               |  1 +
 .pc/.version                    |  1 +
 debian/patches/01-file-loc.diff | 58 +++++++++++++++++++++++++++++++++++++++++
 debian/patches/series           |  1 +
 5 files changed, 62 insertions(+)

diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
new file mode 100644
index 0000000..6857a8d
--- /dev/null
+++ b/.pc/.quilt_patches
@@ -0,0 +1 @@
+debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
new file mode 100644
index 0000000..c206706
--- /dev/null
+++ b/.pc/.quilt_series
@@ -0,0 +1 @@
+series
diff --git a/.pc/.version b/.pc/.version
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/.pc/.version
@@ -0,0 +1 @@
+2
diff --git a/debian/patches/01-file-loc.diff b/debian/patches/01-file-loc.diff
new file mode 100644
index 0000000..8b0a372
--- /dev/null
+++ b/debian/patches/01-file-loc.diff
@@ -0,0 +1,58 @@
+--- a/pyDxCluster_v2_21.py
++++ b/pyDxCluster_v2_21.py
+@@ -15,34 +15,34 @@
+ 
+ version="v2.21"
+ pygame.mixer.init()
+-pygame.mixer.music.load("bell.wav")
++pygame.mixer.music.load("/usr/share/pydxcluster/bell.wav")
+ pygame.mixer.music.play()
+ 
+ try: 
+-	f = open("pydxcluster.cfg","r")
++	f = open("~/.pydxclusterrc","r")
+ 	settings = eval(f.read())
+ 	f.close()
+ except:
+ 	settings = {"host": "", "port": "", "user":"","password":"","ch2200":"1","ch660":"1","ch160":"1","ch80":"1","ch60":"1","ch40":"1","ch30":"1","ch20":"1","ch17":"1","ch15":"1","ch12":"1","ch10":"1","ch6":"1","ch4":"1","ch2":"1","ch70":"1","mainwindowx":0,"mainwindowy":25,"detailwindowx":572,"detailwindowy":274,"viewdetails":1,"consolewindowx":0,"consolewindowy":443,"viewconsole":1,"qrzuser":"","qrzpasswd":"","viewobserver":1,"observerwindowx":569,"observerwindowy":497,"obs1":"","obs2":"" [...]
+-	f = open("pydxcluster.cfg", "w")
++	f = open("~/.pydxclusterrc", "w")
+ 	f.write(str(settings))
+ 	f.close()
+-	f = open("pydxcluster.cfg","r")
++	f = open("~/.pydxclusterrc","r")
+ 	settings = eval(f.read())
+ 	f.close()
+ 	
+ 	
+ ################################# color map load ####################################
+ try: 
+-	fc = open("default.col","r")
++	fc = open("/usr/share/pydxcluster/default.col","r")
+ 	colorsettings = eval(fc.read())
+ 	fc.close()
+ except:
+ 	colorsettings = {"clusterbg":"white","clusterfg":"black","consolebg":"black","consolefg":"#dbff12","spotbg":"#a6f687","spotfg":"black","detailbg":"white","detailfg":"black","detailcall":"brown","detailcountry":"red","call1bg":"red","call1fg":"yellow","call2bg":"blue","call2fg":"yellow","call3bg":"darkgreen","call3fg":"yellow","call4bg":"black","call4fg":"yellow","call5bg":"orange","call5fg":"black","call6bg":"yellow","call6fg":"black","call7bg":"lightblue","call7fg":"black","call8bg":" [...]
+-	fc = open("default.col", "w")
++	fc = open("/usr/share/pydxcluster/default.col", "w")
+ 	fc.write(str(colorsettings))
+ 	fc.close()
+-	fc = open("default.col","r")
++	fc = open("/usr/share/pydxcluster/default.col","r")
+ 	colorsettings = eval(fc.read())
+ 	fc.close()
+ #####################################################################################	
+@@ -341,11 +341,11 @@
+ 
+ 	if rbkapcs==1: reversebeacon=1
+ 	settings = {"host": HOST, "port": str(PORT), "user":user,"password":password,"ch2200":str(ch2200.get()),"ch660":str(ch660.get()),"ch160":str(ch160.get()),"ch80":str(ch80.get()),"ch60":str(ch60.get()),"ch40":str(ch40.get()),"ch30":str(ch30.get()),"ch20":str(ch20.get()),"ch17":str(ch17.get()),"ch15":str(ch15.get()),"ch12":str(ch12.get()),"ch10":str(ch10.get()),"ch6":str(ch6.get()),"ch4":str(ch4.get()),"ch2":str(ch2.get()),"ch70":str(ch70.get()),"mainwindowx":x,"mainwindowy":y,"detailwind [...]
+-	f = open("pydxcluster.cfg", "w")
++	f = open("~/.pydxclusterrc", "w")
+ 	f.write(str(settings))
+ 	f.close()	
+ 	colorsettings = {"clusterbg":clusterbg,"clusterfg":clusterfg,"consolebg":consolebg,"consolefg":consolefg,"spotbg":spotbg,"spotfg":spotfg,"detailbg":detailbg,"detailfg":detailfg,"detailcall":detailcall,"detailcountry":detailcountry,"call1bg":call1bg,"call1fg":call1fg,"call2bg":call2bg,"call2fg":call2fg,"call3bg":call3bg,"call3fg":call3fg,"call4bg":call4bg,"call4fg":call4fg,"call5bg":call5bg,"call5fg":call5fg,"call6bg":call6bg,"call6fg":call6fg,"call7bg":call7bg,"call7fg":call7fg,"call8b [...]
+-	fc = open("default.col", "w")
++	fc = open("/usr/share/pydxcluster/default.col", "w")
+ 	fc.write(str(colorsettings))
+ 	fc.close()
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..80a60eb
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-file-loc.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/pydxcluster.git