The following commit has been merged in the ubuntu-natty-3.3.1 branch:
commit 515237bc042f3fa75810f04984ab98d19a79277f
Author: Bjoern Michaelsen <[email protected]>
Date: Mon Feb 28 09:47:29 2011 +0100
remove duplicate code in control file generation
diff --git a/changelog b/changelog
index 133cc07..457c9bb 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,7 @@
libreoffice (1:3.3.1-1ubuntu4) natty; urgency=low
* reenable verbose build on ubuntu buildd (closes: #726333)
+ * remove duplicate code in control file generation
-- Bjoern Michaelsen <[email protected]> Mon, 28 Feb 2011
09:44:27 +0100
diff --git a/rules b/rules
index f3baf59..9fd7445 100755
--- a/rules
+++ b/rules
@@ -1469,14 +1469,6 @@ ifeq "$(PKGSOURCE)" "libreoffice$(VER)-l10n"
>> debian/control < debian/control.l10n.in
endif
-ifeq "$(PKGSOURCE)" "libreoffice$(VER)-l10n"
- awk '{print} /^ *$$/ {exit}' debian/control > debian/control.l10n
- mv debian/control.l10n debian/control
-
- sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
- >> debian/control < debian/control.l10n.in
-endif
-
ifeq "$(ENABLE_LDAP)" "y"
# build-depends might not be satified when running debian/rules
control. prevent bad subsitition with
# nothing (libldap--)
--
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]
