From 727c7d66d448142d6a87f0f8556a17cd2f5c0641 Mon Sep 17 00:00:00 2001 From: bgk Date: Sun, 20 Feb 2011 13:44:09 +0000 Subject: [PATCH] DEBIAN: Build one package for SDL, and one package for GTK+. Thanks to fernandotcl for the patch. git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@985 a31d4220-a93d-0410-bf67-fe4944624d44 --- debian/changelog | 6 +++ debian/control | 28 +++++++++--- debian/docs | 1 - debian/menu | 2 - debian/rules | 50 ++++++++------------- debian/vbam-gtk.docs | 2 + debian/vbam-gtk.install | 4 ++ debian/vbam-gtk.menu | 2 + debian/vbam-sdl.docs | 3 ++ debian/vbam-sdl.install | 2 + debian/{vbam.manpages => vbam-sdl.manpages} | 0 11 files changed, 58 insertions(+), 42 deletions(-) delete mode 100644 debian/docs delete mode 100644 debian/menu create mode 100644 debian/vbam-gtk.docs create mode 100644 debian/vbam-gtk.install create mode 100644 debian/vbam-gtk.menu create mode 100644 debian/vbam-sdl.docs create mode 100644 debian/vbam-sdl.install rename debian/{vbam.manpages => vbam-sdl.manpages} (100%) diff --git a/debian/changelog b/debian/changelog index e57d9fce..df56c659 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vbam (1.8.0.914-1) unstable; urgency=low + + * Cleanup, packages split into SDL and GTK+ versions + + -- Fernando Tarlá Cardoso Lemos Sun, 04 Oct 2009 19:58:09 -0300 + vbam (1.8.0.913-1) unstable; urgency=low * Using assembly optmizations for i386 and amd64 platforms diff --git a/debian/control b/debian/control index 443f388a..8ad9b588 100644 --- a/debian/control +++ b/debian/control @@ -1,16 +1,30 @@ Source: vbam Section: otherosfs Priority: optional -Maintainer: Fernando Tarlá Cardoso Lemos -Build-Depends: debhelper (>= 7), cmake, nasm [i386 amd64], libsdl1.2-dev, libgl-dev, libgtkmm-2.4-dev, libgtkglextmm-x11-1.2-dev, libsfml-dev +Maintainer: Fernando Tarlá Cardoso Lemos +Build-Depends: debhelper (>= 7), cmake, nasm [i386 amd64], libsdl1.2-dev, libgl-dev, libgtkmm-2.4-dev, libgtkglextmm-x11-1.2-dev Standards-Version: 3.8.1 Homepage: http://www.vbam.com -Package: vbam +Package: vbam-sdl Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Nintendo Game Boy Advance emulator - VisualBoyAdvance-M is a Nintendo Game Boy Emulator with high compatibility - with commercial games. It emulates the Nintendo Game Boy Advance handheld - console, in addition to the original Game Boy handhelds and its Super and - Color variants. + VisualBoyAdvance-M is a Nintendo Game Boy Emulator with high + compatibility with commercial games. It emulates the Nintendo Game + Boy Advance handheld console, in addition to the original Game Boy + handhelds and its Super and Color variants. + . + This package does not provide a GUI version of VisualBoyAdvance-M. + See the vbam-gtk package for the GTK+ version of this program. + +Package: vbam-gtk +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Nintendo Game Boy Advance emulator (GTK+ frontend) + VisualBoyAdvance-M is a Nintendo Game Boy Emulator with high + compatibility with commercial games. It emulates the Nintendo Game + Boy Advance handheld console, in addition to the original Game Boy + handhelds and its Super and Color variants. + . + This package provides the GUI version of VisualBoyAdvance-M. diff --git a/debian/docs b/debian/docs deleted file mode 100644 index 30d29dea..00000000 --- a/debian/docs +++ /dev/null @@ -1 +0,0 @@ -doc/* diff --git a/debian/menu b/debian/menu deleted file mode 100644 index b2838385..00000000 --- a/debian/menu +++ /dev/null @@ -1,2 +0,0 @@ -?package(vbam):needs="X11" section="Applications/Emulators"\ - title="VisualBoyAdvance-M" command="/usr/bin/gvbam" diff --git a/debian/rules b/debian/rules index 56e563e7..9c41deeb 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,7 @@ # Based on an autogenerated debhelper sample # -# Uncomment this to turn on verbose mode. +# Uncomment this to turn on verbose mode #export DH_VERBOSE=1 DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU) @@ -17,63 +17,49 @@ ifeq ($(DH_VERBOSE),1) EXTRA_CMAKE_FLAGS += -DCMAKE_VERBOSE_MAKEFILE=ON endif -# ASM support in currently unmaintained on Linux -#ifneq (,$(filter $(DEB_BUILD_ARCH_CPU),i386 amd64)) -# EXTRA_CMAKE_FLAGS += -DUSE_ASM_SCALERS=ON -DUSE_ASM_CORE=ON -#endif +ifneq (,$(filter $(DEB_BUILD_ARCH_CPU),i386 amd64)) + EXTRA_CMAKE_FLAGS += -DUSE_ASM_SCALERS=ON -DUSE_ASM_CORE=ON +endif builddir/Makefile: dh_testdir - # Add here commands to configure the package. mkdir -p builddir - cd builddir && cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_LD_FLAGS="-Wl,-z,defs" -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" -DCMAKE_SKIP_RPATH=ON $(EXTRA_CMAKE_FLAGS) - + cd builddir && \ + cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_C_FLAGS="$(CFLAGS)" \ + -DCMAKE_LD_FLAGS="-Wl,-z,defs" -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" \ + -DCMAKE_SKIP_RPATH=ON $(EXTRA_CMAKE_FLAGS) build: build-stamp -build-stamp: builddir/Makefile +build-stamp: builddir/Makefile dh_testdir - - # Add here commands to compile the package. $(MAKE) -C builddir - #docbook-to-man debian/vbam.sgml > vbam.1 - touch $@ -clean: +clean: dh_testdir dh_testroot - rm -f build-stamp - - # Add here commands to clean up after the build process. + rm -f build-stamp rm -rf builddir - - - dh_clean + dh_clean install: build dh_testdir dh_testroot - dh_prep + dh_prep dh_installdirs + $(MAKE) -C builddir DESTDIR=$(CURDIR)/debian/tmp install - # Add here commands to install the package into debian/vbam. - $(MAKE) -C builddir DESTDIR=$(CURDIR)/debian/vbam install - - -# Build architecture-independent files here. binary-indep: install -# We have nothing to do by default. -# Build architecture-dependent files here. binary-arch: install dh_testdir dh_testroot - dh_installchangelogs + dh_installchangelogs dh_installdocs dh_installexamples -# dh_install -# dh_installmenu + dh_install + dh_installmenu # dh_installdebconf # dh_installlogrotate # dh_installemacsen @@ -97,4 +83,4 @@ binary-arch: install dh_builddeb binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +.PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/vbam-gtk.docs b/debian/vbam-gtk.docs new file mode 100644 index 00000000..6f8c587f --- /dev/null +++ b/debian/vbam-gtk.docs @@ -0,0 +1,2 @@ +doc/DevInfo.txt +doc/ips.htm diff --git a/debian/vbam-gtk.install b/debian/vbam-gtk.install new file mode 100644 index 00000000..f62f5aa9 --- /dev/null +++ b/debian/vbam-gtk.install @@ -0,0 +1,4 @@ +usr/bin/gvbam +usr/share/icons +usr/share/vbam +usr/share/applications diff --git a/debian/vbam-gtk.menu b/debian/vbam-gtk.menu new file mode 100644 index 00000000..4f02c9d5 --- /dev/null +++ b/debian/vbam-gtk.menu @@ -0,0 +1,2 @@ +?package(gvbam):needs="X11" section="Applications/Emulators"\ + title="VisualBoyAdvance-M" command="/usr/bin/gvbam" diff --git a/debian/vbam-sdl.docs b/debian/vbam-sdl.docs new file mode 100644 index 00000000..1c164a5f --- /dev/null +++ b/debian/vbam-sdl.docs @@ -0,0 +1,3 @@ +doc/DevInfo.txt +doc/ips.htm +doc/ReadMe.SDL.txt diff --git a/debian/vbam-sdl.install b/debian/vbam-sdl.install new file mode 100644 index 00000000..a400b0fe --- /dev/null +++ b/debian/vbam-sdl.install @@ -0,0 +1,2 @@ +etc +usr/bin/vbam diff --git a/debian/vbam.manpages b/debian/vbam-sdl.manpages similarity index 100% rename from debian/vbam.manpages rename to debian/vbam-sdl.manpages