Merge branch 'maint'

mk/server.mk

@@ -38,6 +38,7 @@ ORGFULL := $(ORGFULL:%/=%/*)
 ORGELPA  = $(ORGCOMM) doc/dir doc/org doc/orgcard.pdf \
 		      etc/styles/ org-pkg.el
 ORGELPA := $(ORGELPA:%/=%/*)
+ORGELPAPLUS := $(ORGELPA:org-pkg%=orgplus-pkg%)
 
 release:	cleanall info pdf card rel-dirty tagwarn
 rel-dirty rel-up:	ORGDIR=org-$(GITVERSION:release_%=%)
@@ -77,11 +78,11 @@ elpaplus-dirty:
 	@$(MAKE) GITVERSION=$(GITVERSION:release_%=%)-elpaplus version autoloads
 	-@$(RM) $(ORGDIR) $(ORGTAR) $(ORGZIP)
 	ln -s . $(ORGDIR)
-	echo "(define-package \"org\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" $(PKG_REQ))" \
-	  > org-pkg.el
+	echo "(define-package \"orgplus\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" $(PKG_REQ))" \
+	  > orgplus-pkg.el
 	tar --exclude=Makefile --transform='s:\(lisp\|doc\)/::' -cf $(ORGDIR).tar \
-	  $(foreach dist, $(ORGELPA), $(ORGDIR)/$(dist))
-	-@$(RM) $(ORGDIR) org-pkg.el
+	  $(foreach dist, $(ORGELPAPLUS), $(ORGDIR)/$(dist))
+	-@$(RM) $(ORGDIR) orgplus-pkg.el
 	@$(MAKE) cleanlisp
 elpaplus-up:	info card elpaplus-dirty
 	$(CP) $(ORGDIR).tar $(SERVROOT)/pkg/daily/