Browse Source

Changes in muttng and quilt config

Emmanuel Bouthenot 16 years ago
parent
commit
bd25ab594c
4 changed files with 68 additions and 15 deletions
  1. 33 3
      .mailfilter
  2. 24 10
      .muttng/conf/mailboxes
  3. 3 0
      .muttng/conf/subscribes
  4. 8 2
      .quiltrc

+ 33 - 3
.mailfilter

@@ -8,6 +8,25 @@ MAILDROP_OLD_REGEXP=1
 
 logfile "/home/manu/Admin/logs/maildrop/maildrop.log"
 
+
+## Listes RMLL 2008
+if (/^To:.*organisation@rmll2008.org.*$/ || /^Cc:.*organisation@rmll2008.org.*$/ || /^X-BeenThere:.*2008@rmll.info.*$/)
+	to  $MAILDIR/.my.ml.rmll.2008
+
+#if (/^List-Id:.*![^ <]+!\.rmll\.info.*$/)
+#	to $MAILDIR/.my.ml.rmll.$MATCH2
+if (/^List-Id:.*2008\.rmll\.info.*$/)
+	to $MAILDIR/.my.ml.rmll.2008
+if (/^List-Id:.*org\.rmll\.info.*$/)
+	to $MAILDIR/.my.ml.rmll.org
+if (/^List-Id:.*themes\.rmll\.info.*$/)
+	to $MAILDIR/.my.ml.rmll.themes
+if (/^List-Id:.*communication\.rmll\.info.*$/)
+	to $MAILDIR/.my.ml.rmll.communication
+if (/^List-Id:.*partenaires\.rmll\.info.*$/)
+	to $MAILDIR/.my.ml.rmll.partenaires
+
+
 ## Debian backports
 if (/^List-Id:.*<backports-users\.lists\.backports\.org>$/)
         to $MAILDIR/.my.ml.debian.backports
@@ -27,6 +46,10 @@ if (/^List-Id: <debian-!.*!\.lists\.debian\.org>.*$/)
 if (/^List-Id: <!.*!\.france\.debian\.net>.*$/)
         to $MAILDIR/.my.ml.debian.france.$MATCH2
 
+### Debian Alioth Projects
+if (/^List-Id: .*<pkg-phototools-devel\.lists\.alioth\.debian\.org>.*$/)
+        to $MAILDIR/.my.soft.debian.pkg.phototools
+
 ### Hurd France Lists
 if (/^List-Id:.*<hurdfr\.hurdfr\.org>$/)
         to $MAILDIR/.my.ml.hurd.hurdfr
@@ -44,7 +67,14 @@ if (/^List-Id:.*<galette-!.*!\.gna\.org>.*$/)
 
 ### Abul Lists
 if (/^List-Id:.*<!.*!\.abul\.org>.*$/)
-        to $MAILDIR/.my.ml.abul.$MATCH2
+{
+	exception {
+		`test -d $MAILDIR/.my.ml.abul.$MATCH2`
+		if( $RETURNCODE == 1 )
+			`$MAILDIRMAKE $MAILDIR/.my.ml.abul.$MATCH2`
+        	to $MAILDIR/.my.ml.abul.$MATCH2
+	}
+}
 
 ### WeeChat Lists
 if (/^List-Id:.*weechat-!.*!\.nongnu\.org.*$/ || /^To:.*weechat-!.*!\.nongnu.org\.*$/)
@@ -74,8 +104,8 @@ if (/^X-Spam-Status: YES/)
     to $MAILDIR/.Spam
 }
 
-if (!/^From:.*/)
-    to $MAILDIR/.Spam
+#if (!/^From:.*/ || /^Subject:.*[??SPAM??].*/)
+#    to $MAILDIR/.Spam
 
 ########### INBOX ###############
 to $MAILDIR/

+ 24 - 10
.muttng/conf/mailboxes

@@ -19,26 +19,27 @@ mailboxes = '+.sys.sympa'
 mailboxes = '+.sys.reports'
 mailboxes = '+.sys.infos'
 
+mailboxes = '+.my.cnam'
 mailboxes = '+.my.misc'
 
+mailboxes = '+.friends.tbs.tiacfooting'
+
 mailboxes = '+.my.soft.weechat.ml.cvs'
 mailboxes = '+.my.soft.weechat.ml.dev'
 
