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

./packages/openofficeorg/3.2/experimental r1745: merge



------------------------------------------------------------
revno: 1745 [merge]
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2009-12-18 02:05:08 +0100
message:
  merge
modified:
  changelog
  rules
=== modified file 'changelog'
--- a/changelog	2009-12-18 01:04:30 +0000
+++ b/changelog	2009-12-18 01:05:08 +0000
@@ -34,8 +34,11 @@
       wrong code generation fixes. Thanks Matthias Klose.
     - bump build-dep for mono to >= 2.4.2.3 and adapt for csc -> mono-csc
       change
+    - don't add LIBSUFFIX/PLATFORMID to the arch-indep packages' maintainer
+      scripts, as it will "only" be the system where the upload was built
+      on anyway, thanks Kurt Roeckx
 
- -- Rene Engelhard <rene@debian.org>  Wed, 16 Dec 2009 02:20:30 +0100
+ -- Rene Engelhard <rene@debian.org>  Fri, 18 Dec 2009 01:31:59 +0100
 
 openoffice.org (1:3.1.1-10) unstable; urgency=low
 

=== modified file 'rules'
--- a/rules	2009-12-18 01:04:30 +0000
+++ b/rules	2009-12-18 01:05:08 +0000
@@ -1570,7 +1570,6 @@
 	perl -pi -e "s,%OOO_NPSOPLUGIN_ARCHS%,$(OOO_NPSOPLUGIN_ARCHS),g" debian/control
 	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
-	perl -pi -e "s,%OOO_BUILD_SVN%,$(OOO_BUILD_SVN)," debian/control
 
 ifeq (he,$(findstring he,$(LANGPACKISOS)))
 	perl -pi -e 's/openoffice.org-help-he$$/openoffice.org-help-he, openoffice.org-ctl-he/' debian/control
@@ -2054,8 +2053,10 @@
 	    MAINTSCRIPT=debian/$$PKG.$$FILE ; \
 	    if [ -e $$MAINTSCRIPT.in ]; then \
 	      sed -n '1,/^#INCLUDE_SHELL_LIB#$$/p' < $$MAINTSCRIPT.in | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' > $$MAINTSCRIPT; \
-	      grep LIBSUFFIX debian/scripts/vars.$(ARCH) >> $$MAINTSCRIPT; \
-	      grep PLATFORMID debian/scripts/vars.$(ARCH) >> $$MAINTSCRIPT; \
+	      if echo $(ARCH_DEP_PACKAGES) | grep -q $$PKG; then \
+	        grep LIBSUFFIX debian/scripts/vars.$(ARCH) >> $$MAINTSCRIPT; \
+	        grep PLATFORMID debian/scripts/vars.$(ARCH) >> $$MAINTSCRIPT; \
+ 	      fi; \
 	      echo "" >> $$MAINTSCRIPT; \
 	      if grep -q conffile $$MAINTSCRIPT.in; then \
 		 cat debian/shell-lib-conffiles.sh >> $$MAINTSCRIPT; \


Reply to: