------------------------------------------------------------
revno: 1698
committer: Rene Engelhard <r...@debian.org>
branch nick: experimental
timestamp: Mon 2009-11-23 11:30:07 +0100
message:
if ooo-build/ChangeLog exist, install it as upstream changelog
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-11-17 01:05:57 +0000
+++ b/changelog 2009-11-23 10:30:07 +0000
@@ -10,6 +10,7 @@
* debian/rules:
- add conditional to disable the layout dialogues. Disable it as it
still has some bugs (closes: #554274)
+ - if ooo-build/ChangeLog exist, install it as upstream changelog
* debian/uno-libs3.symbols: add symbol file
* merge 1:3.1.1-7 and 1:3.1.1-8
=== modified file 'rules'
--- a/rules 2009-11-17 01:05:57 +0000
+++ b/rules 2009-11-23 10:30:07 +0000
@@ -3211,7 +3211,11 @@
fi; \
done; \
done
- dh_installchangelogs -s -Nlibmythes-dev
+ if [ -s ooo-build/ChangeLog ]; then \
+ dh_installchangelogs -s -k -Nlibmythes-dev ooo-build/ChangeLog;
\
+ else \
+ dh_installchangelogs -s -k -Nlibmythes-dev; \
+ fi
ifneq "$(USE_EXTERNAL_MYTHES)" "y"
dh_installchangelogs -plibmythes-dev
endif
@@ -3452,7 +3456,11 @@
ln -sf openoffice.1.gz $$i.gz; \
fi; \
done
- dh_installchangelogs -i
+ if [ -s ooo-build/ChangeLog ]; then \
+ dh_installchangelogs -i -k ooo-build/ChangeLog; \
+ else \
+ dh_installchangelogs -i -k; \
+ fi
dh_installmime -i
dh_lintian -i
dh_link -i
