← Back to branch summary

~ubuntu-branches/debian/sid/nano/sid

« back to all changes in this revision

Viewing changes to debian/patches/apt_transports.patch

  • Committer: Package Import Robot
  • Author(s): Jordi Mallach
  • Date: 2014-07-16 18:47:53 UTC
  • Revision ID: package-import@ubuntu.com-20140716184753-ykezs0qti8mw9v31
Tags: 2.2.6-3
http://bugs.debian.org/656133
http://bugs.debian.org/662842
http://bugs.debian.org/726956
* The "Gürtel" release.
* Acknowledge 2.2.6-1.1 NMU (-2 was tagged, never uploaded... mysteries).
* Get rid of massively obsolete preinst upgrade code from 2004.
* Remove nano.desktop.
* Remove nano.README.Debian, the information included was now obsolete
  or pointless.
* Canonicalise Vcs URLs.
* Use dpkg's buildflags.mk to enable hardening. Bump dpkg-dev Build-Dep
  to >= 1.16.1~ accordingly (closes: #656133).
* Bump Standards-Version to 3.9.5.
* Add debian/upstream/signing-key.asc with Chris Allegreta's OpenPGP key.
* Move watch file to version 3, use http URL, add pgpsigurlmangle to
  enable verification of tarball signatures and stop calling uupdate.
* Add manpage_escaping.patch to fix some escaping issues in nano.1 and
  rnano.1. Thanks to Bjarni Ingi Gislason (closes: #662842, #726956).
* Add apt_transports.patch to add all currently supported apt methods to
  the debian sources.list regexp.
* Shuffle build-* target deps and add an explicit build-indep target to
  appease Lintian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/apt_transports.patch
 
1
Author: Jordi Mallach <jordi@debian.org>
 
2
Description: Add https, tor and spacewalk to supported transports regex.
 
3
 While not in the base apt package, APT supports additional transports via
 
4
 the optional apt-transport-* packages. Add all current protocols.
 
5
Forwarded: yes
 
6
 
 
7
Index: nano-2.2.6/doc/syntax/debian.nanorc
 
8
===================================================================
 
9
--- nano-2.2.6.orig/doc/syntax/debian.nanorc
 
10
+++ nano-2.2.6/doc/syntax/debian.nanorc
 
11
@@ -4,11 +4,11 @@
 
12
 ##
 
13
 syntax "apt/sources.list" "sources\.list(\.old|~)?$"
 
14
 # component
 
15
-color brightmagenta "^deb(-src)? ((http|file|ftp):/[^ ]+|cdrom:\[[^\]]+\]/|cdrom:\[[-a-zA-Z0-9\._\(\) ]+\]/) [^ ]+ .+$"
 
16
+color brightmagenta "^deb(-src)? ((http(s)?|file|ftp|tor|spacewalk):/[^ ]+|cdrom:\[[^\]]+\]/|cdrom:\[[-a-zA-Z0-9\._\(\) ]+\]/) [^ ]+ .+$"
 
17
 # distribution
 
18
-color brightred "^deb(-src)? ((http|file|ftp):/[^ ]+|cdrom:\[[^\]]+\]/|cdrom:\[[-a-zA-Z0-9\._\(\) ]+\]/) [^ ]+"
 
19
+color brightred "^deb(-src)? ((http(s)?|file|ftp|tor|spacewalk):/[^ ]+|cdrom:\[[^\]]+\]/|cdrom:\[[-a-zA-Z0-9\._\(\) ]+\]/) [^ ]+"
 
20
 # URI
 
21
-color brightgreen "(http|file|ftp):/[^ ]+"
 
22
+color brightgreen "(http(s)?|file|ftp|tor|spacewalk):/[^ ]+"
 
23
 # cdroms
 
24
 # [^\]] does not work...
 
25
 color brightgreen "cdrom:\[[-a-zA-Z0-9\._\(\) ]+\]/"