[Pkg-sdl-commits] r84 - in unstable/libparagui1.1/debian: . patches

Samuel Hocevar sho at costa.debian.org
Sat Jul 15 12:38:34 CEST 2006


Author: sho
Date: 2006-07-15 10:38:30 +0000 (Sat, 15 Jul 2006)
New Revision: 84

Added:
   unstable/libparagui1.1/debian/libparagui1.1-dev.install
   unstable/libparagui1.1/debian/libparagui1.1-dev.manpages
   unstable/libparagui1.1/debian/libparagui1.1.README.Debian
   unstable/libparagui1.1/debian/libparagui1.1.docs
   unstable/libparagui1.1/debian/libparagui1.1.install
   unstable/libparagui1.1/debian/libparagui1.1.shlibs
   unstable/libparagui1.1/debian/patches/000_m4_pattern.diff
   unstable/libparagui1.1/debian/patches/030_underquoted_definitions.diff
Removed:
   unstable/libparagui1.1/debian/libparagui1.0-dev.install
   unstable/libparagui1.1/debian/libparagui1.0-dev.manpages
   unstable/libparagui1.1/debian/libparagui1.0c2a.README.Debian
   unstable/libparagui1.1/debian/libparagui1.0c2a.docs
   unstable/libparagui1.1/debian/libparagui1.0c2a.install
   unstable/libparagui1.1/debian/libparagui1.0c2a.shlibs
   unstable/libparagui1.1/debian/patches/021_pgtimerobject.h.diff
   unstable/libparagui1.1/debian/patches/022_pglog.h.diff
   unstable/libparagui1.1/debian/patches/023_pgmsgmap.cpp.diff
Modified:
   unstable/libparagui1.1/debian/changelog
   unstable/libparagui1.1/debian/control
   unstable/libparagui1.1/debian/patches/series
   unstable/libparagui1.1/debian/rules
Log:
libparagui1.1 (1.1.8-1) UNRELEASED; urgency=low

  * New upstream development snapshot (Closes: #316335).
  * Distribute the .so link with the -dev package.
  * debian/control:
    + Uncapitalised short descriptions and removed useless qualifiers.

  * debian/patches/030_underquoted_definitions.diff:
    + New patch. Fix annoying underquoted definition in paragui.m4.


Modified: unstable/libparagui1.1/debian/changelog
===================================================================
--- unstable/libparagui1.1/debian/changelog	2006-07-15 10:37:04 UTC (rev 83)
+++ unstable/libparagui1.1/debian/changelog	2006-07-15 10:38:30 UTC (rev 84)
@@ -1,10 +1,13 @@
 libparagui1.1 (1.1.8-1) UNRELEASED; urgency=low
 
-  * New upstream development snapshot.
-
+  * New upstream development snapshot (Closes: #316335).
+  * Distribute the .so link with the -dev package.
   * debian/control:
     + Uncapitalised short descriptions and removed useless qualifiers.
 
+  * debian/patches/030_underquoted_definitions.diff:
+    + New patch. Fix annoying underquoted definition in paragui.m4.
+
  -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Wed,  5 Jul 2006 11:32:56 +0200
 
 libparagui1.0 (1.0.4-11) unstable; urgency=low

Modified: unstable/libparagui1.1/debian/control
===================================================================
--- unstable/libparagui1.1/debian/control	2006-07-15 10:37:04 UTC (rev 83)
+++ unstable/libparagui1.1/debian/control	2006-07-15 10:38:30 UTC (rev 84)
@@ -3,7 +3,7 @@
 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>, Lawrence Williams <lawrence_cecil_williams at hotmail.com>, 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), docbook-to-man, libexpat1-dev, libfreetype6-dev, libsdl1.2-dev (>= 1.2.5-1), zlib1g-dev, autotools-dev, libphysfs-dev, libxt-dev, quilt
+Build-Depends: debhelper (>= 4.0), docbook-to-man, libexpat1-dev, libfreetype6-dev, libsdl1.2-dev (>= 1.2.5-1), zlib1g-dev, autotools-dev, libphysfs-dev, libxt-dev, quilt
 Standards-Version: 3.7.2
 
 Package: libparagui1.1
@@ -16,21 +16,23 @@
  ParaGUI is a cross-platform high-level application framework and GUI
  (graphical user interface) library.
  .
- ParaGUI's is completely based on the Simple DirectMedia Layer.
+ ParaGUI is completely based on the Simple DirectMedia Layer.
  .
  Homepage: http://www.paragui.org
 
 Package: libparagui1.1-dev
 Section: libdevel
 Architecture: any
-Depends: libparagui1.0c2a (= ${Source-Version}), libc6-dev, libexpat1-dev, libfreetype6-dev, libsdl1.2-dev, libphysfs-dev
+Depends: libparagui1.1 (= ${Source-Version}), libexpat1-dev, libfreetype6-dev, libsdl1.2-dev, libphysfs-dev
+Replaces: libparagui1.0c2a (<< 1.0.4-12)
+Conflicts: libparagui1.0-dev
 Description: development files for the widget set library
  ParaGUI is a cross-platform high-level application framework and GUI
  (graphical user interface) library.
  .
  ParaGUI's is completely based on the Simple DirectMedia Layer.
  .
- This package contains files needed if you wish to use the paragui library
+ This package contains files needed if you wish to use the ParaGUI library
  in your own programs.
  .
  Homepage: http://www.paragui.org

Deleted: unstable/libparagui1.1/debian/libparagui1.0-dev.install
===================================================================
--- unstable/libparagui1.1/debian/libparagui1.0-dev.install	2006-07-15 10:37:04 UTC (rev 83)
+++ unstable/libparagui1.1/debian/libparagui1.0-dev.install	2006-07-15 10:38:30 UTC (rev 84)
@@ -1,5 +0,0 @@
-usr/bin/paragui-config
-usr/lib/*.a
-usr/lib/*.la
-usr/include/paragui/*
-usr/share/aclocal/paragui.m4

Deleted: unstable/libparagui1.1/debian/libparagui1.0-dev.manpages
===================================================================
--- unstable/libparagui1.1/debian/libparagui1.0-dev.manpages	2006-07-15 10:37:04 UTC (rev 83)
+++ unstable/libparagui1.1/debian/libparagui1.0-dev.manpages	2006-07-15 10:38:30 UTC (rev 84)
@@ -1 +0,0 @@
-paragui-config.1

Deleted: unstable/libparagui1.1/debian/libparagui1.0c2a.README.Debian
===================================================================
--- unstable/libparagui1.1/debian/libparagui1.0c2a.README.Debian	2006-07-15 10:37:04 UTC (rev 83)
+++ unstable/libparagui1.1/debian/libparagui1.0c2a.README.Debian	2006-07-15 10:38:30 UTC (rev 84)
@@ -1,6 +0,0 @@
-paragui for Debian
-------------------
-
-The themes directory is located at /usr/share/paragui.
-
- -- Michael Moerz <mikem at debian.org>, Sat,  8 Dec 2001 20:53:33 +0100

Deleted: unstable/libparagui1.1/debian/libparagui1.0c2a.docs
===================================================================
--- unstable/libparagui1.1/debian/libparagui1.0c2a.docs	2006-07-15 10:37:04 UTC (rev 83)
+++ unstable/libparagui1.1/debian/libparagui1.0c2a.docs	2006-07-15 10:38:30 UTC (rev 84)
@@ -1,4 +0,0 @@
-README
-README-ParaGUI.txt
-TODO
-

Deleted: unstable/libparagui1.1/debian/libparagui1.0c2a.install
===================================================================
--- unstable/libparagui1.1/debian/libparagui1.0c2a.install	2006-07-15 10:37:04 UTC (rev 83)
+++ unstable/libparagui1.1/debian/libparagui1.0c2a.install	2006-07-15 10:38:30 UTC (rev 84)
@@ -1,2 +0,0 @@
-usr/lib/libparagui*so*
-usr/share/paragui/*

Deleted: unstable/libparagui1.1/debian/libparagui1.0c2a.shlibs
===================================================================
--- unstable/libparagui1.1/debian/libparagui1.0c2a.shlibs	2006-07-15 10:37:04 UTC (rev 83)
+++ unstable/libparagui1.1/debian/libparagui1.0c2a.shlibs	2006-07-15 10:38:30 UTC (rev 84)
@@ -1 +0,0 @@
-libparagui-1.0 0 libparagui1.0c2a (>= 1.0.2)

Copied: unstable/libparagui1.1/debian/libparagui1.1-dev.install (from rev 81, unstable/libparagui1.1/debian/libparagui1.0-dev.install)
===================================================================
--- unstable/libparagui1.1/debian/libparagui1.0-dev.install	2006-07-05 09:49:59 UTC (rev 81)
+++ unstable/libparagui1.1/debian/libparagui1.1-dev.install	2006-07-15 10:38:30 UTC (rev 84)
@@ -0,0 +1,6 @@
+usr/bin/paragui-config
+usr/lib/*.a
+usr/lib/*.la
+usr/lib/*.so
+usr/include/paragui/*
+usr/share/aclocal/paragui.m4

Copied: unstable/libparagui1.1/debian/libparagui1.1-dev.manpages (from rev 81, unstable/libparagui1.1/debian/libparagui1.0-dev.manpages)

Copied: unstable/libparagui1.1/debian/libparagui1.1.README.Debian (from rev 81, unstable/libparagui1.1/debian/libparagui1.0c2a.README.Debian)

Copied: unstable/libparagui1.1/debian/libparagui1.1.docs (from rev 81, unstable/libparagui1.1/debian/libparagui1.0c2a.docs)

Copied: unstable/libparagui1.1/debian/libparagui1.1.install (from rev 81, unstable/libparagui1.1/debian/libparagui1.0c2a.install)
===================================================================
--- unstable/libparagui1.1/debian/libparagui1.0c2a.install	2006-07-05 09:49:59 UTC (rev 81)
+++ unstable/libparagui1.1/debian/libparagui1.1.install	2006-07-15 10:38:30 UTC (rev 84)
@@ -0,0 +1,2 @@
+usr/lib/libparagui*.so.*
+usr/share/paragui1.1

Copied: unstable/libparagui1.1/debian/libparagui1.1.shlibs (from rev 81, unstable/libparagui1.1/debian/libparagui1.0c2a.shlibs)
===================================================================
--- unstable/libparagui1.1/debian/libparagui1.0c2a.shlibs	2006-07-05 09:49:59 UTC (rev 81)
+++ unstable/libparagui1.1/debian/libparagui1.1.shlibs	2006-07-15 10:38:30 UTC (rev 84)
@@ -0,0 +1 @@
+libparagui-1.1 8 libparagui1.1-8 (>= 1.1.8)

Added: unstable/libparagui1.1/debian/patches/000_m4_pattern.diff
===================================================================
--- unstable/libparagui1.1/debian/patches/000_m4_pattern.diff	2006-07-15 10:37:04 UTC (rev 83)
+++ unstable/libparagui1.1/debian/patches/000_m4_pattern.diff	2006-07-15 10:38:30 UTC (rev 84)
@@ -0,0 +1,22 @@
+Index: libparagui1.1-1.1.8/configure.in
+===================================================================
+--- libparagui1.1-1.1.8.orig/configure.in	2006-07-05 11:43:31.000000000 +0200
++++ libparagui1.1-1.1.8/configure.in	2006-07-05 11:43:45.000000000 +0200
+@@ -12,7 +12,7 @@
+ 
+ dnl we also need libSigC++ (yeah)
+ SIGC_VERSION=1.2.5
+-PKG_SIGC="sigc++-1.2"
++SIGC_PKG="sigc++-1.2"
+ 
+ dnl Set various version strings - taken gratefully from the GTk sources
+ 
+@@ -228,7 +228,7 @@
+ 
+ dnl Check for libSigC++
+ 
+-PKG_CHECK_MODULES(SIGC, $PKG_SIGC >= $SIGC_VERSION)
++PKG_CHECK_MODULES(SIGC, $SIGC_PKG >= $SIGC_VERSION)
+ AC_SUBST(SIGC_CFLAGS)
+ AC_SUBST(SIGC_LIBS)
+ 

Deleted: unstable/libparagui1.1/debian/patches/021_pgtimerobject.h.diff
===================================================================
--- unstable/libparagui1.1/debian/patches/021_pgtimerobject.h.diff	2006-07-15 10:37:04 UTC (rev 83)
+++ unstable/libparagui1.1/debian/patches/021_pgtimerobject.h.diff	2006-07-15 10:38:30 UTC (rev 84)
@@ -1,34 +0,0 @@
-#! /bin/sh -e
-## paragui.dpatch
-## Bartosz Fenski <fenio at debian.org>
-
-patch_opts="${patch_opts:--f --no-backup-if-mismatch ${2:+-d $2}}"
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-	-patch) patch $patch_opts -p0 < $0;;
-	-unpatch) patch $patch_opts -R -p0 < $0;;
-	*)
-		echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-		exit 1;;
-esac
- 
-exit 0
-
- at DPATCH@
-Index: include/pgtimerobject.h
-===================================================================
---- include/pgtimerobject.h.orig	2006-06-15 21:58:07.000000000 +0200
-+++ include/pgtimerobject.h	2006-06-15 22:00:15.000000000 +0200
-@@ -32,7 +32,7 @@
- #include "paragui.h"
- #include <map>
- 
--typedef Uint32 PG_TimerID;
-+typedef unsigned long PG_TimerID;
- 
- /**
- 	@author Alexander Pipelka

Deleted: unstable/libparagui1.1/debian/patches/022_pglog.h.diff
===================================================================
--- unstable/libparagui1.1/debian/patches/022_pglog.h.diff	2006-07-15 10:37:04 UTC (rev 83)
+++ unstable/libparagui1.1/debian/patches/022_pglog.h.diff	2006-07-15 10:38:30 UTC (rev 84)
@@ -1,34 +0,0 @@
-#! /bin/sh -e
-## paragui.dpatch
-## Bartosz Fenski <fenio at debian.org>
-
-patch_opts="${patch_opts:--f --no-backup-if-mismatch ${2:+-d $2}}"
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-	-patch) patch $patch_opts -p1 < $0;;
-	-unpatch) patch $patch_opts -R -p1 < $0;;
-	*)
-		echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-		exit 1;;
-esac
- 
-exit 0
-
- at DPATCH@
-Index: libparagui1.0-1.0.4/include/pglog.h
-===================================================================
---- libparagui1.0-1.0.4.orig/include/pglog.h	2003-03-30 18:30:57.000000000 +0200
-+++ libparagui1.0-1.0.4/include/pglog.h	2006-06-15 22:00:28.000000000 +0200
-@@ -84,7 +84,7 @@
- 	DECLSPEC void SetConsoleKey(SDLKey key);
- 	DECLSPEC SDLKey GetConsoleKey();
- 	DECLSPEC void SetTitle(const char* title, int alignment = PG_TA_CENTER);	
--};
-+}
- 
- #endif
- 

Deleted: unstable/libparagui1.1/debian/patches/023_pgmsgmap.cpp.diff
===================================================================
--- unstable/libparagui1.1/debian/patches/023_pgmsgmap.cpp.diff	2006-07-15 10:37:04 UTC (rev 83)
+++ unstable/libparagui1.1/debian/patches/023_pgmsgmap.cpp.diff	2006-07-15 10:38:30 UTC (rev 84)
@@ -1,34 +0,0 @@
-#! /bin/sh -e
-## paragui.dpatch
-## Bartosz Fenski <fenio at debian.org>
-
-patch_opts="${patch_opts:--f --no-backup-if-mismatch ${2:+-d $2}}"
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-	-patch) patch $patch_opts -p1 < $0;;
-	-unpatch) patch $patch_opts -R -p1 < $0;;
-	*)
-		echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-		exit 1;;
-esac
- 
-exit 0
-
- at DPATCH@
-Index: libparagui1.0-1.0.4/src/core/pgmsgmap.cpp
-===================================================================
---- libparagui1.0-1.0.4.orig/src/core/pgmsgmap.cpp	2003-01-04 22:13:40.000000000 +0100
-+++ libparagui1.0-1.0.4/src/core/pgmsgmap.cpp	2006-06-15 22:00:32.000000000 +0200
-@@ -83,7 +83,7 @@
-         return;
-     
- 	for ( li = list->begin() ; li != list->end() ; li++ ) {
--		PG_LogDBG(" - Message Object: %d Event Handler Data: %d", (int)(*li).first, (int)(*li).second);
-+		PG_LogDBG(" - Message Object: %ld Event Handler Data: %ld", (long)(*li).first, (long)(*li).second);
- 	}
- }
- 

Added: unstable/libparagui1.1/debian/patches/030_underquoted_definitions.diff
===================================================================
--- unstable/libparagui1.1/debian/patches/030_underquoted_definitions.diff	2006-07-15 10:37:04 UTC (rev 83)
+++ unstable/libparagui1.1/debian/patches/030_underquoted_definitions.diff	2006-07-15 10:38:30 UTC (rev 84)
@@ -0,0 +1,13 @@
+Index: libparagui1.0-1.0.4/paragui.m4
+===================================================================
+--- libparagui1.0-1.0.4.orig/paragui.m4	2006-07-15 12:14:52.000000000 +0200
++++ libparagui1.0-1.0.4/paragui.m4	2006-07-15 12:15:09.000000000 +0200
+@@ -9,7 +9,7 @@
+ dnl AM_PATH_PARAGUI([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+ dnl Test for PARAGUI, and define PARAGUI_CFLAGS and PARAGUI_LIBS
+ dnl
+-AC_DEFUN(AM_PATH_PARAGUI,
++AC_DEFUN([AM_PATH_PARAGUI],
+ [dnl 
+ dnl Get the cflags and libraries from the paragui-config script
+ dnl

Modified: unstable/libparagui1.1/debian/patches/series
===================================================================
--- unstable/libparagui1.1/debian/patches/series	2006-07-15 10:37:04 UTC (rev 83)
+++ unstable/libparagui1.1/debian/patches/series	2006-07-15 10:38:30 UTC (rev 84)
@@ -1,3 +1,4 @@
 000_freetype_linkage.diff 
 000_m4_pattern.diff
 010_rebootstrap.diff
+030_underquoted_definitions.diff

Modified: unstable/libparagui1.1/debian/rules
===================================================================
--- unstable/libparagui1.1/debian/rules	2006-07-15 10:37:04 UTC (rev 83)
+++ unstable/libparagui1.1/debian/rules	2006-07-15 10:38:30 UTC (rev 84)
@@ -32,7 +32,8 @@
 		--build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=/usr \
 		--mandir=\$${prefix}/share/man \
-		--infodir=\$${prefix}/share/info
+		--infodir=\$${prefix}/share/info \
+		--with-themedir=\$${prefix}/share/paragui1.1
 
 build: build-stamp
 build-stamp:  config.status
@@ -63,6 +64,7 @@
 	dh_clean -k
 	dh_installdirs
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	mv debian/tmp/usr/share/paragui debian/tmp/usr/share/paragui1.1
 	dh_install --sourcedir=debian/tmp
 
 binary-indep: build install




More information about the Pkg-sdl-commits mailing list