r8102 - packages/branches/wesnoth/experimental/debian

[Gerfried Fuchs]

Author: alfie
Date: 2008-09-11 13:18:15 +0000 (Thu, 11 Sep 2008)
New Revision: 8102

Modified:
   packages/branches/wesnoth/experimental/debian/changelog
   packages/branches/wesnoth/experimental/debian/control
   packages/branches/wesnoth/experimental/debian/rules
   packages/branches/wesnoth/experimental/debian/wesnoth.install
Log:
wesnoth_editor(6) won't get installed anymore - symlink it for the time being. Also add a Conflict in wesnoth to make the replacing proper.

Modified: packages/branches/wesnoth/experimental/debian/changelog
===================================================================
--- packages/branches/wesnoth/experimental/debian/changelog	2008-09-10 11:40:50 UTC (rev 8101)
+++ packages/branches/wesnoth/experimental/debian/changelog	2008-09-11 13:18:15 UTC (rev 8102)
@@ -13,7 +13,7 @@
     appropriate Replaces and Provides entries.
   * Allow to hand over arguments to wesnoth-nolog.
 
- -- Gerfried Fuchs <rhonda at debian.at>  Wed, 10 Sep 2008 10:20:31 +0200
+ -- Gerfried Fuchs <rhonda at debian.at>  Thu, 11 Sep 2008 15:15:47 +0200
 
 wesnoth (1:1.5.3-1) experimental; urgency=low
 

Modified: packages/branches/wesnoth/experimental/debian/control
===================================================================
--- packages/branches/wesnoth/experimental/debian/control	2008-09-10 11:40:50 UTC (rev 8101)
+++ packages/branches/wesnoth/experimental/debian/control	2008-09-11 13:18:15 UTC (rev 8102)
@@ -32,6 +32,7 @@
 Depends: ${shlibs:Depends}, wesnoth-data (= ${source:Version})
 Replaces: wesnoth-data (<< 1:1.3.9-3), wesnoth-editor (<< 1:1.5.4-1)
 Provides: wesnoth-editor
+Conflicts: wesnoth-editor
 Recommends: wesnoth-ttb, wesnoth-httt, wesnoth-tsg
 Suggests: wesnoth-all
 Description: fantasy turn-based strategy game

Modified: packages/branches/wesnoth/experimental/debian/rules
===================================================================
--- packages/branches/wesnoth/experimental/debian/rules	2008-09-10 11:40:50 UTC (rev 8101)
+++ packages/branches/wesnoth/experimental/debian/rules	2008-09-11 13:18:15 UTC (rev 8102)
@@ -164,9 +164,11 @@
 	for i in debian/wesnoth/usr/share/man/*/man6/wesnoth.6; do \
 		ln -s wesnoth.6.gz `dirname $$i`/wesnoth-nolog.6.gz; \
 		ln -s wesnoth.6.gz `dirname $$i`/wesnoth-smallgui.6.gz; \
+		ln -s wesnoth.6.gz `dirname $$i`/wesnoth_editor.6.gz; \
 		done
 	ln -s wesnoth.6.gz debian/wesnoth/usr/share/man/man6/wesnoth-nolog.6.gz
 	ln -s wesnoth.6.gz debian/wesnoth/usr/share/man/man6/wesnoth-smallgui.6.gz
+	ln -s wesnoth.6.gz debian/wesnoth/usr/share/man/man6/wesnoth_editor.6.gz
 
 	for i in wesnoth wesnoth-dbg; do \
 		install -p -d -m755 debian/$$i/usr/share/doc; \

Modified: packages/branches/wesnoth/experimental/debian/wesnoth.install
===================================================================
--- packages/branches/wesnoth/experimental/debian/wesnoth.install	2008-09-10 11:40:50 UTC (rev 8101)
+++ packages/branches/wesnoth/experimental/debian/wesnoth.install	2008-09-11 13:18:15 UTC (rev 8102)
@@ -4,8 +4,6 @@
 debian/wesnoth_editor /usr/games
 debian/tmp/usr/share/man/man6/wesnoth.6
 debian/tmp/usr/share/man/*/man6/wesnoth.6
-debian/tmp/usr/share/man/man6/wesnoth_editor.6
-debian/tmp/usr/share/man/*/man6/wesnoth_editor.6
 icons/wesnoth.desktop /usr/share/applications
 icons/wesnoth_editor.desktop /usr/share/applications
 debian/wesnoth-icon.xpm /usr/share/pixmaps