* removed unused files.

diff --git a/citadel/debian/citadel-client.substvars b/citadel/debian/citadel-client.substvars
deleted file mode 100644 (file)
index 511d113..0000000
--- a/citadel/debian/citadel-client.substvars
+++ /dev/null
@@ -1 +0,0 @@
-shlibs:Depends=libc6 (>= 2.3.6-6), libncurses5 (>= 5.4-5), libssl0.9.8 (>= 0.9.8c-1)

diff --git a/citadel/debian/citadel-mta.substvars b/citadel/debian/citadel-mta.substvars
deleted file mode 100644 (file)
index 511d113..0000000
--- a/citadel/debian/citadel-mta.substvars
+++ /dev/null
@@ -1 +0,0 @@
-shlibs:Depends=libc6 (>= 2.3.6-6), libncurses5 (>= 5.4-5), libssl0.9.8 (>= 0.9.8c-1)

diff --git a/citadel/debian/citadel-server.examples b/citadel/debian/citadel-server.examples
deleted file mode 100644 (file)
index a4f338f..0000000
--- a/citadel/debian/citadel-server.examples
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/share/doc/citadel-doc/database_cleanup.sh
-

diff --git a/citadel/debian/citadel-server.install b/citadel/debian/citadel-server.install
index be96b6622defea75ca095ee8e7172ff9d33a4c5d..412689261b1559eead3de0271eddcb10874bf3ae 100644 (file)
--- a/citadel/debian/citadel-server.install
+++ b/citadel/debian/citadel-server.install
@@ -10,4 +10,6 @@ debian/tmp/usr/sbin/chkpwd
 debian/tmp/etc/citadel/mail.aliases
 debian/tmp/etc/citadel/public_clients
 debian/tmp/etc/citadel/messages/
-debian/tmp/etc/citadel/help/
\ No newline at end of file
+debian/tmp/etc/citadel/help/
+debian/tmp/usr/share/doc/citadel-doc/database_cleanup.sh
+

diff --git a/citadel/debian/citadel-server.postrm.debhelper b/citadel/debian/citadel-server.postrm.debhelper
deleted file mode 100644 (file)
index 9860b43..0000000
--- a/citadel/debian/citadel-server.postrm.debhelper
+++ /dev/null
@@ -1,11 +0,0 @@
-# Automatically added by dh_installdebconf
-if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then
-       . /usr/share/debconf/confmodule
-       db_purge
-fi
-# End automatically added section
-# Automatically added by dh_installinit
-if [ "$1" = "purge" ] ; then
-       update-rc.d citadel remove >/dev/null || exit $?
-fi
-# End automatically added section

diff --git a/citadel/debian/citadel-server.templates b/citadel/debian/citadel-server.templates
index cfab3da843fe4de528219d6442e65eb27971f6de..fcbdc0802e84809025ae794dd1ccd724b5da57ef 100644 (file)
--- a/citadel/debian/citadel-server.templates
+++ b/citadel/debian/citadel-server.templates
@@ -1,37 +1,34 @@
 Template: citadel/ServerIPAddress
 Type: string
 Default: 0.0.0.0
-Description: Listen IP for Citadel
+_Description: Listen IP for Citadel
   Specify the IP address on which your server will run.  If you
   specify 0.0.0.0, Citadel will listen on all addresses.  
   You can usually skip this unless you are running multiple 
   instances of Citadel on the same computer.
 
-
 Template: citadel/LoginType
 Type: boolean
 Default: false
-Description: Enable external Accounting Mode
+_Description: Enable external Accounting Mode
   Do you want to use Host based authentication or Citadel internal?
   Host based accounting could be /etc/passwd or an LDAP directory.
   WARNING: do not change this setting once your system is installed.
   Answer "no" unless you completely understand this option.
 
-
 Template: citadel/Administrator
 Type: string
 Default: Administrator
-Description: Citadel Administrator
+_Description: Citadel Administrator
   Enter the name of the Citadeladministrator (which is probably
   you).  When an account is created with this name, it will
   automatically be given administrator-level access.
 
-
 Template: citadel/Installnote
 Type: note
-Description: Citadel/UX
+_Description: Citadel/UX
   For post configuring your Citadel Server, use citadel-webcit with your 
   browser, log in as the user you specified as the Administrator, and
   review the Points under the Administration menu. If you have further
   questions review www.citadel.org, specialy the FAQ and Documentation
-  section.
\ No newline at end of file
+  section.

diff --git a/citadel/debian/citadel.substvars b/citadel/debian/citadel.substvars
deleted file mode 100644 (file)
index dba304b..0000000
--- a/citadel/debian/citadel.substvars
+++ /dev/null
@@ -1 +0,0 @@
-shlibs:Depends=libc6 (>= 2.3.2.ds1-21), libdb4.2, libldap2 (>= 2.1.17-1), libncurses5 (>= 5.4-5), libssl0.9.7, zlib1g (>= 1:1.2.1)

diff --git a/citadel/debian/control b/citadel/debian/control
index 866faf226ba4419213d9ed5f16c1a4a306eae1ad..acc0884f2e88be8405a49c869f440fb596715dfb 100644 (file)
--- a/citadel/debian/control
+++ b/citadel/debian/control
@@ -4,9 +4,8 @@ Priority: extra
 Maintainer: Wilfried Goesgens <citadel@outgesourced.org>
 Uploaders: Fathi Boudra <fboudra@free.fr>
 Build-Depends: debhelper (>= 4.0.0), bison, autotools-dev, 
