diff -Nru performous-0.6.1/debian/changelog performous-0.6.1/debian/changelog --- performous-0.6.1/debian/changelog 2012-01-31 11:56:42.000000000 +0000 +++ performous-0.6.1/debian/changelog 2012-02-16 10:02:11.000000000 +0000 @@ -1,10 +1,13 @@ -performous (0.6.1-4ubuntu1) precise; urgency=low +performous (0.6.1-5) unstable; urgency=low - * Merge from Debian testing, remaining changes: - - Check for jpeglib.h which is actually included instead of jconfig.h. - The latter is installed in multiarch location. + * Team upload. + * Check for jpeglib.h which is actually included instead of jconfig.h. + The latter is installed in multiarch location. Patch from Ilya Barygin. + (Closes: #659740) + * Add build-arch and build-indep targets. + * Fix Vcs-Browser link. - -- Felix Geyer Tue, 31 Jan 2012 12:55:12 +0100 + -- Felix Geyer Tue, 31 Jan 2012 15:26:47 +0100 performous (0.6.1-4) unstable; urgency=low @@ -17,19 +20,6 @@ -- Ansgar Burchardt Sun, 15 Jan 2012 22:48:58 +0100 -performous (0.6.1-3ubuntu1) precise; urgency=low - - * Check for jpeglib.h which is actually included instead of jconfig.h. - The latter is installed in multiarch location. - - -- Ilya Barygin Sat, 19 Nov 2011 13:35:16 +0400 - -performous (0.6.1-3build1) precise; urgency=low - - * Rebuild for libmagickcore4. - - -- Colin Watson Fri, 18 Nov 2011 15:54:06 +0000 - performous (0.6.1-3) unstable; urgency=low * Team upload. diff -Nru performous-0.6.1/debian/control performous-0.6.1/debian/control --- performous-0.6.1/debian/control 2012-01-31 11:55:59.000000000 +0000 +++ performous-0.6.1/debian/control 2012-02-16 09:56:28.000000000 +0000 @@ -1,8 +1,7 @@ Source: performous Section: games Priority: extra -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Games Team +Maintainer: Debian Games Team Uploaders: Miriam Ruiz Build-Depends: debhelper (>= 7), cmake (>= 2.6), pkg-config, help2man, gettext, @@ -16,7 +15,7 @@ libgstreamer0.10-dev, libglew1.5-dev Standards-Version: 3.9.2 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/performous/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/performous/?op=log +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/performous/ Homepage: http://performous.org/ Package: performous diff -Nru performous-0.6.1/debian/rules performous-0.6.1/debian/rules --- performous-0.6.1/debian/rules 2012-01-15 21:47:11.000000000 +0000 +++ performous-0.6.1/debian/rules 2012-02-16 09:56:28.000000000 +0000 @@ -27,7 +27,9 @@ -DCMAKE_C_FLAGS:STRING="$(CFLAGS)" touch $@ -build: build-stamp +build: build-arch build-indep +build-arch: build-stamp +build-indep: build-stamp build-stamp: configure-stamp dh_testdir cd $(BUILD_TREE); $(MAKE) @@ -110,4 +112,4 @@ dh_builddeb -a -- -Zxz binary: binary-arch binary-indep -.PHONY: build clean binary-indep binary-arch binary install configure +.PHONY: build-arch build-indep build clean binary-indep binary-arch binary install configure