From 5618dd98dcdd0909b180349571c5a20a25f1a0e5 Mon Sep 17 00:00:00 2001
From: "Michael W. Olson" <mwolson@gnu.org>
Date: Wed, 16 Apr 2008 20:59:19 -0700
Subject: [PATCH] Remove Debian stuff from Makefile system.

---
 ChangeLog             |  7 +++++++
 Makefile              | 36 ++----------------------------------
 Makefile.defs.default |  4 ----
 3 files changed, 9 insertions(+), 38 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c1506f2..05ebc51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2008-04-16  Michael Olson  <mwolson@gnu.org>
 
+	* Makefile (distclean): Don't bother removing debian files.
+	(debclean, debprepare, debbuild, debinstall, deb): Remove obsolete
+	targets.
+
+	* Makefile.defs.default (DEBNAME, LASTUPLOAD, BUILDOPTS)
+	(DISTRIBUTOR): Remove obsolete variables.
+
 	* planner.el (planner-annotation-from-wiki): Use "::" instead of
 	"#" as the project/page delimiter.
 
diff --git a/Makefile b/Makefile
index 94c898c..42c03da 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
 .PHONY: all autoloads lisp doc clean realclean distclean fullclean install
-.PHONY: test dist release debclean debprepare debbuild debinstall deb upload
-.PHONY: elpa info-only
+.PHONY: test dist release upload elpa info-only
 .PRECIOUS: %.elc
 
 DEFS = $(shell test -f Makefile.defs && echo Makefile.defs \
@@ -57,7 +56,7 @@ test: $(ELC)
 		-f $(PROJECT)-elint-files $(EL)
 
 distclean:
-	-rm -f $(MANUAL).info $(MANUAL).html debian/dirs debian/files
+	-rm -f $(MANUAL).info $(MANUAL).html
 	-rm -fr ../$(PROJECT)-$(VERSION)
 
 dist: autoloads distclean
@@ -74,37 +73,6 @@ release: dist
 	  gpg --detach $(PROJECT)-$(VERSION).tar.gz && \
 	  gpg --detach $(PROJECT)-$(VERSION).zip)
 
-debclean:
-	-rm -f ../../dist/$(DISTRIBUTOR)/$(DEBNAME)_*
-	-rm -fr ../$(DEBNAME)_$(VERSION)*
-
-debprepare:
-	-rm -rf ../$(DEBNAME)-$(VERSION)
-	(cd .. && tar -xzf $(PROJECT)-$(VERSION).tar.gz)
-	mv ../$(PROJECT)-$(VERSION) ../$(DEBNAME)-$(VERSION)
-	(cd .. && tar -czf $(DEBNAME)_$(VERSION).orig.tar.gz \
-	    $(DEBNAME)-$(VERSION))
-	(cd debian && git archive --format=tar \
-	  --prefix=$(DEBNAME)-$(VERSION)/debian/ HEAD | \
-	  (cd ../.. && tar xf -))
-
-debbuild:
-	(cd ../$(DEBNAME)-$(VERSION) && \
-	  dpkg-buildpackage -v$(LASTUPLOAD) $(BUILDOPTS) \
-	    -us -uc -rfakeroot && \
-	  echo "Running lintian ..." && \
-	  lintian -i ../$(DEBNAME)_$(VERSION)*.deb || : && \
-	  echo "Done running lintian." && \
-	  echo "Running linda ..." && \
-	  linda -i ../$(DEBNAME)_$(VERSION)*.deb || : && \
-	  echo "Done running linda." && \
-	  debsign)
-
-debinstall:
-	cp ../$(DEBNAME)_$(VERSION)* ../../dist/$(DISTRIBUTOR)
-
-deb: debclean debprepare debbuild debinstall
-
 upload: release
 	(cd .. && \
 	  scp $(PROJECT)-$(VERSION).zip* $(PROJECT)-$(VERSION).tar.gz* \
diff --git a/Makefile.defs.default b/Makefile.defs.default
index 4e1abf9..c28ad14 100644
--- a/Makefile.defs.default
+++ b/Makefile.defs.default
@@ -35,12 +35,8 @@ install_info = install-info --info-dir=$(INFODIR) $(1) || :
 
 # Useful only for the maintainer
 PROJECT    = planner
-DEBNAME    = planner-el
 VERSION    = 3.41
 MANUAL     = planner-el
-LASTUPLOAD = 3.40.arch.50
-BUILDOPTS  =
-DISTRIBUTOR = debian
 
 # Location of Emacs Lisp Package Archive entries
 ELPADIR  = ../../elpa
-- 
2.11.4.GIT