[Pkg-jed-commit] r817 - in slgtk/trunk/debian: . patches

[Rafael Laboissiere]

tags 438025 pending
thanks

Author: rafael
Date: 2007-08-28 14:20:17 +0000 (Tue, 28 Aug 2007)
New Revision: 817

Added:
   slgtk/trunk/debian/patches/strip-as-variable-in-makefile.patch
Modified:
   slgtk/trunk/debian/changelog
   slgtk/trunk/debian/rules
Log:
Debian release slgtk_0.5.16-4

Modified: slgtk/trunk/debian/changelog
===================================================================
--- slgtk/trunk/debian/changelog	2007-08-09 21:28:54 UTC (rev 816)
+++ slgtk/trunk/debian/changelog	2007-08-28 14:20:17 UTC (rev 817)
@@ -1,3 +1,10 @@
+slgtk (0.5.16-4) unstable; urgency=low
+
+  * debian/patch/strip-as-variable-in-makefile.patch, debian/rules:
+    Handle nostrip build option (closes: #438025)
+
+ -- Rafael Laboissiere <rafael at debian.org>  Tue, 28 Aug 2007 14:12:21 +0200
+
 slgtk (0.5.16-3) unstable; urgency=low
 
   [Jörg Sommer]

Added: slgtk/trunk/debian/patches/strip-as-variable-in-makefile.patch
===================================================================
--- slgtk/trunk/debian/patches/strip-as-variable-in-makefile.patch	                        (rev 0)
+++ slgtk/trunk/debian/patches/strip-as-variable-in-makefile.patch	2007-08-28 14:20:17 UTC (rev 817)
@@ -0,0 +1,27 @@
+diff -Nur slgtk-0.5.16/src/Makefile.in slgtk-0.5.16.new/src/Makefile.in
+--- slgtk-0.5.16/src/Makefile.in	2006-01-06 22:50:00.000000000 +0100
++++ slgtk-0.5.16.new/src/Makefile.in	2007-08-27 21:36:11.000000000 +0200
+@@ -73,6 +73,7 @@
+ RANLIB    = @RANLIB@
+ AR_CR     = @AR@ cr
+ MKDIR     = mkdir -p
++STRIP     = @STRIP@
+ 
+ #---------------------------------------------------------------------------
+ # Section: Primary build macros and rules (NB: 'all' is first target defined)
+@@ -378,13 +379,13 @@
+ 	-\cd $(install_module_dir); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB_MAJOR)
+ 	-\cd $(install_module_dir); $(LN) $(ELFLIB) $(GTK_MODULE)
+ 	if [ -z "@SLGTK_DEVEL_BUILD@" ] ; then \
+-	   @STRIP@ $(install_module_dir)/$(ELFLIB_MAJOR_MINOR) ; \
++	   $(STRIP) $(install_module_dir)/$(ELFLIB_MAJOR_MINOR) ; \
+ 	fi
+ 
+ install_static_module:
+ 	-$(RM) $(install_module_dir)/$(STATIC_MODULE)
+ 	$(INSTALL_DATA) $(STATIC_MODULE) $(install_module_dir)
+-	- at STRIP@ $(install_module_dir)/$(STATIC_MODULE) 2>/dev/null
++	-$(STRIP) $(install_module_dir)/$(STATIC_MODULE) 2>/dev/null
+ 
+ install_exes:
+ 	$(INSTALL_BIN) $(SLGTKSHELL) $(install_bin_dir)

Modified: slgtk/trunk/debian/rules
===================================================================
--- slgtk/trunk/debian/rules	2007-08-09 21:28:54 UTC (rev 816)
+++ slgtk/trunk/debian/rules	2007-08-28 14:20:17 UTC (rev 817)
@@ -6,8 +6,9 @@
 
 DEB_COMPRESS_EXCLUDE := .sl
 DEB_MAKE_BUILD_TARGET := dynamic RPATH=
-DEB_MAKE_INSTALL_TARGET := install RPATH= DESTDIR=$(DEB_DESTDIR) \
-  install_doc_dir=$(DEB_DESTDIR)/usr/share/doc/slang-gtk
+DEB_MAKE_INSTALL_TARGET := install RPATH= DESTDIR=$(DEB_DESTDIR)	\
+  install_doc_dir=$(DEB_DESTDIR)/usr/share/doc/slang-gtk		\
+  STRIP='echo "Warning: not stripping files "'
 
 build/slang-gtk::
 	-( cd tests ; unset DISPLAY ; xvfb-run make )