tags 622140 + pending
thanks

Dear maintainer,

I've prepared an NMU for neon27 (versioned as 0.29.5-3.1) and
uploaded it to DELAYED/2.  NMU diff attached.

Cheers,
Julien
diff -u neon27-0.29.5/debian/changelog neon27-0.29.5/debian/changelog
--- neon27-0.29.5/debian/changelog
+++ neon27-0.29.5/debian/changelog
@@ -1,3 +1,12 @@
+neon27 (0.29.5-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Stop building the openssl variant.  No package in Debian uses it anymore.
+    As a side effect, we don't FTBFS with new openssl (closes: #622140)
+  * Also drop the old transitional libneon25-dev.
+
+ -- Julien Cristau <jcris...@debian.org>  Sun, 03 Jul 2011 12:15:25 +0200
+
 neon27 (0.29.5-3) unstable; urgency=medium
 
   * Don't use \ for line continuation in the parameter of
diff -u neon27-0.29.5/debian/control neon27-0.29.5/debian/control
--- neon27-0.29.5/debian/control
+++ neon27-0.29.5/debian/control
@@ -2,68 +2,10 @@
 Section: net
 Priority: optional
 Maintainer: Laszlo Boszormenyi (GCS) <g...@debian.hu>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, libxml2-dev, libssl-dev (>= 0.9.8c), libgnutls-dev (>= 2.8.3), libkrb5-dev, libz-dev, autotools-dev, binutils (>= 2.14.90.0.7), ca-certificates, chrpath
+Build-Depends: debhelper (>= 5.0.0), pkg-config, libxml2-dev, libgnutls-dev (>= 2.8.3), libkrb5-dev, libz-dev, autotools-dev, binutils (>= 2.14.90.0.7), ca-certificates, chrpath
 Homepage: http://www.webdav.org/neon/
 Standards-Version: 3.9.1
 
-Package: libneon27
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: An HTTP and WebDAV client library
- neon is an HTTP and WebDAV client library, with a C language API.
- .
- WARNING: THE NEON API IS NOT YET STABLE.
- .
- Provides lower-level interfaces to directly implement new HTTP
- methods, and higher-level interfaces so that you don't have to
- worry about the lower-level stuff.
- .
- Current features:
-   * High-level interface to HTTP and WebDAV methods (PUT, GET, HEAD, etc.)
-   * Low-level interface to HTTP request handling, to allow implementing
-     new methods easily.
-   * persistent connections
-   * RFC2617 basic and digest authentication (including auth-int, md5-sess)
-   * Proxy support (including basic/digest authentication)
-   * SSL/TLS support using OpenSSL (including client certificate and thread
-     safety support)
-   * Generic WebDAV 207 XML response handling mechanism
-   * XML parsing using the expat or libxml parsers
-   * Easy generation of error messages from 207 error responses
-   * WebDAV resource manipulation: MOVE, COPY, DELETE, MKCOL.
-   * WebDAV metadata support: set and remove properties, query any set ofi
-     properties (PROPPATCH/PROPFIND).
-   * autoconf macros supplied for easily embedding neon directly inside an
-     application source tree.
-
-Package: libneon27-dev
-Section: libdevel
-Architecture: any
-Conflicts: libneon-dev, libneon24-doc (<= 0.24.5-1), libneon25-dev (<< 0.28.2-5), libneon27-gnutls-dev
-Provides: libneon-dev
-Replaces: libneon-dev, libneon25-dev, libneon27-gnutls-dev
-Depends: ${misc:Depends}, libneon27 (= ${binary:Version}), libssl-dev, libxml2-dev, libkrb5-dev, pkg-config
-Description: Header and static library files for libneon27
- This package contains the headers and the static library for libneon27.
- .
- Neon provides lower-level interfaces to directly implement new HTTP
- methods, and higher-level interfaces so that you don't have to
- worry about the lower-level stuff.
-
-Package: libneon27-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: ${misc:Depends}, libneon27 (= ${binary:Version})
-Description: Detached symbols for libneon27
- This package contains the debugging symbols for libneon27, suitable for
- debugging.
- .
- Neon provides lower-level interfaces to directly implement new HTTP
- methods, and higher-level interfaces so that you don't have to
- worry about the lower-level stuff.
-
 Package: libneon27-gnutls
 Section: libs
 Architecture: any
@@ -127,10 +68,0 @@
-
-Package: libneon25-dev
-Section: libdevel
-Architecture: any
-Conflicts: libneon24-doc (<= 0.24.5-1)
-Depends: ${misc:Depends}, libneon27-dev (= ${binary:Version}) | libneon27-gnutls-dev (= ${binary:Version})
-Description: Header and static library files for libneon25
- This is a transitional package to neon27.
- .
- You may safely remove this package.
reverted:
--- neon27-0.29.5/debian/libneon27-dev.files
+++ neon27-0.29.5.orig/debian/libneon27-dev.files
@@ -1,6 +0,0 @@
-usr/bin/neon-config
-usr/include/neon
-usr/lib/libneon.a
-usr/lib/libneon.so
-usr/lib/pkgconfig
-usr/share/man
reverted:
--- neon27-0.29.5/debian/libneon27-dev.lintian
+++ neon27-0.29.5.orig/debian/libneon27-dev.lintian
@@ -1,3 +0,0 @@
-libneon27-dev: manpage-has-errors-from-man usr/share/man/man3/ne_ssl_cert_identity.3.gz 25: warning [p 1, 2.3i]: can't break line
-libneon27-dev: manpage-has-errors-from-man usr/share/man/man3/ne_ssl_clicert_read.3.gz 31: warning [p 1, 3.7i]: can't break line
-libneon27-dev: manpage-has-errors-from-man usr/share/man/man3/ne_get_error.3.gz 55: warning: `..' not defined
diff -u neon27-0.29.5/debian/rules neon27-0.29.5/debian/rules
--- neon27-0.29.5/debian/rules
+++ neon27-0.29.5/debian/rules
@@ -18,15 +18,6 @@
 		--with-libxml2
 CFLAGS="-O2 -g"
 
-${BUILDDIR}/neon-openssl/config.status: configure
-	cp  /usr/share/misc/config.guess \
-	    /usr/share/misc/config.sub \
-	  ./
-	install -d $(BUILDDIR)/neon-openssl
-	cd $(BUILDDIR)/neon-openssl/ && \
-	                CFLAGS=$(CFLAGS) $(CURDIR)/configure ${CONFIG_COMMON} \
-			--with-ssl=openssl
-
 ${BUILDDIR}/neon-gnutls/config.status: configure
 	cp  /usr/share/misc/config.guess \
 	    /usr/share/misc/config.sub \
@@ -37,14 +28,7 @@
 			--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \
 			--with-ssl=gnutls
 
-build: build-openssl build-gnutls
-build-openssl: ${BUILDDIR}/neon-openssl/config.status
-	dh_testdir
-	cd $(BUILDDIR)/neon-openssl/ && $(MAKE)
-#	cd $(BUILDDIR)/neon-openssl/ && $(MAKE) check
-
-	touch build-openssl
-
+build: build-gnutls
 build-gnutls: ${BUILDDIR}/neon-gnutls/config.status
 	dh_testdir
 	cd $(BUILDDIR)/neon-gnutls/ && \
@@ -61,7 +45,7 @@
 clean:
 	dh_testdir
 	dh_testroot
-	-rm -f build-openssl build-gnutls install-openssl install-gnutls \
+	-rm -f build-gnutls install-gnutls \
 	    macros/changelog.m4
 	-rm -f config.sub config.guess
 	rm -rf $(BUILDDIR)
@@ -71,29 +55,7 @@
 	dh_clean
 
 
-install: install-openssl install-gnutls
-
-install-openssl: build-openssl
-	dh_testdir
-	dh_testroot
-	dh_installdirs
-	cd $(BUILDDIR)/neon-openssl/ && $(MAKE) install-lib install-headers install-config install-man DESTDIR=$(DESTDIR)/$(package)
-	chrpath -d $(CURDIR)/debian/$(package)/usr/lib/libneon.so.27
-	rm -f $(CURDIR)/debian/$(package)/usr/lib/libneon.la
-	dh_movefiles -p$(package)-dev --sourcedir=debian/$(package)
-	install -d debian/$(package)-dev/usr/share/aclocal
-	cp macros/neon*.m4 \
-		debian/$(package)-dev/usr/share/aclocal/
-
-	rm -rf debian/$(package)/usr/include \
-		debian/$(package)/usr/bin \
-		debian/$(package)/usr/share/man \
-		debian/$(package)/usr/lib/pkgconfig
-
-	install -d $(DESTDIR)/$(package)-dev/usr/share/lintian/overrides/
-	install -m0644 $(CURDIR)/debian/$(package)-dev.lintian $(DESTDIR)/$(package)-dev/usr/share/lintian/overrides/$(package)-dev
-
-	touch install-openssl
+install: install-gnutls
 
 install-gnutls: build-gnutls
 	dh_testdir
@@ -131,15 +93,12 @@
 	dh_testroot -a
 
 	cp macros/ChangeLog macros/changelog.m4
-	dh_installdocs -p$(package)-dev macros/changelog.m4
 	dh_installdocs -p$(package)-gnutls-dev macros/changelog.m4
 
 	dh_installchangelogs -a ChangeLog
 	dh_installdocs -a AUTHORS BUGS NEWS README THANKS TODO
-	dh_makeshlibs -p$(package) -V'$(package) (>= $(shlibs-version))'
 	dh_makeshlibs -p$(package)-gnutls -V'$(package)-gnutls (>= $(shlibs-version))'
 	dh_link
-	dh_strip -p$(package) --dbg-package=$(package)-dbg
 	dh_strip -p$(package)-gnutls --dbg-package=$(package)-gnutls-dbg
 	dh_compress -a
 	dh_fixperms -a

Attachment: signature.asc
Description: Digital signature

Reply via email to