CVS:oo-deb/debian changelog,1.240,1.241 rules,1.167,1.168
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv24487
Modified Files:
changelog rules
Log Message:
* Releasing version 1.1.0-3, based on ooo-build 1.1.47
* Add a couple of package development helper targets:
+ upstreamclean: restore source tree back to a known state. removes all
sources (except debian and ooo-build) and unpacks the .orig.tar again
+ cvsupdate: updates debian and ooo-build from latest CVS
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -d -r1.240 -r1.241
--- changelog 17 Nov 2003 11:34:46 -0000 1.240
+++ changelog 17 Nov 2003 11:54:11 -0000 1.241
@@ -1,4 +1,4 @@
-openoffice.org (1.1.0-2.3pre2) unstable; urgency=low
+openoffice.org (1.1.0-3) unstable; urgency=low
* New patches:
+ solar-use-fork: use fork in tools/source/solar/solar.c to make it build
@@ -30,6 +30,7 @@
- Check KDEDIR and KDEHOME for settings, thanks to Nikita V.
Youshchenko (closes: #218914)
- Add gui-scale-ruler hack here too
+ * Packaging based on ooo-build 1.1.47 (tag OOO_BUILD_1_1_47)
* Use Ximian icons version 1.1-6 and update MANIFESTs [CH]
* debian/rules:
- Merge -gnome back into main packages and exclude msgbox-gnome
@@ -56,6 +57,10 @@
- Split 'solver' target into two passes. 'solver' only builds BUILDLANG;
'solver.langpacks' builds all languages. This speeds up the development
cycle and binary-only autobuilds. [CH]
+ - Add a couple of package development helper targets: [CH]
+ + upstreamclean: restore source tree back to a known state. removes all
+ sources (except debian and ooo-build) and unpacks the .orig.tar again
+ + cvsupdate: updates debian and ooo-build from latest CVS
* debian/control*:
- Build-Depends:
- libfontconfig1-dev | g++-3.0 to build without fontconfig on
@@ -79,7 +84,7 @@
is compatible with other backports that need a newer
libfreetype (X 4.3, Gnome 2 etc.) [CH]
- -- Chris Halls <halls@debian.org> Fri, 14 Nov 2003 10:53:19 +0100
+ -- Chris Halls <halls@debian.org> Mon, 17 Nov 2003 12:47:51 +0100
openoffice.org (1.1.0-2) unstable; urgency=low
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -d -r1.167 -r1.168
--- rules 17 Nov 2003 11:01:42 -0000 1.167
+++ rules 17 Nov 2003 11:54:11 -0000 1.168
@@ -36,6 +36,7 @@
# Get package version info.
SOURCE_VERSION:=$(shell head -1 debian/changelog | cut -d\( -f2 | cut -d\) -f1)
+UPSTREAM_VERSION:=$(shell echo "$(SOURCE_VERSION)"| cut -d- -f1)
# Determine our architecture.
ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -1040,6 +1041,7 @@
@echo '$$(DEB_HOST_ARCH)' is "$(DEB_HOST_ARCH)"
@echo '$$(CURDIR)' is "$(CURDIR)"
@echo '$$(SOURCE_VERSION)' is "$(SOURCE_VERSION)"
+ @echo '$$(UPSTREAM_VERSION)' is "$(UPSTREAM_VERSION)"
@echo '$$(JDK_HOME)' is "$(JDK_HOME)"
@echo '$$(_CC)' is "$(_CC)"
@echo '$$(CXX)' is "$(CXX)"
@@ -1065,6 +1067,29 @@
test -d $(OOO_BUILD)/src || mkdir $(OOO_BUILD)/src
wget -O $(OOO_BUILD)/src/$(OOO_ICONS_VER).tar.gz http://ooo.ximian.com/packages/$(OOO_ICONS_VER).tar.gz
uuencode $(OOO_BUILD)/src/$(OOO_ICONS_VER).tar.gz $(OOO_ICONS_VER).tar.gz > $(OOO_BUILD)/src/$(OOO_ICONS_VER).tar.gz.uu
+
+# Update debian and ooo-build directories from cvs
+cvsupdate:
+ cd debian && cvs -z3 -q update -dP
+ cd ooo-build && cvs -z3 -q update -dP
+
+# Clean all source except for debian and ooo-build directories
+# and re-unpack the source tarball. The parent direcory name
+# is preserved
+upstreamclean:
+ # Make sure the upstream source tarball is available
+ test -f ../openoffice.org_$(UPSTREAM_VERSION).orig.tar.gz
+
+ mkdir -p $(SOURCE_TREE)/tmp.source.unpack $(SOURCE_TREE)/tmp.oldsource
+ find $(SOURCE_TREE) -maxdepth 1 \
+ -not -name ooo-build -not -name debian -not -name $(SOURCE_TREE)\
+ -not -name tmp.source.unpack -not -name tmp.oldsource \
+ -exec mv {} $(SOURCE_TREE)/tmp.oldsource \;
+
+ rm -rf $(SOURCE_TREE)/tmp.oldsource
+ tar -C $(SOURCE_TREE)/tmp.source.unpack -zxf ../openoffice.org_$(UPSTREAM_VERSION).orig.tar.gz
+ mv $(SOURCE_TREE)/tmp.source.unpack/*/* $(SOURCE_TREE)
+ rm -r $(SOURCE_TREE)/tmp.source.unpack
# Take a tarfile of all the non-stripped binaries in solver, for generating backtraces
# from coredumps.
Reply to: