Tags: patch

The attached patch fixe this bug and add the ability to highlight the
file in /etc/apt/sources.list.d/*.list.

"Full history" available on https://gitorious.org/debian-packaging/nano

Hope this help,
Rodolphe
diff --git a/debian/changelog b/debian/changelog
index fef1296..d68c1d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nano (2.2.6-1.1) UNRELEASED; urgency=low
+
+  * Allow tabs in sources.list. Closes: #614817
+  * Highlight files in /etc/apt/sources.list.d.
+  * Bump Standards-Version to 3.9.2.
+
+ -- Rodolphe Pelloux-Prayer <rodol...@damsy.net>  Tue, 05 Jul 2011 22:50:54 +0200
+
 nano (2.2.6-1) unstable; urgency=low
 
   * The "Què vol que li diga? Que vosté és una sinvergüensa?" release.
diff --git a/debian/control b/debian/control
index 88254da..f3ad4de 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Jordi Mallach <jo...@debian.org>
 Uploaders: Steve Langasek <vor...@debian.org>
 Build-Depends: dpkg-dev (>= 1.15.7), debhelper (>= 7), libncurses5-dev, libncursesw5-dev, libslang2-dev
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/nano
 Vcs-Browser: http://svn.debian.org/viewsvn/collab-maint/deb-maint/nano/
 Homepage: http://www.nano-editor.org/
diff --git a/debian/patches/allows-tabs-614817.patch b/debian/patches/allows-tabs-614817.patch
new file mode 100644
index 0000000..eb42fb0
--- /dev/null
+++ b/debian/patches/allows-tabs-614817.patch
@@ -0,0 +1,29 @@
+Description: Allow tabs in sources.list files.
+Author: Rodolphe Pelloux-Prayer <rodol...@damsy.net>
+Bug-Debian: http://bugs.debian.org/614817
+--- a/doc/syntax/debian.nanorc
++++ b/doc/syntax/debian.nanorc
+@@ -4,17 +4,18 @@
+ ##
+ syntax "apt/sources.list" "sources\.list(\.old|~)?$"
+ # component
+-color brightmagenta "^deb(-src)? ((http|file|ftp):/[^ ]+|cdrom:\[[^\]]+\]/|cdrom:\[[-a-zA-Z0-9\._\(\) ]+\]/) [^ ]+ .+$"
++color brightmagenta "^deb(-src)?\s+((http|file|ftp):/\S+|cdrom:\[[^\]]+\]/|cdrom:\[[-a-zA-Z0-9\._\(\) ]+\]/)\s+\S+\s+.+$"
+ # distribution
+-color brightred "^deb(-src)? ((http|file|ftp):/[^ ]+|cdrom:\[[^\]]+\]/|cdrom:\[[-a-zA-Z0-9\._\(\) ]+\]/) [^ ]+"
++color brightred "^deb(-src)?\s+((http|file|ftp):/\S+|cdrom:\[[^\]]+\]/|cdrom:\[[-a-zA-Z0-9\._\(\) ]+\]/)\s+\S+"
+ # URI
+-color brightgreen "(http|file|ftp):/[^ ]+"
++color brightgreen "(http|file|ftp)://\S+"
+ # cdroms
+ # [^\]] does not work...
+ color brightgreen "cdrom:\[[-a-zA-Z0-9\._\(\) ]+\]/"
+ # deb / deb-src
+-color yellow "^deb"
+-color yellow "^deb-src"
++color yellow "^deb(-src)?"
+ # comments
+ color brightblue "#.*"
+ 
++## Trailing whitespace
++color ,green "[[:space:]]+$"
diff --git a/debian/patches/highlight-sources-list.patch b/debian/patches/highlight-sources-list.patch
new file mode 100644
index 0000000..761db0b
--- /dev/null
+++ b/debian/patches/highlight-sources-list.patch
@@ -0,0 +1,14 @@
+Description: Highlight list files in /etc/apt/sources.list.d/
+Author: Rodolphe Pelloux-Prayer <rodol...@damsy.net>
+
+--- a/doc/syntax/debian.nanorc
++++ b/doc/syntax/debian.nanorc
+@@ -2,7 +2,7 @@
+ ## Adapted from http://milianw.de/blog/Syntax-Highlighting-in-Nano
+ ## (m...@milianw.de).
+ ##
+-syntax "apt/sources.list" "sources\.list(\.old|~)?$"
++syntax "apt/sources.list" "sources\.list(\.old|~)?$" "apt/sources\.list\.d/.*\.list"
+ # component
+ color brightmagenta "^deb(-src)?\s+((http|file|ftp):/\S+|cdrom:\[[^\]]+\]/|cdrom:\[[-a-zA-Z0-9\._\(\) ]+\]/)\s+\S+\s+.+$"
+ # distribution
diff --git a/debian/patches/series b/debian/patches/series
index c447b9e..5395b11 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 auto.patch
+allows-tabs-614817.patch
+highlight-sources-list.patch

Reply via email to