------------------------------------------------------------
revno: 1095
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2008-05-05 02:37:12 +0200
message:
fix Vcs-Svn:, make it a generated field
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2008-05-04 13:11:33 +0000
+++ b/changelog 2008-05-05 00:37:12 +0000
@@ -6,8 +6,10 @@
- update for new xulrunner 1.9 packaging using iceape-dev
* debian/copyright: fix "Obtained from", mention go-oo.org. Remove obsolete
section about odk/sdk_oo
+ * debian/control.in, debian/rules:
+ - fix Vcs-Svn:, make it a generated field
- -- Rene Engelhard <[EMAIL PROTECTED]> Sun, 04 May 2008 15:06:11 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 05 May 2008 02:35:36 +0200
openoffice.org (1:2.4.0-6) unstable; urgency=low
=== modified file 'control'
--- a/control 2008-04-30 21:04:52 +0000
+++ b/control 2008-05-05 00:37:12 +0000
@@ -8,7 +8,7 @@
Standards-Version: 3.7.2
XS-Python-Version: current
Vcs-Bzr:
http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/2.4/unstable
-Vcs-Svn: svn://svn.gnome.org/svn/ooo-build/trunk
+Vcs-Svn: svn://svn.gnome.org/svn/ooo-build/branches/ooo-build-2-4
Homepage: http://www.openoffice.org
Package: openoffice.org
=== modified file 'control.in'
--- a/control.in 2008-04-30 21:04:52 +0000
+++ b/control.in 2008-05-05 00:37:12 +0000
@@ -55,7 +55,7 @@
Standards-Version: 3.7.2
XS-Python-Version: current
Vcs-Bzr:
http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/2.4/unstable
-Vcs-Svn: svn://svn.gnome.org/svn/ooo-build/trunk
+Vcs-Svn: %OOO_BUILD_SVN%
Homepage: http://www.openoffice.org
Package: openoffice.orgVER
=== modified file 'rules'
--- a/rules 2008-05-03 22:18:43 +0000
+++ b/rules 2008-05-05 00:37:12 +0000
@@ -1233,6 +1233,14 @@
perl -pi -e "s,%OOO_OGLTRANS_ARCHS%,$(OOO_OGLTRANS_ARCHS),g"
debian/control
perl -pi -e "s,%OOO_BINFILTER_ARCHS%,$(OOO_BINFILTER_ARCHS),g"
debian/control
+ifeq "" "$(OOO_BUILD_BRANCH)"
+ perl -pi -e
"s,%OOO_BUILD_SVN%,svn://svn.gnome.org/svn/ooo-build/trunk," \
+ debian/control
+else
+ perl -pi -e
"s,%OOO_BUILD_SVN%,svn://svn.gnome.org/svn/ooo-build/branches/$(OOO_BUILD_BRANCH),"
\
+ debian/control
+endif
+
ifeq (he,$(findstring he,$(LANGPACKISOS)))
perl -pi -e 's/openoffice.org-help-he$$/openoffice.org-help-he,
openoffice.org-ctl-he/' debian/control
endif
