diff -Nru simplestreams-0.1.0~bzr341/debian/changelog simplestreams-0.1.0~bzr341/debian/changelog
--- simplestreams-0.1.0~bzr341/debian/changelog	2014-03-26 12:25:03.000000000 -0400
+++ simplestreams-0.1.0~bzr341/debian/changelog	2014-07-16 11:34:42.000000000 -0400
@@ -1,3 +1,10 @@
+simplestreams (0.1.0~bzr341-0ubuntu2) trusty-proposed; urgency=medium
+
+  * debian/patches/1-add-item-filter-to-glancemirror.patch: add
+    filter support, expose in sstream-mirror-glance (LP: #1339842)
+
+ -- Michael McCracken <mike.mccracken@canonical.com>  Fri, 11 Jul 2014 13:01:54 -0700
+
 simplestreams (0.1.0~bzr341-0ubuntu1) trusty; urgency=medium
 
   * New upstream snapshot.
diff -Nru simplestreams-0.1.0~bzr341/debian/patches/1-add-item-filter-to-glancemirror simplestreams-0.1.0~bzr341/debian/patches/1-add-item-filter-to-glancemirror
--- simplestreams-0.1.0~bzr341/debian/patches/1-add-item-filter-to-glancemirror	1969-12-31 19:00:00.000000000 -0500
+++ simplestreams-0.1.0~bzr341/debian/patches/1-add-item-filter-to-glancemirror	2014-07-16 11:57:36.000000000 -0400
@@ -0,0 +1,105 @@
+Description: add filter support, expose in sstream-mirror-glance
+Forwarded: not-needed
+Origin: upstream, http://bazaar.launchpad.net/~smoser/simplestreams/trunk/revision/347
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/simplestreams/+bug/1339842
+Author: Michael McCracken <mike.mccracken@canonical.com>
+=== modified file 'simplestreams/filters.py'
+--- a/simplestreams/filters.py
++++ b/simplestreams/filters.py
+@@ -64,7 +64,12 @@
+
+
+ def filter_item(filters, data, src, pedigree):
+-    data = util.products_exdata(src, pedigree)
++    "Apply filter list to a products entity.  Flatten before doing so."
++    return filter_dict(filters, util.products_exdata(src, pedigree))
++
++
++def filter_dict(filters, data):
++    "Apply filter list to dict. Does not flatten."
+     for f in filters:
+         if not f.matches(data):
+             return False
+--- a/simplestreams/mirrors/glance.py
++++ b/simplestreams/mirrors/glance.py
+@@ -15,6 +15,7 @@
+ #   You should have received a copy of the GNU Affero General Public License
+ #   along with Simplestreams.  If not, see <http://www.gnu.org/licenses/>.
+
++import simplestreams.filters as filters
+ import simplestreams.mirrors as mirrors
+ import simplestreams.util as util
+ import simplestreams.openstack as openstack
+@@ -44,6 +45,17 @@
+                  name_prefix=None):
+         super(GlanceMirror, self).__init__(config=config)
+
++        self.item_filters = self.config.get('item_filters', [])
++        if len(self.item_filters) == 0:
++            self.item_filters = ['ftype~(disk1.img|disk.img)',
++                                 'arch~(x86_64|amd64|i386)']
++        self.item_filters = filters.get_filters(self.item_filters)
++
++        self.index_filters = self.config.get('index_filters', [])
++        if len(self.index_filters) == 0:
++            self.index_filters = ['datatype=image-downloads']
++        self.index_filters = filters.get_filters(self.index_filters)
++
+         self.loaded_content = {}
+         self.store = objectstore
+
+@@ -134,9 +146,7 @@
+         return glance_t
+
+     def filter_item(self, data, src, target, pedigree):
+-        flat = util.products_exdata(src, pedigree, include_top=False)
+-        return (flat.get('ftype') in ('disk1.img', 'disk.img') and
+-                flat.get('arch') in ('x86_64', 'amd64', 'i386'))
++        return filters.filter_item(self.item_filters, data, src, pedigree)
+
+     def insert_item(self, data, src, target, pedigree, contentsource):
+         flat = util.products_exdata(src, pedigree, include_top=False)
+@@ -214,7 +224,7 @@
+             self.gclient.images.delete(data['id'])
+
+     def filter_index_entry(self, data, src, pedigree):
+-        return data.get('datatype') in ("image-downloads", None)
++        return filters.filter_dict(self.index_filters, data)
+
+     def insert_products(self, path, target, content):
+         if not self.store:
+--- a/tools/sstream-mirror-glance
++++ b/tools/sstream-mirror-glance
+@@ -20,6 +20,7 @@
+ # glanceclient) are not python3.
+ #
+ import argparse
++import logging
+ import os.path
+ import sys
+
+@@ -79,6 +80,14 @@
+
+     parser.add_argument('source_mirror')
+     parser.add_argument('path', nargs='?', default="streams/v1/index.sjson")
++    parser.add_argument('--item-filter', action='append', default=[],
++                        dest="item_filters",
++                        help="Filter expression for mirrored items. "
++                        "Multiple filter arguments can be specified"
++                        "and will be combined with logical AND. "
++                        "Expressions are key[!]=literal_string "
++                        "or key[!]~regexp.")
++
+     args = parser.parse_args()
+
+     modify_hook = None
+@@ -87,7 +96,8 @@
+
+     mirror_config = {'max_items': args.max, 'keep_items': args.keep,
+                      'cloud_name': args.cloud_name,
+-                     'modify_hook': modify_hook}
++                     'modify_hook': modify_hook,
++                     'item_filters': args.item_filters}
+
+     def policy(content, path):  # pylint: disable=W0613
+         if args.path.endswith('sjson'):
diff -Nru simplestreams-0.1.0~bzr341/debian/patches/series simplestreams-0.1.0~bzr341/debian/patches/series
--- simplestreams-0.1.0~bzr341/debian/patches/series	1969-12-31 19:00:00.000000000 -0500
+++ simplestreams-0.1.0~bzr341/debian/patches/series	2014-07-16 11:34:42.000000000 -0400
@@ -0,0 +1 @@
+1-add-item-filter-to-glancemirror