r2448 - in packages/libchart-perl/trunk: . Chart debian

[Niko Tyni]

Author: ntyni-guest
Date: 2006-03-19 19:38:43 +0000 (Sun, 19 Mar 2006)
New Revision: 2448

Removed:
   packages/libchart-perl/trunk/big-changes
Modified:
   packages/libchart-perl/trunk/Chart/Base.pm
   packages/libchart-perl/trunk/debian/changelog
   packages/libchart-perl/trunk/debian/rules
Log:
Fix color problems (#231730); small tweaks in packaging.


Modified: packages/libchart-perl/trunk/Chart/Base.pm
===================================================================
--- packages/libchart-perl/trunk/Chart/Base.pm	2006-03-19 18:09:28 UTC (rev 2447)
+++ packages/libchart-perl/trunk/Chart/Base.pm	2006-03-19 19:38:43 UTC (rev 2448)
@@ -744,8 +744,10 @@
     y_label2	=> 'black',
     grid_lines	=> 'black',
     grey_background => 'grey',
-    (map { 'dataset'.$d++ => $_ }
-     qw (
+    (map { 'dataset'.$d++ => $_ } qw (red green blue purple peach orange mauve olive pink light_purple light_blue plum yellow turquoise light_green brown 
+                                      HotPink PaleGreen1 DarkBlue BlueViolet orange2 chocolate1 LightGreen pink light_purple light_blue plum yellow turquoise light_green brown 
+                                      pink PaleGreen2 MediumPurple PeachPuff1 orange3 chocolate2 olive pink light_purple light_blue plum yellow turquoise light_green brown 
+                                      DarkOrange PaleGreen3 SlateBlue BlueViolet PeachPuff2 orange4 chocolate3 LightGreen pink light_purple light_blue plum yellow turquoise light_green brown
 
 	 snow1 honeydew3 SkyBlue1 cyan3 DarkOliveGreen1 IndianRed3
 	 orange1 LightPink3 MediumPurple1 snow3 LavenderBlush1
@@ -806,7 +808,8 @@
 	 RosyBrown2 salmon4 pink2 DarkOrchid4 ivory4 DeepSkyBlue2
 	 turquoise4 OliveDrab2 RosyBrown4 LightSalmon2 pink4 purple2
 
-	))};
+	))
+  };
   
   # get default color specs for some color roles from alternate role.
   # Subclasses should extend as needed.

Deleted: packages/libchart-perl/trunk/big-changes
===================================================================
--- packages/libchart-perl/trunk/big-changes	2006-03-19 18:09:28 UTC (rev 2447)
+++ packages/libchart-perl/trunk/big-changes	2006-03-19 19:38:43 UTC (rev 2448)
@@ -1,17 +0,0 @@
-Richard Dice:
-# Lines.pm : added prepare brush - done (& legends done)
-# Bars.pm : none
-# StackedBars.pm : none
-# LinesPoints: lots of changes - use this
-# Points: added Prepare brush
-# Base: 
-# added prepare brush and scalar gif
-
-Jim Miner:
-# changed color roles in all modules - 1 line change in all (done)
-# fixed bug on y scale in base (took this base, basically. )
-# added mountain
-# Points: 1 line - done
-# Stacked Bars: lots (use this - done)
-# Bars: 1 line - done
-# changed composite - Use this (in c now)

Modified: packages/libchart-perl/trunk/debian/changelog
===================================================================
--- packages/libchart-perl/trunk/debian/changelog	2006-03-19 18:09:28 UTC (rev 2447)
+++ packages/libchart-perl/trunk/debian/changelog	2006-03-19 19:38:43 UTC (rev 2448)
@@ -1,3 +1,14 @@
+libchart-perl (2.4.1-2) unstable; urgency=low
+
+  * Remove the leftover file 'big-changes' from the source package.
+  * Modify the color patch from #172140 to keep the first 64 colors
+    compatible with upstream. (Closes: #231730)
+  * debian/rules:
+    + don't ignore the result of 'make distclean'
+    + clean up old CVS references
+
+ -- Niko Tyni <ntyni at iki.fi>  Sun, 19 Mar 2006 21:32:43 +0200
+
 libchart-perl (2.4.1-1) unstable; urgency=low
 
   * New upstream release (closes: #329508) (closes: #216345)

Modified: packages/libchart-perl/trunk/debian/rules
===================================================================
--- packages/libchart-perl/trunk/debian/rules	2006-03-19 18:09:28 UTC (rev 2447)
+++ packages/libchart-perl/trunk/debian/rules	2006-03-19 19:38:43 UTC (rev 2448)
@@ -12,12 +12,6 @@
 version	:= $(shell dpkg-parsechangelog | \
 			sed -ne 's/^Version: *\([0-9]\+:\)*//p')
 
-tag:
-	cvs tag -c -F $(subst .,_,debian_version_$(version))
-ifeq ($(findstring -,$(version)),)
-	cvs tag -c -F $(subst .,_,upstream_version_$(version))
-endif
-
 build:	build-stamp
 build-stamp:
 	dh_testdir
@@ -28,7 +22,7 @@
 
 clean:	checkroot
 	rm -f build-stamp
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 	-rm samples/*.png
 	dh_clean