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

CVS:oo-deb/debian openoffice.org-evolution.install,NONE,1.1.2.1 changelog,1.362.2.22,1.362.2.23 control,1.186.2.12,1.186.2.13 control.in,1.153.2.10,1.153.2.11 rules,1.231.2.13,1.231.2.14 openoffice.org-evolution2.install,1.1.2.1,NONE

Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv3932

Modified Files:
      Tag: OPENOFFICE_ORG_1_1_3
	changelog control control.in rules 
Added Files:
      Tag: OPENOFFICE_ORG_1_1_3
	openoffice.org-evolution.install 
Removed Files:
      Tag: OPENOFFICE_ORG_1_1_3
	openoffice.org-evolution2.install 
Log Message:
- remove changes planned for 1.1.2-6 from the changelog
- rename -evolution2 to -evolution


Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.153.2.10
retrieving revision 1.153.2.11
diff -u -d -r1.153.2.10 -r1.153.2.11
--- control.in	20 Oct 2004 00:41:02 -0000	1.153.2.10
+++ control.in	21 Oct 2004 07:34:23 -0000	1.153.2.11
@@ -163,7 +163,7 @@
  You need to tell OOo where your JDK/JRE is located through running
  /usr/lib/openoffice/program/jvmconfig after installation.
 
-Package: openoffice.org-evolution2
+Package: openoffice.org-evolution
 Architecture: i386 powerpc s390 sparc
 Depends: ${shlibs:Depends}
 Recommends: evolution (>> 2.0)

Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.231.2.13
retrieving revision 1.231.2.14
diff -u -d -r1.231.2.13 -r1.231.2.14
--- rules	20 Oct 2004 00:48:30 -0000	1.231.2.13
+++ rules	21 Oct 2004 07:34:24 -0000	1.231.2.14
@@ -907,7 +907,7 @@
 $(STAMP_DIR)/install-arch: debian/openoffice.org$(VER)-gnomevfs.install
 $(STAMP_DIR)/install-arch: debian/openoffice.org$(VER)-kde.install
 $(STAMP_DIR)/install-arch: debian/openoffice.org$(VER)-dev.install
-$(STAMP_DIR)/install-arch: debian/openoffice.org$(VER)-evolution2.install
+$(STAMP_DIR)/install-arch: debian/openoffice.org$(VER)-evolution.install
 $(STAMP_DIR)/install-arch: $(STAMP_DIR)/manifest
 $(STAMP_DIR)/install-arch: $(STAMP_DIR)/extract-sdk
 	dh_testdir
@@ -917,7 +917,7 @@
 	# Remove package directories
 	rm -rf $(MAINPKGDIR)-bin $(MAINPKGDIR)-gtk-gnome $(MAINPKGDIR)-kde \
 	       $(MAINPKGDIR)-gnomevfs $(MAINPKGDIR)-java $(MAINPKGDIR)-dev \
-	       $(MAINPKGDIR)-evolution2
+	       $(MAINPKGDIR)-evolution
 	rm -f $(MAINPKGDIR)-bin.*.debhelper \
 	      $(MAINPKGDIR)-dev.*.debhelper \
 	      $(MAINPKGDIR)-gnomevfs.*.debhelper \
@@ -925,7 +925,7 @@
 	      $(MAINPKGDIR)-kde.*.debhelper \
 	      $(MAINPKGDIR)-java.*.debhelper \
 	      $(MAINPKGDIR)-dev.*.debhelper \
-	      $(MAINPKGDIR)-evolution2.*.debhelper
+	      $(MAINPKGDIR)-evolution.*.debhelper
 
 	dh_installdirs -a
 	sed -e s,@OS@,`dpkg-architecture -qDEB_HOST_GNU_SYSTEM`, \

--- NEW FILE: openoffice.org-evolution.install ---
usr/lib/openoffice/program/libevoab2.so

