[med-svn] [SCM] mricron branch, master, updated. upstream/0.20110413.1_dfsg.1-57-g7a09477

[Michael Hanke]

The following commit has been merged in the master branch:
commit 9be36653e299950b401524f9fff3d67e70d4860d
Author: Michael Hanke <michael.hanke at gmail.com>
Date:   Sun Oct 16 11:42:10 2011 +0200

    Rename npm -> mricron-npm #623509

diff --git a/debian/npm.desktop b/debian/mricron-npm.desktop
similarity index 83%
rename from debian/npm.desktop
rename to debian/mricron-npm.desktop
index 610c680..bfab465 100644
--- a/debian/npm.desktop
+++ b/debian/mricron-npm.desktop
@@ -2,8 +2,8 @@
 Encoding=UTF-8
 GenericName=Non-parametric MRI Analysis
 Name=NPM
-Exec=npm
-TryExec=npm
+Exec=mricron-npm
+TryExec=mricron-npm
 Type=Application
 Terminal=false
 Categories=Education;Graphics;Science;MedicalSoftware;GTK;
diff --git a/debian/mricron.install b/debian/mricron.install
index 3e8c301..85e4c1d 100644
--- a/debian/mricron.install
+++ b/debian/mricron.install
@@ -2,6 +2,6 @@ mricron usr/lib/mricron
 debian/wrapper/mricron usr/bin
 dcm2nii/dcm2niigui usr/bin
 dcm2nii/dcm2nii usr/bin
-npm/npm usr/bin
+npm/mricron-npm usr/bin
 mricron.xpm usr/share/pixmaps
 debian/*.desktop usr/share/applications
diff --git a/debian/mricron.links b/debian/mricron.links
index 77e7ad3..e3fd68c 100644
--- a/debian/mricron.links
+++ b/debian/mricron.links
@@ -1,2 +1,2 @@
-/usr/share/man/man1/mricron.1.gz /usr/share/man/man1/npm.1.gz
+/usr/share/man/man1/mricron.1.gz /usr/share/man/man1/mricron-npm.1.gz
 /usr/share/man/man1/mricron.1.gz /usr/share/man/man1/dcm2niigui.1.gz
diff --git a/debian/mricron.menu b/debian/mricron.menu
index 89a24ed..8d5efb1 100644
--- a/debian/mricron.menu
+++ b/debian/mricron.menu
@@ -22,5 +22,5 @@
     title="NPM" \
     longtitle="Non-parametric MRI Analysis" \
     icon="mricron.xpm" \
-    command="/usr/bin/npm" \
+    command="/usr/bin/mricron-npm" \
     hints="MRI,fMRI"
diff --git a/debian/rules b/debian/rules
index 0205c67..7028092 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,8 @@ override_dh_auto_build:
 	lazbuild --build-all --ws=gtk2 mricron.lpi
 	lazbuild --build-all --ws=gtk2 dcm2nii/dcm2niigui.lpi
 	lazbuild --build-all --ws=gtk2 npm/npm.lpi
+	# rename npm to prevent conflict with npm package
+	mv npm/npm npm/mricron-npm
 	# build icon
 	convert iconfinal.ico -resize 32x32 iconfinal.xpm
 	mv iconfinal-0.xpm mricron.xpm
@@ -34,7 +36,7 @@ override_dh_clean:
 	-rm mricron.rc mricron.lrs mricron
 	-rm dcm2nii/dcm2nii
 	-rm dcm2nii/dcm2niigui
-	-rm npm/npm
+	-rm npm/mricron-npm
 	-rm iconfinal-*.xpm mricron.xpm
 	dh_clean
 

-- 
Debian packaging of MRIcron