From b1664ae94c5ce0919df31e64b30b767af85ff7c6 Mon Sep 17 00:00:00 2001 From: dim Date: Tue, 3 Jun 2008 12:58:14 +0000 Subject: [PATCH] debian package related corrections --- Makefile | 5 ++++- debian/changelog | 1 + debian/control | 2 +- debian/rules | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index bfc1e33..82288a7 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.18 2008-03-10 15:29:45 dim Exp $ +# $Id: Makefile,v 1.19 2008-06-03 12:58:14 dim Exp $ # # Makefile for debian packaging purpose, make install not intended to work. @@ -55,6 +55,9 @@ man: ${DOCS:.txt=.xml} doc: man html todo bugs +clean: + rm -f *.xml *.html *.1 *~ + deb: # working copy from where to make the .orig archive rm -rf $(DEBDIR) diff --git a/debian/changelog b/debian/changelog index 136550e..bdfca6f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ pgloader (2.3.1-1) unstable; urgency=low * FIX: Add database opening into critical path (BoundedSemaphore) * FIX: close database connection as soon as possible * Add support for fixed format + * Add support for escaped field_sep, such as \t -- Dimitri Fontaine Wed, 21 May 2008 12:19:42 +0200 diff --git a/debian/control b/debian/control index e1645bc..860a762 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Homepage: http://pgloader.projects.postgresql.org Package: pgloader Architecture: all -Depends: python (>=2.4.4), python-psycopg2 | python-psycopg (<< 1.1.21) | python-psycopg (= 1.1.21-14) +Depends: python (>=2.4.4), python-psycopg2 | python-psycopg (<< 1.1.21) | python-psycopg (>= 1.1.21-14) Description: loads flat data files into PostgreSQL pgloader imports data from flat files and insert it into a database table. You have to provide a configuration file containing sections, diff --git a/debian/rules b/debian/rules index 770852b..5220363 100644 --- a/debian/rules +++ b/debian/rules @@ -40,6 +40,7 @@ clean: dh_testroot rm -f build-stamp configure-stamp dh_clean + $(MAKE) DESTDIR=$(CURDIR)/debian/pgloader clean install: build dh_testdir