[Pkg-nx-commits] r61 - nxproxy2/trunk/debian/patches

[Per Olofsson]

Author: pelle
Date: 2006-09-19 15:03:20 +0000 (Tue, 19 Sep 2006)
New Revision: 61

Removed:
   nxproxy2/trunk/debian/patches/enable-pic
Modified:
   nxproxy2/trunk/debian/patches/configure-use-flags
   nxproxy2/trunk/debian/patches/series
Log:
refresh patches

Modified: nxproxy2/trunk/debian/patches/configure-use-flags
===================================================================
--- nxproxy2/trunk/debian/patches/configure-use-flags	2006-09-19 14:57:54 UTC (rev 60)
+++ nxproxy2/trunk/debian/patches/configure-use-flags	2006-09-19 15:03:20 UTC (rev 61)
@@ -1,15 +1,13 @@
-Index: nxcomp2/configure.in
+Index: nxproxy/configure.in
 ===================================================================
---- nxcomp2.orig/configure.in	2006-09-19 16:35:59.000000000 +0200
-+++ nxcomp2/configure.in	2006-09-19 16:36:41.000000000 +0200
-@@ -7,8 +7,8 @@
+--- nxproxy.orig/configure.in	2006-09-19 17:01:08.000000000 +0200
++++ nxproxy/configure.in	2006-09-19 17:02:54.000000000 +0200
+@@ -7,7 +7,7 @@
  
- dnl Set our default compilation flags.
+ dnl Reset default compilation flags.
  
--CXXFLAGS="-O3 -fno-rtti -fno-exceptions"
--CFLAGS="-O3"
-+CXXFLAGS="-O3 -fno-rtti -fno-exceptions $CXXFLAGS"
-+CFLAGS="-O3 $CFLAGS"
+-CXXFLAGS="-O3"
++CXXFLAGS="-O3 $CXXFLAGS"
+ CPPFLAGS="-O3"
  
- dnl Reset default linking directives.
- 
+ dnl Prefer headers and libraries from nx-X11 if present.

Deleted: nxproxy2/trunk/debian/patches/enable-pic
===================================================================
--- nxproxy2/trunk/debian/patches/enable-pic	2006-09-19 14:57:54 UTC (rev 60)
+++ nxproxy2/trunk/debian/patches/enable-pic	2006-09-19 15:03:20 UTC (rev 61)
@@ -1,19 +0,0 @@
-Index: nxcomp/configure.in
-===================================================================
---- nxcomp.orig/configure.in	2006-09-17 23:11:38.000000000 +0200
-+++ nxcomp/configure.in	2006-09-17 23:54:17.000000000 +0200
-@@ -124,12 +124,8 @@
- test "$nxconf_cv_amd64" = yes && AMD64=yes])
- nxconf_AMD64
- 
--dnl AMD64 requires -fPIC for libraries.
--
--if test "$AMD64" = yes; then
--    CXXFLAGS="$CXXFLAGS -fPIC"
--    CFLAGS="$CFLAGS -fPIC"
--fi
-+CXXFLAGS="$CXXFLAGS -fPIC"
-+CFLAGS="$CFLAGS -fPIC"
- 
- dnl Check for Darwin environment.
- 

Modified: nxproxy2/trunk/debian/patches/series
===================================================================
--- nxproxy2/trunk/debian/patches/series	2006-09-19 14:57:54 UTC (rev 60)
+++ nxproxy2/trunk/debian/patches/series	2006-09-19 15:03:20 UTC (rev 61)
@@ -1,2 +1 @@
-enable-pic
 configure-use-flags