[Forensics-changes] [SCM] debian-forensics/guymager branch, master, updated. debian/0.5.9-1-12-gb24145a

Julien Valroff julien at kirya.net
Sat Jan 7 15:20:32 UTC 2012


The following commit has been merged in the master branch:
commit 593b6a0b6ec163b6274de20d4fbefe2753cc5443
Merge: 3d1ded74a089e8a3513d45e65022af4bf5ab8a24 34d0617f24d162bb9c525d4c23802da2f950d8db
Author: Julien Valroff <julien at kirya.net>
Date:   Sat Jan 7 16:13:54 2012 +0100

    Merge branch 'debian'
    
    Conflicts:
    	CREDITS
    	debian/changelog
    	debian/compat
    	debian/control
    	debian/copyright
    	debian/guymager.install
    	debian/rules
    	guymager.desktop
    	package.sh

diff --combined CREDITS
index f9ed512,d5510ac..3efcbe4
--- a/CREDITS
+++ b/CREDITS
@@@ -1,7 -1,15 +1,22 @@@
  
++<<<<<<< HEAD
 +Joachim Metz <joachim.metz at gmail.com>
++=======
+ Joachim Metz <jbmetz at users.sourceforge.net>
++>>>>>>> debian
     Guymager uses Joachim's libewf for writing EWF image files. Without
     Joachim's work on the EWF format, the Guymager project would probably
     never have been started. Special thanks to Joachim as well for
     believing in the idea of parallelised compression and adding the
     necessary extra functions to libewf for Guymager.
++<<<<<<< HEAD
++=======
+ 
+ Michael Prokop <mika at debian.org>
+    Mika took care of correctly packaging Guymager and making it available in 
+    the main repositories. Without him, the Guymager installation would have 
+    remained the nightmare it was before. As well, many thanks to Mika for his 
+    patience while answering my numerous questions about copyright and his 
+    suggestions for giving the sources a GPL compliant shape.
+ 
++>>>>>>> debian
diff --combined guymager.desktop
index d7b6e8e,b9e2688..9ed2a85
--- a/guymager.desktop
+++ b/guymager.desktop
@@@ -6,7 -6,6 +6,10 @@@
  Type=Application
  Version=1.0
  Name=Guymager
++<<<<<<< HEAD
 +Name[vi]=Wireshark
++=======
++>>>>>>> debian
  GenericName=Imager
  Comment=Fast forensic imager
  Icon=guymager_128.png

-- 
debian-forensics/guymager



More information about the forensics-changes mailing list