The following commit has been merged in the master branch:
commit 53c9fbc2ddbdb5e713d8943ac7b7a9149849c199
Merge: 2009cc69efd8211c327b2b0a188fb6436de0eab5
440f5176eddf9efd10c5f17afed667071af9ab25
Author: Cesare Falco <cesare.fa...@gmail.com>
Date: Thu May 31 12:21:24 2012 +0200
Merge branch 'master' of git://git.debian.org/git/pkg-games/mess
Conflicts:
debian/changelog
diff --combined debian/changelog
index de77398,59ce4f4..0000000
deleted file mode 100644,100644
--- a/debian/changelog
+++ /dev/null
diff --combined debian/rules
index b5941f4,233eae6..552fc3b
--- a/debian/rules
+++ b/debian/rules
@@@ -148,8 -148,7 +148,8 @@@ override_dh_auto_build
override_dh_auto_clean:
echo "Starting clean process..."
$(MAKE) $(DEB_MESS_OPTS) clean
- [ ! -f default.mess.ini ] || rm default.mess.ini
+ rm -rf default.mess.ini
+ rm -rf obj
# dh_installchangelogs doesn't know about whatsnew.txt,
# so we need to make an explicit call
@@@ -173,7 -172,7 +173,7 @@@ VERSION := $(shell dpkg-parsechangelog
MESS_PACKAGE = mess
MESS_FILEBASE = $(MESS_PACKAGE)$(VERSION)
- MESS_URL = http://ftp.fr.netbsd.org/pub/NetBSD/packages/distfiles/
+ MESS_URL = http://www.progettosnaps.net/MESS/src/
AGENT = Debian MAME/MESS Packagers <m...@packages.debian.org>
TMPDIR := $(shell mktemp --dry-run --directory -p .)
--
mess system emulator
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
