lincity-ng: 1.1.2 -> 2.0

3 files changed, 77 insertions, 31 deletions

diff --git a/lincity-ng/.footprint b/lincity-ng/.footprint
index a345834a4..e8cb5ced1 100644
--- a/lincity-ng/.footprint
+++ b/lincity-ng/.footprint
@@ -7,7 +7,6 @@ drwxr-xr-x	root/root	usr/share/applications/
 drwxr-xr-x	root/root	usr/share/lincity-ng/
 -rw-r--r--	root/root	usr/share/lincity-ng/colour.pal
 drwxr-xr-x	root/root	usr/share/lincity-ng/fonts/
--rw-r--r--	root/root	usr/share/lincity-ng/fonts/fixed.ttf
 -rw-r--r--	root/root	usr/share/lincity-ng/fonts/sans.ttf
 drwxr-xr-x	root/root	usr/share/lincity-ng/gui/
 -rw-r--r--	root/root	usr/share/lincity-ng/gui/allgone.xml
@@ -69,6 +68,7 @@ drwxr-xr-x	root/root	usr/share/lincity-ng/gui/
 -rw-r--r--	root/root	usr/share/lincity-ng/gui/solarpowerup.xml
 -rw-r--r--	root/root	usr/share/lincity-ng/gui/speedpanel.xml
 -rw-r--r--	root/root	usr/share/lincity-ng/gui/sustain.xml
+-rw-r--r--	root/root	usr/share/lincity-ng/gui/too-old.xml
 -rw-r--r--	root/root	usr/share/lincity-ng/gui/tradedialog.xml
 -rw-r--r--	root/root	usr/share/lincity-ng/gui/universityup.xml
 -rw-r--r--	root/root	usr/share/lincity-ng/gui/warning.xml
@@ -149,6 +149,7 @@ drwxr-xr-x	root/root	usr/share/lincity-ng/help/en/
 -rw-r--r--	root/root	usr/share/lincity-ng/help/en/tutorial-scenario.xml
 -rw-r--r--	root/root	usr/share/lincity-ng/help/en/tutorial.xml
 -rw-r--r--	root/root	usr/share/lincity-ng/help/en/university.xml
+-rw-r--r--	root/root	usr/share/lincity-ng/help/en/waterwell.xml
 -rw-r--r--	root/root	usr/share/lincity-ng/help/en/windmill.xml
 drwxr-xr-x	root/root	usr/share/lincity-ng/images/
 drwxr-xr-x	root/root	usr/share/lincity-ng/images/gui/
@@ -196,6 +197,8 @@ drwxr-xr-x	root/root	usr/share/lincity-ng/images/gui/buttonpanel/parks/
 -rw-r--r--	root/root	usr/share/lincity-ng/images/gui/buttonpanel/parks/monument.png
 -rw-r--r--	root/root	usr/share/lincity-ng/images/gui/buttonpanel/parks/tree.png
 -rw-r--r--	root/root	usr/share/lincity-ng/images/gui/buttonpanel/parks/water.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/gui/buttonpanel/pointer-query.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/gui/buttonpanel/pointer-yellow.png
 -rw-r--r--	root/root	usr/share/lincity-ng/images/gui/buttonpanel/pointer1.png
 -rw-r--r--	root/root	usr/share/lincity-ng/images/gui/buttonpanel/pottery.png
 drwxr-xr-x	root/root	usr/share/lincity-ng/images/gui/buttonpanel/power/
@@ -228,9 +231,13 @@ drwxr-xr-x	root/root	usr/share/lincity-ng/images/gui/buttonpanel/transport/
 -rw-r--r--	root/root	usr/share/lincity-ng/images/gui/buttonpanel/transport/road.png
 -rw-r--r--	root/root	usr/share/lincity-ng/images/gui/buttonpanel/transport/rocket.png
 -rw-r--r--	root/root	usr/share/lincity-ng/images/gui/buttonpanel/transport/tracks.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/gui/buttonpanel/waterwell.png
 -rw-r--r--	root/root	usr/share/lincity-ng/images/gui/buttonpanel/windmill.png
 drwxr-xr-x	root/root	usr/share/lincity-ng/images/gui/buttons/
+-rw-r--r--	root/root	usr/share/lincity-ng/images/gui/buttons/button-border-1.png
 -rw-r--r--	root/root	usr/share/lincity-ng/images/gui/buttons/button-border-2.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/gui/buttons/button-border-3.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/gui/buttons/button-border-4.png
 -rw-r--r--	root/root	usr/share/lincity-ng/images/gui/buttons/button-border-5.png
 -rw-r--r--	root/root	usr/share/lincity-ng/images/gui/buttons/button-border-6.png
 -rw-r--r--	root/root	usr/share/lincity-ng/images/gui/buttons/button-checked.png
