Hi,
some testing and verification later, this is the final diff
of my NMU. Compared to the previous it fixes rpath showing
up and provides copyright notices in debian/copyright.
Kind regards
T.
diff -u gpaint-0.3.3/debian/changelog gpaint-0.3.3/debian/changelog
--- gpaint-0.3.3/debian/changelog
+++ gpaint-0.3.3/debian/changelog
@@ -1,3 +1,14 @@
+gpaint (0.3.3-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/patches/20_fix_line_width_combo.dpatch: Add items to the
+ line width combo box in gpaint.glade. Fixes the combo box grabbing
+ the curser when clicked. Closes: #497484.
+ * Patch configure in debian/rules to avoid rpath.
+ * Fix debian/copyright.
+
+ -- Thomas Viehmann <[EMAIL PROTECTED]> Sat, 20 Sep 2008 00:27:22 +0200
+
gpaint (0.3.3-1) unstable; urgency=low
* New upstream release
diff -u gpaint-0.3.3/debian/rules gpaint-0.3.3/debian/rules
--- gpaint-0.3.3/debian/rules
+++ gpaint-0.3.3/debian/rules
@@ -22,9 +22,13 @@
# Use dpatch to apply patches
include /usr/share/dpatch/dpatch.make
+makebuilddir::
+ [ -f $(CURDIR)/configure.backup ] || cp $(CURDIR)/configure
$(CURDIR)/configure.backup
+ sed -i -r
's/(hardcode_into_libs)=.*$$/\1=no/;s/(hardcode_libdir_flag_spec)=.*--rpath.*$$//'
$(CURDIR)/configure
post-patches:: patch
clean:: unpatch
-rm po/*.gmo
+ [ ! -f $(CURDIR)/configure.backup ] || mv $(CURDIR)/configure.backup
$(CURDIR)/configure
install/gpaint::
# Rename executable
diff -u gpaint-0.3.3/debian/patches/00list gpaint-0.3.3/debian/patches/00list
--- gpaint-0.3.3/debian/patches/00list
+++ gpaint-0.3.3/debian/patches/00list
@@ -4,0 +5 @@
+20_fix_line_width_combo
diff -u gpaint-0.3.3/debian/copyright gpaint-0.3.3/debian/copyright
--- gpaint-0.3.3/debian/copyright
+++ gpaint-0.3.3/debian/copyright
@@ -5,9 +5,12 @@
It was downloaded from:
http://alpha.gnu.org/gnu/gpaint/
-Upstream Authors: Li-Cheng (Andy) Tai <[EMAIL PROTECTED]>, Michael A. Meffie
III <[EMAIL PROTECTED]>
-
Copyright:
+ Copyright (C) 2000-2003, 2007 Li-Cheng (Andy) Tai <[EMAIL PROTECTED]>
+ Copyright (C) 2003 Michael A. Meffie III <[EMAIL PROTECTED]>
+ Copyright (C) 2003 Free Software Foundation
+ Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and
+ Josh MacDonald
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
only in patch2:
unchanged:
--- gpaint-0.3.3.orig/debian/patches/20_fix_line_width_combo.dpatch
+++ gpaint-0.3.3/debian/patches/20_fix_line_width_combo.dpatch
@@ -0,0 +1,297 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_fix_line_width_combo.dpatch by Thomas Viehmann <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes line width combo box by putting items in the drop down
+## DP: part again in gpaint.glade.
+
[EMAIL PROTECTED]@
+--- gpaint-0.3.3~/gpaint.glade
++++ gpaint-0.3.3/gpaint.glade
+@@ -1229,6 +1229,34 @@
+ <property name="column_spacing">0</property>
+
+ <child>
++ <widget class="GtkLabel" id="Line Width">
++ <property name="visible">True</property>
++ <property name="label" translatable="yes">line
width</property>
++ <property name="use_underline">False</property>
++ <property name="use_markup">False</property>
++ <property name="justify">GTK_JUSTIFY_CENTER</property>
++ <property name="wrap">False</property>
++ <property name="selectable">False</property>
++ <property name="xalign">0.5</property>
++ <property name="yalign">0.5</property>
++ <property name="xpad">0</property>
++ <property name="ypad">0</property>
++ <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++ <property name="width_chars">-1</property>
++ <property name="single_line_mode">False</property>
++ <property name="angle">0</property>
++ <signal name="realize"
handler="on_small_label_realize"/>
++ </widget>
++ <packing>
++ <property name="left_attach">0</property>
++ <property name="right_attach">1</property>
++ <property name="top_attach">0</property>
++ <property name="bottom_attach">1</property>
++ <property name="x_options"></property>
++ <property name="y_options"></property>
++ </packing>
++ </child>
++ <child>
+ <widget class="GtkCombo" id="line_width_combo">
+ <property name="width_request">60</property>
+ <property name="height_request">25</property>
+@@ -1238,27 +1266,211 @@
+ <property name="case_sensitive">False</property>
+ <property name="enable_arrow_keys">True</property>
+ <property name="enable_arrows_always">False</property>
+- <signal name="check_resize"
handler="on_line_width_combo_check_resize"/>
+ <signal name="add" handler="on_line_width_combo_add"/>
++ <signal name="check_resize"
handler="on_line_width_combo_check_resize"/>
+
+ <child internal-child="entry">
+- <widget class="GtkEntry" id="entry1">
++ <widget class="GtkEntry"
id="line_width_combo_combo_entry">
+ <property name="visible">True</property>
++ <property name="tooltip" translatable="yes">line
width</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text"
translatable="yes"></property>
+ <property name="has_frame">True</property>
+- <property name="invisible_char">â¢</property>
++ <property name="invisible_char">*</property>
+ <property
name="activates_default">False</property>
++ <signal name="changed"
handler="on_line_width_combo_combo_entry_changed"/>
+ </widget>
+ </child>
+
+ <child internal-child="list">
+- <widget class="GtkList" id="list1">
++ <widget class="GtkList" id="convertwidget1">
+ <property name="visible">True</property>
+ <property
name="selection_mode">GTK_SELECTION_BROWSE</property>
++
++ <child>
++ <widget class="GtkListItem" id="convertwidget2">
++ <property name="visible">True</property>
++
++ <child>
++ <widget class="GtkLabel"
id="convertwidget3">
++ <property name="visible">True</property>
++ <property name="label"
translatable="yes">1</property>
++ <property
name="use_underline">False</property>
++ <property
name="use_markup">False</property>
++ <property
name="justify">GTK_JUSTIFY_LEFT</property>
++ <property name="wrap">False</property>
++ <property
name="selectable">False</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0.5</property>
++ <property name="xpad">0</property>
++ <property name="ypad">0</property>
++ <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++ <property name="width_chars">-1</property>
++ <property
name="single_line_mode">False</property>
++ <property name="angle">0</property>
++ </widget>
++ </child>
++ </widget>
++ </child>
++
++ <child>
++ <widget class="GtkListItem" id="convertwidget4">
++ <property name="visible">True</property>
++
++ <child>
++ <widget class="GtkLabel"
id="convertwidget5">
++ <property name="visible">True</property>
++ <property name="label"
translatable="yes">2</property>
++ <property
name="use_underline">False</property>
++ <property
name="use_markup">False</property>
++ <property
name="justify">GTK_JUSTIFY_LEFT</property>
++ <property name="wrap">False</property>
++ <property
name="selectable">False</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0.5</property>
++ <property name="xpad">0</property>
++ <property name="ypad">0</property>
++ <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++ <property name="width_chars">-1</property>
++ <property
name="single_line_mode">False</property>
++ <property name="angle">0</property>
++ </widget>
++ </child>
++ </widget>
++ </child>
++
++ <child>
++ <widget class="GtkListItem" id="convertwidget6">
++ <property name="visible">True</property>
++
++ <child>
++ <widget class="GtkLabel"
id="convertwidget7">
++ <property name="visible">True</property>
++ <property name="label"
translatable="yes">3</property>
++ <property
name="use_underline">False</property>
++ <property
name="use_markup">False</property>
++ <property
name="justify">GTK_JUSTIFY_LEFT</property>
++ <property name="wrap">False</property>
++ <property
name="selectable">False</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0.5</property>
++ <property name="xpad">0</property>
++ <property name="ypad">0</property>
++ <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++ <property name="width_chars">-1</property>
++ <property
name="single_line_mode">False</property>
++ <property name="angle">0</property>
++ </widget>
++ </child>
++ </widget>
++ </child>
++
++ <child>
++ <widget class="GtkListItem" id="convertwidget8">
++ <property name="visible">True</property>
++
++ <child>
++ <widget class="GtkLabel"
id="convertwidget9">
++ <property name="visible">True</property>
++ <property name="label"
translatable="yes">4</property>
++ <property
name="use_underline">False</property>
++ <property
name="use_markup">False</property>
++ <property
name="justify">GTK_JUSTIFY_LEFT</property>
++ <property name="wrap">False</property>
++ <property
name="selectable">False</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0.5</property>
++ <property name="xpad">0</property>
++ <property name="ypad">0</property>
++ <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++ <property name="width_chars">-1</property>
++ <property
name="single_line_mode">False</property>
++ <property name="angle">0</property>
++ </widget>
++ </child>
++ </widget>
++ </child>
++
++ <child>
++ <widget class="GtkListItem"
id="convertwidget10">
++ <property name="visible">True</property>
++
++ <child>
++ <widget class="GtkLabel"
id="convertwidget11">
++ <property name="visible">True</property>
++ <property name="label"
translatable="yes">6</property>
++ <property
name="use_underline">False</property>
++ <property
name="use_markup">False</property>
++ <property
name="justify">GTK_JUSTIFY_LEFT</property>
++ <property name="wrap">False</property>
++ <property
name="selectable">False</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0.5</property>
++ <property name="xpad">0</property>
++ <property name="ypad">0</property>
++ <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++ <property name="width_chars">-1</property>
++ <property
name="single_line_mode">False</property>
++ <property name="angle">0</property>
++ </widget>
++ </child>
++ </widget>
++ </child>
++
++ <child>
++ <widget class="GtkListItem"
id="convertwidget12">
++ <property name="visible">True</property>
++
++ <child>
++ <widget class="GtkLabel"
id="convertwidget13">
++ <property name="visible">True</property>
++ <property name="label"
translatable="yes">8</property>
++ <property
name="use_underline">False</property>
++ <property
name="use_markup">False</property>
++ <property
name="justify">GTK_JUSTIFY_LEFT</property>
++ <property name="wrap">False</property>
++ <property
name="selectable">False</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0.5</property>
++ <property name="xpad">0</property>
++ <property name="ypad">0</property>
++ <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++ <property name="width_chars">-1</property>
++ <property
name="single_line_mode">False</property>
++ <property name="angle">0</property>
++ </widget>
++ </child>
++ </widget>
++ </child>
++
++ <child>
++ <widget class="GtkListItem"
id="convertwidget14">
++ <property name="visible">True</property>
++
++ <child>
++ <widget class="GtkLabel"
id="convertwidget15">
++ <property name="visible">True</property>
++ <property name="label"
translatable="yes"></property>
++ <property
name="use_underline">False</property>
++ <property
name="use_markup">False</property>
++ <property
name="justify">GTK_JUSTIFY_LEFT</property>
++ <property name="wrap">False</property>
++ <property
name="selectable">False</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0.5</property>
++ <property name="xpad">0</property>
++ <property name="ypad">0</property>
++ <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++ <property name="width_chars">-1</property>
++ <property
name="single_line_mode">False</property>
++ <property name="angle">0</property>
++ </widget>
++ </child>
++ </widget>
++ </child>
+ </widget>
+ </child>
+ </widget>
+@@ -1271,35 +1483,6 @@
+ <property name="y_options"></property>
+ </packing>
+ </child>
+-
+- <child>
+- <widget class="GtkLabel" id="Line Width">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes">line
width</property>
+- <property name="use_underline">False</property>
+- <property name="use_markup">False</property>
+- <property name="justify">GTK_JUSTIFY_CENTER</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">0.5</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- <signal name="realize"
handler="on_small_label_realize"/>
+- </widget>
+- <packing>
+- <property name="left_attach">0</property>
+- <property name="right_attach">1</property>
+- <property name="top_attach">0</property>
+- <property name="bottom_attach">1</property>
+- <property name="x_options"></property>
+- <property name="y_options"></property>
+- </packing>
+- </child>
+ </widget>
+ </child>
+ </widget>
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
