[sumo] 10/10: Update patch, changelog number.

[Anton Gladky]

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

gladk pushed a commit to branch experimental
in repository sumo.

commit 834d0db97d3dd4c2682e93ec043c506af303a658
Author: Anton Gladky <gladk at debian.org>
Date:   Thu Nov 20 22:17:48 2014 +0100

    Update patch, changelog number.
---
 debian/changelog                           |  2 +-
 debian/patches/remove_embedded_gl2ps.patch | 42 +++++++++++++++++++-----------
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b36e9d0..6df9406 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-sumo (0.22.0+dfsg-1) experimental; urgency=medium
+sumo (0.22.0+dfsg-1~exp1) experimental; urgency=medium
 
   * [08bef65] Add Files-Excluded to d/copyright.
   * [01c89e5] Imported Upstream version 0.22.0+dfsg
diff --git a/debian/patches/remove_embedded_gl2ps.patch b/debian/patches/remove_embedded_gl2ps.patch
index 5fa20dc..a432022 100644
--- a/debian/patches/remove_embedded_gl2ps.patch
+++ b/debian/patches/remove_embedded_gl2ps.patch
@@ -2,10 +2,10 @@ Description: Remove from compilation embedded copy of gl2ps, use packaged versio
 Author: Anton Gladky <gladky.anton at gmail.com>
 Last-Update: 2012-12-04
 
-Index: sumo/src/Makefile.am
+Index: sumo-0.22.0/src/Makefile.am
 ===================================================================
---- sumo.orig/src/Makefile.am
-+++ sumo/src/Makefile.am
+--- sumo-0.22.0.orig/src/Makefile.am
++++ sumo-0.22.0/src/Makefile.am
 @@ -84,7 +84,6 @@ sumo_gui_LDADD =  ./gui/libgui.a \
  ./utils/foxtools/libfoxtools.a \
  $(MESOGUI_LIBS) \
@@ -14,10 +14,10 @@ Index: sumo/src/Makefile.am
  ./foreign/polyfonts/libpolyfonts.a \
  ./gui/GUIManipulator.o \
  ./gui/GUITLLogicPhasesTrackerWindow.o \
-Index: sumo/src/Makefile.in
+Index: sumo-0.22.0/src/Makefile.in
 ===================================================================
---- sumo.orig/src/Makefile.in
-+++ sumo/src/Makefile.in
+--- sumo-0.22.0.orig/src/Makefile.in
++++ sumo-0.22.0/src/Makefile.in
 @@ -157,7 +157,6 @@ am__DEPENDENCIES_3 = ./netload/libnetloa
  @WITH_GUI_TRUE@	./utils/gui/tracker/libguiutilstracker.a \
  @WITH_GUI_TRUE@	./utils/foxtools/libfoxtools.a $(MESOGUI_LIBS) \
@@ -34,10 +34,10 @@ Index: sumo/src/Makefile.in
  @WITH_GUI_TRUE at ./foreign/polyfonts/libpolyfonts.a \
  @WITH_GUI_TRUE at ./gui/GUIManipulator.o \
  @WITH_GUI_TRUE at ./gui/GUITLLogicPhasesTrackerWindow.o \
-Index: sumo/src/foreign/Makefile.am
+Index: sumo-0.22.0/src/foreign/Makefile.am
 ===================================================================
---- sumo.orig/src/foreign/Makefile.am
-+++ sumo/src/foreign/Makefile.am
+--- sumo-0.22.0.orig/src/foreign/Makefile.am
++++ sumo-0.22.0/src/foreign/Makefile.am
 @@ -3,7 +3,7 @@ MEMDIRS = nvwa
  endif
  
@@ -47,10 +47,10 @@ Index: sumo/src/foreign/Makefile.am
  endif
  
  
-Index: sumo/src/foreign/Makefile.in
+Index: sumo-0.22.0/src/foreign/Makefile.in
 ===================================================================
---- sumo.orig/src/foreign/Makefile.in
-+++ sumo/src/foreign/Makefile.in
+--- sumo-0.22.0.orig/src/foreign/Makefile.in
++++ sumo-0.22.0/src/foreign/Makefile.in
 @@ -142,7 +142,7 @@ am__define_uniq_tagged_files = \
    done | $(am__uniquify_input)`
  ETAGS = etags
@@ -69,10 +69,10 @@ Index: sumo/src/foreign/Makefile.in
  EXTRA_DIST = additional.txt
  SUBDIRS = eulerspiral mersenne tcpip $(MEMDIRS) $(GUIDIRS) 
  all: all-recursive
-Index: sumo/src/utils/gui/windows/GUISUMOAbstractView.cpp
+Index: sumo-0.22.0/src/utils/gui/windows/GUISUMOAbstractView.cpp
 ===================================================================
---- sumo.orig/src/utils/gui/windows/GUISUMOAbstractView.cpp
-+++ sumo/src/utils/gui/windows/GUISUMOAbstractView.cpp
+--- sumo-0.22.0.orig/src/utils/gui/windows/GUISUMOAbstractView.cpp
++++ sumo-0.22.0/src/utils/gui/windows/GUISUMOAbstractView.cpp
 @@ -39,7 +39,7 @@
  #include <limits>
  #include <fxkeys.h>
@@ -82,3 +82,15 @@ Index: sumo/src/utils/gui/windows/GUISUMOAbstractView.cpp
  #include <utils/foxtools/FXSingleEventThread.h>
  #include <utils/foxtools/MFXCheckableButton.h>
  #include <utils/foxtools/MFXImageHelper.h>
+Index: sumo-0.22.0/configure.ac
+===================================================================
+--- sumo-0.22.0.orig/configure.ac
++++ sumo-0.22.0/configure.ac
+@@ -437,7 +437,6 @@ src/activitygen/activities/Makefile
+ src/activitygen/city/Makefile
+ src/foreign/Makefile
+ src/foreign/eulerspiral/Makefile
+-src/foreign/gl2ps/Makefile
+ src/foreign/mersenne/Makefile
+ src/foreign/nvwa/Makefile
+ src/foreign/polyfonts/Makefile

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