[mupen64plus-video-z64] 75/161: Merge commit 'debian/1.99.4-4' into experimental
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 06:20:30 UTC 2015
This is an automated email from the git hooks/post-receive script.
ecsv-guest pushed a commit to branch master
in repository mupen64plus-video-z64.
commit a0c647385f7beea2a22d473a03ae0651cf5a52d6
Merge: f29395d 2ce0bfa
Author: Sven Eckelmann <sven at narfation.org>
Date: Mon Oct 31 15:17:24 2011 +0100
Merge commit 'debian/1.99.4-4' into experimental
Conflicts:
debian/changelog
debian/changelog | 218 ++++++++++++++++++++++++++++++-------------------------
debian/control | 1 -
debian/copyright | 2 +-
debian/rules | 6 --
4 files changed, 122 insertions(+), 105 deletions(-)
diff --cc debian/changelog
index d4ce1fd,38b0348..28d55a4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,16 +1,38 @@@
+mupen64plus-video-z64 (1.99.4+26+4e8c27128826-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot from revision 4e8c2712882684af5233ea66b7033ecf6043a3cb
+ * debian/patches:
+ - Rebase printf_fixup.patch against 1.99.4+26+4e8c27128826
+
+ -- Sven Eckelmann <sven at narfation.org> Sun, 04 Sep 2011 13:27:34 +0200
+
+mupen64plus-video-z64 (1.99.4+24+81f51799ae45-1) experimental; urgency=low
+
+ * New upstream snapshot from revision 81f51799ae4560b8a3b644ba992d0ddd747464ac
+ * debian/control:
- - Add virtual package libsdl-dev as alternative build dependency
+ - Depend on mupen64plus-*-abi-2
+ - Build-Depend on libmupen64plus-dev >= 1.99.4+77+8bb0e6b3ae3a-1
+ * Don't mix implicit and explicit rules to prevent FTBFS with make 3.82
+ * debian/patches:
+ - Remove upstream merged patch rewrite_makefile.patch
+ - Rebase printf_fixup.patch against 1.99.4+24+81f51799ae45
+ * Add debian/get-orig-source.sh for snapshots
+
+ -- Sven Eckelmann <sven at narfation.org> Mon, 29 Aug 2011 17:07:17 +0200
+
+ mupen64plus-video-z64 (1.99.4-4) unstable; urgency=low
+
+ * debian/control:
+ - Add virtual package libsdl-dev as alternative build dependency
+ * Don't mix implicit and explicit rules to prevent FTBFS with make
+ 3.82
+ * Remove hardening-includes which are now integrated in dpkg-
+ buildflags
+ * Use debian packaging manual URL as format identifier in
+ debian/copyright
+
+ -- Sven Eckelmann <sven at narfation.org> Mon, 31 Oct 2011 12:50:51 +0100
+
mupen64plus-video-z64 (1.99.4-3) unstable; urgency=low
* Upload to unstable
diff --cc debian/control
index 552aea0,4cd58bb..9998b83
--- a/debian/control
+++ b/debian/control
@@@ -11,10 -11,9 +11,9 @@@ Vcs-Browser: http://anonscm.debian.org/
Build-Depends:
debhelper (>= 8.1.3),
dpkg-dev (>= 1.16.0),
- hardening-includes,
libgl1-mesa-dev | libgl-dev,
libglew1.6-dev | libglew-dev,
- libmupen64plus-dev,
+ libmupen64plus-dev (>= 1.99.4+77+8bb0e6b3ae3a),
libsdl1.2-dev | libsdl-dev,
pkg-config,
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-z64.git
More information about the Pkg-games-commits
mailing list