r37623 - in /desktop/unstable/gtk+2.0/debian: changelog libgail18.opt libgtk2.0-0.install.opt rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue May  7 05:07:59 2013
New Revision: 37623

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=37623
Log:
Drop the unused opt flavor.

Removed:
    desktop/unstable/gtk+2.0/debian/libgail18.opt
    desktop/unstable/gtk+2.0/debian/libgtk2.0-0.install.opt
Modified:
    desktop/unstable/gtk+2.0/debian/changelog
    desktop/unstable/gtk+2.0/debian/rules

Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=37623&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/changelog [utf-8] Tue May  7 05:07:59 2013
@@ -1,6 +1,7 @@
 gtk+2.0 (2.24.17-2) UNRELEASED; urgency=low
 
   * Upload to unstable.
+  * Drop the unused opt flavor.
 
  -- Michael Biebl <biebl at debian.org>  Tue, 07 May 2013 07:03:57 +0200
 

Modified: desktop/unstable/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/rules?rev=37623&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/rules [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/rules [utf-8] Tue May  7 05:07:59 2013
@@ -137,18 +137,8 @@
 			--disable-shared \
 			--enable-static
 
-# optional optimized flavor for some arches
-OPTLIBDIR :=
-# sample code
-#ifneq ($(filter $(DEB_HOST_ARCH), armel),)
-#FLAVORS += opt
-#OPTLIBDIR := $(LIBDIR)/vfp
-#opt_CFLAGS += $(CFLAGS) -mfpu=vfp -mfloat-abi=softfp
-#opt_configure_flags := $(or $(shared_configure_flags),$(configure_flags))
-#endif
-
 # list of flavors to run the test suite on
-CHECK_FLAVORS := $(filter opt shared static, $(FLAVORS))
+CHECK_FLAVORS := $(filter shared static, $(FLAVORS))
 
 DH_INSTALLDOCS_FILES := NEWS README AUTHORS
 
@@ -235,11 +225,9 @@
 		-e "s#@GNOME_TEAM@#$(UPLOADERS)#g" \
 		-e "s#@GTK_BINARY_VERSION@#$(GTK_BINARY_VERSION)#g" \
 		-e "s#@LIBDIR@#$(LIBDIR)#g" \
-		-e 's#@OPTLIBDIR@#$(OPTLIBDIR)#g' \
 		-e "s#@MODULES_BASE_PATH@#$(MODULES_BASE_PATH)#g" \
 		-e "s#@OLD_MODULES_BASE_PATH@#$(OLD_MODULES_BASE_PATH)#g" \
 		$@.in \
-		$(wildcard $(if $(filter opt,$(FLAVORS)),$@.opt)) \
 		> $@
 
 clean:: debian/control