[apt-proxy-devel] r701 - in branches/1.9.36: apt_proxy debian

[Xavier Lüthi]

Author: xluthi
Date: Fri Dec  4 13:56:20 2009
New Revision: 701

Log:
Import NMUs:

apt-proxy (1.9.36.3+nmu2) unstable; urgency=low

  * Non-maintainer upload.
  * Fix name pattern to accept uppercase characters
    Patch by Folkert van Heusden
    Closes: 503923

 -- Anibal Monsalve Salazar <anibal at debian.org>  Sun, 22 Nov 2009 08:15:59 +1100

apt-proxy (1.9.36.3+nmu1) unstable; urgency=low

  * Non-maintainer upload.
  * Change regexp for translated package description files to accept '_'
    (Closes: #484331).  Patch by Yuri Kozlov <kozlov.y at gmail.com>.

 -- Ben Hutchings <ben at decadent.org.uk>  Sat, 28 Jun 2008 18:31:31 +0000

Modified:
   branches/1.9.36/apt_proxy/cache.py
   branches/1.9.36/debian/changelog

Modified: branches/1.9.36/apt_proxy/cache.py
==============================================================================
--- branches/1.9.36/apt_proxy/cache.py	Fri Dec  4 13:06:29 2009	(r700)
+++ branches/1.9.36/apt_proxy/cache.py	Fri Dec  4 13:56:20 2009	(r701)
@@ -503,7 +503,7 @@
 
     FileType(r"(?:^|/)Packages.gz$", "text/plain", 1, decompressor=clients.GzUncompressClient),
     FileType(r"(?:^|/)Packages.bz2$", "text/plain", 1, decompressor=clients.Bz2UncompressClient),
-    FileType(r"(?:^|/)(?:Packages|Release(?:\.gpg)?|Sources|(?:Contents|Translation)-[a-z0-9]+)"
+    FileType(r"(?:^|/)(?:Packages|Release(?:\.gpg)?|Sources|(?:Contents|Translation)-[A-Za-z0-9_]+)"
                         r"(?:\.(?:gz|bz2))?$",
              "text/plain", 1),
     FileType(r"(?:^|/)(?:Packages|Sources|Contents-[a-z0-9]+)\.diff/Index$",

Modified: branches/1.9.36/debian/changelog
==============================================================================
--- branches/1.9.36/debian/changelog	Fri Dec  4 13:06:29 2009	(r700)
+++ branches/1.9.36/debian/changelog	Fri Dec  4 13:56:20 2009	(r701)
@@ -1,3 +1,20 @@
+apt-proxy (1.9.36.3+nmu2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix name pattern to accept uppercase characters
+    Patch by Folkert van Heusden
+    Closes: 503923
+
+ -- Anibal Monsalve Salazar <anibal at debian.org>  Sun, 22 Nov 2009 08:15:59 +1100
+
+apt-proxy (1.9.36.3+nmu1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Change regexp for translated package description files to accept '_'
+    (Closes: #484331).  Patch by Yuri Kozlov <kozlov.y at gmail.com>.
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Sat, 28 Jun 2008 18:31:31 +0000
+
 apt-proxy (1.9.36.3) unstable; urgency=low
 
   * apt-proxy-import: Do not crash with verbose (-v) or debug (-d) options,