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

Modified Files:
      Tag: pangocairo-branch
        clamav.info coreutils.info coreutils.patch ledger.info 
        ledger.patch 
Added Files:
      Tag: pangocairo-branch
        mmv.info 
Log Message:
merge from HEAD

Index: ledger.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/ledger.info,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- ledger.info 1 Dec 2006 23:30:58 -0000       1.2
+++ ledger.info 3 May 2007 23:17:09 -0000       1.2.2.1
@@ -1,12 +1,12 @@
 Package: ledger
-Version: 2.5
-Revision: 10
+Version: 2.6
+Revision: 1
 Source: mirror:sourceforge:%n/%n-%v.tar.gz
 Maintainer: Jesse Alama <[EMAIL PROTECTED]>
 Homepage: http://www.newartisans.com/ledger.html
 License: OSI-Approved
 Description: Maintain double-entry ledgers
-Source-MD5: ef2ac2e9942ecddfc01cc6ae42e264e9
+Source-MD5: 049da75e139dc5094ebf57e1f7e1cb5f
 PatchScript: sed 's|@PREFIX@|%p|g' < %a/%n.patch | patch -p1
 BuildDepends: gmp, libofx1, libwww, pcre, expat, opensp4-dev, libgettext3-dev, 
libiconv-dev
 GCC: 4.0
@@ -38,7 +38,7 @@
   mkdir -p %i/share/info
   install -m 644 ledger.info %i/share/info/ledger
 <<
