r35314 - in /packages/libgtkdatabox/trunk/debian: ./ patches/

tille at users.alioth.debian.org tille at users.alioth.debian.org
Thu Nov 6 13:41:11 UTC 2008 

Author: tille
Date: Thu Nov  6 13:41:10 2008
New Revision: 35314

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35314
Log:
Glade support (thanks to Norbert BÉRCI <bercin at t-email.hu>)

Added:
    packages/libgtkdatabox/trunk/debian/libgtkdatabox-0.9.0-1-dev.links
    packages/libgtkdatabox/trunk/debian/libgtkdatabox-0.9.0-1-glade.install
    packages/libgtkdatabox/trunk/debian/libgtkdatabox-0.9.0-1-libglade.install
    packages/libgtkdatabox/trunk/debian/patches/
    packages/libgtkdatabox/trunk/debian/patches/01_libglage_example.patch
    packages/libgtkdatabox/trunk/debian/patches/series
Removed:
    packages/libgtkdatabox/trunk/debian/d-devlibdeps
    packages/libgtkdatabox/trunk/debian/d-shlibmove
Modified:
    packages/libgtkdatabox/trunk/debian/Makefile.testdatabox
    packages/libgtkdatabox/trunk/debian/changelog
    packages/libgtkdatabox/trunk/debian/control
    packages/libgtkdatabox/trunk/debian/rules

Modified: packages/libgtkdatabox/trunk/debian/Makefile.testdatabox
URL: http://svn.debian.org/wsvn/debian-science/packages/libgtkdatabox/trunk/debian/Makefile.testdatabox?rev=35314&op=diff
==============================================================================
--- packages/libgtkdatabox/trunk/debian/Makefile.testdatabox (original)
+++ packages/libgtkdatabox/trunk/debian/Makefile.testdatabox Thu Nov  6 13:41:10 2008
@@ -5,7 +5,7 @@
 CFLAGS=-g -O2 -Wall -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED `pkg-config gtk+-2.0 --cflags`
 LDFLAGS=`pkg-config gtk+-2.0 --libs` -s -lgtkdatabox
 
-all: addremove basics colors enable_disable grid keycontrol lissajous signals
+all: addremove basics basics2 basics_libglade colors enable_disable grid keycontrol lissajous logarithmic markers signals
 
 clean:
 	rm -rf *.o *~

Modified: packages/libgtkdatabox/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/libgtkdatabox/trunk/debian/changelog?rev=35314&op=diff
==============================================================================
--- packages/libgtkdatabox/trunk/debian/changelog (original)
+++ packages/libgtkdatabox/trunk/debian/changelog Thu Nov  6 13:41:10 2008
@@ -1,3 +1,11 @@
+libgtkdatabox (1:0.9.0.1-2) UNRELEASED; urgency=low
+
+  * Glade support (thanks to Norbert BÉRCI <bercin at t-email.hu>)
+    Closes: #504166
+  * Use quilt to handle patches
+
+ -- Andreas Tille <tille at debian.org>  Thu, 06 Nov 2008 11:55:40 +0100
+
 libgtkdatabox (1:0.9.0.1-1) unstable; urgency=low
 
   * New upstream version

Modified: packages/libgtkdatabox/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/libgtkdatabox/trunk/debian/control?rev=35314&op=diff
==============================================================================
--- packages/libgtkdatabox/trunk/debian/control (original)
+++ packages/libgtkdatabox/trunk/debian/control Thu Nov  6 13:41:10 2008
@@ -6,7 +6,8 @@
 Uploaders: Ramakrishnan Muthukrishnan <rkrishnan at debian.org>,
  Andreas Tille <tille at debian.org>
 Build-Depends: debhelper (>= 5), cdbs, autotools-dev, d-shlibs (>= 0.31),
- libgtk2.0-dev (>= 2.12.2), libcairo2-dev, libpango1.0-dev
+ libgtk2.0-dev (>= 2.12.2), libcairo2-dev, libpango1.0-dev, gtk-doc-tools,
+ libglade2-dev, libgladeui-1-dev, quilt
 Standards-Version: 3.8.0
 Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/libgtkdatabox/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/libgtkdatabox/trunk/
