Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv12870/main/finkinfo/web

Modified Files:
      Tag: pangocairo-branch
        tomcat4.info tomcat4.patch tomcat5.info tomcat5.patch 
        zopeinterface-py.info 
Log Message:
merge from HEAD as of yesterday

Index: tomcat5.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web/tomcat5.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- tomcat5.patch       20 Dec 2006 18:01:18 -0000      1.1.2.1
+++ tomcat5.patch       31 Jan 2007 19:18:05 -0000      1.1.2.2
@@ -23,7 +23,7 @@
 +      start)
 +              /bin/echo "Starting Tomcat: \c"
 +              $CATALINA_HOME/bin/catalina.sh start 
>>@PREFIX@/var/tomcat5/logs/tomcat.log 2>&1
-+              echo "ok"
++              /bin/echo "ok"
 +              ;;
 +
 +      stop)
@@ -46,16 +46,16 @@
 +              if [ "$TCDONE" = "1" ]; then
 +                      $0 start
 +              else
-+                      echo ""
-+                      echo "Tomcat is not shutting down properly.  Please 
check"
-+                      echo "your logs and try again."
-+                      echo ""
++                      /bin/echo ""
++                      /bin/echo "Tomcat is not shutting down properly.  
Please check"
++                      /bin/echo "your logs and try again."
++                      /bin/echo ""
 +                      exit 1
 +              fi
 +              ;;
 +
 +      *)
-+              echo "Usage: $0 {start|stop|restart}"
++              /bin/echo "Usage: $0 {start|stop|restart}"
 +              exit 1
 +              ;;
 +

Index: tomcat5.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web/tomcat5.info,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- tomcat5.info        20 Dec 2006 18:01:18 -0000      1.2.2.1
+++ tomcat5.info        31 Jan 2007 19:18:05 -0000      1.2.2.2
@@ -17,11 +17,11 @@
 Source3: mirror:apache:tomcat/tomcat-5/v%v/bin/apache-tomcat-%v-compat.tar.gz
 Source3-MD5: 9afe29117c5eca667d72bb847416153e
 PatchFile: %n.patch
-PatchFile-MD5: 204eb678f6ee7601eaddd037ebfe87d5
+PatchFile-MD5: 1a4a0291281992c9fcb834ab7a4d85d1
 PatchScript: sed -e 's:@PREFIX@:%p:g' < %{PatchFile} | patch -p1
 
-BuildDepends: fink (>= 0.24.12)
-Depends: system-java (>= 1.4-1)
+BuildDepends: fink (>= 0.24.12), passwd (>= 20070108-1)
+Depends: passwd (>= 20070108-1), system-java (>= 1.4-1)
 ConfFiles: <<
        %p/etc/%N/tomcat.conf
        %p/var/%N/conf/catalina.policy

Index: zopeinterface-py.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/web/zopeinterface-py.info,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- zopeinterface-py.info       8 Nov 2006 07:33:09 -0000       1.2
+++ zopeinterface-py.info       31 Jan 2007 19:18:05 -0000      1.2.2.1
@@ -1,18 +1,19 @@
 Info2: <<
 
 Package: zopeinterface-py%type_pkg[python]
-Version: 3.1.0c1
+Version: 3.3.0
 Revision: 2
 Description: Interface distribution from Zope 3
 DescDetail: <<
 This is a separate distribution of the zope.interface package
 used in Zope 3, along with the packages it depends on.
 <<
-Source: http://www.zope.org/Products/ZopeInterface/%v/ZopeInterface-%v.tgz
-Source-MD5: f34cb95f2fbdbe3f1850c95cefddbd2c
+
+Source: http://www.zope.org/Products/ZopeInterface/%v/zope.interface-%v.tar.gz
+Source-MD5: 93668855e37b4691c5c956665c33392c
 Source2: http://www.zope.org/Products/Zope/LICENSE.txt
 Source2-MD5: 638c27dc9783a4820f57829a4d856703
-Type: python (2.3 2.4)
+Type: python (2.3 2.4 2.5)
 Depends: python%type_pkg[python]
 CompileScript: <<
  %p/bin/python%type_raw[python] setup.py build
@@ -24,9 +25,10 @@
 DocFiles: README.txt LICENSE.txt
 License: OSI-Approved
 Homepage: http://www.zope.org/Products/ZopeInterface
-Maintainer: None <fink-devel@lists.sourceforge.net>
+Maintainer: Kurt Schwehr <[EMAIL PROTECTED]>
 DescPackaging: <<
  Maintainer (<= 3.1.0c1-2): Daniel Henninger
+ Maintainer (>= 3.3.0, Jan 2007) - Taken over by Kurt Schwehr
 <<
 
 # Info2

Index: tomcat4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web/tomcat4.info,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -d -r1.3.2.1 -r1.3.2.2
--- tomcat4.info        20 Dec 2006 18:01:18 -0000      1.3.2.1
+++ tomcat4.info        31 Jan 2007 19:18:05 -0000      1.3.2.2
@@ -13,11 +13,11 @@
 Source: mirror:apache:tomcat/tomcat-4/v%v/bin/apache-tomcat-%v-LE-jdk14.tar.gz
 Source-MD5: f9ee64000d986907f24f5a9a254660d2
 PatchFile: %n.patch
-PatchFile-MD5: 12c46f4f0f0bb5a258906b50c13443ac
+PatchFile-MD5: 13216b19fc3b18734a6ee571e16dbf2c
 PatchScript: sed -e 's:@PREFIX@:%p:g' < %{PatchFile} | patch -p1
 
-BuildDepends: fink (>= 0.24.12)
-Depends: system-java (>= 1.4-1)
+BuildDepends: fink (>= 0.24.12), passwd (>= 20070108-1)
+Depends: passwd (>= 20070108-1), system-java (>= 1.4-1)
 ConfFiles: <<
        %p/etc/%N/tomcat.conf
        %p/var/%N/conf/catalina.policy

Index: tomcat4.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web/tomcat4.patch,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- tomcat4.patch       20 Dec 2006 18:01:18 -0000      1.2.2.1
+++ tomcat4.patch       31 Jan 2007 19:18:05 -0000      1.2.2.2
@@ -23,7 +23,7 @@
 +      start)
 +              /bin/echo "Starting Tomcat: \c"
 +              $CATALINA_HOME/bin/catalina.sh start 
>>@PREFIX@/var/tomcat4/logs/tomcat.log 2>&1
-+              echo "ok"
++              /bin/echo "ok"
 +              ;;
 +
 +      stop)
@@ -46,16 +46,16 @@
 +              if [ "$TCDONE" = "1" ]; then
 +                      $0 start
 +              else
-+                      echo ""
-+                      echo "Tomcat is not shutting down properly.  Please 
check"
-+                      echo "your logs and try again."
-+                      echo ""
++                      /bin/echo ""
++                      /bin/echo "Tomcat is not shutting down properly.  
Please check"
++                      /bin/echo "your logs and try again."
++                      /bin/echo ""
 +                      exit 1
 +              fi
 +              ;;
 +
 +      *)
-+              echo "Usage: $0 {start|stop|restart}"
++              /bin/echo "Usage: $0 {start|stop|restart}"
 +              exit 1
 +              ;;
 +


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to