[Pkg-tcltk-commits] r781 - in packages/tktreectrl/trunk/debian: . patches

[miriam at alioth.debian.org]

Author: miriam
Date: 2008-12-18 02:11:50 +0000 (Thu, 18 Dec 2008)
New Revision: 781

Removed:
   packages/tktreectrl/trunk/debian/install
Modified:
   packages/tktreectrl/trunk/debian/patches/man.patch
   packages/tktreectrl/trunk/debian/rules
Log:
Fix install procedure



Deleted: packages/tktreectrl/trunk/debian/install
===================================================================
--- packages/tktreectrl/trunk/debian/install	2008-12-18 02:00:05 UTC (rev 780)
+++ packages/tktreectrl/trunk/debian/install	2008-12-18 02:11:50 UTC (rev 781)
@@ -1,2 +0,0 @@
-usr/share
-usr/lib

Modified: packages/tktreectrl/trunk/debian/patches/man.patch
===================================================================
--- packages/tktreectrl/trunk/debian/patches/man.patch	2008-12-18 02:00:05 UTC (rev 780)
+++ packages/tktreectrl/trunk/debian/patches/man.patch	2008-12-18 02:11:50 UTC (rev 781)
@@ -1,27 +1,25 @@
 Index: tktreectrl-2.2.8/Makefile.in
 ===================================================================
---- tktreectrl-2.2.8.orig/Makefile.in	2008-12-18 02:20:18.000000000 +0100
-+++ tktreectrl-2.2.8/Makefile.in	2008-12-18 02:27:22.000000000 +0100
-@@ -214,12 +214,12 @@
+--- tktreectrl-2.2.8.orig/Makefile.in	2008-12-18 02:37:38.000000000 +0100
++++ tktreectrl-2.2.8/Makefile.in	2008-12-18 03:06:41.000000000 +0100
+@@ -214,13 +214,6 @@
  #========================================================================
  
  install-doc-x:
 -	@mkdir -p $(DESTDIR)$(mandir)/mann
-+	@mkdir -p $(DESTDIR)$(mandir)/man3
- 	@echo "Installing documentation in $(DESTDIR)$(mandir)"
- 	@for i in $(srcdir)/doc/*.n; do \
- 	    echo "Installing $$i"; \
+-	@echo "Installing documentation in $(DESTDIR)$(mandir)"
+-	@for i in $(srcdir)/doc/*.n; do \
+-	    echo "Installing $$i"; \
 -	    rm -f $(DESTDIR)$(mandir)/mann/`basename $$i`; \
 -	    $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/mann ; \
-+	    rm -f $(DESTDIR)$(mandir)/man3/`basename $$i`; \
-+	    $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/man3/$$(echo "$$i" | grep -e "s/.n$$/.3tk/")/ ; \
- 	done
+-	done
  
  install-doc: install-doc-x
+ 	mkdir -p $(DESTDIR)$(pkglibdir)/htmldoc
 Index: tktreectrl-2.2.8/doc/treectrl.html
 ===================================================================
---- tktreectrl-2.2.8.orig/doc/treectrl.html	2008-12-18 02:21:33.000000000 +0100
-+++ tktreectrl-2.2.8/doc/treectrl.html	2008-12-18 02:23:38.000000000 +0100
+--- tktreectrl-2.2.8.orig/doc/treectrl.html	2008-12-18 02:37:38.000000000 +0100
++++ tktreectrl-2.2.8/doc/treectrl.html	2008-12-18 03:03:58.000000000 +0100
 @@ -4385,7 +4385,7 @@
  
  <h2><a name="see_also">SEE ALSO</a></h2>
@@ -33,8 +31,8 @@
  tree, widget
 Index: tktreectrl-2.2.8/doc/treectrl.n
 ===================================================================
---- tktreectrl-2.2.8.orig/doc/treectrl.n	2008-12-18 02:21:33.000000000 +0100
-+++ tktreectrl-2.2.8/doc/treectrl.n	2008-12-18 02:24:31.000000000 +0100
+--- tktreectrl-2.2.8.orig/doc/treectrl.n	2008-12-18 02:37:38.000000000 +0100
++++ tktreectrl-2.2.8/doc/treectrl.n	2008-12-18 03:03:58.000000000 +0100
 @@ -1,18 +1,18 @@
 -'\"
 -'\" Generated from file 'doc/treectrl.man' by tcllib/doctools with format 'nroff'

Modified: packages/tktreectrl/trunk/debian/rules
===================================================================
--- packages/tktreectrl/trunk/debian/rules	2008-12-18 02:00:05 UTC (rev 780)
+++ packages/tktreectrl/trunk/debian/rules	2008-12-18 02:11:50 UTC (rev 781)
@@ -61,8 +61,8 @@
 	dh_installdirs
 	$(MAKE) install \
 		prefix=$(CURDIR)/debian/tktreectrl/usr \
-		DESTDIR=$(CURDIR)/debian/tmp \
-		DIST_DIR=$(CURDIR)/debian/tmp
+		DESTDIR=$(CURDIR)/debian/tktreectrl \
+		DIST_DIR=$(CURDIR)/debian/tktreectrl
 	find $(CURDIR)/debian/tktreectrl -empty -type d -delete
 	find $(CURDIR)/debian/tktreectrl -name "*.htm*" | while read f; do chmod -x "$$f"; done