Bug#470215: pdftk: please switch to gcj 4.3

2008-12-27 Thread robertojimen...@terra.es 
I have tested the attached patch and pdftk compiles cleanly.
Just lowering the CPPFLAGS optimization from -O3 to -O2 made it compile again.
If changing from -O3 to -O2 is not OK then the bug:
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35689
should be followed to know what the correct fix would be.


Ahora también puedes acceder a tu correo Terra desde el móvil.
Infórmate pinchando aquí.

--- pdftk-1.41/debian/control
+++ pdftk-1.41/debian/control
@@ -2,7 +2,7 @@
 Maintainer: Aurélien GÉRÔME 
 Section: text
 Priority: optional
-Build-Depends: debhelper (>= 4.0.0), quilt, gcj-4.2 [!alpha !arm !hppa 
!hurd-i386], g++-4.2
+Build-Depends: debhelper (>= 4.0.0), quilt, gcj-4.3 [!alpha !arm !hppa 
!hurd-i386], g++-4.3
 Standards-Version: 3.7.3
 Homepage: http://www.pdfhacks.com/pdftk/
 
--- pdftk-1.41/debian/patches/no_embedded_libs
+++ pdftk-1.41/debian/patches/no_embedded_libs
@@ -43,7 +43,7 @@
  
  # append gcj flags
 -export GCJFLAGS+= -w --encoding=UTF-8 --classpath="$(java_libs_root)"
-+export GCJFLAGS+= -w --encoding=UTF-8 
--classpath="/usr/share/java/libgcj-4.2.jar:$(java_libs_root)"
++export GCJFLAGS+= -w --encoding=UTF-8 
--classpath="/usr/share/java/libgcj$(VERSUFF).jar:$(java_libs_root)"
  
 -all : libgcj_local itext
 -
--- pdftk-1.41/debian/patches/series
+++ pdftk-1.41/debian/patches/series
@@ -1,2 +1,2 @@
-build_with_gcc-4.2
+build_with_gcc-4.3
 no_embedded_libs
--- pdftk-1.41/debian/patches/build_with_gcc-4.2
+++ pdftk-1.41/debian/patches/build_with_gcc-4.3
@@ -7,7 +7,7 @@
  # tools
  TOOLPATH=
 -VERSUFF=-4.1
-+VERSUFF=-4.2
++VERSUFF=-4.3
  CXX= $(TOOLPATH)g++$(VERSUFF)
  export GCJ= $(TOOLPATH)gcj$(VERSUFF)
  export GCJH= $(TOOLPATH)gcjh$(VERSUFF)
@@ -16,7 +16,7 @@
  # ASK_ABOUT_WARNINGS to true; otherwise: false; override this default
  # with the dont_ask or do_ask command-line options
 -CPPFLAGS= -O3 -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false 
-fdollars-in-identifiers
-+CPPFLAGS= -w -O3 -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false 
-fdollars-in-identifiers
++CPPFLAGS= -w -O2 -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false 
-fdollars-in-identifiers
  CXXFLAGS= -lgcj
  
  # itext compiler flags
@@ -30,7 +30,7 @@
  %.h : %.class
 -  $(GCJH) --classpath="." $*;
 -  $(RM) $<
-+  $(GCJH) --classpath="/usr/share/java/libgcj-4.2.jar:$(PWD):." $*
++  $(GCJH) --classpath="/usr/share/java/libgcj$(VERSUFF).jar:$(PWD):." $*
  
  ##
  # targets
@@ -52,7 +52,7 @@
  %.h : %.class
 -  $(GCJH) --classpath="." $*;
 -  $(RM) $<
-+  $(GCJH) --classpath="/usr/share/java/libgcj-4.2.jar:$(PWD):." $*
++  $(GCJH) --classpath="/usr/share/java/libgcj$(VERSUFF).jar:$(PWD):." $*
  
  ##
  # targets
@@ -66,7 +66,7 @@
  %.h : %.class
 -  $(GCJH) --classpath="." $*;
 -  $(RM) $<
-+  $(GCJH) --classpath="/usr/share/java/libgcj-4.2.jar:$(PWD):." $*
++  $(GCJH) --classpath="/usr/share/java/libgcj$(VERSUFF).jar:$(PWD):." $*
  
  ##
  # targets
@@ -86,7 +86,7 @@
  %.h : %.class
 -  $(GCJH) --classpath="." $*;
 -  $(RM) $<
-+  $(GCJH) --classpath="/usr/share/java/libgcj-4.2.jar:$(PWD):." $*
++  $(GCJH) --classpath="/usr/share/java/libgcj$(VERSUFF).jar:$(PWD):." $*
  
  ##
  # targets
@@ -100,7 +100,7 @@
  %.h : %.class
 -  $(GCJH) --classpath="." $*;
 -  $(RM) $<
-+  $(GCJH) --classpath="/usr/share/java/libgcj-4.2.jar:$(PWD):." $*
++  $(GCJH) --classpath="/usr/share/java/libgcj$(VERSUFF).jar:$(PWD):." $*
  
  ##
  # targets
@@ -114,7 +114,7 @@
  %.h : %.class
 -  $(GCJH) --classpath="." $*;
 -  $(RM) $<
-+  $(GCJH) --classpath="/usr/share/java/libgcj-4.2.jar:$(PWD):." $*
++  $(GCJH) --classpath="/usr/share/java/libgcj$(VERSUFF).jar:$(PWD):." $*
  
  ##
  # targets
@@ -128,7 +128,7 @@
  %.h : %.class
 -  $(GCJH) --classpath="." $*;
 -  $(RM) $<
-+  $(GCJH) --classpath="/usr/share/java/libgcj-4.2.jar:$(PWD):." $*
++  $(GCJH) --classpath="/usr/share/java/libgcj$(VERSUFF).jar:$(PWD):." $*
  
  ##
  # targets
@@ -142,7 +142,7 @@
  %.h : %.class
 -  $(GCJH) --classpath="." $*;
 -  $(RM) $<
-+  $(GCJH) --classpath="/usr/share/java/libgcj-4.2.jar:$(PWD):." $*
++  $(GCJH) --classpath="/usr/share/java/libgcj$(VERSUFF).jar:$(PWD):." $*
  
  ##
  # targets
@@ -156,7 +156,7 @@
  %.h : %.class
 -  $(GCJH) --classpath="." $*;
 -  $(RM) $<
-+  $(GCJH) --classpath="/usr/share/java/libgcj-4.2.jar:$(PWD):." $*
++  $(GCJH) --classpath="/usr/share/java/libgcj$(VERSUFF).jar:$(PWD):." $*
  
  ##
  # targets

Bug#508712: user-es: needed maintenance

2008-12-14 Thread robertojimen...@terra.es 
Package: user-es
Version: 0.40+nmu1

user-es needs some basic maintenance or just be removed from Debian.
Having a spanish specific package for language configuration is just bad.

ChangeLog:
spanish is not an ISO 639 language identifier, the correct one is es_ES
/usr/X11R6/lib/X11/nls path was removed from Debian long time ago
less is using the correct charset long time ago
MM_CHARSET is also not needed as most MUAs get the console charset properly



Ahora también puedes acceder a tu correo Terra desde el móvil.
Infórmate pinchando aquí.

--- user-es-0.40+nmu1.new/language-es   2004-09-06 22:37:03.0 +
+++ user-es-0.40+nmu1/language-es   2008-12-14 14:17:28.0 +
@@ -3,37 +3,9 @@
 # settings for spanish speaking users
 #
 
-#LC_MESSAGES="es_ES"
-# LC_CTYPE=es_ES.ISO8859-1
-#export LC_MESSAGES LC_CTYPE
-
-LC_ALL=es_ES   
+LC_ALL=es_ES
 export LC_ALL
 
-# set LANG
-# (locale.alias se encarga de poner esto bien con sólo poner 'spanish')
-LANG=spanish
+LANG=es_ES
 export LANG
 
-if [ -d /usr/X11R6/lib/X11/nls ]; then
-XNLSPATH=/usr/X11R6/lib/X11/nls
-export XNLSPATH
-fi
-
-# no específico del idioma, pero también útil (donde debería ponerlo??)
-# esto será añadido por 'base-files' ahora
-# not language specific, but useful too (where should I place it??)
-# will be set from base-files now
-
-# if [ -n "$PS1" ] ; then
-# PS1='\...@\h[\w]\$ '
-# IGNOREEOF=3
-# fi
-
-# Esto ya no es necesario a menos de que se conecte a máquinas
-# con versiones antiguas del programa 'less'
-#export LESSCHARSET=latin1
-
-# Obtenido de http://members.xoom.com/sromero/linux/castell.html
-export MM_CHARSET=ISO-8859-1# para usar latin1 en los mails
-
--- user-es-0.40+nmu1.new/language-euro-es  2004-09-06 22:36:42.0 
+
+++ user-es-0.40+nmu1/language-euro-es  2008-12-14 14:20:03.0 +
@@ -3,28 +3,8 @@
 # settings for spanish speaking users with euro support
 #
 
-#LC_MESSAGES="es_ES"
-# LC_CTYPE=es_ES.ISO8859-15
-#export LC_MESSAGES LC_CTYPE
-
 lc_all=es...@euro
 export LC_ALL
 
-# set LANG
-# (locale.alias se encarga de poner esto bien con sólo poner 'es...@euro')
 lang=es...@euro
 export LANG
-
-if [ -d /usr/X11R6/lib/X11/nls ]; then
-XNLSPATH=/usr/X11R6/lib/X11/nls
-export XNLSPATH
-fi
-
-# LESS no tiene un charset latin0, sólo latin1 que es un alias a ISO-8859 
(bug?)
-#export LESSCHARSET=latin0
-#export LESSCHARSET=latin1
-# Esto ya no es necesario a menos que utilice una version antigua de less
-
-# Obtenido de http://members.xoom.com/sromero/linux/castell.html
-export MM_CHARSET=ISO-8859-15# para usar latin0 en los mails
-

