# HG changeset patch # User Christopher Rogers # Date 1290647602 0 # Node ID f454cca8b5e22aa62cfcb7eb2e2c2321bfd280d8 # Parent db57b12ffc922c670ad6e3783963eebc8256d67e Remove patch for cherokee. diff -r db57b12ffc92 -r f454cca8b5e2 cherokee/receipt --- a/cherokee/receipt Thu Nov 25 01:07:25 2010 +0000 +++ b/cherokee/receipt Thu Nov 25 01:13:22 2010 +0000 @@ -18,8 +18,6 @@ # Use subdirectory for logs sed -i -r 's|(%localstatedir%/log)|\1/cherokee|' cherokee.conf.sample.pre - # http://code.google.com/p/cherokee/issues/detail?id=1034 - patch -Np3 -E -i ../stuff/r5734-get-rid-of-package-py.patch autoreconf -v ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --with-wwwroot=/var/www/cherokee --disable-static \ diff -r db57b12ffc92 -r f454cca8b5e2 cherokee/stuff/r5734-get-rid-of-package-py.patch --- a/cherokee/stuff/r5734-get-rid-of-package-py.patch Thu Nov 25 01:07:25 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ -Index: /cherokee/trunk/admin/market/Makefile.am -=================================================================== ---- /cherokee/trunk/admin/market/Makefile.am (revision 5670) -+++ /cherokee/trunk/admin/market/Makefile.am (revision 5734) -@@ -7,5 +7,4 @@ - Install_Log.py \ - Menu.py \ --Package.py \ - PageApp.py \ - PageCategory.py \ -Index: /erokee/trunk/admin/market/Package.py -=================================================================== ---- /cherokee/trunk/admin/market/Package.py (revision 5460) -+++ (revision ) -@@ -1,34 +1,0 @@ --# -*- coding: utf-8 -*- --# --# Cherokee-admin --# --# Authors: --# Alvaro Lopez Ortega --# --# Copyright (C) 2001-2010 Alvaro Lopez Ortega --# --# This program is free software; you can redistribute it and/or --# modify it under the terms of version 2 of the GNU General Public --# License as published by the Free Software Foundation. --# --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU General Public License for more details. --# --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA --# 02110-1301, USA. --# -- --class Package_Install_Widget (CTK.Box): -- def __init__ (self, package_local_path): -- Box.__init__ (self) -- -- self.status_uncompress = CTK.ImageStock('loading') -- self.status_setup = CTK.ImageStock('loading') -- -- table = CTK.Table() -- table += [CTK.RawHTML ("Uncompress"), --