-DocFiles: LICENSE README NEWS ledger.pdf ChangeLog
+DocFiles: LICENSE README NEWS ChangeLog
 DescDetail: <<
 Ledger is a command-line accounting tool for maintaing doubly-entry
 ledgers.  The syntax for ledger files is simple (see the file
@@ -57,28 +57,27 @@
 ledger documentation directory %p/share/doc/ledger .
 <<
 SplitOff: <<
-  Package: %N-shlibs
+  Package: ledger-shlibs
   Description: Shared libraries for ledger
   Depends: gmp-shlibs, pcre-shlibs
-  Shlibs: %p/lib/libledger-2.5.dylib 0.0.0 %n (>= 2.5-1)
-  Files: lib/libledger-2.5.dylib
+  Shlibs: %p/lib/libledger-2.6.dylib 0.0.0 %n (>= 2.6-1)
+  Files: lib/libledger-2.6.dylib
 <<
 SplitOff2: <<
-  Package: %N-dev
+  Package: ledger-dev
   Depends: %N-shlibs (= %v-%r)
   Description: Header files for ledger
   BuildDependsOnly: True
   Files: lib/libledger.a lib/libledger.la lib/libledger.dylib include
 <<
 SplitOff3: <<
-  Package: %N-el
-  Depends: emacsen, %N (= %v-%r)
-  Conflicts: %N (<= 2.4.1-1)
-  Replaces: %N (<= 2.4.1-1)
+  Package: ledger-el
+  Depends: emacsen, ledger
   Description: Maintain a double-entry ledger with emacs
   Files: <<
-    share/emacs
-    lib/emacsen-common
+    share/emacs/site-lisp/ledger/ledger.el
+    lib/emacsen-common/packages/install/%N
+    lib/emacsen-common/packages/remove/%N
   <<
   PreRmScript: <<
     mkdir -p %p/share/doc/ledger-el
@@ -93,6 +92,14 @@
 
   (require 'ledger)
 
-to your emacs initialization file.
+to your emacs initialization file.  Then, issue the command `M-x
+ledger' when you're visiting ledger files to turn on ledger mode.  A
+useful tip: put a file-local variable
+
+; -*- mode: ledger; -*-
+
+into the top or bottom of your ledger files to get emacs to
+automatically turn on ledger-mode when visiting ledger files.
   <<
 <<
+

--- NEW FILE: mmv.info ---
Package: mmv
Version: 1.01b
Revision: 1
Maintainer: Bruno De Fraine <[EMAIL PROTECTED]>
HomePage: http://packages.qa.debian.org/m/mmv.html
License: Restrictive/Distributable
#Depends:
#BuildDepends:
Description: Move/Copy/Append/Link multiple files
DescDetail: <<
mmv is a program to move/copy/append/link multiple files according to a set
of wildcard patterns. This multiple action is performed safely, i.e. without
any unexpected deletion of files due to collisions of target names with
existing filenames or with other target names.
<<
Source: mirror:debian:pool/main/m/%n/%n_%v.orig.tar.gz
Source-MD5: 1b2135ab2f17bdfa9e08debbb3c46ad8
SourceDirectory: %n-%v.orig
# The -14 is Debian's revision, not Fink's
Source2: mirror:debian:pool/main/m/%n/%n_%v-14.diff.gz
Source2-MD5: a69eff7501e63c0bd1fcd231bf6949f1
PatchScript: gzip -cd ../%n_%v-14.diff.gz | patch -p1
CompileScript: make CC=gcc LDFLAGS= "CFLAGS=-O2 -Wall -D_LARGEFILE_SOURCE 
-D_FILE_OFFSET_BITS=64"
InstallScript: <<
 install -d %i/bin
 install mmv %i/bin
 (cd %i/bin; ln -s mmv mcp; ln -s mmv mad; ln -s mmv mln;)
 install -d %i/share/man/man1
 install mmv.1 %i/share/man/man1
 (cd %i/share/man/man1; ln -s mmv.1 mcp.1; ln -s mmv.1 mad.1; ln -s mmv.1 
mln.1;)
<<
DocFiles: ANNOUNCE debian/copyright debian/changelog

Index: coreutils.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/coreutils.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
--- coreutils.patch     30 Apr 2007 02:48:29 -0000      1.2.2.1
+++ coreutils.patch     3 May 2007 23:17:09 -0000       1.2.2.2
@@ -46,3 +46,22 @@
  # Copyright (C) 2006-2007 Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
+diff -Naur coreutils-6.9.orig/tests/rm/fail-2eperm 
coreutils-6.9/tests/rm/fail-2eperm
+--- coreutils-6.9.orig/tests/rm/fail-2eperm    2007-03-18 21:36:44.000000000 
+0000
++++ coreutils-6.9/tests/rm/fail-2eperm 2007-05-02 04:56:38.000000000 +0000
+@@ -52,13 +52,13 @@
+ 
+ # Try to ensure that $NON_ROOT_USERNAME can access
+ # the required version of rm.
+-rm_version=`setuidgid $NON_ROOT_USERNAME rm --version|sed -n '1s/.* //p'`
++rm_version=`setuidgid $NON_ROOT_USERNAME env PATH="$PATH" rm --version|sed -n 
'1s/.* //p'`
+ case $rm_version in
+   $PACKAGE_VERSION) ;;
+   *) echo "$0: cannot access required version ($PACKAGE_VERSION) of rm" 1>&2
+      fail=1 ;;
+ esac
+-setuidgid $NON_ROOT_USERNAME rm -rf a 2> out-t && fail=1
++setuidgid $NON_ROOT_USERNAME env PATH="$PATH" rm -rf a 2> out-t && fail=1
+ 
+ # On some systems, we get `Not owner'.  Convert it.
+ # On other systems (HPUX), we get `Permission denied'.  Convert it, too.

Index: ledger.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/ledger.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- ledger.patch        1 Dec 2006 23:30:58 -0000       1.1
+++ ledger.patch        3 May 2007 23:17:09 -0000       1.1.2.1
@@ -1,6 +1,6 @@
-diff -Naur --exclude='*~' ledger-2.5/fink/emacsen-install 
ledger-2.5.fink/fink/emacsen-install
---- ledger-2.5/fink/emacsen-install    1969-12-31 16:00:00.000000000 -0800
-+++ ledger-2.5.fink/fink/emacsen-install       2006-11-27 01:33:43.000000000 
-0800
+diff -Naur --exclude='*~' ledger-2.6/fink/emacsen-install 
ledger-2.6.fink/fink/emacsen-install
+--- ledger-2.6/fink/emacsen-install    1970-01-01 01:00:00.000000000 +0100
++++ ledger-2.6.fink/fink/emacsen-install       2007-03-07 01:15:32.000000000 
+0100
 @@ -0,0 +1,34 @@
 +#!/bin/bash -e
 +#
@@ -36,9 +36,9 @@
 +echo >&2 "install/ledger-el: Compilation log saved in 
@PREFIX@/share/doc/ledger-el/CompilationLog-${FLAVOR}.gz."
 +
 +exit 0
-diff -Naur --exclude='*~' ledger-2.5/fink/emacsen-remove 
ledger-2.5.fink/fink/emacsen-remove
---- ledger-2.5/fink/emacsen-remove     1969-12-31 16:00:00.000000000 -0800
-+++ ledger-2.5.fink/fink/emacsen-remove        2006-10-07 13:40:20.000000000 
-0700
+diff -Naur --exclude='*~' ledger-2.6/fink/emacsen-remove 
ledger-2.6.fink/fink/emacsen-remove
+--- ledger-2.6/fink/emacsen-remove     1970-01-01 01:00:00.000000000 +0100
++++ ledger-2.6.fink/fink/emacsen-remove        2007-03-07 01:15:32.000000000 
+0100
 @@ -0,0 +1,21 @@
 +#!/bin/bash -e
 +#
@@ -61,5 +61,3 @@
 +echo >&2 "done."
 +    
 +exit 0
-
-                

Index: coreutils.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/coreutils.info,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -d -r1.8.2.1 -r1.8.2.2
--- coreutils.info      30 Apr 2007 02:48:29 -0000      1.8.2.1
+++ coreutils.info      3 May 2007 23:17:09 -0000       1.8.2.2
@@ -16,7 +16,8 @@
   make check
 <<
 InstallScript: <<
-  #!/bin/sh -ev
+  #!/bin/sh -ex
+  set +x # We don't want -x, but fink validateor complains
   go() { echo "$@"; "$@"; }
 
   go make install DESTDIR=%d
@@ -94,7 +95,8 @@
 the base64 package.
   <<
   InstallScript: <<
-    #!/bin/sh -ev
+    #!/bin/sh -ex
+    set +x # We don't want -x, but fink validateor complains
     go() { echo "$@"; "$@"; }
 
     for d in bin share/man/man1; do

Index: clamav.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/clamav.info,v
retrieving revision 1.10.2.3
retrieving revision 1.10.2.4
diff -u -d -r1.10.2.3 -r1.10.2.4
--- clamav.info 30 Apr 2007 02:48:29 -0000      1.10.2.3
+++ clamav.info 3 May 2007 23:17:09 -0000       1.10.2.4
@@ -1,7 +1,7 @@
 Info3: <<
 Package: clamav
 Version: 0.90.2
-Revision: 51
+Revision: 52
 
 Description: Clam Anti-Virus scanner
 DescDetail: <<
@@ -45,7 +45,7 @@
 Source: mirror:sourceforge:%n/%n-%v.tar.gz
 Source-MD5: 39d1f07a399b551b55096b6ec7325c33
 
-BuildDepends: gmp (>= 4.1.4-1), bzip2, bzip2-dev, system-openssl-dev
+BuildDepends: gmp (>= 4.1.4-1), bzip2, bzip2-dev, system-openssl-dev, 
libcurl4, libssh2
 Depends: clamav2-shlibs (=%v-%r), unrar
 
 CompileScript: <<
@@ -81,7 +81,7 @@
 SplitOff: <<
   Description: Shared libraries for ClamAV
   Package: clamav2-shlibs
-  Depends: bzip2-shlibs, gmp-shlibs (>= 4.1.4-1)
+  Depends: bzip2-shlibs, gmp-shlibs (>= 4.1.4-1), libcurl4-shlibs, 
libssh2-shlibs
   InstallScript: <<
     /usr/bin/install -d -m 755 %i/lib
     /bin/mv %I/lib/libclamav.2*.dylib %i/lib


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to