Merge tag 'debian/1.185.1'

# Conflicts:
#	debian/changelog
#	debian/control
#	debian/rules
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.


# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch master
# Your branch is up to date with 'origin/master'.
#
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
#	deleted:    classpath.security
#	modified:   debian/README.Debian
#	modified:   debian/README.Debian.m4
#	deleted:    debian/aot-compile
#	deleted:    debian/aotcompile.py
#	modified:   debian/changelog
#	deleted:    debian/classfile.py
#	deleted:    debian/control
#	modified:   debian/control.cross-ml.in
#	modified:   debian/control.cross.in
#	modified:   debian/control.hppa64.in
#	modified:   debian/control.native.in
#	modified:   debian/control.source
#	deleted:    debian/copyright.libgcj-common
#	deleted:    debian/dh_javadoc
#	deleted:    debian/dh_nativejava
#	modified:   debian/gcc.postinst.in
#	deleted:    debian/gcc.preinst
#	deleted:    debian/generate-cacerts.pl.in
#	deleted:    debian/gij.prerm
#	deleted:    debian/libgcj-bc.overrides
#	deleted:    debian/libgcj-common.postinst
#	deleted:    debian/libgcj-common.preinst
#	deleted:    debian/libgcj-common.prerm
#	deleted:    debian/postinst-rebuild-gcj-db
#	deleted:    debian/postrm-rebuild-gcj-db
#	deleted:    debian/rebuild-gcj-db
#	deleted:    debian/rebuild-security-providers
#	modified:   debian/rules
#
