From 950789d26afe6b64995ba8f62cbce4f6a79511be Mon Sep 17 00:00:00 2001 From: Achim Gratz Date: Sat, 15 Sep 2012 19:52:18 +0200 Subject: [PATCH 1/2] mk/server.mk: orgplus must be the package name for package manager to recognize it * mk/server.mk: Rename org-pkg.el to orgplus-pkg.el, rename the package to orgplus also. The package manager will otherwise not recognize the package. This means we will need to educate users not to install both packages at the same time or try to introduce this dependency in a different way. --- mk/server.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mk/server.mk b/mk/server.mk index e4dc2ae7d..301c5022e 100644 --- a/mk/server.mk +++ b/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_%=%) @@ -61,11 +62,11 @@ elpa-dirty: @$(MAKE) GITVERSION=$(GITVERSION:release_%=%)-elpa 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 elpa-up: info card elpa-dirty $(CP) $(ORGDIR).tar $(SERVROOT)/pkg/daily/ From f1f1fc8d48171659be7130453596ae7567ab874d Mon Sep 17 00:00:00 2001 From: Achim Gratz Date: Sat, 15 Sep 2012 20:06:53 +0200 Subject: [PATCH 2/2] mk/server.mk: fix previous commit --- mk/server.mk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mk/server.mk b/mk/server.mk index 301c5022e..a2d49f40c 100644 --- a/mk/server.mk +++ b/mk/server.mk @@ -62,11 +62,11 @@ elpa-dirty: @$(MAKE) GITVERSION=$(GITVERSION:release_%=%)-elpa version autoloads -@$(RM) $(ORGDIR) $(ORGTAR) $(ORGZIP) ln -s . $(ORGDIR) - echo "(define-package \"orgplus\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" $(PKG_REQ))" \ - > orgplus-pkg.el + echo "(define-package \"org\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" $(PKG_REQ))" \ + > org-pkg.el tar --exclude=Makefile --transform='s:\(lisp\|doc\)/::' -cf $(ORGDIR).tar \ - $(foreach dist, $(ORGELPAPLUS), $(ORGDIR)/$(dist)) - -@$(RM) $(ORGDIR) orgplus-pkg.el + $(foreach dist, $(ORGELPA), $(ORGDIR)/$(dist)) + -@$(RM) $(ORGDIR) org-pkg.el elpa-up: info card elpa-dirty $(CP) $(ORGDIR).tar $(SERVROOT)/pkg/daily/ @@ -78,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/