- libdb4.4-dev|libdb4.3-dev, libical-dev, zlib1g-dev,
- libssl-dev, libncurses5-dev, libldap2-dev,  libpam0g-dev, 
- libsieve2-dev
+ libdb4.4-dev|libdb4.3-dev, libical-dev,  libssl-dev, 
+ libncurses5-dev, libldap2-dev,  libpam0g-dev, libsieve2-dev
 Standards-Version: 3.7.2.2
 
 Package: citadel-server

diff --git a/citadel/debian/dirs b/citadel/debian/dirs
deleted file mode 100644 (file)
index ca882bb..0000000
--- a/citadel/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin

diff --git a/citadel/debian/docs b/citadel/debian/docs
deleted file mode 100644 (file)
index fa6b147..0000000
--- a/citadel/debian/docs
+++ /dev/null
@@ -1,2 +0,0 @@
-README.txt
-README.txt

diff --git a/citadel/debian/files_preview b/citadel/debian/files_preview
deleted file mode 100644 (file)
index 8d70c92..0000000
--- a/citadel/debian/files_preview
+++ /dev/null
@@ -1,5 +0,0 @@
-citadel-server_@CITADEL_VERSION@-@PACKAGE_VERSION@_i386.deb mail optional
-citadel-client_@CITADEL_VERSION@-@PACKAGE_VERSION@_i386.deb mail optional
-citadel-mta_@CITADEL_VERSION@-@PACKAGE_VERSION@_i386.deb mail optional
-citadel-doc_@CITADEL_VERSION@-@PACKAGE_VERSION@_all.deb mail optional
-citadel-unixlogin_@CITADEL_VERSION@-@PACKAGE_VERSION@_all.deb mail optional

diff --git a/citadel/debian/po/POTFILES.in b/citadel/debian/po/POTFILES.in
new file mode 100644 (file)
index 0000000..925992c
--- /dev/null
+++ b/citadel/debian/po/POTFILES.in
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] citadel-server.templates

diff --git a/citadel/debian/po/templates.pot b/citadel/debian/po/templates.pot
new file mode 100644 (file)
index 0000000..ab7eaab
--- /dev/null
+++ b/citadel/debian/po/templates.pot
@@ -0,0 +1,81 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: citadel@outgesourced.org\n"
+"POT-Creation-Date: 2006-12-30 12:33+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:1001
+msgid "Listen IP for Citadel"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:1001
+msgid ""
+" Specify the IP address on which your server will run.  If you\n"
+" specify 0.0.0.0, Citadel will listen on all addresses.\n"
+" You can usually skip this unless you are running multiple\n"
+" instances of Citadel on the same computer."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../citadel-server.templates:2001
+msgid "Enable external Accounting Mode"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../citadel-server.templates:2001
+msgid ""
+" Do you want to use Host based authentication or Citadel internal?\n"
+" Host based accounting could be /etc/passwd or an LDAP directory.\n"
+" WARNING: do not change this setting once your system is installed.\n"
+" Answer \"no\" unless you completely understand this option."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:3001
+msgid "Citadel Administrator"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:3001
+msgid ""
+" Enter the name of the Citadeladministrator (which is probably\n"
+" you).  When an account is created with this name, it will\n"
+" automatically be given administrator-level access."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../citadel-server.templates:4001
+msgid "Citadel/UX"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../citadel-server.templates:4001
+msgid ""
+" For post configuring your Citadel Server, use citadel-webcit with your\n"
+" browser, log in as the user you specified as the Administrator, and\n"
+" review the Points under the Administration menu. If you have further\n"
+" questions review www.citadel.org, specialy the FAQ and Documentation\n"
+" section."
+msgstr ""

diff --git a/citadel/debian/rules b/citadel/debian/rules
index 3ff0fb390731de4ec461b7055fe7425e00981b7c..609b58439f3b4256ca128eec45c9c55cf4876b41 100755 (executable)
--- a/citadel/debian/rules
+++ b/citadel/debian/rules
@@ -68,7 +68,7 @@ install-indep:
        dh_testroot
        dh_clean -k -i 
        dh_installdirs -i
-       $(MAKE) -C . install DESTDIR="$(CURDIR)/debian/tmp" install-doc-new prefix=$(CURDIR)/debian/citadel-doc/
+       $(MAKE) -C . install-new DESTDIR="$(CURDIR)/debian/tmp" install-doc-new prefix=$(CURDIR)/debian/citadel-doc/
 
 
 install-arch:
@@ -77,7 +77,7 @@ install-arch:
        dh_clean -k -s 
        dh_installdirs -s
        mkdir -p  $(CURDIR)/debian/tmp/
-       $(MAKE) -C . install DESTDIR="$(CURDIR)/debian/tmp/" install-exec-new install-data-new
+       $(MAKE) -C . install-new DESTDIR="$(CURDIR)/debian/tmp/" install-exec-new install-data-new
 
        mkdir -p $(CURDIR)/debian/tmp/usr/lib/citadel-server
        mv \