# HG changeset patch
# User 'Laurent Bessard <laurent.bessard@lolitech.fr>'
# Date 1249653575 -7200
# Node ID a2c74eca6bf2384f5ee08774bd9b58a5f550725d
# Parent  e297491483ea8c1909352ab6df4e097c687fc60b# Parent  3126da40d46985b21ae21a973667bfa047388173
Merged changes

diff -r e297491483ea -r a2c74eca6bf2 debian/canfestival-examples.install
--- a/debian/canfestival-examples.install	Mon Jul 27 16:35:12 2009 +0200
+++ b/debian/canfestival-examples.install	Fri Aug 07 15:59:35 2009 +0200
@@ -1,4 +1,5 @@
+usr/bin/CANOpenShell
 usr/bin/TestMasterSlave
-usr/bin/TestMasterMicroMod
+#usr/bin/TestMasterMicroMod
 #usr/bin/DS401_Slave_Gui
 #usr/bin/DS401_Master
diff -r e297491483ea -r a2c74eca6bf2 debian/canfestival-peak.postinst
--- a/debian/canfestival-peak.postinst	Mon Jul 27 16:35:12 2009 +0200
+++ b/debian/canfestival-peak.postinst	Fri Aug 07 15:59:35 2009 +0200
@@ -5,31 +5,23 @@
 
 set -e
 
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
 DLL_LIST=
 CF_CONFIG=/usr/share/CanFestival-3/objdictgen/canfestival_config.py
 CF_CONFIG_TEMP=/usr/share/CanFestival-3/objdictgen/canfestival_config_ori.py
+
 case "$1" in
     configure)
     ldconfig
-    cd /usr/lib
-    DLL_LIST=
-	FILES=
+    
+	# Find canfestival driver library in /usr/lib
+	cd /usr/lib
 	for file in libcanfestival_can*
 	do
 		DLL_LIST="'$file',""$DLL_LIST"
 	done
+	
+	# copy template config and add the DLL_LIST 
+	# do this to display available canfestival plugin list choice in beremiz
 	cat $CF_CONFIG_TEMP > $CF_CONFIG
 	echo "DLL_LIST=[$DLL_LIST]" >> $CF_CONFIG
 	;;
diff -r e297491483ea -r a2c74eca6bf2 debian/canfestival-peak.postrm
--- a/debian/canfestival-peak.postrm	Mon Jul 27 16:35:12 2009 +0200
+++ b/debian/canfestival-peak.postrm	Fri Aug 07 15:59:35 2009 +0200
@@ -1,23 +1,10 @@
 #!/bin/sh
-# postinst script for canfestival
-#
-# see: dh_installdeb(1)
+# postrm script for canfestival
 
 set -e
 
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
 DLL_LIST=
+CF_CONFIG_DIR=/usr/share/CanFestival-3/objdictgen/
 CF_CONFIG=/usr/share/CanFestival-3/objdictgen/canfestival_config.py
 CF_CONFIG_TEMP=/usr/share/CanFestival-3/objdictgen/canfestival_config_ori.py
 
@@ -25,27 +12,26 @@
     configure)
     ;;
 	
-    remove|purge)
-    ldconfig
-    cd /usr/lib
-    cd /usr/lib
-	DLL_LIST=
-	FILES=
-
-	for file in libcanfestival_can*
-	do
-		DLL_LIST="'$file',""$DLL_LIST"
-	done
-
-	cat $CF_CONFIG_TEMP > $CF_CONFIG
-	echo "DLL_LIST=[$DLL_LIST]" >> $CF_CONFIG
+    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    
+    if [ -d $CF_CONFIG_DIR ];then
+	    ldconfig
+	    # Find canfestival driver library in /usr/lib
+	    cd /usr/lib
+		for file in `ls libcanfestival_can* 2>/dev/null`
+		do
+			DLL_LIST="'$file',""$DLL_LIST"
+		done
+		
+		# copy template config and add the DLL_LIST 
+		# do this to display available canfestival plugin list choice in beremiz
+		cat $CF_CONFIG_TEMP > $CF_CONFIG
+		echo "DLL_LIST=[$DLL_LIST]" >> $CF_CONFIG
+	fi
 	;;
     
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
     *)
-        echo "postinst called with unknown argument \`$1'" >&2
+        echo "postrm called with unknown argument \`$1'" >&2
         exit 1
     ;;
 esac
diff -r e297491483ea -r a2c74eca6bf2 debian/canfestival-virtual.postinst
--- a/debian/canfestival-virtual.postinst	Mon Jul 27 16:35:12 2009 +0200
+++ b/debian/canfestival-virtual.postinst	Fri Aug 07 15:59:35 2009 +0200
@@ -5,31 +5,23 @@
 
 set -e
 
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
 DLL_LIST=
 CF_CONFIG=/usr/share/CanFestival-3/objdictgen/canfestival_config.py
 CF_CONFIG_TEMP=/usr/share/CanFestival-3/objdictgen/canfestival_config_ori.py