Bug#531099: lyx: fix boost dependencies

2009-05-29 Thread robertojimen...@terra.es 
Package: lyx

It seems newer boost libraries are only in '-mt' format.

The attached patch makes lyx build again with latest boost libraries in 
unstable.


Ahora también puedes acceder a tu correo Terra desde el móvil.
Infórmate pinchando aquí.

--- lyx/boost/Makefile.in
+++ lyx/boost/Makefile.in
@@ -335,10 +335,10 @@
 @use_included_boost_t...@boost_includes = -I$(top_srcdir)/boost
 @use_included_boost_fa...@boost_libs = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS)
 @use_included_boost_t...@boost_libs = $(top_builddir)/boost/liblyxboost.la
-...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem
-...@use_included_boost_false@BOOST_REGEX = -lboost_regex
-...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals
-...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams
+...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem-mt
+...@use_included_boost_false@BOOST_REGEX = -lboost_regex-mt
+...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals-mt
+...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams-mt
 noinst_LTLIBRARIES = liblyxboost.la
 
 # Using precompiled headers makes compilation >10% slower
--- lyx/config/common.am
+++ lyx/config/common.am
@@ -33,10 +33,10 @@
 BOOST_LIBS = $(top_builddir)/boost/liblyxboost.la
 else
 BOOST_INCLUDES =
-BOOST_FILESYSTEM = -lboost_filesystem
-BOOST_REGEX = -lboost_regex
-BOOST_SIGNALS = -lboost_signals
-BOOST_IOSTREAMS = -lboost_iostreams
+BOOST_FILESYSTEM = -lboost_filesystem-mt
+BOOST_REGEX = -lboost_regex-mt
+BOOST_SIGNALS = -lboost_signals-mt
+BOOST_IOSTREAMS = -lboost_iostreams-mt
 BOOST_LIBS = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS)
 endif
 
--- lyx/config/Makefile.in
+++ lyx/config/Makefile.in
@@ -292,10 +292,10 @@
 @use_included_boost_t...@boost_includes = -I$(top_srcdir)/boost
 @use_included_boost_fa...@boost_libs = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS)
 @use_included_boost_t...@boost_libs = $(top_builddir)/boost/liblyxboost.la
-...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem
-...@use_included_boost_false@BOOST_REGEX = -lboost_regex
-...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals
-...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams
+...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem-mt
+...@use_included_boost_false@BOOST_REGEX = -lboost_regex-mt
+...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals-mt
+...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams-mt
 EXTRA_DIST = \
 	common.am \
 	libtool.m4 \
--- lyx/development/MacOSX/Makefile.in
+++ lyx/development/MacOSX/Makefile.in
@@ -323,10 +323,10 @@
 @use_included_boost_t...@boost_includes = -I$(top_srcdir)/boost
 @use_included_boost_fa...@boost_libs = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS)
 @use_included_boost_t...@boost_libs = $(top_builddir)/boost/liblyxboost.la
-...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem
-...@use_included_boost_false@BOOST_REGEX = -lboost_regex
-...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals
-...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams
+...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem-mt
+...@use_included_boost_false@BOOST_REGEX = -lboost_regex-mt
+...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals-mt
+...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams-mt
 LINGUAS = $(srcdir)/../../po/LINGUAS
 SUBDIRS = spotlight
 bundledir = ${prefix}/Contents
--- lyx/development/MacOSX/spotlight/Makefile.in
+++ lyx/development/MacOSX/spotlight/Makefile.in
@@ -308,10 +308,10 @@
 @use_included_boost_t...@boost_includes = -I$(top_srcdir)/boost
 @use_included_boost_fa...@boost_libs = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS)
 @use_included_boost_t...@boost_libs = $(top_builddir)/boost/liblyxboost.la
-...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem
-...@use_included_boost_false@BOOST_REGEX = -lboost_regex
-...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals
-...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams
+...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem-mt
+...@use_included_boost_false@BOOST_REGEX = -lboost_regex-mt
+...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals-mt
+...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams-mt
 bundledir = $(prefix)/Contents
 spotlightdir = $(bundledir)/Library/Spotlight/LyX-Metadata.mdimporter/Contents
 dist_spotlight_DATA = Info.plist 
--- lyx/development/Makefile.in
+++ lyx/development/Makefile.in
@@ -302,10 +302,10 @@
 @use_included_boost_t...@boost_includes = -I$(top_srcdir)/boost
 @use_included_boost_fa...@boost_libs = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS)
 @use_included_boost_t...@boost_libs = $(top_builddir)/boost/liblyxboost.la
-...@use_included_boost_false@BOOST_FILESYSTEM =