[Pkg-sdl-commits] r199 - in unstable/sdl-stretch/debian: . patches

Barry deFreese bdefreese at alioth.debian.org
Thu Apr 9 08:11:20 UTC 2009


Author: bdefreese
Date: 2009-04-09 20:11:20 +0000 (Thu, 09 Apr 2009)
New Revision: 199

Added:
   unstable/sdl-stretch/debian/libsdl-stretch-0-3.install
   unstable/sdl-stretch/debian/watch
Removed:
   unstable/sdl-stretch/debian/libsdl-stretch-0-2.install
   unstable/sdl-stretch/debian/patches/gcc-4.0.diff
   unstable/sdl-stretch/debian/patches/python.diff
Modified:
   unstable/sdl-stretch/debian/changelog
   unstable/sdl-stretch/debian/compat
   unstable/sdl-stretch/debian/control
   unstable/sdl-stretch/debian/libsdl-stretch-dev.dirs
   unstable/sdl-stretch/debian/patches/series
   unstable/sdl-stretch/debian/rules
Log:
  * Add myself to uploaders.
  * New upstream release.
    + Remove existing patches as they are fixed upstream.
  * Add watch file.
  * Remove duplicate Section: libs in binary package.
  * Bump debhelper build-dep and compat to 5.
  * Bump Standards Version to 3.8.1.
Update to match what is in the repo.


Modified: unstable/sdl-stretch/debian/changelog
===================================================================
--- unstable/sdl-stretch/debian/changelog	2009-04-09 19:27:46 UTC (rev 198)
+++ unstable/sdl-stretch/debian/changelog	2009-04-09 20:11:20 UTC (rev 199)
@@ -1,3 +1,16 @@
+sdl-stretch (0.3.0-1) unstable; urgency=low
+
+  [ Barry deFreese ]
+  * Add myself to uploaders.
+  * New upstream release.
+    + Remove existing patches as they are fixed upstream.
+  * Add watch file.
+  * Remove duplicate Section: libs in binary package.
+  * Bump debhelper build-dep and compat to 5.
+  * Bump Standards Version to 3.8.1.
+
+ -- Barry deFreese <bdefreese at debian.org>  Thu, 02 Apr 2009 16:23:04 -0400
+
 sdl-stretch (0.2.3-9) unstable; urgency=low
 
   * debian/patches/python.diff:

Modified: unstable/sdl-stretch/debian/compat
===================================================================
--- unstable/sdl-stretch/debian/compat	2009-04-09 19:27:46 UTC (rev 198)
+++ unstable/sdl-stretch/debian/compat	2009-04-09 20:11:20 UTC (rev 199)
@@ -1 +1 @@
-4
+5

Modified: unstable/sdl-stretch/debian/control
===================================================================
--- unstable/sdl-stretch/debian/control	2009-04-09 19:27:46 UTC (rev 198)
+++ unstable/sdl-stretch/debian/control	2009-04-09 20:11:20 UTC (rev 199)
@@ -2,13 +2,12 @@
 Section: libs
 Priority: optional
 Maintainer: Debian SDL packages maintainers <pkg-sdl-maintainers at lists.alioth.debian.org>
-Uploaders: Matthew Danish <mrd at debian.org>, Zephaniah E. Hull <warp at debian.org>, Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Aurelien Jarno <aurel32 at debian.org>, Josselin Mouette <joss at debian.org>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, libsdl1.2-dev (>= 1.2.4), pkg-config, python, xmlto, quilt
-Standards-Version: 3.7.3
+Uploaders: Matthew Danish <mrd at debian.org>, Zephaniah E. Hull <warp at debian.org>, Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Aurelien Jarno <aurel32 at debian.org>, Josselin Mouette <joss at debian.org>, Barry deFreese <bdefreese at debian.org>
+Build-Depends: debhelper (>= 5.0.0), autotools-dev, libsdl1.2-dev (>= 1.2.4), pkg-config, python, xmlto, quilt
+Standards-Version: 3.8.1
 Homepage: http://sdl-stretch.sourceforge.net
 
