[Forensics-changes] [SCM] debian-forensics/guymager branch, debian, updated. debian/0.5.9-2-2-g43e371c

[Julien Valroff]

The following commit has been merged in the debian branch:
commit 43e371cb38211793b6c384f6a8fb7badf7b5fb5d
Author: Julien Valroff <julien at kirya.net>
Date:   Sat Jan 14 09:03:01 2012 +0100

    Link to libprocps using the new libprocps0-dev package

diff --git a/debian/changelog b/debian/changelog
index 97fbda8..f297fd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ guymager (0.5.9-3) unstable; urgency=low
 
   * Team upload.
   * Changed section to utils as per the override file 
+  * Link to libprocps using the new libprocps0-dev package 
 
- -- Julien Valroff <julien at debian.org>  Sun, 08 Jan 2012 14:42:28 +0100
+ -- Julien Valroff <julien at debian.org>  Sat, 14 Jan 2012 09:00:29 +0100
 
 guymager (0.5.9-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 0242fca..6de1b15 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
 Uploaders: Michael Prokop <mika at debian.org>
 Build-Depends: debhelper (>= 8), libewf-dev (>=20080501), libguytools2-dev,
- libparted0-dev, libproc-dev, libqt4-dev, libssl-dev
+ libparted0-dev, libprocps0-dev, libqt4-dev, libssl-dev
 Standards-Version: 3.9.2
 Homepage: http://guymager.sourceforge.net/
 Vcs-Browser: http://git.debian.org/?p=forensics/guymager.git
diff --git a/debian/patches/01_do-not-statically-compile-against-libs.diff b/debian/patches/01_do-not-statically-compile-against-libs.diff
old mode 100755
new mode 100644
index 12764c8..ce381e5
--- a/debian/patches/01_do-not-statically-compile-against-libs.diff
+++ b/debian/patches/01_do-not-statically-compile-against-libs.diff
@@ -1,10 +1,9 @@
 Description: disable statically linking
 Author: Mickael Prokop <mika at debian.org>
-Last-Updated: 2012-01-07
+Last-Updated: 2012-01-14
 
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' guymager~/guymager.pro guymager/guymager.pro
---- guymager~/guymager.pro	2012-01-07 15:20:44.000000000 +0100
-+++ guymager/guymager.pro	2012-01-07 15:39:26.808021108 +0100
+--- a/guymager.pro
++++ b/guymager.pro
 @@ -140,11 +140,11 @@
  fastasm.commands = g++ -c $$FAST_ASM_CXXFLAGS ${QMAKE_FILE_IN} -o  ${QMAKE_FILE_BASE}.o 2>&1 | grep -vE \"matching constraint does not allow a register|In function |At global scope:\"  | cat
  QMAKE_EXTRA_COMPILERS += fastasm
@@ -14,7 +13,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
 -#LIBS += -lguytools
 -LIBS += /usr/lib/libewf.a
 -LIBS += /usr/lib/libguytools.a
-+LIBS += -lproc-ng
++LIBS += -lprocps
 +LIBS += -lewf
 +LIBS += -lguytools
 +#LIBS += /usr/lib/libewf.a

-- 
debian-forensics/guymager