tags 392415 + patch
thanks

Hi,

Attached is the diff for my sun-java5 1.5.0-10-1.1 NMU.
diff -u sun-java5-1.5.0-10/debian/changelog sun-java5-1.5.0-10/debian/changelog
--- sun-java5-1.5.0-10/debian/changelog
+++ sun-java5-1.5.0-10/debian/changelog
@@ -1,3 +1,12 @@
+sun-java5 (1.5.0-10-1.1) unstable; urgency=high
+
+  * Non-maintainer upload, reapplying the changes from 1.5.0-08-1.1, which
+    appears to have been overlooked.
+  * Move the demo and example files out of /usr/share, to comply with the FHS.
+    (Closes: #392415)
+
+ -- Steinar H. Gunderson <[EMAIL PROTECTED]>  Mon, 25 Dec 2006 12:49:55 +0100
+
 sun-java5 (1.5.0-10-1) unstable; urgency=medium
 
   * New upstream release. Closes: #393153.
diff -u sun-java5-1.5.0-10/debian/rules sun-java5-1.5.0-10/debian/rules
--- sun-java5-1.5.0-10/debian/rules
+++ sun-java5-1.5.0-10/debian/rules
@@ -741,11 +741,11 @@
 		$(d_jdk)/$(lintian_overrides)/$(p_jdk)
 
 ifneq (,$(findstring demo, $(NO_PACKAGES)))
-	cp -a $(srcdir)/demo $(d_jdk)/usr/share/doc/$(p_jdk)/
-	cp -a $(srcdir)/sample $(d_jdk)/usr/share/doc/$(p_jdk)/examples
+	cp -a $(srcdir)/demo $(d_jdk)/$(basedir)/demo
+	cp -a $(srcdir)/sample $(d_jdk)/$(basedir)/sample
 
-	echo usr/share/doc/$(p_jdk)/demo $(basedir)/demo >> $(d_jdk).links
-	echo usr/share/doc/$(p_jdk)/examples $(basedir)/sample >> $(d_jdk).links
+	echo $(basedir)/demo usr/share/doc/$(p_jdk)/demo >> $(d_jdk).links
+	echo $(basedir)/sample usr/share/doc/$(p_jdk)/examples >> $(d_jdk).links
 
 	: # add lintian overrides
 	cat debian/$(p_demo).overrides \
@@ -786,11 +786,11 @@
 		$(basedir) \
 		$(lintian_overrides)
 
-	cp -a $(srcdir)/demo $(d_demo)/usr/share/doc/$(p_jdk)/
-	cp -a $(srcdir)/sample $(d_demo)/usr/share/doc/$(p_jdk)/examples
-
-	echo usr/share/doc/$(p_jdk)/demo $(basedir)/demo >> $(d_demo).links
-	echo usr/share/doc/$(p_jdk)/examples $(basedir)/sample >> $(d_demo).links
+	cp -a $(srcdir)/demo $(d_demo)/$(basedir)/demo
+	cp -a $(srcdir)/sample $(d_demo)/$(basedir)/sample
+	
+	echo $(basedir)/demo usr/share/doc/$(p_jdk)/demo >> $(d_demo).links
+	echo $(basedir)/sample usr/share/doc/$(p_jdk)/examples >> $(d_demo).links
 
 	cp -p debian/sun_java_app.xpm \
 		$(d_demo)/usr/share/icons/$(basename)-app.xpm

Reply via email to