-Package: libsdl-stretch-0-2
-Section: libs
+Package: libsdl-stretch-0-3
 Architecture: i386 hurd-i386 kfreebsd-i386
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: stretch functions for Simple DirectMedia Layer
@@ -23,7 +22,7 @@
 Package: libsdl-stretch-dev
 Section: libdevel
 Architecture: i386 hurd-i386 kfreebsd-i386
-Depends: libsdl-stretch-0-2 (= ${binary:Version}), libsdl1.2-dev(>= 1.2.4-1)
+Depends: libsdl-stretch-0-3 (= ${binary:Version}), libsdl1.2-dev(>= 1.2.4-1)
 Description: development files for SDL_stretch library
  This package contains the header files and static library needed to
  compile applications that use SDL_stretch.

Deleted: unstable/sdl-stretch/debian/libsdl-stretch-0-2.install
===================================================================
--- unstable/sdl-stretch/debian/libsdl-stretch-0-2.install	2009-04-09 19:27:46 UTC (rev 198)
+++ unstable/sdl-stretch/debian/libsdl-stretch-0-2.install	2009-04-09 20:11:20 UTC (rev 199)
@@ -1 +0,0 @@
-usr/lib/lib*.so.*

Added: unstable/sdl-stretch/debian/libsdl-stretch-0-3.install
===================================================================
--- unstable/sdl-stretch/debian/libsdl-stretch-0-3.install	                        (rev 0)
+++ unstable/sdl-stretch/debian/libsdl-stretch-0-3.install	2009-04-09 20:11:20 UTC (rev 199)
@@ -0,0 +1 @@
+usr/lib/lib*.so.*

Modified: unstable/sdl-stretch/debian/libsdl-stretch-dev.dirs
===================================================================
--- unstable/sdl-stretch/debian/libsdl-stretch-dev.dirs	2009-04-09 19:27:46 UTC (rev 198)
+++ unstable/sdl-stretch/debian/libsdl-stretch-dev.dirs	2009-04-09 20:11:20 UTC (rev 199)
@@ -1 +1,2 @@
 usr/share/doc/libsdl-stretch-dev/html
+usr/share/doc/libsdl-stretch-dev/html/man

Deleted: unstable/sdl-stretch/debian/patches/gcc-4.0.diff
===================================================================
--- unstable/sdl-stretch/debian/patches/gcc-4.0.diff	2009-04-09 19:27:46 UTC (rev 198)
+++ unstable/sdl-stretch/debian/patches/gcc-4.0.diff	2009-04-09 20:11:20 UTC (rev 199)
@@ -1,17 +0,0 @@
---- sdl-stretch-0.2.3.orig/sdlstretchcode.c
-+++ sdl-stretch-0.2.3/sdlstretchcode.c
-@@ -58,14 +58,8 @@
- # define SKIP_1BYTE(dst)    {                *dst++ = 0x46; }
- # define SKIP_2BYTe(dst)    { *dst++ = 0x46; *dst++ = 0x46; }
- # define SKIP_3BYTE(dst)    { *dst++ = 0x46; *dst++ = 0x46; *dst++ = 0x46; }
--#  ifndef __GNUC__
- #  define LOAD_2BYTE(dst)  LOAD_2BYTe(dst)
- #  define STORE_2BYTE(dst) STORE_2BYTe(dst)
--#  else
--#  define LOAD_2BYTE(dst)    { *((unsigned short*)(dst))++ = 0xAD66; }
--#  define SKIP_2BYTE(dst)    { *((unsigned short*)(dst))++ = 0x4646; }
--#  define STORE_2BYTE(dst)   { *((unsigned short*)(dst))++ = 0xAB66; }
--#  endif
- 
- #ifndef SKIP_1BYTE
- #define SKIP_1BYTE(dst) LOAD_1BYTE(dst)

