Created an updated package but can't upload it.. Mr van der Meeren, are
you still doing Debian?
#Regards!
diff -Nru vinetto-0.6.0~alpha/debian/changelog
vinetto-0.07~beta/debian/changelog
--- vinetto-0.6.0~alpha/debian/changelog 2013-07-28 02:12:54.000000000
+0200
+++ vinetto-0.07~beta/debian/changelog 2013-07-28 02:12:54.000000000 +0200
@@ -1,3 +1,10 @@
+vinetto (0.07~beta-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * Non-maintainer upload.
+
+ -- Marcel Partap <mpar...@gmx.net> Sun, 28 Jul 2013 01:16:26 +0200
+
vinetto (0.6.0~alpha-1) unstable; urgency=low
* Changed setup.py to use relative paths
diff -Nru vinetto-0.6.0~alpha/README vinetto-0.07~beta/README
--- vinetto-0.6.0~alpha/README 2006-05-08 15:50:39.000000000 +0200
+++ vinetto-0.07~beta/README 2007-06-14 21:43:04.000000000 +0200
@@ -6,7 +6,7 @@
-Version alpha 0.06 (7 may 2006)
+Version beta 0.07 (June 14 2007)
------------------
Introduction
@@ -93,16 +93,20 @@
Usage
-----
-Usage: vinetto [OPTIONS] [-o DIR] file
+usage: vinetto [OPTIONS] [-s] [-U] [-o DIR] file
options:
--version show program's version number and exit
-h, --help show this help message and exit
-o DIR write thumbnails to DIR
-H write html report to DIR
+ -U use utf8 encodings
+ -s create symlink of the image realname to the numbered name in
+ DIR/.thumbs
+
Metadata list will be written on standard output.
--------------
-7 may 2006
+June 14 2007
Michel Roukine
diff -Nru vinetto-0.6.0~alpha/res/HtRepTemplate.html
vinetto-0.07~beta/res/HtRepTemplate.html
--- vinetto-0.6.0~alpha/res/HtRepTemplate.html 2006-05-08 15:50:40.000000000
+0200
+++ vinetto-0.07~beta/res/HtRepTemplate.html 2007-03-03 10:09:01.000000000
+0100
@@ -1,6 +1,7 @@
<HTML>
<HEAD>
<TITLE>Vinetto -H report</TITLE>
+<META http-equiv="Content-Type" content="text/html;charset=__CHARSET__">
</HEAD>
<BODY>
<CENTER><H2>Vinetto -- thumbnails extraction report</H2></CENTER>
@@ -85,4 +86,4 @@
</DIV>
<EM>__VVERSION__</EM>
</BODY>
-</HTML>
\ No newline at end of file
+</HTML>
diff -Nru vinetto-0.6.0~alpha/setup.py vinetto-0.07~beta/setup.py
--- vinetto-0.6.0~alpha/setup.py 2013-07-28 02:12:54.000000000 +0200
+++ vinetto-0.07~beta/setup.py 2007-03-03 10:09:02.000000000 +0100
@@ -3,7 +3,7 @@
version='0.06alpha',
scripts=['vinetto'],
py_modules=['vinutils', 'vinreport'],
- data_files=[('usr/share/vinetto', ['res/header', 'res/huffman', \
+ data_files=[('/usr/share/vinetto', ['res/header', 'res/huffman', \
'res/quantization', \
'res/HtRepTemplate.html'])],
description='vinetto : a forensics tool to examine Thumbs.db files.',
diff -Nru vinetto-0.6.0~alpha/vinetto vinetto-0.07~beta/vinetto
--- vinetto-0.6.0~alpha/vinetto 2006-05-08 15:50:39.000000000 +0200
+++ vinetto-0.07~beta/vinetto 2007-03-03 10:09:02.000000000 +0100
@@ -25,7 +25,7 @@
-----------------------------------------------------------------------------
"""
-__revision__ = "$Revision: 56 $"
+__revision__ = "$Revision: 59 $"
__version__ = "0.06"
__author__ = 'Michel Roukine'
@@ -46,6 +46,7 @@
EOI = unhexlify('ffd9')
HEADER1 = unhexlify('0c00')
PIL = ""
+NUMBERED_THUMBS_DIR = ".thumbs"
def getargs():
@@ -54,12 +55,18 @@
"Copyright (C) 2005-2006 Michel Roukine.\n" + \
"Vinetto is open source software," + \
" see http://vinetto.sourceforge.net/";
- parser = OptionParser(usage="%prog [OPTIONS] [-o DIR] file",
version=verstr)
+ parser = OptionParser(usage="%prog [OPTIONS] [-s] [-U] [-o DIR] file",
version=verstr)
parser.add_option("-o", dest="outputdir",
help="write thumbnails to DIR", metavar="DIR")
parser.set_defaults(htmlrep=False)
parser.add_option("-H", action="store_true", dest="htmlrep",
help="write html report to DIR")
+ parser.set_defaults(encoding=False)
+ parser.add_option("-U", action="store_true", dest="encoding",
+ help="use utf8 encodings")
+ parser.set_defaults(symlinks=False)
+ parser.add_option("-s", action="store_true", dest="symlinks",
+ help="create symlink of the image realname to the
numbered name in DIR/.thumbs")
opts, pargs = parser.parse_args()
if len(pargs) != 1:
@@ -67,9 +74,23 @@
if (opts.outputdir == None) and (opts.htmlrep == True):
parser.error("-H option requires -o with a directory name")
-
- return (pargs[0], opts.outputdir, opts.htmlrep)
+ os.system("mkdir " + opts.outputdir + "/" + NUMBERED_THUMBS_DIR)
+ return (pargs[0], opts.outputdir, opts.htmlrep, opts.encoding,
opts.symlinks)
+
+def getencodings():
+ """What encoding we use?"""
+ if utf8encoding:
+ fileencoding = 'utf8'
+ else:
+ fileencoding = 'iso-8859-1'
+ return fileencoding
+
+def encodefilename(originame):
+ """Convert filename to the global encoding. """
+ TNname = unicode(originame,
+ 'utf-16-le').encode(getencodings(), 'replace')
+ return TNname
def conv2pytime (win32filetime):
"""Convert win32 timestamp to python time. """
@@ -90,7 +111,7 @@
return unpack("<l", TDB[offst:offst+4])[0]
# Beginning ...
-tDBfname, outputdir, htmlrep = getargs()
+tDBfname, outputdir, htmlrep, utf8encoding, symlinks = getargs()
# Testing file and DIR parameters
if not os.access(tDBfname, os.F_OK):
@@ -141,7 +162,7 @@
huffman = open("/usr/share/vinetto/huffman","rb").read()
if htmlrep == True:
- report = vinreport.HtRep(tDBfname, outputdir, __version__ + " (r" + \
+ report = vinreport.HtRep(tDBfname, outputdir, getencodings(),
__version__ + " (r" + \
__revision__[11:-2] +")")
md5tDB = md5.new(thumbsDB).hexdigest()
report.SetFileSection(longueur, md5tDB)
@@ -267,8 +288,10 @@
originame = sr[indcat+16 :indcat+16+nameLen]
TNid = "%04i" % num
TNtimestamp = ctime(conv2pytime(timestamp))
- TNname = unicode(originame,
- 'utf-16-le').encode('iso-8859-1', 'replace')
+ TNname = encodefilename(originame)
+ if symlinks:
+ os.system( "ln -fs " + NUMBERED_THUMBS_DIR + "/" +
TNid + ".jpg " + "\"" + \
+ outputdir + "/" + TNname + "\"" )
print " " + TNid, " ", TNtimestamp, " ", TNname
addCatEntry(num, TNtimestamp, TNname)
indcat = indcat + recordLen
@@ -294,7 +317,7 @@
# is it a type 2 thumbnail ? (full jpeg)
if sr[0x0c:0x10] == "\xff\xd8\xff\xe0" :
if outputdir != None :
- open(outputdir + TNfname(SIDstr, "2") + ".jpg", \
+ open(outputdir + "/" + NUMBERED_THUMBS_DIR + "/" +
TNfname(SIDstr, "2") + ".jpg", \
"wb").write(sr[0x0c:])
elif unpack("<L",sr[0x0c:0x10])[0] == 1 :
# is second header OK ?
@@ -362,4 +385,4 @@
if htmlrep == True:
report.flush(statstring)
-
\ No newline at end of file
+
diff -Nru vinetto-0.6.0~alpha/vinreport.py vinetto-0.07~beta/vinreport.py
--- vinetto-0.6.0~alpha/vinreport.py 2006-05-08 15:50:39.000000000 +0200
+++ vinetto-0.07~beta/vinreport.py 2007-03-03 10:09:01.000000000 +0100
@@ -53,7 +53,7 @@
class HtRep(Report):
""" Html vinetto elementary mode report Class. """
- def __init__ (self, tDBfname, outputdir, verstr):
+ def __init__ (self, tDBfname, outputdir, charset, verstr):
""" Initialize a new HtRep instance. """
Report.__init__(self, tDBfname, outputdir, verstr)
self.rownumber = 0
@@ -61,6 +61,8 @@
for ligne in open("/usr/share/vinetto/HtRepTemplate.html",
"r").readlines():
+ if ligne.find("__CHARSET__") > 0:
+ ligne = ligne.replace("__CHARSET__", charset)
if ligne.find("__ITS__") >= 0:
separatorID += 1
continue
