[SCM] netbeans packaging branch, master, updated. debian/7.0.1+dfsg1-4-6-g7141084

[Andrew Ross]

The following commit has been merged in the master branch:
commit fc5ebc75d73e3a91f3f7008e87ef8b624e561b2e
Author: Andrew Ross <ubuntu at rossfamily.co.uk>
Date:   Sun Feb 19 21:12:04 2012 +0000

    updates to fix various bugs

diff --git a/debian/changelog b/debian/changelog
index ae9b6af..a23eec5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,11 @@ netbeans (7.0.1+dfsg1-5) unstable; urgency=low
   * Include junit library definitions.
   * Make libnb-platform13-java depend on antlr3. (Closes: #651214)
   * Avoid including javadoc twice in libnb-platform13-java-doc.
+  * Replace dependency libpg-java with libpostgresql-jdbc-java
+      (Closes: #659397)
+  * Add symlink to jaxp-1.4.jar (Closes: #653915)
 
- -- Andrew Ross <ubuntu at rossfamily.co.uk>  Thu, 22 Dec 2011 20:36:14 +0000
+ -- Andrew Ross <ubuntu at rossfamily.co.uk>  Wed, 15 Feb 2012 20:36:14 +0000
 
 netbeans (7.0.1+dfsg1-4) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 0d24406..ce0b7f7 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-Depends: debhelper (>= 7.0.50~), javahelper, ant (>= 1.7.0),
  liblucene2-java (>= 2.4.1), libxml-commons-resolver1.1-java (>= 1.2-3),
  libsac-java, libservlet2.5-java, libsvnclientadapter-java, libsvn-java,
  libsvnkit-java, libswingx1-java, libtrilead-ssh2-java,
- libsimple-validation-java, libxerces2-java, libpg-java,
+ libsimple-validation-java, libxerces2-java, libpostgresql-jdbc-java,
  libmysql-java,
  libbetter-appframework-java,  libbeansbinding-java, libcglib-java,
  libnb-javaparser-java (>= 7.0.1~), junit
@@ -140,7 +140,7 @@ Depends: ${java:Depends}, ${misc:Depends}, libnb-platform13-java (>= 7.0),
  libxml-commons-resolver1.1-java (>= 1.2-3), libsac-java,
  libservlet2.5-java, libsvnclientadapter-java, libsvn-java,
  libsvnkit-java, libswingx1-java, libtrilead-ssh2-java,
- libsimple-validation-java, libxerces2-java, libpg-java,
+ libsimple-validation-java, libxerces2-java, libpostgresql-jdbc-java,
  libmysql-java
 Description: Common Integrated Development Environment Libraries for NetBeans
  The NetBeans Platform is a set of modules, each providing their own 
diff --git a/debian/linked-jars b/debian/linked-jars
index c5ec2e8..5fa3baa 100644
--- a/debian/linked-jars
+++ b/debian/linked-jars
@@ -39,6 +39,7 @@ $JAVADIR/swingx1.jar libs.swingx/external ide/modules/ext swingx-0.9.5.jar
 $JAVADIR/trilead-ssh2.jar libs.svnClientAdapter.svnkit/external ide/modules/ext trilead.jar
 $JAVADIR/simple-validation.jar swing.validation/external ide/modules/ext ValidationAPI.jar
 $JAVADIR/xercesImpl.jar libs.xerces/external ide/modules/ext xerces-2.8.0.jar
+$JAVADIR/jaxp-1.4.jar libs.xerces/external ide/modules/ext jaxp-1.4.jar
 $JAVADIR/postgresql-jdbc3.jar db.drivers/external ide/modules/ext postgresql-8.3-603.jdbc3.jar
 $JAVADIR/mysql-connector-java.jar db.drivers/external ide/modules/ext mysql-connector-java-5.1.13-bin.jar
 
diff --git a/debian/patches/netbeans~xerces.patch b/debian/patches/netbeans~xerces.patch
new file mode 100644
index 0000000..097df48
--- /dev/null
+++ b/debian/patches/netbeans~xerces.patch
@@ -0,0 +1,26 @@
+Index: netbeans-7.0.1+dfsg1/libs.xerces/nbproject/project.properties
+===================================================================
+--- netbeans-7.0.1+dfsg1.orig/libs.xerces/nbproject/project.properties	2011-08-10 19:12:58.000000000 +0100
++++ netbeans-7.0.1+dfsg1/libs.xerces/nbproject/project.properties	2012-02-10 21:16:23.432574294 +0000
+@@ -42,5 +42,6 @@
+ 
+ is.autoload=true
+ release.external/xerces-2.8.0.jar=modules/ext/xerces-2.8.0.jar
++release.external/jaxp-1.4.jar=modules/ext/jaxp-1.4.jar
+ module.jar.verifylinkageignores=org.apache.xerces.util.XMLCatalogResolver
+ spec.version.base=1.22.1
+Index: netbeans-7.0.1+dfsg1/libs.xerces/nbproject/project.xml
+===================================================================
+--- netbeans-7.0.1+dfsg1.orig/libs.xerces/nbproject/project.xml	2011-08-10 19:12:58.000000000 +0100
++++ netbeans-7.0.1+dfsg1/libs.xerces/nbproject/project.xml	2012-02-10 21:16:59.008126975 +0000
+@@ -56,6 +56,10 @@
+                 <runtime-relative-path>ext/xerces-2.8.0.jar</runtime-relative-path>
+                 <binary-origin>external/xerces-2.8.0.jar</binary-origin>
+             </class-path-extension>
++            <class-path-extension>
++                <runtime-relative-path>ext/jaxp-1.4.jar</runtime-relative-path>
++                <binary-origin>external/jaxp-1.4.jar</binary-origin>
++            </class-path-extension>
+         </data>
+     </configuration>
+ </project>
diff --git a/debian/patches/series b/debian/patches/series
index 94b0dd8..ca75a42 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,3 +23,4 @@ netbeans~xsl.patch
 netbeans~db.patch
 netbeans-platform~osgi-4.3.patch
 netbeans~include-junit.patch
+netbeans~xerces.patch

-- 
netbeans packaging