Deleted: unstable/sdl-stretch/debian/patches/python.diff
===================================================================
--- unstable/sdl-stretch/debian/patches/python.diff	2009-04-09 19:27:46 UTC (rev 198)
+++ unstable/sdl-stretch/debian/patches/python.diff	2009-04-09 20:11:20 UTC (rev 199)
@@ -1,33 +0,0 @@
---- sdl-stretch-0.2.3.orig/configure.ac
-+++ sdl-stretch-0.2.3/configure.ac
-@@ -10,7 +10,7 @@
- test ".$CFLAGS" = "." && CFLAGS="" 
- AC_PROG_CC
- test ".$CFLAGS" = "." && test "$GCC" = "yes" && CFLAGS="-O3"
--AC_PATH_PROG(PYTHON, python2.3 python2.2 python ,:)
-+AC_PATH_PROG(PYTHON, python ,:)
- AC_PATH_PROG(XMLTO,xmlto,:)
- AC_PROG_INSTALL
- AC_LIBTOOL_WIN32_DLL
---- sdl-stretch-0.2.3.orig/configure
-+++ sdl-stretch-0.2.3/configure
-@@ -3315,8 +3315,8 @@
- 
- 
- test ".$CFLAGS" = "." && test "$GCC" = "yes" && CFLAGS="-O3"
--# Extract the first word of "python2.3 python2.2 python ", so it can be a program name with args.
--set dummy python2.3 python2.2 python ; ac_word=$2
-+# Extract the first word of "python", so it can be a program name with args.
-+set dummy python ; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_PYTHON+set}" = set; then
---- sdl-stretch-0.2.3/doc/make-doc.py
-+++ sdl-stretch-0.2.3/doc/make-doc.py
-@@ -1,3 +1,6 @@
-+#!/usr/bin/python
-+# -*- coding: iso-8859-15 -*-
-+
- import sys
- import re
- import string

Modified: unstable/sdl-stretch/debian/patches/series
===================================================================
--- unstable/sdl-stretch/debian/patches/series	2009-04-09 19:27:46 UTC (rev 198)
+++ unstable/sdl-stretch/debian/patches/series	2009-04-09 20:11:20 UTC (rev 199)
@@ -1,2 +1 @@
-gcc-4.0.diff -p1
-python.diff -p1
+#No current patches

Modified: unstable/sdl-stretch/debian/rules
===================================================================
--- unstable/sdl-stretch/debian/rules	2009-04-09 19:27:46 UTC (rev 198)
+++ unstable/sdl-stretch/debian/rules	2009-04-09 20:11:20 UTC (rev 199)
@@ -77,10 +77,13 @@
 	# Move all files in their corresponding package
 	dh_install -s --sourcedir=debian/tmp
 	
-	cp $(CURDIR)/debian/tmp/usr/share/groups/s/sd/sdl-stretch/htdocs/man3/*.html \
+	cp $(CURDIR)/debian/tmp/usr/share/doc/SDL_stretch/*.html \
 	   $(CURDIR)/debian/libsdl-stretch-dev/usr/share/doc/libsdl-stretch-dev/html
 
+	cp $(CURDIR)/debian/tmp/usr/share/doc/SDL_stretch/man/*.html \
+	   $(CURDIR)/debian/libsdl-stretch-dev/usr/share/doc/libsdl-stretch-dev/html/man
 
+
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.

Added: unstable/sdl-stretch/debian/watch
===================================================================
--- unstable/sdl-stretch/debian/watch	                        (rev 0)
+++ unstable/sdl-stretch/debian/watch	2009-04-09 20:11:20 UTC (rev 199)
@@ -0,0 +1,3 @@
+version=3
+
+http://sf.net/sdl-stretch/SDL_stretch-([\d.]+)\.tar\.bz2




More information about the pkg-sdl-commits mailing list