@@ -54,3 +55,45 @@
  The widget allows you to easily transform pixel coordinates into data 
  coordinates, thus allowing you to easily create powerful applications for 
  data analysis. 
+
+Package: libgtkdatabox-0.9.0-1-glade
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: A Gtk+ library to display large amounts of numerical data
+ One or more data sets of thousands of data points (X and Y coordinate) may be 
+ displayed and updated in split seconds. The widget is therfore used in many 
+ scientific and private projects that need to show quickly changing data live.
+ GtkDatabox offers the ability to zoom into and out of the data and to navigate
+ through your data by scrolling.
+ .
+ In addition to rulers and a simple coordinate cross, GtkDatabox now also allows
+ you to add one (or even more) configurable grids like on an oscilloscope.
+ .
+ Data may be presented as dots, lines connecting the data, or vertical bars. 
+ The widget allows you to easily transform pixel coordinates into data 
+ coordinates, thus allowing you to easily create powerful applications for 
+ data analysis. 
+ .
+ Modules for GUI development with Glade3
+
+Package: libgtkdatabox-0.9.0-1-libglade
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: A Gtk+ library to display large amounts of numerical data
+ One or more data sets of thousands of data points (X and Y coordinate) may be 
+ displayed and updated in split seconds. The widget is therfore used in many 
+ scientific and private projects that need to show quickly changing data live.
+ GtkDatabox offers the ability to zoom into and out of the data and to navigate
+ through your data by scrolling.
+ .
+ In addition to rulers and a simple coordinate cross, GtkDatabox now also allows
+ you to add one (or even more) configurable grids like on an oscilloscope.
+ .
+ Data may be presented as dots, lines connecting the data, or vertical bars. 
+ The widget allows you to easily transform pixel coordinates into data 
+ coordinates, thus allowing you to easily create powerful applications for 
+ data analysis. 
+ .
+ Libraries for run-time GUI loading with libglade

Added: packages/libgtkdatabox/trunk/debian/libgtkdatabox-0.9.0-1-dev.links
URL: http://svn.debian.org/wsvn/debian-science/packages/libgtkdatabox/trunk/debian/libgtkdatabox-0.9.0-1-dev.links?rev=35314&op=file
==============================================================================
--- packages/libgtkdatabox/trunk/debian/libgtkdatabox-0.9.0-1-dev.links (added)
+++ packages/libgtkdatabox/trunk/debian/libgtkdatabox-0.9.0-1-dev.links Thu Nov  6 13:41:10 2008
@@ -1,0 +1,1 @@
+usr/share/doc/libgtkdatabox-0.9.0-1-dev/html usr/share/gtk-doc/html/gtkdatabox

Added: packages/libgtkdatabox/trunk/debian/libgtkdatabox-0.9.0-1-glade.install
URL: http://svn.debian.org/wsvn/debian-science/packages/libgtkdatabox/trunk/debian/libgtkdatabox-0.9.0-1-glade.install?rev=35314&op=file
==============================================================================
--- packages/libgtkdatabox/trunk/debian/libgtkdatabox-0.9.0-1-glade.install (added)
+++ packages/libgtkdatabox/trunk/debian/libgtkdatabox-0.9.0-1-glade.install Thu Nov  6 13:41:10 2008
@@ -1,0 +1,2 @@
+debian/tmp/usr/share/glade3/catalogs/gtkdatabox.xml
+debian/tmp/usr/lib/glade3/modules/libgladedatabox.*

Added: packages/libgtkdatabox/trunk/debian/libgtkdatabox-0.9.0-1-libglade.install
URL: http://svn.debian.org/wsvn/debian-science/packages/libgtkdatabox/trunk/debian/libgtkdatabox-0.9.0-1-libglade.install?rev=35314&op=file
==============================================================================
--- packages/libgtkdatabox/trunk/debian/libgtkdatabox-0.9.0-1-libglade.install (added)
+++ packages/libgtkdatabox/trunk/debian/libgtkdatabox-0.9.0-1-libglade.install Thu Nov  6 13:41:10 2008
@@ -1,0 +1,1 @@
+debian/tmp/usr/lib/libglade/2.0/libdatabox.*

Added: packages/libgtkdatabox/trunk/debian/patches/01_libglage_example.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/libgtkdatabox/trunk/debian/patches/01_libglage_example.patch?rev=35314&op=file
==============================================================================
--- packages/libgtkdatabox/trunk/debian/patches/01_libglage_example.patch (added)
+++ packages/libgtkdatabox/trunk/debian/patches/01_libglage_example.patch Thu Nov  6 13:41:10 2008
@@ -1,0 +1,39 @@
+--- libgtkdatabox-0.9.0.1.orig/examples/basics_libglade.c
++++ libgtkdatabox-0.9.0.1/examples/basics_libglade.c
+@@ -29,19 +29,13 @@
+ #include <gtkdatabox_cross_simple.h>
+ #include <math.h>
+ 
+-#include <config.h>
+-
+-#ifdef USE_LIBGLADE
+ #include <glade/glade.h>
+-#endif
+ 
+ #define POINTS 2000
+ #define STEPS 50
+ #define BARS 25
+ #define MARKER 10
+ 
+-#ifdef USE_LIBGLADE
+-
+ /*----------------------------------------------------------------
+  *  databox basics
+  *----------------------------------------------------------------*/
+@@ -207,16 +201,3 @@
+ 
+    return 0;
+ }
+-
+-#else /* USE_LIBGLADE */
+-
+-/* Build some dummy program if libglade is not used. */
+-gint
+-main ()
+-{
+-   g_printf
+-      ("This program does nothing useful unless you call the configure script with --enable-libglade\n");
+-   return 0;
+-}
+-
+-#endif /* USE_LIBGLADE */

Added: packages/libgtkdatabox/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/libgtkdatabox/trunk/debian/patches/series?rev=35314&op=file
==============================================================================
--- packages/libgtkdatabox/trunk/debian/patches/series (added)
+++ packages/libgtkdatabox/trunk/debian/patches/series Thu Nov  6 13:41:10 2008
@@ -1,0 +1,1 @@
+01_libglage_example.patch

Modified: packages/libgtkdatabox/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/libgtkdatabox/trunk/debian/rules?rev=35314&op=diff
==============================================================================
--- packages/libgtkdatabox/trunk/debian/rules (original)
+++ packages/libgtkdatabox/trunk/debian/rules Thu Nov  6 13:41:10 2008
@@ -5,11 +5,17 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 pkg=$(shell grep -v -- "-dev" debian/control | sed -n 's/^Package: \+\([^-]\+\)-.*/\1/p' | head -n 1)
 devpkg=$(shell grep -- "-dev" debian/control | sed -n 's/^Package: //p' | head -n 1)
 
 DEB_INSTALL_DOCS_ALL := AUTHORS README
+
+DEB_CONFIGURE_EXTRA_FLAGS += \
+			--enable-libglade \
+			--enable-glade \
+			--enable-gtk-doc
 
 common-binary-post-install-arch::
 	# Call d-shlibmove to comply with library packaging guide
@@ -22,10 +28,10 @@
 	cp -a examples/*.[ch] examples/*.glade debian/$(devpkg)/usr/share/doc/$(devpkg)/examples
 	cp -a debian/Makefile.testdatabox debian/$(devpkg)/usr/share/doc/$(devpkg)/examples/Makefile
 
-	/bin/bash debian/d-shlibmove \
-	            --commit \
+	d-shlibmove --commit \
 		    --movedev "debian/tmp/usr/include" usr \
 		    --movedev "debian/tmp/usr/lib/pkgconfig" usr/share \
+		    --movedev "debian/tmp/usr/share/gtk-doc/html/gtkdatabox/*" usr/share/doc/libgtkdatabox-0.9.0-1-dev/html \
 		    debian/tmp/usr/lib/$(pkg).so
 
 get-orig-source:

More information about the debian-science-commits mailing list