[pkg-java] r8177 - trunk/jajuk/debian

[varun at alioth.debian.org]

Author: varun
Date: 2009-04-02 00:35:03 +0000 (Thu, 02 Apr 2009)
New Revision: 8177

Modified:
   trunk/jajuk/debian/build.xml
   trunk/jajuk/debian/changelog
   trunk/jajuk/debian/copyright
   trunk/jajuk/debian/rules
Log:
* Accept changes made by Damien Raude-Morvan (Closes: #522131)
* Fix VERSION and DATE replace in build.xml

Modified: trunk/jajuk/debian/build.xml
===================================================================
--- trunk/jajuk/debian/build.xml	2009-04-02 00:33:59 UTC (rev 8176)
+++ trunk/jajuk/debian/build.xml	2009-04-02 00:35:03 UTC (rev 8177)
@@ -30,12 +30,12 @@
     </tstamp>
     <echo message='Build time: ${build.time}' />
     <replace dir="${source.dir}/org/jajuk/util" value="${build.time}">
-      <include name='ITechnicalStrings.java' />
+      <include name='Const.java' />
       <replacetoken>DATE_REPLACED_BY_ANT</replacetoken>
     </replace>
     <!-- Set release in code-->
     <replace dir="${source.dir}/org/jajuk/util" value="${jajuk.version}">
-      <include name="ITechnicalStrings.java" />
+      <include name="Const.java" />
       <replacetoken>VERSION_REPLACED_BY_ANT</replacetoken>
     </replace>
   

Modified: trunk/jajuk/debian/changelog
===================================================================
--- trunk/jajuk/debian/changelog	2009-04-02 00:33:59 UTC (rev 8176)
+++ trunk/jajuk/debian/changelog	2009-04-02 00:35:03 UTC (rev 8177)
@@ -1,5 +1,6 @@
-jajuk (1.7.1-1) UNRELEASED; urgency=low
+jajuk (1.7.1-1) unstable; urgency=low
 
+  [ Damien Raude-Morvan ]
   * New upstream release
   * Build and run with OpenJDK-6
     - debian/control: B-D on opendjk-6-jdk and D on openjdk-6-jre
@@ -10,8 +11,12 @@
   * Build-Depends/Depends on libjaudiotagger-java >= 1.0.9
   * Build-Depends/Depends on libqdwizard-java >= 2.1
 
- -- Damien Raude-Morvan <drazzib at drazzib.com>  Wed, 01 Apr 2009 00:27:01 +0200
+  [ Varun Hiremath ]
+  * Accept changes made by Damien Raude-Morvan (Closes: #522131)
+  * Fix VERSION and DATE replace in build.xml
 
+ -- Varun Hiremath <varun at debian.org>  Wed, 01 Apr 2009 20:26:58 -0400
+
 jajuk (1.7~rc10+svn4317-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/jajuk/debian/copyright
===================================================================
--- trunk/jajuk/debian/copyright	2009-04-02 00:33:59 UTC (rev 8176)
+++ trunk/jajuk/debian/copyright	2009-04-02 00:35:03 UTC (rev 8177)
@@ -5,14 +5,14 @@
 
 Upstream Authors: Bertrand Florat <bertrand at florat.net> and The Jajuk Team
 
-Copyright: (C) 2003-2007 The Jajuk Team
+Copyright: © 2003-2007 The Jajuk Team
 
 Translations:
-    (C) 2003-2007 Bertrand Florat
-    (C) 2003,2004 Eleftherios Spyromitros Xioufis
-    (C) 2003-2007 Gerhard Dietrichsteiner
-    (C) 2004-2006 Josep Carles Collazos
-    (C) 2006 Bart Cremers
+    © 2003-2007 Bertrand Florat
+    © 2003,2004 Eleftherios Spyromitros Xioufis
+    © 2003-2007 Gerhard Dietrichsteiner
+    © 2004-2006 Josep Carles Collazos
+    © 2006 Bart Cremers
 
 License:
     This program is free software; you can redistribute it and/or modify
@@ -34,13 +34,13 @@
 =============================================
 
 The file in 'ext' folder have been adapted to Jajuk by the Jajuk Team.
-Jajuk Copyright (C) 2007 The Jajuk Team
+Jajuk Copyright © 2007 The Jajuk Team
 ------
 
 Swingx (various dates)
 https://swingx.dev.java.net/
 
-Original Copyright: (C) 2006 Sun Microsystems, Inc.
+Original Copyright: © 2006 Sun Microsystems, Inc.
 License: LGPL 2.1
 
 On Debian systems, the complete text of LGPL 2.1 license can be found
@@ -50,7 +50,7 @@
 aTunes 1.6.0
 http://www.atunes.org
 
-Original Copyright: (C) 2006-2007 Alex Aranda (fleax) <alex.aranda at gmail.com> 
+Original Copyright: © 2006-2007 Alex Aranda (fleax) <alex.aranda at gmail.com> 
 License: GPL 2
 
 On Debian systems, the complete text of the GNU General Public License
@@ -60,7 +60,7 @@
 Part of Zeus API (Splash Screen)
 http://zeus-jscl.sourceforge.net/
 
-Original Copyright: (C) 2004,2005 Gregory Kotsaftis <gregkotsaftis at yahoo.com>
+Original Copyright: © 2004,2005 Gregory Kotsaftis <gregkotsaftis at yahoo.com>
 Licnese: LGPL 2.1
 
 On Debian systems, the complete text of LGPL 2.1 license can be found
@@ -345,5 +345,5 @@
     Creative Commons may be contacted at http://creativecommons.org/.
 
 ------
-The Debian packaging is (C) 2007, Varun Hiremath <varunhiremath at gmail.com> and
+The Debian packaging is © 2007, Varun Hiremath <varunhiremath at gmail.com> and
 is licensed under the GPL, see `/usr/share/common-licenses/GPL'.

Modified: trunk/jajuk/debian/rules
===================================================================
--- trunk/jajuk/debian/rules	2009-04-02 00:33:59 UTC (rev 8176)
+++ trunk/jajuk/debian/rules	2009-04-02 00:35:03 UTC (rev 8177)
@@ -4,7 +4,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-VERSION			:= $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e 's/\+.*//g')
+VERSION			:= $(shell echo $(DEB_UPSTREAM_VERSION))
 JAVA_HOME		:= /usr/lib/jvm/java-6-openjdk
 DEB_ANT_BUILDFILE	:= debian/build.xml
 DEB_ANT_BUILD_TARGET	:= jar -Djajuk.version="$(VERSION)"