Improve mc.menu: add git-import-dsc entry, and drop clashing tex and compression entries.

2 files changed, 84 insertions, 66 deletions

diff --git a/mc/mc.menu b/mc/mc.menu
index bd2d8a7..92ebd50 100644
--- a/mc/mc.menu
+++ b/mc/mc.menu
@@ -184,11 +184,6 @@ R       Copy files to remote host (no error checking)
         read Dir
         rcp -pr %u "${Host}:$Dir"
 
-= f \.tex$ & t r
-+ f \.tex$ & t r & ! t t
-t       Run latex on file and show it with xdvi
-        latex %f && xdvi `basename %f .tex`.dvi
-
 =+ f ^part | f ^Part | f uue & t r
 + t t
 U       Uudecode marked news articles (needs work)
@@ -306,67 +301,17 @@ Z       Extract compressed tar files to subdirectories
 	  mkdir "$D"; (cd "$D" && "$1" "$2" "../$i" | tar xvf -)
         done
 
-+ f \.gz$ | f \.tgz$ | f \.tpz$ | f \.Z$ | f \.z$ | f \.bz2$ & t r & ! t t
-c       Convert gz<->bz2, tar.gz<->tar.bz2 & tgz->tar.bz2
-	unset D
-	unset EXT
-	case %f in
-	    *.tgz)	EXT=tgz;;
-	    *.tpz)	EXT=tpz;;
-	    *.Z)	EXT=Z;;
-	    *.z)	EXT=z;;
-	    *.gz)	EXT=gz;;
-	    *.bz2)	EXT=bz2;;
-	esac
-        case $EXT in
-	  tgz|tpz)	D="`basename %f .$EXT`.tar";;
-	  gz|Z|z)	D="`basename %f .$EXT`";;
-	  bz2)		D="`basename %f .bz2`";;
-        esac
-        if [ "$EXT" = "bz2" ]; then
-	    bunzip2 -v %f ; gzip -f9 -v "$D"
-	else
-	    gunzip -v %f ; bzip2 -v "$D"
-	fi
-
-+ t t
-C       Convert gz<->bz2, tar.gz<->tar.bz2 & tgz->tar.bz2
-	set %t
-	while [ -n "$1" ]
-        do
-	  unset D
-	  unset EXT
-	  case "$1" in
-	    *.tgz)	EXT=tgz;;
-	    *.tpz)	EXT=tpz;;
-	    *.Z)	EXT=Z;;
-	    *.z)	EXT=z;;
-	    *.gz)	EXT=gz;;
-	    *.bz2)	EXT=bz2;;
-	  esac
-	  case $EXT in
-	      tgz)    D="`basename $1 .tgz`.tar";;
-              tpz)    D="`basename $1 .tpz`.tar";;
-	      gz|Z|z) D="`basename $1 .$EXT`";;
-	      bz2)    D="`basename $1 .bz2`";;
-	  esac
-	  if [ "$EXT" = "bz2" ]; then
-	    bunzip2 -v "$1"
-	    gzip -f9 -v "$D"
-	  else
-	    gunzip -v "$1"
-	    bzip2 -v "$D"
-	  fi
-	  shift
-        done
-
 + x /usr/bin/open | x /usr/local/bin/open & x /bin/sh
 o       Open next a free console
         open -s -- sh
 
-+ F \.tar\.gz$ | F \.tar\.bz2$ & ! T T
++ F \.tar\.gz$ | + F \.tgz$ | F \.tar\.bz2$ & ! T T
 t       git-import-orig current file in opposite dir
 	git-import-orig --pristine-tar --sign-tags %D/%F
 
++ F \.dsc$ & ! T T
+t       git-import-dsc current file in opposite dir
+	git-import-dsc --pristine-tar --sign-tags %D/%F
+
 c       Create unofficial changelog entry
