[Pkg-openssl-changes] r874 - openssl/branches/openssl1.0/debian

Sebastian Andrzej Siewior bigeasy at moszumanska.debian.org
Sat Dec 31 14:30:04 UTC 2016 

Author: bigeasy
Date: 2016-12-31 14:30:04 +0000 (Sat, 31 Dec 2016)
New Revision: 874

Added:
   openssl/branches/openssl1.0/debian/libssl1.0-dev.install
   openssl/branches/openssl1.0/debian/libssl1.0.2.install
Removed:
   openssl/branches/openssl1.0/debian/libssl1.0-dev.files
   openssl/branches/openssl1.0/debian/libssl1.0.2.files
Modified:
   openssl/branches/openssl1.0/debian/changelog
   openssl/branches/openssl1.0/debian/compat
   openssl/branches/openssl1.0/debian/control
   openssl/branches/openssl1.0/debian/rules
Log:
redo debhelper, add homepage, drop recommends libssl-dev (it is from 1.1.0)



Modified: openssl/branches/openssl1.0/debian/changelog
===================================================================
--- openssl/branches/openssl1.0/debian/changelog	2016-12-30 22:27:23 UTC (rev 873)
+++ openssl/branches/openssl1.0/debian/changelog	2016-12-31 14:30:04 UTC (rev 874)
@@ -1,4 +1,4 @@
-openssl1.0 (1.0.2j-5) UNRELEASED; urgency=medium
+openssl1.0 (1.0.2j-5) unstable; urgency=medium
 
   * Add myself as Uploader.
   * Drop zlib1g-dev from libssl1.0-dev's deps (Closes: #845945).
@@ -7,8 +7,12 @@
   * Update Standards-Version, no change required.
   * Drop asm support for X32 because the testsuite segfaults.
   * Limit the watchfile to the 1.0.2x series.
+  * Redo rules file to newer debhelper syntax
+  * Add homepage filed
+  * Remove recommends for libssl-doc because the doc package from 1.1.0 is not
+    really matching the -dev package from 1.0.2
 
- -- Sebastian Andrzej Siewior <sebastian at breakpoint.cc>  Mon, 19 Dec 2016 21:57:14 +0100
+ -- Sebastian Andrzej Siewior <sebastian at breakpoint.cc>  Sat, 31 Dec 2016 14:09:16 +0100
 
 openssl1.0 (1.0.2j-4) unstable; urgency=medium
 

Modified: openssl/branches/openssl1.0/debian/compat
===================================================================
--- openssl/branches/openssl1.0/debian/compat	2016-12-30 22:27:23 UTC (rev 873)
+++ openssl/branches/openssl1.0/debian/compat	2016-12-31 14:30:04 UTC (rev 874)
@@ -1 +1 @@
-9
+10

Modified: openssl/branches/openssl1.0/debian/control
===================================================================
--- openssl/branches/openssl1.0/debian/control	2016-12-30 22:27:23 UTC (rev 873)
+++ openssl/branches/openssl1.0/debian/control	2016-12-31 14:30:04 UTC (rev 874)
@@ -1,5 +1,5 @@
 Source: openssl1.0
-Build-Depends: debhelper (>= 9), m4, bc, dpkg-dev (>= 1.15.7)
+Build-Depends: debhelper (>= 10), m4, bc, dpkg-dev (>= 1.15.7)
 Section: utils
 Priority: optional
 Maintainer: Debian OpenSSL Team <pkg-openssl-devel at lists.alioth.debian.org>
@@ -7,6 +7,7 @@
 Standards-Version: 3.9.8
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-openssl/openssl
 Vcs-Svn: svn://anonscm.debian.org/pkg-openssl/openssl/
+Homepage: https://www.openssl.org
 
 Package: libssl1.0.2
 Section: libs
@@ -27,7 +28,6 @@
 Priority: optional
 Architecture: any
 Multi-Arch: same
-Recommends: libssl-doc
 Conflicts: libssl-dev
 Depends: libssl1.0.2 (= ${binary:Version}), ${misc:Depends}
 Description: Secure Sockets Layer toolkit - development files
@@ -66,16 +66,3 @@
  libssl shared library.
  .
  Do not install it on a normal system.
-
-Package: libssl1.0.2-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Multi-Arch: same
-Depends: libssl1.0.2 (= ${binary:Version}), ${misc:Depends}
-Description: Secure Sockets Layer toolkit - debug information
- This package is part of the OpenSSL project's implementation of the SSL
- and TLS cryptographic protocols for secure communication over the
- Internet.
- .
- It contains debugging symbols for libssl and libcrypto.

