--- a/ChangeLog	Fri Jul 18 21:58:05 2014 +0100
+++ b/ChangeLog	Fri Jul 18 23:36:37 2014 +0100
@@ -1,3 +1,24 @@
+2014-07-18  Andrew John Hughes  <gnu.andrew@redhat.com>
+
+	PR1877: Code not updated in accordance with
+	name changes in PR1840
+	* Makefile.am:
+	(ICEDTEA_SOUND_JAVA_GENDIR): Reference to generated
+	source files present in the build directory.
+	(ICEDTEA_SOUND_JAVA_SRCS): Include Config.java
+	(IT_PKGS): Include org.classpath.icedtea
+	(docs): Include ICEDTEA_SOUND_JAVA_GENDIR in sourcepath
+	and include source code in output.
+	* NEWS: Updated.
+	* configure.ac:
+	Add Config.java to AC_CONFIG_FILES.
+	* src/java/org/classpath/icedtea/Config.java.in:
+	Template filled out by configure so Java can access
+	the package name, version, etc.
+	* src/java/org/classpath/icedtea/pulseaudio/SecurityWrapper.java:
+	Add missing copyright header and replace
+	static reference to "pulse-java" with package name.
+
 2014-07-18  Andrew John Hughes  <gnu.andrew@redhat.com>
 
 	PR1876: The following shared libraries lack a

--- a/Makefile.am	Fri Jul 18 21:58:05 2014 +0100
+++ b/Makefile.am	Fri Jul 18 23:36:37 2014 +0100
@@ -25,6 +25,7 @@
 ICEDTEA_SOUND_NATIVE_SRCDIR = $(ICEDTEA_SOUND_DIR)/src/native
 ICEDTEA_SOUND_NATIVE_SRCS = $(wildcard $(ICEDTEA_SOUND_NATIVE_SRCDIR)/*.c)
 ICEDTEA_SOUND_JAVA_SRCDIR = $(ICEDTEA_SOUND_DIR)/src/java
+ICEDTEA_SOUND_JAVA_GENDIR = $(abs_top_builddir)/src/java
 
 # Build directories
 RUNTIME = $(SYSTEM_JDK_DIR)/jre/lib/rt.jar
@@ -36,7 +37,8 @@
 
 # Files
 # Must use relative paths so as not to break make distcheck
-ICEDTEA_SOUND_JAVA_SRCS = $(top_srcdir)/src/java/org/classpath/icedtea/*/*.java
+ICEDTEA_SOUND_JAVA_SRCS = $(top_srcdir)/src/java/org/classpath/icedtea/*/*.java \
+	$(top_builddir)/src/java/org/classpath/icedtea/Config.java
 ICEDTEA_SOUND_SRCS = $(ICEDTEA_SOUND_JAVA_SRCS) \
 	$(top_srcdir)/src/java/META-INF/services/javax.sound.sampled.spi.MixerProvider \
 	$(top_srcdir)/src/native/*.h \
@@ -56,7 +58,7 @@
 IT_CFLAGS=$(CFLAGS) $(ARCHFLAG)
 LDFLAGS+=-Xlinker -z -Xlinker defs
 if ENABLE_DOCS
-ITS_PKGS=org.classpath.icedtea.pulseaudio
+ITS_PKGS=org.classpath.icedtea org.classpath.icedtea.pulseaudio
 JAVADOC_OPTS=-use -keywords -encoding UTF-8 -splitIndex \
  -bottom '<font size="-1"> <a href="http://icedtea.classpath.org/bugzilla">Submit a bug or feature</a></font>'
 if JAVADOC_SUPPORTS_J_OPTIONS
@@ -160,10 +162,12 @@
 stamps/docs.stamp:
 if ENABLE_DOCS
 	$(JAVADOC) $(JAVADOC_MEM_OPTS) $(JAVADOC_OPTS) \
-	 -d ${abs_top_builddir}/docs -sourcepath $(ICEDTEA_SOUND_JAVA_SRCDIR) \
+	 -d ${abs_top_builddir}/docs \
+	 -sourcepath $(ICEDTEA_SOUND_JAVA_SRCDIR):$(ICEDTEA_SOUND_JAVA_GENDIR) \
 	 -doctitle 'IcedTea-Sound: API Specification' \
 	 -windowtitle 'IcedTea-Sound' \
 	 -header '<strong>IcedTea-Sound</strong>' \
+	 -linksource \
 	 $(ITS_PKGS)
 endif
 	mkdir -p stamps

--- a/NEWS	Fri Jul 18 21:58:05 2014 +0100
+++ b/NEWS	Fri Jul 18 23:36:37 2014 +0100
@@ -31,6 +31,10 @@
 
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
+New in release 1.0.1 (2014-07-18):
+
+* PR1877: Code not updated in accordance with name changes in PR1840
+
 New in release 1.0.0 (2014-07-18):
 
 * PR1741: Break PulseAudio provider out into IcedTea-Sound

--- a/configure.ac	Fri Jul 18 21:58:05 2014 +0100
+++ b/configure.ac	Fri Jul 18 23:36:37 2014 +0100
@@ -20,7 +20,6 @@
 AC_INIT([icedtea-sound], [1.0.0], [distro-pkg-dev@openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AM_MAINTAINER_MODE([enable])
-AC_CONFIG_FILES([Makefile])
 
 # Older automake doesn't generate these correctly
 abs_top_builddir=`pwd -P`
@@ -74,4 +73,7 @@
 AC_SUBST(CONFIGURE_ARGS)
 CONFIGURE_ARGS="$ac_configure_args"
 
+AC_CONFIG_FILES([Makefile
+	src/java/org/classpath/icedtea/Config.java
+])
 AC_OUTPUT

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/java/org/classpath/icedtea/Config.java.in	Fri Jul 18 23:36:37 2014 +0100
@@ -0,0 +1,64 @@
+/* Config.java.in - Input file for IcedTea-Sound configuration data
+   Copyright (C) 2014 Red Hat, Inc.
+
+This file is part of IcedTea-Sound.
+
+IcedTea-Sound is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as published by
+the Free Software Foundation, version 2.
+
+IcedTea-Sound is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea-Sound; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version.
+*/
+
+package org.classpath.icedtea;
+
+/**
+ * Expose version and configuration data from configure to Java.
+ *
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ */
+public class Config
+{
+
+  /**
+   * The name of the package, as provided by configure.
+   */
+  public static String PACKAGE_NAME = "@PACKAGE_NAME@";
+
+  /**
+   * The version of the package, as provided by configure.
+   */
+  public static String PACKAGE_VERSION = "@PACKAGE_VERSION@";
+
+  /**
+   * Shouldn't be instantiated.
+   */
+  private Config() {}
+
+}
+

--- a/src/java/org/classpath/icedtea/pulseaudio/SecurityWrapper.java	Fri Jul 18 21:58:05 2014 +0100
+++ b/src/java/org/classpath/icedtea/pulseaudio/SecurityWrapper.java	Fri Jul 18 23:36:37 2014 +0100
@@ -1,8 +1,47 @@
+/* SecurityWrapper.java
+   Copyright (C) 2014 Red Hat, Inc.
+
+This file is part of IcedTea-Sound.
+
+IcedTea-Sound is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as published by
+the Free Software Foundation, version 2.
+
+IcedTea-Sound is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea-Sound; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version.
+*/
+
 package org.classpath.icedtea.pulseaudio;
 
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 
+import org.classpath.icedtea.Config;
+
 /**
  * A wrapper around the security sensitive functions
  *
@@ -15,7 +54,7 @@
             PrivilegedAction<Boolean> action = new PrivilegedAction<Boolean>() {
                 @Override
                 public Boolean run() {
-                    System.loadLibrary("pulse-java");
+                    System.loadLibrary(Config.PACKAGE_NAME);
                     return true;
                 }
 
@@ -24,7 +63,7 @@
             AccessController.doPrivileged(action);
 
         } else {
-            System.loadLibrary("pulse-java");
+            System.loadLibrary(Config.PACKAGE_NAME);
         }
 
     }