@@ -328,6 +335,8 @@ drwxr-xr-x	root/root	usr/share/lincity-ng/images/gui/window/
 drwxr-xr-x	root/root	usr/share/lincity-ng/images/gui/zoom/
 -rw-r--r--	root/root	usr/share/lincity-ng/images/gui/zoom/zoomin.png
 -rw-r--r--	root/root	usr/share/lincity-ng/images/gui/zoom/zoomout.png
+drwxr-xr-x	root/root	usr/share/lincity-ng/images/help/
+-rw-r--r--	root/root	usr/share/lincity-ng/images/help/powerscoal-example.png
 drwxr-xr-x	root/root	usr/share/lincity-ng/images/mainmenu/
 drwxr-xr-x	root/root	usr/share/lincity-ng/images/mainmenu/buttons/
 -rw-r--r--	root/root	usr/share/lincity-ng/images/mainmenu/buttons/back-clicked.png
@@ -398,6 +407,40 @@ drwxr-xr-x	root/root	usr/share/lincity-ng/images/mainmenu/slider/
 -rw-r--r--	root/root	usr/share/lincity-ng/images/mainmenu/slider/slider-up-highlight.png
 -rw-r--r--	root/root	usr/share/lincity-ng/images/mainmenu/slider/slider-up.png
 drwxr-xr-x	root/root	usr/share/lincity-ng/images/tiles/
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/Railbridge1.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/Railbridge2.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/Railbridge_entrance1_00.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/Railbridge_entrance1_180.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/Railbridge_entrance1_270.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/Railbridge_entrance1_90.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/Railbridge_entrance2_00.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/Railbridge_entrance2_180.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/Railbridge_entrance2_270.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/Railbridge_entrance2_90.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/Railbridge_pg1.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/Railbridge_pg2.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/Roadbridge1.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/Roadbridge1s.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/Roadbridge2.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/Roadbridge2s.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/Roadbridge_entrance1_00.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/Roadbridge_entrance1_180.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/Roadbridge_entrance1_270.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/Roadbridge_entrance1_90.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/Roadbridge_entrance2_00.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/Roadbridge_entrance2_180.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/Roadbridge_entrance2_270.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/Roadbridge_entrance2_90.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/Roadbridge_pg1.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/Roadbridge_pg2.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/Trackbridge1.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/Trackbridge2.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/Trackbridge_entrance_00.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/Trackbridge_entrance_180.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/Trackbridge_entrance_270.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/Trackbridge_entrance_90.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/Trackbridge_pg1.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/Trackbridge_pg2.png
 -rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/blacksmith0.png
 -rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/blacksmith1.png
 -rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/blacksmith2.png
@@ -429,6 +472,22 @@ drwxr-xr-x	root/root	usr/share/lincity-ng/images/tiles/
 -rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/cricket5.png
 -rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/cricket6.png
 -rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/cricket7.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/desert.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/desert_0.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/desert_1d.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/desert_1l.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/desert_1r.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/desert_1u.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/desert_2ld.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/desert_2lr.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/desert_2lu.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/desert_2rd.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/desert_2ru.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/desert_2ud.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/desert_3lrd.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/desert_3lru.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/desert_3lud.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/desert_3rud.png
 -rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/ex_port.png
 -rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/farm0.png
 -rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/farm11.png
@@ -628,6 +687,9 @@ drwxr-xr-x	root/root	usr/share/lincity-ng/images/tiles/
 -rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/trackud.png
 -rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/trackudr.png
 -rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/trackur.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/tree.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/tree2.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/tree3.png
 -rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/university.png
 -rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/water.png
 -rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/waterd.png
@@ -645,6 +707,7 @@ drwxr-xr-x	root/root	usr/share/lincity-ng/images/tiles/
 -rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/waterud.png
 -rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/waterur.png
 -rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/waterurd.png
+-rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/waterwell.png
 -rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/windmill1g.png
 -rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/windmill1r.png
 -rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/windmill1rg.png
@@ -658,28 +721,6 @@ drwxr-xr-x	root/root	usr/share/lincity-ng/images/tiles/
 -rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/windmill3rg.png
 -rw-r--r--	root/root	usr/share/lincity-ng/images/tiles/windmill3w.png
 -rw-r--r--	root/root	usr/share/lincity-ng/lincityconfig.xml
