[Pkg-nx-commits] r26 - in nxcomp/trunk/debian: . patches

[Stefan Lippers-Hollmann]

Author: slh-guest
Date: 2005-08-01 01:32:55 +0000 (Mon, 01 Aug 2005)
New Revision: 26

Removed:
   nxcomp/trunk/debian/watch
Modified:
   nxcomp/trunk/debian/changelog
   nxcomp/trunk/debian/patches/build_with_fpic.dpatch
   nxcomp/trunk/debian/rules
Log:
- remove non working patches concerning -Wmissing-declarations and -Wstrict-prototyes for CXXFLAGS.
- fix prtoing to new upstream version.


Modified: nxcomp/trunk/debian/changelog
===================================================================
--- nxcomp/trunk/debian/changelog	2005-07-31 23:24:11 UTC (rev 25)
+++ nxcomp/trunk/debian/changelog	2005-08-01 01:32:55 UTC (rev 26)
@@ -1,10 +1,10 @@
 nxcomp (1.5.0-63-0) UNRELEASED; urgency=low
 
   * (NOT RELEASED YET) New upstream release
-  * add Stefan Huehner's suggestion concerning the removal of
-    -Wmissing-declarations and -Wstrict-prototyes from CXXFLAGS.
+  * do final porting to 1.5.0.
+  * fix building on amd64.
 
- -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Mon,  1 Aug 2005 01:17:14 +0200
+ -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Mon,  1 Aug 2005 03:30:53 +0200
 
 nxcomp (1.4.0.2-31-0) UNRELEASED; urgency=low
 

Modified: nxcomp/trunk/debian/patches/build_with_fpic.dpatch
===================================================================
--- nxcomp/trunk/debian/patches/build_with_fpic.dpatch	2005-07-31 23:24:11 UTC (rev 25)
+++ nxcomp/trunk/debian/patches/build_with_fpic.dpatch	2005-08-01 01:32:55 UTC (rev 26)
@@ -1,19 +1,28 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## build_with_fpic.dpatch by  <tfheen at debian.org>
+## build_with_fpic.dpatch by Stefan Lippers-Hollmann <s.l-h at gmx.de>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: No description.
 
 @DPATCH@
-diff -urNad nxcomp-1.4.0/Makefile.in /tmp/dpep.uUxxBl/nxcomp-1.4.0/Makefile.in
---- nxcomp-1.4.0/Makefile.in	2005-06-05 12:08:31.385594778 +0200
-+++ /tmp/dpep.uUxxBl/nxcomp-1.4.0/Makefile.in	2005-06-05 12:09:16.749823089 +0200
-@@ -12,7 +12,7 @@
+diff -Nrup nxcomp-1.5.0-63.orig/Makefile.in nxcomp-1.5.0-63/Makefile.in
+--- nxcomp-1.5.0-63.orig/Makefile.in	2005-05-14 12:59:12.000000000 +0200
++++ nxcomp-1.5.0-63/Makefile.in	2005-08-01 02:29:52.064178250 +0200
+@@ -32,7 +32,7 @@ LIBVERSION=@LIBVERSION@
  
  CXX         = @CXX@
  CXXFLAGS    = @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \
--              -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes
+-              -Wall -Wpointer-arith
 +              -Wall -Wpointer-arith -fPIC
  CXXINCLUDES =
  CXXDEFINES  =
  
+@@ -43,7 +43,7 @@ CXXDEFINES  =
+ 
+ CC          = @CC@
+ CCFLAGS     = @X_CFLAGS@ @DEFS@ \
+-              -Wall -Wpointer-arith
++              -Wall -Wpointer-arith -fPIC
+ CCINCLUDES  =
+ CCDEFINES   =
+ 

Modified: nxcomp/trunk/debian/rules
===================================================================
--- nxcomp/trunk/debian/rules	2005-07-31 23:24:11 UTC (rev 25)
+++ nxcomp/trunk/debian/rules	2005-08-01 01:32:55 UTC (rev 26)
@@ -9,10 +9,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-PACKAGE=nxcomp
-# Our version number is busted at the moment :-(
-#VERSION=$(shell dpkg-parsechangelog | grep ^Version | sed 's,Version: \([-0-9.]*\)-.*,\1,')
-VERSION=1.4.0-31
 # DPATCH_WORKDIR=$(PACKAGE)
 
 # These are used for cross-compiling and for saving the configure script

Deleted: nxcomp/trunk/debian/watch
===================================================================
--- nxcomp/trunk/debian/watch	2005-07-31 23:24:11 UTC (rev 25)
+++ nxcomp/trunk/debian/watch	2005-08-01 01:32:55 UTC (rev 26)
@@ -1,22 +0,0 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
-version=3
-
-# Uncomment to examine a Webpage 
-# <Webpage URL> <string match>
-#http://www.example.com/downloads.php nxcomp-1.4.0-(.*)\.tar\.gz
-
-# Uncomment to examine a Webserver directory
-http://www.nomachine.com/download/nxsources/1.4.0/nxcomp-1.4.0-(.*)\.tar\.gz
-
-# Uncommment to examine a FTP server
-#ftp://ftp.example.com/pub/nxcomp-1.4.0-(.*)\.tar\.gz debian uupdate
-
-# Uncomment to use Roland's hack for sourceforge based projects - YMMV!
-#http://people.debian.org/~lolando/sfdlr.php?project=nxcomp-1.4.0 nxcomp-1.4.0-([\d.]*).tar.gz
-
-