diff options
author | paul <paul@7b491191-dbf0-0310-aff6-d879d4d69008> | 2006-10-27 12:48:23 +0000 |
---|---|---|
committer | paul <paul@7b491191-dbf0-0310-aff6-d879d4d69008> | 2006-10-27 12:48:23 +0000 |
commit | 8ba88344c5aca70740cc4ea9b5e7a4e86486ecfd (patch) | |
tree | 255da91bc27ebbd6d201cbfd875cca12c6b5402e /debian | |
parent | 7985ea277c74fc9cdef7a54ed8fac80b80d6f178 (diff) |
merging git tree
git-svn-id: https://svn.ic-s.nl/svn/dbmail/branches/dbmail_2_2_branch@2332 7b491191-dbf0-0310-aff6-d879d4d69008
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | debian/dbmail-mysql.examples | 4 | ||||
-rw-r--r-- | debian/dbmail-pgsql.examples | 3 | ||||
-rw-r--r-- | debian/dbmail-sqlite.examples | 1 | ||||
-rwxr-xr-x | debian/rules | 11 |
5 files changed, 23 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 0152c406..ae2eb4df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dbmail (2.1.7+20061026) experimental; urgency=low + + * pre-release snapshot + + -- Paul J Stevens <paul@nfg.nl> Thu, 26 Oct 2006 23:44:27 +0200 + dbmail (2.1.7-1) unstable; urgency=low * new upstream release (closes: #351341) diff --git a/debian/dbmail-mysql.examples b/debian/dbmail-mysql.examples index 9c9a8d32..0257330d 100644 --- a/debian/dbmail-mysql.examples +++ b/debian/dbmail-mysql.examples @@ -1,3 +1,5 @@ +sql/mysql/2_1_7-2_2_0.mysql sql/mysql/create_tables.mysql sql/mysql/migrate_from_1.x_to_2.0_innodb.mysql -sql/mysql/migrate_from_2.0_to_2.1.mysql +sql/mysql/migrate_from_2.0_to_2.2.mysql +sql/mysql/update_headervalue_01.mysql diff --git a/debian/dbmail-pgsql.examples b/debian/dbmail-pgsql.examples index f391b2de..c00908ae 100644 --- a/debian/dbmail-pgsql.examples +++ b/debian/dbmail-pgsql.examples @@ -1,3 +1,4 @@ +sql/postgresql/2_1_7-2_2_0.pgsql sql/postgresql/create_tables.pgsql sql/postgresql/migrate_from_1.x_to_2.0.pgsql -sql/postgresql/migrate_from_2.0_to_2.1.pgsql +sql/postgresql/migrate_from_2.0_to_2.2.pgsql diff --git a/debian/dbmail-sqlite.examples b/debian/dbmail-sqlite.examples index 206c2c33..1763f6b7 100644 --- a/debian/dbmail-sqlite.examples +++ b/debian/dbmail-sqlite.examples @@ -1 +1,2 @@ +sql/sqlite/2_1_7-2_2_0.sqlite sql/sqlite/create_tables.sqlite diff --git a/debian/rules b/debian/rules index f2063ce5..3c4dec57 100755 --- a/debian/rules +++ b/debian/rules @@ -125,12 +125,14 @@ binary-common: build dh_testroot dh_testdir dh_installdirs -a + ## install lintian overrides for file in $(CURDIR)/debian/*.lintian-override; do \ pkg=`basename $$file .lintian-override`; \ target=$(CURDIR)/debian/tmp/usr/share/lintian/overrides; \ mkdir -p $$target || true; \ install -m 644 $$file $$target/$$pkg; \ done + ## reduce RPATH to minimum (libdbmail.so in /usr/lib/dbmail/) for file in $(CURDIR)/debian/tmp/usr/lib/dbmail/*.so ; do \ chrpath -d $$file; \ done @@ -146,6 +148,15 @@ binary-common: build dh_installdocs -a dh_installdocs -A debian/README.Debian debian/TODO dh_installchangelogs -a + ## update examples + tmpfile=`tempfile` + (cd $(CURDIR) && find sql/mysql/ -type f && cat debian/dbmail-mysql.examples) | \ + sort|uniq>$$tmpfile && cat $$tmpfile > $(CURDIR)/debian/dbmail-mysql.examples + (cd $(CURDIR) && find sql/sqlite/ -type f && cat debian/dbmail-sqlite.examples) | \ + sort|uniq>$$tmpfile && cat $$tmpfile > $(CURDIR)/debian/dbmail-sqlite.examples + (cd $(CURDIR) && find sql/postgresql/ -type f && cat debian/dbmail-pgsql.examples) | \ + sort|uniq>$$tmpfile && cat $$tmpfile > $(CURDIR)/debian/dbmail-pgsql.examples + rm -f $$tmpfile dh_installexamples -a dh_installdirs -A etc/dbmail var/run/dbmail var/log/dbmail dh_strip -a |