r5749 - packages/trunk/wesnoth/debian

Gerfried Fuchs alfie at alioth.debian.org
Wed Feb 13 12:51:22 UTC 2008 

Author: alfie
Date: 2008-02-13 12:51:22 +0000 (Wed, 13 Feb 2008)
New Revision: 5749

Modified:
   packages/trunk/wesnoth/debian/changelog
   packages/trunk/wesnoth/debian/control
   packages/trunk/wesnoth/debian/rules
   packages/trunk/wesnoth/debian/watch
Log:
 * Update watchfile to match everything, not only development releases, for
   the time being until the next stable release.
 * Use fixed control file substitute strings and switch in debian/rules
   appropriately.


Modified: packages/trunk/wesnoth/debian/changelog
===================================================================
--- packages/trunk/wesnoth/debian/changelog	2008-02-13 12:33:26 UTC (rev 5748)
+++ packages/trunk/wesnoth/debian/changelog	2008-02-13 12:51:22 UTC (rev 5749)
@@ -1,3 +1,12 @@
+wesnoth (1:1.3.16-2) unstable; urgency=low
+
+  * Update watchfile to match everything, not only development releases, for
+    the time being until the next stable release.
+  * Use fixed control file substitute strings and switch in debian/rules
+    appropriately.
+
+ -- Gerfried Fuchs <rhonda at debian.at>  Wed, 13 Feb 2008 13:51:02 +0100
+
 wesnoth (1:1.3.16-1) unstable; urgency=low
 
   * New upstream release, upload to unstable now. Update Vcs-* fields in

Modified: packages/trunk/wesnoth/debian/control
===================================================================
--- packages/trunk/wesnoth/debian/control	2008-02-13 12:33:26 UTC (rev 5748)
+++ packages/trunk/wesnoth/debian/control	2008-02-13 12:51:22 UTC (rev 5749)
@@ -91,7 +91,7 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-httt
-Depends: wesnoth (>= ${source:Upstream-Version}), wesnoth (<< ${source:Upstream-Version}.~)
+Depends: wesnoth (>= ${wesnoth:Stable-Version}), wesnoth (<< ${wesnoth:Next-Version})
 Architecture: all
 Description: Heir to the Throne official campaign for Wesnoth
  This package contains the Heir to the Throne campaign for Wesnoth.
@@ -102,7 +102,7 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-tsg
-Depends: wesnoth (>= ${source:Upstream-Version}), wesnoth (<< ${source:Upstream-Version}.~)
+Depends: wesnoth (>= ${wesnoth:Stable-Version}), wesnoth (<< ${wesnoth:Next-Version})
 Architecture: all
 Description: The South Guard official campaign for Wesnoth
  This package contains The South Guard campaign for Wesnoth.
@@ -113,7 +113,7 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-trow
-Depends: wesnoth (>= ${source:Upstream-Version}), wesnoth (<< ${source:Upstream-Version}.~)
+Depends: wesnoth (>= ${wesnoth:Stable-Version}), wesnoth (<< ${wesnoth:Next-Version})
 Architecture: all
 Description: The Rise of Wesnoth official campaign for Wesnoth
  This package contains the Rise of Wesnoth campaign for Wesnoth.
@@ -124,7 +124,7 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-ttb
-Depends: wesnoth (>= ${source:Upstream-Version}), wesnoth (<< ${source:Upstream-Version}.~)
+Depends: wesnoth (>= ${wesnoth:Stable-Version}), wesnoth (<< ${wesnoth:Next-Version})
 Architecture: all
 Description: A Tale of Two Brothers official campaign for Wesnoth
  This package contains A Tale of Two Brothers campaign for Wesnoth.
@@ -135,7 +135,7 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-ei
-Depends: wesnoth (>= ${source:Upstream-Version}), wesnoth (<< ${source:Upstream-Version}.~)
+Depends: wesnoth (>= ${wesnoth:Stable-Version}), wesnoth (<< ${wesnoth:Next-Version})
 Architecture: all
 Description: Eastern Invasion official campaign for Wesnoth
  This package contains the Eastern Invasion campaign for Wesnoth.
@@ -146,7 +146,7 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-utbs
-Depends: wesnoth (>= ${source:Upstream-Version}), wesnoth (<< ${source:Upstream-Version}.~)
+Depends: wesnoth (>= ${wesnoth:Stable-Version}), wesnoth (<< ${wesnoth:Next-Version})
 Architecture: all
 Description: Under the Burning Suns official campaign for Wesnoth
  This package contains the Under the Burning Suns campaign for Wesnoth.
@@ -157,7 +157,7 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-did
-Depends: wesnoth (>= ${source:Upstream-Version}), wesnoth (<< ${source:Upstream-Version}.~)
+Depends: wesnoth (>= ${wesnoth:Stable-Version}), wesnoth (<< ${wesnoth:Next-Version})
 Architecture: all
 Description: Descent into Darkness official campaign for Wesnoth
  This package contains the Descent into Darkness campaign for Wesnoth.
