* debian/control:

    + Set policy to 3.6.0. No changes required.
    + Set debhelper build-dependency to (>= 4.0) due to debian/compat.
    + Renamed source package to libdvbpsi2.
  * libdvbpsi.spec:
    + Renamed source package to libdvbpsi2.

debian/Makefile.am

 ## Process this file with automake to produce Makefile.in
 
-EXTRA_DIST=rules control changelog libdvbpsi1-dev.dirs copyright libdvbpsi1.dirs
+EXTRA_DIST=rules control changelog libdvbpsi2-dev.dirs copyright libdvbpsi2.dirs
 

debian/changelog

-libdvbpsi (0.1.3-1) unstable; urgency=low
+libdvbpsi2 (0.1.3-1) unstable; urgency=low
 
   * New upstream release.
+  * debian/control:
+    + Set policy to 3.6.0. No changes required.
+    + Set debhelper build-dependency to (>= 4.0) due to debian/compat.
+    + Renamed source package to libdvbpsi2.
 
- -- Samuel Hocevar <sam@zoy.org>  Tue, 29 Jul 2003 01:25:23 +0200
+ -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Wed, 30 Jul 2003 11:50:45 +0200
 
-libdvbpsi (0.1.2-2) unstable; urgency=low
+libdvbpsi (0.1.1-8) unstable; urgency=low
 
-  * Package that can also be installed on Woody and Sarge, not juste Sid.
+  * Set policy to 3.5.10.
+  * Fixed a typo in the package description.
 
- -- Alexis de Lattre <alexis@videolan.org>  Mon, 13 Oct 2002 11:14:21 +0200
+ -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Sat, 31 May 2003 00:43:41 +0200
 
-libdvbpsi (0.1.2-1) unstable; urgency=low
+libdvbpsi (0.1.1-7) unstable; urgency=high
 
