[Pkg-gmagick-svn-commit] r25 - trunk/debian

[naoliv at alioth.debian.org]

Author: naoliv
Date: 2008-01-09 20:53:49 +0000 (Wed, 09 Jan 2008)
New Revision: 25

Added:
   trunk/debian/imagemagick.doc-base
Removed:
   trunk/debian/doc-base.imagemagick
Modified:
   trunk/debian/imagemagick.dirs
   trunk/debian/libmagick++-dev.dirs
   trunk/debian/libmagick++10.dirs
   trunk/debian/libmagick-dev.dirs
   trunk/debian/rules
Log:
Small cleanups


Deleted: trunk/debian/doc-base.imagemagick
===================================================================
--- trunk/debian/doc-base.imagemagick	2008-01-09 19:11:05 UTC (rev 24)
+++ trunk/debian/doc-base.imagemagick	2008-01-09 20:53:49 UTC (rev 25)
@@ -1,14 +0,0 @@
-Document: imagemagick
-Title: ImageMagick
-Author: John Cristy
-Abstract: This manual documents ImageMagick.  
- ImageMagick is a set of programs to manipulate various image formats
- (JPEG, TIFF, PhotoCD, PBM, XPM, etc...). All manipulations can
- be achieved through shell commands as well as through a X11 graphical
- interface (display).
-Section: Applications/Graphics
-
-Format: HTML
-Index: /usr/share/doc/imagemagick/index.html
-Files: /usr/share/doc/imagemagick/www/*
-

Modified: trunk/debian/imagemagick.dirs
===================================================================
--- trunk/debian/imagemagick.dirs	2008-01-09 19:11:05 UTC (rev 24)
+++ trunk/debian/imagemagick.dirs	2008-01-09 20:53:49 UTC (rev 25)
@@ -1,11 +1,6 @@
 usr/bin
-usr/include
 usr/include/magick
-usr/lib/mime
 usr/lib/mime/packages
 usr/lib/menu
-usr/share/doc
-usr/share/doc/imagemagick/
-usr/share/doc/imagemagick/html
 usr/share/doc/imagemagick/html/www
 usr/share/man

Copied: trunk/debian/imagemagick.doc-base (from rev 24, trunk/debian/doc-base.imagemagick)
===================================================================
--- trunk/debian/imagemagick.doc-base	                        (rev 0)
+++ trunk/debian/imagemagick.doc-base	2008-01-09 20:53:49 UTC (rev 25)
@@ -0,0 +1,14 @@
+Document: imagemagick
+Title: ImageMagick
+Author: John Cristy
+Abstract: This manual documents ImageMagick.  
+ ImageMagick is a set of programs to manipulate various image formats
+ (JPEG, TIFF, PhotoCD, PBM, XPM, etc...). All manipulations can
+ be achieved through shell commands as well as through a X11 graphical
+ interface (display).
+Section: Applications/Graphics
+
+Format: HTML
+Index: /usr/share/doc/imagemagick/index.html
+Files: /usr/share/doc/imagemagick/www/*
+

Modified: trunk/debian/libmagick++-dev.dirs
===================================================================
--- trunk/debian/libmagick++-dev.dirs	2008-01-09 19:11:05 UTC (rev 24)
+++ trunk/debian/libmagick++-dev.dirs	2008-01-09 20:53:49 UTC (rev 25)
@@ -1,7 +1,4 @@
-usr/include
 usr/include/Magick++
 usr/bin
 usr/share/man/man1
-usr/lib
 usr/lib/pkgconfig
-

Modified: trunk/debian/libmagick++10.dirs
===================================================================
--- trunk/debian/libmagick++10.dirs	2008-01-09 19:11:05 UTC (rev 24)
+++ trunk/debian/libmagick++10.dirs	2008-01-09 20:53:49 UTC (rev 25)
@@ -1,2 +1 @@
-usr/share/doc
 usr/share/doc/libmagick++10

Modified: trunk/debian/libmagick-dev.dirs
===================================================================
--- trunk/debian/libmagick-dev.dirs	2008-01-09 19:11:05 UTC (rev 24)
+++ trunk/debian/libmagick-dev.dirs	2008-01-09 20:53:49 UTC (rev 25)
@@ -1,5 +1,4 @@
 usr/lib
-usr/include
 usr/include/magick
 usr/share/man
 usr/lib/pkgconfig

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2008-01-09 19:11:05 UTC (rev 24)
+++ trunk/debian/rules	2008-01-09 20:53:49 UTC (rev 25)
@@ -110,8 +110,8 @@
 	-cp `pwd`/magick/Magick-config.1 $(CURDIR)/debian/imagemagick/usr/share/man/man1/
 	-find $(CURDIR)/debian -type f -name .packlist | xargs rm -f
 
-	# Duplicate. License file is already included in the doc dir.
-	-rm "$(CURDIR)"/debian/imagemagick/usr/share/ImageMagick-$(IMAGEMAGICKVERSION)/LICENSE
+	# These files are already included in the doc dir.
+	-rm -r "$(CURDIR)"/debian/imagemagick/usr/share/ImageMagick-$(IMAGEMAGICKVERSION)
 
 # Use x-terninal emulator for editing (Bug #132947)	
 #