From fd52650255060b9dabaf6b5665637ac5e147a5ba Mon Sep 17 00:00:00 2001
From: fritz-hh <julien.pfefferkorn@googlemail.com>
Date: Sun, 5 May 2013 16:54:41 +0200
Subject: [PATCH] .gitattribute: handle *.jar and *.pdf as binary

---
 .gitattributes             |  24 +++++---------------
 jhove/bin/JhoveApp.jar     | Bin 724134 -> 724142 bytes
 jhove/bin/JhoveView.jar    | Bin 770494 -> 770505 bytes
 jhove/bin/jhove-module.jar | Bin 528644 -> 528649 bytes
 jhove/bin/jhove.jar        | Bin 79254 -> 79255 bytes
 jhove/conf/jhove.conf.old  |  45 -------------------------------------
 6 files changed, 5 insertions(+), 64 deletions(-)
 delete mode 100644 jhove/conf/jhove.conf.old

diff --git a/.gitattributes b/.gitattributes
index e77e6900..27dc5b03 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,22 +1,8 @@
 # Always use Unix convention for new lines
 * text eol=lf
 
-# Custom for Visual Studio
-*.cs     diff=csharp
-*.sln    merge=union
-*.csproj merge=union
-*.vbproj merge=union
-*.fsproj merge=union
-*.dbproj merge=union
-
-# Standard to msysgit
-*.doc	 diff=astextplain
-*.DOC	 diff=astextplain
-*.docx diff=astextplain
-*.DOCX diff=astextplain
-*.dot  diff=astextplain
-*.DOT  diff=astextplain
-*.pdf  diff=astextplain
-*.PDF	 diff=astextplain
-*.rtf	 diff=astextplain
-*.RTF	 diff=astextplain
+# These files are binary and should be left untouched
+# (binary is a macro for -text -diff)
+*.jar	binary
+*.pdf	binary
+*.PDF	binary
\ No newline at end of file
diff --git a/jhove/bin/JhoveApp.jar b/jhove/bin/JhoveApp.jar
index b84c56717dce669bde8ff4ac7dbb93f850d2c4ca..ec4ac8552b1d85c89157a1d24f5690b0a5df821b 100644
GIT binary patch
delta 96
zcmZ2BQ)k^woej$tF!DApTd*BSi)JwLw(sU(+P<5Enf)Cj@AgCAn1#fF^c7wfMpGbt
q)rsZjG$4KMCX1d6Q0*UCRv=~rVs;?r*#1YBGw2sk-cN!n;tK%sLnIpj

delta 80
zcmZ2CQ)k&soej$tG%sJUefa`L(Tw)J98BByaxk;M+kW&Lvyk}q8@w!xrrU2hvHYC2
i{mM-iJ(qT7IaVNM17da{=Ge|G#~Ji%dzb`Q#1{Z^{vPuH

diff --git a/jhove/bin/JhoveView.jar b/jhove/bin/JhoveView.jar
index 8ed7ca1026ed1e80b6a087ceb88d654c1a5de051..6ad2e0dd2953c8bc4f70ff3815fd04d2e05cca91 100644
GIT binary patch
delta 119
zcmdnjtbejue?xOBBX4ta>UJP~Dv6P|-S-6JcHa|B?C%(Pw})(F77_>2X=j-kO@VYe
z6U)zOKssS2i=GQmZQorMAZ7((HXvr--glQH=oe7_!FA4yp+I`0F4u%UAnmw^t5$`P
Kclo{tTn_<+v@P2J

delta 97
zcmX@vtiP{We?xO>b4%*>mQ==5N$vh87`OYMU}Ar_J$xIpkofkjv&@X9+jE#$eoot-
zHj_oqrG4sM79eH?Vm2UV-#+y&N6@eBFRpW54Bfs<muo`bcJDo0wJOU`KHz!?0Cndr
Aq5uE@

diff --git a/jhove/bin/jhove-module.jar b/jhove/bin/jhove-module.jar
index c1e59778fa0ec9c8a6323b683b3434d3e0a42aac..ed5730df9a4645e77f987ea74a70077d126cc967 100644
GIT binary patch
delta 68
zcmZo!q|muYVZ$sQM&9OGJllaZ`#VP7?F)Y~3W)>h&4Nsfri{GpTilp{m>Gy!fS7gr
Q7B{wYUxD&XHtbDT04e|&Hvj+t

delta 58
zcmeBNq|mZRVZ$t*=Gi>kXY(+!zuUg}7o(8)_HBYpjHc~7+?arv8Hibcn05OOH@0(M
Lx3}A{H(db$w(b}a

diff --git a/jhove/bin/jhove.jar b/jhove/bin/jhove.jar
index 77fea60dd001a194af8760d517c476f77bbe4be0..231fd1ab023856c5f4fe8116f17bd854f84a2d23 100644
GIT binary patch
delta 16
YcmbRCnq~THmJJp0jJ%sG;^nRZ06;qj9{>OV

delta 14
WcmbRKnq}H+mJJp0n=9kxt^oix#|IJs

diff --git a/jhove/conf/jhove.conf.old b/jhove/conf/jhove.conf.old
deleted file mode 100644
index 9481d6e0..00000000
--- a/jhove/conf/jhove.conf.old
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jhoveConfig version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://hul.harvard.edu/ois/xml/ns/jhove/jhoveConfig"
- xsi:schemaLocation="http://hul.harvard.edu/ois/xml/ns/jhove/jhoveConfig
-                     http://hul.harvard.edu/ois/xml/xsd/jhove/1.4/jhoveConfig.xsd">
- <jhoveHome>/users/stephen/projects/jhove</jhoveHome>
- <defaultEncoding>utf-8</defaultEncoding>
- <tempDirectory>/var/tmp</tempDirectory>
- <bufferSize>131072</bufferSize>
- <module>
-  <class>edu.harvard.hul.ois.jhove.module.AiffModule</class>
- </module>
- <module>
-  <class>edu.harvard.hul.ois.jhove.module.WaveModule</class>
- </module>
- <module>
-  <class>edu.harvard.hul.ois.jhove.module.PdfModule</class>
- </module>
- <module>
-  <class>edu.harvard.hul.ois.jhove.module.Jpeg2000Module</class>
- </module>
- <module>
-  <class>edu.harvard.hul.ois.jhove.module.JpegModule</class>
- </module>
- <module>
-  <class>edu.harvard.hul.ois.jhove.module.GifModule</class>
- </module>
- <module>
-  <class>edu.harvard.hul.ois.jhove.module.TiffModule</class>
- </module>
- <module>
-  <class>edu.harvard.hul.ois.jhove.module.XmlModule</class>
-  <param>schema=http://www.example.com/schema;/home/schemas/exampleschema.xsd</param>
- </module>
- <module>
-  <class>edu.harvard.hul.ois.jhove.module.HtmlModule</class>
- </module>
- <module>
-  <class>edu.harvard.hul.ois.jhove.module.AsciiModule</class>
- </module>
- <module>
-  <class>edu.harvard.hul.ois.jhove.module.Utf8Module</class>
- </module>
-</jhoveConfig>