This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch master in repository libreoffice.
commit 6329316bb8a93ab79786231cf765c013d2b4d737 Author: Rene Engelhard <[email protected]> Date: Sun May 8 08:40:03 2016 +0200 sigh. revert control changes for now, needs more work, apparently.. --- changelog | 7 +++++++ rules | 8 ++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/changelog b/changelog index c3cf20e..ae48d2c 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,10 @@ +libreoffice (1:5.1.3~rc2-3) unstable; urgency=medium + + * debian/rules: + - sigh. revert control changes for now, needs more work, apparently.. + + -- Rene Engelhard <[email protected]> Sun, 08 May 2016 08:31:54 +0200 + libreoffice (1:5.1.3~rc2-2) unstable; urgency=medium [ Mattia Rizzolo ] diff --git a/rules b/rules index b5ecd94..909d14b 100755 --- a/rules +++ b/rules @@ -1665,6 +1665,8 @@ endif # Files created in debian directory $(MAKE) -f debian/rules clean-debdir + $(MAKE) -f debian/rules control + # Generate control file, because we have so many different languages # Based on script by Martin Quinson <[email protected]> @@ -1674,12 +1676,6 @@ else control: debian/control endif debian/control: $(wildcard debian/control*in) $(SOURCE_TREE)/bin/lo-xlate-lang debian/rules -ifneq "$(OOO_GCJ_JDK_ARCHS)" "" - if ! dpkg -l gcj-jdk | grep -q ^ii 2>/dev/null; then \ - echo "Can not determine GCJ_VERSION. you need gcj-jdk installed"; \ - exit 1; \ - fi -endif chmod 755 $(SOURCE_TREE)/bin/lo-xlate-lang sed -e "s#%$(DEB_VENDOR)=\([^%]*\)%#, \1#g#" \ -e "s#%[A-Za-z]*=[^%]*%##g#" \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