+
 case "$1" in
     configure)
     ldconfig
-    cd /usr/lib
-    DLL_LIST=
-	FILES=
+    
+	# Find canfestival driver library in /usr/lib
+	cd /usr/lib
 	for file in libcanfestival_can*
 	do
 		DLL_LIST="'$file',""$DLL_LIST"
 	done
+	
+	# copy template config and add the DLL_LIST 
+	# do this to display available canfestival plugin list choice in beremiz
 	cat $CF_CONFIG_TEMP > $CF_CONFIG
 	echo "DLL_LIST=[$DLL_LIST]" >> $CF_CONFIG
 	;;
diff -r e297491483ea -r a2c74eca6bf2 debian/canfestival-virtual.postrm
--- a/debian/canfestival-virtual.postrm	Mon Jul 27 16:35:12 2009 +0200
+++ b/debian/canfestival-virtual.postrm	Fri Aug 07 15:59:35 2009 +0200
@@ -1,23 +1,10 @@
 #!/bin/sh
-# postinst script for canfestival
-#
-# see: dh_installdeb(1)
+# postrm script for canfestival
 
 set -e
 
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
 DLL_LIST=
+CF_CONFIG_DIR=/usr/share/CanFestival-3/objdictgen/
 CF_CONFIG=/usr/share/CanFestival-3/objdictgen/canfestival_config.py
 CF_CONFIG_TEMP=/usr/share/CanFestival-3/objdictgen/canfestival_config_ori.py
 
@@ -25,24 +12,26 @@
     configure)
     ;;
 	
-    remove|purge)
-    ldconfig
-    cd /usr/lib
-	DLL_LIST=
-	FILES=
-	for file in libcanfestival_can*
-	do
-		DLL_LIST="'$file',""$DLL_LIST"
-	done
-	cat $CF_CONFIG_TEMP > $CF_CONFIG
-	echo "DLL_LIST=[$DLL_LIST]" >> $CF_CONFIG
+    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    
+    if [ -d $CF_CONFIG_DIR ];then
+	    ldconfig
+	    # Find canfestival driver library in /usr/lib
+	    cd /usr/lib
+		for file in `ls libcanfestival_can* 2>/dev/null`
+		do
+			DLL_LIST="'$file',""$DLL_LIST"
+		done
+		
+		# copy template config and add the DLL_LIST 
+		# do this to display available canfestival plugin list choice in beremiz
+		cat $CF_CONFIG_TEMP > $CF_CONFIG
+		echo "DLL_LIST=[$DLL_LIST]" >> $CF_CONFIG
+	fi
 	;;
     
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
     *)
-        echo "postinst called with unknown argument \`$1'" >&2
+        echo "postrm called with unknown argument \`$1'" >&2
         exit 1
     ;;
 esac
diff -r e297491483ea -r a2c74eca6bf2 debian/changelog
--- a/debian/changelog	Mon Jul 27 16:35:12 2009 +0200
+++ b/debian/changelog	Fri Aug 07 15:59:35 2009 +0200
@@ -1,4 +1,4 @@
-canfestival (3.1-%DATEVERSION%) unstable; urgency=low
+canfestival (3.0-%DATEVERSION%) unstable; urgency=low
 
   * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
 
diff -r e297491483ea -r a2c74eca6bf2 debian/control-virtual
--- a/debian/control-virtual	Mon Jul 27 16:35:12 2009 +0200
+++ b/debian/control-virtual	Fri Aug 07 15:59:35 2009 +0200
@@ -2,7 +2,7 @@
 Section: devel
 Priority: standard
 Maintainer: lolitech <gregory.trelat@lolitech.fr>
-Build-Depends: debhelper (>= 5), libwxgtk2.8-dev
+Build-Depends: debhelper (>= 5)
 Standards-Version: 3.7.2
 
 Package: canfestival-devel
@@ -31,7 +31,7 @@
 
 Package: canfestival-objdictedit
 Architecture: all
-Depends: python-wxgtk2.8, xpdf, docutils
+Depends: python-wxgtk2.8
 Description: A CanOpen Node Editor
  Objdictedit, the Object Dictionary Editor, is a WxPython based GUI that is used to
  create the C file needed to create a new CanOpen node.
diff -r e297491483ea -r a2c74eca6bf2 examples/CANOpenShell/Makefile.in
--- a/examples/CANOpenShell/Makefile.in	Mon Jul 27 16:35:12 2009 +0200
+++ b/examples/CANOpenShell/Makefile.in	Fri Aug 07 15:59:35 2009 +0200
@@ -86,3 +86,9 @@
 	rm -f CANOpenShellMasterOD.c
 	rm -f CANOpenShellSlaveOD.c
 
+install: $(CANOPENSHELL)
+	mkdir -p $(PREFIX)/bin/
+	cp $< $(PREFIX)/bin/
+	
+uninstall:
+	rm -f $(PREFIX)/bin/$(CANOPENSHELL)
\ No newline at end of file