diff -Nru fontforge-0.0.20090923/debian/changelog fontforge-0.0.20090923/debian/changelog --- fontforge-0.0.20090923/debian/changelog 2010-04-18 07:24:20.000000000 +0100 +++ fontforge-0.0.20090923/debian/changelog 2010-02-27 23:09:48.000000000 +0000 @@ -1,3 +1,18 @@ +fontforge (0.0.20090923-2) unstable; urgency=low + + * Switched to 3.0 (quilt) source format. As a consequence, no longer + build-depend on quilt and removed the file README.source. + * debian/control: + - add ${misc:Depends} to dependencies to properly cope with + debhelper-triggerred dependencies; + - bumped Standards-Version to 3.8.4. No changes required. + * debian/patches: added the patch 026_fix-null-pntr-dereference.diff for + allowing the dereference of the 'cs' pointer in the scstyles.c file if + it is non-NUL. Thanks to Rogério Brito for the + patch (Closes: #569548). + + -- Kęstutis Biliūnas Sat, 27 Feb 2010 10:18:58 +0200 + fontforge (0.0.20090923-1) unstable; urgency=low * New upstream release. diff -Nru fontforge-0.0.20090923/debian/control fontforge-0.0.20090923/debian/control --- fontforge-0.0.20090923/debian/control 2010-04-18 07:24:20.000000000 +0100 +++ fontforge-0.0.20090923/debian/control 2010-02-27 10:43:49.000000000 +0000 @@ -13,7 +13,6 @@ libgif-dev, libxt-dev, libfreetype6-dev, - quilt (>= 0.40), autoconf, automake, libtool, @@ -26,14 +25,14 @@ libpango1.0-dev, libcairo2-dev, chrpath -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Homepage: http://fontforge.sourceforge.net/ Vcs-svn: svn://svn.debian.org/pkg-fonts/packages/fontforge/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-fonts/packages/fontforge/ Package: fontforge Architecture: any -Depends: libfontforge1 (= ${binary:Version}), libgdraw4 (= ${binary:Version}), ${shlibs:Depends} +Depends: ${misc:Depends}, libfontforge1 (= ${binary:Version}), libgdraw4 (= ${binary:Version}), ${shlibs:Depends} Conflicts: fontforge-nox Suggests: fontforge-doc, potrace, autotrace, python-fontforge, fontforge-extras Description: font editor @@ -49,7 +48,7 @@ Package: fontforge-nox Architecture: any -Depends: libfontforge1 (= ${binary:Version}), ${shlibs:Depends} +Depends: ${misc:Depends}, libfontforge1 (= ${binary:Version}), ${shlibs:Depends} Conflicts: fontforge Description: font editor - non-X version Besides being a font editor, FontForge is also a font format @@ -68,7 +67,7 @@ Package: libfontforge-dev Section: libdevel Architecture: any -Depends: libfontforge1 (= ${binary:Version}), libgdraw4 (= ${binary:Version}) +Depends: ${misc:Depends}, libfontforge1 (= ${binary:Version}), libgdraw4 (= ${binary:Version}) Description: font editor - runtime library (development files) Besides being a font editor, FontForge is also a font format converter, and can convert among PostScript (ASCII & binary Type 1, @@ -80,9 +79,9 @@ Package: libfontforge1 Section: libs Architecture: any -Depends: ${shlibs:Depends} -Conflicts: fontforge (< 0.0.20090224) -Replaces: fontforge (< 0.0.20090224) +Depends: ${misc:Depends}, ${shlibs:Depends} +Conflicts: fontforge (<= 0.0.20090224) +Replaces: fontforge (<= 0.0.20090224) Description: font editor - runtime library Besides being a font editor, FontForge is also a font format converter, and can convert among PostScript (ASCII & binary Type 1, @@ -94,9 +93,9 @@ Package: libgdraw4 Section: libs Architecture: any -Depends: ${shlibs:Depends} -Conflicts: fontforge (< 0.0.20090224) -Replaces: fontforge (< 0.0.20090224) +Depends: ${misc:Depends}, ${shlibs:Depends} +Conflicts: fontforge (<= 0.0.20090224) +Replaces: fontforge (<= 0.0.20090224) Description: font editor - runtime graphics and widget library Besides being a font editor, FontForge is also a font format converter, and can convert among PostScript (ASCII & binary Type 1, @@ -107,7 +106,7 @@ Package: python-fontforge Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends}, libfontforge1 +Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}, libfontforge1 XB-Python-Version: ${python:Versions} Provides: ${python:Provides} Section: python diff -Nru fontforge-0.0.20090923/debian/patches/026_fix-null-pntr-dereference.diff fontforge-0.0.20090923/debian/patches/026_fix-null-pntr-dereference.diff --- fontforge-0.0.20090923/debian/patches/026_fix-null-pntr-dereference.diff 1970-01-01 01:00:00.000000000 +0100 +++ fontforge-0.0.20090923/debian/patches/026_fix-null-pntr-dereference.diff 2010-02-27 23:04:54.000000000 +0000 @@ -0,0 +1,30 @@ +Description: At line scstyles.c:2676, we test if sc_sc == NULL and then + jump to end_loop2. But at end_loop2 (sctyles.c:2725), we dereference sc + and this gives us a segfault. Skipping the dereference at that point means + that we don't update the UI for that point (which should not be updated + anyway, since nothing was converted to small caps). + This patch only allows the dereference of the pointer if it is non-NULL. + +Author: Rogério Brito +--- +Bug-Debian: http://bugs.debian.org/569548 +Forwarded: fontforge-devel@lists.sourceforge.net +Last-Update: 2010-02-27 + +--- fontforge-0.0.20090923.orig/fontforge/scstyles.c ++++ fontforge-0.0.20090923/fontforge/scstyles.c +@@ -2723,9 +2723,11 @@ return; + SCCharChangedUpdate(sc_sc,fv->active_layer); + } + end_loop2: +- if ( !sc->ticked && !ff_progress_next()) +- break; +- sc->ticked = true; ++ if (sc) { ++ if ( !sc->ticked && !ff_progress_next()) ++ break; ++ sc->ticked = true; ++ } + } + } + } diff -Nru fontforge-0.0.20090923/debian/patches/series fontforge-0.0.20090923/debian/patches/series --- fontforge-0.0.20090923/debian/patches/series 2010-04-18 07:24:20.000000000 +0100 +++ fontforge-0.0.20090923/debian/patches/series 2010-02-27 22:53:05.000000000 +0000 @@ -3,4 +3,6 @@ 020_fix_pyext_path.diff 023_fix_desktop_file.diff 024_def_background.diff +026_fix-null-pntr-dereference.diff 900_debian_HelpDir_path.diff + diff -Nru fontforge-0.0.20090923/debian/README.source fontforge-0.0.20090923/debian/README.source --- fontforge-0.0.20090923/debian/README.source 2010-04-18 07:24:20.000000000 +0100 +++ fontforge-0.0.20090923/debian/README.source 1970-01-01 01:00:00.000000000 +0100 @@ -1,61 +0,0 @@ -Editing and creating patches -============================ -To start, you should be in the source package directory (this is the -directory that contains the debian/ directory). - - -Editing an existing patch -------------------------- -Run: - - quilt push yourpatchname.diff - -Make your edits now, directly in the source tree. If you're editing a file -that wasn't previously included in the patch, you must let quilt know you're -doing it by using: - - quilt add filename -or - quilt edit filename - -If you're not sure if you need this, you can run "quilt files" to see if your -file is already in there, or "quilt patches filename" to see if the current -patch edits the specified file. Once you're done editing, run: - - quilt refresh -p1 - -to update your patch. This will create a unified diff patch with a strip -number of 1. You can then go in to the patches directory and document your -patch by adding a description of it to the top of the patch file. It is very -advisable always to document the changes you have made in the header of the -patch. - - -Creating a new patch --------------------- -Decide where your patch belongs according to the number series. Once you do -this, run: - - quilt push patch-before-yours - -where "patch-before-yours" specifies the filename of the patch that will be -the last one applied before your new patch. Then run: - - quilt new patchname - -using the name of the patch (including the appropriate number). Then, as -described above in the case of editing existing patches, you'll want to be -sure quilt knows which files you are editing. Run: - - quilt add filename - -Now make your edits to the source files, directly in the source tree. When you -are finished, run: - - quilt refresh -p1 - -Once you're all done with patch creation/editing, run: - - debian/rules clean - -to get rid of the things that had to be set up. diff -Nru fontforge-0.0.20090923/debian/rules fontforge-0.0.20090923/debian/rules --- fontforge-0.0.20090923/debian/rules 2010-04-18 07:24:20.000000000 +0100 +++ fontforge-0.0.20090923/debian/rules 2010-02-27 10:07:14.000000000 +0000 @@ -7,8 +7,6 @@ # This has to be exported to make some magic below work. export DH_OPTIONS -include /usr/share/quilt/quilt.make - LIBTOOLVERSION = $(shell dpkg-query -W -f='$${Version}\n' "libtool") DIST=$(shell lsb_release -i -s) @@ -43,8 +41,6 @@ configure-stamp: dh_testdir - $(MAKE) -f debian/rules patch - ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub endif @@ -91,7 +87,7 @@ touch $@ -clean: unpatch +clean: dh_testdir dh_testroot rm -f build-arch-stamp build-stamp-nox configure-stamp configure-stamp-nox @@ -175,6 +171,8 @@ binary-arch: build install build-nox install-nox $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common +binary-indep: + binary: binary-arch .PHONY: build clean binary-arch binary install configure \ build-nox configure-nox install-nox diff -Nru fontforge-0.0.20090923/debian/source/format fontforge-0.0.20090923/debian/source/format --- fontforge-0.0.20090923/debian/source/format 1970-01-01 01:00:00.000000000 +0100 +++ fontforge-0.0.20090923/debian/source/format 2010-04-18 07:24:21.000000000 +0100 @@ -0,0 +1 @@ +3.0 (quilt)