[jnr-posix] 01/01: Upload to unstable

[Miguel Landaeta]

This is an automated email from the git hooks/post-receive script.

nomadium pushed a commit to branch 1.1.x
in repository jnr-posix.

commit 7d854cdab0da07293b3544cc5e133e0ebd862245
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Sat May 2 14:47:30 2015 -0300

    Upload to unstable
---
 debian/changelog                          |  9 +++++++++
 debian/control                            | 10 +++++-----
 debian/patches/pom.diff                   | 10 ++++++----
 debian/patches/series                     |  1 +
 debian/patches/use-jnr-constants.diff     | 17 +++++++++++++++++
 pom.xml                                   |  4 ++--
 src/org/jruby/ext/posix/WindowsPOSIX.java |  3 ++-
 7 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9a741d9..3f350c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libjnr-posix-java (1.1.8-3) unstable; urgency=medium
+
+  * Team upload.
+  * Replace dependency on libconstantine-jaba with libjnr-constants-java.
+  * Bump Standards-Version to 3.9.6. No changes were required.
+  * Update Vcs-* fields.
+
+ -- Miguel Landaeta <nomadium at debian.org>  Sat, 02 May 2015 14:46:30 -0300
+
 libjnr-posix-java (1.1.8-2) unstable; urgency=low
 
   [ Jakub Adam ]
diff --git a/debian/control b/debian/control
index 4bdae0a..80fb95d 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>> 7.0.0),
                maven2
 Build-Depends-Indep: bnd,
                      default-jdk,
-                     libconstantine-java (>= 0.7-3),
+                     libjnr-constants-java,
                      libjaffl-java (>= 0.5.9),
                      libmaven-compiler-plugin-java,
                      libmaven-jar-plugin-java,
@@ -19,14 +19,14 @@ Build-Depends-Indep: bnd,
                      libmaven-site-plugin-java,
                      libsurefire-java,
                      maven-repo-helper
-Standards-Version: 3.9.4
+Standards-Version: 3.9.6
 Homepage: https://github.com/wmeissner/jnr-posix
-Vcs-Git: git://anonscm.debian.org/pkg-java/libjnr-posix-java.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/libjnr-posix-java.git
+Vcs-Git: git://anonscm.debian.org/pkg-java/jnr-posix.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/jnr-posix.git
 
 Package: libjnr-posix-java
 Architecture: all
-Depends: libconstantine-java (>= 0.7-3),
+Depends: libjnr-constants-java,
          libjaffl-java (>= 0.5.9),
          ${misc:Depends}
 Description: basic POSIX-like functions for Java
diff --git a/debian/patches/pom.diff b/debian/patches/pom.diff
index 766a365..23facc0 100644
--- a/debian/patches/pom.diff
+++ b/debian/patches/pom.diff
@@ -4,8 +4,8 @@ Author: Damien Raude-Morvan <drazzib at debian.org>
 Forwarded: not-needed
 Last-Update: 2012-08-29
 
---- a/pom.xml
-+++ b/pom.xml
+--- a/pom.xml	2012-08-27 19:13:49.000000000 -0300
++++ b/pom.xml	2015-05-02 15:59:43.482068000 -0300
 @@ -89,32 +89,24 @@
      <dependency>
        <groupId>junit</groupId>
@@ -22,10 +22,12 @@ Last-Update: 2012-08-29
 +      <version>debian</version>
      </dependency>
      <dependency>
-       <groupId>org.jruby.extras</groupId>
-       <artifactId>constantine</artifactId>
+-      <groupId>org.jruby.extras</groupId>
+-      <artifactId>constantine</artifactId>
 -      <version>0.7</version>
 -      <scope>provided</scope>
++      <groupId>com.github.jnr</groupId>
++      <artifactId>jnr-constants</artifactId>
 +      <version>debian</version>
      </dependency>
    </dependencies>
diff --git a/debian/patches/series b/debian/patches/series
index 7740e23..4e3706b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 pom.diff
+use-jnr-constants.diff
diff --git a/debian/patches/use-jnr-constants.diff b/debian/patches/use-jnr-constants.diff
new file mode 100644
index 0000000..a4594a9
--- /dev/null
+++ b/debian/patches/use-jnr-constants.diff
@@ -0,0 +1,17 @@
+Description: Replace class names under constantine packages with jnr-constants ones
+Author: Miguel Landaeta <nomadium at debian.org>
+Forwarded: no
+Last-Update: 2015-01-02
+
+--- libjnr-posix-java-1.1.8.orig/src/org/jruby/ext/posix/WindowsPOSIX.java
++++ libjnr-posix-java-1.1.8/src/org/jruby/ext/posix/WindowsPOSIX.java
+@@ -2,7 +2,8 @@ package org.jruby.ext.posix;
+ 
+ import com.kenai.constantine.platform.Errno;
+ import static com.kenai.constantine.platform.Errno.*;
+-import static com.kenai.constantine.platform.windows.LastError.*;
++//import static com.kenai.constantine.platform.windows.LastError.*;
++import static jnr.constants.platform.windows.LastError.*;
+ import com.kenai.jaffl.Pointer;
+ import com.kenai.jaffl.Type;
+ import com.kenai.jaffl.provider.jffi.Provider;
diff --git a/pom.xml b/pom.xml
index c50a99a..da9f72e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,8 +98,8 @@
       <version>debian</version>
     </dependency>
     <dependency>
-      <groupId>org.jruby.extras</groupId>
-      <artifactId>constantine</artifactId>
+      <groupId>com.github.jnr</groupId>
+      <artifactId>jnr-constants</artifactId>
       <version>debian</version>
     </dependency>
   </dependencies>
diff --git a/src/org/jruby/ext/posix/WindowsPOSIX.java b/src/org/jruby/ext/posix/WindowsPOSIX.java
index f3a11ce..1f70a52 100644
--- a/src/org/jruby/ext/posix/WindowsPOSIX.java
+++ b/src/org/jruby/ext/posix/WindowsPOSIX.java
@@ -2,7 +2,8 @@ package org.jruby.ext.posix;
 
 import com.kenai.constantine.platform.Errno;
 import static com.kenai.constantine.platform.Errno.*;
-import static com.kenai.constantine.platform.windows.LastError.*;
+//import static com.kenai.constantine.platform.windows.LastError.*;
+import static jnr.constants.platform.windows.LastError.*;
 import com.kenai.jaffl.Pointer;
 import com.kenai.jaffl.Type;
 import com.kenai.jaffl.provider.jffi.Provider;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jnr-posix.git