------------------------------------------------------------
revno: 1714
committer: Rene Engelhard <r...@debian.org>
branch nick: experimental
timestamp: Sat 2009-11-28 22:29:29 +0100
message:
remove beta splash workaround and fix regex to also catch one-digit milestones
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-11-28 21:28:38 +0000
+++ b/changelog 2009-11-28 21:29:29 +0000
@@ -16,6 +16,8 @@
- add BUILD_HPPA conditional, don't enable it yet
- add symlink /usr/lib/openoffice/basisX.Y/help -> /usr/share/... to work
around regression.... (see i107283)
+ - remove beta splash workaround and fix regex to also catch one-digit
+ milestones...
* debian/control.in, debian/rules: adapt for upstream xx-IN -> xx rename
(except hi-IN and pa-IN)
* debian/scripts/vars.hppa: add
=== modified file 'rules'
--- a/rules 2009-11-28 21:28:38 +0000
+++ b/rules 2009-11-28 21:29:29 +0000
@@ -2772,7 +2772,7 @@
for i in $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*.sh; echo
$$OUTPATH$$PROEXT)/misc/broffice.org/*.keys; do \
cat $$i >>
debian/broffice.org/usr/share/mime-info/openoffice.keys; \
done
- if dpkg-parsechangelog | grep urgency | egrep -q
"\~(.*m[0123456789]\+|beta)"; then \
+ if dpkg-parsechangelog | grep urgency | egrep -q "\~.*m[0123456789]+";
then \
debian/scripts/fix_image_rgb \
$(SOURCE_TREE)/ooo_custom_images/dev_nologo_broffice/introabout/intro.bmp \
debian/broffice.org$(VER)/$(OOBRANDDIR)/program/intro.bmp; \
@@ -3140,7 +3140,7 @@
ifeq "$(DIST)" "Debian"
# fix intro
- if dpkg-parsechangelog | grep urgency | egrep -q
"\~(.*m[0123456789]\+|beta)"; then \
+ if dpkg-parsechangelog | grep urgency | egrep -q "\~.*m[0123456789]+";
then \
debian/scripts/fix_image_rgb \
$(SOURCE_TREE)/ooo_custom_images/dev_nologo/introabout/intro.bmp \
$(PKGDIR)-common/$(OOBRANDDIR)/program/intro.bmp; \