-  * New upstream release.
+  * Fixed the build by making libdvbpsi-0.1.0/configure executable during
+    the clean rule (Closes: #194360).
+
+ -- Samuel Hocevar <sam@zoy.org>  Fri, 23 May 2003 10:53:16 +0200
+
+libdvbpsi (0.1.1-6) unstable; urgency=low
+
+  * Updated standards-version to 3.5.9.0.
+  * Added versioned build-depends on debhelper (>=3.0).
+
+ -- Samuel Hocevar <sam@zoy.org>  Fri,  4 Apr 2003 17:02:28 +0200
+
+libdvbpsi (0.1.1-5) unstable; urgency=low
+
+  * The "don't try to be more clever than automake" release.
+  * Fixed timestamp skew in debian/rules (Closes: #173438).
+
+ -- Samuel Hocevar <sam@zoy.org>  Mon, 10 Feb 2003 18:31:15 +0100
+
+libdvbpsi (0.1.1-4) unstable; urgency=low
+
+  * Fixed timestamp skew in debian/rules (Closes: #173438).
+
+ -- Samuel Hocevar <sam@zoy.org>  Sat,  8 Feb 2003 05:56:52 +0100
+
+libdvbpsi (0.1.1-3) unstable; urgency=low
+
+  * Synced debian/control with the override file.
+
+ -- Samuel Hocevar <sam@zoy.org>  Thu, 12 Dec 2002 17:03:04 +0100
+
+libdvbpsi (0.1.1-2) unstable; urgency=low
+
+  * Updated rules file to call configure with the proper flags and avoid
+    timestamp issues with autotools (Closes: #162774, #171290).
 
- -- Samuel Hocevar <sam@zoy.org>  Fri, 11 Oct 2002 11:34:23 +0200
+ -- Samuel Hocevar <sam@zoy.org>  Thu, 12 Dec 2002 15:29:42 +0100
 
 libdvbpsi (0.1.1-1) unstable; urgency=low
 

debian/compat

+4

debian/control

-Source: libdvbpsi
-Section: libs
+Source: libdvbpsi2
 Priority: optional
-Maintainer: Samuel Hocevar <sam@zoy.org>
-Build-Depends: debhelper (>=2.2.0)
-Standards-Version: 3.0.1
+Maintainer: Sam Hocevar (Debian packages) <sam+deb@zoy.org>
+Build-Depends: debhelper (>= 4.0), autotools-dev
+Standards-Version: 3.6.0
 
-Package: libdvbpsi1
+Package: libdvbpsi2
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: a library for MPEG TS and DVB PSI tables decoding and generating
+Description: library for MPEG TS and DVB PSI tables decoding and generating
  libdvbpsi is a simple library designed for MPEG TS and DVB PSI tables
  decoding and generating.
  .
- This package contains the libdvbpsi1 runtime library.
+ This package contains the libdvbpsi2 runtime library.
 
-Package: libdvbpsi1-dev
-Section: devel
+Package: libdvbpsi2-dev
+Section: libdevel
 Architecture: any
-Depends: libdvbpsi1 (= ${Source-Version})
-Conflicts: libdvbpsi0-dev
-Description: development files for libdvbpsi1
+Depends: libdvbpsi2 (= ${Source-Version})
+Conflicts: libdvbpsi0-dev, libdvbpsi1-dev
+Description: development files for libdvbpsi2
  libdvbpsi is a simple library designed for MPEG TS and DVB PSI tables
  decoding and generating.
  .
  This package contains the header files and static library needed to
- compile applications that use libdvbpsi1.
+ compile applications that use libdvbpsi2.
 

debian/libdvbpsi1-dev.dirs

-usr/lib
-usr/share/doc

debian/libdvbpsi1.dirs

-usr/lib
-usr/share/doc/libdvbpsi0

debian/rules

@@ -4,17 +4,28 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatability version to use.
-export DH_COMPAT=3
+# See /usr/share/doc/autotools-dev/README.Debian.gz
+export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-# Compilation options
-export CONFIG_FLAGS="--prefix=/usr"
+# FOR AUTOCONF 2.52 AND NEWER ONLY
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+  confflags += --build $(DEB_HOST_GNU_TYPE)
+else
+  confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
 
 build: build-stamp
 build-stamp:
 	dh_testdir
 
-	./configure --prefix=/usr --mandir=$${prefix}/share/man \
+	touch configure.ac \
+	&& touch aclocal.m4 \
+	&& touch configure \
+	&& touch config.h.in \
+	&& touch `find -name Makefile.in`
+
+	./configure $(confflags) --prefix=/usr --mandir=$${prefix}/share/man \
 		--infodir=$${prefix}/share/info --enable-release 
 
 	$(MAKE)
@@ -30,18 +41,23 @@ clean:
 
 	dh_clean
 
+	-test -r /usr/share/misc/config.sub && \
+           cp -f /usr/share/misc/config.sub config.sub
+	-test -r /usr/share/misc/config.guess && \
+           cp -f /usr/share/misc/config.guess config.guess
+
 install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
 
-	$(MAKE) install DESTDIR=`pwd`/debian/libdvbpsi1/
+	$(MAKE) install DESTDIR=`pwd`/debian/libdvbpsi2/
 
-	ln -s libdvbpsi1 debian/libdvbpsi1-dev/usr/share/doc/libdvbpsi1-dev
-	mv debian/libdvbpsi1/usr/lib/*.so debian/libdvbpsi1/usr/lib/*a \
-		debian/libdvbpsi1-dev/usr/lib/
-	mv debian/libdvbpsi1/usr/include debian/libdvbpsi1-dev/usr/
+	ln -s libdvbpsi2 debian/libdvbpsi2-dev/usr/share/doc/libdvbpsi2-dev
+	mv debian/libdvbpsi2/usr/lib/*.so debian/libdvbpsi2/usr/lib/*a \
+		debian/libdvbpsi2-dev/usr/lib/
+	mv debian/libdvbpsi2/usr/include debian/libdvbpsi2-dev/usr/
 
 # Build architecture-independent files here.
 binary-indep: build install

libdvbpsi.spec

-%define name		libdvbpsi
-%define version		0.1.2
+%define name		libdvbpsi2
+%define version		0.1.3
 %define release		1
 
-%define major		1
+%define major		2
 %define lib_name	%{name}%{major}
 
 %define redhat80 0
@@ -24,8 +24,8 @@ Packager:	Yves Duret <yves@zarb.org>
 License:	GPL
 URL:		http://developers.videolan.org/libdvbpsi/
 Group:		System/Libraries
-Source:		http://www.videolan.org/pub/videolan/libdvbpsi/%{version}/%{name}-%{version}.tar.bz2
-BuildRoot:	%_tmppath/%name-%version-%release-root
+Source:		http://www.videolan.org/pub/videolan/libdvbpsi/%{version}/%{name}${major}-%{version}.tar.bz2
+BuildRoot:	%_tmppath/%name%major-%version-%release-root
 
 %description
 libdvbpsi is a simple library designed for MPEG 2 TS and DVB PSI tables