-mailboxes = '+.my.soft.debian.bugs'
-mailboxes = '+.my.soft.debian.misc'
-mailboxes = '+.my.soft.debian.asso'
-mailboxes = '+.my.soft.debian.bts'
-mailboxes = '+.my.soft.debian.pkg.ffproxy'
-mailboxes = '+.my.soft.debian.pkg.kio-apt'
-mailboxes = '+.my.soft.debian.pkg.kwin-style-knifty'
-mailboxes = '+.my.soft.debian.pkg.incron'
-mailboxes = '+.my.soft.debian.pkg.hiawatha'
 mailboxes = '+.my.soft.galette.devel'
 #mailboxes = '+.my.soft.debian.pkg.dudki'
 #mailboxes = '+.my.soft.debian.pkg.konqburn'
 
 #mailboxes = '+.my.soft.kde'
 
+mailboxes = '+.my.ml.rmll.admin'
+mailboxes = '+.my.ml.rmll.2008'
+mailboxes = '+.my.ml.rmll.org'
+mailboxes = '+.my.ml.rmll.themes'
+mailboxes = '+.my.ml.rmll.communication'
+mailboxes = '+.my.ml.rmll.partenaires'
+
 mailboxes = '+.my.ml.asyd.sysadmin'
 mailboxes = '+.my.ml.asyd.shell'
 mailboxes = '+.my.ml.asyd.emacs'
@@ -61,6 +62,8 @@ mailboxes = '+.my.ml.abul.hourtin'
 mailboxes = '+.my.ml.debian.france.asso'
 mailboxes = '+.my.ml.debian.france.sl'
 
+mailboxes = '+.my.soft.debian.pkg.phototools'
+
 mailboxes = '+.my.ml.debian.bugs-rc'
 mailboxes = '+.my.ml.debian.announce'
 mailboxes = '+.my.ml.debian.project'
@@ -81,11 +84,22 @@ mailboxes = '+.my.ml.debian.backports'
 mailboxes = '+.my.ml.debian.hurd'
 mailboxes = '+.my.ml.hurd.hurdfr'
 
+mailboxes = '+.my.soft.debian.bugs'
+mailboxes = '+.my.soft.debian.misc'
+mailboxes = '+.my.soft.debian.asso'
+mailboxes = '+.my.soft.debian.bts'
+mailboxes = '+.my.soft.debian.pkg.incron'
+mailboxes = '+.my.soft.debian.pkg.ffproxy'
+mailboxes = '+.my.soft.debian.pkg.kio-apt'
+mailboxes = '+.my.soft.debian.pkg.kwin-style-knifty'
+mailboxes = '+.my.soft.debian.pkg.pmailq'
+mailboxes = '+.my.soft.debian.pkg.hiawatha'
+mailboxes = '+.my.soft.debian.pkg.weechat'
+
 #mailboxes = '+.computer.fon'
 #mailboxes = '+.computer.shop.ebay'
 #mailboxes = '+.computer.paypal'
 
-mailboxes = '+.friends.tbs.tiacfooting'
 #mailboxes = '+.friends.all.alexis'
 #mailboxes = '+.friends.all.jm'
 #mailboxes = '+.friends.all.ge'

+ 3 - 0
.muttng/conf/subscribes

@@ -11,9 +11,12 @@
 
 subscribe weechat-(dev|cvs)
 subscribe debian-.*@lists\.debian\.org
+subscribe (asso|sl)@france\.debian\.net
 subscribe backports.*@lists\.backports\.org
 subscribe (ca|asso|abonnes|inscrits|tech|debutants|blahblah|annonces|party|devel|web|hourtin)@abul\.org
+subscribe (communication|themes|org|2008)@rmll.info
 subscribe linuxaction
 subscribe hurdfr@hurdfr\.org
 subscribe (shell|emacs|sysadmin)@asyd\.net
 subscribe .*@listes.gulliver.eu.org
+subscribe organisation@rmll2008.org

+ 8 - 2
.quiltrc

@@ -1,6 +1,12 @@
 QUILT_PATCH_OPTS="--unified-reject-files" 
-QUILT_REFRESH_ARGS="-p ab --no-timestamps --no-index" 
-QUILT_DIFF_ARGS="-p ab --no-timestamps --no-index --color=auto" 
+
+if [ "$(quilt --version|sed 's/0.//')" -gt "45" ] ; then
+    QUILT_REFRESH_ARGS="-p ab --no-timestamps --no-index" 
+    QUILT_DIFF_ARGS="-p ab --no-timestamps --no-index --color=auto"
+else
+    QUILT_REFRESH_ARGS="--no-timestamps --no-index" 
+    QUILT_DIFF_ARGS="--no-timestamps --no-index --color=auto"
+fi
 
 QUILT_PATCHES="debian/patches" 
 QUILT_COLORS="diff_hdr=1;32:diff_add=1;34:diff_rem=1;31:diff_hunk=1;33:diff_ctx=35:diff_cctx=33"