On 15/11/10 19:30, Michael Terry wrote: > My debdiff from 2.10.4 to 2.91.1 is attached.
You could have forwarded your patch upstream. I've just done it, but next time please forward your patches to upstream. https://bugzilla.gnome.org/show_bug.cgi?id=637023 --- gtksourceview2-2.10.4/debian/patches/15-fix-catalog-var-name.patch 1969-12-31 19:00:00.000000000 -0500 +++ gtksourceview3-2.91.1/debian/patches/15-fix-catalog-var-name.patch 2010-11-15 12:06:58.886131002 -0500 @@ -0,0 +1,53 @@ +Description: Fix variable typo +Author: Michael Terry <[email protected]> + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +--- gtksourceview3-2.91.1.orig/data/glade/Makefile.am ++++ gtksourceview3-2.91.1/data/glade/Makefile.am +@@ -1,4 +1,4 @@ +-cataloguedir = $(GLADE_CATALOGUE_DIR) ++cataloguedir = $(GLADE_CATALOG_DIR) + catalogue_in_files = gtksourceview.xml.in + catalogue_DATA = $(catalogue_in_files:.xml.in=.xml) + +@@ -6,7 +6,7 @@ EXTRA_DIST = \ + $(catalogue_in_files) + + validate: $(catalogue_DATA) +- xmllint --dtdvalid $(GLADE_CATALOGUE_DIR)/glade-catalog.dtd --noout $< ++ xmllint --dtdvalid $(GLADE_CATALOG_DIR)/glade-catalog.dtd --noout $< + + CLEANFILES = $(catalogue_DATA) + +--- gtksourceview3-2.91.1.orig/data/glade/Makefile.in ++++ gtksourceview3-2.91.1/data/glade/Makefile.in +@@ -248,7 +248,7 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-cataloguedir = $(GLADE_CATALOGUE_DIR) ++cataloguedir = $(GLADE_CATALOG_DIR) + catalogue_in_files = gtksourceview.xml.in + catalogue_DATA = $(catalogue_in_files:.xml.in=.xml) + EXTRA_DIST = \ +@@ -466,7 +466,7 @@ uninstall-am: uninstall-catalogueDATA + + + validate: $(catalogue_DATA) +- xmllint --dtdvalid $(GLADE_CATALOGUE_DIR)/glade-catalog.dtd --noout $< ++ xmllint --dtdvalid $(GLADE_CATALOG_DIR)/glade-catalog.dtd --noout $< + + @INTLTOOL_XML_NOMERGE_RULE@ + -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
