[yecht] 13/13: Upload to experimental

Sat Jan 24 21:47:02 UTC 2015

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

nomadium pushed a commit to branch master
in repository yecht.

commit 1476231e5262753793fd55a3159b9abcb2fc0b7f
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Sat Jan 24 18:32:33 2015 -0300

    Upload to experimental
---
 debian/changelog                                   | 14 ++++++++++++
 debian/compat                                      |  2 +-
 debian/control                                     | 13 +++++------
 debian/copyright                                   | 17 ++++++++-------
 debian/libyecht-java.poms                          |  1 +
 .../patches/01_dont_hardcode_yecht_version.patch   | 25 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       | 10 +++++++--
 debian/watch                                       |  3 ++-
 9 files changed, 68 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5ba7e61..3393533 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+yecht (1.0-1) experimental; urgency=medium
+
+  * New upstream release. (Closes: #776032).
+  * Update watch file.
+  * Add myself to Uploaders list.
+  * Bump debhelper compat level to 9.
+  * Bump Standards-Version to 3.9.6. No changes were required.
+  * Provide Maven artifacts.
+  * Update Homepage and Vcs-* URLs.
+  * Update copyright file.
+  * Add patch to remove hard-coded version from jar files in Ant build.xml.
+
+ -- Miguel Landaeta <nomadium at debian.org>  Sat, 24 Jan 2015 16:41:22 -0300
+
 yecht (0.0.2-2) unstable; urgency=low
 
   * Build yecht-jruby.jar, too.
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 7f18429..ef9a198 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,14 @@ Source: yecht
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, maven-repo-helper, ant, default-jdk,
+Uploaders: Torsten Werner <twerner at debian.org>,
+ Miguel Landaeta <nomadium at debian.org>
+Build-Depends: debhelper (>= 9), cdbs, maven-repo-helper, ant, default-jdk,
  javahelper, jruby
-Standards-Version: 3.9.2
-Vcs-Git: git://git.debian.org/pkg-java/yecht.git
-Vcs-Browser: http://git.debian.org/?p=pkg-java/yecht.git
-Homepage: https://github.com/olabini/yecht
+Standards-Version: 3.9.6
+Vcs-Git: git://anonscm.debian.org/pkg-java/yecht.git
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/yecht.git
+Homepage: https://github.com/jruby/yecht
 
 Package: libyecht-java
 Architecture: all
diff --git a/debian/copyright b/debian/copyright
index 0078533..d7233f1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,17 +1,18 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: jffi
-Maintainer: Ola Bini
-Source: http://github.com/olabini/yecht
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: yecht
+Source: http://github.com/jruby/yecht
 
-Copyright: 2009-2010 Ola Bini
+Files: *
+Copyright: 2009-2011 Ola Bini
            2002-2006 ats at cs.rit.edu
-License: MIT/X11
+License: Expat
 
 Files: debian/*
 Copyright: 2011 Torsten Werner <twerner at debian.org>
-License: MIT/X11
+           2015 Miguel Landaeta <nomadium at debian.org>
+License: Expat
 
-License: MIT/X11
+License: Expat
   Permission is hereby granted, free of charge, to any person obtaining a copy of
   this software and associated documentation files (the "Software"), to deal in
   the Software without restriction, including without limitation the rights to
diff --git a/debian/libyecht-java.poms b/debian/libyecht-java.poms
new file mode 100644
index 0000000..43e746b
--- /dev/null
+++ b/debian/libyecht-java.poms
@@ -0,0 +1 @@
+pom.xml --no-parent
diff --git a/debian/patches/01_dont_hardcode_yecht_version.patch b/debian/patches/01_dont_hardcode_yecht_version.patch
new file mode 100644
index 0000000..0e746ab
--- /dev/null
+++ b/debian/patches/01_dont_hardcode_yecht_version.patch
@@ -0,0 +1,25 @@
+Description: Don't hard-code yecht version
+Author: Miguel Landaeta <nomadium at debian.org>
+Forwarded: no
+Last-Update: 2015-01-24
+
+--- yecht-1.0.orig/build.xml
++++ yecht-1.0/build.xml
+@@ -90,7 +90,7 @@
+   </target>
+ 
+   <target name="jar" depends="compile" description="Create the yecht.jar file">
+-    <jar destfile="${lib.dir}/yecht-0.0.2.jar">
++    <jar destfile="${lib.dir}/yecht-${version}.jar">
+       <fileset dir="${yecht.classes.dir}">
+         <include name="**/*.class"/>
+         <include name="**/*.properties"/>
+@@ -110,7 +110,7 @@
+   </target>
+ 
+   <target name="ext-ruby-jar" depends="ext-ruby-compile" description="Create the yecht-ruby.jar file">
+-    <jar destfile="${lib.dir}/yecht-ruby-0.0.2.jar">
++    <jar destfile="${lib.dir}/yecht-ruby-${version}.jar">
+       <fileset dir="${yecht.classes.dir}">
+         <include name="**/*.class"/>
+         <include name="**/*.properties"/>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..edf79f6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_dont_hardcode_yecht_version.patch
diff --git a/debian/rules b/debian/rules
index 676f343..a1bc73f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,12 +2,18 @@
 
 include /usr/share/cdbs/1/class/javahelper.mk
 include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/dpkg/default.mk
 
 JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_ANT_BUILD_TARGET := -Djruby.lib=/usr/share/java ext-ruby-jar
+DEB_ANT_BUILD_TARGET := -Djruby.lib=/usr/share/java -Dversion=$(DEB_VERSION_UPSTREAM) ext-ruby-jar
 
 pre-build::
 	mkdir -p lib
 
+binary-post-install/lib$(DEB_SOURCE)-java::
+	mh_installpoms -plib$(DEB_SOURCE)-java
+	mh_installjar  -plib$(DEB_SOURCE)-java -l pom.xml lib/$(DEB_SOURCE)-$(DEB_VERSION_UPSTREAM).jar
+
 clean::
-	$(RM) lib
+	-$(RM) -r lib
+	mh_clean
diff --git a/debian/watch b/debian/watch
index 0fac9f4..42f4652 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
-http://githubredir.debian.net/github/olabini/yecht .*/(.+).tar.gz
+https://github.com/jruby/yecht/releases \
+  /jruby/yecht/archive/yecht-([0-9].+)\.tar\.gz

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

