[Pkg-octave-commit] r1074 - in octave/trunk/debian: . in

[Rafael Laboissiere]

Author: rafael
Date: 2007-12-05 15:13:33 +0000 (Wed, 05 Dec 2007)
New Revision: 1074

Added:
   octave/trunk/debian/in/octave3.0-NEWS
Removed:
   octave/trunk/debian/NEWS
Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/rules
Log:
The file currently in debian/NEWS belongs only to octave3.0 and was wrongly
shown when upgrading to octave2.9 2.9.17.  This is fixed by moving that file
into debian/in/ (and versioning its name) and adding the necessary code in
debian/rule to create/delete debian/NEWS.


Deleted: octave/trunk/debian/NEWS
===================================================================
--- octave/trunk/debian/NEWS	2007-12-05 11:57:27 UTC (rev 1073)
+++ octave/trunk/debian/NEWS	2007-12-05 15:13:33 UTC (rev 1074)
@@ -1,8 +0,0 @@
-octave3.0 (2.9.15-1) experimental; urgency=low
-
-    This is a pre-release of the upcoming Octave 3.0 series and is a package
-    is specific to the Debian GNU/Linux distribution. Please don't mistake it
-    for the final 3.0 release.
-
- -- Thomas Weber <thomas.weber.mail at gmail.com>  Thu, 11 Oct 2007 22:39:42 +0000
-

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2007-12-05 11:57:27 UTC (rev 1073)
+++ octave/trunk/debian/changelog	2007-12-05 15:13:33 UTC (rev 1074)
@@ -1,9 +1,12 @@
 octave2.9 (1:2.9.17-2) UNRELEASED; urgency=low
 
-  * debian/rules: Call dh_shlibdeps with the appropriate -l option in
-    order to avoid warnings about the private libraries of Octave not
-    being found.  These warnings have been introduced in a recent version
-    of dpkg-shlibdeps.
+  * debian/rules: 
+    + Call dh_shlibdeps with the appropriate -l option in order to avoid
+      warnings about the private libraries of Octave not being found.  These
+      warnings have been introduced in a recent version of dpkg-shlibdeps.
+    + Copy version NEWS files from debian/in/ directory into debian/
+    + Remove debian/NEWS at clean rule
+  * debian/in/octave3.0-NEWS: Moved from debian/NEWS
   * debian/control:
     + Dropped the Homepage pseudo-header for the extended description
     + Bumped Standards-Version to 3.7.3

Copied: octave/trunk/debian/in/octave3.0-NEWS (from rev 1068, octave/trunk/debian/NEWS)
===================================================================
--- octave/trunk/debian/in/octave3.0-NEWS	                        (rev 0)
+++ octave/trunk/debian/in/octave3.0-NEWS	2007-12-05 15:13:33 UTC (rev 1074)
@@ -0,0 +1,8 @@
+octave3.0 (2.9.15-1) experimental; urgency=low
+
+    This is a pre-release of the upcoming Octave 3.0 series and is a package
+    is specific to the Debian GNU/Linux distribution. Please don't mistake it
+    for the final 3.0 release.
+
+ -- Thomas Weber <thomas.weber.mail at gmail.com>  Thu, 11 Oct 2007 22:39:42 +0000
+

Modified: octave/trunk/debian/rules
===================================================================
--- octave/trunk/debian/rules	2007-12-05 11:57:27 UTC (rev 1073)
+++ octave/trunk/debian/rules	2007-12-05 15:13:33 UTC (rev 1074)
@@ -112,6 +112,7 @@
 	cp debian/in/$(PACKAGE)-00list debian/patches/00list
 	cp debian/in/$(PACKAGE)-watch debian/watch
 	slice -o $(sliceterm):debian/$(PACKAGE).conf debian/in/PACKAGE.conf
+	-cp debian/in/$(PACKAGE)-NEWS debian/NEWS
 
 get-orig-source: upstream
 upstream:
@@ -230,6 +231,8 @@
 		test -f $$f-save && mv $$f-save $$f ;	\
 	done
 
+	rm -f debian/NEWS
+
 	dh_clean
 
 install: install-arch install-indep