[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.4_dfsg-3-46-gd08e765



The following commit has been merged in the debian-experimental-3.5 branch:
commit da1f0568532f3b03d6c5b4c18aaed2b9e60949c8
Author: Rene Engelhard <rene@debian.org>
Date:   Tue Nov 20 17:24:40 2012 +0100

    don't rely on dictionaries submodule. unused.

diff --git a/changelog b/changelog
index 2baf81e..5acddac 100644
--- a/changelog
+++ b/changelog
@@ -15,6 +15,7 @@ libreoffice (1:3.5.7-1) UNRELEASED; urgency=low
     - fix typo in finding gcj dir detection, thanks Rico Tzschichholz
     - don't add version from librsvg*.shlibs (as for libebook) as we
       dlopen() it anyway.
+    - don't rely on dictionaries submodule. unused.
   * debian/control.in:
     - remove obsolete sharutils, po-debconf and wget | curl build-deps
     - recommend fonts-liberation instead of ttf-liberation
diff --git a/rules b/rules
index b41fe49..2189870 100755
--- a/rules
+++ b/rules
@@ -3097,7 +3097,7 @@ $(call get_orig_tarball,-%):
 	$(call pack_gittarball,$*,$@,libreoffice-$(DEB_VERSION_UPSTREAM)/$*)
 
 # Get upstream external sources
-$(call get_orig_tarball,-src): binfilter/no_localization dictionaries/en/README.txt helpcontent2/makefile.pmk translations/makefile.mk .gitignore
+$(call get_orig_tarball,-src): binfilter/no_localization helpcontent2/makefile.pmk translations/makefile.mk .gitignore
 	dh_testdir
 	rm -rf $(TARFIILE_LOCATION)
 	mkdir -p $(TARFILE_LOCATION)
@@ -3112,9 +3112,6 @@ $(call get_orig_tarball,-src): binfilter/no_localization dictionaries/en/README.
 binfilter/no_localization: $(call get_orig_tarball,-binfilter)
 	$(call unpack_gittarball,binfilter,$<,)
 
-dictionaries/en/README.txt: $(call get_orig_tarball,-dictionaries)
-	$(call unpack_gittarball,dictionaries,$<,)
-
 translations/makefile.mk:  $(call get_orig_tarball,-translations)
 	$(call unpack_gittarball,translations,$<,)
 

-- 
LibreOffice packaging repository


Reply to: