The following commit has been merged in the master branch:
commit 8dbf71cb0e22e1837f73676f76cb27df6d2beeed
Author: Bruno Kleinert <[email protected]>
Date:   Fri Jul 3 14:57:04 2009 +0200

    Fix broken binary dependency on sauerbraten-data
    
    Generate our own 'optimized' substitution variable in debian/rules for 
binary
    sauerbraten and use it in the dependency field.

diff --git a/debian/changelog b/debian/changelog
index d8fe7da..c0de21e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,8 @@ sauerbraten (0.0.20090504.dfsg-1) unstable; urgency=low
     + Updated section for sauerbraten-dbg
     + Use unicode copyright symbol in debian/copyright
   * Bumped debhelper compatibility level to 7
-  * Binary dependency on sauerbrate-data is now done versioned by a substition-
-    variable
+  * Versioned binary dependency on sauerbraten-data is now put into a generated
+    substitution variable
   * Update Vcs-* fields in debian/control to reflect new repository location
   * Minor changes in README.Debian about download location and from where the
     sources were obtained.
diff --git a/debian/control b/debian/control
index f51b679..c6a7181 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Homepage: http://sauerbraten.org/
 
 Package: sauerbraten
 Architecture: any
-Depends: ${shlibs:Depends}, sauerbraten-data (>= ${source:Upstream-Version})
+Depends: ${shlibs:Depends}, sauerbraten-data (>= ${sauerbraten-data-ver})
 Recommends: sauerbraten-wake6
 Description: 3D first-person game engine
  Sauerbraten is a networked fast-paced 3D first person first-person shooter 
diff --git a/debian/rules b/debian/rules
index ff8f398..cc67a36 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,6 +60,10 @@ binary-arch: build install
        dh_testdir
        dh_testroot
        dh_installchangelogs 
+       # Uhm... yes, it's a hack to strip \.dfsg.* from the version... 
Improvements
+       # appreciated! It's used by gh_gencontrol
+       echo "sauerbraten-data-ver=`head -n1 debian/changelog | egrep -o 
'\(.*\)' | sed -e 's/(//' | sed -e 's/\.dfsg.*//'`" \
+                       >> debian/sauerbraten.substvars
        dh_installdocs
        dh_installdocs --all debian/README.Debian
        dh_installdocs -psauerbraten debian/NEWS.Debian

-- 
Packaging for sauerbraten game engine

_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

Reply via email to