CVS:oo-deb/debian changelog,1.338.2.6,1.338.2.7 rules,1.214.2.8,1.214.2.9

[Rene Engelhard <rene@gluck.debian.org>]

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

Modified Files:
      Tag: OPENOFFICE_ORG_1_1_2
	changelog rules 
Log Message:
use orig.tar.gz made from 1.1.2 tarball: http://people.debian.org/~rene/openoffice.org/openoffice.org_1.1.2.orig.tar.gz

Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.338.2.6
retrieving revision 1.338.2.7
diff -u -d -r1.338.2.6 -r1.338.2.7
--- changelog	16 Jun 2004 15:50:25 -0000	1.338.2.6
+++ changelog	18 Jun 2004 07:29:16 -0000	1.338.2.7
@@ -1,6 +1,6 @@
-openoffice.org (1.1.1+1.1.2cvs20040609-0.1pre) experimental; urgency=low
+openoffice.org (1.1.2-0.1pre) experimental; urgency=low
 
-  * CVS co of SRX645_m44 as of 2004-06-09 -> 1.1.2rc3
+  * New upstream release.
     - closes: #216973: openoffice spews lpc errors on startup
   * New packages:
     - openoffice.org-java.  This package is not built by default

Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.214.2.8
retrieving revision 1.214.2.9
diff -u -d -r1.214.2.8 -r1.214.2.9
--- rules	16 Jun 2004 18:19:30 -0000	1.214.2.8
+++ rules	18 Jun 2004 07:29:16 -0000	1.214.2.9
@@ -1120,9 +1120,9 @@
 	dh_gencontrol -- \
 		-V'debconf-depends=debconf (>= $(MINDEBCONFVER)) | debconf-2.0' \
 		-V'python-depends=$(PYTHON_DEPENDS)' \
-		-V'java-additional-depends=$(JAVA_ADDITIONAL_DEPENDS)' \
-		-v1.1.1+1.1.2rc3-`dpkg-parsechangelog  | grep urgency \
-		| awk '{print $$2}' | sed -e s/"("// -e s/")"// | cut -d"-" -f2`
+		-V'java-additional-depends=$(JAVA_ADDITIONAL_DEPENDS)'
+#		-v1.1.1+1.1.2rc3-`dpkg-parsechangelog  | grep urgency \
+#		| awk '{print $$2}' | sed -e s/"("// -e s/")"// | cut -d"-" -f2`
 	dh_md5sums
 	dh_builddeb