[debian-edu-commits] debian-edu/ 05/50: Refresh patches.

[Unit 193]

This is an automated email from the git hooks/post-receive script.

unit193-guest pushed a commit to branch master
in repository veracrypt.

commit d062841c38cbe11f1820368fbba15c7ad3f094c5
Author: Unit 193 <unit193 at ubuntu.com>
Date:   Thu Jan 8 04:45:02 2015 -0500

    Refresh patches.
---
 debian/patches/002-build-flags.diff       | 12 ------------
 debian/patches/005-indicator-support.diff |  4 ++--
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/debian/patches/002-build-flags.diff b/debian/patches/002-build-flags.diff
index ce91adf..b577275 100644
--- a/debian/patches/002-build-flags.diff
+++ b/debian/patches/002-build-flags.diff
@@ -19,18 +19,6 @@ Index: veracrypt/src/Makefile
  
  export TC_BUILD_CONFIG := Release
  
---- veracrypt.orig/src/Main/Main.make
-+++ veracrypt/src/Main/Main.make
-@@ -123,7 +123,7 @@ TC_VERSION = $(shell grep VERSION_STRING
- 
- $(APPNAME): $(LIBS) $(OBJS)
- 	@echo Linking $@
--	$(CXX) -o $(APPNAME) $(LFLAGS) $(OBJS) $(LIBS) $(FUSE_LIBS) $(WX_LIBS)
-+	$(CXX) -o $(APPNAME) $(LFLAGS) $(OBJS) $(LIBS) $(FUSE_LIBS) $(WX_LIBS) -ldl
- 
- ifeq "$(TC_BUILD_CONFIG)" "Release"
- ifndef NOSTRIP
-
 --- veracrypt.orig/src/Build/Include/Makefile.inc	2012-02-07 11:36:48.000000000 +0100
 +++ veracrypt/src/Build/Include/Makefile.inc	2013-06-17 01:34:00.429636758 +0200
 @@ -10,7 +10,7 @@
diff --git a/debian/patches/005-indicator-support.diff b/debian/patches/005-indicator-support.diff
index 509ff49..b047ad7 100644
--- a/debian/patches/005-indicator-support.diff
+++ b/debian/patches/005-indicator-support.diff
@@ -16,8 +16,8 @@ Index: veracrypt/src/Main/Main.make
  
  $(APPNAME): $(LIBS) $(OBJS)
  	@echo Linking $@
--	$(CXX) -o $(APPNAME) $(LFLAGS) $(OBJS) $(LIBS) $(FUSE_LIBS) $(WX_LIBS) -ldl
-+	$(CXX) -o $(APPNAME) $(LFLAGS) $(OBJS) $(LIBS) $(FUSE_LIBS) $(WX_LIBS) -ldl $(shell pkg-config --libs appindicator-0.1)
+-	$(CXX) -o $(APPNAME) $(OBJS) $(LIBS) $(FUSE_LIBS) $(WX_LIBS) $(LFLAGS)
++	$(CXX) -o $(APPNAME) $(OBJS) $(LIBS) $(FUSE_LIBS) $(WX_LIBS) $(LFLAGS) $(shell pkg-config --libs appindicator-0.1)
  
  ifeq "$(TC_BUILD_CONFIG)" "Release"
  ifndef NOSTRIP

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/veracrypt.git