@@ -168,7 +168,7 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-nr
-Depends: wesnoth (>= ${source:Upstream-Version}), wesnoth (<< ${source:Upstream-Version}.~)
+Depends: wesnoth (>= ${wesnoth:Stable-Version}), wesnoth (<< ${wesnoth:Next-Version})
 Architecture: all
 Description: Northern Rebirth official campaign for Wesnoth
  This package contains the Northern Rebirth campaign for Wesnoth.
@@ -179,7 +179,7 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-sof
-Depends: wesnoth (>= ${source:Upstream-Version}), wesnoth (<< ${source:Upstream-Version}.~)
+Depends: wesnoth (>= ${wesnoth:Stable-Version}), wesnoth (<< ${wesnoth:Next-Version})
 Architecture: all
 Description: Sceptre of Fire official campaign for Wesnoth
  This package contains the Sceptre of Fire campaign for Wesnoth.
@@ -190,7 +190,7 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-sotbe
-Depends: wesnoth (>= ${source:Upstream-Version}), wesnoth (<< ${source:Upstream-Version}.~)
+Depends: wesnoth (>= ${wesnoth:Stable-Version}), wesnoth (<< ${wesnoth:Next-Version})
 Architecture: all
 Description: Son of the Black Eye official campaign for Wesnoth
  This package contains the Son of the Black Eye campaign for Wesnoth.
@@ -201,7 +201,7 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-l
-Depends: wesnoth (>= ${source:Upstream-Version}), wesnoth (<< ${source:Upstream-Version}.~)
+Depends: wesnoth (>= ${wesnoth:Stable-Version}), wesnoth (<< ${wesnoth:Next-Version})
 Architecture: all
 Description: Liberty official campaign for Wesnoth
  This package contains the Liberty campaign for Wesnoth.
@@ -212,7 +212,7 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-aoi
-Depends: wesnoth (>= ${source:Upstream-Version}), wesnoth (<< ${source:Upstream-Version}.~)
+Depends: wesnoth (>= ${wesnoth:Stable-Version}), wesnoth (<< ${wesnoth:Next-Version})
 Architecture: all
 Description: An Orcish Incursion official campaign for Wesnoth
  This package contains the An Orcish Incursion campaign for Wesnoth.
@@ -223,7 +223,7 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-thot
-Depends: wesnoth (>= ${source:Upstream-Version}), wesnoth (<< ${source:Upstream-Version}.~)
+Depends: wesnoth (>= ${wesnoth:Stable-Version}), wesnoth (<< ${wesnoth:Next-Version})
 Architecture: all
 Description: The Hammer of Thursagan official campaign for Wesnoth
  This package contains the The Hammer of Thursagan campaign for Wesnoth.

Modified: packages/trunk/wesnoth/debian/rules
===================================================================
--- packages/trunk/wesnoth/debian/rules	2008-02-13 12:33:26 UTC (rev 5748)
+++ packages/trunk/wesnoth/debian/rules	2008-02-13 12:51:22 UTC (rev 5749)
@@ -23,9 +23,18 @@
 # calculate the version strings
 MAJOR_VERSION = $(shell dpkg-parsechangelog | grep "^Version:" | cut -d" " -f2 | cut -d. -f1)
 MINOR_VERSION = $(shell dpkg-parsechangelog | grep "^Version:" | cut -d" " -f2 | cut -d. -f2)
-STABLE_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION)
-NEXT_VERSION = $(MAJOR_VERSION).$(shell echo $$(( $(MINOR_VERSION) + 1 )) )
+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 )) )
+
+## for development releases, we use this so we won't have to change the
+## control file
+STABLE_VERSION = $(UPSTREAM_VERSION)
+NEXT_VERSION = $(UPSTREAM_VERSION).~
+
+
 QUILT_STAMPFN = patch-stamp
 include /usr/share/quilt/quilt.make
 

Modified: packages/trunk/wesnoth/debian/watch
===================================================================
--- packages/trunk/wesnoth/debian/watch	2008-02-13 12:33:26 UTC (rev 5748)
+++ packages/trunk/wesnoth/debian/watch	2008-02-13 12:51:22 UTC (rev 5749)
@@ -1,3 +1,11 @@
 version=2
 # Site/Directory                                       Pattern                                                       Version Script
-http://heanet.dl.sourceforge.net/sourceforge/wesnoth/  wesnoth-([\d]+\.[\d]*[13579](?:\.[\d\.]*)?)\.tar\.(?:bz2|gz)  debian uupdate
+
+## stable branch
+#http://heanet.dl.sourceforge.net/sourceforge/wesnoth/  wesnoth-([\d]+\.[\d]*[13579](?:\.[\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
+
+## everything
+http://heanet.dl.sourceforge.net/sourceforge/wesnoth/  wesnoth-([\d.]+)\.tar\.(?:bz2|gz)  debian uupdate

More information about the Pkg-games-commits mailing list