[pkg-eucalyptus-commits] r181 - in axis2c/trunk/debian: . patches
Steffen Möller
moeller at alioth.debian.org
Sun Jan 15 18:02:49 UTC 2012
Author: moeller
Date: 2012-01-15 18:02:48 +0000 (Sun, 15 Jan 2012)
New Revision: 181
Added:
axis2c/trunk/debian/patches/06-ld-no-as-needed.patch
axis2c/trunk/debian/patches/constify_ssl_method_ftbfs.patch
axis2c/trunk/debian/patches/fix_uri_test.patch
Modified:
axis2c/trunk/debian/README.source
axis2c/trunk/debian/changelog
axis2c/trunk/debian/control
axis2c/trunk/debian/copyright
axis2c/trunk/debian/libaxis2c0.preinst
axis2c/trunk/debian/patches/series
axis2c/trunk/debian/rules
Log:
Update of packaging instructions with what came from Ubuntu.
Modified: axis2c/trunk/debian/README.source
===================================================================
--- axis2c/trunk/debian/README.source 2011-11-23 20:22:02 UTC (rev 180)
+++ axis2c/trunk/debian/README.source 2012-01-15 18:02:48 UTC (rev 181)
@@ -6,6 +6,9 @@
03_enable-security.patch
Enables security by default
+ 03 is slightly larger than what is found in Ubuntu.
+ This should be harmonized.
+
04_fix_testsuite.patch
Fixes a bug in testsuite
@@ -14,3 +17,13 @@
-- Kyo Lee <kyo.lee at eucalyptus.com> Wed, 16 Dec 2009 20:27:31 -0800
+
+Maintenance of this package was stronger with Ubuntu than with
+Debian in the past. Whoever uploads a next version, please cross-check.
+
+The copyright file between the two distributions also differs.
+
+ -- Steffen Moeller <moeller at debian.org> Sun, 15 Jan 2012 18:31:08 +0100
+
+
+
Modified: axis2c/trunk/debian/changelog
===================================================================
--- axis2c/trunk/debian/changelog 2011-11-23 20:22:02 UTC (rev 180)
+++ axis2c/trunk/debian/changelog 2012-01-15 18:02:48 UTC (rev 181)
@@ -1,16 +1,55 @@
-axis2c (1.6.0-2) unstable; urgency=low
+axis2c (1.6.0-13) unstable; urgency=low
- * Fix patches/03_enable-security to enable both security
- flows (Closes: #594335).
+ [ by sponsor Steffen Moeller ]
- -- Chris Grzegorczyk <grze at eucalyptus.com> Sun, 10 Oct 2010 18:16:54 -0700
+ * Took 0ubuntu13 and merged it with the better patch by Chris from
+ Debian release - hence also the version jump up from 1.6.0-2.2.
+ * Added Brian as uploader and set DMUA flag.
+ * Added pkg-eucalyptus as maintainer.
+ * Added Vcs paths
+ * Bumpted standard to 3.9.2
-axis2c (1.6.0-1) unstable; urgency=low
+ -- Brian Thomason <brian.thomason at eucalyptus.com> Sun, 15 Jan 2012 18:23:14 +0100
- * Build for debian package based largely on Ubuntu package (Closes: #497594)
+axis2c (1.6.0-0ubuntu13) oneiric; urgency=low
- -- Kyo Lee <kyo.lee at eucalyptus.com> Wed, 16 Dec 2009 20:27:31 -0800
+ * Build with -Wno-error=unused-but-set-variable. LP: #829498.
+ -- Matthias Klose <doko at ubuntu.com> Thu, 25 Aug 2011 17:50:12 +0200
+
+axis2c (1.6.0-0ubuntu12) oneiric; urgency=low
+
+ * debian/patches/constify_ssl_method_ftbfs.patch: Declare SSL_METHOD
+ of type const, fixing FTBFS. (LP: #796379)
+
+ -- Dave Walker (Daviey) <DaveWalker at ubuntu.com> Sun, 12 Jun 2011 21:20:18 +0100
+
+axis2c (1.6.0-0ubuntu11) oneiric; urgency=low
+
+ * Rebuild for OpenSSL 1.0.0.
+
+ -- Colin Watson <cjwatson at ubuntu.com> Wed, 18 May 2011 10:16:01 +0100
+
+axis2c (1.6.0-0ubuntu10) natty; urgency=low
+
+ * debian/patches/fix_uri_test.patch: Fix double free in testcase
+ causing FTBFS (LP: #600174)
+
+ -- Jani Monoses <jani at ubuntu.com> Tue, 08 Mar 2011 16:43:31 +0200
+
+axis2c (1.6.0-0ubuntu9) natty; urgency=low
+
+ * Fix build failure with DSO linker changes (Rob Savoye). LP: #606686.
+
+ -- Matthias Klose <doko at ubuntu.com> Thu, 07 Oct 2010 16:09:00 +0200
+
+axis2c (1.6.0-0ubuntu8) lucid; urgency=low
+
+ * rebuild rest of main for armel armv7/thumb2 optimization;
+ UbuntuSpec:mobile-lucid-arm-gcc-v7-thumb2
+
+ -- Alexander Sack <asac at ubuntu.com> Fri, 05 Mar 2010 03:10:28 +0100
+
axis2c (1.6.0-0ubuntu7) karmic; urgency=low
* debian/libaxis2c.preinst: Handle /usr/lib/axis2/lib directory symlink
Modified: axis2c/trunk/debian/control
===================================================================
--- axis2c/trunk/debian/control 2011-11-23 20:22:02 UTC (rev 180)
+++ axis2c/trunk/debian/control 2012-01-15 18:02:48 UTC (rev 181)
@@ -1,13 +1,14 @@
Source: axis2c
Section: libs
Priority: optional
+Maintainer: Debian Eucalyptus Team <pkg-eucalyptus-maintainers at lists.alioth.debian.org>
+Uploaders: Brian Thomason <brian.thomason at eucalyptus.com>
+Build-Depends: cdbs, debhelper (>= 7), autotools-dev, libxml2-dev, libapr1-dev, apache2-threaded-dev, zlib1g-dev, libssl-dev, quilt
+Standards-Version: 3.9.2
+Homepage: http://ws.apache.org/axis2/c/
DM-Upload-Allowed: yes
-Uploaders: Daniel Nurmi <nurmi at eucalyptus.com>, Graziano Obertelli <graziano at eucalyptus.com>, Chris Grzegorczyk <grze at eucalyptus.com>, Thierry Carrez <thierry.carrez at ubuntu.com>
-XSBC-Original-Maintainer: Soren Hansen <soren at ubuntu.com>, Thierry Carrez <thierry.carrez at ubuntu.com>
-Maintainer: Kyo Lee <kyo.lee at eucalyptus.com>
-Build-Depends: cdbs, debhelper (>= 7), autotools-dev, libxml2-dev, libapr1-dev, apache2-threaded-dev, zlib1g-dev, libssl-dev
-Standards-Version: 3.9.1
-Homepage: http://ws.apache.org/axis2/c/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-eucalyptus/axis2c/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-eucalyptus/axis2c/trunk
Package: libaxis2c0
Architecture: any
@@ -131,3 +132,4 @@
guaranteed interoperability. This enables using C in Service Oriented
Architecture (SOA) implementations, and would be very useful when integrating
legacy systems into SOA.
+X-Original-Maintainer: Soren Hansen <soren at ubuntu.com>
Modified: axis2c/trunk/debian/copyright
===================================================================
--- axis2c/trunk/debian/copyright 2011-11-23 20:22:02 UTC (rev 180)
+++ axis2c/trunk/debian/copyright 2012-01-15 18:02:48 UTC (rev 181)
@@ -3,6 +3,8 @@
It was downloaded from http://archive.apache.org/dist/ws/axis2/c/1_6_0/
+Files: *
+
Upstream Authors:
Samisa Abeysinghe
@@ -50,24 +52,8 @@
On a Debian system, the license can be found at
/usr/share/common-licenses/Apache-2.0 .
-The Debian packaging is copyright 2009, Soren Hansen <soren at ubuntu.com> and
-is also licensed under the Apache license.
+Files: unzip.h
-The below article is included in NOTICE file
-
-Apache Axis2/C
-Copyright 2005-2009 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This software contains code derived from the RSA Data Security
-Inc. MD5 Message-Digest Algorithm, including various
-modifications by Spyglass Inc., Carnegie Mellon University, and
-Bell Communications Research, Inc (Bellcore).
-
-Files in util/src/minizip are covered by the following license.
-
unzip.h -- IO for uncompress .zip files using zlib
Version 1.01e, February 12th, 2005
@@ -107,3 +93,6 @@
PkWare has also a specification at :
ftp://ftp.pkware.com/probdesc.zip
+
+The Debian packaging is copyright 2009, Soren Hansen <soren at ubuntu.com> and
+is also licensed under the Apache license.
Modified: axis2c/trunk/debian/libaxis2c0.preinst
===================================================================
--- axis2c/trunk/debian/libaxis2c0.preinst 2011-11-23 20:22:02 UTC (rev 180)
+++ axis2c/trunk/debian/libaxis2c0.preinst 2012-01-15 18:02:48 UTC (rev 181)
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
if [ "$1" = "upgrade" ]
then
Added: axis2c/trunk/debian/patches/06-ld-no-as-needed.patch
===================================================================
--- axis2c/trunk/debian/patches/06-ld-no-as-needed.patch (rev 0)
+++ axis2c/trunk/debian/patches/06-ld-no-as-needed.patch 2012-01-15 18:02:48 UTC (rev 181)
@@ -0,0 +1,56 @@
+--- axis2c-1.6.0-orig/axiom/test/util/Makefile.am 2009-04-05 22:48:14.000000000 -0600
++++ axis2c-1.6.0-new/axiom/test/util/Makefile.am 2010-07-16 11:44:25.000000000 -0600
+@@ -1,7 +1,9 @@
+ noinst_PROGRAMS = axiom
+ axiom_SOURCES = axiom_util_test.c
+ axiom_LDADD = \
+- $(top_builddir)/src/om/libaxis2_axiom.la
++ $(top_builddir)/src/om/libaxis2_axiom.la \
++ $(top_builddir)/src/parser/guththila/libaxis2_parser.la \
++ $(top_builddir)/../util/src/libaxutil.la
+
+ INCLUDES = -I$(top_builddir)/include \
+ -I ../../../util/include \
+--- axis2c-1.6.0-orig/axiom/test/util/axiom_util_test.c 2010-07-16 12:03:37.000000000 -0600
++++ axis2c-1.6.0-new/axiom/test/util/axiom_util_test.c 2010-07-16 12:04:12.000000000 -0600
+@@ -3,6 +3,8 @@
+ #include <axiom.h>
+ #include <axis2_util.h>
+ #include <axiom_node.h>
++#include <axiom_xml_reader.h> /* FIXME */
++
+ #include "../../../util/test/util/create_env.h"
+ FILE *f = NULL;
+ axiom_node_t *node = NULL;
+--- axis2c-1.6.0-orig/neethi/test/Makefile.am 2009-04-05 22:46:59.000000000 -0600
++++ axis2c-1.6.0-new/neethi/test/Makefile.am 2010-07-16 11:50:08.000000000 -0600
+@@ -12,5 +12,6 @@
+
+ test_LDADD = $(top_builddir)/src/libneethi.la \
+ ../../axiom/src/om/libaxis2_axiom.la \
++ ../../axiom/src/parser/guththila/libaxis2_parser.la \
+ ../../util/src/libaxutil.la \
+ ../src/libneethi.la
+--- ./neethi/test/Makefile.in~ 2009-04-17 08:15:28.000000000 +0200
++++ ./neethi/test/Makefile.in 2010-10-07 16:33:06.232108405 +0200
+@@ -187,6 +187,7 @@
+
+ test_LDADD = $(top_builddir)/src/libneethi.la \
+ ../../axiom/src/om/libaxis2_axiom.la \
++ ../../axiom/src/parser/guththila/libaxis2_parser.la \
+ ../../util/src/libaxutil.la \
+ ../src/libneethi.la
+
+--- ./axiom/test/util/Makefile.in~ 2009-04-17 08:15:23.000000000 +0200
++++ ./axiom/test/util/Makefile.in 2010-10-07 16:32:04.289608905 +0200
+@@ -184,7 +184,9 @@
+ top_srcdir = @top_srcdir@
+ axiom_SOURCES = axiom_util_test.c
+ axiom_LDADD = \
+- $(top_builddir)/src/om/libaxis2_axiom.la
++ $(top_builddir)/src/om/libaxis2_axiom.la \
++ $(top_builddir)/src/parser/guththila/libaxis2_parser.la \
++ $(top_builddir)/../util/src/libaxutil.la \
+
+ INCLUDES = -I$(top_builddir)/include \
+ -I ../../../util/include \
Added: axis2c/trunk/debian/patches/constify_ssl_method_ftbfs.patch
===================================================================
--- axis2c/trunk/debian/patches/constify_ssl_method_ftbfs.patch (rev 0)
+++ axis2c/trunk/debian/patches/constify_ssl_method_ftbfs.patch 2012-01-15 18:02:48 UTC (rev 181)
@@ -0,0 +1,15 @@
+Description: Declare SSL_METHOD of type const, fixing FTBFS.
+Author: Dave Walker (Daviey)) <DaveWalker at ubuntu.com>
+Bug-Ubuntu: https://launchpad.net/bugs/796379
+
+--- a/src/core/transport/http/sender/ssl/ssl_utils.c
++++ b/src/core/transport/http/sender/ssl/ssl_utils.c
+@@ -41,7 +41,7 @@
+ axis2_char_t * key_file,
+ axis2_char_t * ssl_pp)
+ {
+- SSL_METHOD *meth = NULL;
++ const SSL_METHOD *meth = NULL;
+ SSL_CTX *ctx = NULL;
+ axis2_char_t *ca_file = server_cert;
+
Added: axis2c/trunk/debian/patches/fix_uri_test.patch
===================================================================
--- axis2c/trunk/debian/patches/fix_uri_test.patch (rev 0)
+++ axis2c/trunk/debian/patches/fix_uri_test.patch 2012-01-15 18:02:48 UTC (rev 181)
@@ -0,0 +1,16 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+Index: axis2c-1.6.0/util/test/uri/uri_test.c
+===================================================================
+--- axis2c-1.6.0.orig/util/test/uri/uri_test.c 2011-03-08 16:43:28.988346623 +0200
++++ axis2c-1.6.0/util/test/uri/uri_test.c 2011-03-08 16:43:23.020317033 +0200
+@@ -72,7 +72,7 @@
+ printf("Test clone failed");
+ }
+
+- rel = axutil_uri_resolve_relative(env,base,clone);
++ rel = axutil_uri_resolve_relative(env,base,uri);
+ if(rel)
+ {
+ printf("The resolved relative uri is %s\n",axutil_uri_to_string(rel,env,0));
Modified: axis2c/trunk/debian/patches/series
===================================================================
--- axis2c/trunk/debian/patches/series 2011-11-23 20:22:02 UTC (rev 180)
+++ axis2c/trunk/debian/patches/series 2012-01-15 18:02:48 UTC (rev 181)
@@ -3,3 +3,6 @@
04_fix_testsuite.patch
#build-without-threading.patch
05-build-without-threading.patch
+06-ld-no-as-needed.patch
+fix_uri_test.patch
+constify_ssl_method_ftbfs.patch
Modified: axis2c/trunk/debian/rules
===================================================================
--- axis2c/trunk/debian/rules 2011-11-23 20:22:02 UTC (rev 180)
+++ axis2c/trunk/debian/rules 2012-01-15 18:02:48 UTC (rev 181)
@@ -6,6 +6,9 @@
DEB_CONFIGURE_PREFIX:=/usr/lib/axis2
DEB_CONFIGURE_EXTRA_FLAGS := --with-apache2=/usr/include/apache2 --with-apr=/usr/include/apr-1.0 --enable-openssl --enable-multi-thread=no
+CFLAGS += -Wno-error=unused-but-set-variable
+export CFLAGS
+
DEB_CONFIGURE_EXTRA_FLAGS += --enable-tests
DEB_MAKE_CHECK_TARGET := check
@@ -16,13 +19,11 @@
mkdir -p debian/$(cdbs_curpkg)/usr/lib/axis2/include/axis2-1.6.0
find debian/$(cdbs_curpkg)
cd debian/$(cdbs_curpkg)/usr/lib/axis2/include/axis2-1.6.0 ; for x in ../../../../include/axis2-1.6.0/*; do ln -s $$x; done
- chmod +x debian/$(cdbs_curpkg)/usr/lib/axis2/bin/tools/wsdl2c/WSDL2C.sh
binary-install/libapache2-mod-axis2c::
sed -i "s/\(libdir=.*\)axis2/\1apache2/g" debian/$(cdbs_curpkg)/usr/lib/apache2/modules/addressing/libaxis2_mod_addr.la
- sed -i "s/\(libdir=.*\)axis2/\1apache2/g" debian/$(cdbs_curpkg)/usr/lib/apache2/modules/logging/libaxis2_mod_log.la
+ sed -i "s/\(libdir=.*\)axis2/\1apache2/g" debian/$(cdbs_curpkg)/usr/lib/apache2/modules/logging/libaxis2_mod_log.la
clean::
find . -name Makefile -print0 | xargs -0 rm || /bin/true
chmod 755 tools/codegen/javatool/WSDL2C.sh
-
More information about the pkg-eucalyptus-commits
mailing list