The following commit has been merged in the debian-experimental-4.0 branch:
commit 08e3d3c9eba387395c1f80a17fc62cad24276599
Author: Benjamin Drung <[email protected]>
Date: Mon Mar 11 13:34:08 2013 +0100
Remove unneeded VER sed replacements.
diff --git a/rules b/rules
index 2e34c45..6cea262 100755
--- a/rules
+++ b/rules
@@ -22,7 +22,6 @@ BASE_VERSION:=$(shell echo $(DEB_VERSION) | cut -d:
-f1):$(DEB_VERSION_UPSTREAM)
BINARY_VERSION=$(DEB_VERSION)
#HELP_L10N_VIRTUAL_VERSION:=$(shell echo $(DEB_VERSION_UPSTREAM) | cut -d: -f2
| tr [~] [\\-])
HELP_L10N_VIRTUAL_VERSION:=4.0
-#VER:=4
OOVER:=4.0
NEXT_OOVER:=$(shell echo "$(OOVER) + 0.1" | bc)
@@ -1324,9 +1323,7 @@ endif
control: debian/control
debian/control: $(wildcard debian/control*in) $(SOURCE_TREE)/bin/lo-xlate-lang
debian/rules
chmod 755 $(SOURCE_TREE)/bin/lo-xlate-lang
- sed -e "s#libreofficeVER#libreoffice#g" \
- -e "s#libreofficeVER#libreoffice#g" \
- -e "s#%$(DEB_VENDOR)=\([^%]*\)%#, \1#g#" \
+ sed -e "s#%$(DEB_VENDOR)=\([^%]*\)%#, \1#g#" \
-e "s#%[A-Za-z]*=[^%]*%##g#" \
-e "s#%BUILD_DEPS%#$(strip $(BUILD_DEPS))#g" \
-e "s#%BUILD_DEPS_INDEP%#$(strip $(BUILD_DEPS_INDEP))#g" \
@@ -1392,12 +1389,10 @@ debian/control: $(wildcard debian/control*in)
$(SOURCE_TREE)/bin/lo-xlate-lang
-e "s|@CCODE@|$$CCODE|g" \
-e "s|@FONT_SUGGESTS@|$$FONT_SUGGESTS|g" \
-e "s:@LOCALES_DEPENDS@:$$LOCALES_DEPENDS:g" \
- -e "s|libreofficeVER|libreoffice|g" \
-e "s|@LDAP_LIB@|$(LDAP_LIB)|g" \
>> debian/control < debian/control.lang.in; \
done
- sed -e "s|libreofficeVER|libreoffice|g" \
- >> debian/control < debian/control.transitionals.in
+ cat debian/control.transitionals.in >> debian/control
ifneq "$(ENABLE_HELP)" "n"
for LNUM in $(HELPISOS) ; do \
@@ -1407,7 +1402,6 @@ ifneq "$(ENABLE_HELP)" "n"
CCODE=`echo $$LCODE | sed 's/-.*//'`; \
sed -e "s|@LNAME@|$$LNAME|g" -e "s|@LCODE@|$$LCODE|g" \
-e "s|@CCODE@|$$CCODE|g" \
- -e "s|libreofficeVER|libreoffice|g" \
>> debian/control < debian/control.help.in; \
done
# en_US is in -common
@@ -1416,73 +1410,57 @@ ifneq "$(ENABLE_HELP)" "n"
perl -pi -e 's|(Depends: libreoffice-writer,
libreoffice-l10n-en-us)|\1, fonts-deva|' \
debian/control
endif
- sed -e "s|libreofficeVER|libreoffice|g" \
- >> debian/control < debian/control.ure.in
+ cat debian/control.ure.in >> debian/control
ifeq "$(ENABLE_JAVA)" "y"
ifneq "$(OOO_GCJ_JDK_ARCHS)" ""
ifeq "$(BUILD_JARS_NATIVE)" "y"
- sed -e "s|libreofficeVER|libreoffice|g" \
- >> debian/control < debian/control.gcj.in
+ cat debian/control.gcj.in >> debian/control
endif
endif
endif
ifneq "$(OOO_NSPLUGIN_ARCHS)" ""
- sed -e "s|libreofficeVER|libreoffice|g" \
- >> debian/control < debian/control.mozilla.in
+ cat debian/control.mozilla.in >> debian/control
endif
ifneq "$(OOO_OGLTRANS_ARCHS)" ""
- sed -e "s|libreofficeVER|libreoffice|g" \
- >> debian/control < debian/control.ogltrans.in
+ cat debian/control.ogltrans.in >> debian/control
endif
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(ENABLE_MEDIAWIKI)" "y"
- sed -e "s|libreofficeVER|libreoffice|g" \
- >> debian/control < debian/control.mediawiki.in
+ cat debian/control.mediawiki.in >> debian/control
endif
ifeq "$(ENABLE_REPORTDESIGN)" "y"
- sed -e "s|libreofficeVER|libreoffice|g" \
- >> debian/control < debian/control.reportdesign.in
+ cat debian/control.reportdesign.in >> debian/control
endif
endif
ifeq "$(ENABLE_MINIMIZER)" "y"
- sed -e "s|libreofficeVER|libreoffice|g" \
- >> debian/control < debian/control.minimizer.in
+ cat debian/control.minimizer.in >> debian/control
endif
ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
- sed -e "s|libreofficeVER|libreoffice|g" \
- >> debian/control < debian/control.fonts.in
+ cat debian/control.fonts.in >> debian/control
endif
ifeq "$(BUILD_DBG_PACKAGE)" "y"
- sed -e "s|libreofficeVER|libreoffice|g" \
- >> debian/control < debian/control.debug.in
+ cat debian/control.debug.in >> debian/control
endif
ifeq "$(PACKAGE_SDK)" "y"
- sed -e "s|libreofficeVER|libreoffice|g" \
- >> debian/control < debian/control.sdk.in
+ cat debian/control.sdk.in >> debian/control
endif
ifeq "$(BUILD_KDE)" "y"
- sed -e "s|libreofficeVER|libreoffice|g" \
- >> debian/control < debian/control.kde.in
+ cat debian/control.kde.in >> debian/control
endif
ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y"
- sed -e "s|libreofficeVER|libreoffice|g" \
- >> debian/control < debian/control.postgresql.in
+ cat debian/control.postgresql.in >> debian/control
endif
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
- sed -e "s|libreofficeVER|libreoffice|g" \
- >> debian/control < debian/control.mysql.in
+ cat debian/control.mysql.in >> debian/control
endif
ifeq "$(ENABLE_EVO2)" "y"
- sed -e "s|libreofficeVER|libreoffice|g" \
- >> debian/control < debian/control.evolution.in
+ cat debian/control.evolution.in >> debian/control
endif
ifeq "$(ENABLE_KDEAB)" "y"
- sed -e "s|libreofficeVER|libreoffice|g" \
- >> debian/control < debian/control.kab.in
+ cat debian/control.kab.in >> debian/control
endif
ifeq "$(PACKAGE_LIBRELOGO)" "y"
- sed -e "s|libreofficeVER|libreoffice|g" \
- >> debian/control < debian/control.librelogo.in
+ cat debian/control.librelogo.in >> debian/control
endif
perl -pi -e "s,%OOO_ARCHS%,$(OOO_ARCHS),g" debian/control
@@ -1528,11 +1506,9 @@ endif
python debian/scripts/joinctrl.py < debian/control > debian/control.tmp
mv debian/control.tmp debian/control
-ifeq "" ""
# no conflict with "universal Linux packages" as they have the version
in their
# names thankfully now
perl -pi -e 's/libreoffice-unbundled, //' debian/control
-endif
# make -l10n-fi suggest libreoffice-spellcheck-fi to
# match myspell-fi and libreoffice-soikko/-voikko
@@ -3034,7 +3010,6 @@ ifeq "$(PACKAGE_SDK)" "y"
| sed -e "s/@UDK_MAJOR@/$$UDK_MAJOR/" \
-e "s/@UDK_MINOR@/$$UDK_MINOR/" \
-e "s/@UDK_MICRO@/$$UDK_MICRO/" \
- -e "s/@VER@//" \
> debian/libreoffice-dev-doc.doc-base.udk-$$i-ref; \
done
# remove Autodoc_DiagnosticMessages.txt
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
