diff options
author | Guido Günther <agx@sigxcpu.org> | 2009-09-29 09:35:20 +0200 |
---|---|---|
committer | Guido Günther <agx@sigxcpu.org> | 2009-09-29 09:35:20 +0200 |
commit | 045601b7fb591854ed12a8eb532fad1be71baebe (patch) | |
tree | a93902208f1926afe90681ea945e3c75b88e495e | |
parent | Merge commit 'upstream/0.13' (diff) | |
download | krb5-auth-dialog-045601b7fb591854ed12a8eb532fad1be71baebe.tar.gz krb5-auth-dialog-045601b7fb591854ed12a8eb532fad1be71baebe.tar.bz2 krb5-auth-dialog-045601b7fb591854ed12a8eb532fad1be71baebe.zip |
Drop 0001-remove-unused-GtkImage-with-duplicate-id.patch
fixed upstream.
-rw-r--r-- | debian/control | 2 | ||||
-rw-r--r-- | debian/patches/0001-remove-unused-GtkImage-with-duplicate-id.patch | 25 | ||||
-rw-r--r-- | debian/patches/series | 1 | ||||
-rwxr-xr-x | debian/rules | 2 |
4 files changed, 2 insertions, 28 deletions
diff --git a/debian/control b/debian/control index 0dd2f4a..2bfc92e 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Guido Günther <agx@sigxcpu.org> Build-Depends: debhelper (>= 6), cdbs, heimdal-dev, libgtk2.0-dev, libglade2-dev, intltool, libgnomeui-dev, autotools-dev, libnm-glib-dev, gnome-common, autoconf, automake, pkg-config, intltool, bison, flex, libnotify-dev, libgconf2-dev, - libdbus-glib-1-dev, gnome-doc-utils, rarian-compat, quilt + libdbus-glib-1-dev, gnome-doc-utils, rarian-compat Standards-Version: 3.8.3 Vcs-Git: git://git.debian.org/git/users/agx/krb5-auth-dialog.git Vcs-Browser: http://git.debian.org/git/users/agx/krb5-auth-dialog.git diff --git a/debian/patches/0001-remove-unused-GtkImage-with-duplicate-id.patch b/debian/patches/0001-remove-unused-GtkImage-with-duplicate-id.patch deleted file mode 100644 index 7e7c5f1..0000000 --- a/debian/patches/0001-remove-unused-GtkImage-with-duplicate-id.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org> -Date: Sun, 30 Aug 2009 19:06:42 +0200 -Subject: [PATCH] remove unused GtkImage with duplicate id - -BZ: #593389 ---- - preferences/krb5-auth-dialog-preferences.xml | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -diff --git a/preferences/krb5-auth-dialog-preferences.xml b/preferences/krb5-auth-dialog-preferences.xml -index 14b8598..61e99a9 100644 ---- a/preferences/krb5-auth-dialog-preferences.xml -+++ b/preferences/krb5-auth-dialog-preferences.xml -@@ -712,10 +712,6 @@ - <action-widget response="0">button1</action-widget> - </action-widgets> - </object> -- <object class="GtkImage" id="image1"> -- <property name="visible">True</property> -- <property name="stock">gtk-missing-image</property> -- </object> - <object class="GtkAdjustment" id="adjustment1"> - <property name="upper">1000</property> - <property name="step_increment">1</property> --- diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index ae4063e..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -0001-remove-unused-GtkImage-with-duplicate-id.patch diff --git a/debian/rules b/debian/rules index ec02057..b651db1 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,7 @@ LDFLAGS += -Wl,--as-needed include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/cdbs/1/class/autotools.mk -include /usr/share/cdbs/1/rules/patchsys-quilt.mk +#include /usr/share/cdbs/1/rules/patchsys-quilt.mk DEB_BUILDDIR := build DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/usr --enable-network-manager --with-libnotify |