[Pkg-openssl-changes] r868 - openssl/branches/1.1.0/debian

Sebastian Andrzej Siewior bigeasy at moszumanska.debian.org
Tue Dec 27 22:25:11 UTC 2016 

Author: bigeasy
Date: 2016-12-27 22:25:11 +0000 (Tue, 27 Dec 2016)
New Revision: 868

Added:
   openssl/branches/1.1.0/debian/libssl-dev.install
   openssl/branches/1.1.0/debian/libssl-doc.install
   openssl/branches/1.1.0/debian/libssl1.1.install
   openssl/branches/1.1.0/debian/openssl.install
Removed:
   openssl/branches/1.1.0/debian/libssl-dev.files
   openssl/branches/1.1.0/debian/libssl-doc.files
   openssl/branches/1.1.0/debian/libssl1.1.files
   openssl/branches/1.1.0/debian/openssl.files
Modified:
   openssl/branches/1.1.0/debian/changelog
   openssl/branches/1.1.0/debian/compat
   openssl/branches/1.1.0/debian/control
   openssl/branches/1.1.0/debian/openssl.docs
   openssl/branches/1.1.0/debian/rules
Log:
redo debhelper for 1.1.0



Modified: openssl/branches/1.1.0/debian/changelog
===================================================================
--- openssl/branches/1.1.0/debian/changelog	2016-12-22 22:28:34 UTC (rev 867)
+++ openssl/branches/1.1.0/debian/changelog	2016-12-27 22:25:11 UTC (rev 868)
@@ -2,6 +2,13 @@
 
   * Add myself as Uploader.
   * Add support for tilegx, patch by Helmut Grohne (Closes: #848957).
+  * redo the rules file to some newer debhelper:
+    - everyfile should remain, nothing should get lost
+    - the scripts in the doc package gained an exec bit
+    - openssl gained a dep on perl (the package contains perl scripts)
+    - libssl1.0.2-dbg is gone, we have dbgsym now
+    - dh compat 10
+    - pkg.install instead of pkg.files is used for install
 
  -- Sebastian Andrzej Siewior <sebastian at breakpoint.cc>  Thu, 22 Dec 2016 23:24:14 +0100
 

Modified: openssl/branches/1.1.0/debian/compat
===================================================================
--- openssl/branches/1.1.0/debian/compat	2016-12-22 22:28:34 UTC (rev 867)
+++ openssl/branches/1.1.0/debian/compat	2016-12-27 22:25:11 UTC (rev 868)
@@ -1 +1 @@
-9
+10

Modified: openssl/branches/1.1.0/debian/control
===================================================================
--- openssl/branches/1.1.0/debian/control	2016-12-22 22:28:34 UTC (rev 867)
+++ openssl/branches/1.1.0/debian/control	2016-12-27 22:25:11 UTC (rev 868)
@@ -1,5 +1,5 @@
 Source: openssl
-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>
@@ -92,16 +92,3 @@
  Internet.
  .
  It contains manpages and demo files for libssl and libcrypto.
-
-Package: libssl1.1-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Multi-Arch: same
-Depends: libssl1.1 (= ${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/1.1.0/debian/libssl-dev.files
===================================================================
--- openssl/branches/1.1.0/debian/libssl-dev.files	2016-12-22 22:28:34 UTC (rev 867)
+++ openssl/branches/1.1.0/debian/libssl-dev.files	2016-12-27 22:25:11 UTC (rev 868)
@@ -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/1.1.0/debian/libssl-dev.install
===================================================================
--- openssl/branches/1.1.0/debian/libssl-dev.install	                        (rev 0)
+++ openssl/branches/1.1.0/debian/libssl-dev.install	2016-12-27 22:25:11 UTC (rev 868)
@@ -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/1.1.0/debian/libssl-doc.files
===================================================================
--- openssl/branches/1.1.0/debian/libssl-doc.files	2016-12-22 22:28:34 UTC (rev 867)
+++ openssl/branches/1.1.0/debian/libssl-doc.files	2016-12-27 22:25:11 UTC (rev 868)
@@ -1 +0,0 @@
-usr/share/man/man3

Added: openssl/branches/1.1.0/debian/libssl-doc.install
===================================================================
--- openssl/branches/1.1.0/debian/libssl-doc.install	                        (rev 0)
+++ openssl/branches/1.1.0/debian/libssl-doc.install	2016-12-27 22:25:11 UTC (rev 868)
@@ -0,0 +1 @@
+usr/share/man/man3/*

Deleted: openssl/branches/1.1.0/debian/libssl1.1.files
===================================================================
--- openssl/branches/1.1.0/debian/libssl1.1.files	2016-12-22 22:28:34 UTC (rev 867)
+++ openssl/branches/1.1.0/debian/libssl1.1.files	2016-12-27 22:25:11 UTC (rev 868)
@@ -1,3 +0,0 @@
-usr/lib/*/*.so.*.*
-usr/lib/*/*/*.so.*.*
-usr/lib/*/engines-*

Added: openssl/branches/1.1.0/debian/libssl1.1.install
===================================================================
--- openssl/branches/1.1.0/debian/libssl1.1.install	                        (rev 0)
+++ openssl/branches/1.1.0/debian/libssl1.1.install	2016-12-27 22:25:11 UTC (rev 868)
@@ -0,0 +1,2 @@
+usr/lib/*/*.so.*.*
+usr/lib/*/engines-*/*.so

Modified: openssl/branches/1.1.0/debian/openssl.docs
===================================================================
--- openssl/branches/1.1.0/debian/openssl.docs	2016-12-22 22:28:34 UTC (rev 867)
+++ openssl/branches/1.1.0/debian/openssl.docs	2016-12-27 22:25:11 UTC (rev 868)
@@ -5,3 +5,4 @@
 README.ENGINE
 NEWS
 FAQ
+debian/README.optimization

Deleted: openssl/branches/1.1.0/debian/openssl.files
===================================================================
--- openssl/branches/1.1.0/debian/openssl.files	2016-12-22 22:28:34 UTC (rev 867)
+++ openssl/branches/1.1.0/debian/openssl.files	2016-12-27 22:25:11 UTC (rev 868)
@@ -1,9 +0,0 @@
-usr/share/man/man1
-usr/share/man/man5
-usr/share/man/man7
-usr/bin
-usr/lib/ssl/misc
-usr/lib/ssl/certs
-usr/lib/ssl/openssl.cnf
-usr/lib/ssl/private
-etc/ssl

Added: openssl/branches/1.1.0/debian/openssl.install
===================================================================
--- openssl/branches/1.1.0/debian/openssl.install	                        (rev 0)
+++ openssl/branches/1.1.0/debian/openssl.install	2016-12-27 22:25:11 UTC (rev 868)
@@ -0,0 +1,9 @@
+etc/ssl
+usr/bin/*
+usr/lib/ssl/certs 
+usr/lib/ssl/private
+usr/lib/ssl/misc/*
+usr/lib/ssl/openssl.cnf
+usr/share/man/man1/*
+usr/share/man/man5/*
+usr/share/man/man7/*

Modified: openssl/branches/1.1.0/debian/rules
===================================================================
--- openssl/branches/1.1.0/debian/rules	2016-12-22 22:28:34 UTC (rev 867)
+++ openssl/branches/1.1.0/debian/rules	2016-12-27 22:25:11 UTC (rev 868)
@@ -46,11 +46,12 @@
 	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
 	./Configure no-shared $(CONFARGS) debian-$(DEB_HOST_ARCH)
@@ -81,19 +82,18 @@
 #	$(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
+# we test as part of the build
+override_dh_auto_test:
+
+override_dh_auto_clean:
 	-./Configure $(CONFARGS) debian-$(DEB_HOST_ARCH)
 	[ ! -f Makefile ] || $(MAKE) -f Makefile clean
 	#-$(MAKE) -f Makefile  dclean
 #	perl util/ssldir.pl /usr/local/ssl
 	-rm -f test/.rnd test/testkey.pem test/testreq.pem test/certCA.srl
 	-rm -f util/mk1mf.bak Makefile.bak `find . -name Makefile.save` 
-	-rm -f crypto/pem/ctx_size
+	-rm -f crypto/pem/ctx_size pod2htmd.tmp
 	-rm -f `find . -name "*~"`
 	-rm -f `find . -name "*.orig" -o -name "*.rej"`
 	-rm -f certs/*.0 certs/*.1
@@ -109,34 +109,9 @@
 	rm -f configdata.pm crypto/include/internal/bn_conf.h crypto/include/internal/dso_conf.h include/openssl/opensslconf.h
 	rm -f crypto.map ssl.map engines/afalg/afalg.so test/req-check.err test/req-fff.p test/sid-fff.p
 	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 DESTDIR=`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
@@ -148,38 +123,25 @@
 	cp -pf debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libcrypto.so.* debian/libcrypto1.1-udeb/usr/lib/
 	cp -pf debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libssl.so.* debian/libssl1.1-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.1/usr/share/doc/libssl1.1/
-	install debian/changelog debian/libssl1.1/usr/share/doc/libssl1.1/changelog.Debian
-	install debian/copyright debian/libssl-dev/usr/share/doc/libssl-dev/
-	install debian/changelog debian/libssl-dev/usr/share/doc/libssl-dev/changelog.Debian
 
-	dh_installdocs -a debian/README.optimization
-	dh_installexamples -a
+override_dh_installchangelogs-binary:
 	dh_installchangelogs -a CHANGES
-	dh_installman -popenssl
-	dh_installdebconf -a
-	dh_movefiles -a
-	dh_compress -a
+
+override_dh_fixperms:
 	chmod 700 debian/openssl/etc/ssl/private
 	dh_fixperms -a -X etc/ssl/private
-	dh_strip -plibssl1.1 --dbg-package=libssl1.1-dbg
-	dh_strip -a -Nlibssl1.1
-	dh_perl -a -d
-	dpkg-gensymbols -Pdebian/libssl1.1/ -plibssl1.1 -c4
-	dh_makeshlibs -a -V "libssl1.1" --add-udeb="libcrypto1.1-udeb" -Xengines
-	sed -i '/^udeb: libssl/s/libcrypto1.1-udeb/libssl1.1-udeb/' debian/libssl1.1/DEBIAN/shlibs
-	dh_shlibdeps -a -L libssl1.1 -l debian/libssl1.1/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.1/ -plibssl1.1 -c4
+	dh_makeshlibs -a --add-udeb="libcrypto1.1-udeb" -Xengines
 
-binary:		binary-indep binary-arch
-
-.PHONY: binary binary-arch binary-indep clean install
+override_dh_shlibdeps:
+	sed -i '/^udeb: libssl/s/libcrypto1.1-udeb/libssl1.1-udeb/' debian/libssl1.1/DEBIAN/shlibs
+	dh_shlibdeps -a -L libssl1.1

More information about the Pkg-openssl-changes mailing list