r5985 - in packages/trunk/wesnoth: . debian debian/patches

[Gerfried Fuchs]

Author: alfie
Date: 2008-03-02 21:19:15 +0000 (Sun, 02 Mar 2008)
New Revision: 5985

Modified:
   packages/trunk/wesnoth/
   packages/trunk/wesnoth/debian/changelog
   packages/trunk/wesnoth/debian/patches/01disable-rpath
   packages/trunk/wesnoth/debian/rules
   packages/trunk/wesnoth/debian/watch
Log:
 * New stable upstream release:
   - debian/rules: switch to stable release dependency chain
   - debian/watch: switch to stable release matching only
rpath patch regenerated



Property changes on: packages/trunk/wesnoth
___________________________________________________________________
Name: svn-bp:origUrl
   - http://pkg-games.alioth.debian.org/tarballs/wesnoth_1.3.19.orig.tar.gz

   + http://pkg-games.alioth.debian.org/tarballs/wesnoth_1.4.orig.tar.gz


Modified: packages/trunk/wesnoth/debian/changelog
===================================================================
--- packages/trunk/wesnoth/debian/changelog	2008-03-02 17:40:00 UTC (rev 5984)
+++ packages/trunk/wesnoth/debian/changelog	2008-03-02 21:19:15 UTC (rev 5985)
@@ -1,3 +1,11 @@
+wesnoth (1:1.4-1) unstable; urgency=low
+
+  * New stable upstream release:
+    - debian/rules: switch to stable release dependency chain
+    - debian/watch: switch to stable release matching only
+
+ -- Gerfried Fuchs <rhonda at debian.at>  Sun, 02 Mar 2008 22:17:28 +0100
+
 wesnoth (1:1.3.19-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/trunk/wesnoth/debian/patches/01disable-rpath
===================================================================
--- packages/trunk/wesnoth/debian/patches/01disable-rpath	2008-03-02 17:40:00 UTC (rev 5984)
+++ packages/trunk/wesnoth/debian/patches/01disable-rpath	2008-03-02 21:19:15 UTC (rev 5985)
@@ -1,10 +1,10 @@
 Author: Gerfried Fuchs <rhonda at debian.at>	vim:ft=diff:
 Description: disable rpath for real
 
-Index: wesnoth-1.3.17/configure
+Index: wesnoth-1.4/configure
 ===================================================================
---- wesnoth-1.3.17.orig/configure
-+++ wesnoth-1.3.17/configure
+--- wesnoth-1.4.orig/configure
++++ wesnoth-1.4/configure
 @@ -14467,7 +14467,7 @@ rm -f core conftest.err conftest_ipa8_co
        ac_objext=$boost_save_ac_objext
        LDFLAGS=$boost_save_LDFLAGS

Modified: packages/trunk/wesnoth/debian/rules
===================================================================
--- packages/trunk/wesnoth/debian/rules	2008-03-02 17:40:00 UTC (rev 5984)
+++ packages/trunk/wesnoth/debian/rules	2008-03-02 21:19:15 UTC (rev 5985)
@@ -26,13 +26,13 @@
 UPSTREAM_VERSION =  $(shell dpkg-parsechangelog | grep "^Version:" | cut -d" " -f2 | rev | cut -d- -f2 | rev)
 
 ## if we are in a stable release we use this
-#STABLE_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION)
-#NEXT_VERSION = $(MAJOR_VERSION).$(shell echo $$(( $(MINOR_VERSION) + 1 )) )
+STABLE_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION)
+NEXT_VERSION = $(MAJOR_VERSION).$(shell echo $$(( $(MINOR_VERSION) + 1 )) )
 
 ## for development releases, we use this so we won't have to change the
 ## control file
-STABLE_VERSION = $(UPSTREAM_VERSION)
-NEXT_VERSION = $(UPSTREAM_VERSION).~
+#STABLE_VERSION = $(UPSTREAM_VERSION)
+#NEXT_VERSION = $(UPSTREAM_VERSION).~
 
 
 QUILT_STAMPFN = patch-stamp

Modified: packages/trunk/wesnoth/debian/watch
===================================================================
--- packages/trunk/wesnoth/debian/watch	2008-03-02 17:40:00 UTC (rev 5984)
+++ packages/trunk/wesnoth/debian/watch	2008-03-02 21:19:15 UTC (rev 5985)
@@ -2,10 +2,10 @@
 # Site/Directory                                       Pattern                                                       Version Script
 
 ## stable branch
-#http://heanet.dl.sourceforge.net/sourceforge/wesnoth/  wesnoth-([\d]+\.[\d]*[13579](?:\.[\d\.]*)?)\.tar\.(?:bz2|gz)  debian uupdate
+http://heanet.dl.sourceforge.net/sourceforge/wesnoth/  wesnoth-([\d]+\.[\d]*[02468](?:\.[\d\.]*)?)\.tar\.(?:bz2|gz)  debian uupdate
 
 ## development branch
-#http://heanet.dl.sourceforge.net/sourceforge/wesnoth/  wesnoth-([\d]+\.[\d]*[02468](?:\.[\d\.]*)?)\.tar\.(?:bz2|gz)  debian uupdate
+#http://heanet.dl.sourceforge.net/sourceforge/wesnoth/  wesnoth-([\d]+\.[\d]*[13579](?:\.[\d\.]*)?)\.tar\.(?:bz2|gz)  debian uupdate
 
 ## everything
-http://heanet.dl.sourceforge.net/sourceforge/wesnoth/  wesnoth-([\d.]+)\.tar\.(?:bz2|gz)  debian uupdate
+#http://heanet.dl.sourceforge.net/sourceforge/wesnoth/  wesnoth-([\d.]+)\.tar\.(?:bz2|gz)  debian uupdate