diff -u dia-0.93/debian/changelog dia-0.93/debian/changelog --- dia-0.93/debian/changelog +++ dia-0.93/debian/changelog @@ -1,3 +1,13 @@ +dia (0.93-4.backports.org.1) unstable; urgency=low + + * recompiled for http://www.backports.org/ + + disabled python and gnome support in debian/rules and debian/control + + modified configure script to work with older version of libpango + + removed dia-common's python-gtk2 dependency + + used libpng2-dev instead of libpng3-dev + + -- Norbert Tretkowski Mon, 19 Jul 2004 12:59:33 +0200 + dia (0.93-5) unstable; urgency=low * objects/standard/image.c: Applied patch to fix path resolution with diff -u dia-0.93/debian/rules dia-0.93/debian/rules --- dia-0.93/debian/rules +++ dia-0.93/debian/rules @@ -36,10 +36,7 @@ cp -a sheets/sheet-translation-report backup/sheets/ ; \ fi - ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-gnome --exec-prefix=/usr --with-python - $(MAKE) - mv app/.libs/dia app/dia-gnome - ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --exec-prefix=/usr --with-python + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --exec-prefix=/usr $(MAKE) xmlto -o doc/en/manual html doc/en/dia.xml @@ -72,9 +69,7 @@ $(MAKE) install prefix=$(CURDIR)/debian/$(PACKAGE)/usr exec_prefix=$(CURDIR)/debian/$(PACKAGE)/usr mv debian/$(PACKAGE)/usr/bin/dia debian/$(PACKAGE)/usr/bin/dia-normal mv debian/$(PACKAGE)/usr/share/man/man1/dia.1 debian/$(PACKAGE)/usr/share/man/man1/dia-normal.1 - cp debian/$(PACKAGE)/usr/share/man/man1/dia-normal.1 debian/$(PACKAGE)/usr/share/man/man1/dia-gnome.1 rm -rf debian/$(PACKAGE)/usr/share/oaf - cp app/dia-gnome debian/$(PACKAGE)/usr/bin/ cp *.xpm debian/$(PACKAGE)/usr/share/pixmaps cp debian/*.xpm debian/$(PACKAGE)/usr/share/pixmaps diff -u dia-0.93/debian/control dia-0.93/debian/control --- dia-0.93/debian/control +++ dia-0.93/debian/control @@ -4,11 +4,11 @@ Maintainer: Roland Stigge Uploaders: Debian GNOME Maintainers , Akira TAGOH , Andrew Lau , Edd Dumbill , Emil Soleyman-Zomalan , Gustavo Noronha Silva , Johannes Rohr , Jordi Mallach , Josselin Mouette , Rob Bradford , Robert McQueen , Ross Burton , Sebastien Bacher , Takuo KITAME Standards-Version: 3.6.1.0 -Build-Depends: debhelper (>= 4), libgnome2-dev, libglib2.0-dev, libgtk2.0-dev, xlibs-dev, libxml2-dev, libgdk-pixbuf-dev, libpopt-dev, libpng3-dev, libart-2.0-dev, libunicode-dev, libfreetype6-dev, libpango1.0-dev, libgnomeui-dev, libxslt1-dev, python2.3-dev, python-gtk2, xmlto +Build-Depends: debhelper (>= 4), libglib2.0-dev, libgtk2.0-dev, xlibs-dev, libxml2-dev, libgdk-pixbuf-dev, libpopt-dev, libpng2-dev, libart-2.0-dev, libunicode-dev, libfreetype6-dev, libpango1.0-dev, libxslt1-dev, xmlto Package: dia-common Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, python-gtk2 +Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: dia | dia-gnome, dia-libs Replaces: dia (<= 0.86-1) Conflicts: dia (<= 0.86-1) @@ -46,13 +45,0 @@ - -Package: dia-gnome -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, dia-common (=${Source-Version}), dia-libs (=${Source-Version}) -Recommends: gsfonts-x11 -Section: gnome -Description: Diagram editor (GNOME version) - Dia is an editor for diagrams, graphs, charts etc. There is support for UML - static structure diagrams (class diagrams), Entity-Relationship diagrams, - network diagrams and much more. Diagrams can be exported to postscript and - many other formats. - . - This package contains the GNOME version of Dia. only in patch2: unchanged: --- dia-0.93.orig/configure +++ dia-0.93/configure @@ -20099,23 +20099,23 @@ else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for pango >= 1.1.5" >&5 -echo $ECHO_N "checking for pango >= 1.1.5... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for pango >= 1.0.1" >&5 +echo $ECHO_N "checking for pango >= 1.0.1... $ECHO_C" >&6 - if $PKG_CONFIG --exists "pango >= 1.1.5" ; then + if $PKG_CONFIG --exists "pango >= 1.0.1" ; then echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 succeeded=yes echo "$as_me:$LINENO: checking PANGOVERSION_CFLAGS" >&5 echo $ECHO_N "checking PANGOVERSION_CFLAGS... $ECHO_C" >&6 - PANGOVERSION_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.1.5"` + PANGOVERSION_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.0.1"` echo "$as_me:$LINENO: result: $PANGOVERSION_CFLAGS" >&5 echo "${ECHO_T}$PANGOVERSION_CFLAGS" >&6 echo "$as_me:$LINENO: checking PANGOVERSION_LIBS" >&5 echo $ECHO_N "checking PANGOVERSION_LIBS... $ECHO_C" >&6 - PANGOVERSION_LIBS=`$PKG_CONFIG --libs "pango >= 1.1.5"` + PANGOVERSION_LIBS=`$PKG_CONFIG --libs "pango >= 1.0.1"` echo "$as_me:$LINENO: result: $PANGOVERSION_LIBS" >&5 echo "${ECHO_T}$PANGOVERSION_LIBS" >&6 else @@ -20123,7 +20123,7 @@ PANGOVERSION_LIBS="" ## If we have a custom action on failure, don't print errors, but ## do set a variable so people can do so. - PANGOVERSION_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pango >= 1.1.5"` + PANGOVERSION_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pango >= 1.0.1"` fi @@ -20138,8 +20138,8 @@ if test $succeeded = yes; then : else - { { echo "$as_me:$LINENO: error: Need Pango version 1.1.5 or higher" >&5 -echo "$as_me: error: Need Pango version 1.1.5 or higher" >&2;} + { { echo "$as_me:$LINENO: error: Need Pango version 1.0.1 or higher" >&5 +echo "$as_me: error: Need Pango version 1.0.1 or higher" >&2;} { (exit 1); exit 1; }; } fi