This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libjna-java.
commit 464c998b0086d5fe8e79aca342b99a2e323eb01b Author: Emmanuel Bourg <[email protected]> Date: Wed Oct 15 16:47:21 2014 +0200 Refreshed the patches --- debian/changelog | 4 +-- debian/patches/03-dynlink-and-cflags.patch | 4 +-- .../06-remove-gjdoc-inexistent-options.patch | 2 +- debian/patches/09-javadoc.patch | 2 +- .../patches/11-remove-non-ascii-from-javadoc.patch | 38 ---------------------- debian/patches/series | 1 - debian/rules | 2 +- 7 files changed, 7 insertions(+), 46 deletions(-) diff --git a/debian/changelog b/debian/changelog index 41c03c7..f6514ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libjna-java (4.0.0-1) UNRELEASED; urgency=low +libjna-java (4.1.0-1) UNRELEASED; urgency=low [ Andrew Ross ] * New upstream release (Closes: #733488) @@ -10,7 +10,7 @@ libjna-java (4.0.0-1) UNRELEASED; urgency=low * Update d/watch for new upstream location [ Emmanuel Bourg ] - * Refreshed the patches (up to version 4.0.0) + * Refreshed the patches (up to version 4.1.0) * Removed 08-multiarch-support.patch (merged upstream since jna 3.5.0) * Removed 02-builddir.patch (merged upstream since 4.0.0) * Removed 05-support-gnu-kfreebsd.patch (merged upstream since 4.0.0) diff --git a/debian/patches/03-dynlink-and-cflags.patch b/debian/patches/03-dynlink-and-cflags.patch index 15b4ac0..bf17e3c 100644 --- a/debian/patches/03-dynlink-and-cflags.patch +++ b/debian/patches/03-dynlink-and-cflags.patch @@ -3,7 +3,7 @@ Description: dynlink and cflags --- a/build.xml +++ b/build.xml -@@ -735,6 +735,19 @@ +@@ -743,6 +743,19 @@ <arg value="JNA_JNI_VERSION=${jni.version}"/> <arg value="CHECKSUM=${jni.md5}"/> </exec> @@ -23,7 +23,7 @@ Description: dynlink and cflags <mkdir dir="${classes}/${native.path}"/> <copy todir="${classes}/${native.path}"> <fileset dir="${build.native}" -@@ -746,15 +759,6 @@ +@@ -754,15 +767,6 @@ <fileset dir="${build.native}" includes="jnidispatch.dll,libjnidispatch.*"/> </copy> diff --git a/debian/patches/06-remove-gjdoc-inexistent-options.patch b/debian/patches/06-remove-gjdoc-inexistent-options.patch index a43d47d..de98997 100644 --- a/debian/patches/06-remove-gjdoc-inexistent-options.patch +++ b/debian/patches/06-remove-gjdoc-inexistent-options.patch @@ -3,7 +3,7 @@ Subject: disable javadoc options that are not supported by gjdoc --- a/build.xml +++ b/build.xml -@@ -986,7 +986,7 @@ +@@ -1008,7 +1008,7 @@ <group title="Platform Utilities" packages="com.sun.jna.platform,com.sun.jna.platform.dnd"/> <group title="Platform Specific" packages="com.sun.jna.platform.*"/> diff --git a/debian/patches/09-javadoc.patch b/debian/patches/09-javadoc.patch index 5153b09..4d97063 100644 --- a/debian/patches/09-javadoc.patch +++ b/debian/patches/09-javadoc.patch @@ -2,7 +2,7 @@ Link javadoc to the default-jdk javadoc. --- a/build.xml +++ b/build.xml -@@ -969,7 +969,7 @@ +@@ -991,7 +991,7 @@ <doctitle>JNA API Documentation</doctitle> <header>${header}</header> <bottom>${footer}</bottom> diff --git a/debian/patches/11-remove-non-ascii-from-javadoc.patch b/debian/patches/11-remove-non-ascii-from-javadoc.patch deleted file mode 100644 index 1d9344c..0000000 --- a/debian/patches/11-remove-non-ascii-from-javadoc.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 91a9bd6ab3110841597cd0cad5ff4e0f97bc4b4d Mon Sep 17 00:00:00 2001 -From: Timothy Wall <[email protected]> -Date: Sat, 6 Jul 2013 09:16:27 -0400 -Subject: [PATCH] remove non-ascii from javadoc - ---- - contrib/platform/src/com/sun/jna/platform/win32/Shell32.java | 2 +- - contrib/platform/src/com/sun/jna/platform/win32/ShellAPI.java | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/contrib/platform/src/com/sun/jna/platform/win32/Shell32.java b/contrib/platform/src/com/sun/jna/platform/win32/Shell32.java -index b62c8d6..b9df1e7 100644 ---- a/contrib/platform/src/com/sun/jna/platform/win32/Shell32.java -+++ b/contrib/platform/src/com/sun/jna/platform/win32/Shell32.java -@@ -181,7 +181,7 @@ INT_PTR ShellExecute(HWND hwnd, String lpOperation, String lpFile, String lpPara - * {@link ShellAPI#ABM_QUERYPOS} Requests a size and screen position for an appbar. - * {@link ShellAPI#ABM_SETPOS} Sets the size and screen position of an appbar. - * {@link ShellAPI#ABM_GETSTATE} Retrieves the autohide and always-on-top states of the Windows taskbar. -- * {@link ShellAPI#ABM_GETTASKBARPOS} Retrieves the bounding rectangle of the Windows taskbar. Note that this applies only to the system taskbar. Other objects, particularly toolbars supplied with third-party software, also can be present. As a result, some of the screen area not covered by the Windows taskbar might not be visible to the user. To retrieve the area of the screen not covered by both the taskbar and other app bars�the working area available to your application�, use [...] -+ * {@link ShellAPI#ABM_GETTASKBARPOS} Retrieves the bounding rectangle of the Windows taskbar. Note that this applies only to the system taskbar. Other objects, particularly toolbars supplied with third-party software, also can be present. As a result, some of the screen area not covered by the Windows taskbar might not be visible to the user. To retrieve the area of the screen not covered by both the taskbar and other app bars -- the working area available to your application -- [...] - * {@link ShellAPI#ABM_ACTIVATE} Notifies the system to activate or deactivate an appbar. The lParam member of the APPBARDATA pointed to by pData is set to TRUE to activate or FALSE to deactivate. - * {@link ShellAPI#ABM_GETAUTOHIDEBAR} Retrieves the handle to the autohide appbar associated with a particular edge of the screen. - * {@link ShellAPI#ABM_SETAUTOHIDEBAR} Registers or unregisters an autohide appbar for an edge of the screen. -diff --git a/contrib/platform/src/com/sun/jna/platform/win32/ShellAPI.java b/contrib/platform/src/com/sun/jna/platform/win32/ShellAPI.java -index 0ce4611..fcfd56e 100644 ---- a/contrib/platform/src/com/sun/jna/platform/win32/ShellAPI.java -+++ b/contrib/platform/src/com/sun/jna/platform/win32/ShellAPI.java -@@ -149,8 +149,8 @@ public String encodePaths(String[] paths) { - * supplied with third-party software, also can be present. As a result, - * some of the screen area not covered by the Windows taskbar might not be - * visible to the user. To retrieve the area of the screen not covered by -- * both the taskbar and other app bars�the working area available to your -- * application�, use the GetMonitorInfo function. -+ * both the taskbar and other app bars -- the working area available to your -+ * application --, use the GetMonitorInfo function. - */ - int ABM_ACTIVATE = 0x00000006; - /** diff --git a/debian/patches/series b/debian/patches/series index c5e6801..3e21bda 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,4 +4,3 @@ 06-remove-gjdoc-inexistent-options.patch 09-javadoc.patch 10-disable-full-jar.patch -11-remove-non-ascii-from-javadoc.patch diff --git a/debian/rules b/debian/rules index b5caf8c..076b762 100755 --- a/debian/rules +++ b/debian/rules @@ -11,7 +11,7 @@ VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p') dh $@ override_dh_auto_clean: - ant -f build.xml clean + ant -f build.xml -Dmaven-release=true clean rm -f build.number rm -rf build doc rm -rf contrib/platform/build -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjna-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
