svn rev 546 - 1.2.3

COPYING

@@ -278,63 +278,3 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

ChangeLog

@@ -1,6 +1,6 @@
-CHANGELOG $Revision: 91 $
+CHANGELOG $Revision: 100 $
 
-20060321 1.2.1+
+20060321 1.2.2
 	sleep introduced, to reduce load.
 	examples in the manual introduced.
 	new formatting on usage() to not get line breaks.

Dirlist.hh

@@ -3,13 +3,14 @@ files for reading entries from a file structure.
 
 Author Paul Sundvall 2006
 see LICENSE for details.
-$Revision: 43 $
-$Id: Dirlist.hh 43 2006-02-28 17:56:41Z pauls $
+$Revision: 530 $
+$Id: Dirlist.hh 530 2008-10-03 09:41:29Z pauls $
  */
 #ifndef Dirlist_hh
 #define Dirlist_hh
 
 #include <string>
+#include <cstring>
 
 //class that traverses a directory
 class Dirlist {

Fileinfo.hh

@@ -3,8 +3,8 @@ a class to hold information about a file.
 
 Author Paul Sundvall 2006
 see LICENSE for details.
-$Revision: 43 $
-$Id: Fileinfo.hh 43 2006-02-28 17:56:41Z pauls $
+$Revision: 530 $
+$Id: Fileinfo.hh 530 2008-10-03 09:41:29Z pauls $
  */
 
 #ifndef Fileinfo_hh
@@ -13,6 +13,7 @@ $Id: Fileinfo.hh 43 2006-02-28 17:56:41Z pauls $
 
 
 #include <iostream> //for cout etc.
+#include <cstring>
 
 using std::cout;
 using std::endl;

Rdutil.hh

@@ -4,13 +4,14 @@ functionality in rdfind.
 
 Author Paul Sundvall 2006
 see LICENSE for details.
-$Revision: 91 $
-$Id: Rdutil.hh 91 2006-03-26 09:12:16Z pauls $
+$Revision: 530 $
+$Id: Rdutil.hh 530 2008-10-03 09:41:29Z pauls $
  */
 #ifndef rdutil_hh
 #define rdutil_hh
 
 #include <fstream> //for file writing
+#include <algorithm>
 
 #include "MultiAttributeCompare.hh"//for sorting on multiple attributes
 

VERSION

@@ -1,9 +1,9 @@
-1.2.2
+1.2.2+
 
 Note that the version number exists at three places:
 here (file VERSION)
 configure.in
 rdfind.1 (the man page)
 
-$Revision: 92 $
-$Id: VERSION 92 2006-03-26 09:27:32Z pauls $
+$Revision: 100 $
+$Id: VERSION 100 2006-04-04 10:00:59Z pauls $

configure.in

@@ -1,11 +1,11 @@
 dnl configure.in for rdfind. Written By Paul Sundvall.
-dnl This file is cvs version $Revision: 92 $
+dnl This file is cvs version $Revision: 546 $
 
-VERSION="1.2.2"
-AC_INIT(rdfind.cc,1.2.2)
+VERSION="1.2.3"
+AC_INIT(rdfind.cc,1.2.3)
 AM_CONFIG_HEADER(config.h)       
 
-AM_INIT_AUTOMAKE(rdfind,1.2.2)
+AM_INIT_AUTOMAKE(rdfind,1.2.3)
 
 
 dnl find and test the C compiler
@@ -36,7 +36,7 @@ AC_CHECK_LIB(nettle,main,,[AC_MSG_ERROR([
 ])])
 
 dnl test for some specific functions
-AC_CHECK_FUNC(stat,,AC_MSG_ERROR(oops! no start ?!?))
+AC_CHECK_FUNC(stat,,AC_MSG_ERROR(oops! no stat ?!?))
 AC_CHECK_FUNC(nanosleep,,AC_MSG_WARN(cant do nanosleep ?))
 
 AC_CHECK_LIB(stdc++, main,,AC_MSG_ERROR(rdfind requires libstdc++))          

creating_deb_pkg.txt

@@ -0,0 +1,35 @@
+#!/bin/bash
+#this file is version $Revision: 235 $
+
+#follow http://www.debian.org/doc/maint-guide/ch-start.en.html
+
+
+mkdir -p debianize_rdfind
+cd debianize_rdfind/
+cp ~/code/eget/cvs/paulsundvall.net/rdfind/rdfind-1.2.2.tar.gz . 
+tar xvzf rdfind-1.2.2.tar.gz
+cd rdfind-1.2.2
+dh_make -e [email protected] -f ../rdfind-1.2.2.tar.gz 
+#(answer s, single binary)
+#emacs debian/control
+cp /tmp/control debian/
+#emacs debian/copyright
+
+#emacs debian/changelog
+cp /tmp/copyright debian/
+#leave debian/rules unchanged
+rm debian/README.Debian
+#debian/conffiles.ex was missing! should be deleted anyway...
+rm debian/*.ex
+#rm debian/cron.d.ex
+#changed debian/dirs to contain only usr/bin
+echo "usr/bin"> debian/dirs
+#debian/docs unchanged
+rm debian/emacsen-*
+# rm debian/init.d.ex
+cp /tmp/rdfind.1 debian/
+#emacs debian/menu.ex
+echo '?package(rdfind):needs="text" section="Apps/Util"\
+         title="rdfind" command="/usr/bin/rdfind"'>debian/menu
+rm debian/rdfind.doc-base.EX
+dpkg-buildpackage -rfakeroot -k0x509CCB46                                         

debianpackage/changelog

@@ -0,0 +1,6 @@
+rdfind (1.2.2-1) unstable; urgency=low
+
+  * Initial release 
+
+ -- Paul Sundvall <[email protected]>  Sun, 26 Nov 2006 10:34:21 +0100
+

debianpackage/control

@@ -0,0 +1,15 @@
+Source: rdfind
+Section: utils
+Priority: extra
+Maintainer: Paul Sundvall <[email protected]>
+Build-Depends: debhelper (>= 5), autotools-dev, libnettle-dev
+Standards-Version: 3.7.2
+
+Package: rdfind
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: A tool to find duplicate files
+ Rdfind is a tool to find duplicate files based on their content.
+ Optionally, duplicate files can be replaced with hardlinks, symbolic links
+ or deleted. Per default, a report file is generated and a report on the
+ aumount of disk space that can be reduced is shown on standard output.

debianpackage/copyright

@@ -0,0 +1,18 @@
+This package was debianized by Paul Sundvall <[email protected]> on
+Sun, 26 Nov 2006 10:34:21 +0100.
+
+It was downloaded from http://rdfind.paulsundvall.net
+
+Upstream Author: Paul Sundvall <[email protected]>
+
+Copyright: Paul Sundvall 2006 and on.
+
+License: 
+
+Rdfind is available under GPL, see `/usr/share/common-licenses/GPL'.
+
+
+The Debian packaging is (C) 2006, Paul Sundvall <[email protected]> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+
+

debianpackage/create_archive.sh

@@ -0,0 +1,103 @@
+#!/bin/bash
+
+#$Date: 2006-11-26 12:17:24 +0100 (sön, 26 nov 2006) $
+#$Rev: 238 $
+#$Author: pauls $
+#$Id: create_package.sh 238 2006-11-26 11:17:24Z pauls $
+
+echo "this is made from  http://people.connexer.com/~roberto/howtos/debrepository and works, except that it wont be signed."
+
+sourcedirs="$HOME/tmp/debianize_rdfind/"
+repdir=$HOME/tmp/debian_repository
+
+mkdir -p $repdir
+
+
+pushd $repdir
+
+rm packages*
+rm *.conf
+rm dists/* -rf
+rm binary/* -rf
+rm source/* -rf
+rmdir binary*
+rmdir source*
+rmdir dists
+rm Release Packages Release.gz Packages.gz
+
+
+
+#from http://people.connexer.com/~roberto/howtos/debrepository
+
+echo will now create the directory structure
+
+mkdir -p dists
+mkdir -p dists/sarge
+#mkdir -p dists/sarge/contrib
+#mkdir -p dists/sarge/contrib/binary-i386
+#mkdir -p dists/sarge/contrib/source
+mkdir -p dists/sarge/main
+mkdir -p dists/sarge/main/binary-i386
+mkdir -p dists/sarge/main/source
+#mkdir -p dists/sarge/non-free
+#mkdir -p dists/sarge/non-free/binary-i386
+#mkdir -p dists/sarge/non-free/source
+
+
+
+echo will now move the packages to the correct places
+
+for srcdir in $sourcedirs; do
+find $srcdir -type f  -name "*.deb" -exec cp {} dists/sarge/main/binary-i386 \; -print 
+find $srcdir -type f  -a \(  -name "*.orig.gz" -o -name "*.diff.gz" -o -name "*.dsc" \) -exec cp {} dists/sarge/main/source \; -print 
+done
+
+
+
+echo 'APT::FTPArchive::Release::Origin "Your name or organization";
+APT::FTPArchive::Release::Label "Descriptive label";
+APT::FTPArchive::Release::Suite "stable";
+APT::FTPArchive::Release::Codename "sarge";
+APT::FTPArchive::Release::Architectures "i386 source";
+APT::FTPArchive::Release::Components "main";
+APT::FTPArchive::Release::Description "More detailed description";
+'>apt-sarge-release.conf
+
+echo 'Dir {
+  ArchiveDir ".";
+  CacheDir ".";
+};
+
+Default {
+  Packages::Compress ". gzip bzip2";
+  Sources::Compress "gzip bzip2";
+  Contents::Compress "gzip bzip2";
+};
+
+BinDirectory "dists/sarge/main/binary-i386" {
+  Packages "dists/sarge/main/binary-i386/Packages";
+  Contents "dists/sarge/Contents-i386";
+  SrcPackages "dists/sarge/main/source/Sources";
+};
+
+  
+Tree "dists/sarge" {
+  Sections "main";
+  Architectures "i386 source";
+};
+
+Default {
+  Packages {
+    Extensions ".deb";
+  };
+};
+'>apt-ftparchive.conf
+
+apt-ftparchive generate apt-ftparchive.conf
+apt-ftparchive -c apt-sarge-release.conf release dists/sarge/ >dists/sarge/Release
+
+gpg -u 0x509CCB46 --sign -ba -o dists/sarge/Release.gpg dists/sarge/Release
+exit
+
+ssh atle 'rm -rf /var/www/debian/*'
+scp -r * atle:/var/www/debian/