Bug#821977: csmash: Build arch:all+arch:any but is missing build-{arch,indep} targets

2016-09-28 Thread Markus Koschany
Control: tags -1 pending

On Wed, 20 Apr 2016 22:50:23 +0200 ni...@thykier.net wrote:
> Package: csmash
> Severity: normal
> Usertags: arch-all-and-any-missing-targets
> 
> Hi,
> 
> The package csmash builds an architecture independent *and* an
> architecture dependent package, but does not have the (now mandatory)
> "build-arch" and "build-indep" targets in debian/rules.

[...]

Dear maintainer,

I've just uploaded an NMU for csmash versioned as 0.6.6-6.8. Please find
attached the debdiff.

Regards,

Markus
diff -Nru csmash-0.6.6/debian/changelog csmash-0.6.6/debian/changelog
--- csmash-0.6.6/debian/changelog   2015-03-31 06:00:23.0 +0200
+++ csmash-0.6.6/debian/changelog   2016-09-28 20:17:03.0 +0200
@@ -1,3 +1,12 @@
+csmash (0.6.6-6.8) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add build-arch and build-indep targets to debian/rules. (Closes: #821977)
+  * Provide a desktop file for csmash.
+Thanks to James Westby for the report. (Closes: #488276)
+
+ -- Markus Koschany   Wed, 28 Sep 2016 20:17:03 +0200
+
 csmash (0.6.6-6.7) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru csmash-0.6.6/debian/csmash.desktop csmash-0.6.6/debian/csmash.desktop
--- csmash-0.6.6/debian/csmash.desktop  1970-01-01 01:00:00.0 +0100
+++ csmash-0.6.6/debian/csmash.desktop  2016-09-28 20:17:03.0 +0200
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Cannon Smash
+Comment=3D tabletennis game
+Comment[de]=Tischtennisspiel in 3D
+Exec=csmash
+Icon=csmash
+Terminal=false
+Type=Application
+Categories=Game;SportsGame;
+StartupNotify=false
+Keywords=table;tennis;sport;3D;
diff -Nru csmash-0.6.6/debian/csmash.dirs csmash-0.6.6/debian/csmash.dirs
--- csmash-0.6.6/debian/csmash.dirs 2010-05-02 19:28:21.0 +0200
+++ csmash-0.6.6/debian/csmash.dirs 2016-09-28 20:17:03.0 +0200
@@ -1,2 +1,3 @@
 usr/share/pixmaps
 usr/share/games
+usr/share/applications
diff -Nru csmash-0.6.6/debian/rules csmash-0.6.6/debian/rules
--- csmash-0.6.6/debian/rules   2010-05-11 20:29:58.0 +0200
+++ csmash-0.6.6/debian/rules   2016-09-28 20:17:03.0 +0200
@@ -7,6 +7,8 @@
 
 DEBIAN_DIR = $(shell pwd)/debian
 
+build-arch: build
+build-indep: build
 build: build-stamp
 build-stamp:
dh_testdir
@@ -62,6 +64,8 @@
localedir=$(DEBIAN_DIR)/$(package)/usr/share/locale
install -D -m 644 debian/csmash.xpm \
$(DEBIAN_DIR)/$(package)/usr/share/pixmaps/csmash.xpm
+   install -D -m 644 debian/csmash.desktop \
+   $(DEBIAN_DIR)/$(package)/usr/share/applications/csmash.desktop
# Delete empty dir
rmdir $(DEBIAN_DIR)/$(package)/usr/share/games
touch install-stamp
@@ -99,4 +103,4 @@
dh_builddeb -a
 
 binary: binary-indep binary-arch
-.PHONY: binary clean binary-indep binary-arch binary install
+.PHONY: binary clean binary-indep binary-arch binary install build build-arch 
build-indep


signature.asc
Description: OpenPGP digital signature


Bug#821977: csmash: Build arch:all+arch:any but is missing build-{arch,indep} targets

2016-07-28 Thread Santiago Vila
tags 821977 + patch
thanks

I also recommend switching to dh, but in the meantime, the attached
patch should work.

Thanks.--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,8 @@ package-data=csmash-data
 
 DEBIAN_DIR = $(shell pwd)/debian
 
+build-arch: build
+build-indep: build
 build: build-stamp
 build-stamp:
dh_testdir
@@ -99,4 +101,4 @@ binary-arch: build install
dh_builddeb -a
 
 binary: binary-indep binary-arch
-.PHONY: binary clean binary-indep binary-arch binary install
+.PHONY: binary clean binary-indep binary-arch binary install build build-arch 
build-indep