--- gem-0.92.2.orig/debian/control +++ gem-0.92.2/debian/control @@ -1,14 +1,26 @@ Source: gem Section: graphics Priority: optional -Maintainer: IOhannes m zmoelnig (gpg-key at iem) +Maintainer: Paul Brossier +Uploaders: IOhannes m zmoelnig (gpg-key at iem) + Guenter Geiger (Debian/GNU) , Homepage: http://gem.iem.at/ -Build-Depends: debhelper (>=7) , cdbs, autoconf, pkg-config, - puredata | pd, - libftgl-dev, libmagick++9-dev, - libxxf86vm-dev, libgl1-mesa-dev | libgl-dev, zlib1g-dev (>= 1:1.1.3), - libquicktime-dev, libmpeg3-dev, - libdv-dev, libv4l-dev +Build-Depends: debhelper (>= 7.0.50~), + quilt, + autoconf, + automake, + pkg-config, + puredata | pd, + libftgl-dev, + libmagick++9-dev, + libxxf86vm-dev, + libgl1-mesa-dev | libgl-dev, + zlib1g-dev (>= 1:1.1.3), + libquicktime-dev, + libmpeg3-dev, + libavifile-0.7-dev, + libdv-dev, + libv4l-dev Standards-Version: 3.8.3 Package: gem --- gem-0.92.2.orig/debian/README.source +++ gem-0.92.2/debian/README.source @@ -0,0 +1,5 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +Read more about this on /usr/share/doc/quilt/README.source. --- gem-0.92.2.orig/debian/rules +++ gem-0.92.2/debian/rules @@ -1,14 +1,41 @@ #!/usr/bin/make -f -DEB_SRCDIR = src -DEB_AUTO_UPDATE_AUTOCONF = 2.57 -DEB_AUTO_UPDATE_ACLOCAL = 1.11 - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/autotools.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 -DEB_CONFIGURE_EXTRA_FLAGS = --without-ALL --with-ftgl --with-ImageMagick --with-lqt --with-libquicktime --with-libmpeg3 --with-v4l --with-libv4l1 --with-libv4l2 --with-default-font=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf +archconfflags := \ + --prefix=/usr \ + --without-ALL \ + --with-ImageMagick \ + --with-lqt \ + --with-libquicktime \ + --with-libmpeg3 \ + --with-avifile \ + --with-v4l \ + --with-libv4l1 \ + --with-libv4l2 \ + --with-ftgl \ + --with-default-font=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf -DEB_INSTALL_CHANGELOGS_ALL = ChangeLog -DEB_FIXPERMS_EXCLUDE = /usr/share/gem/pd-gem +%: + dh --with quilt $@ + +override_dh_auto_configure: + cd src && CFLAGS="$(CFLAGS)" ./configure $(archconfflags) + +override_dh_auto_build: + dh build --before dh_auto_build + cd src && make + dh build --after dh_auto_build + +override_dh_auto_clean: + dh clean --before dh_auto_clean + cd src && [ ! -f Makefile ] || make distclean + -$(RM) -rf src/Base/configLinux.h + dh clean --after dh_auto_clean + +override_dh_fixperms: + dh_fixperms -Xpd-gem + +override_dh_auto_test: + # no actual 'make test' target --- gem-0.92.2.orig/debian/changelog +++ gem-0.92.2/debian/changelog @@ -1,23 +1,39 @@ -gem (1:0.92.2-1) unstable; urgency=low +gem (1:0.92.2-2) unstable; urgency=low - * New upstream bugfix release(closes various NULL-initialization bugs) - * upstream now has updated debian-rules + * debian/patches/00_no_flags_overwrite.patch: + - do not overwrite CXXFLAGS (closes: #562635) + - make sure user defined flags are last - -- IOhannes m zmoelnig (gpg-key at iem) Tue, 15 Dec 2009 15:11:04 +0100 + -- Paul Brossier Sun, 27 Dec 2009 02:16:12 +0100 -gem (1:0.92.1-1) unstable; urgency=low +gem (1:0.92.2-1) unstable; urgency=low + [IOhannes m zmoelnig] * New upstream (Closes: #485972) * New upstream version fixes bugs by itself (Closes: #549720) - * new upstream version might fix #454731 on various driver/hardware - combinations (and provides mechanisms for workarounds) + * new upstream version might fix problems on various driver/hardware + combinations (and provides mechanisms for workarounds) (Closes: #454731) + * build against libavifile + * build-depend on automake + * added "pd-gem" script that properly calls Pd with the correct Gem enabled * added myself as Maintainer, since gem is officially orphaned - (Closes: #546956) * bumped debhelper version * fixes most lintian warnings - * added "pd-gem" script that properly calls Pd with Gem enabled + (Closes: #546956) + + [Paul Brossier] + * debian/control: + - adopt package (closes: #546956) + - span build-depends on multiple lines + - switch to quilt, tighten debhelper depends + * debian/rules: + - switch to debhelper + - remove direct patch to src/configure + - remove gem-0.92-1.tar.gz.cdbs-config_list + - clean generated src/Base/configLinux.h + * debian/patches/series, debian/README.source: switch to quilt - -- IOhannes m zmoelnig (gpg-key at iem) Thu, 05 Nov 2009 19:47:48 +0100 + -- Paul Brossier Fri, 25 Dec 2009 13:04:48 +0100 gem (1:0.90.0.1-2.3) unstable; urgency=low --- gem-0.92.2.orig/debian/pd-gem +++ gem-0.92.2/debian/pd-gem @@ -1,3 +1,3 @@ #!/bin/sh -exec /usr/bin/pd -path /usr/lib/pd/extra/Gem -lib Gem $@ +exec /usr/bin/pd -path /usr/lib/pd/extra/Gem -lib /usr/lib/pd/extra/Gem/Gem $@ --- gem-0.92.2.orig/debian/patches/00_no_flags_overwrite.patch +++ gem-0.92.2/debian/patches/00_no_flags_overwrite.patch @@ -0,0 +1,22 @@ +diff --git a/src/Make.config.in b/src/Make.config.in +index 36b6055..5c5e4e1 100644 +--- a/src/Make.config.in ++++ b/src/Make.config.in +@@ -1,14 +1,9 @@ + GEM_TARGETS = @GEM_TARGETS@ + EXT = @EXT@ + +-CXX ?= @CXX@ +-CXXFLAGS ?= @CXXFLAGS@ +-LDFLAGS ?= @LDFLAGS@ +-LIBS ?= @LIBS@ +- +-GEM_CXXFLAGS= $(CXXFLAGS) @X_CFLAGS@ @PKG_CFLAGS@ -I.. @INCLUDES@ @DEFINES@ +-GEM_LDFLAGS = $(LDFLAGS) @X_LIBS@ +-GEM_LIBS = $(LIBS) @PKG_LIBS@ ++GEM_CXXFLAGS= @X_CFLAGS@ @PKG_CFLAGS@ -I.. @INCLUDES@ @DEFINES@ @CXXFLAGS@ $(CXXFLAGS) ++GEM_LDFLAGS = @X_LIBS@ @LDFLAGS@ $(LDFLAGS) ++GEM_LIBS = @PKG_LIBS@ @LIBS@ $(LIBS) + + GEM_ARCH_CXXFLAGS = @ARCH_FLAGS@ + GEM_ARCH_LDFLAGS = @ARCH_FLAGS@ --- gem-0.92.2.orig/debian/patches/series +++ gem-0.92.2/debian/patches/series @@ -0,0 +1,3 @@ +00_no_flags_overwrite.patch +01_change_defaultfont.patch +02_manual_examples_install.patch