Bug#927120: HI
-- Greetings from Syria
[libreoffice] 12/16: 22:05 < ricotz> _rene_, hi, cherry-picking gtk3-rtl.diff bumps the gtk+ requirement to 3.8
This is an automated email from the git hooks/post-receive script. sweetshark-guest pushed a commit to tag libreoffice_5.0.2-0ubuntu1 in repository libreoffice. commit 939e78e8f122321321b95a74f3e9da3009db93b8 Author: Rene Engelhard Date: Fri Aug 28 11:09:53 2015 +0200 22:05 < ricotz> _rene_, hi, cherry-picking gtk3-rtl.diff bumps the gtk+ requirement to 3.8 Conflicts: control --- rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules b/rules index cd3aaa1..8970864 100755 --- a/rules +++ b/rules @@ -1333,7 +1333,7 @@ else BUILD_DEPS += , libgtk2.0-dev (>= 2.10) endif ifeq "$(BUILD_GTK3)" "y" - BUILD_DEPS += , libgtk-3-dev (>= 3.2~) + BUILD_DEPS += , libgtk-3-dev (>= 3.8~) CONFIGURE_FLAGS+= --enable-gtk3 ifneq (cairo,$(findstring cairo,$(SYSTEM_STUFF))) $(error GTK3 build fails without system-cairo!!) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
[libreoffice] 03/05: 22:05 < ricotz> _rene_, hi, cherry-picking gtk3-rtl.diff bumps the gtk+ requirement to 3.8
This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch master in repository libreoffice. commit eba5a05fcd382634f8fdc4f06390aedab49d6487 Author: Rene Engelhard Date: Fri Aug 28 11:09:53 2015 +0200 22:05 < ricotz> _rene_, hi, cherry-picking gtk3-rtl.diff bumps the gtk+ requirement to 3.8 --- control | 4 ++-- rules | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/control b/control index 1da74a0..79df927 100644 --- a/control +++ b/control @@ -72,7 +72,7 @@ Build-Depends: ant (>= 1.7.0), libgraphite2-dev (>= 0.9.3), libgstreamer-plugins-base1.0-dev, libgstreamer1.0-dev, - libgtk-3-dev (>= 3.2~), + libgtk-3-dev (>= 3.8~), libgtk2.0-dev (>= 2.10), libharfbuzz-dev (>= 0.9.18), libhsqldb1.8.0-java (>> 1.8.0.10), @@ -4419,7 +4419,7 @@ Depends: ant (>= 1.7.0), libgraphite2-dev (>= 0.9.3), libgstreamer-plugins-base1.0-dev, libgstreamer1.0-dev, - libgtk-3-dev (>= 3.2~), + libgtk-3-dev (>= 3.8~), libgtk2.0-dev (>= 2.10), libharfbuzz-dev (>= 0.9.18), libhsqldb1.8.0-java (>> 1.8.0.10), diff --git a/rules b/rules index 23f4758..57864d2 100755 --- a/rules +++ b/rules @@ -1283,7 +1283,7 @@ else BUILD_DEPS += , libgtk2.0-dev (>= 2.10) endif ifeq "$(BUILD_GTK3)" "y" - BUILD_DEPS += , libgtk-3-dev (>= 3.2~) + BUILD_DEPS += , libgtk-3-dev (>= 3.8~) CONFIGURE_FLAGS+= --enable-gtk3 ifneq (cairo,$(findstring cairo,$(SYSTEM_STUFF))) $(error GTK3 build fails without system-cairo!!) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
./packages/openofficeorg/3.3.0/experimental r2130: -hi-in instead of -hi
revno: 2130
committer: Rene Engelhard
branch nick: experimental
timestamp: Mon 2011-01-24 04:49:36 +0100
message:
-hi-in instead of -hi
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2011-01-24 03:31:47 +
+++ b/changelog 2011-01-24 03:49:36 +
@@ -24,6 +24,9 @@
* debian/openoffice.org-common.preinst.in: move ...
* debian/openoffice.org-common.preinst: ... here and rm_conffile
/etc/bash_completion.d/ooffice.sh
+ * debian/rules
+- generate openoffice.org-{l10n,help}-hi-in transitional package insteda of
+ -hi (OOo 3.2.x has the former)
[ Matthias Klose ]
* debian/rules:
=== modified file 'control'
--- a/control 2011-01-24 03:31:47 +
+++ b/control 2011-01-24 03:49:36 +
@@ -31,7 +31,7 @@
.
It can be safely removed after an upgrade.
-Package: openoffice.org-help-hi
+Package: openoffice.org-help-hi-in
Architecture: all
Priority: extra
Section: doc
@@ -317,7 +317,7 @@
.
It can be safely removed after an upgrade.
-Package: openoffice.org-l10n-hi
+Package: openoffice.org-l10n-hi-in
Architecture: all
Priority: extra
Section: localization
=== modified file 'rules'
--- a/rules 2011-01-24 03:26:36 +
+++ b/rules 2011-01-24 03:49:36 +
@@ -28,6 +28,9 @@
cat debian/control.ooo >> debian/control
rm -f debian/control.ooo
+ # got renamed in OOo 3.3
+ perl -pi -e 's#(Package:.*hi$$)#\1-in#' debian/control
+
.DELETE_ON_ERROR: debian/control
build: control
./packages/libreoffice/3.3.0/experimental r2172: update to current git; remove pam builddep and explicitely use --enable-unowinreg-build; hi-IN -> hi
revno: 2172 committer: Rene Engelhard branch nick: debian timestamp: Wed 2010-11-03 19:47:51 +0100 message: update to current git; remove pam builddep and explicitely use --enable-unowinreg-build; hi-IN -> hi modified: changelog control control.in patches/buildfix-patches.diff rules Diff too large for email (1747 lines, the limit is 1000).
+Hi+
http://sites.google.com/site/34498fi58ujhr4/xhdq2s -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/j2t57783b191004212301led31b528lcb25fad6c292b...@mail.gmail.com
+Hi+
http://www.gate.jobsatcanada.com/Ol1RGVwox5.htm -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/t2k57783b191004091349x418c99ecn5724575bdb689...@mail.gmail.com
./packages/openofficeorg/3.2/experimental r1710: xx-IN was (except hi-IN and pa-IN moved to xx upstream...
revno: 1710
committer: Rene Engelhard
branch nick: experimental
timestamp: Thu 2009-11-26 21:11:30 +0100
message:
xx-IN was (except hi-IN and pa-IN moved to xx upstream...
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2009-11-26 20:02:33 +
+++ b/changelog 2009-11-26 20:11:30 +
@@ -14,6 +14,8 @@
- remove removed languages: lo
- fix install on no-Java builds
- add BUILD_HPPA conditional, don't enable it yet
+ * debian/control.in, debian/rules: adapt for upstream xx-IN -> xx rename
+(except hi-IN and pa-IN)
* debian/scripts/vars.hppa: add
-- Rene Engelhard Mon, 23 Nov 2009 21:27:01 +0100
=== modified file 'control'
--- a/control 2009-11-26 20:02:33 +
+++ b/control 2009-11-26 20:11:30 +
@@ -90,7 +90,7 @@
Package: openoffice.org-l10n-in
Section: localization
Architecture: all
-Depends: openoffice.org-l10n-as-in, openoffice.org-l10n-bn,
openoffice.org-l10n-gu-in, openoffice.org-l10n-hi-in,
openoffice.org-l10n-ml-in, openoffice.org-l10n-mr-in,
openoffice.org-l10n-or-in, openoffice.org-l10n-pa-in,
openoffice.org-l10n-ta-in, openoffice.org-l10n-te-in, ${misc:Depends}
+Depends: openoffice.org-l10n-as, openoffice.org-l10n-bn,
openoffice.org-l10n-gu, openoffice.org-l10n-hi-in, openoffice.org-l10n-ml,
openoffice.org-l10n-mr, openoffice.org-l10n-or, openoffice.org-l10n-pa,
openoffice.org-l10n-ta, openoffice.org-l10n-te, ${misc:Depends}
Recommends: ttf-indic-fonts
Description: full-featured office productivity suite -- Indic language packages
OpenOffice.org is a full-featured office productivity suite that provides
@@ -554,15 +554,15 @@
install extra dictionaries/hyphenation patterns/thesauri independently of
the language packs.
-Package: openoffice.org-l10n-as-in
+Package: openoffice.org-l10n-as
Section: localization
Architecture: all
-Depends: locales (>= 2.3.6.ds1-1) | locales-all (>= 2.3.6.ds1-1),
${misc:Depends}
+Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) |
language-support-translations-as
-Provides: openoffice.org-l10n-${help-l10n-virtual-version},
openoffice.org2-l10n-as-in
-Suggests: hunspell-dictionary-as-in | myspell-dictionary-as-in,
openoffice.org-hyphenation-as-in, openoffice.org2-thesaurus-as-in,
openoffice.org-help-as-in
-Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>=
${base-version}.1), openoffice.org2-l10n-as-in
-Replaces: openoffice.org2-l10n-as-in
+Provides: openoffice.org-l10n-${help-l10n-virtual-version},
openoffice.org2-l10n-as
+Suggests: hunspell-dictionary-as | myspell-dictionary-as,
openoffice.org-hyphenation-as, openoffice.org2-thesaurus-as,
openoffice.org-help-as
+Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>=
${base-version}.1), openoffice.org2-l10n-as
+Replaces: openoffice.org2-l10n-as
Description: full-featured office productivity suite -- Assamese language
package
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -1282,15 +1282,15 @@
install extra dictionaries/hyphenation patterns/thesauri independently of
the language packs.
-Package: openoffice.org-l10n-gu-in
+Package: openoffice.org-l10n-gu
Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
-Recommends: openoffice.org-core (>> ${base-version}) |
language-support-translations-gu , ttf-gujarati-fonts
-Provides: openoffice.org-l10n-${help-l10n-virtual-version},
openoffice.org2-l10n-gu-in
-Suggests: hunspell-dictionary-gu-in | myspell-dictionary-gu-in,
openoffice.org-hyphenation-gu-in, openoffice.org2-thesaurus-gu-in,
openoffice.org-help-gu-in
-Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>=
${base-version}.1), openoffice.org2-l10n-gu-in
-Replaces: openoffice.org2-l10n-gu-in
+Recommends: openoffice.org-core (>> ${base-version}) |
language-support-translations-gu
+Provides: openoffice.org-l10n-${help-l10n-virtual-version},
openoffice.org2-l10n-gu
+Suggests: hunspell-dictionary-gu | myspell-dictionary-gu,
openoffice.org-hyphenation-gu, openoffice.org2-thesaurus-gu,
openoffice.org-help-gu
+Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>=
${base-version}.1), openoffice.org2-l10n-gu
+Replaces: openoffice.org2-l10n-gu
Description: full-featured office productivity suite -- Gujarati language
package
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -1758,15 +1758,15 @@
install extra dictionaries/hyphenation patterns/thesauri independently of
the language packs.
-Package: openoffice.org-l10n-ml-in
+Package: openoffice.org-l
./packages/openofficeorg/3.0.1/experimental r1345: remove "Lohit Hindi" addition for hi-INs help, obsolete
revno: 1345
committer: Rene Engelhard
branch nick: experimental
timestamp: Fri 2008-12-19 10:12:03 +0100
message:
remove "Lohit Hindi" addition for hi-INs help, obsolete
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-12-18 16:04:14 +
+++ b/changelog 2008-12-19 09:12:03 +
@@ -3,7 +3,7 @@
* new upstream snapshot (OOO300_m13)
- fixes usage of flash v9 plugin (closes: #434510)
* ooo-build
-- switch to ooo-build-3-0-1 branch (r14887)
+- switch to ooo-build-3-0-1 branch (r14890)
* debian/source.lintian-overrides: override bogus
missing-build-dependency-for-dh_-command
* debian/rules:
@@ -13,6 +13,8 @@
directly from sysui and make install-*/broffice use the directories
for the respective flavour directly
- also install /usr/share/mime-info/openoffice.keys for broffice.org
+- remove "Lohit Hindi" addition for hi-INs help, obsolete since (at least)
+ 3.0.0
* debian/README, debian/rules: remove obsolete targets, explain
make patch.apply
* debian/control.in:
=== modified file 'rules'
--- a/rules 2008-12-18 16:04:14 +
+++ b/rules 2008-12-19 09:12:03 +
@@ -1823,11 +1823,6 @@
$(PKGDIR)-help-$$pkgiso; \
fi; \
done
-ifeq (hi-IN,$(findstring hi-IN,$(HELPISOS)))
- for i in $(PKGDIR)-help-hi-in/$(OODIR)/help/hi-IN/*.css; do \
- perl -pi -e 's|(font-family: )(.*)|\1 \"Lohit Hindi\", \2|' $$i; \
- done
-endif
endif
endif
hi
Schade das du schon aus dem chat bist,ich wollte dir doch noch ein paar bilder von mir zeigen.na ja schau sie dir halt jetzt an und sage mir dann wie du sie findest :-)) http://www.jenny17.de.ms/ bis dann sagt jenny
