Author: twerner Date: 2010-07-28 12:30:21 +0000 (Wed, 28 Jul 2010) New Revision: 12830
Modified: trunk/sun-java6/debian/JB-bin.overrides.in trunk/sun-java6/debian/changelog trunk/sun-java6/debian/rules Log: * New upstream release - There are no security fixes in this release. * Update $(bin_pattern) and $(diff_ignore) in debian/rules. * Add a lintian override for embedded-libjpeg. Modified: trunk/sun-java6/debian/JB-bin.overrides.in =================================================================== --- trunk/sun-java6/debian/JB-bin.overrides.in 2010-07-28 07:19:11 UTC (rev 12829) +++ trunk/sun-java6/debian/JB-bin.overrides.in 2010-07-28 12:30:21 UTC (rev 12830) @@ -7,3 +7,4 @@ @basen...@-bin: package-contains-empty-directory @basen...@-bin: too-long-extended-description-in-templates @basen...@-bin: embedded-zlib +...@basename@-bin: embedded-libjpeg Modified: trunk/sun-java6/debian/changelog =================================================================== --- trunk/sun-java6/debian/changelog 2010-07-28 07:19:11 UTC (rev 12829) +++ trunk/sun-java6/debian/changelog 2010-07-28 12:30:21 UTC (rev 12830) @@ -1,9 +1,12 @@ -sun-java6 (6.20-dlj-5) unstable; urgency=low +sun-java6 (6.21-1) unstable; urgency=low - * UNRELEASED + * New upstream release + - There are no security fixes in this release. + * Update $(bin_pattern) and $(diff_ignore) in debian/rules. * Update danish debconf tranlation; thanks to Joe Dalton. (Closes: #586238) + * Add a lintian override for embedded-libjpeg. - -- Torsten Werner <[email protected]> Sun, 20 Jun 2010 21:12:02 +0200 + -- Torsten Werner <[email protected]> Wed, 28 Jul 2010 14:26:55 +0200 sun-java6 (6.20-dlj-4) unstable; urgency=low Modified: trunk/sun-java6/debian/rules =================================================================== --- trunk/sun-java6/debian/rules 2010-07-28 07:19:11 UTC (rev 12829) +++ trunk/sun-java6/debian/rules 2010-07-28 12:30:21 UTC (rev 12830) @@ -43,8 +43,7 @@ jdirname := $(ia32_prefix)java-$(version)-$(VENDOR)-$(jdkversion).$(releng_ver) jdiralias := $(ia32_prefix)java-$(version)-$(VENDOR) srcdir := $(arch)-jdk -bin_pattern = jdk-$(subst .,_,$(version))-dlj-linux-%.bin -bin_pattern = jdk-6u20-dlj-linux-%.bin +bin_pattern = jdk-$(version)u$(releng_ver)-dlj-linux-%.bin all_archs = $(filter $(subst =, , $(arch_map)), \ $(subst -, , $(patsubst %.bin, %, $(wildcard *.bin)))) priority := 63 @@ -99,18 +98,19 @@ info: @echo Build information @echo ========================== - @echo 'TOP = $(TOP)' - @echo 'VENDOR = $(VENDOR)' - @echo 'RELEASE = $(RELEASE)' - @echo 'PRODUCT = $(PRODUCT)' - @echo 'basename = $(basename)' - @echo 'version = $(version)' - @echo 'releng_ver = $(releng_ver)' - @echo 'unpackdir = $(unpackdir)' - @echo 'srcdir = $(srcdir)' - @echo 'all_archs = $(all_archs)' - @echo 'arch = $(arch)' - @echo 'archdir = $(archdir)' + @echo 'TOP = $(TOP)' + @echo 'VENDOR = $(VENDOR)' + @echo 'RELEASE = $(RELEASE)' + @echo 'PRODUCT = $(PRODUCT)' + @echo 'basename = $(basename)' + @echo 'version = $(version)' + @echo 'releng_ver = $(releng_ver)' + @echo 'unpackdir = $(unpackdir)' + @echo 'srcdir = $(srcdir)' + @echo 'all_archs = $(all_archs)' + @echo 'arch = $(arch)' + @echo 'archdir = $(archdir)' + @echo 'bin_pattern = $(bin_pattern)' @echo $(jre_tools) d = debian/tmp @@ -315,8 +315,8 @@ exit 1; \ fi -diff_ignore = -I 'Monday, April 12' \ - -I 'Mon Apr 12' -I '^ *// java GenerateCharacter' +diff_ignore = -I 'Tuesday, June 22' \ + -I 'Tue Jun 22' -I '^ *// java GenerateCharacter' with_check = yes _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
