[pkg-java] r10541 - trunk/tijmp/debian

[Niels Thykier]

Author: nthykier-guest
Date: 2009-09-23 09:37:19 +0000 (Wed, 23 Sep 2009)
New Revision: 10541

Modified:
   trunk/tijmp/debian/changelog
   trunk/tijmp/debian/control
   trunk/tijmp/debian/copyright
   trunk/tijmp/debian/rules
Log:
tijmp (0.8-2) unstable; urgency=low

  * Moved to main.
    - Build-Depend on openjdk-6-jdk.
  * Corrected debian/copyright to reflect that Debian packaging is
    GPL-2+ and made it refer to GPL-2 rather than the versionless
    symlink of GPL in common-licenses.
  * Removed "la" file from /usr/lib.

 -- Niels Thykier <niels at thykier.net>  Wed, 23 Sep 2009 11:36:25 +0200


Modified: trunk/tijmp/debian/changelog
===================================================================
--- trunk/tijmp/debian/changelog	2009-09-23 09:12:02 UTC (rev 10540)
+++ trunk/tijmp/debian/changelog	2009-09-23 09:37:19 UTC (rev 10541)
@@ -1,3 +1,14 @@
+tijmp (0.8-2) unstable; urgency=low
+
+  * Moved to main.
+    - Build-Depend on openjdk-6-jdk.
+  * Corrected debian/copyright to reflect that Debian packaging is
+    GPL-2+ and made it refer to GPL-2 rather than the versionless
+    symlink of GPL in common-licenses.
+  * Removed "la" file from /usr/lib.
+
+ -- Niels Thykier <niels at thykier.net>  Wed, 23 Sep 2009 11:36:25 +0200
+
 tijmp (0.8-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/tijmp/debian/control
===================================================================
--- trunk/tijmp/debian/control	2009-09-23 09:12:02 UTC (rev 10540)
+++ trunk/tijmp/debian/control	2009-09-23 09:37:19 UTC (rev 10541)
@@ -1,9 +1,10 @@
 Source: tijmp
-Section: contrib/devel
+Section: devel
 Priority: extra
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Michael Koch <konqueror at gmx.de>
-Build-Depends: cdbs, debhelper (>= 7), sun-java6-jdk
+Uploaders: Michael Koch <konqueror at gmx.de>,
+ Niels Thykier <niels at thykier.net>
+Build-Depends: cdbs, debhelper (>= 7), openjdk-6-jdk
 Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/tijmp
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/tijmp

Modified: trunk/tijmp/debian/copyright
===================================================================
--- trunk/tijmp/debian/copyright	2009-09-23 09:12:02 UTC (rev 10540)
+++ trunk/tijmp/debian/copyright	2009-09-23 09:37:19 UTC (rev 10541)
@@ -5,7 +5,7 @@
 
 Upstream Author: Robert Olofsson <robo at khelekore.org>
 
-Copyright: (c) 2007 Robert Olofsson
+Copyright: (C) 2007 Robert Olofsson
 
 License:
 
@@ -24,5 +24,5 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
-The Debian packaging is (C) 2007, Michael Koch <konqueror at gmx.de> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+The Debian packaging is © 2007, Michael Koch <konqueror at gmx.de> and
+is licensed under the GPL-2+, see `/usr/share/common-licenses/GPL-2'.

Modified: trunk/tijmp/debian/rules
===================================================================
--- trunk/tijmp/debian/rules	2009-09-23 09:12:02 UTC (rev 10540)
+++ trunk/tijmp/debian/rules	2009-09-23 09:37:19 UTC (rev 10541)
@@ -1,14 +1,15 @@
 #!/usr/bin/make -f
-  
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_SCRIPT_ENV += JAVA_HOME="/usr/lib/jvm/java-6-sun"
+DEB_CONFIGURE_SCRIPT_ENV += JAVA_HOME="/usr/lib/jvm/java-6-openjdk"
 
-DEB_MAKE_INVOKE += JAR=/usr/lib/jvm/java-6-sun/bin/jar
+DEB_MAKE_INVOKE += JAR=/usr/lib/jvm/java-6-openjdk/bin/jar
 
 install/tijmp::
 	mv debian/tijmp/usr/share/java/tijmp.jar debian/tijmp/usr/share/java/tijmp-$(DEB_UPSTREAM_VERSION).jar
 	dh_link -p tijmp /usr/share/java/tijmp-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/tijmp.jar
 	rm debian/tijmp/usr/share/doc/tijmp/ChangeLog
+	rm -f debian/tijmp/usr/lib/*.la