Tony Mancill pushed to branch master at Debian Java Maintainers / java-package
Commits: 3d4c9567 by tony mancill at 2019-10-06T15:41:48Z Replace dependency on libgl1-mesa-glx (Closes: #941808) - - - - - 6339a114 by tony mancill at 2019-10-06T15:47:32Z Add lintian override for debhelper dependency - - - - - 1d014048 by tony mancill at 2019-10-06T16:00:50Z Use dh sequencer in debian/rules - - - - - e09702fe by tony mancill at 2019-10-06T16:00:50Z Use debhelper 12 - - - - - 98bdc9ad by tony mancill at 2019-10-06T16:00:50Z Bump Standards-Version to 4.4.1 - - - - - ee016352 by tony mancill at 2019-10-06T16:00:50Z interim changelog - - - - - 5 changed files: - debian/changelog - debian/compat - debian/control - + debian/java-package.lintian-overrides - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -4,8 +4,6 @@ java-package (0.63) UNRELEASED; urgency=medium * Team upload. * Removed support for the browser plugin (Closes: #779725) * Suggest openjdk-8-jre instead of openjdk-7-jre - * Standards-Version updated to 4.2.1 - * Switch to debhelper level 11 * Use salsa.debian.org Vcs-* URLs [ Sven Hoexter ] @@ -15,7 +13,15 @@ java-package (0.63) UNRELEASED; urgency=medium [ Jelmer Vernooij ] * Use secure copyright file specification URI. - -- Sven Hoexter <[email protected]> Mon, 22 Oct 2018 15:39:32 +0200 + [ tony mancill ] + * Replace dependency on libgl1-mesa-glx (Closes: #941808) + * Add lintian override for debhelper dependency + * Use dh sequencer in debian/rules + * Use debhelper 12 for Build-Depends + * Use dh sequencer in debian/rules + * Bump Standards-Version to 4.4.1 + + -- tony mancill <[email protected]> Sun, 06 Oct 2019 09:00:07 -0700 java-package (0.62) unstable; urgency=medium ===================================== debian/compat ===================================== @@ -1 +1 @@ -11 +12 ===================================== debian/control ===================================== @@ -3,8 +3,8 @@ Section: contrib/misc Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Cédric Pineau <[email protected]> -Build-Depends: debhelper (>= 11) -Standards-Version: 4.2.1 +Build-Depends: debhelper (>= 12) +Standards-Version: 4.4.1 Vcs-Git: https://salsa.debian.org/java-team/java-package.git Vcs-Browser: https://salsa.debian.org/java-team/java-package @@ -16,7 +16,8 @@ Depends: debhelper (>= 11), fakeroot, libasound2, libfontconfig1, - libgl1-mesa-glx, + libgl1, + libglx-mesa0, libgtk2.0-0, libx11-6, libxslt1.1, ===================================== debian/java-package.lintian-overrides ===================================== @@ -0,0 +1,2 @@ +# java-package uses debhelper at runtime +java-package binary: binary-package-depends-on-toolchain-package ===================================== debian/rules ===================================== @@ -8,58 +8,25 @@ VERSION := $(shell head -n 1 $(CURDIR)/debian/changelog | sed 's/.*(//;s/).*//') B := $(CURDIR)/debian/java-package -build: build-arch build-indep -build-arch: build-stamp -build-indep: build-stamp +%: + dh $@ -build-stamp: - dh_testdir +override_dh_auto_build-indep: sed s/@VERSION@/$(VERSION)/ make-jpkg > make-jpkg.out - touch $@ + dh_auto_build -i -clean: - dh_testdir - dh_testroot +override_dh_clean: rm -f build-stamp SUPPORTED make-jpkg.out debian/semantic.cache dh_clean -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs +override_dh_auto_install-indep: install -m 755 make-jpkg.out $(B)/usr/bin/make-jpkg cp lib/*.sh $(B)/usr/share/java-package/ find $(B) -type d -name .svn | xargs -r rm -r - -# Generate SUPPORTED + # Generate SUPPORTED echo "java-package currently supports the following binary packages:" > SUPPORTED echo >> SUPPORTED echo "(This list is automatically generated, do not edit)" >> SUPPORTED echo >> SUPPORTED grep -h "SUPPORTED$$" $(wildcard $(CURDIR)/lib/*-*.sh) | sed 's/"//g;s/).*//' >> SUPPORTED - - dh_install - -binary: binary-indep - -binary-arch: - -binary-indep: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installman make-jpkg.1 - dh_link -# dh_strip - dh_compress - dh_fixperms - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -.PHONY: build clean binary-indep binary install + dh_auto_install -i View it on GitLab: https://salsa.debian.org/java-team/java-package/compare/26e5a6e5307181749166e2b7b94409a385a290a3...ee016352fcc0252934c435f2d88bf97319d5bd5d -- View it on GitLab: https://salsa.debian.org/java-team/java-package/compare/26e5a6e5307181749166e2b7b94409a385a290a3...ee016352fcc0252934c435f2d88bf97319d5bd5d You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
