From 0f0c9abe2430a3eb9fe0cce30e9c253db4ba19f2 Mon Sep 17 00:00:00 2001
From: Romuald Conty <romuald@libnfc.org>
Date: Fri, 27 Nov 2009 15:44:25 +0000
Subject: [PATCH] Prepare next release. Update Debian packages. Set svn:ignore
 properties.

---
 Makefile.am                 | 9 ---------
 configure.ac                | 2 +-
 debian/changelog            | 6 ++++++
 debian/libnfc-dev.install   | 2 +-
 src/Makefile.am             | 1 -
 src/examples/Makefile.am    | 1 -
 src/lib/Makefile.am         | 1 -
 src/lib/buses/Makefile.am   | 1 -
 src/lib/chips/Makefile.am   | 1 -
 src/lib/drivers/Makefile.am | 1 -
 10 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 4a730c4..058e10f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,12 +15,3 @@ html-am : Doxyfile
 
 .PHONY: html
 endif
-DISTCLEANFILES = \
-  Makefile.in \
-  configure \
-  depcomp \
-  config.guess \
-  config.sub \
-  ltmain.sh \
-  config.h.in \
-  aclocal.m4 
diff --git a/configure.ac b/configure.ac
index 3dfb6b1..2aed395 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # General init
-AC_INIT(libnfc, 1.2.1, info@libnfc.org)
+AC_INIT(libnfc, 1.3.0, info@libnfc.org)
 
 AC_CONFIG_HEADER(config.h)
 
diff --git a/debian/changelog b/debian/changelog
index 5de1338..5ee5d79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libnfc (1.3.0-0) unstable; urgency=low
+  
+  * New upstream release.
+
+ -- Romuald Conty <rconty@il4p.fr>  Fri, 20 Nov 2009 16:42:42 +0100
+
 libnfc (1.2.1-4) unstable; urgency=low
   
   * Add udev rules for USB PN53x.
diff --git a/debian/libnfc-dev.install b/debian/libnfc-dev.install
index 35dfe53..3f573f4 100644
--- a/debian/libnfc-dev.install
+++ b/debian/libnfc-dev.install
@@ -1,3 +1,3 @@
-debian/tmp/usr/include/libnfc
+debian/tmp/usr/include/nfc
 debian/tmp/usr/lib/libnfc.{a,la,so}
 debian/tmp/usr/lib/pkgconfig/libnfc.pc
diff --git a/src/Makefile.am b/src/Makefile.am
index 10863ba..0dbeb31 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,2 @@
 SUBDIRS = lib examples
 
-DISTCLEANFILES = Makefile.in
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index a87a2b6..fecafe7 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -34,4 +34,3 @@ nfcip_initiator_LDADD = $(top_builddir)/src/lib/libnfc.la
 
 dist_man_MANS = nfc-anticol.1 nfc-emulate.1 nfc-list.1 nfc-mfclassic.1 nfc-mfultralight.1 nfc-relay.1
 
-DISTCLEANFILES = Makefile.in
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 373f599..24924ef 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -25,4 +25,3 @@ if LIBUSB_ENABLED
   libnfc_la_LIBADD  += @LIBUSB_LIBS@
 endif
 
-DISTCLEANFILES = Makefile.in
diff --git a/src/lib/buses/Makefile.am b/src/lib/buses/Makefile.am
index 6d6a840..e853581 100644
--- a/src/lib/buses/Makefile.am
+++ b/src/lib/buses/Makefile.am
@@ -7,4 +7,3 @@ noinst_LTLIBRARIES = libnfcbuses.la
 libnfcbuses_la_SOURCES = uart.c
 libnfcbuses_la_CFLAGS = -I$(top_srcdir)/src/lib
 
-DISTCLEANFILES = Makefile.in
diff --git a/src/lib/chips/Makefile.am b/src/lib/chips/Makefile.am
index 5ab4d16..9cf69f5 100644
--- a/src/lib/chips/Makefile.am
+++ b/src/lib/chips/Makefile.am
@@ -7,4 +7,3 @@ noinst_LTLIBRARIES = libnfcchips.la
 libnfcchips_la_SOURCES = pn53x.c
 libnfcchips_la_CFLAGS = -I$(top_srcdir)/src/lib
 
-DISTCLEANFILES = Makefile.in
diff --git a/src/lib/drivers/Makefile.am b/src/lib/drivers/Makefile.am
index 10f210c..6e34bc7 100644
--- a/src/lib/drivers/Makefile.am
+++ b/src/lib/drivers/Makefile.am
@@ -21,4 +21,3 @@ if LIBUSB_ENABLED
   libnfcdrivers_la_LIBADD  += @LIBUSB_LIBS@
 endif
 
-DISTCLEANFILES = Makefile.in