* moved another file to ETC_DIR

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index b5658ac1530eb9d9482f6c24e52d0a9b6ae3914b..f90cb38c3ac10a7885fbe7f2e0ac40bae6d90c3c 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -226,8 +226,8 @@ install-data-new:
        $(INSTALL_DATA) $(srcdir)/citadel.rc $(DESTDIR)$(ETC_DIR)/citadel.rc
        $(INSTALL_DATA) $(srcdir)/network/mail.aliases $(DESTDIR)$(ETC_DIR)/mail.aliases$
 
-       $(srcdir)/mkinstalldirs $(DESTDIR)$(DATA_DIR)/help
-       $(srcdir)/mkinstalldirs $(DESTDIR)$(DATA_DIR)/messages
+       $(srcdir)/mkinstalldirs $(DESTDIR)$(ETC_DIR)/help
+       $(srcdir)/mkinstalldirs $(DESTDIR)$(ETC_DIR)/messages
        @for i in  \
                 `find $(srcdir)/help $(srcdir)/messages  -type f | grep -v .svn`; do \
                echo $(INSTALL_DATA) $$i $(DESTDIR)$(ETC_DIR)/$$i; \

diff --git a/citadel/buildpackages b/citadel/buildpackages
index 4a0ffc9729cd74672b0ebc301f21fe17befeb830..7bc9622401d4a9496d1c0a8e4217bfee276c8ba2 100755 (executable)
--- a/citadel/buildpackages
+++ b/citadel/buildpackages
@@ -38,10 +38,6 @@ case $1 in
 
 #dpkg-source: warning: source directory `./citadel' is not <sourcepackage>-<upstreamversion> `citadel-6.61'
 
-               cat debian/files_preview | sed \
-                       -e "s;@CITADEL_VERSION@;${CITADEL_VERSION};" \
-                       -e "s;@PACKAGE_VERSION@;${PACKAGE_VERSION};" \
-                       > debian/files
                if grep -q "($CITADEL_VERSION" debian/changelog; then
                        echo rebuilding package.
                else
@@ -65,4 +61,4 @@ case $1 in
        *)
                echo "Not yet implemented. we have: debian "
                ;;
-esac
\ No newline at end of file
+esac