reverted: --- libgtkdatabox-0.9.0.1/debian/d-devlibdeps +++ libgtkdatabox-0.9.0.1.orig/debian/d-devlibdeps @@ -1,199 +0,0 @@ -#!/bin/bash -# d-devlibdeps -- get list of build-time dependencies -# Copyright (C) 2002-2005 Junichi Uekawa -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -# 2002 May 3. Created. -# automatic depends line generator. - -set -e -set -o pipefail - -function getname () { - local SONAMELIBNAME - local SONAMEVERSION - local SONAME - SONAME="$1" - SONAMELIBNAME=$(echo $SONAME | sed 's/\.so\..*$//') - SONAMEVERSION=$(echo $SONAME | sed 's/^.*\.so\.//') - case "$SONAMELIBNAME" in - *[0-9]) - RETURN="$SONAMELIBNAME-$SONAMEVERSION" - ;; - *) - RETURN="$SONAMELIBNAME$SONAMEVERSION" - ;; - esac -} - -function overridedevlibdeps () { - # overrides necessary until the scheme is adopted. - sed \ - -e 's/libX11-6-dev/libx11-dev | xlibs-dev (<< 4.3.0)/' \ - -e 's/libXext6-dev/libxext-dev | xlibs-dev (<< 4.3.0)/' \ - -e 's/libXi6-dev/libxi-dev | xlibs-dev (<< 4.3.0)/' \ - -e 's/libXpm4-dev/libxpm-dev | xlibs-dev (<< 4.3.0)/' \ - -e 's/libICE6-dev/libice-dev | xlibs-dev (<< 4.3.0)/' \ - -e 's/libSM6-dev/libsm-dev | xlibs-dev (<< 4.3.0)/' \ - -e 's/libGL1-dev/xlibmesa-gl-dev | xlibs-dev (<< 4.3.0)/' \ - -e 's/libGLU1-dev/xlibmesa-glu-dev | xlibs-dev (<< 4.3.0)/' \ - -e 's/libcrypt1-dev//' \ - -e 's/libcrypt1\.1-dev//' \ - -e 's/libdl2-dev//' \ - -e 's/libdl2.1-dev//' \ - -e 's/libm6-dev//' \ - -e 's/libm6.1-dev//' \ - -e 's/libm1-dev//' \ - -e 's/libnsl1-dev//' \ - -e 's/libnsl1\.1-dev//' \ - -e 's/libpthread0-dev//' \ - -e 's/libpthread0\.3-dev//' \ - -e 's/libpthread.*-dev/libpthread-dev/' \ - -e 's/libresolv2-dev//' \ - -e 's/libglib-1.2-0-dev/libglib1.2-dev/' \ - -e 's/libgthread-1.2-0-dev/libglib1.2-dev/' \ - -e 's/libgmodule-1.2-0-dev/libglib1.2-dev/' \ - -e 's/libgtk-1.2-0-dev/libgtk1.2-dev/' \ - -e 's/libpam0-dev/libpam0g-dev/' \ - -e 's/libgdk-1.2-0-dev/libgtk1.2-dev/' \ - -e 's/libz1-dev/zlib1g-dev/' \ - -e 's/libgcc_s.*-dev//' \ - -e 's/libcrypto.*-dev/libssl-dev/' \ - -e 's/libssl.*-dev/libssl-dev/' \ - -e 's/libcomerr2//' \ - -e 's/libcom_err2-dev/comerr-dev/' \ - -e 's/libgssapi_krb5-2-dev/libkrb5-dev/' \ - -e 's/libk5crypto3-dev/libkrb5-dev/' \ - -e 's/libkrb5-3-dev/libkrb5-dev/' \ - -e 's/libparted-1.6-0-dev/libparted1.6-dev/' \ - -e 's/libSDL-1.2-0-dev/libsdl1.2-dev/' \ - -e 's/libvorbis0-dev/libvorbis-dev/' \ - -e 's/libcrack2-dev/cracklib2-dev/' \ - -e 's/libkrb1-dev/kerberos4kth-dev/' \ - -e 's/libtheora0-dev/libtheora-dev/' \ - -e 's/libvorbisenc2-dev/libvorbis-dev/' \ - -e 's/libogg0-dev/libogg-dev/' \ - -e 's/librt1-dev//' \ - -e 's/libspeex1-dev/libspeex-dev/' \ - -e 's/libX\(.*\)[0-9]-dev/libx\1-dev/' \ - -e 's/libgdk-x11-2.0-0-dev/libgtk2.0-dev/' \ - -e 's/libgdk-x11-2.0-0-dev/libgtk2.0-dev/' \ - -e 's/libgtk-x11-2.0-0-dev/libgtk2.0-dev/' \ - -e 's/libgdk_pixbuf-2.0-0-dev/libgtk2.0-dev/' \ - -e 's/libgd2-dev/libgd-dev/' \ - -e 's/libgmodule-2.0-0-dev/libglib2.0-dev/' \ - -e 's/libgobject-2.0-0-dev/libglib2.0-dev/' \ - -e 's/libglib-2.0-0-dev/libglib2.0-dev/' \ - -e 's/libpango-1.0-0-dev/libpango1.0-dev/' \ - -e 's/libpangocairo-1.0-0-dev/libpango1.0-dev/' \ - -e 's/libatk-1.0-0-dev/libatk1.0-dev/' \ - -e 's/libxml2-2-dev/libxml2-dev/' \ - -e 's/libgthread-2.0-0-dev/libglib2.0-dev/' \ - -e 's/libstdc++6-dev/libstdc++6-4.2-dev/' \ - "${OVERRIDE[@]/#/-e}" \ - - -} - - -function validate_package () { -# validate if package foo exists, this relies on apt. - if [ -z "$1" ]; then - # ignore empty. - return; - fi - if grep "^Package: $1\$" debian/control > /dev/null 2> /dev/null ; then - # ignore package that is going to be created. - echo " --> $1 package from same source package." >&2 - return - fi - case $(echo $(apt-cache show $1 2> /dev/null| wc -l ) ) in - 0) - case $(echo $(apt-cache showpkg $1 2> /dev/null | awk ' /^Reverse Provides: $/,/^$/ {if ($0 !~ /:/) {print $0}}' | wc -l) ) in - 0) - echo "devlibs error: There is no package matching [$1] and noone provides it, please report bug to d-shlibs maintainer" >&2 - return 1;; - *) echo " --> $1 is provided by a package." >&2 ;; - esac;; - *) echo " --> $1 package exists." >&2 ;; - esac - return 0; -} - -while true; do - case $1 in - --override=*) - OVERRIDE[${#OVERRIDE[@]}]="${1/--override=/}" - shift; - ;; - --override) - OVERRIDE[${#OVERRIDE[@]}]="$2" - shift; shift; - ;; - --*) - #error - ;; - --|*) - break; - ;; - esac -done - -if [ -z "$2" ]; then - echo "$0: Please read manpage for help, not enough options given" - exit 1 -fi - -OUTPUTFILE="$1" -shift; - -DEPENDS="" -for A in $*; do - # let shell do the delimiting of objdump output./ - DEPENDS="$DEPENDS $(set -o pipefail; objdump -p ${A} |sed -n 's/^.*NEEDED *//p')" -done - -outputtmp=$(tempfile) -( - set -e - if [ -f "$OUTPUTFILE" ] ; then - if grep -v "^devlibs:Depends=" "$OUTPUTFILE"; then - : - fi - fi - printf "devlibs:Depends=" - for A in $DEPENDS; do #DEPENDS is a space-delimited thing. - getname "$A" - echo $RETURN-dev | overridedevlibdeps - done | \ - sort | \ - uniq | \ - while read B; do - # abuse that only first part of multi-entry overrides is considered - if validate_package $B ; then - printf "%s " $B ; - else - echo "ERROR_DEVLIB " - fi - done | sed -e 's/\([a-z0-9)]\) \+\([a-z]\)/\1, \2/g' -e 's/ \+/ /g' -e 's/^ //' -e 's/ $//' - printf "\n" -) > "${outputtmp}" - -if grep "ERROR_DEVLIB" "$outputtmp" > /dev/null; then - exit 1 -fi - -mv "${outputtmp}" $OUTPUTFILE diff -u libgtkdatabox-0.9.0.1/debian/Makefile.testdatabox libgtkdatabox-0.9.0.1/debian/Makefile.testdatabox --- libgtkdatabox-0.9.0.1/debian/Makefile.testdatabox +++ libgtkdatabox-0.9.0.1/debian/Makefile.testdatabox @@ -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 *~ diff -u libgtkdatabox-0.9.0.1/debian/changelog libgtkdatabox-0.9.0.1/debian/changelog --- libgtkdatabox-0.9.0.1/debian/changelog +++ libgtkdatabox-0.9.0.1/debian/changelog @@ -1,3 +1,27 @@ +libgtkdatabox (1:0.9.0.1-2ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #383570), remaining changes: + - debian/rules: Add gio and pangoft overrides for FTBFS + + -- Michael Terry Thu, 04 Jun 2009 09:20:20 -0400 + +libgtkdatabox (1:0.9.0.1-2) unstable; urgency=low + + * Glade support (thanks to Norbert BÉRCI ) + Closes: #504166, #508830 + * Use quilt to handle patches + * Added doc-base entry + * Do not use local copy of d-shlibs any more + Closes: #527481 + * debian/copyright: put packaging under "same licence as + gtkdatabox itself + * debian/control: + - Standards-Version: 3.8.1 (no changes needed) + - Added missing ${misc:Depends} to libgtkdatabox-0.9.0-1-dev + - Versioned Depends from d-shlibs (>= 0.40) + + -- Andreas Tille Fri, 08 May 2009 09:18:48 +0200 + libgtkdatabox (1:0.9.0.1-1ubuntu1) jaunty; urgency=low * Add overrides for libgio and libpangoft for d-devlibdeps to allow diff -u libgtkdatabox-0.9.0.1/debian/control libgtkdatabox-0.9.0.1/debian/control --- libgtkdatabox-0.9.0.1/debian/control +++ libgtkdatabox-0.9.0.1/debian/control @@ -6,9 +6,10 @@ DM-Upload-Allowed: yes Uploaders: Ramakrishnan Muthukrishnan , Andreas Tille -Build-Depends: debhelper (>= 5), cdbs, autotools-dev, d-shlibs (>= 0.31), - libgtk2.0-dev (>= 2.12.2), libcairo2-dev, libpango1.0-dev -Standards-Version: 3.8.0 +Build-Depends: debhelper, cdbs, autotools-dev, d-shlibs (>= 0.40), + libgtk2.0-dev (>= 2.12.2), libcairo2-dev, libpango1.0-dev, gtk-doc-tools, + libglade2-dev, libgladeui-1-dev, quilt +Standards-Version: 3.8.1 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/ Homepage: http://www.eudoxos.de/gtk/gtkdatabox/ @@ -18,7 +19,8 @@ Architecture: any Provides: libgtkdatabox-dev Conflicts: libgtkdatabox-dev -Depends: libgtkdatabox-0.9.0-1 (= ${binary:Version}), libgtk2.0-dev +Depends: ${shlibs:Depends}, ${misc:Depends}, libgtkdatabox-0.9.0-1 (= ${binary:Version}), + libgtk2.0-dev 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 @@ -57,0 +60,42 @@ + +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 diff -u libgtkdatabox-0.9.0.1/debian/copyright libgtkdatabox-0.9.0.1/debian/copyright --- libgtkdatabox-0.9.0.1/debian/copyright +++ libgtkdatabox-0.9.0.1/debian/copyright @@ -19,3 +19,3 @@ -The Debian packaging is (C) 2007, Ramakrishnan Muthukrishnan -and Andreas Tille and is licensed under the GPL, see -`/usr/share/common-licenses/GPL'. +The Debian packaging is (C) 2007-2009, Ramakrishnan Muthukrishnan +and Andreas Tille and is licensed under the same license as +gtkdatabox itself. diff -u libgtkdatabox-0.9.0.1/debian/rules libgtkdatabox-0.9.0.1/debian/rules --- libgtkdatabox-0.9.0.1/debian/rules +++ libgtkdatabox-0.9.0.1/debian/rules @@ -5,12 +5,18 @@ 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 d-devlibdeps \ @@ -25,12 +31,12 @@ 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 \ + d-shlibmove --commit \ --override s/libpangoft2-1.0-0-dev/libpango1.0-dev/ \ --override s/libgio-2.0-0-dev/libglib2.0-dev/ \ - --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: reverted: --- libgtkdatabox-0.9.0.1/debian/d-shlibmove +++ libgtkdatabox-0.9.0.1.orig/debian/d-shlibmove @@ -1,228 +0,0 @@ -#!/bin/bash -# d-shlibmove -- move shared library files around for Debian packaging -# Copyright (C) 2002, 2005 Junichi Uekawa -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -# 2002 Apr 23. Created. -# automatic packaging of libtool-created library packages. - -# from d-shlibs package - -set -e -set -o pipefail - -function getname () { - local SONAMELIBNAME - local SONAMEVERSION - local SONAME - SONAME="$1" - SONAMELIBNAME=$(echo $SONAME | sed 's/\.so\..*$//') - SONAMEVERSION=$(echo $SONAME | sed 's/^.*\.so\.//') - case "$SONAMELIBNAME" in - *[0-9]) - RETURN="$SONAMELIBNAME-$SONAMEVERSION" - ;; - *) - RETURN="$SONAMELIBNAME$SONAMEVERSION" - ;; - esac -} - -function readlibnameinfo () { - LIBNAME="$1" - - if [ -z "$1" ] || ! echo "$1" | grep ".so$" > /dev/null ; then - echo "$0: [$1] is not a valid shared library file name " >&2 - exit 1; - fi - - if [ ! -h "$1" ]; then - echo "$0: expected [$1] to be a symlink, but it is not" >&2 - exit 1; - fi - - SONAME=$(set -o pipefail; objdump -p ${LIBNAME} |sed -n 's/^.*SONAME *//p' ) - getname "$SONAME" - SONAMEPKGNAME=$(echo "$RETURN" | tr '[A-Z]' '[a-z]') - PK=$(basename "$1" | sed 's/\.so$//') - PK_LOWER=$(echo ${PK} | tr '[A-Z]' '[a-z]') - REALSO=$(readlink -f "${LIBNAME}") -} - -function check_line () { - # check line - local PKGNAME="$1" - local ENTRYLINE="$2" - - if ! awk '/^Package:.*'"$PKGNAME"'/,/^$/{print}' "$CONTROL" | \ - grep "$ENTRYLINE" > /dev/null; then - echo "E: line [$ENTRYLINE] not found in $CONTROL section for $PKGNAME" - # set this error signifier to true - CHECK_ERROR=true - fi -} - - -echo "Library package automatic movement utility" - -CONTROL=debian/control - -execscript=$(tempfile) -INSTALLFILE_SHLPKG=$(tempfile) -INSTALLFILE_DEVPKG=$(tempfile) -cat > ${execscript} <> "${INSTALLFILE_SHLPKG}" - shift; shift; shift; - ;; - --movedev) - echo "$2 $3" >> "${INSTALLFILE_DEVPKG}" - shift; shift; shift; - ;; - --movedevdoc) - echo "$2 usr/share/doc/\${PKGDEV}" >> "${INSTALLFILE_DEVPKG}" - shift; shift; - ;; - --commit) - DOIT=yes - shift; - ;; - --extralib) - readlibnameinfo "$2" - DEVLIB_TO_CHECK="${DEVLIB_TO_CHECK} $2" - echo "$(dirname $2)/${PK}.a usr/lib" >> "${INSTALLFILE_DEVPKG}" - echo "$(dirname $2)/${PK}.la usr/lib || true" >> "${INSTALLFILE_DEVPKG}" - echo "$(dirname $2)/${PK}.so usr/lib" >> "${INSTALLFILE_DEVPKG}" - echo "$(dirname ${REALSO})/${SONAME} usr/lib" >> "${INSTALLFILE_SHLPKG}" - echo "${REALSO} usr/lib" >> "${INSTALLFILE_SHLPKG}" - - shift; shift; - ;; - --shlibs-local) - shift; - SHLIBSLOCALVER="$1"; - shift; - ;; - --suffix) - shift; - SUFFIX="$1"; - shift; - ;; - --devsuffix) - shift; - DEVSUFFIX="$1"; - shift; - ;; - --c102) - TRANSITIONSUFFIX="c102" - shift;; - --ldbl) - TRANSITIONSUFFIX="ldbl" - shift;; - --override) - OVERRIDE[${#OVERRIDE[@]}]="$2" - shift; shift;; - --|*) - break; - ;; - esac -done - -# path/libxxxx.so.yyy.zz.zz -# ------------------------- REALSO (actual .so filename that is linked to) -# -------------- SONAME -# ------- --- SONAMEPKGNAME (lowercased for package name) -# --------------- $1 -# ---------- PK -# ---------- PK_LOWER (lowercased for package name) - -DEVLIB_TO_CHECK="${DEVLIB_TO_CHECK} $1" -readlibnameinfo "$1" -PKGDEV="${SONAMEPKGNAME}${DEVSUFFIX}-dev" -PKGSHL="${SONAMEPKGNAME}${SUFFIX}${TRANSITIONSUFFIX}" - -INSTALLDIR="install -d -m 755 " -echo "${INSTALLDIR} debian/${PKGDEV}/usr/lib" >> "$execscript" -echo "${INSTALLDIR} debian/${PKGSHL}/usr/lib" >> "$execscript" -echo "mv $(dirname $1)/${PK}.a debian/${PKGDEV}/usr/lib" >> "$execscript" -echo "mv $(dirname $1)/${PK}.la debian/${PKGDEV}/usr/lib || true" >> "$execscript" -echo "mv $(dirname $1)/${PK}.so debian/${PKGDEV}/usr/lib" >> "$execscript" -echo "mv $(dirname ${REALSO})/${SONAME} debian/${PKGSHL}/usr/lib" >> "$execscript" -echo "mv ${REALSO} debian/${PKGSHL}/usr/lib" >> "$execscript" - -if [ -n "${SHLIBSLOCALVER}" ]; then - echo "echo \"${SONAMELIBNAME} ${SONAMEVERSION} ${PKGSHL} (>= ${SHLIBSLOCALVER})\" >> debian/shlibs.local" >> "$execscript" -fi - -/bin/bash debian/d-devlibdeps "${OVERRIDE[@]/#/--override=}" debian/"${PKGDEV}".substvars "${DEVLIB_TO_CHECK}" - -#do some definition for the file. -echo "PKGDEV=${PKGDEV}" >> "${execscript}" -echo "PKGSHL=${PKGSHL}" >> "${execscript}" - -#do the extra files -cat "${INSTALLFILE_SHLPKG}" | while read A B; do - echo "${INSTALLDIR} debian/${PKGSHL}/${B}" >> "${execscript}" - echo "mv ${A} debian/${PKGSHL}/${B}" >> "${execscript}" -done -cat "${INSTALLFILE_DEVPKG}" | while read A B; do - echo "${INSTALLDIR} debian/${PKGDEV}/${B}" >> "${execscript}" - echo "mv ${A} debian/${PKGDEV}/${B}" >> "${execscript}" -done - -cat "${execscript}" - -# check the syntax of the control file. -CHECK_ERROR=false - -check_line "${PKGDEV}" "Provides:.*${PK_LOWER}-dev" -check_line "${PKGDEV}" "Conflicts:.*${PK_LOWER}-dev" -check_line "${PKGSHL}" "Section: libs" -if [ -n "${SUFFIX}" ]; then - check_line "${PKGSHL}" "Conflicts: ${SONAMEPKGNAME}" -fi -if [ -n "${TRANSITIONSUFFIX}" ]; then - check_line "${PKGSHL}" "Conflicts: ${SONAMEPKGNAME}${SUFFIX}" -fi -check_line "${PKGDEV}" "Section: \(devel\|libdevel\)" -check_line "${PKGDEV}" "Depends:.*${PKGSHL}" -check_line "${PKGSHL}" "Depends:.*[$]{shlibs:Depends}" - -if [ "${CHECK_ERROR}" = "true" ]; then - echo "Error occurred, aborting" >&2 - exit 1 -fi - -if [ "${DOIT}" = "yes" ]; then - sh "${execscript}" -else - echo "Dry-run. If you are satisfied, run with --commit" - exit 2 -fi -rm -f "${execscript}" "${INSTALLFILE_DEVPKG}"" ${INSTALLFILE_SHLPKG}" - -exit 0 only in patch2: unchanged: --- libgtkdatabox-0.9.0.1.orig/debian/libgtkdatabox-0.9.0-1-dev.links +++ libgtkdatabox-0.9.0.1/debian/libgtkdatabox-0.9.0-1-dev.links @@ -0,0 +1 @@ +usr/share/doc/libgtkdatabox-0.9.0-1-dev/html usr/share/gtk-doc/html/gtkdatabox only in patch2: unchanged: --- libgtkdatabox-0.9.0.1.orig/debian/libgtkdatabox-0.9.0-1-dev.doc-base +++ libgtkdatabox-0.9.0.1/debian/libgtkdatabox-0.9.0-1-dev.doc-base @@ -0,0 +1,22 @@ +Document: libgtkdatabox-dev +Title: Programmers reference for libgtkdatabox +Author: Dr. Roland Bock +Abstract: 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. +Section: Science/Data Analysis + +Format: html +Index: /usr/share/doc/libgtkdatabox-0.9.0-1-dev/html +Files: /usr/share/doc/libgtkdatabox-0.9.0-1-dev/html/* only in patch2: unchanged: --- libgtkdatabox-0.9.0.1.orig/debian/libgtkdatabox-0.9.0-1-glade.install +++ libgtkdatabox-0.9.0.1/debian/libgtkdatabox-0.9.0-1-glade.install @@ -0,0 +1,2 @@ +debian/tmp/usr/share/glade3/catalogs/gtkdatabox.xml +debian/tmp/usr/lib/glade3/modules/libgladedatabox.* only in patch2: unchanged: --- libgtkdatabox-0.9.0.1.orig/debian/libgtkdatabox-0.9.0-1-libglade.install +++ libgtkdatabox-0.9.0.1/debian/libgtkdatabox-0.9.0-1-libglade.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libglade/2.0/libdatabox.* only in patch2: unchanged: --- libgtkdatabox-0.9.0.1.orig/debian/patches/series +++ libgtkdatabox-0.9.0.1/debian/patches/series @@ -0,0 +1 @@ +01_libglage_example.patch only in patch2: unchanged: --- libgtkdatabox-0.9.0.1.orig/debian/patches/01_libglage_example.patch +++ libgtkdatabox-0.9.0.1/debian/patches/01_libglage_example.patch @@ -0,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 + #include + +-#include +- +-#ifdef USE_LIBGLADE + #include +-#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 */