X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=debian%2Frules;h=e43c585786cd1185a5fa3865c4cf3b03d1ef2284;hb=a2f12f10589a04b48cafa947b645c6ec69ec2829;hp=bd83c2845aae70b6474a67966b6f28c603cb8697;hpb=381403b63e52556173694d7dc2d02ac2371b61ff;p=pkg%2Ft-prot.git

diff --git a/debian/rules b/debian/rules
index bd83c28..e43c585 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,8 @@
 #!/usr/bin/make -f
 # debian/rules for t-prot package
 
-PACKAGE = t-prot
-TMP = $(CURDIR)/debian/$(PACKAGE)
+PKG = t-prot
+TMP = $(CURDIR)/debian/$(PKG)
 
 INSTALL = install
 INSTALL_FILE    = $(INSTALL) -p    -oroot -groot -m644
@@ -26,31 +26,32 @@ install: build
 	$(checkroot)
 	-rm -rf $(TMP)
 	$(INSTALL_DIR) $(TMP)
-	cd $(TMP) && $(INSTALL_DIR) etc usr/bin usr/share/man/man1 \
-		usr/share/slrn/macros usr/share/doc/$(PACKAGE)/examples
-	#	usr/share/doc/$(PACKAGE)/contrib
+	cd $(TMP) && $(INSTALL_DIR) etc/t-prot/footers etc/t-prot/ads \
+		usr/bin usr/share/man/man1 usr/share/slrn/macros \
+		usr/share/doc/$(PKG)/examples
+	#	usr/share/doc/$(PKG)/contrib
 	$(INSTALL_SCRIPT) t-prot   $(TMP)/usr/bin
-	cd $(TMP)/usr/bin/ && patch t-prot \
-		$(TMP)/../../contrib/t-prot-r*-mutt157.diff
+	patch $(TMP)/usr/bin/t-prot \
+		contrib/t-prot-r*-mutt157.diff
+	-rm -f $(TMP)/usr/bin/t-prot.orig
 	$(INSTALL_FILE)   t-prot.1 $(TMP)/usr/share/man/man1
-	$(INSTALL_FILE) debian/Muttrc.t-prot $(TMP)/etc
+	$(INSTALL_FILE) debian/Muttrc     $(TMP)/etc/t-prot
+	$(INSTALL_FILE) debian/footers/*  $(TMP)/etc/t-prot/footers
 	$(INSTALL_FILE) contrib/t-prot.sl $(TMP)/usr/share/slrn/macros
+	patch $(TMP)/usr/share/slrn/macros/t-prot.sl \
+		contrib/t-prot.sl-slang2.diff
+	-rm -f $(TMP)/usr/share/slrn/macros/t-prot.sl.orig
 
-	$(INSTALL_FILE) BUGS TODO README $(TMP)/usr/share/doc/$(PACKAGE)
+	$(INSTALL_FILE) TODO README $(TMP)/usr/share/doc/$(PKG)
 	#$(INSTALL_FILE) contrib/README.patches contrib/t-prot-r*-gol.diff \
 	#	contrib/t-prot-r*-indentms.diff \
-	#	$(TMP)/usr/share/doc/$(PACKAGE)/contrib
-	cp -pR contrib/muttrc.t-prot contrib/filter_innd.pl debian/footers \
-		debian/README.footers \
-		$(TMP)/usr/share/doc/$(PACKAGE)/examples
+	#	$(TMP)/usr/share/doc/$(PKG)/contrib
+	$(INSTALL_FILE) contrib/filter_innd.pl contrib/README.examples \
+		$(TMP)/usr/share/doc/$(PKG)/examples
 	$(INSTALL_FILE) ChangeLog \
-		$(TMP)/usr/share/doc/$(PACKAGE)/changelog
-	cd $(TMP)/usr/share && gzip -9 doc/$(PACKAGE)/changelog \
+		$(TMP)/usr/share/doc/$(PKG)/changelog
+	cd $(TMP)/usr/share && gzip -9 doc/$(PKG)/changelog \
 		man/man1/t-prot.1
-	find $(TMP) -print0 2>/dev/null | xargs -0r \
-		chown --no-dereference 0.0
-	find $(TMP) ! -type l -print0 2>/dev/null | xargs -0r \
-		chmod go=rX,u+rw,a-s
 
 
 binary-indep: build install
@@ -58,16 +59,17 @@ binary-indep: build install
 	$(checkroot)
 	$(INSTALL_DIR) $(TMP)/DEBIAN
 	$(INSTALL_FILE) debian/copyright debian/README.Debian \
-		debian/NEWS.Debian $(TMP)/usr/share/doc/$(PACKAGE)
+		debian/NEWS.Debian $(TMP)/usr/share/doc/$(PKG)
 	$(INSTALL_FILE) debian/changelog \
-		$(TMP)/usr/share/doc/$(PACKAGE)/changelog.Debian
-	cd $(TMP)/usr/share/doc/$(PACKAGE) && gzip -9 \
+		$(TMP)/usr/share/doc/$(PKG)/changelog.Debian
+	cd $(TMP)/usr/share/doc/$(PKG) && gzip -9 \
 		changelog.Debian NEWS.Debian
-	$(INSTALL_SCRIPT) debian/postinst \
+	$(INSTALL_SCRIPT) debian/postinst debian/postrm debian/config \
 		$(TMP)/DEBIAN
+	po2debconf debian/templates > $(TMP)/DEBIAN/templates
 	$(INSTALL_FILE) debian/conffiles \
 		$(TMP)/DEBIAN
-	dpkg-gencontrol -ldebian/changelog -isp -p$(PACKAGE) -P$(TMP)
+	dpkg-gencontrol -ldebian/changelog -isp -p$(PKG) -P$(TMP)
 	cd $(TMP) && find * -type f ! -regex '^DEBIAN/.*' -print0 | \
 		xargs -r0 md5sum > DEBIAN/md5sums
 	dpkg --build $(TMP) ..