Author: wijnen
Date: 2011-05-15 21:44:35 +0000 (Sun, 15 May 2011)
New Revision: 12382
Added:
packages/trunk/lmemory/debian/lmemory.install
Modified:
packages/trunk/lmemory/debian/changelog
packages/trunk/lmemory/debian/compat
packages/trunk/lmemory/debian/control
packages/trunk/lmemory/debian/rules
Log:
Fix lintian warnings for short description and standards version.
Upgrade to debhelper's dh syntax.
Modified: packages/trunk/lmemory/debian/changelog
===================================================================
--- packages/trunk/lmemory/debian/changelog 2011-05-15 17:47:24 UTC (rev 12381)
+++ packages/trunk/lmemory/debian/changelog 2011-05-15 21:44:35 UTC (rev 12382)
@@ -1,6 +1,12 @@
lmemory (0.6c-5) unstable; urgency=low
- * Update Standards Version: 3.9.1 (no changes need)
+ [ Bas Wijnen ]
+ * Team upload.
+ * debian/control: remove 'a' from short description
+ * Update standards version to 3.9.2 (no changes needed)
+
+ [ Evgeny Dolgikh ]
+ * Update Standards Version: 3.9.1 (no changes needed)
* Fix desktop menu entry (Closes: #565510)
- added resized default.xpm as lmemory.xpm
- fixed .desktop file
@@ -18,7 +24,7 @@
* Add myself in Uploaders
* debian/changelog: removed trailing colons
- -- Evgeny Dolgikh <marcondream at gmail.com> Sat, 29 Jan 2011 12:45:56 +0200
+ -- Bas Wijnen <wijnen at debian.org> Sun, 15 May 2011 20:33:24 +0200
lmemory (0.6c-4) unstable; urgency=low
Modified: packages/trunk/lmemory/debian/compat
===================================================================
--- packages/trunk/lmemory/debian/compat 2011-05-15 17:47:24 UTC (rev 12381)
+++ packages/trunk/lmemory/debian/compat 2011-05-15 21:44:35 UTC (rev 12382)
@@ -1 +1 @@
-7
+8
Modified: packages/trunk/lmemory/debian/control
===================================================================
--- packages/trunk/lmemory/debian/control 2011-05-15 17:47:24 UTC (rev 12381)
+++ packages/trunk/lmemory/debian/control 2011-05-15 21:44:35 UTC (rev 12382)
@@ -3,9 +3,8 @@
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Evgeny Dolgikh <marcondream at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libgtk2.0-dev,
- autoconf, automake, libtool
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 8), libgtk2.0-dev, autoconf, automake, libtool
+Standards-Version: 3.9.2
Homepage: http://home.comcast.net/~x.zhang1/linux_game.html
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/lmemory/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/lmemory/?op=log
@@ -13,7 +12,7 @@
Package: lmemory
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: A children's game based on the "memory" card game
+Description: Children's game based on the "memory" card game
The Linux Memory Game is an X11 game for children ages 3 and up, based on
the card game "Memory". It is written using GTK+ library. Although it is a
children's game, it has five skill levels, the higher ones are challenging
Added: packages/trunk/lmemory/debian/lmemory.install
===================================================================
--- packages/trunk/lmemory/debian/lmemory.install (rev 0)
+++ packages/trunk/lmemory/debian/lmemory.install 2011-05-15 21:44:35 UTC (rev 12382)
@@ -0,0 +1,3 @@
+debian/pixmaps /usr/share/games/lmemory/
+debian/lmemory.desktop /usr/share/applications
+debian/lmemory.xpm /usr/share/pixmaps
Modified: packages/trunk/lmemory/debian/rules
===================================================================
--- packages/trunk/lmemory/debian/rules 2011-05-15 17:47:24 UTC (rev 12381)
+++ packages/trunk/lmemory/debian/rules 2011-05-15 21:44:35 UTC (rev 12382)
@@ -1,105 +1,15 @@
#!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+ dh $@
-CFLAGS=-Wall -g -D__USE_GNU -D_GNU_SOURCE
-INSTALL = install
-INSTALL_FILE = $(INSTALL) -p -o root -g root -m 644
-INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755
-INSTALL_SCRIPT = $(INSTALL) -p -o root -g root -m 755
-INSTALL_DIR = $(INSTALL) -p -d -o root -g root -m 755
+override_dh_auto_configure:
+ autoreconf --force --install --symlink
+ ./configure --prefix=/usr --bindir=/usr/games --datadir=/usr/share/games/lmemory
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- MAKEFLAGS += -j$(NUMJOBS)
-endif
+JUNK = configure ltmain.sh config.guess config.sub aclocal.m4 depcomp install-sh missing Makefile.in INSTALL COPYING
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
-CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-else
-CROSS= --build $(DEB_BUILD_GNU_TYPE)
+override_dh_auto_clean:
+ifneq ($(wildcard $(JUNK)),)
+ rm -r $(wildcard $(JUNK))
endif
-
-
-config: config-stamp
-config-stamp:
- dh_testdir
-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
- autoreconf --force --install
- CFLAGS="$(CFLAGS)" \
- LDFLAGS="-Wl,-z,defs -Wl,--as-needed -Wl,--no-undefined" \
- ./configure --prefix=/usr --mandir=\$${prefix}/share/man \
- --datadir=\$${prefix}/share/games/lmemory \
- --bindir=\$${prefix}/games
- touch $@
-
-build: build-stamp
-build-stamp: config-stamp
- dh_testdir
- $(MAKE)
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f config-stamp build-stamp
- # Clean up the files generated by the autoreconf
- [ ! -f config.status ] || $(MAKE) distclean
- dh_clean ltconfig depcomp install-sh ltmain.sh missing mkinstalldirs \
- INSTALL Makefile.in aclocal.m4 config.h.in configure \
- config.sub config.guess config.log config.cache
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- $(MAKE) install prefix=$(CURDIR)/debian/lmemory/usr
-
- # We provide some default pixmaps here. No need for
- # a Makefile for just a simple data install:
- dh_install debian/pixmaps /usr/share/games/lmemory/
- dh_install debian/lmemory.desktop /usr/share/applications
- dh_install debian/lmemory.xpm /usr/share/pixmaps
-
-#binary-indep: build install
-binary-indep: build
-# We have nothing to do.
-
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdocs
- dh_installmenu
- dh_installman
- dh_installchangelogs ChangeLog
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install config