--- openoffice.org-evolution2.install DELETED ---

Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.362.2.22
retrieving revision 1.362.2.23
diff -u -d -r1.362.2.22 -r1.362.2.23
--- changelog	20 Oct 2004 00:41:02 -0000	1.362.2.22
+++ changelog	21 Oct 2004 07:34:23 -0000	1.362.2.23
@@ -2,7 +2,6 @@
 
   * New upstream release.
     - fixes KDE clipboard exchange (closes: #237232)
-    - encoding of ooo645calc.desktop is fixed (closes: #275968)
     - fixes import of .docs with FormControls (closes: #276669)
   * New major patches:
     - vfs-*: GNOME VFS Support [MM]
@@ -18,10 +17,6 @@
   * New minor patches:
     - print-do-not-change-document.diff: do not mark document modified
       when printing per default [PM] (closes: #271883)
-    - sysui-mimetypes.diff: add MimeType entries to the
-      .desktop files (closes: #272638) [RE]
-    - l10n-YTL.diff: backport tr_TR localedata patch from cws_srx645_trcurrency
-      to add YTL (.tr currency as of 2005-01-01) support; make it default [RE]
   * Removed patches:
     - disable-odk-build: We now build the odk but with a patch to skip
       the removed non-free documentation... [RE]
@@ -31,7 +26,7 @@
                                 OpenOffice.org
     - openoffice.org-gnomevfs: GNOME VFS support for OpenOffice.org
     - openoffice.org-dev: OpenOffice.org SDK - development files
-    - openoffice.org-evolution2: Evolution2 Adressbook support for
+    - openoffice.org-evolution: Evolution Adressbook support for
       OpenOffice.org
       (split out from the main package because this now needs
       evolution-data-server and gnome libs...)
@@ -47,7 +42,7 @@
     - add libstartup-notification0-dev to Build-Depends: [RE]
     - add openoffice.org-kde, openoffice-org-gtk-gnome,
       openoffice.org-gnomevfs, openoffice.org-dev and
-      openoffice.org-evolution2 [RE]
+      openoffice.org-evolution [RE]
     - tighten depends [RE]
     - increase openoffice.org-mimelnks Recommends: on kdelibs-data to
       >> 4:3.3.0 [RE]
@@ -56,7 +51,6 @@
     - openoffice.org Suggests: -gnomevfs, -kde | -gtk-gnome [RE]
     - change -mimelnk description to say that we ship additioal mimelnks
       to those in kdelibs-data [RE]
-    - remove Jan-Hendrik Palic from Uploaders: [RE]
     - add libebook-dev to Build-Depends: [RE]
   * debian/rules:
     - use ooo-build-1-3 branch of ooo-build [RE]
@@ -93,10 +87,8 @@
   * debian/openoffice.org-gtk-gnome.install, openoffice.org-kde.install,
     debian/openoffice.org-gnomevfs.install: add [RE]
   * debian/openoffice.org-dev.install: add [RE]
-  * debian/openoffice.org-evolution2.install: add [RE]
+  * debian/openoffice.org-evolution.install: add [RE]
   * debian/openoffice.org-dev.links.in: add [RE]
-  * debian/java-lib.sh: use ${LIBSUFFIX} instead of hardcoded li to
-    make it work on !i386 [RE]
   * debian/gnomevfs-lib.sh: add [RE]
   * debian/openoffice.org-bin.templates.master: rename to .templates [RE]
 

Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.186.2.12
retrieving revision 1.186.2.13
diff -u -d -r1.186.2.12 -r1.186.2.13
--- control	20 Oct 2004 00:41:02 -0000	1.186.2.12
+++ control	21 Oct 2004 07:34:23 -0000	1.186.2.13
@@ -163,7 +163,7 @@
  You need to tell OOo where your JDK/JRE is located through running
  /usr/lib/openoffice/program/jvmconfig after installation.
 
-Package: openoffice.org-evolution2
+Package: openoffice.org-evolution
 Architecture: i386 powerpc s390 sparc
 Depends: ${shlibs:Depends}
 Recommends: evolution (>> 2.0)
Reply to: