[libreoffice] 04/06: * debian/README.Debian-source: update
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 017f7d334581cfd33eebb82465845b9f4cb1d44b
Author: Rene Engelhard <rene@debian.org>
Date: Sun Sep 4 12:05:41 2016 +0200
* debian/README.Debian-source: update
---
README.Debian-source | 183 +++++++++++++++------------------------------------
changelog | 3 +-
2 files changed, 54 insertions(+), 132 deletions(-)
diff --git a/README.Debian-source b/README.Debian-source
index 9b4da02..8f00c9e 100644
--- a/README.Debian-source
+++ b/README.Debian-source
@@ -1,6 +1,6 @@
Package directory modes
=======================
-The packages can be built directly from a set of git/bzr checkouts (vcs mode),
+The packages can be built directly from a set of git checkouts (vcs mode),
or from a set of release tarballs (tarball mode).
Vcs mode is useful if you want to work on libreoffice during the development
@@ -10,154 +10,75 @@ changes.
Tarball mode is used to prepare packages of official libreoffice releases
from the tarballs created by upstream.
-Package directory layout - tarball mode
-=======================================
-
-The packaging scripts work in tarball mode when debian/rules contains:
+Source package creation steps for tarball mode
+==============================================
+The .orig.tar.gz consists of the (separate) source tarballs available
+from The Document Foundation from
+http://download.documentfoundation.org/libreoffice/src/<version/
- USE_SOURCE_TARBALLS=y
+The libreoffice-x.y.z.a.tar.xz is taken verbatim as original tarball:
+$ ln -s libreoffice-x.y.z.a.tar.xz libreoffice_x.y.z.orig.tar.xz
+$ tar xfvJ libreoffice-x.y.z.a.tar.xz
-dpkg-source unpacks the packages like this:
- extracting libreoffice in libreoffice-3.3.0~rc1
- unpacking libreoffice_3.3.0~rc1.orig.tar.gz
- unpacking libreoffice_3.3.0~rc1.orig-libreoffice-build-3-3-0-1.tar.gz
- unpacking libreoffice_3.3.0~rc1.orig-ext-sources.tar.gz
- unpacking libreoffice_3.3.0~rc1.orig-ext-sources-libreoffice-build-3-3-0-1.tar.gz
- unpacking libreoffice_3.3.0~rc1-1.debian.tar.gz
- applying installer-globals-max-1-regcomp.diff
- applying splash-progressbarcolor.diff
- applying buildfix-patches.diff
- applying hack-no-rm-fr-of-smoketest-userconfig.diff
+For a full build you also need helpcontent2 and translations (and the external
+modules' tarballs) which normally are git submodules and/or downloaded during
+the build.
-The top level packaging directory looks like this:
+As dpkg-souorce expects e.g. helpcontent2 as a subdir we can't directly
+symlink (as the tarball contains libreoffice-x.y.z.a/helpcontent2).
+We need to create them manually/repack them:
- debian/
- ext-sources/
- ext-sources-libreoffice-build-3-3-0-1/
- libreoffice-build-3-3-0-1/
- sources/
+$ tar xfvJ libreoffice-helpcontent2-x.y.z.a.tar.xz
+$ tar xfvJ libreoffice-translations-x.y.z.a.tar.xz
+$ cd libreoffice-x.y.z.a
+$ for i in helpcontent2 translations tarballs; do \
+ tar cfvJ ../libreoffice_5.2.1.orig-$i.tar.xz $i; \
+ done
+given those files are not in the tarballs above they need to be removed
+as otherwise dpkg complains
+$ rm ChangeLog-*
-The sources directory contains tarballs generated from the individual libreoffice git
-repositories. These are copied by the debian packaging scripts into the src/ directory
-of the libreoffice build tree.
+We also need (or want, except xmlsec we don't need it for a normal build)
+the "tarball" (so what upstreams external modules want for building, as those
+are not included). A standard upstream build downloads it during the build,
+but we neither can't nor want it here of course. So:
-The debian, ext-sources, ext-sources-libreoffice-build and libreoffice-build directories
-are unpacked from the source tarballs of the same names.
+$ rm -rf tarballs
+$ mkdir -p tarballs
+$ ./autogen.sh $(filter-out --disable-fetch-external,$(CONFIGURE_FLAGS)) --with-all-tarballs
+$ make download gb_LO_VER=<version>
-The libreoffice build is configured to build using tarballs using the --without-git flag.
+and
-Patches are unpacked into debian/patches and applied.
+$ tar cfvJ ../libreoffice_5.2.1.orig-tarballs.tar.xz
-- debian/rules configuration -
+(or base on an old version and add/remove the files manually and/or symlink
+to the old version if this didn't change - see git diff of download.lst)
-USE_SOURCE_TARBALLS=y # tarball mode
-OOO_BUILD_VERSION=3.3.0.1 # used to determine unpacked directory names, e.g. libreoffice-build-3-3-0-1
-OOO_BUILD_TARBALL_VERSION=3.3.0.1 # used to determine tarball suffix, e.g. libreoffice_3.3.0~rc1.orig-ext-sources-libreoffice-build-3-3-0-1.tar.gz
- # also used to determine build directory name under build/libreoffice-$(OOO_BUILD_TARBALL_VERSION)
+See the "Format: 3.0 (quilt)" section dpkg-source(1) for more details.
Package directory layout - vcs mode
===================================
-In vcs mode we are working directly from checkouts of the libreoffice sources. We pull in
-sources to these places:
-
- debian - git packaging repository from pkg-openoffice project on alioth
- libreoffice-build - base libreoffice repository
- ext-sources - various source tarballs used during the build process
- libreoffice-build/clone - libreoffice git repositories
-
-Libreoffice is configured to work directly from git repositories using the
---with-git flag.
-
-- debian/rules configuration -
-
-USE_SOURCE_TARBALLS=n # vcs mode
-
-Source package checkout steps for vcs mode
-==========================================
-
-To create a package directory in vcs mode, you need to do the following:
-
- # Create a top level directory with a name of your choice
- mkdir libreoffice ; cd libreoffice
+In vcs mode we are working directly from checkouts of the libreoffice sources.
- # Checkout the debian packaging repository
- #
- # The repository can be found at
- # git://git.debian.org/git/pkg-openoffice/libreoffice.git
- # or, if you have a login on alioth:
- # ssh://USERNAME@git.debian.org/git/pkg-openoffice/libreoffice/
- git clone -b ${DISTRO}-${SUITE}-${VERSION} git://git.debian.org/git/pkg-openoffice/libreoffice.git debian
+We pull in sources to these places:
- # Checkout the libreoffice build repository
- # if you have a login:
- # git clone ssh://git.freedesktop.org/git/libreoffice/build
- # useful flags:
- # -b <branch> - checkout a different branch, e.g. -b libreoffice-3-3
- # -r <directory> - copy the repository contents from another checkout, e.g. -r ../lo-old/libreoffice-build
- #
- git clone git://anongit.freedesktop.org/git/libreoffice/build libreoffice-build
-
- # Edit debian/rules and make sure you have USE_SOURCE_TARBALLS=n
- vi debian/rules
-
- # Regenerate debian/control from the templates
- debian/rules control
-
- # Check you have all build dependencies installed
- dpkg-checkbuilddeps
- # If you do not have them, you will need to install them
-
- # Set the directory where download will copy the external sources tarballs
- mkdir ext-sources
- export TARFILE_LOCATION=`pwd`/ext-sources
-
- # run automake/configure and generate download script
- cd libreoffice-build
- ./autogen.sh --with-git
-
- # If you already have a clone of the libreoffice repositories elsewhere on your machine,
- # you can pass the directory name to the --with-git argument like this:
- # ./autogen.sh --with-git=/home/chris/libreoffice-3.3/libreoffice-build/clone
- # Don't forget to run 'bin/g pull -r' afterwards to bring the repos up to date.
-
- # Download sources and clone the libreoffice git repositories
- ./download
-
- # If you need to work on a stable release branch, switch your working directories
+ "top" directory - checkout of LO's "core" repo
+ debian - git packaging repository from pkg-openoffice project on alioth
+ helpcontent2 - checkout of LO's "help" repo (git submodule)
+ translations - checkout of LO's "translations" repo (git submodule)
+ tarballs - see above in tarball mode
-Source package creation steps for tarball mode
-==============================================
-The .orig.tar.gz consists of the 6 seperate tarballs from
-http://ftp.gwdg.de/pub/openoffice/stable/3.2.0/ of which some non-free
-stuff has been removed:
- * core:
- - psprint_config/configuration/ppds/.PS (except SGEN*.PS):
- PPDs where "all rights [are] reserved"
- * system:
- - dictionaries/{da_DK,en_GB,en_US,nl_NL,ru_RU}/hyph_*.dic:
- hyphenation patterns violating licenses/having questionable license
- * extensions:
- - jfreereport/download/liblayout.zip: liblayout/resource/rfc1345.txt
-and put them into sources/.
-
-Then we add ooo-build (as downloaded from http://download.go-oo.org/OOO320)
-into the tree as ooo-build-MAJOR-MINOR-MICRO[-NAN and have that in a
-libreoffice_3.2.0.orig-ooo-build-MAJOR-MINOR-MICRO-NANO.tar.gz file
-in the same dir as the orig (which we use as "component" in dpkg sense and
-thefore is mentioned in debian/source/components). Also we add the extra
-stuff this ooo-build release needs into ext-sources-<ooo-build-dir>. That step
-unfortunately is manual; the same as the translation-updates-YYYMMDD
-(ftp://ftp.linux.cz/pub/localization/LibreOffice/devel/build/Files/OOO320/
-is where we get those)
+$ git clone git://gerrit.libreoffice.org/core
+$ cd core
+$ git submodule init
-See the "Format: 3.0 (quilt)" section dpkg-source(1) for more details.
+(maybe remove dictionaries again, see .git/config, we don't need it here.)
-Note thet there is discussion whether dpkg actually should honour
-debian/source/components. It is said to not yet, but the file is used fo
-uuencoding if needed so needs to be up to date anyway and also is a good
-reference of what needs to be there.
+./g pull -r (git pull -r, but also does the necessary steps for the submodules)
+either disable --disable-fetch-external in rules to get the tarballs or
+run the make steps above (or take a base of an older version and do the
+changes need manually)
-Chris Halls <halls@debian.org>
-December 2010
diff --git a/changelog b/changelog
index 54a4160..e30154f 100644
--- a/changelog
+++ b/changelog
@@ -7,8 +7,9 @@ libreoffice (1:5.2.1-1) unstable; urgency=medium
* debian/bug-presubj: mention https://wiki.debian.org/AutomaticDebugPackages
* debian/control.in: make the libreoffice meta-package depend also on
fonts-crosextra-caladea, fonts-crosextra-carlito and fonts-linuxlibertine
+ * debian/README.Debian-source: update (closes: #836186)
- -- Rene Engelhard <rene@debian.org> Sat, 03 Sep 2016 10:55:56 +0200
+ -- Rene Engelhard <rene@debian.org> Sun, 04 Sep 2016 12:04:33 +0200
libreoffice (1:5.2.1~rc2-1) experimental; urgency=medium
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: