[Pkg-cli-apps-commits] r5273 - in /packages/gfax/trunk/debian: changelog control patches/00list patches/08_disable_evolution_sharp.dpatch rules
directhex at users.alioth.debian.org
directhex at users.alioth.debian.org
Fri Jan 29 12:26:52 UTC 2010
Author: directhex
Date: Fri Jan 29 12:26:51 2010
New Revision: 5273
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=5273
Log:
* debian/patches/02_libgnomeprint_path,
debian/patches/03_fix_gconf-sharp-peditors_linkage,
debian/patches/04_fix_Process_ambiguous_reference,
debian/patches/pretty_date_format,
debian/patches/fr.po,
debian/patches/configurable_compiler,
debian/patches/ignore_killall:
+ Remove (fixed upstream)
* debian/patches/08_disable_evolution_sharp.dpatch,
debian/control:
+ Evolution# is broken, so disable it
* debian/control:
+ Standards 3.8.4 (no changes needed)
+ Update build-deps to use -dev packages
+ Stop manually depending on libgnomeprint
* debian/rules,
debian/control:
+ Use mono-csc from mono-devel 2.4.3 as compiler command
* debian/rules:
+ Stop manually passing gnomeprint nonsense to dh_gencontrol
Added:
packages/gfax/trunk/debian/patches/08_disable_evolution_sharp.dpatch (with props)
Modified:
packages/gfax/trunk/debian/changelog
packages/gfax/trunk/debian/control
packages/gfax/trunk/debian/patches/00list
packages/gfax/trunk/debian/rules
Modified: packages/gfax/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gfax/trunk/debian/changelog?rev=5273&op=diff
==============================================================================
--- packages/gfax/trunk/debian/changelog (original)
+++ packages/gfax/trunk/debian/changelog Fri Jan 29 12:26:51 2010
@@ -1,13 +1,31 @@
gfax (0.7.7-1) UNRELEASED; urgency=low
- [ Stefan Ebner ]
- * debian/control:
- + Get rid of libgcof2.24-cil since gnome-sharp is fixed in ubuntu now
-
[ Iain Lane ]
- * New upstream release 0.7.7
-
- -- Iain Lane <laney at ubuntu.com> Sat, 17 Oct 2009 10:12:24 +0100
+ * New upstream release 0.7.7 (Closes: #542559)
+
+ [ Jo Shields ]
+ * debian/patches/02_libgnomeprint_path,
+ debian/patches/03_fix_gconf-sharp-peditors_linkage,
+ debian/patches/04_fix_Process_ambiguous_reference,
+ debian/patches/pretty_date_format,
+ debian/patches/fr.po,
+ debian/patches/configurable_compiler,
+ debian/patches/ignore_killall:
+ + Remove (fixed upstream)
+ * debian/patches/08_disable_evolution_sharp.dpatch,
+ debian/control:
+ + Evolution# is broken, so disable it
+ * debian/control:
+ + Standards 3.8.4 (no changes needed)
+ + Update build-deps to use -dev packages
+ + Stop manually depending on libgnomeprint
+ * debian/rules,
+ debian/control:
+ + Use mono-csc from mono-devel 2.4.3 as compiler command
+ * debian/rules:
+ + Stop manually passing gnomeprint nonsense to dh_gencontrol
+
+ -- Jo Shields <directhex at apebox.org> Fri, 29 Jan 2010 11:31:56 +0000
gfax (0.7.6-13) unstable; urgency=low
Modified: packages/gfax/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gfax/trunk/debian/control?rev=5273&op=diff
==============================================================================
--- packages/gfax/trunk/debian/control (original)
+++ packages/gfax/trunk/debian/control Fri Jan 29 12:26:51 2010
@@ -5,15 +5,13 @@
Uploaders: Mirco Bauer <meebey at debian.org>
Build-Depends: debhelper (>= 7), dpatch
Build-Depends-Indep: cli-common-dev (>= 0.5.4),
- mono-devel (>= 2.0),
- libgtk2.0-cil,
- libgnome2.24-cil (>= 2.24),
- libgconf2.0-cil,
+ mono-devel (>= 2.4.3),
+ libgtk2.0-cil-dev,
+ libgnome2.0-cil-dev,
+ libgconf2.0-cil-dev,
libgconf2-dev,
- libglade2.0-cil,
- libglib2.0-cil,
- libevolution5.0-cil,
- libgnomeprint2.2-dev,
+ libglade2.0-cil-dev,
+ libglib2.0-cil-dev,
gettext,
intltool,
gnome-doc-utils,
@@ -21,14 +19,14 @@
autoconf,
automake,
autotools-dev
-Standards-Version: 3.8.1
+Standards-Version: 3.8.4
Homepage: http://www.cowlug.org/gfax/
Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-apps/packages/gfax/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gfax/trunk/
Package: gfax
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, libgnomeprint2.2-0 (>= ${misc:libgnomeprint-upversion}), libgnomeprint2.2-0 (<< ${misc:libgnomeprint-next-upversion}), efax | hylafax-client
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, efax | hylafax-client
Description: GNOME frontend for fax programs
The GFAX project aims to provide a free front end to the various facsimile
programs available for Linux and other operating systems that use the GNOME
Modified: packages/gfax/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gfax/trunk/debian/patches/00list?rev=5273&op=diff
==============================================================================
--- packages/gfax/trunk/debian/patches/00list (original)
+++ packages/gfax/trunk/debian/patches/00list Fri Jan 29 12:26:51 2010
@@ -1,8 +1,2 @@
-02_libgnomeprint_path
-03_fix_gconf-sharp-peditors_linkage
-04_fix_Process_ambiguous_reference
-pretty_date_format
+08_disable_evolution_sharp
fix_mkdir_p_var
-fr.po
-configurable_compiler
-ignore_killall
Added: packages/gfax/trunk/debian/patches/08_disable_evolution_sharp.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gfax/trunk/debian/patches/08_disable_evolution_sharp.dpatch?rev=5273&op=file
==============================================================================
--- packages/gfax/trunk/debian/patches/08_disable_evolution_sharp.dpatch (added)
+++ packages/gfax/trunk/debian/patches/08_disable_evolution_sharp.dpatch Fri Jan 29 12:26:51 2010
@@ -1,0 +1,82 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08_disable_evolution_sharp.dpatch by Jo Shields <directhex at apebox.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Strip support for Evolution, as Evolution Sharp sucks
+
+ at DPATCH@
+diff -urNad gfax-0.7.7~/configure.in gfax-0.7.7/configure.in
+--- gfax-0.7.7~/configure.in 2010-01-29 11:42:19.603626175 +0000
++++ gfax-0.7.7/configure.in 2010-01-29 11:42:34.791765521 +0000
+@@ -67,7 +67,7 @@
+ # Gfax needs Gtk# Gnome# GConf#
+ #
+ PKG_CHECK_MODULES(GFAX, glib-sharp-2.0 gtk-sharp-2.0 gnome-sharp-2.0 gconf-sharp-2.0 gconf-sharp-peditors-2.0
+- glade-sharp-2.0 evolution-sharp)
++ glade-sharp-2.0)
+ AC_SUBST(GFAX_LIBS)
+
+ AC_OUTPUT([
+diff -urNad gfax-0.7.7~/src/Makefile.am gfax-0.7.7/src/Makefile.am
+--- gfax-0.7.7~/src/Makefile.am 2010-01-29 11:42:19.603626175 +0000
++++ gfax-0.7.7/src/Makefile.am 2010-01-29 11:44:59.011134807 +0000
+@@ -31,7 +31,6 @@
+ hylafax.cs \
+ main.cs \
+ phonebook.cs \
+- evolution.cs \
+ sendphonebook.cs
+
+
+diff -urNad gfax-0.7.7~/src/newphonebook.cs gfax-0.7.7/src/newphonebook.cs
+--- gfax-0.7.7~/src/newphonebook.cs 2010-01-29 11:42:19.603626175 +0000
++++ gfax-0.7.7/src/newphonebook.cs 2010-01-29 11:43:56.951136400 +0000
+@@ -69,8 +69,8 @@
+
+ GfaxRadioButton.Active = true;
+
+- EvolutionRadioButton.Sensitive = true;
+ // turn these off until somewhere near supported
++ EvolutionRadioButton.Sensitive = false;
+ DatabaseRadioButton.Visible = false;
+ LDAPRadioButton.Visible = false;
+
+@@ -171,7 +171,7 @@
+ private void on_BookDruidPageStandard_next (object o, Gnome.NextClickedArgs args)
+ {
+ // skip next page if active
+- if (EvolutionRadioButton.Active) {
++ /*if (EvolutionRadioButton.Active) {
+ NewPhoneBookDruid.Page = druidpagestandard12;
+
+ EdsPhoneBooks eds = new EdsPhoneBooks();
+@@ -185,7 +185,7 @@
+ iter = store.AppendValues(false, enu.Current);
+ EvolutionTreeView.Model = store;
+ }
+- }
++ }*/
+ }
+ }
+ }
+diff -urNad gfax-0.7.7~/src/phonebook.cs gfax-0.7.7/src/phonebook.cs
+--- gfax-0.7.7~/src/phonebook.cs 2010-01-29 11:42:19.603626175 +0000
++++ gfax-0.7.7/src/phonebook.cs 2010-01-29 11:44:16.233657857 +0000
+@@ -314,7 +314,7 @@
+ fp.Close();
+ }
+
+- if ( p.Type == "evolution" ) {
++ /*if ( p.Type == "evolution" ) {
+ EdsPhoneBooks eds = new EdsPhoneBooks();
+ ArrayList ebooks = new ArrayList();
+ ebooks = eds.GetPhoneBooks();
+@@ -325,7 +325,7 @@
+ records = eds.GetContacts((string)enu.Current);
+ }
+ }
+- }
++ }*/
+
+ return records;
+
Propchange: packages/gfax/trunk/debian/patches/08_disable_evolution_sharp.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: packages/gfax/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gfax/trunk/debian/rules?rev=5273&op=diff
==============================================================================
--- packages/gfax/trunk/debian/rules (original)
+++ packages/gfax/trunk/debian/rules Fri Jan 29 12:26:51 2010
@@ -31,7 +31,7 @@
autoconf
automake --add-missing --copy
- MCS=/usr/bin/csc \
+ MCS=/usr/bin/mono-csc \
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc \
--mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
@@ -83,7 +83,7 @@
dh_installdeb -i
dh_shlibdeps -i
dh_clideps -i
- dh_gencontrol -i -- -Vmisc:libgnomeprint-upversion=$(LIBGNOMEPRINT_UPVERSION) -Vmisc:libgnomeprint-next-upversion=$(LIBGNOMEPRINT_NEXT_UPVERSION)
+ dh_gencontrol -i
dh_md5sums -i
dh_builddeb -i
More information about the Pkg-cli-apps-commits
mailing list