[sumo] 05/05: Minor update.

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository sumo.

commit 88dafcd664976d6665bdcaf4717b746ef5a0244a
Author: Anton Gladky <gladk at debian.org>
Date:   Mon Nov 18 20:14:19 2013 +0100

    Minor update.
---
 debian/patches/remove_embedded_gl2ps.patch |   29 +++++-----------------------
 debian/rules                               |    1 -
 2 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/debian/patches/remove_embedded_gl2ps.patch b/debian/patches/remove_embedded_gl2ps.patch
index a3eac97..7a7d375 100644
--- a/debian/patches/remove_embedded_gl2ps.patch
+++ b/debian/patches/remove_embedded_gl2ps.patch
@@ -4,7 +4,7 @@ Last-Update: 2012-12-04
 
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -98,7 +98,6 @@
+@@ -99,7 +99,6 @@
  ./utils/foxtools/libfoxtools.a \
  $(MESOGUI_LIBS) \
  $(sumo_LDADD) \
@@ -22,7 +22,7 @@ Last-Update: 2012-12-04
  @WITH_GUI_TRUE@	./foreign/polyfonts/libpolyfonts.a \
  @WITH_GUI_TRUE@	./gui/GUIManipulator.o \
  @WITH_GUI_TRUE@	./gui/GUITLLogicPhasesTrackerWindow.o \
-@@ -387,7 +386,6 @@
+@@ -388,7 +387,6 @@
  @WITH_GUI_TRUE at ./utils/foxtools/libfoxtools.a \
  @WITH_GUI_TRUE@$(MESOGUI_LIBS) \
  @WITH_GUI_TRUE@$(sumo_LDADD) \
@@ -41,33 +41,14 @@ Last-Update: 2012-12-04
  endif
  
  
---- a/configure
-+++ b/configure
-@@ -17410,7 +17410,7 @@
- 
- 
- 
--ac_config_files="$ac_config_files src/Makefile src/activitygen/Makefile src/activitygen/activities/Makefile src/activitygen/city/Makefile src/foreign/Makefile src/foreign/gl2ps/Makefile src/foreign/mersenne/Makefile src/foreign/nvwa/Makefile src/foreign/polyfonts/Makefile src/foreign/rtree/Makefile src/foreign/tcpip/Makefile src/gui/Makefile src/gui/dialogs/Makefile src/guinetload/Makefile src/guisim/Makefile src/microsim/Makefile src/microsim/actions/Makefile src/microsim/cfmodels/Make [...]
-+ac_config_files="$ac_config_files src/Makefile src/activitygen/Makefile src/activitygen/activities/Makefile src/activitygen/city/Makefile src/foreign/Makefile src/foreign/mersenne/Makefile src/foreign/nvwa/Makefile src/foreign/polyfonts/Makefile src/foreign/rtree/Makefile src/foreign/tcpip/Makefile src/gui/Makefile src/gui/dialogs/Makefile src/guinetload/Makefile src/guisim/Makefile src/microsim/Makefile src/microsim/actions/Makefile src/microsim/cfmodels/Makefile src/microsim/devices/M [...]
- 
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -18566,7 +18566,6 @@
-     "src/activitygen/activities/Makefile") CONFIG_FILES="$CONFIG_FILES src/activitygen/activities/Makefile" ;;
-     "src/activitygen/city/Makefile") CONFIG_FILES="$CONFIG_FILES src/activitygen/city/Makefile" ;;
-     "src/foreign/Makefile") CONFIG_FILES="$CONFIG_FILES src/foreign/Makefile" ;;
--    "src/foreign/gl2ps/Makefile") CONFIG_FILES="$CONFIG_FILES src/foreign/gl2ps/Makefile" ;;
-     "src/foreign/mersenne/Makefile") CONFIG_FILES="$CONFIG_FILES src/foreign/mersenne/Makefile" ;;
-     "src/foreign/nvwa/Makefile") CONFIG_FILES="$CONFIG_FILES src/foreign/nvwa/Makefile" ;;
-     "src/foreign/polyfonts/Makefile") CONFIG_FILES="$CONFIG_FILES src/foreign/polyfonts/Makefile" ;;
 --- a/src/foreign/Makefile.in
 +++ b/src/foreign/Makefile.in
 @@ -60,7 +60,7 @@
  	distdir
  ETAGS = etags
  CTAGS = ctags
--DIST_SUBDIRS = mersenne tcpip nvwa gl2ps polyfonts rtree
-+DIST_SUBDIRS = mersenne tcpip nvwa polyfonts rtree
+-DIST_SUBDIRS = eulerspiral mersenne tcpip nvwa gl2ps polyfonts rtree
++DIST_SUBDIRS = eulerspiral mersenne tcpip nvwa polyfonts rtree
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  am__relativize = \
    dir0=`pwd`; \
@@ -78,7 +59,7 @@ Last-Update: 2012-12-04
 - at WITH_GUI_TRUE@GUIDIRS = gl2ps polyfonts rtree
 + at WITH_GUI_TRUE@GUIDIRS = polyfonts rtree
  EXTRA_DIST = additional.txt
- SUBDIRS = mersenne tcpip $(MEMDIRS) $(GUIDIRS) 
+ SUBDIRS = eulerspiral mersenne tcpip $(MEMDIRS) $(GUIDIRS) 
  all: all-recursive
 --- a/src/utils/gui/windows/GUISUMOAbstractView.cpp
 +++ b/src/utils/gui/windows/GUISUMOAbstractView.cpp
diff --git a/debian/rules b/debian/rules
index 3df1b82..2742a85 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,6 @@ override_dh_auto_build-indep:
 	rm ./tools/contributed/trafficmodeler/src/resources/icons/Thumbs.db
 	rm ./tools/contributed/traci4j/.gitignore
 	find ./tools -name '*.java' -print0 | xargs -0 chmod -x
-	find ./tools -name '*.jar' -print0 | xargs -0 chmod -x
 	find ./tools/contributed/traci4j -type f -print0 | xargs -0 chmod -x
 	chmod -x ./tools/projects/TaxiFCD_Krieg/src/backup/BackupFolder.pyw
 	chmod -x ./tools/build/dailyBuildMSVC8.bat

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sumo.git