# HG changeset patch
# User 'Gr?gory Tr?lat <gregory.trelat@lolitech.fr>'
# Date 1256734140 -3600
# Node ID e9fce24923fcf5d5e920acf5def5e7d90c486974
# Parent  fc3399727a06e9b325ecdd8ab9de0c6743b4d7d4# Parent  3e0c776da33bc7e6dfe2e2142f54f939df8149e2
changes merged

diff -r 3e0c776da33b -r e9fce24923fc debian/canfestival-doc.docs
--- a/debian/canfestival-doc.docs	Tue Oct 27 15:11:26 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-debian/canfestival/usr/share/objdictgen/doc/*
diff -r 3e0c776da33b -r e9fce24923fc debian/canfestival-doc.install
--- a/debian/canfestival-doc.install	Tue Oct 27 15:11:26 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-#DOCS#
-
diff -r 3e0c776da33b -r e9fce24923fc debian/control-virtual
--- a/debian/control-virtual	Tue Oct 27 15:11:26 2009 +0100
+++ b/debian/control-virtual	Wed Oct 28 13:49:00 2009 +0100
@@ -16,13 +16,7 @@
  This package contains some test programs you can use as example
  for your own developments.
  - TestMasterSlave : Two CanOpen nodes in the same process
- - TestMasterMicromod : A CanOpen master that control a peak MicroMod module
- - DS401_Master : Master Node for the DS401_Slave_Gui
- - DS401_Slave_Gui : Simulate an I/O module with GUI
-
-Package: canfestival-doc
-Architecture: all
-Description: Documentation for canfestival
+ - CANOpenShell : A CanOpen node that can execute some user commands through stdin
 
 Package: canfestival-virtual
 Architecture: all
diff -r 3e0c776da33b -r e9fce24923fc debian/objdictedit.desktop
--- a/debian/objdictedit.desktop	Tue Oct 27 15:11:26 2009 +0100
+++ b/debian/objdictedit.desktop	Wed Oct 28 13:49:00 2009 +0100
@@ -1,8 +1,9 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=Objdictedit
-Comment=A CanOpen Node Editor
-Comment[fr]=Un Editeur de Noeud CanOpen
+Name=CANOpen Object Dictionary Editor
+Name[fr]=Editeur de Dictionnaire d'Objets CANOpen
+Comment=Create, modifify, configure CANOpen nodes
+Comment[fr]=Créer, modifier, configurer des noeuds CANOpen
 Exec=/usr/bin/objdictedit
 Icon=/usr/share/CanFestival-3/objdictgen/networkedit.png
 Terminal=false
diff -r 3e0c776da33b -r e9fce24923fc debian/rules
--- a/debian/rules	Tue Oct 27 15:11:26 2009 +0100
+++ b/debian/rules	Wed Oct 28 13:49:00 2009 +0100
@@ -1,14 +1,5 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-#
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets  by Bill Allombert 2001
 
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
@@ -30,7 +21,7 @@
 	
 	# Add here commands to configure the package.
 	cp debian/control-$(shell echo $(CAN_INTERFACE)) debian/control; \
-	./configure --can=$(shell echo $(CAN_INTERFACE)) --prefix=/usr
+	./configure --can=$(shell echo $(CAN_INTERFACE)) --prefix=/usr --wx=0
 	 
 build: build-indep
 
@@ -95,7 +86,7 @@
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs CHANGES
-	dh_installdocs
+#	dh_installdocs
 #	dh_installexamples
 #	dh_installmenu
 #	dh_installdebconf	
diff -r 3e0c776da33b -r e9fce24923fc objdictgen/Makefile.in
--- a/objdictgen/Makefile.in	Tue Oct 27 15:11:26 2009 +0100
+++ b/objdictgen/Makefile.in	Wed Oct 28 13:49:00 2009 +0100
@@ -36,7 +36,7 @@
 
 install: gnosis
 	mkdir -p $(PREFIX)/objdictgen
-	cp -r *.py* config doc doc_index examples gnosis $(PREFIX)/objdictgen
+	cp -r *.py* config doc doc_index locale examples gnosis $(PREFIX)/objdictgen
 	chmod -R a+r $(PREFIX)/objdictgen
 	mkdir -p $(PREFIX)/bin
 	ln -sf $(PREFIX)/objdictgen/objdictedit.py $(PREFIX)/bin/objdictedit
diff -r 3e0c776da33b -r e9fce24923fc objdictgen/networkedit.py
--- a/objdictgen/networkedit.py	Tue Oct 27 15:11:26 2009 +0100
+++ b/objdictgen/networkedit.py	Wed Oct 28 13:49:00 2009 +0100
@@ -394,7 +394,7 @@
     def OnChar(self, event):
         if event.ControlDown() and event.GetKeyCode() == 83 and getattr(self, "_onsave", None) != None:
             self._onsave()
-        event.Skip()
+        #event.Skip()
 
     def OnQuitMenu(self, event):
         self.Close()