summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-04-21 22:41:52 +0100
committerCarl Hetherington <cth@carlh.net>2013-04-21 22:41:52 +0100
commit47f25009bcbc765e397bcb471dd361a511c99daf (patch)
tree356ac924524183047a84e34674985b3a00c5ca24 /debian
parentafc495f722f89fea0bcc579046d1a5d362e36f69 (diff)
parente8d8a27c7f6861b031b3250b0ad50d04c41a7721 (diff)
Untested merge of master.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog38
-rwxr-xr-xdebian/rules3
2 files changed, 39 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 0a53eff15..a0b068d55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,40 @@
-dcpomatic (0.83-1) UNRELEASED; urgency=low
+dvdomatic (0.84-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan> Sun, 21 Apr 2013 17:49:54 +0100
+
+dvdomatic (0.84beta5-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan> Sun, 21 Apr 2013 00:06:12 +0100
+
+dvdomatic (0.84beta4-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan> Fri, 19 Apr 2013 17:41:58 +0100
+
+dvdomatic (0.84beta3-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan> Fri, 19 Apr 2013 11:36:37 +0100
+
+dvdomatic (0.84beta2-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan> Fri, 19 Apr 2013 11:12:09 +0100
+
+dvdomatic (0.84beta1-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan> Thu, 18 Apr 2013 23:32:17 +0100
+
+dvdomatic (0.83-1) UNRELEASED; urgency=low
* New upstream release.
diff --git a/debian/rules b/debian/rules
index ba42e5291..7f7da5530 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,8 @@
dh $@
override_dh_auto_configure:
- ./waf --nocache configure --prefix=/usr --static
+ LINKFLAGS=$(CDIST_LINKFLAGS) CXXFLAGS="$(CXXFLAGS) $(CDIST_CXXFLAGS)" PKG_CONFIG_PATH=$(CDIST_PKG_CONFIG_PATH) \
+ ./waf --nocache configure --prefix=/usr --static
override_dh_auto_build:
./waf --nocache build