Deleted: openssl/branches/openssl1.0/debian/libssl1.0-dev.files
===================================================================
--- openssl/branches/openssl1.0/debian/libssl1.0-dev.files	2016-12-30 22:27:23 UTC (rev 873)
+++ openssl/branches/openssl1.0/debian/libssl1.0-dev.files	2016-12-31 14:30:04 UTC (rev 874)
@@ -1,6 +0,0 @@
-usr/lib/*/libssl.so
-usr/lib/*/libcrypto.so
-usr/lib/*/libssl.a
-usr/lib/*/libcrypto.a
-usr/lib/*/pkgconfig
-usr/include

Added: openssl/branches/openssl1.0/debian/libssl1.0-dev.install
===================================================================
--- openssl/branches/openssl1.0/debian/libssl1.0-dev.install	                        (rev 0)
+++ openssl/branches/openssl1.0/debian/libssl1.0-dev.install	2016-12-31 14:30:04 UTC (rev 874)
@@ -0,0 +1,7 @@
+usr/lib/*/libssl.so
+usr/lib/*/libcrypto.so
+usr/lib/*/libssl.a
+usr/lib/*/libcrypto.a
+usr/lib/*/pkgconfig
+usr/include/openssl/*
+usr/include/*/openssl

Deleted: openssl/branches/openssl1.0/debian/libssl1.0.2.files
===================================================================
--- openssl/branches/openssl1.0/debian/libssl1.0.2.files	2016-12-30 22:27:23 UTC (rev 873)
+++ openssl/branches/openssl1.0/debian/libssl1.0.2.files	2016-12-31 14:30:04 UTC (rev 874)
@@ -1,3 +0,0 @@
-usr/lib/*/*.so.*.*.*
-usr/lib/*/*/*.so.*.*.*
-usr/lib/*/openssl-1.0.2/engines

