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

[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. e49c4755fb3ca70ed3fe5806757d42357837c6f2



The following commit has been merged in the debian-experimental-3.4.0 branch:
commit fccfc94ef9127a230848e2b584e08a4bb98c83b0
Author: Rene Engelhard <rene@debian.org>
Date:   Fri Jun 3 15:08:28 2011 +0000

    libeggtray is gone

diff --git a/rules b/rules
index fdf63ab..bdf28bd 100755
--- a/rules
+++ b/rules
@@ -1882,7 +1882,7 @@ endif
 	rm -f $(PKGDIR)-common/$(OODIR)/program/.testtoolrc
 
 ifeq "$(BUILD_GTK)" "y"
-	# Gtk quickstarter for the eggtrtray stuff, so to -gtk (via -gnome)
+	# Gtk quickstarter, so to -gtk (via -gnome)
 	mkdir -p -m755 $(PKGDIR)-gnome/$(OOBRANDDIR)/share/xdg
 	mv $(PKGDIR)-common/$(OOBRANDDIR)/share/xdg/qstart.desktop \
 		$(PKGDIR)-gnome/$(OOBRANDDIR)/share/xdg
@@ -2201,9 +2201,7 @@ ifeq "$(BUILD_GTK)" "y"
 	for f in fps_gnome.uno.so libvclplug_gtk*.so; do \
 	  mv $(PKGDIR)-core/$(OODIR)/program/$$f $(PKGDIR)-gnome/$(OODIR)/program || exit 1;\
 	done
-	for f in libeggtray* libqstart_gtk*; do \
-	  mv $(PKGDIR)-core/$(OODIR)/program/$$f $(PKGDIR)-gnome/$(OODIR)/program || exit 1;\
-	done
+	mv $(PKGDIR)-core/$(OODIR)/program/libqstart_gtk* $(PKGDIR)-gnome/$(OODIR)/program || exit 1
 endif
 
 	# split out gtk stuff

-- 
LibreOffice packaging repository


Reply to: