[SCM] qtchooser packaging branch, master, updated. c2cace9410a47868cc0865de4e303c3e79286c09

[Timo Jyrinki]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtchooser.git;a=commitdiff;h=c2cace9

The following commit has been merged in the master branch:
commit c2cace9410a47868cc0865de4e303c3e79286c09
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Wed Mar 13 14:18:47 2013 +0000

    Fix the Makefile part of applying create-a-system-default-path.patch
---
 debian/patches/create-a-system-default-path.patch |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/patches/create-a-system-default-path.patch b/debian/patches/create-a-system-default-path.patch
index b5f1b39..caf3ca8 100644
--- a/debian/patches/create-a-system-default-path.patch
+++ b/debian/patches/create-a-system-default-path.patch
@@ -23,7 +23,7 @@ index fcff0ce..6ad619a 100644
 +++ b/src/qtchooser/Makefile
 @@ -17,6 +17,10 @@ TARGET        = qtchooser
  OBJECTS_TEST  = main-test.o
- TARGET_TEST   = qtchooser-test
+ TARGET_TEST   = test/qtchooser
  
 +ifneq ($(QTCHOOSER_GLOBAL_DIR),)
 +	QTCHOOSER_GLOBAL_DIR_VAR:=-DQTCHOOSER_GLOBAL_DIR=\"$(QTCHOOSER_GLOBAL_DIR)\"
@@ -32,16 +32,16 @@ index fcff0ce..6ad619a 100644
  first: all
  check: $(TARGET_TEST)
  
-@@ -48,10 +52,10 @@ uninstall:
+@@ -49,10 +53,10 @@ uninstall:
  ####### Compile
  
  main.o: main.cpp
--	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
-+	$(CXX) -c $(QTCHOOSER_GLOBAL_DIR_VAR) $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
+-	$(CXX) -c -Wall -Wextra $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
++	$(CXX) -c -Wall -Wextra $(QTCHOOSER_GLOBAL_DIR_VAR) $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
  
  main-test.o: main.cpp
--	$(CXX) -c -DQTCHOOSER_TEST_MODE -g $(CXXFLAGS) $(INCPATH) -o main-test.o main.cpp
-+	$(CXX) -c -DQTCHOOSER_TEST_MODE $(QTCHOOSER_GLOBAL_DIR_VAR) -g $(CXXFLAGS) $(INCPATH) -o main-test.o main.cpp
+-	$(CXX) -c -Wall -Wextra -DQTCHOOSER_TEST_MODE -g $(CXXFLAGS) $(INCPATH) -o main-test.o main.cpp
++	$(CXX) -c -Wall -Wextra -DQTCHOOSER_TEST_MODE $(QTCHOOSER_GLOBAL_DIR_VAR) -g $(CXXFLAGS) $(INCPATH) -o main-test.o main.cpp
  
  ####### Install
  

-- 
qtchooser packaging