I heard that Debian packagers (re-)appeared so I hope they won't mind that I'm overstepping their responsibilities :)
I'm a Debian user so I thought that before I start playing "for real" with the sources, I'd get them to build as .debs first. Unfortunately, after some days of trying still no luck. They're aaaaaaaaaalmost OK, after some small tweaks, but not quite (hey, I'm still learning!). I'm attaching patches to packages I tried to fix - some are easy, some are not. For Python packages I'm not sure if I should use dh_pysupport or dh_pycentral or both and what is really necessary... I'm a Java guy, you know ;) Note that I only got them to build, not run, so nothing is actually tested! * libtprl - seems OK, a nice playground ;) I removed the libncurses Depends: because it's unsatisfiable and ldd (and shlibdeps) says it's not needed, hmm... * libtpproto-py - seems OK too, but there's a problem with tp.netlib.discover.LocalBrowser (tpclient-pywx won't see it - does it need Avahi, or something?) * libtpclient-py - probably OK * libtpproto-cpp - builds, but that's all I know ;) * tpserver-cpp - builds, but the package comes up empty (dunno why, I gave up...) * tpclient-pywx - this one needed some fixes to the sources too; it builds and installs but fails on startup (due to aforementioned problem with LocalBrowser) Of course there are lots of problems, lintian errors and such... Anywa, hope that helps :) -KS ---------------------------------------------------------------------- Jak najszybciej dostac sie na wymarzona plaze? Znajdz trase ekspresowa >>>http://link.interia.pl/f1b0c
From 256731f67b25a24b937125d220b328c7ca4c2b82 Mon Sep 17 00:00:00 2001
From: Krzysztof Sobolewski <[EMAIL PROTECTED]>
Date: Wed, 15 Aug 2007 23:37:10 +0200
Subject: [PATCH] Make the package pbuildable and shut up lintian a bit.
---
debian/control | 6 +++---
debian/rules | 6 +++++-
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/debian/control b/debian/control
index 0a5d324..c1a8dfb 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,14 @@
Source: libtprl
Priority: extra
Maintainer: Paul Schulz <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5), autotools-dev, automake, libtool
+Build-Depends: debhelper (>= 5), autotools-dev, automake, libtool, libreadline5-dev
Standards-Version: 3.7.2
Section: libs
Package: libtprl-dev
Section: libdevel
Architecture: any
-Depends: libtprl1 (= ${Source-Version})
+Depends: libtprl1 (= ${binary:Version})
Description: Thousand Parsec Readline Library development package
The Thousand Parsec Readline library is used by other software
(particularly C++ code) written for the Thousand Parsec project
@@ -19,7 +19,7 @@ Description: Thousand Parsec Readline Library development package
Package: libtprl1
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libncurses
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Thousand Parsec Readline Library
The Thousand Parsec Readline library is used by other software
(particularly C++ code) written for the Thousand Parsec project
diff --git a/debian/rules b/debian/rules
index 966538f..24c2bca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,11 +33,13 @@ major=2
#major=`ls src/.libs/lib*.so.* | \
# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
+configure:
+ ./autogen.sh
+
config.status: configure
dh_testdir
# Add here commands to configure the package.
# ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
- ./autogen.sh
./configure --prefix=/usr
build: build-stamp
@@ -56,6 +58,8 @@ clean:
# Add here commands to clean up after the build process.
-$(MAKE) distclean
+
+ rm -f aclocal.m4 build-stamp config.guess config.h config.h.in config.log config.status config.sub configure depcomp install-sh libtool libtprl.pc ltmain.sh Makefile Makefile.in test/Makefile.in tprl/Makefile.in missing stamp-h1
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
endif
--
1.5.2.4
From 8a0e68a22fdb8505fcbf90327372c81bb2ee3585 Mon Sep 17 00:00:00 2001 From: Krzysztof Sobolewski <[EMAIL PROTECTED]> Date: Wed, 15 Aug 2007 23:42:25 +0200 Subject: [PATCH] Some tweaks to Debian package, plus one ommission in setyp.py --- debian/control | 2 +- debian/rules | 1 + setup.py | 1 + 3 files changed, 3 insertions(+), 1 deletions(-) diff --git a/debian/control b/debian/control index 024026d..cc7ac26 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: python XS-Python-Version: all Priority: optional Maintainer: Paul Hampson <[EMAIL PROTECTED]> -Build-Depends-Indep: python-central (>= 0.5.6), python-setuptools (>= 0.6b3-1), python-all +Build-Depends-Indep: python-central (>= 0.5.6), python-support, python-setuptools (>= 0.6b3-1), python-all Build-Depends: debhelper (>= 5.0.38) Standards-Version: 3.7.2 diff --git a/debian/rules b/debian/rules index 86128a9..66e1ebb 100755 --- a/debian/rules +++ b/debian/rules @@ -45,6 +45,7 @@ binary-indep: build install dh_installchangelogs dh_installdocs README dh_pycentral + dh_pysupport dh_compress -X.py dh_fixperms dh_installdeb diff --git a/setup.py b/setup.py index 3407959..60df20d 100644 --- a/setup.py +++ b/setup.py @@ -32,6 +32,7 @@ Includes support for: 'tp.netlib.objects', 'tp.netlib.objects.ObjectExtra', 'tp.netlib.objects.OrderExtra', + 'tp.netlib.discover', 'tp.netlib.support', ], ) -- 1.5.2.4
From fab8346b299da98f99fdc7ffab740069cab89a2b Mon Sep 17 00:00:00 2001 From: Krzysztof Sobolewski <[EMAIL PROTECTED]> Date: Wed, 15 Aug 2007 22:48:26 +0200 Subject: [PATCH] Fix the changelog so dpkg-source won't barf. --- debian/changelog | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4b52e31..176d4fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libtpproto-py (0.2.99+0.3.0+git.48.g3031194-1auto1) unstable; urgency=low +libtpclient-py (0.2.99+0.3.0+git.48.g3031194-1auto1) unstable; urgency=low * Daily build * Git 'describe': LIBTPCLIENT_0_2_99-48-g3031194 diff --git a/debian/control b/debian/control index 6c1ed32..75d5298 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: python XS-Python-Version: >=2.4 Priority: optional Maintainer: Paul Hampson <[EMAIL PROTECTED]> -Build-Depends-Indep: python-central (>= 0.5.6), python-setuptools (>= 0.6b3-1), python-all +Build-Depends-Indep: python-central (>= 0.5.6), python-setuptools (>= 0.6b3-1), python-all, python-tp-netlib (>> 0.2) Build-Depends: debhelper (>= 5.0.38) Standards-Version: 3.7.2 -- 1.5.2.4
From 637fc3e458f87a2f50db022d34333c42372b6a07 Mon Sep 17 00:00:00 2001
From: Krzysztof Sobolewski <[EMAIL PROTECTED]>
Date: Tue, 14 Aug 2007 18:02:42 +0200
Subject: [PATCH] Make it build from zero-state (clean git repository) and fix lintian errors about Depends: subst.
---
debian/control | 4 ++--
debian/rules | 5 ++++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/debian/control b/debian/control
index 8acab39..12a1d6c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,14 @@
Source: libtpproto-cpp
Priority: extra
Maintainer: Paul Hampson <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5), autotools-dev
+Build-Depends: debhelper (>= 5), autotools-dev, automake, libtool, libgnutls-dev
Standards-Version: 3.7.2
Section: libs
Package: libtpproto-dev
Section: libdevel
Architecture: any
-Depends: libtpproto2 (= ${Source-Version})
+Depends: libtpproto2 (= ${binary:Version})
Description: Thousand Parsec network protocol development libraries and headers
This package provides the development headers and libraries needed to compile
software against the Thousand Parsec network protocol.
diff --git a/debian/rules b/debian/rules
index 59ff628..da69aef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,10 +15,12 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+configure:
+ ./autogen.sh
+
config.status: configure
dh_testdir
# If you are building this package from git, you will need to run
- #./autogen.sh
# before you can continue.
./configure --prefix=/usr
@@ -38,6 +40,7 @@ clean:
# Add here commands to clean up after the build process.
-$(MAKE) distclean
+ rm -f aclocal.m4 build-stamp config.guess config.h config.h.in config.log config.status config.sub configure depcomp install-sh libtool libtprl.pc ltmain.sh Makefile Makefile.in test/Makefile.in tprl/Makefile.in missing stamp-h1
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
endif
--
1.5.2.4
From 788ebc577ed8b57cd8b2a721067629cfbd4edfd1 Mon Sep 17 00:00:00 2001 From: Krzysztof Sobolewski <[EMAIL PROTECTED]> Date: Tue, 14 Aug 2007 19:09:45 +0200 Subject: [PATCH] Fix some more lintian warnings. --- debian/changelog | 2 +- debian/watch | 2 ++ debian/watch.ex | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 debian/watch delete mode 100644 debian/watch.ex diff --git a/debian/changelog b/debian/changelog index 6eba261..a7a2dd1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,6 @@ libtpproto-cpp (0.1.0-2) unstable; urgency=low libtpproto-cpp (0.1.0-1) unstable; urgency=low - * Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP> + * Initial release -- Paul Hampson <[EMAIL PROTECTED]> Thu, 18 Jan 2007 18:53:07 +1100 diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..acfb9d9 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://www.thousandparsec.net/tp/downloads/libtpproto-cpp/libtpproto-cpp-([\d\.]*).tar.gz \ No newline at end of file diff --git a/debian/watch.ex b/debian/watch.ex deleted file mode 100644 index acfb9d9..0000000 --- a/debian/watch.ex +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://www.thousandparsec.net/tp/downloads/libtpproto-cpp/libtpproto-cpp-([\d\.]*).tar.gz \ No newline at end of file -- 1.5.2.4
From 05a156a420e1910a0245642468ca9c0073c0e1b2 Mon Sep 17 00:00:00 2001 From: Krzysztof Sobolewski <[EMAIL PROTECTED]> Date: Wed, 15 Aug 2007 23:54:10 +0200 Subject: [PATCH] Make it pdebuildable (Build-Depends: and rules fix). --- debian/control | 2 +- debian/rules | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index fc4a7b1..f369147 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: tpserver-cpp Section: unknown Priority: extra Maintainer: Paul Schulz <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 5), autotools-dev +Build-Depends: debhelper (>= 5), autotools-dev, automake, libtool, pkg-config, guile-1.8-dev, mzscheme, libtprl-dev Standards-Version: 3.7.2 Package: tpserver-cpp diff --git a/debian/rules b/debian/rules index cb8a5f0..50f8176 100755 --- a/debian/rules +++ b/debian/rules @@ -24,10 +24,12 @@ else CFLAGS += -O2 endif +configure: + ./autogen.sh + config.status: configure dh_testdir # Add here commands to configure the package. - ./autogen.sh ./configure --prefix=/usr build: build-stamp @@ -48,6 +50,7 @@ clean: # Add here commands to clean up after the build process. -$(MAKE) distclean + rm -f aclocal.m4 build-stamp config.guess config.h config.h.in config.log config.status config.sub configure depcomp install-sh libtool libtprl.pc ltmain.sh Makefile Makefile.in test/Makefile.in tprl/Makefile.in missing stamp-h1 ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub endif -- 1.5.2.4
From 402964ce0150ffcaa65848090a82bac101494acc Mon Sep 17 00:00:00 2001 From: Krzysztof Sobolewski <[EMAIL PROTECTED]> Date: Tue, 14 Aug 2007 22:08:59 +0200 Subject: [PATCH] Make the package buildable and somewhat acceptable for lintian (especially fix totally bogus paths for files) --- debian/control | 2 +- debian/rules | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index f181ee6..ae96fe5 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: tpclient-pywx Section: python Priority: optional Maintainer: Paul Schulz <[EMAIL PROTECTED]> -Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5), python-all-dev(>=2.3.5-11), python-support (>= 0.5.3) +Build-Depends: debhelper (>= 5), python-all-dev(>=2.3.5-11), python-support (>= 0.5.3), python-central, python-setuptools Standards-Version: 3.7.2 Package: tpclient-pywx diff --git a/debian/rules b/debian/rules index d673522..935fa71 100755 --- a/debian/rules +++ b/debian/rules @@ -34,7 +34,7 @@ install: dh_testdir dh_installdirs #$(MAKE) DESTDIR=$(CURDIR)/debian/tpclient-pywx install - python setup.py install --prefix=$(CURDIR)/debian/tpclient-pywx + python setup.py install --prefix=$(CURDIR)/debian/tpclient-pywx/usr #install: build $(PYVERS:%=install-python%) @@ -56,8 +56,8 @@ binary-indep: build install dh_testroot dh_installchangelogs dh_installdocs README -# dh_pycentral -# dh_compress -X.py + dh_pycentral + dh_compress -X.py dh_fixperms dh_installdeb dh_gencontrol -- 1.5.2.4
From f6327031eb856884e424ed8e1c3861c5d2b8d28d Mon Sep 17 00:00:00 2001
From: Krzysztof Sobolewski <[EMAIL PROTECTED]>
Date: Wed, 15 Aug 2007 23:59:02 +0200
Subject: [PATCH] Make it pdebuildable (Build-Depends:, rules and Python headers).
---
debian/control | 5 ++++-
debian/rules | 1 +
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/debian/control b/debian/control
index ae96fe5..50858a7 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
Source: tpclient-pywx
Section: python
+XS-Python-Version: all
Priority: optional
Maintainer: Paul Schulz <[EMAIL PROTECTED]>
Build-Depends: debhelper (>= 5), python-all-dev(>=2.3.5-11), python-support (>= 0.5.3), python-central, python-setuptools
@@ -7,7 +8,9 @@ Standards-Version: 3.7.2
Package: tpclient-pywx
Architecture: all
-Depends: ${python:Depends}
+Depends: ${python:Depends}, python-tp-netlib (>> 0.2), python-tp-client (>= 0.2.99), python-numpy, python-wxgtk2.6
+Recommends: python-psyco, python-pyopenssl, python-imaging, python-pygame
+XB-Python-Version: ${python:Versions}
Provides: ${python:Provides}
Description: Thousand Parsec client written in Python
This Thousand Parsec client, written in python, is an easy way to
diff --git a/debian/rules b/debian/rules
index 935fa71..92b75f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,6 +57,7 @@ binary-indep: build install
dh_installchangelogs
dh_installdocs README
dh_pycentral
+ dh_pysupport
dh_compress -X.py
dh_fixperms
dh_installdeb
--
1.5.2.4
From 792cf258faa269e17821b9955325ea9f5f858d43 Mon Sep 17 00:00:00 2001 From: Krzysztof Sobolewski <[EMAIL PROTECTED]> Date: Thu, 16 Aug 2007 00:00:15 +0200 Subject: [PATCH] Fix indents (spaces!!!!) in extra/wxFloatCanvas/Arrow.py so it's valid Python --- extra/wxFloatCanvas/Arrow.py | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/extra/wxFloatCanvas/Arrow.py b/extra/wxFloatCanvas/Arrow.py index a4691ed..202a79e 100644 --- a/extra/wxFloatCanvas/Arrow.py +++ b/extra/wxFloatCanvas/Arrow.py @@ -17,13 +17,12 @@ class Arrow(Polygon): self.Offset = N.array(Offset, N.float_) self.Offset.shape = (2,) # Make sure it is a length 2 vector - def _Draw(self, dc , WorldToPixel, ScaleWorldToPixel = None, HTdc=None): - Points = WorldToPixel(self.Points) + self.Offset - dc.SetPen(self.Pen) - dc.SetBrush(self.Brush) - dc.DrawPolygon(Points) - if HTdc and self.HitAble: - HTdc.SetPen(self.HitPen) - HTdc.SetBrush(self.HitBrush) - HTdc.DrawPolygon(Points) - + def _Draw(self, dc , WorldToPixel, ScaleWorldToPixel = None, HTdc=None): + Points = WorldToPixel(self.Points) + self.Offset + dc.SetPen(self.Pen) + dc.SetBrush(self.Brush) + dc.DrawPolygon(Points) + if HTdc and self.HitAble: + HTdc.SetPen(self.HitPen) + HTdc.SetBrush(self.HitBrush) + HTdc.DrawPolygon(Points) -- 1.5.2.4
From cbfd4b7e1ccd73f3538b34d91f1cbfadb9584259 Mon Sep 17 00:00:00 2001 From: Krzysztof Sobolewski <[EMAIL PROTECTED]> Date: Thu, 16 Aug 2007 00:01:14 +0200 Subject: [PATCH] I think it was supposed to be a comment. --- windows/overlays/Size.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/windows/overlays/Size.py b/windows/overlays/Size.py index e98996e..9cca9b6 100644 --- a/windows/overlays/Size.py +++ b/windows/overlays/Size.py @@ -1,7 +1,7 @@ """\ Draws circles proportional to the actual size of the object. """ - wxPython imports +# wxPython imports from Value import Value # Network imports -- 1.5.2.4
From 0882d37dea2639350dfa67c95960be0b18faf039 Mon Sep 17 00:00:00 2001
From: Krzysztof Sobolewski <[EMAIL PROTECTED]>
Date: Thu, 16 Aug 2007 00:02:26 +0200
Subject: [PATCH] Fix executable symlink not to point to build-temporary location.
---
setup.py | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/setup.py b/setup.py
index fc78868..9bbd144 100644
--- a/setup.py
+++ b/setup.py
@@ -86,7 +86,8 @@ if sys.platform.startswith('linux') and "install" in sys.argv:
shutil.copytree('graphics', graphicspath)
# Private python file
- privatepath = os.path.join(prefix, "lib/tpclient-pywx/")
+ libpath = 'lib/tpclient-pywx/'
+ privatepath = os.path.join(prefix, libpath)
print 'librarypath', privatepath
makedirs(privatepath)
@@ -111,7 +112,7 @@ if sys.platform.startswith('linux') and "install" in sys.argv:
binpath = os.path.join(prefix, "bin")
print 'binpath', binpath
makedirs(binpath)
- os.symlink(os.path.join(privatepath, 'tp-pywx-installed'), os.path.join(binpath, 'tpclient-pywx'))
+ os.symlink(os.path.join('..', libpath, 'tp-pywx-installed'), os.path.join(binpath, 'tpclient-pywx'))
sys.exit()
--
1.5.2.4
From 69e63c151578eb282c735f92d540211636805d9a Mon Sep 17 00:00:00 2001 From: Krzysztof Sobolewski <[EMAIL PROTECTED]> Date: Thu, 16 Aug 2007 00:03:10 +0200 Subject: [PATCH] Make it not barf on disallowed chmod while starting. --- requirements.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/requirements.py b/requirements.py index 2a837bd..0e3bb6f 100755 --- a/requirements.py +++ b/requirements.py @@ -184,7 +184,11 @@ if len(notfound) == 0: else: print location # Check the file is executable - os.chmod(location, stat.S_IRUSR|stat.S_IWUSR|stat.S_IXUSR|stat.S_IRGRP|stat.S_IXGRP|stat.S_IROTH|stat.S_IXOTH) + + # OSError: [Errno 1] Operation not permitted: '/usr/lib/tpclient-pywx/tpclient-pywx' + # (and not necessary?) - KS + + # os.chmod(location, stat.S_IRUSR|stat.S_IWUSR|stat.S_IXUSR|stat.S_IRGRP|stat.S_IXGRP|stat.S_IROTH|stat.S_IXOTH) # Register the URL Handlers try: -- 1.5.2.4
signature.asc
Description: OpenPGP digital signature
_______________________________________________ tp-devel mailing list [email protected] http://www.thousandparsec.net/tp/mailman.php/listinfo/tp-devel
