[Pkg-jed-commit] r614 - in tess/trunk/debian: . patches

[Rafael Laboissiere]

Author: rafael
Date: 2007-03-28 00:07:32 +0000 (Wed, 28 Mar 2007)
New Revision: 614

Added:
   tess/trunk/debian/patches/
   tess/trunk/debian/patches/dest-sl-files-install-dir.patch
Modified:
   tess/trunk/debian/changelog
   tess/trunk/debian/rules
Log:
Debian release tess_0.3.0-2

Modified: tess/trunk/debian/changelog
===================================================================
--- tess/trunk/debian/changelog	2007-03-27 23:49:28 UTC (rev 613)
+++ tess/trunk/debian/changelog	2007-03-28 00:07:32 UTC (rev 614)
@@ -1,3 +1,12 @@
+tess (0.3.0-2) unstable; urgency=low
+
+  * debian/patches/dest-sl-files-install-dir.patch: Instead of using the
+    hack in debian/rules introduced in the last version, use a patch to
+    admin/Makefile.in.  That way, if/when the upstream author fixes the
+    problem, I will notice that my changes must be reverted.
+
+ -- Rafael Laboissiere <rafael at debian.org>  Wed, 28 Mar 2007 02:02:25 +0200
+
 tess (0.3.0-1) unstable; urgency=low
 
   * New upstream release.  The value of the DEB_MAKE_INSTALL_TARGET

Added: tess/trunk/debian/patches/dest-sl-files-install-dir.patch
===================================================================
--- tess/trunk/debian/patches/dest-sl-files-install-dir.patch	2007-03-27 23:49:28 UTC (rev 613)
+++ tess/trunk/debian/patches/dest-sl-files-install-dir.patch	2007-03-28 00:07:32 UTC (rev 614)
@@ -0,0 +1,25 @@
+diff -Nur tess-0.3.0/admin/Makefile.in tess-0.3.0.new/admin/Makefile.in
+--- tess-0.3.0/admin/Makefile.in	2007-01-18 18:32:12.000000000 +0100
++++ tess-0.3.0.new/admin/Makefile.in	2007-03-28 02:00:05.000000000 +0200
+@@ -61,8 +61,8 @@
+ install_slfiles:
+ 	@for X in $(SL_FILES); \
+ 	do \
+-		echo $(INSTALL_DATA) $$X $(SL_FILES_INSTALL_DIR); \
+-		$(INSTALL_DATA) $$X $(SL_FILES_INSTALL_DIR); \
++		echo $(INSTALL_DATA) $$X $(DEST_SL_FILES_INSTALL_DIR); \
++		$(INSTALL_DATA) $$X $(DEST_SL_FILES_INSTALL_DIR); \
+ 		if [ "$$?" != "0" ]; then \
+ 		  exit 1; \
+ 		fi; \
+@@ -79,8 +79,8 @@
+ 
+ uninstall: 
+ 	@for X in $(SL_FILES); do \
+-		echo $(RM) $(SL_FILES_INSTALL_DIR)/$$X ; \
+-		$(RM) $(SL_FILES_INSTALL_DIR)/$$X; \
++		echo $(RM) $(DEST_SL_FILES_INSTALL_DIR)/$$X ; \
++		$(RM) $(DEST_SL_FILES_INSTALL_DIR)/$$X; \
+ 		if [ "$$?" != "0" ]; then \
+ 		  exit 1; \
+ 		fi; \

Modified: tess/trunk/debian/rules
===================================================================
--- tess/trunk/debian/rules	2007-03-27 23:49:28 UTC (rev 613)
+++ tess/trunk/debian/rules	2007-03-28 00:07:32 UTC (rev 614)
@@ -2,15 +2,8 @@
 
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_MAKE_BUILD_TARGET := all RPATH=
 DEB_MAKE_CHECK_TARGET := test
 
-# Fix an installation bug in admin/Makefile.in
-# The code below should be removed once upstream has fixed that file
-destdir = $(CURDIR)/debian/slang-tess
-slinstdir = $(destdir)/usr/share/slsh/local-packages
-DEB_MAKE_INSTALL_TARGET = install		\
-  DESTDIR=$(destdir)				\
-  SL_FILES_INSTALL_DIR=$(slinstdir)		\
-  DEST_SL_FILES_INSTALL_DIR=$(slinstdir)