Bug#885051: pdfmod: Drop unnecessary Build-Depend on libgnome2.0-cil-dev

[Jeremy Bicha]

Control: tags -1 +pending

On Sat, Jan 27, 2018 at 9:10 PM Jeremy Bicha  wrote:
> There was a typo in my second patch.
>
> I have imported my corrected patches to
>
> https://salsa.debian.org/jbicha/pdfmod

I submitted a merge request and uploaded my work as an NMU to the
DELAYED/2 queue.

https://salsa.debian.org/dotnet-team/pdfmod/merge_requests/1

Thanks,
Jeremy Bicha

Bug#885051: pdfmod: Drop unnecessary Build-Depend on libgnome2.0-cil-dev

[Jeremy Bicha]

There was a typo in my second patch.

I have imported my corrected patches to

https://salsa.debian.org/jbicha/pdfmod

Thanks,
Jeremy Bicha

Bug#885051: pdfmod: Drop unnecessary Build-Depend on libgnome2.0-cil-dev

[Jeremy Bicha]

Control: tags -1 +patch

I'm attaching patches to drop the libgnome and gconf dependencies. I
do get a crash on closing the app after opening the Bookmarks sidebar.
I don't know if that's new or not since I haven't used pdfmod much.


Thanks,
Jeremy Bicha
From 6e44a3dabee733c15481f869edb44bb8e493a4e5 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha 
Date: Sat, 23 Dec 2017 01:31:45 -0500
Subject: [PATCH 1/5] Build-Depend on libgtk2.0-cil-dev instead of
 libgnome2.0-cil-dev

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 3c7cf20..685adb6 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,8 @@ Build-Depends: debhelper (>= 7.0.50),
mono-devel (>= 2.4.2),
gnome-doc-utils (>= 0.3.2),
intltool (>= 0.35.0),
-   libgnome2.0-cil-dev,
libgconf2.0-cil-dev,
+   libgtk2.0-cil-dev,
libhyena-cil-dev (>= 0.5),
libpoppler-cil-dev (>= 0.0.2)
 Standards-Version: 3.9.3
-- 
2.14.1

From 256f490e7aa4029a8f465668fb594e840a372227 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha 
Date: Sat, 23 Dec 2017 02:24:50 -0500
Subject: [PATCH 2/5] Revert commit that added gconf dependency

---
 debian/control |   4 +-
 debian/patches/Drop-gconf-dependency.patch | 227 +
 debian/patches/series  |   1 +
 debian/rules   |   8 +-
 debian/rules.orig  |  33 +
 debian/rules.rej   |  11 ++
 6 files changed, 279 insertions(+), 5 deletions(-)
 create mode 100644 debian/patches/Drop-gconf-dependency.patch
 create mode 100755 debian/rules.orig
 create mode 100644 debian/rules.rej

diff --git a/debian/control b/debian/control
index 685adb6..7c4f573 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,13 @@ Section: gnome
 Priority: optional
 Maintainer: Debian CLI Applications Team 
 Uploaders: Chow Loong Jin 
-Build-Depends: debhelper (>= 7.0.50),
+Build-Depends: debhelper (>= 10),
autotools-dev,
cli-common-dev (>= 0.5.7),
mono-devel (>= 2.4.2),
gnome-doc-utils (>= 0.3.2),
intltool (>= 0.35.0),
-   libgconf2.0-cil-dev,
+   libglib2.0-dev,
libgtk2.0-cil-dev,
libhyena-cil-dev (>= 0.5),
libpoppler-cil-dev (>= 0.0.2)
diff --git a/debian/patches/Drop-gconf-dependency.patch b/debian/patches/Drop-gconf-dependency.patch
new file mode 100644
index 000..c9bce4a
--- /dev/null
+++ b/debian/patches/Drop-gconf-dependency.patch
@@ -0,0 +1,227 @@
+From: Jeremy Bicha 
+Date: Sat, 23 Dec 2017 02:22:44 -0500
+Subject: Drop gconf dependency
+
+Revert 3647e8bd20533f317c8fa0deac29e89fec0512f2
+"Remember show_toolbar and last_open folder in gconf"
+
+Similarly, undo gconf support for Bookmarks feature
+---
+ configure.ac |  1 -
+ src/Makefile.am  |  2 --
+ src/PdfMod/Core/Client.cs|  2 --
+ src/PdfMod/Core/Configuration.cs | 65 
+ src/PdfMod/Gui/Actions.cs| 17 +++
+ src/PdfMod/Gui/BookmarkView.cs   |  2 --
+ src/PdfMod/Gui/Client.cs |  3 --
+ 7 files changed, 4 insertions(+), 88 deletions(-)
+ delete mode 100644 src/PdfMod/Core/Configuration.cs
+
+diff --git a/configure.ac b/configure.ac
+index e3b4570..6438aa0 100644
+--- a/configure.ac
 b/configure.ac
+@@ -108,7 +108,6 @@ AM_GLIB_GNU_GETTEXT
+ dnl package checks, common for all configs
+ PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0])
+ PKG_CHECK_MODULES([GLIB_SHARP_20], [glib-sharp-2.0])
+-PKG_CHECK_MODULES([GCONF_SHARP_20], [gconf-sharp-2.0])
+ 
+ dnl package checks, per config
+ PKG_CHECK_MODULES(HYENA, hyena >= 0.5)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 9eb4c74..a3ead39 100644
+--- a/src/Makefile.am
 b/src/Makefile.am
+@@ -29,7 +29,6 @@ all: $(ASSEMBLY) $(PROGRAMFILES) $(BINARIES)
+ FILES =  \
+ 	PdfMod/Core/AssemblyInfo.cs \
+ 	PdfMod/Core/Client.cs \
+-	PdfMod/Core/Configuration.cs \
+ 	PdfMod/Core/Defines.cs \
+ 	PdfMod/Gui/Actions.cs \
+ 	PdfMod/Gui/BookmarkView.cs \
+@@ -63,7 +62,6 @@ EXTRAS = \
+ REFERENCES =  \
+ 	Mono.Cairo \
+ 	Mono.Posix \
+-	-pkg:gconf-sharp-2.0 \
+ 	-pkg:glib-sharp-2.0 \
+ 	-pkg:gtk-sharp-2.0 \
+ 	-pkg:hyena \
+diff --git a/src/PdfMod/Core/Client.cs b/src/PdfMod/Core/Client.cs
+index e8d4d11..fac4c75 100644
+--- a/src/PdfMod/Core/Client.cs
 b/src/PdfMod/Core/Client.cs
+@@ -32,13 +32,11 @@ namespace PdfMod.Core
+ static readonly string CacheDir = Path.Combine (XdgBaseDirectorySpec.GetUserDirectory ("XDG_CACHE_HOME", ".cache"), "pdfmod");
+ 
+ public Document Document { get; protected set; }
+-public