summaryrefslogtreecommitdiff
path: root/sysui/desktop/solaris
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-03-20 09:11:01 +0000
committerOliver Bolte <obo@openoffice.org>2009-03-20 09:11:01 +0000
commit598680d51c357c9fb7a05d4e197dd8e50f12c924 (patch)
treed1f3eb5af2f6558b5993e4684522e74f00a5a8bf /sysui/desktop/solaris
parent7bc5a3ac0094627e85c12aa4523e9d5ad424b688 (diff)
CWS-TOOLING: integrate CWS native238
2009-03-19 10:48:03 +0100 is r269730 : #i100258# copyright for system integration packages 2009-03-18 14:44:04 +0100 is r269669 : #i100258# license also into system integration packages 2009-03-18 14:23:56 +0100 ihi r269664 : removed debug stuff 2009-03-18 13:24:17 +0100 ihi r269655 : #i100305# 30 -> 3 2009-03-17 17:06:59 +0100 is r269619 : #i100258# license files into solaris packages 2009-03-17 16:25:39 +0100 is r269616 : #i100258# license file into solaris packages
Diffstat (limited to 'sysui/desktop/solaris')
-rw-r--r--sysui/desktop/solaris/copyright2
-rw-r--r--sysui/desktop/solaris/makefile.mk6
-rw-r--r--sysui/desktop/solaris/pkginfo2
3 files changed, 5 insertions, 5 deletions
diff --git a/sysui/desktop/solaris/copyright b/sysui/desktop/solaris/copyright
index 4c8823c969..2ebebd6ed8 100644
--- a/sysui/desktop/solaris/copyright
+++ b/sysui/desktop/solaris/copyright
@@ -1,2 +1,2 @@
-Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+Copyright 2009 Sun Microsystems, Inc. All rights reserved.
Use is subject to license terms.
diff --git a/sysui/desktop/solaris/makefile.mk b/sysui/desktop/solaris/makefile.mk
index 4275456195..9a2c606f62 100644
--- a/sysui/desktop/solaris/makefile.mk
+++ b/sysui/desktop/solaris/makefile.mk
@@ -125,8 +125,8 @@ $(PKGFILES) : $(MISC)$/{$(PRODUCTLIST)}$/prototype
@-$(RM) $(BIN)$/$(@:f)
@$(MKDIRHIER) $(@:d)
pkgmk -l 1073741824 -r . -f $(MISC)$/$(@:b:b:s/-/ /:1)$/prototype -o -d $(PKGDIR) ARCH=$(PKGARCH) VERSION=$(PKGVERSION.$(@:b:s/-/ /:1)),REV=$(PKGREV).$(PKGDATESTRING)
- $(FASPAC) $(SOLARBINDIR)/faspac-so.sh -a -d $(PKGDIR) $(@:b:b:s/-/ /:1:s/.//)30-desktop-int
- @tar -cf - -C $(PKGDIR) $(@:b:b:s/-/ /:1:s/.//)30-desktop-int | gzip > $@
- @rm -rf $(PKGDIR)/$(@:b:b:s/-/ /:1:s/.//)-desktop-int30
+ $(FASPAC) $(SOLARBINDIR)/faspac-so.sh -a -d $(PKGDIR) $(@:b:b:s/-/ /:1:s/.//)$(PRODUCTVERSIONSHORT)-desktop-int
+ @tar -cf - -C $(PKGDIR) $(@:b:b:s/-/ /:1:s/.//)$(PRODUCTVERSIONSHORT)-desktop-int | gzip > $@
+ @rm -rf $(PKGDIR)/$(@:b:b:s/-/ /:1:s/.//)$(PRODUCTVERSIONSHORT)-desktop-int
.ENDIF
diff --git a/sysui/desktop/solaris/pkginfo b/sysui/desktop/solaris/pkginfo
index 448096b1c2..8fbf60ec81 100644
--- a/sysui/desktop/solaris/pkginfo
+++ b/sysui/desktop/solaris/pkginfo
@@ -1,4 +1,4 @@
-PKG=%pkgprefix30-desktop-int
+PKG=%pkgprefix3-desktop-int
NAME=%PRODUCTNAME Solaris desktop integration
CATEGORY=application
BASEDIR=/