CVS:oo-deb/debian README,1.27,1.28 changelog,1.207,1.208 rules,1.138,1.139 setperms,1.5,1.6 doogie-build-system,1.2,NONE

[Chris Halls <halls@gluck.debian.org>]

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

Modified Files:
	README changelog rules setperms 
Removed Files:
	doogie-build-system 
Log Message:
  * debian/README:
    - remove documentation for downloadpatch and rsyncpatch targets [JT]
  * debian/rules:
    - removed obsolete dbs targets from stampdir_targets [JT]
    - removed downloadpatch and rsyncpatch targets, which depend on obsolete
      debian/patches directory [JT]
  * debian/setperms:
    - remove chmod of obsolete dbs packaging scripts [JT]
  * Removed obsolete dbs packaging scripts [JT]:
    - debian/doogie-build-system
    - debian/scripts/fix.source.patch
    - debian/scripts/getglibcversion
    - debian/scripts/lib
    - debian/scripts/patch.apply
    - debian/scripts/patch.unapply
    - debian/scripts/source.patch
    - debian/scripts/source.unpack
    - debian/scripts/unfix.source.patch


Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -d -r1.207 -r1.208
--- changelog	9 Oct 2003 15:17:24 -0000	1.207
+++ changelog	10 Oct 2003 04:05:00 -0000	1.208
@@ -63,6 +63,7 @@
     - remove instructions about prebuilt mozilla files needed because we
       now build without on those platforms [CH]
     - remove obsolete information old patch system [CH]
+    - remove documentation for downloadpatch and rsyncpatch targets [JT]
   * debian/rules:
     - ignore python-core for the MANIFEST check [RE]
     - Fix Gnome desktop Exec= line, thanks to MK for spotting the problem
@@ -79,15 +80,19 @@
         of CONFIGURE_FLAGS [JT]
       - move installation of files only built with a JDK into debian/rules
         surrounded by a conditional [JT]
-      - removed (commented out) distcc section; you can use CCACHE_PREFIX or
-        distcc's masquerading instead without needing special support [CH]
-      - reorganise the build targets that are run before configure so backups
-        are only made once, and it is possible to repatch without converting
-        all the icons again [CH]
+    - removed (commented out) distcc section; you can use CCACHE_PREFIX or
+      distcc's masquerading instead without needing special support [CH]
+    - reorganise the build targets that are run before configure so backups
+      are only made once, and it is possible to repatch without converting
+      all the icons again [CH]
+    - removed obsolete dbs targets from stampdir_targets [JT]
+    - removed downloadpatch and rsyncpatch targets, which depend on obsolete
+      debian/patches directory [JT]
   * debian/scripts/detect_java.sh:
     - removed [JT]
   * debian/setperms:
     - remove chmod of scripts/detect_java.sh [JT]
+    - remove chmod of obsolete dbs packaging scripts [JT]
   * debian/control*:
     - add zlib1g-dev to Build-Depends: [RE]
     - Bump virtual l10n package to 1.1.0.final; openoffice.org conflicts
@@ -97,6 +102,16 @@
     - Build-Depend on xsltproc [JT]
     - Move from contrib to main [JT]
   * Use Ximian icons version 1.1-4 [CH]
+  * Removed obsolete dbs packaging scripts [JT]:
+    - debian/doogie-build-system
+    - debian/scripts/fix.source.patch
+    - debian/scripts/getglibcversion
+    - debian/scripts/lib
+    - debian/scripts/patch.apply
+    - debian/scripts/patch.unapply
+    - debian/scripts/source.patch
+    - debian/scripts/source.unpack
+    - debian/scripts/unfix.source.patch
 
  -- Chris Halls <halls@debian.org>  Thu,  9 Oct 2003 16:32:46 +0200
 

Index: setperms
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/setperms,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- setperms	8 Oct 2003 14:20:19 -0000	1.5
+++ setperms	10 Oct 2003 04:05:00 -0000	1.6
@@ -4,15 +4,7 @@
 
 cd debian
 
-for FILE in doogie-build-system \
-            scripts/fix.source.patch \
-            scripts/getglibcversion \
-            scripts/patch.apply \
-            scripts/patch.unapply \
-            scripts/source.patch \
-            scripts/source.unpack \
-            scripts/unfix.source.patch \
-            scripts/vars* \
+for FILE in scripts/vars* \
 	    scripts/installoverrides \
 	    scripts/xcftobmp \
 	    local/scripts/oo-xvfb-run \

Index: README
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/README,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- README	9 Oct 2003 15:17:24 -0000	1.27
+++ README	10 Oct 2003 04:05:00 -0000	1.28
@@ -1,8 +1,6 @@
 Openoffice build system
 -----------------------
 
-This package was adapted from the XFree86 build system.  It uses an adapted dbs.
-
 Building the packages from source
 =================================
 Overview:
@@ -70,11 +68,6 @@
 
 - targets run during the package build -
 
-source.unpack - (dbs) Unpack OpenOffice sources from upstream/archives into build-tree
-
-source.make   - (dbs) Apply patches from debian/patches directory.
-  	        (why is there source.patch and patchapply?? TODO: fix this)
-
 build.prepare - Applies any workarounds/modifications needed to the build tree
 		once the source is unpacked.  Currently: create a fake
 		libstlport tree, fix some file permissions.
@@ -149,19 +142,11 @@
 		     the project:
 		       debian/rules buildprj PRJ=tools
 
-downloadpatch      - During the runup to a release, Chris is generating patches
-                     that patch the current source to the next release from CVS.  
-		     This target downloads the files and unpacks them to the
-		     patches directory.  You can run this target as often as
-		     you like.  If you have a Debian developer account, use the
-		     'rsyncpatch' target instead, which uses rsync over ssh to
-		     save bandwidth.
-
 Build system file layout
 ========================
 scripts:
-  Directory containing the internals of Doogie's Build System.  If any
-  architecture-specific make variables need to be declared, you may do so
+  Directory containing various build-related scripts.  If any
+  architecture-specific make variables need to be declared, you may do so in
   debian/scripts/vars.$(ARCH).
 
 local:

--- doogie-build-system DELETED ---

Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- rules	9 Oct 2003 16:19:48 -0000	1.138
+++ rules	10 Oct 2003 04:05:00 -0000	1.139
@@ -219,9 +219,6 @@
 stampdir_targets=build.prepare configure bootstrap solver instsetoo
 stampdir_targets+=setupins setup install-arch install-indep manifest
 stampdir_targets+=langpacks binary-common binary-arch binary-indep
-stampdir_targets+=source.make patchapply
-stampdir_targets+=source.build source.unpack fix.source.patch source.patch
-stampdir_targets+=unfix.source.patch
 ifdef FORCE
  DUMMY:=$(shell rm -f $(patsubst %,$(STAMP_DIR)/%,$(filter $(stampdir_targets),$(MAKECMDGOALS))))
 endif
@@ -1010,32 +1007,6 @@
 	wget -O $(TOOLS_DIR)/src/$(OOO_ICONS_VER).tar.gz http://ooo.ximian.com/packages/$(OOO_ICONS_VER).tar.gz
 	uuencode $(TOOLS_DIR)/src/$(OOO_ICONS_VER).tar.gz $(OOO_ICONS_VER).tar.gz > $(TOOLS_DIR)/src/$(OOO_ICONS_VER).tar.gz.uu
 
-# Get latest patch files from Chris' repository
-PATCHNAME=000_prerc3_stolen_from_ooo11rc3
-PATCHDIR=openoffice/1.1rc3
-PATCHURL=http://people.debian.org/~halls/$(PATCHDIR)
-
-downloadpatch:
-	# we don't want to change the patches if already applied (hint: debian/scripts/patch.unapply)
-	test ! -f $(STAMP_DIR)/patches/$(PATCHNAME).diff 
-	test ! -f $(STAMP_DIR)/patches/$(PATCHNAME)-binaries.diff.uu 
-
-	wget -O - $(PATCHURL)/$(PATCHNAME).diff.bz2 | bunzip2 -c > debian/patches/$(PATCHNAME).diff
-	wget -O - $(PATCHURL)/$(PATCHNAME)-binaries.diff.uu.bz2 | bunzip2 -c \
-	  > debian/patches/$(PATCHNAME)-binaries.diff.uu
-
-# If you are a Debian developer, you can save some bandwidth by using rsync instead of wget:
-rsyncpatch:
-	# we don't want to change the patches if already applied (hint: debian/scripts/patch.unapply)
-	test ! -f $(STAMP_DIR)/patches/$(PATCHNAME).diff 
-	test ! -f $(STAMP_DIR)/patches/$(PATCHNAME)-binaries.diff.uu 
-
-	rsync -vL -e ssh \
-	   gluck.debian.org:/home/halls/public_html/$(PATCHDIR)/$(PATCHNAME).diff \
-	   debian/patches
-	wget -O - $(PATCHURL)/$(PATCHNAME)-binaries.diff.uu.bz2 | bunzip2 -c \
-	  > debian/patches/$(PATCHNAME)-binaries.diff.uu
-
 # Take a tarfile of all the non-stripped binaries in solver, for generating backtraces
 # from coredumps.
 makebinariestar:
@@ -1045,7 +1016,7 @@
 
 # -------------------------------------------------------
 
-.PHONY: environment checksource control downloadpatch rsyncpatch makebinariestar
+.PHONY: environment checksource control makebinariestar
 .PHONY: clean-debdir clean-instsetoo clean-objectdirs clean default
 .PHONY: build build-indep build-arch
 .PHONY: $(stampdir_targets)