From 60dc2312035186421c29d3904d26639ce8b44fea Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@gmail.com>
Date: Fri, 5 Aug 2011 17:56:10 +0200
Subject: [PATCH 01/11] Changed .Desktop location. Added .desktop to
$(sharedir)/applications directory.
---
Makefile | 4 +++-
conf/{autostart/qasim.desktop => qasim.destop} | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
rename conf/{autostart/qasim.desktop => qasim.destop} (78%)
diff --git a/Makefile b/Makefile
index 8cbf437..29247d1 100644
--- a/Makefile
+++ b/Makefile
@@ -68,8 +68,10 @@ install-data:
#
## Install configuration files
mkdir -p $(CONFDIR)/xdg/autostart
- install -D -o root -g root -m 644 $(CURDIR)/conf/autostart/$(NAME).desktop \
+ install -D -o root -g root -m 644 $(CURDIR)/conf/$(NAME).desktop \
$(CONFDIR)/xdg/autostart/$(NAME).desktop
+ install -D -o root -g root -m 644 $(CURDIR)/conf/$(NAME).desktop \
+ $(SHAREDIR)/applications/$(NAME).desktop
mkdir -p $(CONFDIR)/$(NAME)
install -D -o root -g root -m 644 $(CURDIR)/conf/config \
$(CONFDIR)/$(NAME)/config
diff --git a/conf/autostart/qasim.desktop b/conf/qasim.destop
similarity index 78%
rename from conf/autostart/qasim.desktop
rename to conf/qasim.destop
index 5c5ef6e..b2d5e69 100644
--- a/conf/autostart/qasim.desktop
+++ b/conf/qasim.destop
@@ -8,6 +8,7 @@ Terminal=false
Type=Application
Icon=printer
NotShowIn=
-StartupNotify=false
X-Desktop-File-Install-Version=0.15
Categories=KDE;GTK;Monitor;System;
+StartupNotify=true
+Categories=KDE;Qt;Network;System;Utility;
From f0b2447f29362f16c609d535d9fabf2b749dd4a1 Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@gmail.com>
Date: Fri, 5 Aug 2011 17:58:28 +0200
Subject: [PATCH 02/11] .desktop: Fixed typo in file renaming
---
conf/{qasim.destop => qasim.desktop} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename conf/{qasim.destop => qasim.desktop} (100%)
diff --git a/conf/qasim.destop b/conf/qasim.desktop
similarity index 100%
rename from conf/qasim.destop
rename to conf/qasim.desktop
From 4abec4ab7a4d1c2e68d7236b655cb84f3776a3ec Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@gmail.com>
Date: Fri, 5 Aug 2011 18:05:32 +0200
Subject: [PATCH 03/11] Makefile: Fix all installation directories for .desktop
files.
---
Makefile | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/Makefile b/Makefile
index 29247d1..ef642dc 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,8 @@ NAME=qasim
CONFDIR=$(DESTDIR)/etc
BINDIR=$(DESTDIR)/usr/bin
MANDIR=$(DESTDIR)/usr/share/man
-DOCDIR=$(DESTDIR)/usr/share/doc/$(NAME)
-SHAREDIR=$(DESTDIR)/usr/share/$(NAME)
+DOCDIR=$(DESTDIR)/usr/share/doc
+SHAREDIR=$(DESTDIR)/usr/share
RUBYVERSION=1.8
RDOC=rdoc$(RUBYVERSION)
@@ -32,9 +32,9 @@ build-doc:
install-doc:
# # install documentation
- rm -fr $(DOCDIR)
- mkdir -p $(DOCDIR)
- cp -a doc $(DOCDIR)
+ rm -fr $(DOCDIR)/$(NAME)
+ mkdir -p $(DOCDIR)/$(NAME)
+ cp -a doc $(DOCDIR)/$(NAME)
install: install-bin install-lib install-data
@@ -50,7 +50,7 @@ install-bin:
install-lib:
for libfile in $(NAME)/*.rb ; do \
- install -D -o root -g root -m 644 $$libfile $(SHAREDIR)/$$libfile; \
+ install -D -o root -g root -m 644 $$libfile $(SHAREDIR)/$(NAME)/$$libfile; \
done
install-data:
@@ -59,9 +59,9 @@ install-data:
# cat $(NAME).1 | gzip > $(MANDIR)/man1/$(NAME).1.gz
#
## Install icons
- mkdir -p $(SHAREDIR)/icons
+ mkdir -p $(SHAREDIR)/$(NAME)/icons
install -D -o root -g root -m 644 $(CURDIR)/icons/$(NAME).svg \
- $(SHAREDIR)/icons/$(NAME).svg
+ $(SHAREDIR)/$(NAME)/icons/$(NAME).svg
#
## Install completion file
# install -D -o root -g root -m 644 $(CURDIR)/$(NAME).completion $(DESTDIR)/etc/bash_completion.d/$(NAME)
@@ -79,9 +79,9 @@ install-data:
$(CONFDIR)/$(NAME)/default.map
#
# Install examples
- mkdir -p $(DOCDIR)/examples
+ mkdir -p $(DOCDIR)/$(NAME)/examples
for f in `ls examples`; do \
- cat examples/$$f | gzip -f9 > $(DOCDIR)/examples/$$f.gz ; \
+ cat examples/$$f | gzip -f9 > $(DOCDIR)/$(NAME)/examples/$$f.gz ; \
done
.PHONY: destdir
From 7c2105d13395d7c63b8eb75bfef1ae05a3c12503 Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@gmail.com>
Date: Fri, 5 Aug 2011 18:09:34 +0200
Subject: [PATCH 04/11] sshfs-mapper.desktop: removed obsolete file.
---
sshfs-mapper.desktop | 10 ----------
1 file changed, 10 deletions(-)
delete mode 100644 sshfs-mapper.desktop
diff --git a/sshfs-mapper.desktop b/sshfs-mapper.desktop
deleted file mode 100644
index 50fcba9..0000000
--- a/sshfs-mapper.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Version=1.0
-Name=SSHFS Mapper
-Name[fr_FR@euro]=SSHFS Mapper
-Comment=Access to remote SSH shares
-Comment[fr_FR@euro]=Accès aux partages SSH distants
-Exec=sshfs-mapper
-X-GNOME-Autostart-enabled=true
From 91f33b1fe41dce9abbeef8d3ae8ced29994aa44e Mon Sep 17 00:00:00 2001
From: warbrain <warbrain@daneel.glenux.net>
Date: Sun, 7 Aug 2011 16:54:17 +0200
Subject: [PATCH 05/11] Added missing dependencies.
---
debian/changelog | 6 ++++++
debian/control | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 8e4d552..9d0fede 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qasim (0.1.1) unstable; urgency=low
+
+ * Added missing dependencies (libqt4-ruby & ruby)
+
+ -- Glenn Y. Rolland <glenux@glenux.net> Sun, 07 Aug 2011 16:53:20 +0200
+
qasim (0.1) unstable; urgency=low
* Initial version.
diff --git a/debian/control b/debian/control
index 692b2df..82786a8 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.7.2
Package: qasim
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, sshfs (>= 1.7)
+Depends: ${shlibs:Depends}, ${misc:Depends}, sshfs (>= 1.7), ruby, libqt4-ruby
Description: Easy mount solution for SSH filesystems.
Qasim is a front-end for sshfs, the filesystem client based on fuse
and ssh. It provides automating and global settings control for sshfs mounts.
From 91b539545cce7ba87fc49f91fd64ace1e7a70146 Mon Sep 17 00:00:00 2001
From: warbrain <warbrain@daneel.glenux.net>
Date: Sun, 7 Aug 2011 17:06:30 +0200
Subject: [PATCH 06/11] Disabled rdebug & added another missing dependency.
---
debian/changelog | 6 ++++++
debian/control | 2 +-
qasim/config.rb | 4 ++--
qasim/map.rb | 20 ++++++++++----------
4 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9d0fede..3118f13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qasim (0.1.2) unstable; urgency=low
+
+ * Disabled rdebug & added another missing dependency.
+
+ -- Glenn Y. Rolland <glenux@glenux.net> Sun, 07 Aug 2011 17:06:15 +0200
+
qasim (0.1.1) unstable; urgency=low
* Added missing dependencies (libqt4-ruby & ruby)
diff --git a/debian/control b/debian/control
index 82786a8..ef4210b 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.7.2
Package: qasim
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, sshfs (>= 1.7), ruby, libqt4-ruby
+Depends: ${shlibs:Depends}, ${misc:Depends}, sshfs (>= 1.7), ruby, libqt4-ruby, rubygems
Description: Easy mount solution for SSH filesystems.
Qasim is a front-end for sshfs, the filesystem client based on fuse
and ssh. It provides automating and global settings control for sshfs mounts.
diff --git a/qasim/config.rb b/qasim/config.rb
index 81dd072..647906b 100644
--- a/qasim/config.rb
+++ b/qasim/config.rb
@@ -7,7 +7,7 @@ require 'pp'
require 'find'
require 'rubygems'
-require 'rdebug/base'
+#require 'rdebug/base'
require 'qasim/constants'
require 'qasim/map'
@@ -51,7 +51,7 @@ module Qasim
end
def parse_maps &blk
- rdebug "Config: #{@config_dir}/config"
+ #rdebug "Config: #{@config_dir}/config"
@maps = []
Find.find( @config_dir, APP_SYSCONFIG_DIR ) do |path|
diff --git a/qasim/map.rb b/qasim/map.rb
index 42e1a38..92ebe59 100644
--- a/qasim/map.rb
+++ b/qasim/map.rb
@@ -1,6 +1,6 @@
require 'rubygems'
-require 'rdebug/base'
+#require 'rdebug/base'
require 'qasim/config'
module Qasim
@@ -38,7 +38,7 @@ module Qasim
def load path=nil
@path=path unless path.nil?
- rdebug "Parsing map #{@path}"
+ #rdebug "Parsing map #{@path}"
f = File.open @path
linect = 0
local_env = ENV.clone
@@ -64,22 +64,22 @@ module Qasim
case line
when /^\s*REMOTE_USER\s*=\s*(.*)\s*$/ then
@user = $1
- rdebug "d: remote_user => #{$1}"
+ #rdebug "d: remote_user => #{$1}"
when /^\s*REMOTE_PORT\s*=\s*(.*)\s*$/ then
@port = $1.to_i
- rdebug "d: remote_port => #{$1}"
+ #rdebug "d: remote_port => #{$1}"
when /^\s*REMOTE_HOST\s*=\s*(.*)\s*$/ then
@host = $1
- rdebug "d: remote_host => #{$1}"
+ #rdebug "d: remote_host => #{$1}"
when /^\s*REMOTE_CYPHER\s*=\s*(.*)\s*$/ then
if CYPHERS.map{|x| x.to_s}.include? $1 then
@host = $1.to_sym
end
when /^\s*MAP\s*=\s*(.*)\s+(.*)\s*$/ then
@links[$1] = $2
- rdebug "d: link #{$1} => #{$2}"
+ #rdebug "d: link #{$1} => #{$2}"
when /^\s*$/,/^\s*#/ then
- rdebug "d: dropping empty line"
+ #rdebug "d: dropping empty line"
else
raise MapParseError, "parse error at #{@path}:#{linect}"
end
@@ -99,7 +99,7 @@ module Qasim
end
def online?
- rdebug "testing online? %s " % self.inspect
+ #rdebug "testing online? %s " % self.inspect
#FIXME: test liveness
end
@@ -159,7 +159,7 @@ module Qasim
"-o","Port=%s" % @port,
"%s@%s:%s" % [@user,@host,remotepath],
localpath ]
- rdebug "command: %s" % [ cmd, cmd_args ].flatten.join(' ')
+ #rdebug "command: %s" % [ cmd, cmd_args ].flatten.join(' ')
if block_given? then
yield name, cmd, cmd_args
else
@@ -180,7 +180,7 @@ module Qasim
"-u", #umount
"-z" ,#lazy
localpath ]
- rdebug "command: %s" % [ cmd, cmd_args ].flatten.join(' ')
+ #rdebug "command: %s" % [ cmd, cmd_args ].flatten.join(' ')
if block_given? then
yield name, cmd, cmd_args
else
From 3c38af560e0574ca086d65f86a8ec82ec224c414 Mon Sep 17 00:00:00 2001
From: warbrain <warbrain@daneel.glenux.net>
Date: Sun, 7 Aug 2011 17:44:28 +0200
Subject: [PATCH 07/11] Create mountpoint.
---
debian/changelog | 6 ++++++
qasim/map.rb | 1 +
2 files changed, 7 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 3118f13..86bfd1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qasim (0.1.3) unstable; urgency=low
+
+ * Create mountpoint if non-existant.
+
+ -- Glenn Y. Rolland <glenux@glenux.net> Sun, 07 Aug 2011 17:43:56 +0200
+
qasim (0.1.2) unstable; urgency=low
* Disabled rdebug & added another missing dependency.
diff --git a/qasim/map.rb b/qasim/map.rb
index 92ebe59..926e1bf 100644
--- a/qasim/map.rb
+++ b/qasim/map.rb
@@ -143,6 +143,7 @@ module Qasim
#
# FIXME: test connexion with Net::SSH + timeout or ask password
@links.each do |name, remotepath|
+ FileUtils.mkdir_p localpath
localpath = File.join ENV['HOME'], "mnt", name
cmd = "sshfs"
cmd_args = [
From 1c0edfdcc10616dbab1356e57d65e2c0450656cf Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@gmail.com>
Date: Tue, 9 Aug 2011 22:30:23 +0200
Subject: [PATCH 08/11] map: Inverted two lines.
---
qasim/map.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/qasim/map.rb b/qasim/map.rb
index 926e1bf..b2dd843 100644
--- a/qasim/map.rb
+++ b/qasim/map.rb
@@ -143,8 +143,8 @@ module Qasim
#
# FIXME: test connexion with Net::SSH + timeout or ask password
@links.each do |name, remotepath|
- FileUtils.mkdir_p localpath
localpath = File.join ENV['HOME'], "mnt", name
+ FileUtils.mkdir_p localpath
cmd = "sshfs"
cmd_args = [
"-o","allow_root" ,
From d75e744bea083dce718fa5ba9509e0c39e7a1968 Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@gmail.com>
Date: Tue, 9 Aug 2011 22:35:32 +0200
Subject: [PATCH 09/11] Updated debian changelog.
---
debian/changelog | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 86bfd1c..582eed9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qasim (0.1.4) unstable; urgency=low
+
+ * Fixed localpath bug.
+
+ -- Glenn ROLLAND <glenux@fr.st> Tue, 09 Aug 2011 22:35:10 +0200
+
qasim (0.1.3) unstable; urgency=low
* Create mountpoint if non-existant.
From 3d26e8d64bc2eb92fd0b45a4d48059724af6f810 Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@gmail.com>
Date: Tue, 9 Aug 2011 22:45:12 +0200
Subject: [PATCH 10/11] map: Added missing require for fileutils.
---
qasim/map.rb | 1 +
1 file changed, 1 insertion(+)
diff --git a/qasim/map.rb b/qasim/map.rb
index b2dd843..35ab34e 100644
--- a/qasim/map.rb
+++ b/qasim/map.rb
@@ -1,4 +1,5 @@
+require 'fileutils'
require 'rubygems'
#require 'rdebug/base'
require 'qasim/config'
From a92426c80e3dad8bf1bc51db2011a5bc141b004d Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@gmail.com>
Date: Tue, 9 Aug 2011 22:46:43 +0200
Subject: [PATCH 11/11] Updated changelog.
---
debian/changelog | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 582eed9..b30213b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qasim (0.1.5) unstable; urgency=low
+
+ * map: Added missing require for fileutils.
+
+ -- Glenn ROLLAND <glenux@fr.st> Tue, 09 Aug 2011 22:46:33 +0200
+
qasim (0.1.4) unstable; urgency=low
* Fixed localpath bug.