ref: 9ae8f9d21ccad4155c7d379e071b04cb9712041b
parent: 01e2c942ccd52849e0bbddbf57bee67dda781898
author: Sam Hocevar <[email protected]>
date: Tue Sep 9 08:32:40 EDT 2003
* configure.ac: check for doxygen and latex to build documentation. * doc/Makefile.am: conditionally build documentation. * debian/*: use debian/compat instead of DH_COMPAT.
--- a/.cvsignore
+++ b/.cvsignore
@@ -6,8 +6,6 @@
config.log
config.cache
config.status
-config.guess
-config.sub
config.h
config.h.in
Makefile
@@ -16,10 +14,4 @@
stamp-h*
aclocal.m4
autom4te.cache
-compile
-depcomp
-install-sh
libtool
-ltmain.sh
-missing
-mkinstalldirs
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
-SUBDIRS = src test
-DIST_SUBDIRS = $(SUBDIRS) debian doc autotools
+SUBDIRS = src test doc
+DIST_SUBDIRS = $(SUBDIRS) debian autotools
EXTRA_DIST = libdvdcss.spec bootstrap
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,8 @@
-$Id: NEWS,v 1.6 2003/07/29 19:49:13 gbazin Exp $
+$Id: NEWS,v 1.7 2003/09/09 12:32:40 sam Exp $
Changes between 1.2.7 and 1.2.8:
---------------------------------
+--------------------------------
+
* win32 fix for encrypted DVDs.
* workaround for strange discs that report read errors seemingly at random.
--- a/README
+++ b/README
@@ -1,4 +1,5 @@
README for libdvdcss, a portable abstraction library for DVD decryption
+$Id: README,v 1.3 2003/09/09 12:32:40 sam Exp $
Introduction
@@ -34,8 +35,8 @@
libcss.
This is the default method,
DVDCSS_VERBOSE={0|1|2}: libdvdcss verbosity- 0: no error messages, no debug messages,
- 1: only error messages (this is the default)
+ 0: no error messages, no debug messages (this is the default)
+ 1: only error messages
2: error and debug messages
--- a/configure.ac
+++ b/configure.ac
@@ -188,5 +188,21 @@
AM_CONDITIONAL(SYS_BSDI_LIBDVD, test "${SYS_BSDI_LIBDVD}" = "1") AM_CONDITIONAL(SYS_MSVC, test "${SYS_MSVC}" = "1")-AC_OUTPUT([Makefile src/Makefile src/dvdcss/Makefile test/Makefile debian/Makefile doc/Makefile autotools/Makefile])
+dnl
+dnl Shall we build documentation?
+dnl
+AC_PATH_PROG(DOXYGEN, doxygen, no)
+AM_CONDITIONAL(DOXYGEN, test "${DOXYGEN}" != "no")+AC_PATH_PROG(LATEX, latex, no)
+AM_CONDITIONAL(LATEX, test "${LATEX}" != "no")+
+AC_OUTPUT([
+ Makefile
+ autotools/Makefile
+ debian/Makefile
+ doc/Makefile
+ src/Makefile
+ src/dvdcss/Makefile
+ test/Makefile
+])
--- a/debian/Makefile.am
+++ b/debian/Makefile.am
@@ -1,3 +1,12 @@
-EXTRA_DIST = changelog control libdvdcss2-dev.dirs libdvdcss2.copyright libdvdcss2.dirs rules
+NULL =
+EXTRA_DIST = \
+ changelog \
+ compat \
+ control \
+ libdvdcss2-dev.dirs \
+ libdvdcss2.copyright \
+ libdvdcss2.dirs \
+ rules \
+ $(NULL)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+libdvdcss (1.2.8-2) unstable; urgency=low
+
+ * debian/control:
+ + Set policy to 3.6.0. No changes required.
+ + Set debhelper build-dependency to (>= 4.0) because of debian/compat.
+ + Build-depend on doxygen.
+ + Build-depend on tetex-bin so we have latex and dvips.
+ * debian/rules:
+ + Copy the HTML and PostScript documentation to the binary package.
+
+ -- Sam Hocevar (Debian packages) <[email protected]> Wed, 6 Aug 2003 16:57:46 +0200
+
libdvdcss (1.2.8-1) unstable; urgency=low
* New upstream release.
--- /dev/null
+++ b/debian/compat
@@ -1,0 +1,1 @@
+4
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@
Section: libs
Priority: optional
Maintainer: Sam Hocevar (Debian packages) <[email protected]>
-Build-Depends: debhelper (>=3.0)
-Standards-Version: 3.5.10
+Build-Depends: debhelper (>= 4.0), doxygen, tetex-bin
+Standards-Version: 3.6.0
Package: libdvdcss2
Section: libs
--- a/debian/rules
+++ b/debian/rules
@@ -4,12 +4,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatability version to use.
-export DH_COMPAT=3
-
-# Compilation options
-export CONFIG_FLAGS="--prefix=/usr"
-
build: build-stamp
build-stamp:
dh_testdir
@@ -48,6 +42,10 @@
mv debian/libdvdcss2/usr/lib/*.so debian/libdvdcss2/usr/lib/*a \
debian/libdvdcss2-dev/usr/lib/
mv debian/libdvdcss2/usr/include debian/libdvdcss2-dev/usr/
+
+ cp -r doc/html debian/libdvdcss2/usr/share/doc/libdvdcss2/
+ cp doc/latex/refman.ps \
+ debian/libdvdcss2/usr/share/doc/libdvdcss2/libdvdcss.ps
# Build architecture-independent files here.
binary-indep: build install
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,23 @@
EXTRA_DIST = doxygen.cfg footer.html header.html
-doc:
+all: stamp-doxygen stamp-latex
+
+stamp-doxygen:
+if DOXYGEN
doxygen doxygen.cfg
+ touch stamp-doxygen
+endif
+
+stamp-latex: stamp-doxygen
+if DOXYGEN
+if LATEX
+ cd latex && $(MAKE) $(AM_CFLAGS) ps
+ touch stamp-latex
+endif
+endif
+
+clean: clean-local
+clean-local:
+ -rm -Rf html latex
+ -rm -f stamp-latex stamp-doxygen
--- a/doc/footer.html
+++ b/doc/footer.html
@@ -1,1 +1,3 @@
-
+<!-- $Id: footer.html,v 1.2 2003/09/09 12:32:40 sam Exp $ -->
+ </body>
+</html>
--- a/doc/header.html
+++ b/doc/header.html
@@ -1,6 +1,10 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-<title>libdvdcss documentation</title>
-<link href="/main.css" rel="stylesheet" type="text/css">
-<link href="/doxygen.css" rel="stylesheet" type="text/css">
-</head><body>
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+ <title>libdvdcss documentation</title>
+ <link href="/main.css" rel="stylesheet" type="text/css">
+ <link href="/doxygen.css" rel="stylesheet" type="text/css">
+ </head>
+ <body>
+<!-- $Id: header.html,v 1.2 2003/09/09 12:32:40 sam Exp $ -->
--- a/test/csstest.c
+++ b/test/csstest.c
@@ -29,7 +29,11 @@
/* Check for 2 arguments */
if( i_argc != 3 )
{- printf( "usage: %s <device> <sector>\n", ppsz_argv[0] );
+ printf( "usage: %s <target> <sector>\n", ppsz_argv[0] );
+ printf( "examples:\n" );
+ printf( " %s /dev/hdc 1024\n", ppsz_argv[0] );
+ printf( " %s D: 1024\n", ppsz_argv[0] );
+ printf( " %s scrambledfile.vob 1024\n", ppsz_argv[0] );
return -1;
}