Added: openssl/branches/openssl1.0/debian/libssl1.0.2.install
===================================================================
--- openssl/branches/openssl1.0/debian/libssl1.0.2.install	                        (rev 0)
+++ openssl/branches/openssl1.0/debian/libssl1.0.2.install	2016-12-31 14:30:04 UTC (rev 874)
@@ -0,0 +1,2 @@
+usr/lib/*/*.so.*.*.*
+usr/lib/*/openssl-1.0.2/engines/*.so

Modified: openssl/branches/openssl1.0/debian/rules
===================================================================
--- openssl/branches/openssl1.0/debian/rules	2016-12-30 22:27:23 UTC (rev 873)
+++ openssl/branches/openssl1.0/debian/rules	2016-12-31 14:30:04 UTC (rev 874)
@@ -41,13 +41,14 @@
 	MAKE_TEST = :
 endif
 
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp:
-	dh_testdir
+%:
+	dh $@ --without autoreconf
+
+override_dh_auto_configure:
+
+override_dh_auto_build:
 #	perl util/ssldir.pl /usr/lib/ssl
-#	chmod +x debian/libtool
+#	chmo +x debian/libtool
 	./Configure no-shared $(CONFARGS) debian-$(DEB_HOST_ARCH)
 	make depend
 	make -f Makefile all
@@ -75,12 +76,10 @@
 #	make -f Makefile clean
 #	./Configure --prefix=/usr --openssldir=/usr/lib/ssl no-idea no-mdc2 no-rc5 debian-$(DEB_HOST_ARCH)
 #	make -f Makefile all
-	touch build-stamp
 
-clean:
-	dh_testdir
-	dh_testroot
-	-rm -f build-stamp
+override_dh_auto_test:
+
+override_dh_auto_clean:
 	-./Configure $(CONFARGS) debian-$(DEB_HOST_ARCH)
 	[ ! -f Makefile ] || make -f Makefile  clean clean-shared
 	#-make -f Makefile  dclean
@@ -101,34 +100,9 @@
 	rm -f certs/demo/*.0
 	rm -rf crypto/aes/aes-armv4.S crypto/bn/armv4-gf2m.S crypto/modes/ghash-armv4.S crypto/sha/*.S
 	find . -type l -exec rm '{}' \;
-	dh_clean
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean
-	dh_installdirs
+override_dh_auto_install:
 	make -f Makefile install INSTALL_PREFIX=`pwd`/debian/tmp
-
-binary-indep:	build install
-	dh_testdir
-	dh_testroot
-	dh_installdirs -i
-	dh_installman -plibssl-doc
-	dh_installdocs -i
-	dh_movefiles -i
-	dh_installchangelogs -i CHANGES
-	dh_compress -i
-	dh_fixperms -i
-	dh_gencontrol -i
-	dh_installdeb -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-binary-arch:	build install
-	dh_testdir
-	dh_testroot
-	dh_installdirs -a
 	# pic static libraries, nobody should need them
 #	mv debian/tmp/usr/lib/libcrypto.a debian/tmp/usr/lib/libcrypto_pic.a
 #	mv debian/tmp/usr/lib/libssl.a debian/tmp/usr/lib/libssl_pic.a
@@ -137,13 +111,13 @@
 	cp -pf debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libcrypto.so.* debian/libcrypto1.0.2-udeb/usr/lib/
 	cp -pf debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libssl.so.* debian/libssl1.0.2-udeb/usr/lib/
 	cp -auv lib*.so* debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
-	for opt in $(OPTS); do set -xe; mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/$$opt; cp -auv $$opt/lib*.so* debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/$$opt/; done
+	for opt in $(OPTS); \
+		do set -xe; \
+		mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/$$opt; \
+		cp -auv $$opt/lib*.so* debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/$$opt/; \
+	done
 	mkdir -p debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/openssl
 	mv debian/tmp/usr/include/openssl/opensslconf.h debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/openssl/
-	install debian/copyright debian/libssl1.0.2/usr/share/doc/libssl1.0.2/
-	install debian/changelog debian/libssl1.0.2/usr/share/doc/libssl1.0.2/changelog.Debian
-	install debian/copyright debian/libssl1.0-dev/usr/share/doc/libssl1.0-dev/
-	install debian/changelog debian/libssl1.0-dev/usr/share/doc/libssl1.0-dev/changelog.Debian
 
 	dh_lintian -a
 	# dh_lintian skips udebs, copy it manually
@@ -151,29 +125,14 @@
 	mkdir -p debian/libssl1.0.2-udeb/usr/share/lintian/overrides
 	cp debian/libcrypto1.0.2-udeb.lintian-overrides debian/libcrypto1.0.2-udeb/usr/share/lintian/overrides/libcrypto1.0.2-udeb
 	cp debian/libssl1.0.2-udeb.lintian-overrides debian/libssl1.0.2-udeb/usr/share/lintian/overrides/libssl1.0.2-udeb
-	dh_installdocs -a
-	dh_installexamples -a
+
+override_dh_installchangelogs:
 	dh_installchangelogs -a CHANGES
-	dh_installman -popenssl
-	dh_installdebconf -a
-	dh_movefiles -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_strip -plibssl1.0.2 --dbg-package=libssl1.0.2-dbg
-	dh_strip -a -Nlibssl1.0.2
-	dh_perl -a -d
-	dpkg-gensymbols -Pdebian/libssl1.0.2/ -plibssl1.0.2 -c4
-	dh_makeshlibs -a -V "libssl1.0.2" --add-udeb="libcrypto1.0.2-udeb" -Xengines
-	sed -i '/^udeb: libssl/s/libcrypto1.0.2-udeb/libssl1.0.2-udeb/' debian/libssl1.0.2/DEBIAN/shlibs
-	dh_shlibdeps -a -L libssl1.0.2 -l debian/libssl1.0.2/usr/lib/$(DEB_HOST_MULTIARCH)
-	dh_gencontrol -a
-	dh_installdeb -a
-	dh_md5sums -a
-	dh_builddeb -a
-	echo -en "\a"
 
-# Below here is fairly generic really
+override_dh_makeshlibs:
+	#dpkg-gensymbols -Pdebian/libssl1.0.2/ -plibssl1.0.2 -c4
+	dh_makeshlibs -a --add-udeb="libcrypto1.0.2-udeb" -Xengines
 
-binary:		binary-indep binary-arch
-
-.PHONY: binary binary-arch binary-indep clean install
+override_dh_shlibdeps:
+	sed -i '/^udeb: libssl/s/libcrypto1.0.2-udeb/libssl1.0.2-udeb/' debian/libssl1.0.2/DEBIAN/shlibs
+	dh_shlibdeps -a -L libssl1.0.2

More information about the Pkg-openssl-changes mailing list