[Pkg-nx-commits] r16 - in nxproxy/trunk: . debian debian/patches
Stefan Lippers-Hollmann
slh-guest at costa.debian.org
Wed Jul 20 11:37:01 UTC 2005
Author: slh-guest
Date: 2005-07-20 11:37:01 +0000 (Wed, 20 Jul 2005)
New Revision: 16
Added:
nxproxy/trunk/debian/
nxproxy/trunk/debian/TODO
nxproxy/trunk/debian/changelog
nxproxy/trunk/debian/compat
nxproxy/trunk/debian/control
nxproxy/trunk/debian/copyright
nxproxy/trunk/debian/dirs
nxproxy/trunk/debian/nxproxy.install
nxproxy/trunk/debian/patches/
nxproxy/trunk/debian/patches/00list
nxproxy/trunk/debian/patches/build_with_fpic.dpatch
nxproxy/trunk/debian/patches/nxcomp_nx_h.dpatch
nxproxy/trunk/debian/rules
nxproxy/trunk/debian/watch
Modified:
nxproxy/trunk/configure
nxproxy/trunk/filter.pl
nxproxy/trunk/install-sh
nxproxy/trunk/mkinstalldirs
Log:
Load nxproxy-1.4.0.2-2 into nxproxy/trunk.
Property changes on: nxproxy/trunk/configure
___________________________________________________________________
Name: svn:executable
-
+ *
Added: nxproxy/trunk/debian/TODO
===================================================================
--- nxproxy/trunk/debian/TODO 2005-07-20 11:36:27 UTC (rev 15)
+++ nxproxy/trunk/debian/TODO 2005-07-20 11:37:01 UTC (rev 16)
@@ -0,0 +1,3 @@
+- include docs
+- create -dev pkgs for libxcomp*
+- include .supp files for valgrind
Added: nxproxy/trunk/debian/changelog
===================================================================
--- nxproxy/trunk/debian/changelog 2005-07-20 11:36:27 UTC (rev 15)
+++ nxproxy/trunk/debian/changelog 2005-07-20 11:37:01 UTC (rev 16)
@@ -0,0 +1,184 @@
+nxproxy (1.4.0.2-2-0) UNRELEASED; urgency=low
+
+ Changes by Stefan Lippers-Hollmann:
+ - Initial upload to Debian
+ - Split package into sensible source packages
+ - Make Architecture: any
+ - Remove junk from rules file.
+ - Use plain debhelper, not cdbs
+
+ -- Stefan Lippers-Hollmann <s.l-h at gmx.de> Thu, 14 Jul 2005 12:06:53 +0200
+
+nx (1.4.0.2-0alpha6) experimental; urgency=low
+
+ * add automake1.4 to the build dependencies.
+
+ -- Stefan Lippers-Hollmann <s.l-h at gmx.de> Fri, 3 Jun 2005 02:20:30 +0200
+
+nx (1.4.0.2-0alpha5) experimental; urgency=low
+
+ * move /usr/bin/nxdesktop to /usr/lib/nx/.
+ * remove amd64 from arch.
+
+ -- Stefan Lippers-Hollmann <s.l-h at gmx.de> Mon, 30 May 2005 23:20:06 +0200
+
+nx (1.4.0.2-0alpha4) experimental; urgency=low
+
+ * fix linker regressions.
+ * fix 64 bit linker problems.
+ * fix dpkg-shlibdeps complaints.
+ * revert modular source approach for now.
+ * fix FSSTND vs. FHS clashed in nxdesktop.
+ * move prefix to /usr/lib/nx.
+ * adapt get-orig-source to current NoMachine URLs.
+ * add experimental x86_64 patch, also fixes potential buffer overflow on
+ other 64 bit architectures.
+
+ -- Stefan Lippers-Hollmann <s.l-h at gmx.de> Sun, 29 May 2005 21:27:10 +0200
+
+nx (1.4.0.2-0alpha3) experimental; urgency=low
+
+ * adapt SuSE build process.
+
+ -- Stefan Lippers-Hollmann <s.l-h at gmx.de> Tue, 26 Apr 2005 11:47:19 +0200
+
+nx (1.4.0.2-0alpha2) experimental; urgency=low
+
+ * revert to /usr/bin/, due to serious compatibility problems with freenx.
+
+ -- Stefan Lippers-Hollmann <s.l-h at gmx.de> Mon, 25 Apr 2005 11:25:10 +0200
+
+nx (1.4.0.2-0alpha1) experimental; urgency=low
+
+ * create new orig.tar.gz
+ * rename nxlibs to libnx.
+ * add VERSION listing to get-orig-source.
+ * fix nxssh.install.
+ * fix nxviewer.install.
+ * restructure patches.
+ * switch to simple patchsys.
+ * revise get-orig-source (formally download target).
+ * remove nxtunnnel-*.
+
+ -- Stefan Lippers-Hollmann <s.l-h at gmx.de> Sun, 24 Apr 2005 12:41:02 +0200
+
+nx (1.4.0-m2-2) experimental; urgency=low
+
+ * fix lintian errors.
+ * add nxlibs-dev and libnxcomp0-dev.
+ * limit architectures to known good ones i386, ppc.
+ * adapt "debian/rules download" to actually download the release sources
+ from nomachine.
+
+ -- Stefan Lippers-Hollmann <s.l-h at gmx.de> Sun, 17 Apr 2005 14:50:35 +0200
+
+nx (1.4.0-m2-1) experimental; urgency=low
+
+ * new upstream maintenance release (2):
+ * "ROME, Italy, February 10th, 2004 - NoMachine announces a new
+ maintenance release of NX 1.4.0."
+ http://www.nomachine.com/news_read.php?idnews=138
+
+ -- Stefan Lippers-Hollmann <s.l-h at gmx.de> Fri, 11 Feb 2005 18:13:09 +0100
+
+nx (1.4.0-m1-1) experimental; urgency=low
+
+ * New Maintenance Release (1) of NX 1.4.0 Client and Server Packages.
+
+ -- Stefan Lippers-Hollmann <s.l-h at gmx.de> Sat, 25 Dec 2004 18:44:45 +0100
+
+nx (1.4.0-final-1) experimental; urgency=low
+
+ * preliminary naming scheme.
+ * merge new upstream release.
+ * remove nxcompsh.
+
+ -- Stefan Lippers-Hollmann <s.l-h at gmx.de> Thu, 25 Nov 2004 21:41:14 +0100
+
+nx (1.4.0-6-3) experimental; urgency=low
+
+ * Fix build dependencies (hopefully).
+ * Fix typo xbase-fonts -> xfonts-base
+
+ -- Peter Rockai (mornfall) <mornfall at danill.sk> Tue, 26 Oct 2004 15:18:34 +0200
+
+nx (1.4.0-6-2) experimental; urgency=low
+
+ * Argh. Not a native package. Again.
+
+ -- Peter Rockai (mornfall) <mornfall at danill.sk> Tue, 19 Oct 2004 10:02:20 +0200
+
+nx (1.4.0-6-1) experimental; urgency=low
+
+ * Sync up with Stefan Lippers-Hollmann <s.l-h at gmx.de>
+ - add experimental AMD64/ PPC64 support
+ - add missing build-deps
+ * New versioning scheme (1.4.0-<snapshot>-<revision>).
+ * Grab new nomachine snapshot.
+ * Simplify package maintenance a bit.
+
+ -- Peter Rockai (mornfall) <mornfall at danill.sk> Tue, 19 Oct 2004 10:02:14 +0200
+
+nx (1.3.99.2-3) experimental; urgency=low
+
+ * Add replaces: nxagent (<< 1.3.99.2-2) to nxlibs; fixes upgrade.
+
+ -- Peter Rockai (mornfall) <mornfall at danill.sk> Thu, 16 Sep 2004 23:51:20 +0200
+
+nx (1.3.99.2-2) experimental; urgency=low
+
+ * Ouch! Not a native package...
+ * Another ouch, remove _old/ tarballs
+ * Last ouch, update clean target to remove new builddirs
+
+ -- Peter Rockai (mornfall) <mornfall at danill.sk> Tue, 14 Sep 2004 17:23:39 +0200
+
+nx (1.3.99.2-1) experimental; urgency=low
+
+ * Include nxdesktop and nxviewer.
+ * Split out nxlibs.
+
+ -- Peter Rockai (mornfall) <mornfall at danill.sk> Tue, 14 Sep 2004 16:04:39 +0200
+
+nx (1.3.99.2-0) experimental; urgency=low
+
+ * New 1.4 snapshot.
+
+ -- Peter Rockai (mornfall) <mornfall at danill.sk> Fri, 10 Sep 2004 12:15:07 +0200
+
+nx (1.3.99.1-0pre1) experimental; urgency=low
+
+ * Update nxagent and nxssh to current snapshots.
+ * Recompress the tarballs with bzip2
+
+ -- Peter Rockai (mornfall) <mornfall at danill.sk> Tue, 6 Jul 2004 10:48:59 +0200
+
+nx (1.3.99-0pre3) experimental; urgency=low
+
+ * Implement nxtunnel and add 2 new packages: nxtunnel-server and
+ nxtunnel-client. See README.Debian in those packages for use instructions.
+
+ -- Peter Rockai (mornfall) <mornfall at danill.sk> Fri, 25 Jun 2004 16:29:59 +0200
+
+nx (1.3.99-0pre2) experimental; urgency=low
+
+ * Fix nxproxy depends (had a typo in it... sorry for inconvenience), thanks
+ to Isaac Clerencia <isaac at sindominio.net> for spotting.
+
+ -- Peter Rockai (mornfall) <mornfall at danill.sk> Wed, 23 Jun 2004 23:07:55 +0200
+
+nx (1.3.99-0pre1) experimental; urgency=low
+
+ * Change lib sonames, so they can reside in /usr/lib as per FHS; change
+ linking of nxagent appropriately.
+ * Fix dependency breakage (libnxcompext0 does not depend on nxagent and
+ nxproxy depends on libnxcomp*)
+
+ -- Peter Rockai (mornfall) <mornfall at danill.sk> Tue, 22 Jun 2004 14:47:12 +0200
+
+nx (1.3.99-0pre0) experimental; urgency=low
+
+ * Initial packaging.
+
+ -- Peter Rockai (mornfall) <mornfall at danill.sk> Mon, 21 Jun 2004 23:24:35 +0200
+
Added: nxproxy/trunk/debian/compat
===================================================================
--- nxproxy/trunk/debian/compat 2005-07-20 11:36:27 UTC (rev 15)
+++ nxproxy/trunk/debian/compat 2005-07-20 11:37:01 UTC (rev 16)
@@ -0,0 +1 @@
+4
Added: nxproxy/trunk/debian/control
===================================================================
--- nxproxy/trunk/debian/control 2005-07-20 11:36:27 UTC (rev 15)
+++ nxproxy/trunk/debian/control 2005-07-20 11:37:01 UTC (rev 16)
@@ -0,0 +1,20 @@
+Source: nxproxy
+Section: x11
+Priority: extra
+Maintainer: Stefan Lippers-Hollmann <s.l-h at gmx.de>
+Uploaders: Tollef Fog Heen <tfheen at debian.org>
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, dpatch, libx11-dev, zlib1g-dev, libjpeg62-dev, libpng12-dev, libxcomp-dev
+Standards-Version: 3.6.2
+
+Package: nxproxy
+Section: x11
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: NoMachine NX - X protocol compression proxy
+ NoMachine NX is the next-generation X compression and roundtrip suppression
+ scheme. It can operate remote X11 sessions over 56k modem dialup links or
+ anything better.
+ .
+ The nxproxy runs on the X server side of the wire and thus accompanies
+ the nxagent running on X client side. It provides the protocol compression
+ and caching part of the NX scheme.
Added: nxproxy/trunk/debian/copyright
===================================================================
--- nxproxy/trunk/debian/copyright 2005-07-20 11:36:27 UTC (rev 15)
+++ nxproxy/trunk/debian/copyright 2005-07-20 11:37:01 UTC (rev 16)
@@ -0,0 +1,14 @@
+This package was debianized by Peter Rockai (mornfall)
+<mornfall at danill.sk> on Tue, 22 Jun 2004 08:17:15 +0200.
+
+It was downloaded from http://www.nomachine.com/
+
+Upstream Author: NoMachine
+
+Copyright:
+
+This software is copyright (c) by NoMachine
+You are free to distribute this software under the terms of
+the GNU General Public License.
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in /usr/share/common-licenses/GPL file.
Added: nxproxy/trunk/debian/dirs
===================================================================
--- nxproxy/trunk/debian/dirs 2005-07-20 11:36:27 UTC (rev 15)
+++ nxproxy/trunk/debian/dirs 2005-07-20 11:37:01 UTC (rev 16)
@@ -0,0 +1 @@
+usr/lib/nx
Added: nxproxy/trunk/debian/nxproxy.install
===================================================================
--- nxproxy/trunk/debian/nxproxy.install 2005-07-20 11:36:27 UTC (rev 15)
+++ nxproxy/trunk/debian/nxproxy.install 2005-07-20 11:37:01 UTC (rev 16)
@@ -0,0 +1 @@
+nxproxy usr/lib/nx
Added: nxproxy/trunk/debian/patches/00list
===================================================================
--- nxproxy/trunk/debian/patches/00list 2005-07-20 11:36:27 UTC (rev 15)
+++ nxproxy/trunk/debian/patches/00list 2005-07-20 11:37:01 UTC (rev 16)
@@ -0,0 +1,2 @@
+build_with_fpic
+nxcomp_nx_h.dpatch
Added: nxproxy/trunk/debian/patches/build_with_fpic.dpatch
===================================================================
--- nxproxy/trunk/debian/patches/build_with_fpic.dpatch 2005-07-20 11:36:27 UTC (rev 15)
+++ nxproxy/trunk/debian/patches/build_with_fpic.dpatch 2005-07-20 11:37:01 UTC (rev 16)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 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.
+
+ at DPATCH@
+diff -urNad nxproxy.orig/Makefile.in nxproxy/Makefile.in
+--- nxproxy.orig/Makefile.in 2004-07-28 18:42:55.000000000 +0200
++++ nxproxy/Makefile.in 2005-07-12 23:37:37.161372384 +0200
+@@ -13,7 +13,7 @@
+ CXX = @CXX@
+ CXXFLAGS = @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \
+ -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
+- -Wmissing-declarations -Wnested-externs
++ -Wmissing-declarations -Wnested-externs -fPIC
+
+ CXXINCLUDES = -I. -I../nxcomp
+
Added: nxproxy/trunk/debian/patches/nxcomp_nx_h.dpatch
===================================================================
--- nxproxy/trunk/debian/patches/nxcomp_nx_h.dpatch 2005-07-20 11:36:27 UTC (rev 15)
+++ nxproxy/trunk/debian/patches/nxcomp_nx_h.dpatch 2005-07-20 11:37:01 UTC (rev 16)
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## nxcomp_nx_h.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.
+
+ at DPATCH@
+diff -urNad nxproxy.orig/Makefile.in nxproxy/Makefile.in
+--- nxproxy.orig/Makefile.in 2004-07-28 18:42:55.000000000 +0200
++++ nxproxy/Makefile.in 2005-07-12 23:48:06.334723496 +0200
+@@ -15,11 +15,11 @@
+ -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
+ -Wmissing-declarations -Wnested-externs -fPIC
+
+-CXXINCLUDES = -I. -I../nxcomp
++CXXINCLUDES = -I.
+
+ CC = @CC@
+ CCFLAGS = $(CXXFLAGS)
+-CCINCLUDES = -I. -I../nxcomp
++CCINCLUDES = -I.
+ CCDEFINES =
+
+ LDFLAGS = @LDFLAGS@
Added: nxproxy/trunk/debian/rules
===================================================================
--- nxproxy/trunk/debian/rules 2005-07-20 11:36:27 UTC (rev 15)
+++ nxproxy/trunk/debian/rules 2005-07-20 11:37:01 UTC (rev 16)
@@ -0,0 +1,111 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+PACKAGE=nxproxy
+# Our version number is busted at the moment :-(
+#VERSION=$(shell dpkg-parsechangelog | grep ^Version | sed 's,Version: \([-0-9.]*\)-.*,\1,')
+VERSION=1.4.0-2
+#DPATCH_WORKDIR=$(PACKAGE)
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+include /usr/share/dpatch/dpatch.make
+
+config.status: patch-stamp configure
+ dh_testdir
+ # Add here commands to configure the package.
+ #CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+ autoreconf -f -i
+ CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
+
+
+build: build-stamp
+
+build-stamp: config.status
+ dh_testdir
+
+ # Add here commands to compile the package.
+ $(MAKE) all
+ #docbook-to-man debian/nxproxy-1.4.0.sgml > nxproxy-1.4.0.1
+
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+
+ # Add here commands to clean up after the build process.
+ -$(MAKE) distclean
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ # Add here commands to install the package into debian/nxproxy-1.4.0.
+ #$(MAKE) install prefix=$(CURDIR)/debian/nxproxy-1.4.0/usr
+ #dh_install --sourcedir=$(PACKAGE)
+ dh_install
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs CHANGELOG
+ dh_installdocs
+# dh_installexamples
+# dh_install
+# dh_installmenu
+# dh_installdebconf
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installpam
+# dh_installmime
+# dh_installinit
+# dh_installcron
+# dh_installinfo
+# dh_installman
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+# dh_perl
+# dh_python
+# dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
Property changes on: nxproxy/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: nxproxy/trunk/debian/watch
===================================================================
--- nxproxy/trunk/debian/watch 2005-07-20 11:36:27 UTC (rev 15)
+++ nxproxy/trunk/debian/watch 2005-07-20 11:37:01 UTC (rev 16)
@@ -0,0 +1,22 @@
+# 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 nxproxy-1.4.0-(.*)\.tar\.gz
+
+# Uncomment to examine a Webserver directory
+#http://www.example.com/pub/nxproxy-1.4.0-(.*)\.tar\.gz
+
+# Uncommment to examine a FTP server
+#ftp://ftp.example.com/pub/nxproxy-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=nxproxy-1.4.0 nxproxy-1.4.0-([\d.]*).tar.gz
+
+
Property changes on: nxproxy/trunk/filter.pl
___________________________________________________________________
Name: svn:executable
-
+ *
Property changes on: nxproxy/trunk/install-sh
___________________________________________________________________
Name: svn:executable
-
+ *
Property changes on: nxproxy/trunk/mkinstalldirs
___________________________________________________________________
Name: svn:executable
-
+ *
More information about the Pkg-nx-commits
mailing list