This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository netbeans.
commit dc40a55a0317b3e04a645aa0ecdb90965c4906d0 Author: Markus Koschany <[email protected]> Date: Fri Jun 12 22:44:59 2015 +0200 Fix svnclient.patch and add updatecenters.patch --- debian/patches/netbeans-svnclient.patch | 13 +++++++--- debian/patches/netbeans-updatecenters.patch | 39 +++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 49 insertions(+), 4 deletions(-) diff --git a/debian/patches/netbeans-svnclient.patch b/debian/patches/netbeans-svnclient.patch index fcb5228..9638e64 100644 --- a/debian/patches/netbeans-svnclient.patch +++ b/debian/patches/netbeans-svnclient.patch @@ -7,8 +7,8 @@ Subject: netbeans svnclient libs.svnClientAdapter.javahl/nbproject/project.xml | 6 +++--- libs.svnClientAdapter.svnkit/nbproject/project.properties | 5 +++-- libs.svnClientAdapter.svnkit/nbproject/project.xml | 12 ++++++++---- - libs.svnClientAdapter/nbproject/project.xml | 4 +++- - 5 files changed, 18 insertions(+), 11 deletions(-) + libs.svnClientAdapter/nbproject/project.xml | 7 ++++++- + 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/libs.svnClientAdapter.javahl/nbproject/project.properties b/libs.svnClientAdapter.javahl/nbproject/project.properties index a520ea7..5e7850c 100644 @@ -92,10 +92,10 @@ index 5e8ac75..05f669f 100644 </class-path-extension> </data> diff --git a/libs.svnClientAdapter/nbproject/project.xml b/libs.svnClientAdapter/nbproject/project.xml -index 7089cca..b9b38de 100644 +index 7089cca..612efbf 100644 --- a/libs.svnClientAdapter/nbproject/project.xml +++ b/libs.svnClientAdapter/nbproject/project.xml -@@ -81,9 +81,11 @@ made subject to such option by the copyright holder. +@@ -81,11 +81,16 @@ made subject to such option by the copyright holder. <package>org.netbeans.libs.svnclientadapter</package> <package>org.tigris.subversion.svnclientadapter</package> <package>org.tigris.subversion.svnclientadapter.utils</package> @@ -107,4 +107,9 @@ index 7089cca..b9b38de 100644 + <runtime-relative-path>ext/svnClientAdapter-main-1.10.3.jar</runtime-relative-path> <binary-origin>external/svnClientAdapter-main-1.10.3.jar</binary-origin> </class-path-extension> ++ <class-path-extension> ++ <runtime-relative-path>ext/svnjavahl-1.8.4.jar</runtime-relative-path> ++ </class-path-extension> </data> + </configuration> + </project> diff --git a/debian/patches/netbeans-updatecenters.patch b/debian/patches/netbeans-updatecenters.patch new file mode 100644 index 0000000..e9ad862 --- /dev/null +++ b/debian/patches/netbeans-updatecenters.patch @@ -0,0 +1,39 @@ +From: Markus Koschany <[email protected]> +Date: Fri, 12 Jun 2015 22:44:34 +0200 +Subject: netbeans updatecenters + +--- + .../src/org/netbeans/modules/updatecenters/resources/mf-layer.xml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml b/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml +index 46daa72..7c5acd0 100644 +--- a/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml ++++ b/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml +@@ -55,7 +55,7 @@ made subject to such option by the copyright holder. + <attr name="iconBase" stringvalue="org/netbeans/modules/updatecenters/resources/updateAction.gif"/> + <attr name="url" bundlevalue="org.netbeans.modules.updatecenters.resources.Bundle#URL_Distribution"/> + <attr name="category" stringvalue="STANDARD"/> +- <attr name="enabled" boolvalue="true"/> ++ <attr name="enabled" boolvalue="false"/> + <attr name="instanceOf" stringvalue="org.netbeans.spi.autoupdate.UpdateProvider"/> + <attr name="instanceCreate" methodvalue="org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory.createUpdateProvider"/> + </file> +@@ -65,7 +65,7 @@ made subject to such option by the copyright holder. + <attr name="iconBase" stringvalue="org/netbeans/modules/updatecenters/resources/updateAction.gif"/> + <attr name="url" bundlevalue="org.netbeans.modules.updatecenters.resources.Bundle#URL_Certified"/> + <attr name="category" stringvalue="STANDARD"/> +- <attr name="enabled" boolvalue="true"/> ++ <attr name="enabled" boolvalue="false"/> + <attr name="instanceOf" stringvalue="org.netbeans.spi.autoupdate.UpdateProvider"/> + <attr name="instanceCreate" methodvalue="org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory.createUpdateProvider"/> + </file> +@@ -75,7 +75,7 @@ made subject to such option by the copyright holder. + <attr name="iconBase" stringvalue="org/netbeans/modules/updatecenters/resources/updateAction.gif"/> + <attr name="url" bundlevalue="org.netbeans.modules.updatecenters.resources.Bundle#URL_PluginPortal"/> + <attr name="category" stringvalue="COMMUNITY"/> +- <attr name="enabled" boolvalue="true"/> ++ <attr name="enabled" boolvalue="false"/> + <attr name="instanceOf" stringvalue="org.netbeans.spi.autoupdate.UpdateProvider"/> + <attr name="instanceCreate" methodvalue="org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory.createUpdateProvider"/> + </file> diff --git a/debian/patches/series b/debian/patches/series index b5fe9fc..4b3d5ad 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -27,3 +27,4 @@ netbeans-ide-launcher.patch netbeans-small-ide.patch netbeans-xsl-httpserver.patch netbeans-svnclient.patch +netbeans-updatecenters.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netbeans.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
