The following commit has been merged in the debian-experimental-3.6 branch:
commit 7690148f53d0325d8ced96b7945f6686841b12ce
Author: Rene Engelhard
Date: Sun Jun 24 22:40:44 2012 +0200
fix gcc version check in
disable-xmloff-subsequentchecks-for-fdo-51324-for-no.diff
diff --git a/patches/d
The following commit has been merged in the debian-experimental-3.6 branch:
commit a44e84cf8a1adc177b39df194831c9e51e77e992
Author: Bjoern Michaelsen
Date: Sun Jun 24 15:24:36 2012 +0200
disable broken sdext_pdfimport cppunit test
diff --git a/patches/disable-broken-sdext_pdfimport-cppunit
The following commit has been merged in the debian-experimental-3.6 branch:
commit 6ba0213c51a1cff985b039a250dcb8e55cac3f16
Author: Rene Engelhard
Date: Sat Jun 23 13:51:10 2012 +0200
add ENABLE_HELP conditional now that we have --without-help; also add the
new
--disable-extensions and
The following commit has been merged in the debian-experimental-3.6 branch:
commit 09006f1d9a05583dff25117b5e530f1b0e2c4ef0
Author: Rene Engelhard
Date: Sun Jun 24 17:44:08 2012 +0200
add proper gcc version check to
disable-xmloff-subsequentchecks-for-fdo-51324-for-no.diff
diff --git a/pa
The following commit has been merged in the debian-experimental-3.6 branch:
commit 885890d3fb04031f4fe4ff7b3d5e231f91f13f8f
Author: Bjoern Michaelsen
Date: Fri Jun 22 12:07:29 2012 +0200
disable xmloff subsequentchecks for fdo#51324 for now
diff --git a/patches/disable-xmloff-subsequentche
The following commit has been merged in the debian-experimental-3.6 branch:
commit 3bdd932893cf1cdb5e9d58c809a65216904aa40f
Author: Bjoern Michaelsen
Date: Sun Jun 24 14:05:04 2012 +0200
update patch to run checks separate
diff --git a/patches/build-dont-run-checks.diff
b/patches/build-do
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 1a1a1d26e493a2108ef24b454e75b22993b684f1
Author: Bjoern Michaelsen
Date: Fri Apr 20 09:32:32 2012 +0200
lp#753627: readd updated Ubuntu brand palette colors
diff --git a/patches/lp-753627-readd-updated-Ubuntu-bra
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit c411ff845cc9cae4f29c1afaaa9c15a10b80216e
Author: Bjoern Michaelsen
Date: Sun Jun 24 05:34:35 2012 +0200
replace (nonworking) old gcc versioning with simple working one
diff --git a/rules b/rules
index 5919e9a..70
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 18da3a3cc468f26547ab79908418421f0a76c1a1
Author: Bjoern Michaelsen
Date: Tue May 1 15:16:52 2012 +0200
reduce l10n set for ppa builds
diff --git a/rules b/rules
index 8a07092..d83c912 100755
--- a/rules
+++ b/rul
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 0f6546072525e8ef073379ae23a676493764f3ea
Author: Bjoern Michaelsen
Date: Thu May 31 17:32:39 2012 +0200
temporary hack: gconfbe move is missing files, need to figure out what is
going wrong there.
diff --git a/r
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 63155da3b6b8a15ab96fdb26f52f0ebba39593b8
Author: Bjoern Michaelsen
Date: Tue Jun 12 00:31:50 2012 +0200
update changelog
diff --git a/changelog b/changelog
index ffb6c79..1bb57a9 100644
--- a/changelog
+++ b/chan
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 4e5bfff1e01695e79d3fcbf3c57b07e626e4556d
Author: Bjoern Michaelsen
Date: Fri Apr 20 19:59:34 2012 +0200
lp#973134: default to ~/Documents for saving, look for templates in
~/Templates too
diff --git a/patches/lp
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit d23e83559fb532590a2365c112faa3aa911659b7
Author: Rene Engelhard
Date: Mon Jun 11 12:49:34 2012 +0200
remove obsolete rm -rf preventing -report-builders contents getting packaged
Conflicts:
ch
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 3739f22512022771aa13f3accd65754a55f0617d
Author: Bjoern Michaelsen
Date: Sun Jun 24 14:31:46 2012 +0200
renable xmloff subsequentcheck as long as we are on gcc-4.6
diff --git a/patches/disable-xmloff-subsequentch
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 80679075bf3e2ba888bde38315f7455876fd5428
Author: Bjoern Michaelsen
Date: Mon Mar 5 08:40:44 2012 +0100
lp#916291: failing -common postinst script
lp#916291: soft fail on registering extensions
lp
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 7c0c982f407cd3ecf159d8260ec4c0b8acb74533
Author: Bjoern Michaelsen
Date: Thu Dec 15 15:54:55 2011 +0100
disable system lucene graphite libvisio lpsolve libcdr for now
lp#938708: MIR lucene2
lp#93
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 7e7d8d8b99c91b931e8331a89949851db9f9d911
Author: Bjoern Michaelsen
Date: Sun Jun 24 14:05:04 2012 +0200
update patch to run checks separate
diff --git a/patches/build-dont-run-checks.diff
b/patches/build-dont-ru
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit f0e4bb9672f88ce489d2bfb05e36e3b89b5d94f9
Author: Bjoern Michaelsen
Date: Mon Apr 2 17:36:58 2012 +0200
lp#969707: do not use libreoffice-cores unopkg in preinst
diff --git a/libreoffice-mysql-connector.preinst.in
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 6f0b194beb988a0db4ca8e74db10967f6a8fdec8
Author: Bjoern Michaelsen
Date: Thu May 17 22:47:10 2012 +0200
remove broken mysqlcon version check
diff --git a/patches/remove-broken-mysqlcon-version-check.diff
b/patch
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit c3618b9d91e9d20d5efd3731f656b1597b587eb5
Author: Bjoern Michaelsen
Date: Sun Jun 24 15:24:36 2012 +0200
disable broken sdext_pdfimport cppunit test
diff --git a/patches/disable-broken-sdext_pdfimport-cppunit-test
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 9a21ef713865f513a199b748693bc6e452622cb9
Author: Bjoern Michaelsen
Date: Wed Feb 15 21:17:41 2012 +0100
temporary remove libpoppler-private-dev as poppler 0.18.3-0ubuntu4 doesnt
build one
diff --git a/rules b/ru
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit b68c6297e35de7d3a22c249d79ab7d24ebf15ae2
Author: Bjoern Michaelsen
Date: Fri Jun 22 12:07:29 2012 +0200
disable xmloff subsequentchecks for fdo#51324 for now
Conflicts:
patches/series
diff -
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 6d0e2ab3489febbf73af83631f6d1466e9e29e36
Author: Bjoern Michaelsen
Date: Thu May 31 23:37:20 2012 +0200
temporary hack: disable evo2 and nsplugin
diff --git a/rules b/rules
index 52a97cf..96e5580 100755
--- a/rul
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit d674082dd0d2f35d11ad84e5f3578a2d6a3831a1
Author: Bjoern Michaelsen
Date: Thu Apr 5 14:44:16 2012 +0200
adjust make version needed for parallel build to ubuntu
diff --git a/rules b/rules
index 6ec6072..8a07092 100
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 20f4decec9f2e2d5ed27c3b9abb68e9e3b1fe36d
Author: Bjoern Michaelsen
Date: Tue Jun 5 15:08:30 2012 +0200
styles dont really need -core as a hard dep, demote to recommends:
diff --git a/control.in b/control.in
index
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 3ce428ee6fb170838df915fbadbb2b074fc6d86d
Author: Bjoern Michaelsen
Date: Thu May 31 12:55:44 2012 +0200
first upstream alpha
diff --git a/changelog b/changelog
index fa1c616..40a2975 100644
--- a/changelog
+++ b/
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit a5a429f44f6f7ff1e9c50f40e578e3f19989566f
Author: Bjoern Michaelsen
Date: Wed May 30 10:22:40 2012 +0200
temporary hack: remove split split-binfilters-and-evo.diff
diff --git a/patches/series b/patches/series
inde
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit d84ccf2ce79b50ae4aa552b6d324924810354fd5
Author: Bjoern Michaelsen
Date: Sat May 12 01:17:31 2012 +0200
ubuntufy changelog
diff --git a/changelog b/changelog
index e50fe7a..fa1c616 100644
--- a/changelog
+++ b/ch
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 399682c18bb967d614e5f2595f8d403784fb9efa
Author: Bjoern Michaelsen
Date: Sun Feb 19 21:36:00 2012 +0100
Ubuntufy splash progress
diff --git a/rules b/rules
index 4c2f646..d8b2740 100755
--- a/rules
+++ b/rules
@@
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 821fa63bca2a6d92286807d8efc904192ae0d983
Author: Bjoern Michaelsen
Date: Tue May 15 23:25:03 2012 +0200
hardwire GCJ version for now
diff --git a/rules b/rules
index d83c912..7fa00bb 100755
--- a/rules
+++ b/rule
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit f2228f12efa26f92a3752993095c15ce04a36c7e
Author: Bjoern Michaelsen
Date: Tue Feb 21 11:11:40 2012 +0100
make gbuild use hardlinks and use linkoo in smoketest to save some space
pythonloader patch for link
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 00cb3d11aa72e48014c358d517fd509c511c4fcd
Author: Bjoern Michaelsen
Date: Fri Jun 8 10:39:53 2012 +0200
update changelog
diff --git a/changelog b/changelog
index 40a2975..5036fc4 100644
--- a/changelog
+++ b/chang
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 21bead24e429adc14ae6a69fb5109d3861356f73
Author: Bjoern Michaelsen
Date: Wed Feb 15 10:35:44 2012 +0100
lp#917153: do extension registration from -common to -core because we
actually have the binaries (unopkg.bin
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 557238bfe71aeaea9ce93f6108cf476c30015377
Author: Bjoern Michaelsen
Date: Wed May 23 21:04:15 2012 +0200
update dep-track disabling
diff --git a/rules b/rules
index 7fa00bb..064d248 100755
--- a/rules
+++ b/rules
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit aa60cd901238fd995bf6e525802378dd242f10de
Author: Bjoern Michaelsen
Date: Mon Jan 9 17:20:15 2012 +0100
ubuntufy maintainers
diff --git a/control b/control
index 9c986a0..c390b1f 100644
--- a/control
+++ b/control
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit ca2e207e8244165be9019a29e696d68d4b78ba5d
Author: Bjoern Michaelsen
Date: Wed Feb 22 10:54:11 2012 +0100
do not run checks on powerpc armel armhf for now as they fail with debug
output level 11 is too high
diff -
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 0bfb0182aa43d9558703524b4fe99799d5e49f47
Author: Bjoern Michaelsen
Date: Tue May 29 21:52:24 2012 +0200
git dailies
diff --git a/rules b/rules
index 064d248..fb3de93 100755
--- a/rules
+++ b/rules
@@ -70,10 +70,1
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit cdd355e82686c5e6c961d055048afd8f672efdd1
Author: Bjoern Michaelsen
Date: Fri Jan 13 00:08:54 2012 +0100
add human theme
enable human theme and make it the default for gtk desktops
diff --git a/control.in
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit dedcc60d202ff29b5f359c004f7c8db093421aa3
Author: Bjoern Michaelsen
Date: Tue Apr 17 23:34:27 2012 +0200
lp#841696: metapackage libreoffice should recommend -kde or -gnome
diff --git a/control.in b/control.in
inde
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit c9cf6d104f9d3526543d18f9eb93bc3c8036e27f
Author: Bjoern Michaelsen
Date: Thu Dec 22 12:31:45 2011 +0100
unset DISPLAY for subsequenttests
diff --git a/rules b/rules
index f58328b..e55372a 100755
--- a/rules
+++ b
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 541f5aeacafe6fc662ab8b3eb94e7664698c9149
Author: Bjoern Michaelsen
Date: Thu Jan 12 17:58:11 2012 +0100
cherry-pick demotion of java-Recommends for -writer to Suggests and demote
lucene and java-common recommends
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 952aefd1680ace5eb5e42fd0054d3af79f66c7c1
Author: Bjoern Michaelsen
Date: Thu Dec 15 15:03:52 2011 +0100
allow firefox-dev as an alternative to xulrunner-dev
exchange firefox-dev and xulrunner-dev order in
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 00b48ee3cfce723ac973c4d9bb2d7409fa6243f6
Author: Bjoern Michaelsen
Date: Thu Jan 12 17:44:04 2012 +0100
cherry-pick Replaces commit from 3.4 (LP: #705343)
diff --git a/control.in b/control.in
index 02b5a62..40922
Package: libreoffice
Version: 1:3.5.4-4
Severity: normal
Dear Maintainer,
*** Please consider answering these questions, where appropriate ***
* What led up to the situation?
I selected an avery address label (30 labels per page in 3 columns of 10
labels) but they
didn't print properly. The
44 matches
Mail list logo
