diff --git a/debian/changelog b/debian/changelog index 23084ea..b199c14 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +apt-cacher-ng (0.7.26-1ubuntu0.1) trusty-proposed; urgency=medium + + * backport appstream support from upstream. LP: #1547431 + + -- Rolf Leggewie Wed, 02 Mar 2016 14:29:37 +0100 + apt-cacher-ng (0.7.26-1) unstable; urgency=medium * New upstream version diff --git a/debian/patches/LP1547431.patch b/debian/patches/LP1547431.patch new file mode 100644 index 0000000..71d0504 --- /dev/null +++ b/debian/patches/LP1547431.patch @@ -0,0 +1,17 @@ +Author: Rolf Leggewie +Subject: Backport upstream c54b88bb28781b13a35 to LTS +Ubuntu-bug: 1547431 + +diff --git a/source/acfg_defaults.cc b/source/acfg_defaults.cc +index b46318f..b91d803 100644 +--- a/source/acfg_defaults.cc ++++ b/source/acfg_defaults.cc +@@ -42,6 +42,8 @@ string vfilepat(INFOLDER + "|packages\\.[a-zA-Z][a-zA-Z]\\.gz|info\\.txt|license\\.tar\\.gz|license\\.zip" //opensuse + "|"ALXPATTERN // Arch Linux + "|metalink\\?repo|.*prestodelta\\.xml\\.gz|repodata/.*\\.(xml|sqlite)"COMPRLIST // CentOS ++ "|Components-.*yml" COMPOPT // DEP-11 aka AppStream" ++ "|icons-[x0-9]+\\.tar" COMPOPT + ")$" // end of only-filename paterns + "|/dists/.*/installer-[^/]+/[^0-9][^/]+/images/.*"); // d-i stuff but not containing a number (year) in the revision directory (like "current", "beta", ...) + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..0deeefa --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +LP1547431.patch