-	dch -D jonas -l ~0jones --force-distribution "Unofficial build based on Debian Sid packaging."
+	dch -D jonas -l ~0jones --force-distribution "Local build based on Debian Sid packaging."
diff --git a/mc/mc.menu.diff b/mc/mc.menu.diff
index 047bf13..5460f98 100644
--- a/mc/mc.menu.diff
+++ b/mc/mc.menu.diff
@@ -1,13 +1,86 @@
---- mc.menu.orig	2012-08-05 14:41:44.000000000 +0200
-+++ mc.menu	2012-10-03 17:27:34.000000000 +0200
-@@ -363,3 +363,10 @@
+--- mc.menu.orig	2012-05-06 06:59:58.000000000 +0200
++++ mc.menu	2012-05-06 14:36:38.000000000 +0200
+@@ -184,11 +184,6 @@
+         read Dir
+         rcp -pr %u "${Host}:$Dir"
+ 
+-= f \.tex$ & t r
+-+ f \.tex$ & t r & ! t t
+-t       Run latex on file and show it with xdvi
+-        latex %f && xdvi `basename %f .tex`.dvi
+-
+ =+ f ^part | f ^Part | f uue & t r
+ + t t
+ U       Uudecode marked news articles (needs work)
+@@ -306,60 +301,17 @@
+ 	  mkdir "$D"; (cd "$D" && "$1" "$2" "../$i" | tar xvf -)
+         done
+ 
+-+ f \.gz$ | f \.tgz$ | f \.tpz$ | f \.Z$ | f \.z$ | f \.bz2$ & t r & ! t t
+-c       Convert gz<->bz2, tar.gz<->tar.bz2 & tgz->tar.bz2
+-	unset D
+-	unset EXT
+-	case %f in
+-	    *.tgz)	EXT=tgz;;
+-	    *.tpz)	EXT=tpz;;
+-	    *.Z)	EXT=Z;;
+-	    *.z)	EXT=z;;
+-	    *.gz)	EXT=gz;;
+-	    *.bz2)	EXT=bz2;;
+-	esac
+-        case $EXT in
+-	  tgz|tpz)	D="`basename %f .$EXT`.tar";;
+-	  gz|Z|z)	D="`basename %f .$EXT`";;
+-	  bz2)		D="`basename %f .bz2`";;
+-        esac
+-        if [ "$EXT" = "bz2" ]; then
+-	    bunzip2 -v %f ; gzip -f9 -v "$D"
+-	else
+-	    gunzip -v %f ; bzip2 -v "$D"
+-	fi
+-
+-+ t t
+-C       Convert gz<->bz2, tar.gz<->tar.bz2 & tgz->tar.bz2
+-	set %t
+-	while [ -n "$1" ]
+-        do
+-	  unset D
+-	  unset EXT
+-	  case "$1" in
+-	    *.tgz)	EXT=tgz;;
+-	    *.tpz)	EXT=tpz;;
+-	    *.Z)	EXT=Z;;
+-	    *.z)	EXT=z;;
+-	    *.gz)	EXT=gz;;
+-	    *.bz2)	EXT=bz2;;
+-	  esac
+-	  case $EXT in
+-	      tgz)    D="`basename $1 .tgz`.tar";;
+-              tpz)    D="`basename $1 .tpz`.tar";;
+-	      gz|Z|z) D="`basename $1 .$EXT`";;
+-	      bz2)    D="`basename $1 .bz2`";;
+-	  esac
+-	  if [ "$EXT" = "bz2" ]; then
+-	    bunzip2 -v "$1"
+-	    gzip -f9 -v "$D"
+-	  else
+-	    gunzip -v "$1"
+-	    bzip2 -v "$D"
+-	  fi
+-	  shift
+-        done
+-
  + x /usr/bin/open | x /usr/local/bin/open & x /bin/sh
  o       Open next a free console
          open -s -- sh
 +
-++ F \.tar\.gz$ | F \.tar\.bz2$ & ! T T
+++ F \.tar\.gz$ | + F \.tgz$ | F \.tar\.bz2$ & ! T T
 +t       git-import-orig current file in opposite dir
 +	git-import-orig --pristine-tar --sign-tags %D/%F
 +
+++ F \.dsc$ & ! T T
++t       git-import-dsc current file in opposite dir
++	git-import-dsc --pristine-tar --sign-tags %D/%F
++
 +c       Create unofficial changelog entry
-+	dch -D jonas -l ~0jones --force-distribution "Unofficial build based on Debian Sid packaging."
++	dch -D jonas -l ~0jones --force-distribution "Local build based on Debian Sid packaging."