-drwxr-xr-x	root/root	usr/share/lincity-ng/locale/
--rw-r--r--	root/root	usr/share/lincity-ng/locale/ca.po
--rw-r--r--	root/root	usr/share/lincity-ng/locale/cs.po
--rw-r--r--	root/root	usr/share/lincity-ng/locale/de.po
--rw-r--r--	root/root	usr/share/lincity-ng/locale/es.po
--rw-r--r--	root/root	usr/share/lincity-ng/locale/fr.po
-drwxr-xr-x	root/root	usr/share/lincity-ng/locale/gui/
--rw-r--r--	root/root	usr/share/lincity-ng/locale/gui/ca.po
--rw-r--r--	root/root	usr/share/lincity-ng/locale/gui/cs.po
--rw-r--r--	root/root	usr/share/lincity-ng/locale/gui/de.po
--rw-r--r--	root/root	usr/share/lincity-ng/locale/gui/es.po
--rw-r--r--	root/root	usr/share/lincity-ng/locale/gui/fr.po
--rw-r--r--	root/root	usr/share/lincity-ng/locale/gui/nl.po
--rw-r--r--	root/root	usr/share/lincity-ng/locale/gui/pl.po
--rw-r--r--	root/root	usr/share/lincity-ng/locale/gui/pt_BR.po
--rw-r--r--	root/root	usr/share/lincity-ng/locale/gui/ru.po
--rw-r--r--	root/root	usr/share/lincity-ng/locale/gui/sv.po
--rw-r--r--	root/root	usr/share/lincity-ng/locale/nl.po
--rw-r--r--	root/root	usr/share/lincity-ng/locale/pl.po
--rw-r--r--	root/root	usr/share/lincity-ng/locale/pt_BR.po
--rw-r--r--	root/root	usr/share/lincity-ng/locale/ru.po
--rw-r--r--	root/root	usr/share/lincity-ng/locale/sv.po
 drwxr-xr-x	root/root	usr/share/lincity-ng/music/
 -rw-r--r--	root/root	usr/share/lincity-ng/music/01 - pronobozo - lincity.ogg
 -rw-r--r--	root/root	usr/share/lincity-ng/music/02 - Robert van Herk - City Blues.ogg
@@ -687,6 +728,8 @@ drwxr-xr-x	root/root	usr/share/lincity-ng/music/
 drwxr-xr-x	root/root	usr/share/lincity-ng/opening/
 -rw-r--r--	root/root	usr/share/lincity-ng/opening/Beach.scn
 -rw-r--r--	root/root	usr/share/lincity-ng/opening/bad_times.scn
+-rw-r--r--	root/root	usr/share/lincity-ng/opening/extreme_arid.scn
+-rw-r--r--	root/root	usr/share/lincity-ng/opening/extreme_wetland.scn
 -rw-r--r--	root/root	usr/share/lincity-ng/opening/good_times.scn
 drwxr-xr-x	root/root	usr/share/lincity-ng/sounds/
 -rw-r--r--	root/root	usr/share/lincity-ng/sounds/Blacksmith1.wav
diff --git a/lincity-ng/.md5sum b/lincity-ng/.md5sum
index a74144664..5ebb1c054 100644
--- a/lincity-ng/.md5sum
+++ b/lincity-ng/.md5sum
@@ -1 +1 @@
-3b4b67044230bdab64e7976e212cdd80  lincity-ng-1.1.2.tar.bz2
+1bd0f58e0f2b131d70044f4230600ed1  lincity-ng-2.0.tar.bz2
diff --git a/lincity-ng/Pkgfile b/lincity-ng/Pkgfile
index dc863adcd..a26de14cb 100644
--- a/lincity-ng/Pkgfile
+++ b/lincity-ng/Pkgfile
@@ -5,20 +5,23 @@
 # Depends on: jam physfs sdl_gfx sdl_image sdl_mixer sdl_ttf
 
 name=lincity-ng
-version=1.1.2
+version=2.0
 release=1
-source=(http://download.berlios.de/lincity-ng/lincity-ng-$version.tar.bz2)
+source=(http://download.berlios.de/$name/$name-$version.tar.bz2)
 
 build() {
-	cd lincity-ng-$version
+	cd $name-$version
+	local JOBS="$(sed -e 's/.*\(\-j[ 0-9]\+\) .*/\1/' <<< $MAKEFLAGS)"
 
-	./configure --prefix=/usr
+	./configure \
+		--prefix=/usr \
+		--disable-nls
 
-	jam
+	jam $JOBS
 	jam -sprefix=$PKG/usr install
 
 	rm -r \
 		$PKG/usr/share/doc \
-		$PKG/usr/share/lincity-ng/help/{cs,pt_BR,ru,de,es,fr,nl,sv}
+		$PKG/usr/share/lincity-ng/locale \
+		$PKG/usr/share/lincity-ng/help/{ca,cs,de,es,fr,gl,nl,pt_BR,ru,sv,tr}
 }
-