control: Tags: patch pending
Dear maintainer,
I've prepared an NMU for ace (versioned as 6.3.3+dfsg-1.2). The diff
is attached to this message.
Regards.
diff -Nru ace-6.3.3+dfsg/debian/changelog ace-6.3.3+dfsg/debian/changelog
--- ace-6.3.3+dfsg/debian/changelog 2016-07-01 07:43:37.000000000 +0200
+++ ace-6.3.3+dfsg/debian/changelog 2017-01-14 14:47:41.000000000 +0100
@@ -1,3 +1,12 @@
+ace (6.3.3+dfsg-1.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Build against libssl1.0.2 (Closes: #828229).
+ * Merge build-indep rules into build-arch rules so it builds with -A as it
+ did before (Closes: #806602).
+
+ -- Sebastian Andrzej Siewior <sebast...@breakpoint.cc> Sat, 14 Jan 2017 13:47:41 +0000
+
ace (6.3.3+dfsg-1.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru ace-6.3.3+dfsg/debian/control ace-6.3.3+dfsg/debian/control
--- ace-6.3.3+dfsg/debian/control 2015-10-25 15:03:01.000000000 +0100
+++ ace-6.3.3+dfsg/debian/control 2017-01-14 14:13:20.000000000 +0100
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian ACE+TAO maintainers <pkg-ace-de...@lists.alioth.debian.org>
Uploaders: Thomas Girard <thomas.g.gir...@free.fr>, Pau Garcia i Quiles <pgqui...@elpauer.org>, Marek Brudka <mbru...@aster.pl>
-Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.2), libssl-dev (>= 0.9.7d), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev (>= 8.5), libfox-1.6-dev, zlib1g-dev, libzzip-dev, liblzo2-dev, docbook-to-man, bzip2, libbz2-dev, libxerces-c-dev
+Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.2), libssl1.0-dev | libssl-dev (<< 1.1), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev (>= 8.5), libfox-1.6-dev, zlib1g-dev, libzzip-dev, liblzo2-dev, docbook-to-man, bzip2, libbz2-dev, libxerces-c-dev
Build-Depends-Indep: doxygen, graphviz
Standards-Version: 3.9.6.1
Vcs-Git: git://anonscm.debian.org/pkg-ace/pkg-ace.git
@@ -73,7 +73,7 @@
Package: libace-ssl-dev
Architecture: any
Section: libdevel
-Depends: libace-ssl-6.3.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev (>= 0.9.7d), ${misc:Depends}
+Depends: libace-ssl-6.3.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl1.0-dev | libssl-dev (<< 1.1), ${misc:Depends}
Description: ACE secure socket layer library - development files
This package contains the header files and static library for the ACE
SSL library.
diff -Nru ace-6.3.3+dfsg/debian/rules ace-6.3.3+dfsg/debian/rules
--- ace-6.3.3+dfsg/debian/rules 2015-10-25 15:03:01.000000000 +0100
+++ ace-6.3.3+dfsg/debian/rules 2017-01-14 14:47:41.000000000 +0100
@@ -57,7 +57,12 @@
override_dh_auto_build-arch: configure-stamp
$(MAKE) -C $(ACE_ROOT) $(DSO_MAKE_FLAG) $(FIXUP)
-override_dh_auto_install-arch: manpages-stamp
+override_dh_auto_build-indep: configure-stamp
+ $(MAKE) -C $(ACE_ROOT) $(DSO_MAKE_FLAG) $(FIXUP)
+ cd $(ACE_ROOT) && bin/generate_doxygen.pl -is_release -exclude_tao -exclude_ciao -exclude_dance
+ find $(ACE_ROOT)/html $(DOXYGEN_FILES_TO_REMOVE) | xargs -r rm -f
+
+override_dh_auto_install: manpages-stamp
$(MAKE) -C $(ACE_ROOT) install $(INSTALL_FLAGS) $(FIXUP)
mkdir -p $(DT)/usr/share/man/man1
cp $(ACE_ROOT)/apps/gperf/ace_gperf.1 $(DT)/usr/share/man/man1
@@ -68,9 +73,7 @@
mv $$f $$g ; \
done
-override_dh_auto_install-indep:
-
-override_dh_auto_clean-arch:
+override_dh_auto_clean:
[ -f $(ACE_ROOT)/GNUmakefile ] && $(MAKE) -C $(ACE_ROOT) realclean $(DSO_MAKE_FLAG) $(FIXUP) || true
find $(ACE_ROOT) -name 'GNUmakefile*' -o -name '.depend.*' | xargs -r rm
rm -f $(ACE_ROOT)/include/makeinclude/platform_macros.GNU
@@ -82,8 +85,6 @@
# Remove stubs that get generated during TAO compilation but for some reason
# are not removed on make realclean
rm -f `cat debian/TOREMOVE`
-
-override_dh_auto_clean-indep:
rm -Rf $(ACE_ROOT)/html/libace-doc \
$(ACE_ROOT)/html/libacexml-doc \
$(ACE_ROOT)/doxygen_sqlite3.db
@@ -114,10 +115,6 @@
debian/%.1: debian/%.sgml
docbook-to-man $< > $@
-override_dh_auto_build-indep:
- cd $(ACE_ROOT) && bin/generate_doxygen.pl -is_release -exclude_tao -exclude_ciao -exclude_dance
- find $(ACE_ROOT)/html $(DOXYGEN_FILES_TO_REMOVE) | xargs -r rm -f
-
.PHONY: manpages
manpages: manpages-stamp
manpages-stamp: $(MAN1)
