* Updated Debian build rules.

Makefile.am

@@ -8,6 +8,3 @@ AUTOMAKE_OPTIONS = dist-bzip2
 
 bin_SCRIPTS = caca-config
 
-doc_DATA = README TODO AUTHORS NEWS NOTES THANKS
-docdir = $(datadir)/doc/libcaca-dev
-

debian/Makefile.am

@@ -1,3 +1,16 @@
 # $Id$
 
-EXTRA_DIST = changelog compat control copyright rules caca-utils.mime
+EXTRA_DIST = \
+	changelog \
+	compat \
+	control \
+	copyright \
+	rules \
+	caca-utils.install \
+	caca-utils.mime \
+	libcucul-dev.install \
+	libcucul0.install \
+	libcaca-dev.install \
+	libcaca0.install \
+	$(NULL)
+

debian/caca-utils.install

@@ -0,0 +1,3 @@
+usr/bin/*
+usr/share/man/man1
+usr/share/libcaca

debian/changelog

@@ -1,8 +1,8 @@
-libcaca (0.10-1) UNRELEASED; urgency=low
+libcaca (0.99.beta1-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
- -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Mon,  6 Mar 2006 00:55:30 +0100
+ -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Sat, 22 Apr 2006 21:57:18 +0200
 
 libcaca (0.9-5) unstable; urgency=low
 

debian/control

@@ -9,8 +9,8 @@ Package: libcucul-dev
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: libcaca-dev (< 0.10-1)
-Replaces: libcaca-dev (< 0.10-1)
+Conflicts: libcaca-dev (<< 0.10-1)
+Replaces: libcaca-dev (<< 0.10-1)
 Description: development files for libcucul
  libcaca is the Colour AsCii Art library. It provides high level functions
  for colour text drawing, simple primitives for line, polygon and ellipse

debian/libcaca-dev.install

@@ -0,0 +1,4 @@
+usr/include/caca.h
+usr/lib/libcaca.so
+usr/lib/libcaca.a
+usr/lib/pkgconfig/caca.pc

debian/libcaca0.install

@@ -0,0 +1 @@
+usr/lib/libcaca*.so.*

debian/libcucul-dev.install

@@ -0,0 +1,6 @@
+usr/include/cucul.h
+usr/lib/libcucul.so
+usr/lib/libcucul.a
+usr/lib/pkgconfig/cucul.pc
+usr/share/man/man3/*.3caca
+usr/share/doc/libcucul-dev

debian/libcucul0.install

@@ -0,0 +1 @@
+usr/lib/libcucul*.so.*

debian/rules

@@ -42,37 +42,8 @@ install: build
 	dh_installdirs usr/bin usr/share/doc/caca-utils usr/share/man/man1 -pcaca-utils
 	dh_installdirs usr/lib -plibcucul0
 	dh_installdirs usr/lib -plibcaca0
-
-	$(MAKE) install DESTDIR=`pwd`/debian/libcaca-dev/
-
-	mv debian/libcaca-dev/usr/lib/libcucul*.so.* debian/libcucul0/usr/lib
-
-	mv debian/libcaca-dev/usr/lib/libcaca*.so.* debian/libcaca0/usr/lib
-
-	mv debian/libcaca-dev/usr/bin/cacaball debian/caca-utils/usr/bin
-	mv debian/libcaca-dev/usr/bin/cacaview debian/caca-utils/usr/bin
-	mv debian/libcaca-dev/usr/bin/cacafire debian/caca-utils/usr/bin
-	mv debian/libcaca-dev/usr/bin/cacamoir debian/caca-utils/usr/bin
-	mv debian/libcaca-dev/usr/bin/cacaplas debian/caca-utils/usr/bin
-
-	mv debian/libcaca-dev/usr/share/libcaca debian/caca-utils/usr/share
-	mv debian/libcaca-dev/usr/share/man/man1/cacaball.1 \
-	   debian/caca-utils/usr/share/man/man1/
-	mv debian/libcaca-dev/usr/share/man/man1/cacafire.1 \
-	   debian/caca-utils/usr/share/man/man1/
-	mv debian/libcaca-dev/usr/share/man/man1/cacamoir.1 \
-	   debian/caca-utils/usr/share/man/man1/
-	mv debian/libcaca-dev/usr/share/man/man1/cacaplas.1 \
-	   debian/caca-utils/usr/share/man/man1/
-	mv debian/libcaca-dev/usr/share/man/man1/cacaview.1 \
-	   debian/caca-utils/usr/share/man/man1/
-
-	cp debian/libcaca-dev/usr/share/doc/libcaca-dev/README \
-	   debian/libcaca-dev/usr/share/doc/libcaca-dev/TODO \
-	   debian/libcaca-dev/usr/share/doc/libcaca-dev/AUTHORS \
-	   debian/libcaca-dev/usr/share/doc/libcaca-dev/NEWS \
-	   debian/libcaca-dev/usr/share/doc/libcaca-dev/NOTES \
-	   debian/caca-utils/usr/share/doc/caca-utils/
+	$(MAKE) install DESTDIR=`pwd`/debian/tmp
+	dh_install --sourcedir=debian/tmp --list-missing
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -84,7 +55,7 @@ binary-arch: build install
 	dh_testdir
 	dh_testroot
 #	dh_installdebconf	
-	dh_installdocs
+	dh_installdocs -A README TODO AUTHORS NEWS NOTES THANKS
 #	dh_installexamples
 	dh_installmenu
 #	dh_installemacsen

doc/Makefile.am

@@ -7,10 +7,10 @@ man_MANS = caca-config.1 cacafire.1 cacaview.1
 
 if BUILD_DOCUMENTATION
 htmldoc_DATA = html/doxygen.css
-htmldocdir = $(datadir)/doc/libcaca-dev/html
+htmldocdir = $(datadir)/doc/libcucul-dev/html
 if USE_LATEX
 pdfdoc_DATA = latex/libcaca.pdf
-pdfdocdir = $(datadir)/doc/libcaca-dev/pdf
+pdfdocdir = $(datadir)/doc/libcucul-dev/pdf
 endif
 endif
 
@@ -42,9 +42,9 @@ clean-local:
 
 install-data-local:
 if BUILD_DOCUMENTATION
-	$(mkinstalldirs) $(DESTDIR)$(datadir)/doc/libcaca-dev/html
+	$(mkinstalldirs) $(DESTDIR)$(datadir)/doc/libcucul-dev/html
 	cp `find html -name '*.html' -o -name '*.gif' -o -name '*.png'` \
-	  $(DESTDIR)$(datadir)/doc/libcaca-dev/html
+	  $(DESTDIR)$(datadir)/doc/libcucul-dev/html
 	$(mkinstalldirs) $(DESTDIR)$(mandir)/man3
 	cp `find man -name '*.3caca'` $(DESTDIR)$(mandir)/man3
 	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1