diff -u apache2-2.2.6/debian/control apache2-2.2.6/debian/control --- apache2-2.2.6/debian/control +++ apache2-2.2.6/debian/control @@ -1,9 +1,10 @@ Source: apache2 Section: web Priority: optional -Maintainer: Debian Apache Maintainers +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Debian Apache Maintainers Uploaders: Tollef Fog Heen , Thom May , Fabio M. Di Nitto , Adam Conrad , Peter Samuelson , Stefan Fritsch -Build-Depends: debhelper (>=4.1.16), dpatch, lsb-release, libaprutil1-dev, libapr1-dev (>= 1.2.7-6), openssl, libpcre3-dev, libtool, mawk, zlib1g-dev, libssl-dev +Build-Depends: debhelper (>=4.1.16), dpatch, lsb-release, libaprutil1-dev, libapr1-dev (>= 1.2.7-6), openssl, libpcre3-dev, libtool, mawk, zlib1g-dev, libssl-dev, sharutils Standards-Version: 3.7.2.0 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-apache XS-Vcs-svn: svn://svn.debian.org/pkg-apache diff -u apache2-2.2.6/debian/rules apache2-2.2.6/debian/rules --- apache2-2.2.6/debian/rules +++ apache2-2.2.6/debian/rules @@ -176,6 +176,10 @@ mv debian/tmp/usr/sbin/apachectl debian/tmp/usr/sbin/apache2ctl mv debian/tmp/usr/share/man/man8/apachectl.8 debian/tmp/usr/share/man/man8/apache2ctl.8 mv debian/tmp/usr/share/man/man8/suexec.8 debian/tmp/usr/share/man/man8/suexec2.8 + mkdir -p debian/tmp/usr/share/apache2/icons/ + for i in `ls debian/icons/ | cut -d. -f1,2`; do \ + uudecode -o debian/tmp/usr/share/apache2/icons/$$i debian/icons/$$i".uue"; \ + done dh_install --list-missing --sourcedir=debian/tmp # --sourcedir=$(REALCURDIR)/debian/apache2.2-common diff -u apache2-2.2.6/debian/changelog apache2-2.2.6/debian/changelog --- apache2-2.2.6/debian/changelog +++ apache2-2.2.6/debian/changelog @@ -1,3 +1,11 @@ +apache2 (2.2.6-2ubuntu1) hardy; urgency=low + + * Added icons for OpenDocuments by default on mime.conf (Closes: LP: #130836) + * Icons added to the package in uuencode format + * Added sharutils to Build-Depends on debian/control for uuencode + + -- Nicolas Valcárcel Scerpella (aka nxvl) Wed, 24 Oct 2007 18:56:31 -0500 + apache2 (2.2.6-2) unstable; urgency=low * Avoid calling apr_pollset_poll() and accept_func() when the listening @@ -470,7 +478,7 @@ vs requests-with-bodies bug, as occurs with POST and SVN (Ubuntu #14991) -- Adam Conrad Tue, 4 Oct 2005 11:53:01 +1000 - + apache2 (2.0.54-5ubuntu1) breezy; urgency=low * Resynchronise with Debian, bringing in several security patches. diff -u apache2-2.2.6/debian/config-dir/mods-available/autoindex.conf apache2-2.2.6/debian/config-dir/mods-available/autoindex.conf --- apache2-2.2.6/debian/config-dir/mods-available/autoindex.conf +++ apache2-2.2.6/debian/config-dir/mods-available/autoindex.conf @@ -43,7 +43,27 @@ AddIcon /icons/folder.gif ^^DIRECTORY^^ AddIcon /icons/blank.gif ^^BLANKICON^^ -# +# Default icons for OpenDocument format +AddIcon /icons/odf6odt-20x22.png .odt +AddIcon /icons/odf6ods-20x22.png .ods +AddIcon /icons/odf6odp-20x22.png .odp +AddIcon /icons/odf6odg-20x22.png .odg +AddIcon /icons/odf6odc-20x22.png .odc +AddIcon /icons/odf6odf-20x22.png .odf +AddIcon /icons/odf6odb-20x22.png .odb +AddIcon /icons/odf6odi-20x22.png .odi +AddIcon /icons/odf6odm-20x22.png .odm + +AddIcon /icons/odf6ott-20x22.png .ott +AddIcon /icons/odf6ots-20x22.png .ots +AddIcon /icons/odf6otp-20x22.png .otp +AddIcon /icons/odf6otg-20x22.png .otg +AddIcon /icons/odf6otc-20x22.png .otc +AddIcon /icons/odf6otf-20x22.png .otf +AddIcon /icons/odf6oti-20x22.png .oti +AddIcon /icons/odf6oth-20x22.png .oth + + # DefaultIcon is which icon to show for files which do not have an icon # explicitly set. # diff -u apache2-2.2.6/debian/copyright apache2-2.2.6/debian/copyright --- apache2-2.2.6/debian/copyright +++ apache2-2.2.6/debian/copyright @@ -689,0 +690,7 @@ + +OpenDocument icons: +------------------- + +These icons are trademarks of Pete Harlow. + +Permission to use and/or modify these images is granted for the identification and promotion of the OpenDocument Format (ISO 26300 and any later version published by OASIS or ISO) provided you acknowledge me, Pete Harlow, if someone asks. only in patch2: unchanged: --- apache2-2.2.6.orig/debian/icons/odf6odb-20x22.png.uue +++ apache2-2.2.6/debian/icons/odf6odb-20x22.png.uue @@ -0,0 +1,26 @@ +begin-base64 644 odf6odb-20x22.png.uue +iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAMAAAD3n0w0AAACVVBMVEXZ2dkm +JiYnJycoJycnKCgoKCgpKSkzMzMzM5lcXKxdXK1dXa1eXq6ZmZmampqcm5uf +n5+ioaKhoqKmpqWnp6fOztzOz9zR0N7R0d3R0d/S0eDS0uDT0+DT1ODV1eIA +AADX2OTY2OTa2trb2tvb29vc29zb3Nvc3Nvc3Nzc3dzd3dzd3d3d3t7e3t3e +3t7e397e39/f39/e3ujg39/f4N/g4ODf3+ng4OHh4ODh4OHh4eDh4eHh4eLi +4eHh4uLi4uHi4uLj4uLj4uPi4+Lj4+Pj4+Tk4+Pk4+Tj5OTk5OTk5OXl5OTk +5eTk5eXl5eXl5ebm5eXm5ebl5uXl5ubm5ubm5ufn5ufm5+bm5+fn5+fn5+jm +5vHo5+fo5+jn6Ojo6Ofo6Ojo5/Hp6Ono6enp6ejp6enp6erq6enq6erp6unp +6urq6unq6urq6uvr6uvq6+vr6+vr6+zs6+vs6+zr7Ovr7Ozs7Ozs7O3t7Ozt +7O3s7e3t7e3u7e3t7u3t7u7u7u3u7u7u7u/v7u/v7+7v7+/v7/Dw7/Dv8O/v +8PDw8PDx8PDx8PHw8fDw8fHx8fDx8fHx8fLx8vHy8vHy8vLy8vPz8vLz8vPy +8/Ly8/Pz8/Lz8/Pz8/T08/Tz9PP09PP09PT19PT19PX09fT09fX19fX19fb2 +9fX29fb19vb29vb29vf39vf39/f49/j3+Pf3+Pj4+Pj4+Pn5+fn5+fr6+fn6 ++fr6+vr7+vr7+vv6+/v7+/v8+/v8/Pz9/Pz8/fz9/fz9/f3+/f3+/f7+/v7+ +/v///v/////2MLzaAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZ +cwAACxMAAAsTAQCanBgAAAFOSURBVBjTY2BHBgxQwH7s2OEDibu2bd6whn0Z +TJT96GFFHg5uuQ1rlrPPnwUVZT+kwAECMksWsM+Y1AMRZd/DwyG3cY0014LZ +7BO7OhrBouzRIHUrl3CYTZZnB0OQ4BZujtXLF0tw9vfJQwBIcIMsh9QCcQ7R +/pbmal4gAAuuWSnJycEp1tnaWF1eABNcsnj2LKN+ETaQTlahBIjgwnlTJ/e1 +swlXFeamCbJEQgRnTe7vbGuQZwWpZJb3gwhO7O1saaiWL8hOjYsMkfeECPa3 +N9VVFcqnJ8RG+vvJu0AEW5prygpy5VNiQgK83ORtIIIN1cUFOanykSF+nm4O +8hYQwarSgvTkOPlAH3cXe2t5Q4hgUU5qQlQok4CHg50VP6MuRBAoFhkSJMAE +chIjnyZEMCU2ItDP1cXB2tRQT1tdBSLIzosCwEHHwCCPBhgYAAu7YJl7iNbr +AAAAAElFTkSuQmCC +==== only in patch2: unchanged: --- apache2-2.2.6.orig/debian/icons/odf6odc-20x22.png.uue +++ apache2-2.2.6/debian/icons/odf6odc-20x22.png.uue @@ -0,0 +1,25 @@ +begin-base64 644 odf6odc-20x22.png.uue +iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAMAAAD3n0w0AAACLlBMVEXZ2dkz +MzMzM5lcXKxdXK1dXa1eXq6ZmZnOztzOz9zR0N7R0d3R0d/S0eDS0uDT0+DT +1ODV1eIAAADX2OTY2OTa2trb2tvb29vc29zb3Nvc3Nvc3Nzc3dzd3dzd3d3d +3t7e3t3e3t7e397e39/f39/e3ujg39/f4N/g4ODf3+ng4OHh4ODh4OHh4eDh +4eHh4eLi4eHh4uLi4uHi4uLj4uLj4uPi4+Lj4+Pj4+Tk4+Pk4+Tj5OTk5OTk +5OXl5OTk5eTk5eXl5eXl5ebm5eXm5ebl5uXl5ubm5ubm5ufn5ufm5+bm5+fn +5+fn5+jm5vHo5+fo5+jn6Ojo6Ofo6Ojo5/Hp6Ono6enp6ejp6enp6erq6enq +6erp6unp6urq6unq6urq6uvr6uvq6+vr6+vr6+zs6+vs6+zr7Ovr7Ozs7Ozs +7O3t7Ozt7O3s7e3t7e3u7e3t7u3t7u7u7u3u7u7u7u/v7u/v7+7v7+/v7/Dw +7/Dv8O/v8PDw8PDx8PDx8PHw8fDw8fHx8fDx8fHx8fLx8vHy8vHy8vLy8vPz +8vLz8vPy8/Ly8/Pz8/Lz8/Pz8/T08/Tz9PP09PP09PT19PT19PX09fT09fX1 +9fX19fb29fX29fb19vb29vb29vf39vf39/f49/j3+Pf3+Pj4+Pj4+Pn5+fn5 ++fr6+fn6+fr6+vr7+vr7+vv6+/v7+/v8+/v8/Pz9/Pz8/fz9/fz9/f3+/f3+ +/f7+/v7+/v///v////9yFadVAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgA +AAAJcEhZcwAACxMAAAsTAQCanBgAAAFGSURBVBjTY2BEBgxQwLhz57bNIWtX +Lls8n3EmTJRxxzYRNiZWwcXzZzFO6oWKMm4VZgIB/umTGbtb6yGijOvZmASX +zOdjmdzH2FJbXQIWZfQDqZsznUmzTYgRDEGCy1mZ5s2axs3c1CgEASDBxQJM +vJO5mDiaysvy2IEALDh/Dg8zEzNnTUVJXlYyTHD6tL5e1aaa8qK8zKTosGCI +4JSJHW2NVSVFuSkJkaGBPhDBXqGmmsrivMxkodhgf3dHiGCLUE05SCxOKNDH +XcgGItgkVFqYmxIfFSzk4+QoZA4RLBfKz0xOiBHyF3IWshTShwgWC6UlxwsF +CwG1ChkLaUMEc4WShcKEPIXshcyF9IRUIIKpQhHBvh4uttbGhrpqSgoQwXgh +ZCADEQwP8HZxtDA31tNQUZSTEocIMrKjAHDQMTAIoQEGBgAAx1K+64izZQAA +AABJRU5ErkJggg== +==== only in patch2: unchanged: --- apache2-2.2.6.orig/debian/icons/odf6odf-20x22.png.uue +++ apache2-2.2.6/debian/icons/odf6odf-20x22.png.uue @@ -0,0 +1,26 @@ +begin-base64 644 odf6odf-20x22.png.uue +iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAMAAAD3n0w0AAACWFBMVEXZ2dkm +JiYnJycoKCgzMzMzM5lcXKxdXK1dXa1eXq6ZmZmen5+goKGgoaChoaGioaGj +oqOjo6OlpKSkpaWlpaSmpqbOztzOz9zR0N7R0d3R0d/S0eDS0uDT0+DT1ODV +1eIAAADX2OTY2OTa2trb2tvb29vc29zb3Nvc3Nvc3Nzc3dzd3dzd3d3d3t7e +3t3e3t7e397e39/f39/e3ujg39/f4N/g4ODf3+ng4OHh4ODh4OHh4eDh4eHh +4eLi4eHh4uLi4uHi4uLj4uLj4uPi4+Lj4+Pj4+Tk4+Pk4+Tj5OTk5OTk5OXl +5OTk5eTk5eXl5eXl5ebm5eXm5ebl5uXl5ubm5ubm5ufn5ufm5+bm5+fn5+fn +5+jm5vHo5+fo5+jn6Ojo6Ofo6Ojo5/Hp6Ono6enp6ejp6enp6erq6enq6erp +6unp6urq6unq6urq6uvr6uvq6+vr6+vr6+zs6+vs6+zr7Ovr7Ozs7Ozs7O3t +7Ozt7O3s7e3t7e3u7e3t7u3t7u7u7u3u7u7u7u/v7u/v7+7v7+/v7/Dw7/Dv +8O/v8PDw8PDx8PDx8PHw8fDw8fHx8fDx8fHx8fLx8vHy8vHy8vLy8vPz8vLz +8vPy8/Ly8/Pz8/Lz8/Pz8/T08/Tz9PP09PP09PT19PT19PX09fT09fX19fX1 +9fb29fX29fb19vb29vb29vf39vf39/f49/j3+Pf3+Pj4+Pj4+Pn5+fn5+fr6 ++fn6+fr6+vr7+vr7+vv6+/v7+/v8+/v8/Pz9/Pz8/fz9/fz9/f3+/f3+/f7+ +/v7+/v///v/////zGJjLAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJ +cEhZcwAACxMAAAsTAQCanBgAAAFLSURBVBjTY2BBBgxQwHL8+JGDSbu3b9m4 +lmU5TJTl2BElTlYO+Y1rV7AsmA0VZTmsyAoCsksXssyc3AsRZdnLySq/aa0M ++8I5LJO6O5vAoiwxIHWrlrKaT1FgAUOQ4FYO1jUrlkiyTehXgACQ4EY5VumF +EqxiE1pbariAACy4dpUUGyubeFdbU01FIUxw6ZI5s40ndLU21JQXZKYkQgQX +zZ82pb8DYlxyfBREcPaUCV3tjcyihbnCzLGh/hDBSX1drY01oswiafFRof5e +EMEJHc311UW5QsyCUQH+Hq4QwdaW2vLCvKxUQSZ+b3dnW4hgY01JYW5aoiAT +n5e7o50lRLC6rDAjJV6AidfD1cHGzAgiWAxUFh3GxOPpyM1oYqAHEQSKRYUG +Q9ypr6MFEUyNiwzyd3N1BGrV19FQhQiycKEAcNAxMCigAQYGAJCUYbIIDCae +AAAAAElFTkSuQmCC +==== only in patch2: unchanged: --- apache2-2.2.6.orig/debian/icons/odf6odg-20x22.png.uue +++ apache2-2.2.6/debian/icons/odf6odg-20x22.png.uue @@ -0,0 +1,26 @@ +begin-base64 644 odf6odg-20x22.png.uue +iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAMAAAD3n0w0AAACbVBMVEXZ2dkq +KiorKiorKysrKywsLCwsLC0tLS0zMzMzM5lcXKxdXK1dXa1eXq6ZmZmam5qd +nZ2fn6Cgn5+hoaGioqKio6Kio6Ojo6OkpKSkpaWlpaWmpqampqfOztzOz9zR +0N7R0d3R0d/S0eDS0uDT0+DT1ODV1eIAAADX2OTY2OTa2trb2tvb29vc29zb +3Nvc3Nvc3Nzc3dzd3dzd3d3d3t7e3t3e3t7e397e39/f39/e3ujg39/f4N/g +4ODf3+ng4OHh4ODh4OHh4eDh4eHh4eLi4eHh4uLi4uHi4uLj4uLj4uPi4+Lj +4+Pj4+Tk4+Pk4+Tj5OTk5OTk5OXl5OTk5eTk5eXl5eXl5ebm5eXm5ebl5uXl +5ubm5ubm5ufn5ufm5+bm5+fn5+fn5+jm5vHo5+fo5+jn6Ojo6Ofo6Ojo5/Hp +6Ono6enp6ejp6enp6erq6enq6erp6unp6urq6unq6urq6uvr6uvq6+vr6+vr +6+zs6+vs6+zr7Ovr7Ozs7Ozs7O3t7Ozt7O3s7e3t7e3u7e3t7u3t7u7u7u3u +7u7u7u/v7u/v7+7v7+/v7/Dw7/Dv8O/v8PDw8PDx8PDx8PHw8fDw8fHx8fDx +8fHx8fLx8vHy8vHy8vLy8vPz8vLz8vPy8/Ly8/Pz8/Lz8/Pz8/T08/Tz9PP0 +9PP09PT19PT19PX09fT09fX19fX19fb29fX29fb19vb29vb29vf39vf39/f4 +9/j3+Pf3+Pj4+Pj4+Pn5+fn5+fr6+fn6+fr6+vr7+vr7+vv6+/v7+/v8+/v8 +/Pz9/Pz8/fz9/fz9/f3+/f3+/f7+/v7+/v///v////9hYXL5AAAAAXRSTlMA +QObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCanBgAAAFPSURB +VBjTY+BABgxQwHHu3OkTmYf27d6xhWMdTJTj7GlNXk4etR1b1nMsXwQV5Til +wQkCKmtWcCyYNQUiynGEl1Nt5xZl7hWLOWZOmtAJFuVIBqnbuIbTbrY6BxiC +BPfwcG5ev1qBa/o0dQgACe5Q5VRaIc8pO72nu5kPCMCCWzYqcnFyyU2U6Wyu +r4AJrlm9eJHV9InS7FJ15QXZGRDBlcvmzp7W38kuyV6al5WWCBFcNHv6xL4O +KfYKVrGMlJgwiODMqRN7OprZJYpFWBNjwgIhgtP7u9qaJFjzM1JZBcP8fSCC +Pd0tdRVsojkpMUIsfl4uEMGO5uoKcdYMkFZmAVcHiGBTbUU+q3BcZIi/jwCz +rSVEsKokV5g1NjIowMPNiYnfFCJYkpvBqg4DjIYQwZzUhMgwXx8PZ1tLM2N9 +HYggBx8KAAcdA4M6GmBgAABuC2ZqLPWjjgAAAABJRU5ErkJggg== +==== only in patch2: unchanged: --- apache2-2.2.6.orig/debian/icons/odf6odi-20x22.png.uue +++ apache2-2.2.6/debian/icons/odf6odi-20x22.png.uue @@ -0,0 +1,26 @@ +begin-base64 644 odf6odi-20x22.png.uue +iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAMAAAD3n0w0AAACbVBMVEXZ2dkr +KyssLCwsLC0tLS0zMzMzM5lcXKxdXK1dXa1eXq6ZmZm4uLi5uLi7u7u7u7y8 +u7u8vLy9vb2+vb2+vb69vr6+vr6/vr6+v77AwMDAwMHBwMHAwcHOztzOz9zR +0N7R0d3R0d/S0eDS0uDT0+DT1ODV1eIAAADX2OTY2OTa2trb2tvb29vc29zb +3Nvc3Nvc3Nzc3dzd3dzd3d3d3t7e3t3e3t7e397e39/f39/e3ujg39/f4N/g +4ODf3+ng4OHh4ODh4OHh4eDh4eHh4eLi4eHh4uLi4uHi4uLj4uLj4uPi4+Lj +4+Pj4+Tk4+Pk4+Tj5OTk5OTk5OXl5OTk5eTk5eXl5eXl5ebm5eXm5ebl5uXl +5ubm5ubm5ufn5ufm5+bm5+fn5+fn5+jm5vHo5+fo5+jn6Ojo6Ofo6Ojo5/Hp +6Ono6enp6ejp6enp6erq6enq6erp6unp6urq6unq6urq6uvr6uvq6+vr6+vr +6+zs6+vs6+zr7Ovr7Ozs7Ozs7O3t7Ozt7O3s7e3t7e3u7e3t7u3t7u7u7u3u +7u7u7u/v7u/v7+7v7+/v7/Dw7/Dv8O/v8PDw8PDx8PDx8PHw8fDw8fHx8fDx +8fHx8fLx8vHy8vHy8vLy8vPz8vLz8vPy8/Ly8/Pz8/Lz8/Pz8/T08/Tz9PP0 +9PP09PT19PT19PX09fT09fX19fX19fb29fX29fb19vb29vb29vf39vf39/f4 +9/j3+Pf3+Pj4+Pj4+Pn5+fn5+fr6+fn6+fr6+vr7+vr7+vv6+/v7+/v8+/v8 +/Pz9/Pz8/fz9/fz9/f3+/f3+/f7+/v7+/v///v////8eeoEKAAAAAXRSTlMA +QObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCanBgAAAFKSURB +VBjTY2BFBgxQwHru3OkTmYf27d6xhXUdTJT17GlNLjZOtR1b1rMuXwQVZT2l +wQYCKmtWsC6YNQUiynqEi01t5xZljhWLWWdOmtAJFmVNBqnbuIbNbrY6KxiC +BPdwsm1ev1qBffo0dQgACe5QZVNaIc8mO72nu5kbCMCCWzYqsrOxy03s7Wyu +r4AJrlm9eJHV9Ik97c115QXZGRDBlcvmzp7W39neVFmal5WWCBFcNHv6xL6O +5rqKkqKMlJgwiODMqRN7QGLFuaJMgmGBEMHp/V1tTVJM4hkiTPxM/j4QwZ7u +ljpJZgkmYSaBIHUvF4hgR7M0C5NYhhATX6AfI68DRLBJhkU8Oy0uMsTfx52H +0RIiWAVUlhQbGRTg4eZkrW4KESxRRwaGEMGc1ITIMF8fD2dbSzNjfR2IICs3 +CgAHHQODOhpgYAAAhh9mExNPmYgAAAAASUVORK5CYII= +==== only in patch2: unchanged: --- apache2-2.2.6.orig/debian/icons/odf6odm-20x22.png.uue +++ apache2-2.2.6/debian/icons/odf6odm-20x22.png.uue @@ -0,0 +1,26 @@ +begin-base64 644 odf6odm-20x22.png.uue +iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAMAAAD3n0w0AAACW1BMVEXZ2dkt +LS0uLi4uLy8vLy8zMzMzM5lcXKxdXK1dXa1eXq6ZmZmdnZ2fnp6gn6CgoKCh +oaGioqGioqOjoqOkpKSkpaWmpqbOztzOz9zR0N7R0d3R0d/S0eDS0uDT0+DT +1ODV1eIAAADX2OTY2OTa2trb2tvb29vc29zb3Nvc3Nvc3Nzc3dzd3dzd3d3d +3t7e3t3e3t7e397e39/f39/e3ujg39/f4N/g4ODf3+ng4OHh4ODh4OHh4eDh +4eHh4eLi4eHh4uLi4uHi4uLj4uLj4uPi4+Lj4+Pj4+Tk4+Pk4+Tj5OTk5OTk +5OXl5OTk5eTk5eXl5eXl5ebm5eXm5ebl5uXl5ubm5ubm5ufn5ufm5+bm5+fn +5+fn5+jm5vHo5+fo5+jn6Ojo6Ofo6Ojo5/Hp6Ono6enp6ejp6enp6erq6enq +6erp6unp6urq6unq6urq6uvr6uvq6+vr6+vr6+zs6+vs6+zr7Ovr7Ozs7Ozs +7O3t7Ozt7O3s7e3t7e3u7e3t7u3t7u7u7u3u7u7u7u/v7u/v7+7v7+/v7/Dw +7/Dv8O/v8PDw8PDx8PDx8PHw8fDw8fHx8fDx8fHx8fLx8vHy8vHy8vLy8vPz +8vLz8vPy8/Ly8/Pz8/Lz8/Pz8/T08/Tz9PP09PP09PT19PT19PX09fT09fX1 +9fX19fb29fX29fb19vb29vb29vf39vf39/f49/j3+Pf3+Pj4+Pj4+Pn5+fn5 ++fr6+fn6+fr6+vr7+vr7+vv6+/v7+/v8+/v8/Pz9/Pz8/fz9/fz9/f3+/f3+ +/f7+/v7+/v///v/////7IDMLAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgA +AAAJcEhZcwAACxMAAAsTAQCanBgAAAFVSURBVBjTY2BFBgxQwHrixNFDyXt2 +bN20jnUFTJT1+FFlLjZOhU3rVrIunAMVZT2ixAYCcssWsc6a0gcRZd3Hxaaw +eZ0sx6K5rJN7uprBoqyxIHWrl7FZTFVkBUOQ4DZOtrUrl0qxT5ygCAEgwU3y +bDKLJNnEJ7a11nIDAVhw3WppdjZ2ie725trKIpjgsqVz55hM7BZjqa1gFk5N +ggguXjB96oROMRbR4nwhJoFoiOCcqRO7O5pYRIrycpIEmAIggpP7u9uaahWL +ctMTosMUvSGCEztbGmqKFTOT4qMDAxTdIIJtrXUVRflMgnFhQT68jHYQwaba +0qK8dAEm/gBvXkYeK4hgTXlRZmpCBB+jpxsjj7kxRLAkLz0pJjzYR9HJQdHU +UB8iCBSLDgvxd1O0tVI00NWGCKbFRwUHuLs52ZobG+hqqkEEWblRADjoGBgU +0QADAwCDDmJcDd4k9QAAAABJRU5ErkJggg== +==== only in patch2: unchanged: --- apache2-2.2.6.orig/debian/icons/odf6odp-20x22.png.uue +++ apache2-2.2.6/debian/icons/odf6odp-20x22.png.uue @@ -0,0 +1,24 @@ +begin-base64 644 odf6odp-20x22.png.uue +iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAMAAAD3n0w0AAACLlBMVEXZ2dkz +MzMzM5lcXKxdXK1dXa1eXq6ZmZnOztzOz9zR0N7R0d3R0d/S0eDS0uDT0+DT +1ODV1eIAAADX2OTY2OTa2trb2tvb29vc29zb3Nvc3Nvc3Nzc3dzd3dzd3d3d +3t7e3t3e3t7e397e39/f39/e3ujg39/f4N/g4ODf3+ng4OHh4ODh4OHh4eDh +4eHh4eLi4eHh4uLi4uHi4uLj4uLj4uPi4+Lj4+Pj4+Tk4+Pk4+Tj5OTk5OTk +5OXl5OTk5eTk5eXl5eXl5ebm5eXm5ebl5uXl5ubm5ubm5ufn5ufm5+bm5+fn +5+fn5+jm5vHo5+fo5+jn6Ojo6Ofo6Ojo5/Hp6Ono6enp6ejp6enp6erq6enq +6erp6unp6urq6unq6urq6uvr6uvq6+vr6+vr6+zs6+vs6+zr7Ovr7Ozs7Ozs +7O3t7Ozt7O3s7e3t7e3u7e3t7u3t7u7u7u3u7u7u7u/v7u/v7+7v7+/v7/Dw +7/Dv8O/v8PDw8PDx8PDx8PHw8fDw8fHx8fDx8fHx8fLx8vHy8vHy8vLy8vPz +8vLz8vPy8/Ly8/Pz8/Lz8/Pz8/T08/Tz9PP09PP09PT19PT19PX09fT09fX1 +9fX19fb29fX29fb19vb29vb29vf39vf39/f49/j3+Pf3+Pj4+Pj4+Pn5+fn5 ++fr6+fn6+fr6+vr7+vr7+vv6+/v7+/v8+/v8/Pz9/Pz8/fz9/fz9/f3+/f3+ +/f7+/v7+/v///v////9yFadVAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgA +AAAJcEhZcwAACxMAAAsTAQCanBgAAAEwSURBVBjTY2BEBgxQwLhz57bNIWtX +Lls8n3EmTJRxxzYRNiZWwcXzZzFO6oWKMm4VZgIB/umTGbtb6yGijOvZmASX +zOdjmdzH2FJbXQIWZfQDqZsznUmzTYgRDEGCy1mZ5s2axs3c1CgEASDBxQJM +vJO5mDiaysvy2IEALDh/Dg8zEzNnTUVJXlYyTHD6tL5e1aaa8qK8zKTosGCI +4JSJHW2NVSVFuSkJkaGBPhDB3rammsrivMzk+Nhgf3dHiGCLUI0QAthABJuq +SgtzU+KjggN8nBytzCGC5UL5SCr1IYLFeWnJ8RHBPu6ONpbGBtoQwVyhZCSV +KhDBVKAyXw8XW2tjQ101JQWIYLxQMJJKGYhgeIC3i6OFubGehoqinJQ4RJCR +HQWAg46BQQgNMDAAAGkwUKkiN6jBAAAAAElFTkSuQmCC +==== only in patch2: unchanged: --- apache2-2.2.6.orig/debian/icons/odf6ods-20x22.png.uue +++ apache2-2.2.6/debian/icons/odf6ods-20x22.png.uue @@ -0,0 +1,24 @@ +begin-base64 644 odf6ods-20x22.png.uue +iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAMAAAD3n0w0AAACLlBMVEXZ2dkz +MzMzM5lcXKxdXK1dXa1eXq6ZmZnOztzOz9zR0N7R0d3R0d/S0eDS0uDT0+DT +1ODV1eIAAADX2OTY2OTa2trb2tvb29vc29zb3Nvc3Nvc3Nzc3dzd3dzd3d3d +3t7e3t3e3t7e397e39/f39/e3ujg39/f4N/g4ODf3+ng4OHh4ODh4OHh4eDh +4eHh4eLi4eHh4uLi4uHi4uLj4uLj4uPi4+Lj4+Pj4+Tk4+Pk4+Tj5OTk5OTk +5OXl5OTk5eTk5eXl5eXl5ebm5eXm5ebl5uXl5ubm5ubm5ufn5ufm5+bm5+fn +5+fn5+jm5vHo5+fo5+jn6Ojo6Ofo6Ojo5/Hp6Ono6enp6ejp6enp6erq6enq +6erp6unp6urq6unq6urq6uvr6uvq6+vr6+vr6+zs6+vs6+zr7Ovr7Ozs7Ozs +7O3t7Ozt7O3s7e3t7e3u7e3t7u3t7u7u7u3u7u7u7u/v7u/v7+7v7+/v7/Dw +7/Dv8O/v8PDw8PDx8PDx8PHw8fDw8fHx8fDx8fHx8fLx8vHy8vHy8vLy8vPz +8vLz8vPy8/Ly8/Pz8/Lz8/Pz8/T08/Tz9PP09PP09PT19PT19PX09fT09fX1 +9fX19fb29fX29fb19vb29vb29vf39vf39/f49/j3+Pf3+Pj4+Pj4+Pn5+fn5 ++fr6+fn6+fr6+vr7+vr7+vv6+/v7+/v8+/v8/Pz9/Pz8/fz9/fz9/f3+/f3+ +/f7+/v7+/v///v////9yFadVAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgA +AAAJcEhZcwAACxMAAAsTAQCanBgAAAEpSURBVBjTY2BEBgxQwLhz57bNIWtX +Lls8n3EmTJRxxzYRNiZWwcXzZzFO6oWKMm4VZgIB/umTGbtb6yGijOvZmASX +zOdjmdzH2FJbXQIWZfQDqZsznUmzTYgRDEGCy1mZ5s2axs3c1CgEASDBxQJM +vJO5mDiaysvy2IEALDh/Dg8zEzNnTUVJXlYyTHD6tL5e1aaa8qK8zKTosGCI +4JSJHW2NVSVFuSkJkaGBPhDB3rammsrivMzk+Nhgf3dHiGCLEDKwgQg2CZUW +5qbECwUH+Dg5CplDBMtRVOpDBIuF0pLjI4KF3B1tLI2FtCGCuSgqVSCCqUIR +wb4eLkLWxoa6akIKEMF4FJUyEMHwAG8XRwtzYz0NFUU5KXGIICM7CgAHHQOD +EBpgYAAAbP5NPEH1cBAAAAAASUVORK5CYII= +==== only in patch2: unchanged: --- apache2-2.2.6.orig/debian/icons/odf6odt-20x22.png.uue +++ apache2-2.2.6/debian/icons/odf6odt-20x22.png.uue @@ -0,0 +1,24 @@ +begin-base64 644 odf6odt-20x22.png.uue +iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAMAAAD3n0w0AAACLlBMVEXZ2dkz +MzMzM5lcXKxdXK1dXa1eXq6ZmZnOztzOz9zR0N7R0d3R0d/S0eDS0uDT0+DT +1ODV1eIAAADX2OTY2OTa2trb2tvb29vc29zb3Nvc3Nvc3Nzc3dzd3dzd3d3d +3t7e3t3e3t7e397e39/f39/e3ujg39/f4N/g4ODf3+ng4OHh4ODh4OHh4eDh +4eHh4eLi4eHh4uLi4uHi4uLj4uLj4uPi4+Lj4+Pj4+Tk4+Pk4+Tj5OTk5OTk +5OXl5OTk5eTk5eXl5eXl5ebm5eXm5ebl5uXl5ubm5ubm5ufn5ufm5+bm5+fn +5+fn5+jm5vHo5+fo5+jn6Ojo6Ofo6Ojo5/Hp6Ono6enp6ejp6enp6erq6enq +6erp6unp6urq6unq6urq6uvr6uvq6+vr6+vr6+zs6+vs6+zr7Ovr7Ozs7Ozs +7O3t7Ozt7O3s7e3t7e3u7e3t7u3t7u7u7u3u7u7u7u/v7u/v7+7v7+/v7/Dw +7/Dv8O/v8PDw8PDx8PDx8PHw8fDw8fHx8fDx8fHx8fLx8vHy8vHy8vLy8vPz +8vLz8vPy8/Ly8/Pz8/Lz8/Pz8/T08/Tz9PP09PP09PT19PT19PX09fT09fX1 +9fX19fb29fX29fb19vb29vb29vf39vf39/f49/j3+Pf3+Pj4+Pj4+Pn5+fn5 ++fr6+fn6+fr6+vr7+vr7+vv6+/v7+/v8+/v8/Pz9/Pz8/fz9/fz9/f3+/f3+ +/f7+/v7+/v///v////9yFadVAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgA +AAAJcEhZcwAACxMAAAsTAQCanBgAAAE1SURBVBjTY2BEBgxQwLhz57bNIWtX +Lls8n3EmTJRxxzYRNiZWwcXzZzFO6oWKMm4VZgIB/umTGbtb6yGijOvZmASX +zOdjmdzH2FJbXQIWZfQDqZsznUmzTYgRDEGCy1mZ5s2axs3c1CgEASDBxQJM +vJO5mDiaysvy2IEALDh/Dg8zEzNnTUVJXlYyTHD6tL5e1aaa8qK8zKTosGCI +4JSJHW2NVSVFuSkJkaGBPhDB3rammsrivMzk+Nhgf3dHiGCLEDKwgQg2oQia +QwTLy/IzkxNiwv3dnW0tTfUhgsVA+XihYJAySyEhbYhgbkZyVFigp4u9lbmR +noYKRDBVKELIF2yeIRArQATjI4J93F0dzI31tFUU5WQgguEB3i6OFkAxDaCY +lDhEkJEdBYCDjoFBCA0wMAAAEE1PsJ/Jn2YAAAAASUVORK5CYII= +==== only in patch2: unchanged: --- apache2-2.2.6.orig/debian/icons/odf6otc-20x22.png.uue +++ apache2-2.2.6/debian/icons/odf6otc-20x22.png.uue @@ -0,0 +1,26 @@ +begin-base64 644 odf6otc-20x22.png.uue +iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAMAAAD3n0w0AAACRlBMVEXZ2dkh +ISEzMzM0NDQ1NTUzM5lcXKxdXK1dXa1eXq6ZmZmlpKSlpaWmpqamp6amp6en +p6eoqKioqKmpqaqqqarOztzOz9zR0N7R0d3R0d/S0eDS0uDT0+DT1ODV1eIA +AADX2OTY2OTa2trb2tvb29vc29zb3Nvc3Nvc3Nzc3dzd3dzd3d3d3t7e3t3e +3t7e397e39/f39/e3ujg39/f4N/g4ODf3+ng4OHh4ODh4OHh4eDh4eHh4eLi +4eHh4uLi4uHi4uLj4uLj4uPi4+Lj4+Pj4+Tk4+Pk4+Tj5OTk5OTk5OXl5OTk +5eTk5eXl5eXl5ebm5eXm5ebl5uXl5ubm5ubm5ufn5ufm5+bm5+fn5+fn5+jm +5vHo5+fo5+jn6Ojo6Ofo6Ojo5/Hp6Ono6enp6ejp6enp6erq6enq6erp6unp +6urq6unq6urq6uvr6uvq6+vr6+vr6+zs6+vs6+zr7Ovr7Ozs7Ozs7O3t7Ozs +7e3t7e3u7e3t7u3t7u7u7u3u7u7u7u/v7u/v7+7v7+/v7/Dw7/Dv8O/v8PDw +8PDx8PDw8fDw8fHx8fDx8fHx8vHy8vHy8vLz8vLz8vPy8/Ly8/Pz8/Lz8/Pz +8/T08/Tz9PP09PP09PT19PT19PX09fT09fX19fX19fb29fX29fb29vb29vf3 +9vf39/f49/j3+Pf3+Pj4+Pj4+Pn5+fn5+fr6+fn6+fr6+vr7+vr7+vv6+/v7 ++/v8+/v8/Pz9/Pz8/fz9/fz9/f3+/f3+/f7+/v7+/v///v/////O2tP2AAAA +AXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCanBgA +AAFWSURBVBjTY2BCBvIgwMDAwHTw4L7diVs3rlu9fOmieTOFGMGCB/YpcrJy +yK1evnjB7GmCzFxgwb0KrCAgs4BFZIogswBEcDsnq9ya5dLsc4RZBJn5GyCC +0SB1Sxawmk0QZOarr4EIrudgXbZ4vgRbb087LzNPMURwtSyr1BxxVtHe5qYq +bqY8iODyJZJsrGxiHS0NVeUFudkQwQXzp08z6u1orqsqy89IToAIzp01cUJP +W0NdZWFuWlJcJERwmnxvR2t9VVmBfFZCTIgfRLBPvqMZJJYtHxcZIu8JEeyV +b6ytLMxJT5CP9PeTd4EINstXlxXkZsrHyAfIu8nbQATr5YsLcuQT5IFa5R3k +LSCClfIF8snyYfI+8i7y1vKGEMEi+dSEqNBALw8HOytjfV2IYI48MtCECKbE +RgT6ubo4WJsa6mmrq0AEmbhQABNIkIFBHg0wMAAA4ypjPVdnlsEAAAAASUVO +RK5CYII= +==== only in patch2: unchanged: --- apache2-2.2.6.orig/debian/icons/odf6otf-20x22.png.uue +++ apache2-2.2.6/debian/icons/odf6otf-20x22.png.uue @@ -0,0 +1,27 @@ +begin-base64 644 odf6otf-20x22.png.uue +iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAMAAAD3n0w0AAACalBMVEXZ2dkh +ISEmJiYnJycoKCgzMzM0NDQ1NTUzM5lcXKxdXK1dXa1eXq6ZmZmen5+goKGg +oaChoaGioaGjoqOjo6OlpKSkpaWlpaSlpaWmpqamp6amp6enp6eoqKioqKmp +qaqqqarOztzOz9zR0N7R0d3R0d/S0eDS0uDT0+DT1ODV1eIAAADX2OTY2OTa +2trb2tvb29vc29zb3Nvc3Nvc3Nzc3dzd3dzd3d3d3t7e3t3e3t7e397e39/f +39/e3ujg39/f4N/g4ODf3+ng4OHh4ODh4OHh4eDh4eHh4eLi4eHh4uLi4uHi +4uLj4uLj4uPi4+Lj4+Pj4+Tk4+Pk4+Tj5OTk5OTk5OXl5OTk5eTk5eXl5eXl +5ebm5eXm5ebl5uXl5ubm5ubm5ufn5ufm5+bm5+fn5+fn5+jm5vHo5+fo5+jn +6Ojo6Ofo6Ojo5/Hp6Ono6enp6ejp6enp6erq6enq6erp6unp6urq6unq6urq +6uvr6uvq6+vr6+vr6+zs6+vs6+zr7Ovr7Ozs7Ozs7O3t7Ozs7e3t7e3u7e3t +7u3t7u7u7u3u7u7u7u/v7u/v7+7v7+/v7/Dw7/Dv8O/v8PDw8PDx8PDw8fDw +8fHx8fDx8fHx8vHy8vHy8vLz8vLz8vPy8/Ly8/Pz8/Lz8/Pz8/T08/Tz9PP0 +9PP09PT19PT19PX09fT09fX19fX19fb29fX29fb29vb29vf39vf39/f49/j3 ++Pf3+Pj4+Pj4+Pn5+fn5+fr6+fn6+fr6+vr7+vr7+vv6+/v7+/v8+/v8/Pz9 +/Pz8/fz9/fz9/f3+/f3+/f7+/v7+/v///v////9bQbSjAAAAAXRSTlMAQObY +ZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCanBgAAAFcSURBVBjT +Y2BFBtogwMDAwHr27KnjuQf37tq+eeO6VUvlGMGCZ07p8nBwa23fvH7N8kWy +bLxgwZM6HCCgsYZdYYEsmwxE8DAPh9aOzepcK+TZZdmkeyCC6SB1G9ZwOM2R +ZZPq7oAI7ubm2LR+tQrnzBmTJdkk6iGC2zU51FYocyjO7O9rE2Wtgghu3qDK +ycGpNGVCT1tzTWU5RHDN6sWL7GZO6e9qa6ouyc+BCK5cNnfOjElgv2jnZaVC +BBfNmTllYjeLZE2FGEtGQhREcNb0Kf3dbZIs4oVZqQlRoRDBmZN6O1trK0RZ +RFKjo4IDIIL9fe1NNZWlBSLMQmFBfh4Qwe62+pqKwhwRZsHQIB9PF4hga2NN +cX6WMLNAcIC3u6MtRLAOqCwtkZk/xIePyd7aEiIIFEtNiIO408rcFCJYkJkS +GxUY4APUamVubAARZOVFAawgQQYGbTTAwAAAYqJv/HjEEzcAAAAASUVORK5C +YII= +==== only in patch2: unchanged: --- apache2-2.2.6.orig/debian/icons/odf6otg-20x22.png.uue +++ apache2-2.2.6/debian/icons/odf6otg-20x22.png.uue @@ -0,0 +1,27 @@ +begin-base64 644 odf6otg-20x22.png.uue +iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAMAAAD3n0w0AAACf1BMVEXZ2dkh +ISEqKiorKiorKysrKywsLCwsLC0tLS0zMzM0NDQ1NTUzM5lcXKxdXK1dXa1e +Xq6ZmZmam5qdnZ2fn6Cgn5+hoaGioqKio6Kio6Ojo6OkpKSlpKSkpaWlpaWm +pqampqemp6amp6enp6eoqKioqKmpqaqqqarOztzOz9zR0N7R0d3R0d/S0eDS +0uDT0+DT1ODV1eIAAADX2OTY2OTa2trb2tvb29vc29zb3Nvc3Nvc3Nzc3dzd +3dzd3d3d3t7e3t3e3t7e397e39/f39/e3ujg39/f4N/g4ODf3+ng4OHh4ODh +4OHh4eDh4eHh4eLi4eHh4uLi4uHi4uLj4uLj4uPi4+Lj4+Pj4+Tk4+Pk4+Tj +5OTk5OTk5OXl5OTk5eTk5eXl5eXl5ebm5eXm5ebl5uXl5ubm5ubm5ufn5ufm +5+bm5+fn5+fn5+jm5vHo5+fo5+jn6Ojo6Ofo6Ojo5/Hp6Ono6enp6ejp6enp +6erq6enq6erp6unp6urq6unq6urq6uvr6uvq6+vr6+vr6+zs6+vs6+zr7Ovr +7Ozs7Ozs7O3t7Ozs7e3t7e3u7e3t7u3t7u7u7u3u7u7u7u/v7u/v7+7v7+/v +7/Dw7/Dv8O/v8PDw8PDx8PDw8fDw8fHx8fDx8fHx8vHy8vHy8vLz8vLz8vPy +8/Ly8/Pz8/Lz8/Pz8/T08/Tz9PP09PP09PT19PT19PX09fT09fX19fX19fb2 +9fX29fb29vb29vf39vf39/f49/j3+Pf3+Pj4+Pj4+Pn5+fn5+fr6+fn6+fr6 ++vr7+vr7+vv6+/v7+/v8+/v8/Pz9/Pz8/fz9/fz9/f3+/f3+/f7+/v7+/v// +/v/////QWXrUAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAA +CxMAAAsTAQCanBgAAAFfSURBVBjTY+BEBkYgwMDAwHnlysVzJSeOHNy3a8fW +jWtUGcGCly+aCPDwG+7btW3zupUqXIJgwQvGPCCgv5lbfbkKlzJE8JQAj+H+ +XXp869W4VbiUJkME80Dqtm/m8VyswqU4qR8ieIifZ+e2Tdq8C+bPkueSa4MI +7jPg0V2vxaOxYNrUXhnORojgru06vDy8mrMVJvd2NTfUQQQ3b1q10nXBbHkO +uc6m6rJiiOCGtUsWz585mUOWo6GytDAHIrhy8YLZMybJcTSzSRbnpydCBBfO +mz1tUi+HdJ04W056YgxEcMHMKRN6pNmqigvYRBKjwiGC06b2dTazS5Tnp4uy +Rob6QwQn9bY1S7EVg7SyCAd4QwR7Opqr2MQyU+KjwoVZPFwggq31FWJsGSmx +0cGBvsxCDhDB+opiNiMYYLKBCJYXZKckRoQH+3m4ONpZmUMEOQVRACdIkIHB +CA0wMAAAjGF0n7ZMFJ4AAAAASUVORK5CYII= +==== only in patch2: unchanged: --- apache2-2.2.6.orig/debian/icons/odf6oth-20x22.png.uue +++ apache2-2.2.6/debian/icons/odf6oth-20x22.png.uue @@ -0,0 +1,26 @@ +begin-base64 644 odf6oth-20x22.png.uue +iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAMAAAD3n0w0AAACWFBMVEXZ2dkh +ISEzMzM0NDQ1NTUzM5lcXKxdXK1dXa1eXq53d7V4eLZ5eLd5ebd6erh7e7mZ +mZmlpKSlpaWmpqamp6amp6enp6eoqKioqKmpqaqqqarOztzOz9zR0N7R0d3R +0d/S0eDS0uDT0+DT1ODV1eIAAADX2OTY2OTa2trb2tvb29vc29zb3Nvc3Nvc +3Nzc3dzd3dzd3d3d3t7e3t3e3t7e397e39/f39/e3ujg39/f4N/g4ODf3+ng +4OHh4ODh4OHh4eDh4eHh4eLi4eHh4uLi4uHi4uLj4uLj4uPi4+Lj4+Pj4+Tk +4+Pk4+Tj5OTk5OTk5OXl5OTk5eTk5eXl5eXl5ebm5eXm5ebl5uXl5ubm5ubm +5ufn5ufm5+bm5+fn5+fn5+jm5vHo5+fo5+jn6Ojo6Ofo6Ojo5/Hp6Ono6enp +6ejp6enp6erq6enq6erp6unp6urq6unq6urq6uvr6uvq6+vr6+vr6+zs6+vs +6+zr7Ovr7Ozs7Ozs7O3t7Ozs7e3t7e3u7e3t7u3t7u7u7u3u7u7u7u/v7u/v +7+7v7+/v7/Dw7/Dv8O/v8PDw8PDx8PDw8fDw8fHx8fDx8fHx8vHy8vHy8vLz +8vLz8vPy8/Ly8/Pz8/Lz8/Pz8/T08/Tz9PP09PP09PT19PT19PX09fT09fX1 +9fX19fb29fX29fb29vb29vf39vf39/f49/j3+Pf3+Pj4+Pj4+Pn5+fn5+fr6 ++fn6+fr6+vr7+vr7+vv6+/v7+/v8+/v8/Pz9/Pz8/fz9/fz9/f3+/f3+/f7+ +/v7+/v///v////9sLkI5AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJ +cEhZcwAACxMAAAsTAQCanBgAAAFaSURBVBjTY2BCBqogwMDAwHT8+JGD6bu3 +b9m4dvWKJfMlGMGCx46oc7JyqGxcu3LZwjnizAJgwcNqrCCgtIxFapY4sxhE +cC8nq8qmtYrsiyRZxJlF2yCCiSB1q5ax2kwTZxZpbYIIbuVgXbNyqRzb5Em9 +wsxClRDBjcqsCotkWaUnd3Y0CDKVQATXrpJnY2WT6etqa6gtKy6ECC5bOneO +xeS+zpaGmtK8zDSI4OIF06dN6mlrqS8vzslIiYcIzpk2ua+7taGGn48vLSkq +BCI4ZWJfJ0gM6DDeqBB/iODknvbm+nI+VtbkeFZuXy+IYGdHY01ZMVAwKoyV +28MJItjaUFlWlM3LGgXUz+VsBxGsry7LzUyJ4QH51tHaHCJYUZSdlhAdHsDN +xeVgaWoMEQSKxUdFBHu5OdqZmxjqQwSzkuPCQ7yBYtZAMV0tiCCTAApgAgky +MKiiAQYGAFMTaQfquhWYAAAAAElFTkSuQmCC +==== only in patch2: unchanged: --- apache2-2.2.6.orig/debian/icons/odf6oti-20x22.png.uue +++ apache2-2.2.6/debian/icons/odf6oti-20x22.png.uue @@ -0,0 +1,27 @@ +begin-base64 644 odf6oti-20x22.png.uue +iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAMAAAD3n0w0AAAChVBMVEXZ2dkh +ISErKyssLCwsLC0tLS0zMzM0NDQ1NTUzM5lcXKxdXK1dXa1eXq6ZmZmlpKSl +paWmpqamp6amp6enp6eoqKioqKmpqaqqqaq4uLi5uLi7u7u7u7y8u7u8vLy9 +vb2+vb2+vb69vr6+vr6/vr6+v77AwMDAwMHBwMHAwcHOztzOz9zR0N7R0d3R +0d/S0eDS0uDT0+DT1ODV1eIAAADX2OTY2OTa2trb2tvb29vc29zb3Nvc3Nvc +3Nzc3dzd3dzd3d3d3t7e3t3e3t7e397e39/f39/e3ujg39/f4N/g4ODf3+ng +4OHh4ODh4OHh4eDh4eHh4eLi4eHh4uLi4uHi4uLj4uLj4uPi4+Lj4+Pj4+Tk +4+Pk4+Tj5OTk5OTk5OXl5OTk5eTk5eXl5eXl5ebm5eXm5ebl5uXl5ubm5ubm +5ufn5ufm5+bm5+fn5+fn5+jm5vHo5+fo5+jn6Ojo6Ofo6Ojo5/Hp6Ono6enp +6ejp6enp6erq6enq6erp6unp6urq6unq6urq6uvr6uvq6+vr6+vr6+zs6+vs +6+zr7Ovr7Ozs7Ozs7O3t7Ozs7e3t7e3u7e3t7u3t7u7u7u3u7u7u7u/v7u/v +7+7v7+/v7/Dw7/Dv8O/v8PDw8PDx8PDw8fDw8fHx8fDx8fHx8vHy8vHy8vLz +8vLz8vPy8/Ly8/Pz8/Lz8/Pz8/T08/Tz9PP09PP09PT19PT19PX09fT09fX1 +9fX19fb29fX29fb29vb29vf39vf39/f49/j3+Pf3+Pj4+Pj4+Pn5+fn5+fr6 ++fn6+fr6+vr7+vr7+vv6+/v7+/v8+/v8/Pz9/Pz8/fz9/fz9/f3+/f3+/f7+ +/v7+/v///v////9GKjb7AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJ +cEhZcwAACxMAAAsTAQCanBgAAAFaSURBVBjTY2BDBiYgwMDAwHbt2uULZaeO +HT6wZ9f2zevEGMGCVy+b8XLyGB/Ys2PrhtWi7HxgwUumnCBguJVDYqUouwhE +8Awvp/HBPQbcG8U5RNmFp0IEC0Dqdm7l9F4qyi40ZSJE8AgP5+4dW3S5Fi2c +I8gu0AERPGDEqb9Rh1Nr0Yzp/fxszRDBPTv1uDi5tOfOnNrf09rUABHcumXN +avdFc2dM7u9uqa0ohQhuWr9s6cLZUyf3tTVVlxfnQQRXL100d9aU/u7WxvrS +wsxkiODiBXNngMQaqpSY5ZLjIIKLZk+b1KfOrFKqyCzDHBMJEZwxfUK3Gosq +swKzbLxJeCBEcEq/Biuzcqk8s3RcNJOUL0SwT5NVpaI4Oy0xJjJEkskNItgO +VJaflRYfGxrs72HiBBFsNEEGdhDByqLctOSoyNAALzdnBxtLiCAbHwpgAwky +MJigAQYGAOZzdl7FtGVFAAAAAElFTkSuQmCC +==== only in patch2: unchanged: --- apache2-2.2.6.orig/debian/icons/odf6otp-20x22.png.uue +++ apache2-2.2.6/debian/icons/odf6otp-20x22.png.uue @@ -0,0 +1,25 @@ +begin-base64 644 odf6otp-20x22.png.uue +iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAMAAAD3n0w0AAACRlBMVEXZ2dkh +ISEzMzM0NDQ1NTUzM5lcXKxdXK1dXa1eXq6ZmZmlpKSlpaWmpqamp6amp6en +p6eoqKioqKmpqaqqqarOztzOz9zR0N7R0d3R0d/S0eDS0uDT0+DT1ODV1eIA +AADX2OTY2OTa2trb2tvb29vc29zb3Nvc3Nvc3Nzc3dzd3dzd3d3d3t7e3t3e +3t7e397e39/f39/e3ujg39/f4N/g4ODf3+ng4OHh4ODh4OHh4eDh4eHh4eLi +4eHh4uLi4uHi4uLj4uLj4uPi4+Lj4+Pj4+Tk4+Pk4+Tj5OTk5OTk5OXl5OTk +5eTk5eXl5eXl5ebm5eXm5ebl5uXl5ubm5ubm5ufn5ufm5+bm5+fn5+fn5+jm +5vHo5+fo5+jn6Ojo6Ofo6Ojo5/Hp6Ono6enp6ejp6enp6erq6enq6erp6unp +6urq6unq6urq6uvr6uvq6+vr6+vr6+zs6+vs6+zr7Ovr7Ozs7Ozs7O3t7Ozs +7e3t7e3u7e3t7u3t7u7u7u3u7u7u7u/v7u/v7+7v7+/v7/Dw7/Dv8O/v8PDw +8PDx8PDw8fDw8fHx8fDx8fHx8vHy8vHy8vLz8vLz8vPy8/Ly8/Pz8/Lz8/Pz +8/T08/Tz9PP09PP09PT19PT19PX09fT09fX19fX19fb29fX29fb29vb29vf3 +9vf39/f49/j3+Pf3+Pj4+Pj4+Pn5+fn5+fr6+fn6+fr6+vr7+vr7+vv6+/v7 ++/v8+/v8/Pz9/Pz8/fz9/fz9/f3+/f3+/f7+/v7+/v///v/////O2tP2AAAA +AXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCanBgA +AAE/SURBVBjTY2BCBvIgwMDAwHTw4L7diVs3rlu9fOmieTOFGMGCB/YpcrJy +yK1evnjB7GmCzFxgwb0KrCAgs4BFZIogswBEcDsnq9ya5dLsc4RZBJn5GyCC +0SB1Sxawmk0QZOarr4EIrudgXbZ4vgRbb087LzNPMURwtSyr1BxxVtHe5qYq +bqY8iODyJZJsrGxiHS0NVeUFudkQwQXzp08z6u1orqsqy89IToAIzp01cUJP +W0NdZWFuWlJcJERw2oTejtb6qrKCnKyEmBA/iGCffIc8AnhCBHvbGmsrC3PS +E2Ij/f3cXSCCzfLVSCptIIL1VcUFOakJkSF+nm4OthYQwUr5AiSVhhDBIqCy +qNBALw8HOytjfV2IYI58ApJKTYhgSmxEoJ+ri4O1qaGetroKRJCJCwUwgQQZ +GOTRAAMDAEoQYSbvnJwhAAAAAElFTkSuQmCC +==== only in patch2: unchanged: --- apache2-2.2.6.orig/debian/icons/odf6ots-20x22.png.uue +++ apache2-2.2.6/debian/icons/odf6ots-20x22.png.uue @@ -0,0 +1,25 @@ +begin-base64 644 odf6ots-20x22.png.uue +iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAMAAAD3n0w0AAACRlBMVEXZ2dkh +ISEzMzM0NDQ1NTUzM5lcXKxdXK1dXa1eXq6ZmZmlpKSlpaWmpqamp6amp6en +p6eoqKioqKmpqaqqqarOztzOz9zR0N7R0d3R0d/S0eDS0uDT0+DT1ODV1eIA +AADX2OTY2OTa2trb2tvb29vc29zb3Nvc3Nvc3Nzc3dzd3dzd3d3d3t7e3t3e +3t7e397e39/f39/e3ujg39/f4N/g4ODf3+ng4OHh4ODh4OHh4eDh4eHh4eLi +4eHh4uLi4uHi4uLj4uLj4uPi4+Lj4+Pj4+Tk4+Pk4+Tj5OTk5OTk5OXl5OTk +5eTk5eXl5eXl5ebm5eXm5ebl5uXl5ubm5ubm5ufn5ufm5+bm5+fn5+fn5+jm +5vHo5+fo5+jn6Ojo6Ofo6Ojo5/Hp6Ono6enp6ejp6enp6erq6enq6erp6unp +6urq6unq6urq6uvr6uvq6+vr6+vr6+zs6+vs6+zr7Ovr7Ozs7Ozs7O3t7Ozs +7e3t7e3u7e3t7u3t7u7u7u3u7u7u7u/v7u/v7+7v7+/v7/Dw7/Dv8O/v8PDw +8PDx8PDw8fDw8fHx8fDx8fHx8vHy8vHy8vLz8vLz8vPy8/Ly8/Pz8/Lz8/Pz +8/T08/Tz9PP09PP09PT19PT19PX09fT09fX19fX19fb29fX29fb29vb29vf3 +9vf39/f49/j3+Pf3+Pj4+Pj4+Pn5+fn5+fr6+fn6+fr6+vr7+vr7+vv6+/v7 ++/v8+/v8/Pz9/Pz8/fz9/fz9/f3+/f3+/f7+/v7+/v///v/////O2tP2AAAA +AXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCanBgA +AAE4SURBVBjTY2BCBvIgwMDAwHTw4L7diVs3rlu9fOmieTOFGMGCB/YpcrJy +yK1evnjB7GmCzFxgwb0KrCAgs4BFZIogswBEcDsnq9ya5dLsc4RZBJn5GyCC +0SB1Sxawmk0QZOarr4EIrudgXbZ4vgRbb087LzNPMURwtSyr1BxxVtHe5qYq +bqY8iODyJZJsrGxiHS0NVeUFudkQwQXzp08z6u1orqsqy89IToAIzp01cUJP +W0NdZWFuWlJcJERw2oTejtb6qrKCnKyEmBA/iGCfPDLwhAj2yjfWVhbmyCfE +Rvr7ybtABJtRVNpABOvliwtyUhPkQ/w83RzkLSCClSgqDSGCRfKpCVGhgfIe +DnZWxvK6EMEcFJWaEMGU2IhAP1cXB2tTQz1tdRWIIBMXCmACCTIwyKMBBgYA +UJpdvW69xycAAAAASUVORK5CYII= +==== only in patch2: unchanged: --- apache2-2.2.6.orig/debian/icons/odf6ott-20x22.png.uue +++ apache2-2.2.6/debian/icons/odf6ott-20x22.png.uue @@ -0,0 +1,25 @@ +begin-base64 644 odf6ott-20x22.png.uue +iVBORw0KGgoAAAANSUhEUgAAABQAAAAWCAMAAAD3n0w0AAACRlBMVEXZ2dkh +ISEzMzM0NDQ1NTUzM5lcXKxdXK1dXa1eXq6ZmZmlpKSlpaWmpqamp6amp6en +p6eoqKioqKmpqaqqqarOztzOz9zR0N7R0d3R0d/S0eDS0uDT0+DT1ODV1eIA +AADX2OTY2OTa2trb2tvb29vc29zb3Nvc3Nvc3Nzc3dzd3dzd3d3d3t7e3t3e +3t7e397e39/f39/e3ujg39/f4N/g4ODf3+ng4OHh4ODh4OHh4eDh4eHh4eLi +4eHh4uLi4uHi4uLj4uLj4uPi4+Lj4+Pj4+Tk4+Pk4+Tj5OTk5OTk5OXl5OTk +5eTk5eXl5eXl5ebm5eXm5ebl5uXl5ubm5ubm5ufn5ufm5+bm5+fn5+fn5+jm +5vHo5+fo5+jn6Ojo6Ofo6Ojo5/Hp6Ono6enp6ejp6enp6erq6enq6erp6unp +6urq6unq6urq6uvr6uvq6+vr6+vr6+zs6+vs6+zr7Ovr7Ozs7Ozs7O3t7Ozs +7e3t7e3u7e3t7u3t7u7u7u3u7u7u7u/v7u/v7+7v7+/v7/Dw7/Dv8O/v8PDw +8PDx8PDw8fDw8fHx8fDx8fHx8vHy8vHy8vLz8vLz8vPy8/Ly8/Pz8/Lz8/Pz +8/T08/Tz9PP09PP09PT19PT19PX09fT09fX19fX19fb29fX29fb29vb29vf3 +9vf39/f49/j3+Pf3+Pj4+Pj4+Pn5+fn5+fr6+fn6+fr6+vr7+vr7+vv6+/v7 ++/v8+/v8/Pz9/Pz8/fz9/fz9/f3+/f3+/f7+/v7+/v///v/////O2tP2AAAA +AXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCanBgA +AAFESURBVBjTY2BCBvIgwMDAwHTw4L7diVs3rlu9fOmieTOFGMGCB/YpcrJy +yK1evnjB7GmCzFxgwb0KrCAgs4BFZIogswBEcDsnq9ya5dLsc4RZBJn5GyCC +0SB1Sxawmk0QZOarr4EIrudgXbZ4vgRbb087LzNPMURwtSyr1BxxVtHe5qYq +bqY8iODyJZJsrGxiHS0NVeUFudkQwQXzp08z6u1orqsqy89IToAIzp01cUJP +W0NdZWFuWlJcJERw2oTejtb6qrKCnKyEmBA/iGCfPDLwhAj2ogi6QASbm6rL +CnIzU2JCArzcnGwggvVA+Rz5BJAyN3l5C4hgZWlBenJcWKCPu4u9takhRLBI +PlU+CmyeHRDrQgRzUhMiQ4J8XRysLQz1tDUhgimxEYF+rkAxU6CYugpEkIkL +BTCBBBkY5NEAAwMA9LlgMjOLUzMAAAAASUVORK5CYII= +====