Merge branch 'master' into debian-dbg

diff --git a/builds/control-12.04-32 b/builds/control-12.04-32
index 8cb5aceb3b461e59831601c4a95b28926e575a0c..0f52d03ae4e984ba4297f2b5c0e765c92df10851 100644 (file)
--- a/builds/control-12.04-32
+++ b/builds/control-12.04-32
@@ -13,3 +13,12 @@ Description: Generator of Digital Cinema Packages (DCPs)
   DVD-o-matic generates Digital Cinema Packages (DCPs) from video and audio
   files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant
   digital projectors.
+
+Package: dvdomatic-dbg
+Architecture: i386
+Section: debug
+Priority: extra
+Depends: ${dvdomatic:Depends}, ${misc:Depends}
+Description: debugging symbols for dvdomatic
+  This package contains the debugging symbols for dvdomatic.
+

diff --git a/builds/control-12.04-64 b/builds/control-12.04-64
index cdb15a87b78a1256ca43721fe3c0a4c3633409e2..fa4b4476e77773708487f52073177edf0df8851c 100644 (file)
--- a/builds/control-12.04-64
+++ b/builds/control-12.04-64
@@ -13,3 +13,12 @@ Description: Generator of Digital Cinema Packages (DCPs)
   DVD-o-matic generates Digital Cinema Packages (DCPs) from video and audio
   files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant
   digital projectors.
+
+Package: dvdomatic-dbg
+Architecture: amd64
+Section: debug
+Priority: extra
+Depends: ${dvdomatic:Depends}, ${misc:Depends}
+Description: debugging symbols for dvdomatic
+  This package contains the debugging symbols for dvdomatic.
+

diff --git a/builds/control-12.10-32 b/builds/control-12.10-32
index 1dc91b7018cdeed82ba66176ee05674605f5808e..0e5fc1f466ecfced9203d368b8343f0fc92b51fb 100644 (file)
--- a/builds/control-12.10-32
+++ b/builds/control-12.10-32
@@ -13,3 +13,11 @@ Description: Generator of Digital Cinema Packages (DCPs)
   DVD-o-matic generates Digital Cinema Packages (DCPs) from video and audio
   files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant
   digital projectors.
+
+Package: dvdomatic-dbg
+Architecture: i386
+Section: debug
+Priority: extra
+Depends: ${dvdomatic:Depends}, ${misc:Depends}
+Description: debugging symbols for dvdomatic
+  This package contains the debugging symbols for dvdomatic.

diff --git a/builds/control-12.10-64 b/builds/control-12.10-64
index ed0b36b2ef060f2bed36db893baac7eb37460ce7..24e16b4b5afe3c21d3abb531e2d431fef0a0943e 100644 (file)
--- a/builds/control-12.10-64
+++ b/builds/control-12.10-64
@@ -13,3 +13,12 @@ Description: Generator of Digital Cinema Packages (DCPs)
   DVD-o-matic generates Digital Cinema Packages (DCPs) from video and audio
   files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant
   digital projectors.
+
+Package: dvdomatic-dbg
+Architecture: amd64
+Section: debug
+Priority: extra
+Depends: ${dvdomatic:Depends}, ${misc:Depends}
+Description: debugging symbols for dvdomatic
+  This package contains the debugging symbols for dvdomatic.
+

diff --git a/cscript b/cscript
index d985838fc876cd742cdc3c5e87e87eed3cbde346..0111e9638db266ecdab5499b620497fa95a241f5 100644 (file)
--- a/cscript
+++ b/cscript
@@ -55,7 +55,12 @@ def package(env, target, version):
         env.set('CDIST_CXXFLAGS', env.get('CXXFLAGS'))
         env.set('CDIST_PKG_CONFIG_PATH', env.get('PKG_CONFIG_PATH'))
         env.command('dpkg-buildpackage')
-        return os.path.abspath(glob.glob('../*.deb')[0])
+        
+        debs = []
+        for p in glob.glob('../*.deb'):
+            debs.append(os.path.abspath(p))
+
+        return debs
 
 def make_pot(env):
     env.command('./waf pot')

diff --git a/debian/rules b/debian/rules
index a2bf70bd87a595913382c4de942d07f3016e6767..f2b2219beb7c56829e770256c1810a3a68db03a7 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@
 
 override_dh_auto_configure:
        LINKFLAGS=$(CDIST_LINKFLAGS) CXXFLAGS="$(CXXFLAGS) $(CDIST_CXXFLAGS)" PKG_CONFIG_PATH=$(CDIST_PKG_CONFIG_PATH) \
-                ./waf --nocache configure --prefix=/usr --static
+                ./waf --nocache configure --prefix=/usr --static --enable-debug
 
 override_dh_auto_build:
        ./waf --nocache build
@@ -22,3 +22,6 @@ override_dh_auto_build:
 override_dh_auto_install:
        ./waf --nocache install --destdir=debian/dvdomatic
 
+.PHONY: override_dh_strip
+override_dh_strip:
+       dh_strip --dbg-package=dvdomatic-dbg