The following commit has been merged in the master branch:
commit 893d148527cb60e1078b0975afd6f36b243d0d25
Author: Christoph Egger <[email protected]>
Date: Fri May 1 18:11:57 2009 +0200
clean p rules with dh7
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..4d7e16a
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,8 @@
+config.cache
+config.log
+config.status
+Makefile
+src/image/makefile
+src/Make.common
+src/make.conf
+src/makefile
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 04b0555..61ead61 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,66 +1,31 @@
#!/usr/bin/make -f
-export QUILT_PATCHES=debian/patches
-
include /usr/share/quilt/quilt.make
-include /usr/share/topgit/tg2quilt.mk
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
+%:
+ dh $@
SAVERESTORE := config.guess config.sub config.status src/include/globals.h
clean: unpatch
- dh_testdir
- dh_testroot
for f in $(SAVERESTORE) ; do [ -f $$f.d-r-orig ] || [ ! -f $$f ] || cp
-p $$f $$f.d-r-orig ; done
- rm -f build-stamp
- rm -f config.guess config.sub
-
- [ ! -f Makefile ] || $(MAKE) clean
- rm -f config.status
- dh_clean
+ dh clean
- rm -f config.cache config.log Makefile src/image/makefile
src/Make.common src/make.conf src/makefile
for f in $(SAVERESTORE) ; do [ ! -f $$f.d-r-orig ] || mv $$f.d-r-orig
$$f ; done
- #for f in $(SAVERESTORE) ; do cp -p ../orig/*/$$f $$f ; done
-config.status: configure patch
- dh_testdir
+override_dh_auto_configure: $(QUILT_STAMPFN)
for f in $(SAVERESTORE) ; do [ -f $$f.d-r-orig ] || cp -p $$f
$$f.d-r-orig ; done
-
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
-
+ ln -sf /usr/share/misc/config.sub .
+ ln -sf /usr/share/misc/config.guess .
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE)
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --bindir=/usr/games
--datadir=/usr/share/games --with-sdl
-build: build-stamp
-build-stamp: config.status
- dh_testdir
-
- $(MAKE)
-
- touch build-stamp
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
+override_dh_auto_install:
# Installing package
$(MAKE) INSTDIR=$(CURDIR)/debian/xwelltris/usr/games
INSTLIB=$(CURDIR)/debian/xwelltris/usr/share/games/xwelltris install
dh_install debian/xwelltris.desktop /usr/share/applications
@@ -70,27 +35,3 @@ install: build
mv debian/xwelltris/usr/share/games/xwelltris/welltris.scores
debian/xwelltris/usr/share/games/xwelltris/welltris.scores.blank
ln -s ../../../../var/games/xwelltris/welltris.scores
debian/xwelltris/usr/share/games/xwelltris/welltris.scores
-binary: binary-arch
-
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs Changelog
- dh_installdocs
- dh_installmenu
- dh_installman
- dh_link
- dh_strip
- dh_desktop
- dh_icons
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary-indep:
-
-.PHONY: clean build install binary binary-arch binary-indep
--
Packaging Xwelltris
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
