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

Wed Sep 23 21:34:32 UTC 2009

Author: nthykier-guest
Date: 2009-09-23 21:34:32 +0000 (Wed, 23 Sep 2009)
New Revision: 10552

Modified:
   trunk/tijmp/debian/changelog
   trunk/tijmp/debian/copyright
   trunk/tijmp/debian/rules
   trunk/tijmp/debian/watch
Log:
Corrected debian/copyright, created get-orig-source rule.

Modified: trunk/tijmp/debian/changelog
===================================================================

--- trunk/tijmp/debian/changelog	2009-09-23 21:13:57 UTC (rev 10551)
+++ trunk/tijmp/debian/changelog	2009-09-23 21:34:32 UTC (rev 10552)
@@ -1,4 +1,4 @@
-tijmp (0.8-2) unstable; urgency=low
+tijmp (0.8+dfsg-1) unstable; urgency=low
 
   * Moved to main.
     - Build-Depend on openjdk-6-jdk.
@@ -6,8 +6,10 @@
     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.
+  * Repackaged the orig.tar.gz to follow DFSG.
+    - See README.source for more info.
 
- -- Niels Thykier <niels at thykier.net>  Wed, 23 Sep 2009 11:36:25 +0200
+ -- Niels Thykier <niels at thykier.net>  Wed, 23 Sep 2009 23:33:02 +0200
 
 tijmp (0.8-1) unstable; urgency=low
 

Modified: trunk/tijmp/debian/copyright
===================================================================
--- trunk/tijmp/debian/copyright	2009-09-23 21:13:57 UTC (rev 10551)
+++ trunk/tijmp/debian/copyright	2009-09-23 21:34:32 UTC (rev 10552)
@@ -7,12 +7,13 @@
 
 Copyright: (C) 2007 Robert Olofsson
 
-License:
+Files: *
 
+License: 
+
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
+    the Free Software Foundation; version 3 of the License.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,6 +24,41 @@
     with this program; if not, write to the Free Software Foundation, Inc.,
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+Copyright: Copyright 2003-2004 Sun Microsystems, Inc.  All Rights Reserved.
+Files: src/java_crw_demo.h
+Copyright: Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
+Files: src/java_crw_demo.c
+License: 
 
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+
+      - Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+
+      - Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+  
+      - Neither the name of Sun Microsystems nor the names of its
+        contributors may be used to endorse or promote products derived
+        from this software without specific prior written permission.
+  
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+    IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+    THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+    PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
 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'.
+is licensed under the GPL-3+,`/usr/share/common-licenses/GPL-3' for 
+the full license text.

Modified: trunk/tijmp/debian/rules
===================================================================
--- trunk/tijmp/debian/rules	2009-09-23 21:13:57 UTC (rev 10551)
+++ trunk/tijmp/debian/rules	2009-09-23 21:34:32 UTC (rev 10552)
@@ -8,8 +8,25 @@
 
 DEB_MAKE_INVOKE += JAR=/usr/lib/jvm/java-6-openjdk/bin/jar
 
+UPSTREAM_VERSION=$(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/\+dfsg//' )
+
+WGET?=wget
+
 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
+	mv debian/tijmp/usr/share/java/tijmp.jar debian/tijmp/usr/share/java/tijmp-$(UPSTREAM_VERSION).jar
+	dh_link -p tijmp /usr/share/java/tijmp-$(UPSTREAM_VERSION).jar /usr/share/java/tijmp.jar
 	rm debian/tijmp/usr/share/doc/tijmp/ChangeLog
 	rm -f debian/tijmp/usr/lib/*.la
+
+get-orig-source:
+	dh_testdir
+	which $(WGET) || (echo "Need wget to fetch some files."; exit 1)
+	test ! -d tijmp-$(DEB_UPSTREAM_VERSION) || rm -fr tijmp-$(DEB_UPSTREAM_VERSION)
+	test -d ../tijmp-$(DEB_UPSTREAM_VERSION) || uscan --force-download --rename
+	tar xzf ../tijmp_$(DEB_UPSTREAM_VERSION).orig.tar.gz
+	cd tijmp-$(UPSTREAM_VERSION)/src/ && \
+	  rm java_crw_demo.* && \
+	  $(WGET) http://hg.openjdk.java.net/jdk7/jdk7/jdk/raw-file/37a05a11f281/src/share/demo/jvmti/java_crw_demo/java_crw_demo.h && \
+	  $(WGET) http://hg.openjdk.java.net/jdk7/jdk7/jdk/raw-file/37a05a11f281/src/share/demo/jvmti/java_crw_demo/java_crw_demo.c
+	tar czf ../tijmp_$(DEB_UPSTREAM_VERSION).orig.tar.gz tijmp-$(UPSTREAM_VERSION)
+	rm -fr tijmp-$(UPSTREAM_VERSION)

Modified: trunk/tijmp/debian/watch
===================================================================
--- trunk/tijmp/debian/watch	2009-09-23 21:13:57 UTC (rev 10551)
+++ trunk/tijmp/debian/watch	2009-09-23 21:34:32 UTC (rev 10552)
@@ -1,3 +1,3 @@
 version=3
-opts=uversionmangle=s/-pre/~pre/ \
+opts=uversionmangle=s/-pre/~pre/,uversionmangle=s/$/\+dfsg/ \
 	http://www.khelekore.org/jmp/tijmp/ tijmp-(.*).tar.gz


