[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.4-1-101-gc1ab6d0



The following commit has been merged in the debian-experimental-3.5 branch:
commit 0a15ec77e0a891df33a289cc1c90a260b85235ee
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Tue Nov 22 21:52:29 2011 +0100

    update most outdated README sections

diff --git a/README b/README
index 56b5f8f..225e966 100644
--- a/README
+++ b/README
@@ -18,19 +18,19 @@ These options are supported:
 	      with SMALL ones since the deb otherwise gets too big
 	      ((>400M, ca. 1GB I-S))
 
-  ccache    - enable the use of ccache during the build.  This is highly
-	      recommended if you plan on building the package more than once,
-	      or doing any development on the packages.  A typical speedup is
-	      from 11 hours to 3 hours on the second build (PIII 800Mhz).  Be
-	      aware that you need EXTRAPACKAGES="ccache" in /etc/pbuilderrc
-	      when trying to build libreoffice with ccache in
-	      $DEB_BUILD_OPTIONS under pbuilder (this has no effect on speed,
-	      though because the cache does not persist in pbuilder)
+  ccache    - enable the use of ccache during the build. This is highly
+	      recommended if you plan on building the package more than
+              once, or doing any development on the packages. Be aware
+              that you need EXTRAPACKAGES="ccache" in /etc/pbuilderrc
+              when trying to build libreoffice with ccache in
+              $DEB_BUILD_OPTIONS under pbuilder (this has no effect
+              on speed, hough because the cache does not persist in
+              pbuilder)
 
   parallel=<n>
-            - enable n projects to be built in parallel (-P flag to build.pl).
+            - enable n projects to be built in parallel.
               The log output can get a little confusing, and some projects
-	      may fail still. You need to remove ooo-build/config.status if you
+	      may fail still. You need to remove config.status if you
 	      change this value after interrupting a build.
 	      
   lang=<code>
@@ -45,7 +45,7 @@ The targets that are built during the package build
 
 - targets run during the package build -
 
-configure          - Does prerequisites for the build like unpacking extra
+config.status      - Does prerequisites for the build like unpacking extra
                      stuff and run configure in ooo-build. 
 
 build              - as the name says
@@ -64,26 +64,13 @@ helppkgs           - Installs the help packages
 
 maintscripts       - Generates  the maintainer scripts
 
-get-ooo-build      - get ooo-build
-download           - downloads needed files from ooo.ximian.com, normally
-                     not needed, already done
-get-orig-source	   - gets original source (only works for milestones right now)
-vcsupdate          - as the name says ;-)
+get-orig-source	   - gets original source tarballs and unpacks them
+                     GIT_BASEURL can be set to a local mirror
+                     GIT_BRANCH is the branch to clone from the repos
+                     GIT_TAG is tag that should be packed 
+                     GIT_BRANCH and GIT_TAG can both be master
 
 Build system file layout
 ========================
 debian/scripts:
   Directory containing various debian-specific build-related scripts.
-
-ooo-build/:
-  Checkout of ooo-build; containing the build scripts and the shared
-  patches (patches/); also the installation scripts for installing into
-  debian/tmp/pkg (-> ooinstall, package-ooo).
-
-  For adding patches; please do so in ooo-build. To get a source tree
-  unpacked and patched run:
-	debian/rules configure
-	cd ooo-build && make patch.apply
-
-  See README and www/* for documentation.
-
diff --git a/changelog b/changelog
index f68b94a..f185b50 100644
--- a/changelog
+++ b/changelog
@@ -27,8 +27,9 @@ libreoffice (1:3.5.0~alpha0~git20111121-1) UNRELEASED; urgency=low
   * set CURDIR before first use and use safe method to set it
   * update GIT_ vars, add GIT_BASEURL for local mirrors
   * update get-orig-source
+  * update most outdated README sections
 
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Tue, 22 Nov 2011 21:48:31 +0100
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Tue, 22 Nov 2011 21:52:11 +0100
 
 libreoffice (1:3.4.4-2) UNRELEASED; urgency=medium
 

-- 
LibreOffice packaging repository


Reply to: