[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.4-1-185-gf6717f7
The following commit has been merged in the debian-experimental-3.5 branch:
commit 06abbf36ac5853e4b375d5839e6b569626d20d0e
Author: Rene Engelhard <rene@debian.org>
Date: Fri Dec 23 17:41:31 2011 +0100
move loads of mvs in rules to proper scp2 patch...
diff --git a/changelog b/changelog
index 18a4f4e..f4b46c3 100644
--- a/changelog
+++ b/changelog
@@ -25,6 +25,8 @@ libreoffice (1:3.5.0~beta2-1) UNRELEASED; urgency=low
- run new "make check" instead of solenv/bin/subsequenttests and
manual smoketest
- remove fakeroot hackaround
+ * debian/rules, debian/make-package-modules-not-suck.diff: migrate loads of mv's
+ in debian/rules to proper scp2 patches
* debian/rules, debian/control.in:
- move from self-defined UPSTREAM_VERSION/ARCH etc. to use
/usr/share/dpkg/*.mk
diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
new file mode 100644
index 0000000..54a59b3
--- /dev/null
+++ b/patches/make-package-modules-not-suck.diff
@@ -0,0 +1,191 @@
+diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp
+index 1a245a6..dc9dbf0 100644
+--- a/scp2/source/base/module_base.scp
++++ b/scp2/source/base/module_base.scp
+@@ -51,6 +51,20 @@ Module gid_Module_Prg_Base_Bin
+ ,gid_File_Lib_Rpt
+ ,gid_File_Lib_Rptui
+ ,gid_File_Lib_Rptxml
++ ,gid_File_Lib_Dba
++ ,gid_File_Lib_Dbase2
++ ,gid_File_Lib_Dbaxml
++ ,gid_File_Lib_Odbcbase
++ ,gid_File_Lib_Dbpool
++ ,gid_File_Lib_Odbc
++ ,gid_File_Lib_Sdbc_2
++ ,gid_File_Lib_Mysql
++#ifdef SOLAR_JAVA
++ ,gid_File_Lib_Jdbc
++ ,gid_File_Lib_Hsqldb_2
++#endif
++ ,gid_File_Lib_Flat
++ ,gid_File_Lib_Calc
+ );
+ End
+
+diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp
+index 0e5e790..e5ba644 100644
+--- a/scp2/source/calc/module_calc.scp
++++ b/scp2/source/calc/module_calc.scp
+@@ -42,8 +42,9 @@ Module gid_Module_Prg_Calc_Bin
+ Minimal = YES;
+ Default = YES;
+ Styles = (HIDDEN_ROOT);
+- Files = (gid_File_Share_Registry_Calc_Xcd,gid_File_Lib_Calc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scfilt,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml,
++ Files = (gid_File_Share_Registry_Calc_Xcd,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scfilt,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml,
+ gid_File_Lib_Solver,gid_File_Lib_Lpsolve,
++ gid_File_Lib_Vbaobj,
+ gid_File_Tmp_Userinstall_Calc_Inf);
+ End
+
+diff --git a/scp2/source/draw/module_draw.scp b/scp2/source/draw/module_draw.scp
+index b5bec12..920fc4e 100644
+--- a/scp2/source/draw/module_draw.scp
++++ b/scp2/source/draw/module_draw.scp
+@@ -43,6 +43,11 @@ Module gid_Module_Prg_Draw_Bin
+ Default = YES;
+ Styles = (HIDDEN_ROOT);
+ Files = (gid_File_Extra_Urldesktop_Draw,gid_File_Extra_Urlnew_Draw,gid_File_Extra_Urlstart_Draw,gid_File_Extra_Urltasks_Draw,gid_File_Share_Config_Sofficecfg_Draw_Menubar_Xml,
++ gid_File_Filter_Sdfilt,
++ gid_File_Lib_Sd,
++ gid_File_Lib_Sdd,
++ gid_File_Lib_Sdui,
++ gid_File_Filter_Sdfilt,
+ gid_File_Share_Registry_Draw_Xcd,
+ gid_File_Tmp_Userinstall_Draw_Inf);
+ End
+diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp
+index 88a2926..beaaf0ab 100644
+--- a/scp2/source/gnome/module_gnome.scp
++++ b/scp2/source/gnome/module_gnome.scp
+@@ -62,7 +62,7 @@ Module gid_Module_Optional_Gnome
+ gid_File_Lib_Gconfbe
+ #endif
+ #if (defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO
+- gid_File_Share_Registry_Gnome_Xcd
++ ,gid_File_Share_Registry_Gnome_Xcd
+ #endif
+ );
+ End
+diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp
+index e3313c8..3f5e257 100644
+--- a/scp2/source/impress/module_impress.scp
++++ b/scp2/source/impress/module_impress.scp
+@@ -43,6 +43,7 @@ Module gid_Module_Prg_Impress_Bin
+ Default = YES;
+ Styles = (HIDDEN_ROOT);
+ Files = (gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress,gid_File_Lib_Placeware,
++ gid_File_Lib_Slideshow,
+ gid_File_Share_Registry_Impress_Xcd,
+ gid_File_Lib_Animcore,gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml, gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml,
+ gid_File_Tmp_Userinstall_Impress_Inf);
+diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp
+index 55180c5..742cb6e 100644
+--- a/scp2/source/kde/module_kde.scp
++++ b/scp2/source/kde/module_kde.scp
+@@ -35,15 +35,25 @@ Module gid_Module_Optional_Kde
+ MOD_NAME_DESC(MODULE_OPTIONAL_KDE);
+ Styles = (DONTSHOWINUSERINSTALL);
+ Files = (
++ gid_File_Bin_Kde_Open_Url
+ #ifdef ENABLE_KDE
+- gid_File_Lib_Kdebe
++ gid_File_Lib_Kdebe,
++ gid_File_Lib_Vclplug_Kde
++ gid_File_Lib_Fps_Kde
+ #ifdef ENABLE_KDE4
+ ,
+ #endif // ENABLE_KDE4
+ #endif // ENABLE_KDE
+ #ifdef ENABLE_KDE4
+- gid_File_Lib_Kde4be
++ gid_File_Lib_Kde4be,
++ gid_File_Lib_Vclplug_Kde4,
++ gid_File_Lib_Fps_Kde4
+ #endif // ENABLE_KDE4
++#ifdef ENABLE_KAB
++ ,
++ gid_File_Lib_Kab_1,
++ gid_File_Lib_Kab_Drv_1
++#endif
+ );
+ End
+ #endif
+diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
+index 024ec68..a46e972 100644
+--- a/scp2/source/ooo/module_hidden_ooo.scp
++++ b/scp2/source/ooo/module_hidden_ooo.scp
+@@ -83,7 +83,6 @@ Module gid_Module_Root_Files_2
+ Default = YES;
+ Styles = (HIDDEN_ROOT);
+ Files = (gid_File_Bin_Cde_Open_Url,
+- gid_File_Bin_Kde_Open_Url,
+ gid_File_Bin_Open_Url,
+ gid_File_Bin_Pagein,
+ gid_File_Bin_Pluginapp,
+@@ -177,7 +176,6 @@ Module gid_Module_Root_Files_4
+ Styles = (HIDDEN_ROOT);
+ Files = (gid_File_Dat_Root4,
+ gid_File_Filter_Eme,
+- gid_File_Filter_Sdfilt,
+ gid_File_Filter_Icg,
+ gid_File_Filter_Egi,
+ gid_File_Filter_Epb,
+@@ -208,9 +206,6 @@ Module gid_Module_Root_Files_4
+ gid_File_Lib_Cui,
+ gid_File_Lib_Sdbt,
+ gid_File_Lib_Dbmm,
+- gid_File_Lib_Dba,
+- gid_File_Lib_Dbase2,
+- gid_File_Lib_Dbaxml,
+ gid_File_Lib_Dbt,
+ gid_File_Lib_Dbfile,
+ gid_File_Lib_Drawinglayer,
+@@ -240,9 +235,6 @@ Module gid_Module_Root_Files_4
+ gid_File_Lib_Sax,
+ gid_File_Lib_Sb,
+ gid_File_Lib_Scn,
+- gid_File_Lib_Sd,
+- gid_File_Lib_Sdd,
+- gid_File_Lib_Sdui,
+ gid_File_Lib_Sfx,
+ gid_File_Lib_Sot,
+ gid_File_Lib_Spa,
+@@ -277,8 +269,6 @@ Module gid_Module_Root_Files_4
+ gid_File_Lib_Odfflatxml,
+ gid_File_Lib_Zip,
+ gid_File_Lib_Vclplug_Gen,
+- gid_File_Lib_Vclplug_Kde,
+- gid_File_Lib_Vclplug_Kde4,
+ gid_File_Lib_Vclplug_Svp,
+ gid_File_Lib_Basctl,
+ gid_File_Lib_CanvasTools,
+@@ -355,7 +345,6 @@ Module gid_Module_Root_Files_5
+ gid_File_Lib_Evtatt,
+ gid_File_Lib_Fileacc,
+ gid_File_Lib_Filterconfig1,
+- gid_File_Lib_Dbodbcbase,
+ gid_File_Lib_I18npool,
+ gid_File_Lib_I18npaper,
+ gid_File_Lib_I18nregexp,
+@@ -385,7 +374,6 @@ Module gid_Module_Root_Files_5
+ gid_File_Lib_DeploymentGui,
+ gid_File_Lib_Expwrap_Uno,
+ gid_File_Lib_Fastsax_Uno,
+- gid_File_Lib_Slideshow,
+ gid_File_Lib_Recentfile,
+ gid_File_Lib_Scriptframe,
+ gid_File_Lib_Sdbc_2,
+diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp
+index e66214b..44107d8 100644
+--- a/scp2/source/writer/module_writer.scp
++++ b/scp2/source/writer/module_writer.scp
+@@ -60,6 +60,8 @@ Module gid_Module_Prg_Wrt_Bin
+ gid_File_Jar_Mail,
+ gid_File_Jar_Activation,
+ gid_File_Share_Registry_Writer_Xcd,
++ gid_File_Lib_Sw,
++ gid_File_Lib_Vbaswobj,
+ gid_File_Tmp_Userinstall_Wrt_Inf);
+ End
+
diff --git a/patches/series b/patches/series
index 1fe7e74..7e72be5 100644
--- a/patches/series
+++ b/patches/series
@@ -23,3 +23,4 @@ jdbc-driver-classpaths.diff
mysqlcppconn-mysqlclient-SONAME.diff
make-pyuno-work-with-system-wide-module-install.diff
search-usr-share-for-images.diff
+make-package-modules-not-suck.diff
diff --git a/rules b/rules
index 3c4a23e..cd201a9 100755
--- a/rules
+++ b/rules
@@ -1755,10 +1755,6 @@ ifeq "$(BUILD_GTK)" "y"
mkdir -p -m755 $(PKGDIR)-gnome/$(OODIR)/share/xdg
mv $(PKGDIR)-common/$(OODIR)/share/xdg/qstart.desktop \
$(PKGDIR)-gnome/$(OODIR)/share/xdg
- # gnome config stuff, should land in gnome upstream even but...
- mkdir -p $(PKGDIR)-gnome/$(OODIR)/share/registry
- mv $(PKGDIR)-common/$(OODIR)/share/registry/gnome.xcd \
- $(PKGDIR)-gnome/$(OODIR)/share/registry
endif
ifeq "$(PACKAGE_SDK)" "y"
@@ -1981,12 +1977,6 @@ endif
done
ifeq "$(BUILD_KDE)" "y"
- mkdir -p -m755 $(PKGDIR)-kde/$(OODIR)/program
- mkdir -p -m755 $(PKGDIR)-kde/$(OODIR)/program
- for f in fps_kde*.uno.so libvclplug_kde*.so; do \
- mv $(PKGDIR)-core/$(OODIR)/program/$$f $(PKGDIR)-kde/$(OODIR)/program || exit 1 ;\
- done
-
# install files for KDEs "create new" ...
mkdir -p $(PKGDIR)-kde/usr/share/templates/.source
for i in $(SOURCE_TREE)/extras/source/shellnew/*; do \
@@ -2013,11 +2003,6 @@ ifeq "$(BUILD_KDE)" "y"
| sed -e "s/@TYPE@/drawing/" \
> $(PKGDIR)-kde/usr/share/templates/soffice.odg.desktop
endif
-ifeq "$(ENABLE_KDEAB)" "y"
- rm -rf $(PKGDIR)-kab
- mkdir -p -m755 $(PKGDIR)-kab/$(OODIR)/program
- mv $(PKGDIR)-core/$(OODIR)/program/libkab*so $(PKGDIR)-kab/$(OODIR)/program || exit 1
-endif
# split out gtk stuff
rm -rf $(PKGDIR)-gtk
@@ -2038,7 +2023,7 @@ ifeq "$(BUILD_GTK)" "y"
$(PKGDIR)-gnome/$(OODIR)/program/
endif
ifeq "$(ENABLE_GCONF)" "y"
- mv $(PKGDIR)-core/$(OODIR)/program/gconfbe* \
+ mv $(PKGDIR)-gtk/$(OODIR)/program/gconfbe* \
$(PKGDIR)-gnome/$(OODIR)/program
endif
endif
@@ -2062,46 +2047,6 @@ ifeq "$(PACKAGE_NPSOPLUGIN)" "y"
usr/lib/mozilla/plugins/libnpsoplugin.so
endif
- # OOo's package split sucks...
- mv $(PKGDIR)-core/$(OODIR)/program/libsw* \
- $(PKGDIR)-writer/$(OODIR)/program
- mv $(PKGDIR)-core/$(OODIR)/program/libsdlo* \
- $(PKGDIR)-core/$(OODIR)/program/libsdd* \
- $(PKGDIR)-core/$(OODIR)/program/libsdui* \
- $(PKGDIR)-core/$(OODIR)/program/libsdfilt* \
- $(PKGDIR)-draw/$(OODIR)/program
- mv $(PKGDIR)-core/$(OODIR)/program/slideshow.uno.so \
- $(PKGDIR)-impress/$(OODIR)/program
- mv $(PKGDIR)-core/$(OODIR)/program/libdba* \
- $(PKGDIR)-base/$(OODIR)/program
- # except for libdba680l?.so itself
- rm -rf $(PKGDIR)-base-core
- mkdir -p $(PKGDIR)-base-core/$(OODIR)/program
- mv $(PKGDIR)-base/$(OODIR)/program/libdbalo.so \
- $(PKGDIR)-base-core/$(OODIR)/program
- for i in odbcbase dbpool2 odbc sdbc2 mysql; do \
- mv $(PKGDIR)-core/$(OODIR)/program/lib$$i* \
- $(PKGDIR)-base/$(OODIR)/program; \
- done
-ifeq "$(ENABLE_JAVA)" "y"
- for i in jdbc hsqldb; do \
- mv $(PKGDIR)-core/$(OODIR)/program/lib$$i* \
- $(PKGDIR)-base/$(OODIR)/program; \
- done
-endif
- mv $(PKGDIR)-core/$(OODIR)/program/libflat*so \
- $(PKGDIR)-base/$(OODIR)/program
- # http://www.openoffice.org/issues/show_bug.cgi?id=107779
- mv $(PKGDIR)-calc/$(OODIR)/program/libcalc*so \
- $(PKGDIR)-base/$(OODIR)/program; \
-
- # linked (amongst others) to libsc*
- mv $(PKGDIR)-core/$(OODIR)/program/vbaobj*uno.so \
- $(PKGDIR)-calc/$(OODIR)/program
- # linked (amongst others) to libsw*
- mv $(PKGDIR)-core/$(OODIR)/program/vbaswobj*uno.so \
- $(PKGDIR)-writer/$(OODIR)/program
-
ifeq "$(ENABLE_JAVA)" "y"
ifneq (,$(filter hsqldb, $(SYSTEM_STUFF)))
# link to system hsqldb
--
LibreOffice packaging repository
Reply to: