[SCM] ois/master: Imported Debian patch 1.2.0-2

rzr-guest at users.alioth.debian.org rzr-guest at users.alioth.debian.org
Tue May 10 10:18:12 UTC 2011


Imported Upstream version 1.2.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 55b624b24a2b3284d73107e752d7cfede42140ce
X-Git-Newrev: 0f97d3eb60b088ac3c2bc88b0e0584aed0593c38

The following commit has been merged in the master branch:
commit 0f97d3eb60b088ac3c2bc88b0e0584aed0593c38
Merge: 55b624b24a2b3284d73107e752d7cfede42140ce af6b96743127df704380fddb79ce3e2d6a71cb77
Author: Philippe Coval <rzr at gna.org>
Date:   Sun Dec 13 20:53:41 2009 +0100

    Imported Debian patch 1.2.0-2

diff --combined debian/README.source
index 0000000,0000000..dac02c7
new file mode 100644
--- /dev/null
+++ b/debian/README.source
@@@ -1,0 -1,0 +1,4 @@@
++ois for Debian
++--------------
++
++Make sure to cleanup generated files before rebuilding.
diff --combined debian/changelog
index ed60af2,0000000..08fa510
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,0 +1,32 @@@
++ois (1.2.0-2) unstable; urgency=low
++
++  * debian/control:
++    - bumped standards, updated maintainer email
++    - depends on libX11.a (Closes: #555785)
++  * debian/rules: cleanup generated file 'compile'
++  * debian/watch: fixed
++
++ -- Philippe Coval <rzr at gna.org>  Sun, 13 Dec 2009 20:53:41 +0100
++
 +ois (1.2.0-1) unstable; urgency=low
 +
-   * Imported Upstream version 1.2.0 (Closes: #509924) 
++  * Imported Upstream version 1.2.0 (Closes: #509924)
 +  * Bumped Standards-Version to 3.8.1
 +  * Removed spurious merge data from src/Makefile.am
 +  * Shared library package is now versioned, as done upstream
 +  * Added examples to libois-dev package
 +
 + -- Federico Di Gregorio <fog at debian.org>  Wed, 18 Mar 2009 14:09:21 +0100
 +
 +ois (0.99+1.0rc1-2) unstable; urgency=low
 +
 +  * Fixed debian/rules clean (Closes: #442694) and watchfile (Closes: #450304)
 +  * Fixed headers include (Closes:#455453)
 +
 + -- Philippe Coval <rzr at users.sf.net>  Wed, 09 Jan 2008 03:22:44 +0100
 +
 +ois (0.99+1.0rc1-1) unstable; urgency=low
 +
 +  * Initial release (Closes: #419573)
 +
 + -- Philippe Coval <rzr at users.sf.net>  Sun, 15 Apr 2007 09:15:59 +0200
- 
diff --combined debian/control
index 4255dbe,0000000..13668f3
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,31 -1,0 +1,31 @@@
 +Source: ois
 +Priority: extra
- Maintainer: Philippe Coval <rzr at users.sf.net>
++Maintainer: Philippe Coval <rzr at gna.org>
 +Uploaders: Federico Di Gregorio <fog at debian.org>
- Build-Depends: debhelper (>= 5), automake (>= 1.9), autotools-dev, autoconf, libtool, libltdl3-dev, libxaw7-dev, quilt
- Standards-Version: 3.8.1
++Build-Depends: debhelper (>= 5), automake (>= 1.9), autotools-dev, autoconf, libtool, libltdl3-dev, libxaw7-dev, quilt, libx11-dev
++Standards-Version: 3.8.3
 +Section: libs
 +Homepage: http://sourceforge.net/projects/wgois
 +
 +Package: libois-dev
 +Section: libdevel
 +Architecture: any
- Depends: libois-1.2.0 (= ${binary:Version})
++Depends: libois-1.2.0 (= ${binary:Version}), ${misc:Depends} 
 +Description: Object Oriented Input System library (C++ development headers)
 + Object Oriented Input System (OIS) is meant to be a cross platform,
 + simple solution for using all kinds of Input Devices
 + (KeyBoards, Mice, Joysticks, etc) and feedback devices (e.g. forcefeedback)
 + .
 + Written in C++ using Object Oriented Design patterns.
 +
 +Package: libois-1.2.0
 +Section: libs
 +Architecture: any
 +Depends: ${shlibs:Depends}, ${misc:Depends}
 +Conflicts: libois1
 +Description: Object Oriented Input System library (C++)
 + Object Oriented Input System (OIS) is meant to be a cross platform,
 + simple solution for using all kinds of Input Devices
 + (KeyBoards, Mice, Joysticks, etc) and feedback devices (e.g. forcefeedback)
 + .
 + Written in C++ using Object Oriented Design patterns.
diff --combined debian/rules
index 45102d6,0000000..eac280f
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,75 -1,0 +1,75 @@@
 +#!/usr/bin/make -f
 +# -*- makefile -*-
 +
 +#export DH_VERBOSE=1
 +CFLAGS = -Wall -g
 +
 +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 +	CFLAGS += -O0
 +else
 +	CFLAGS += -O2
 +endif
 +
 +configure: configure-stamp
 +configure-stamp:
 +	dh_testdir
 +	./bootstrap
 +	./configure --prefix=/usr/
 +	touch configure-stamp
 +
 +build: build-stamp
 +build-stamp: configure-stamp 
 +	dh_testdir
 +	$(MAKE)
 +	touch $@
 +
 +
 +generated_files=\
-  configure \
++ configure  \
 + config.status config.guess config.sub config.log \
 + ltmain.sh libtool depcomp install-sh missing \
 + Makefile  Makefile.in aclocal.m4 \
 + */Makefile */Makefile.in */config.h */config.h.in */stamp-h1 \
-  *.pc \
-  mkinstalldirs
++ *.pc *.tmp \
++ mkinstalldirs compile
 +
 +clean:
 +	dh_testdir
 +	dh_testroot
 +	rm -f build-stamp configure-stamp
 +	$(MAKE) clean  || echo "# $@"
 +	rm -f -- ${generated_files}
 +	rm -rf -- */.deps 
 +	dh_clean 
 +
 +install: build
 +	dh_testdir
 +	dh_testroot
 +	dh_clean -k 
 +	dh_installdirs
 +	$(MAKE) install prefix=$(CURDIR)/debian/tmp/usr
 +
 +binary-indep: build install
 +
 +binary-arch: build install
 +	dh_testdir
 +	dh_testroot
 +	dh_installchangelogs 
 +	dh_installdocs ./ReadMe.txt
 +	dh_installexamples -p libois-dev ./demos/*.cpp
 +	dh_install --sourcedir=debian/tmp
 +	dh_installman
 +	dh_strip
 +	dh_compress
 +	dh_fixperms
 +	dh_makeshlibs
 +	dh_installdeb
 +	dh_shlibdeps
 +	dh_gencontrol
 +	dh_md5sums
 +	dh_builddeb
 +
 +binary: binary-indep binary-arch
 +.PHONY: build clean binary-indep binary-arch binary install configure
 +
 +#eof "$Id: rzr --  -- rzr at users.sf.net $"
diff --combined debian/watch
index aa357b9,0000000..b8ed70b
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,2 -1,0 +1,2 @@@
 +version=3
- http://sf.net/wgois/ois-(.*)\.tar\.gz
++http://sf.net/wgois/ois_(\d*.*)\.tar\.gz

-- 
ois packaging



More information about the pkg-multimedia-commits mailing list