Ludovico Cavedon wrote: > I have just uploaded a NMU delayed of 10 days with version 2.5. I have > tried to minimize the changes to the packaging.
Here is the debdiff limited to the debian directroy. Please let me know if you want me to delay more or cancel it. Thanks, Ludovico
--- jcc-1.9/debian/changelog 2009-12-27 14:04:18.000000000 +0100
+++ jcc-2.5/debian/changelog 2009-12-27 14:04:18.000000000 +0100
@@ -1,3 +1,21 @@
+jcc (2.5-0.1) unstable; urgency=low
+
+ * Non-maintainer upload (closes: 562405).
+ * New upstream release (closes: 533486).
+ * Add watch file.
+ * Depend on python-all-dev so it will be built against all supported python
+ versions.
+ * Disable shared mode, as it requires patched setuptools (and lower depends
+ on python-setuptools version).
+ * Fix separators in JCC_LFLAGS.
+ * Add depends on ${misc:Depends} required for debhelper.
+ * Remove debina/pycompat and add X.-Python-Version control fileds.
+ * Add lintian override for libjava.so from openjdk, until bug #562622 is
+ solved.
+ * Update copyright file (new Apache 2 license).
+
+ -- Ludovico Cavedon <[email protected]> Sat, 26 Dec 2009 18:50:19 +0100
+
jcc (1.9-8) unstable; urgency=low
* Add ${python:Depends} (closes: 497131)
--- jcc-1.9/debian/control 2009-12-27 14:04:18.000000000 +0100
+++ jcc-2.5/debian/control 2009-12-27 14:04:18.000000000 +0100
@@ -2,13 +2,15 @@
Section: python
Priority: extra
Maintainer: Jeff Breidenbach <[email protected]>
-Build-Depends: cdbs, debhelper (>= 5), python-setuptools (>= 0.6c7),
- openjdk-6-jdk, python-dev, python-support, python2.4, python2.4-dev
+Build-Depends: cdbs, debhelper (>= 5), python-setuptools (>= 0.6a9),
+ openjdk-6-jdk, python-dev, python-support (>= 0.5.3), python-all-dev
Standards-Version: 3.7.3
+XS-Python-Version: >= 2.3
Package: jcc
Architecture: any
-Depends: openjdk-6-jdk, ${shlibs:Depends}, ${python:Depends}
+Depends: openjdk-6-jdk, ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}
+XB-Python-Version: ${python:Versions}
Description: code generator producing a Python extension from Java classes
JCC is a code generator for producing a Python extension providing
access to a set of Java classes. For every Java class, JCC generates
--- jcc-1.9/debian/copyright 2009-12-27 14:04:18.000000000 +0100
+++ jcc-2.5/debian/copyright 2009-12-27 14:04:18.000000000 +0100
@@ -1,5 +1,7 @@
This package was debianized by Jeff Breidenbach <[email protected]> on
Wed, 16 Apr 2008 10:57:54 -0700.
+This package was updated by Ludovico Cavedon <[email protected]> on
+Sat, 26 Dec 2009 18:40:39 +0100.
It was downloaded from <http://pypi.python.org/pypi/JCC>
@@ -7,27 +9,25 @@
Copyright:
- Copyright (c) 2004 - 2007 Open Source Applications Foundation
+ Copyright 2009 The Apache Software Foundation
+ Copyright 2007-2008 Open Source Applications Foundation
+
License:
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
+On Debian systems, a copy of the Apache License, Version 2.0 can be found at
+/usr/share/common-licenses/Apache-2.0
The Debian packaging is (C) 2008, Jeff Breidenbach <[email protected]> and
is licensed as above.
--- jcc-1.9/debian/docs 2009-12-27 14:04:18.000000000 +0100
+++ jcc-2.5/debian/docs 2009-12-27 14:04:18.000000000 +0100
@@ -1,3 +1,3 @@
README
-changelog
+CHANGES
DESCRIPTION
--- jcc-1.9/debian/jcc.lintian-overrides 1970-01-01 01:00:00.000000000
+0100
+++ jcc-2.5/debian/jcc.lintian-overrides 2009-12-27 14:04:18.000000000
+0100
@@ -0,0 +1,2 @@
+# allow RPATH against libjava.so in openjdk, until
http://bugs.debian.org/562622 is solved.
+jcc binary: binary-or-shlib-defines-rpath
--- jcc-1.9/debian/pycompat 2009-12-27 14:04:18.000000000 +0100
+++ jcc-2.5/debian/pycompat 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-2
--- jcc-1.9/debian/README.Debian 2009-12-27 14:04:18.000000000 +0100
+++ jcc-2.5/debian/README.Debian 2009-12-27 14:04:18.000000000 +0100
@@ -5,6 +5,8 @@
the following command. It should exit silently with no errors.
$ python -m jcc
+or
+ $ python -m jcc.__main__ # on Python 2.6
This package was built using rpath which is very unusual. The reason
is we need to link against shared libraries shipped with Java. There's
@@ -18,10 +20,11 @@
http://www.mail-archive.com/[email protected]/msg02279.html
http://www.mail-archive.com/[email protected]/msg10991.html
-Even though this package can be built by older copies of
-python-setuptools, we require a recent one in order to build
-in shared mode. See discussion on upstream mailing list.
+Even though building JCC in shared mode would be better [0], right now shared
+mode is disabled because it requires a patch to be applied to setuptools [1].
- http://lists.osafoundation.org/pipermail/pylucene-dev/2008-April/002642.html
+[0]
http://lists.osafoundation.org/pipermail/pylucene-dev/2008-April/002642.html
+[1] http://lucene.apache.org/pylucene/jcc/documentation/install.html#shared
-- Jeff Breidenbach <[email protected]> Wed, 16 Apr 2008 10:57:54 -0700
+ -- Ludovico Cavedon <[email protected]> Sat, 26 Dec 2009 15:41:46 +0100
--- jcc-1.9/debian/rules 2009-12-27 14:04:18.000000000 +0100
+++ jcc-2.5/debian/rules 2009-12-27 14:04:18.000000000 +0100
@@ -9,12 +9,21 @@
JAVAARCH :=ppc
endif
-export JCC_LFLAGS
:=-L/usr/lib/jvm/java-6-openjdk/jre/lib/$(JAVAARCH)::-L/usr/lib/jvm/java-6-openjdk/jre/lib/$(JAVAARCH)/server::-Wl,-rpath=/usr/lib/jvm/java-6-openjdk/jre/lib/$(JAVAARCH):/usr/lib/jvm/java-6-openjdk/jre/lib/$(JAVAARCH)/server::-ljava
+export JCC_ARGSEP=;
+export JCC_LFLAGS :=
-L/usr/lib/jvm/java-6-openjdk/jre/lib/$(JAVAARCH);-L/usr/lib/jvm/java-6-openjdk/jre/lib/$(JAVAARCH)/server;-Wl,-rpath=/usr/lib/jvm/java-6-openjdk/jre/lib/$(JAVAARCH):/usr/lib/jvm/java-6-openjdk/jre/lib/$(JAVAARCH)/server;-ljava
export JCC_CFLAGS := -fdollars-in-identifiers
+# For shared mode we need patch http://bugs.python.org/setuptools/issue43 for
setuptools to be applied
+export NO_SHARED=1
+
include /usr/share/cdbs/1/rules/debhelper.mk
DEB_PYTHON_SYSTEM = pysupport
include /usr/share/cdbs/1/class/python-distutils.mk
+binary-post-install/jcc::
+ rm -rf debian/jcc/usr/share/pyshared/jcc/patches
+
clean::
rm -rf build/*
+ rm -f jcc/config.py
+
--- jcc-1.9/debian/watch 1970-01-01 01:00:00.000000000 +0100
+++ jcc-2.5/debian/watch 2009-12-27 14:04:18.000000000 +0100
@@ -0,0 +1,2 @@
+version=3
+http://pypi.python.org/packages/source/J/JCC/JCC-(.*)\.tar\.gz
signature.asc
Description: OpenPGP digital signature
