summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/01-zlib.patch25
-rw-r--r--debian/patches/20-lpi.patch40
-rw-r--r--debian/patches/series1
-rw-r--r--debian/patches/ubuntu.series2
4 files changed, 68 insertions, 0 deletions
diff --git a/debian/patches/01-zlib.patch b/debian/patches/01-zlib.patch
new file mode 100644
index 0000000..6314ec4
--- /dev/null
+++ b/debian/patches/01-zlib.patch
@@ -0,0 +1,25 @@
+---
+ configure.ac | 1 +
+ src/Makefile.am | 1 +
+ 2 files changed, 2 insertions(+)
+
+--- simple-scan.orig/configure.ac
++++ simple-scan/configure.ac
+@@ -39,6 +39,7 @@ AM_CONDITIONAL(HAVE_COLORD, test $have_c
+
+ AC_CHECK_HEADERS([sane/sane.h],[],[AC_MSG_ERROR([SANE not found])])
+ AC_CHECK_HEADERS([sane/saneopts.h],[],[AC_MSG_ERROR([SANE not found])])
++AC_CHECK_HEADERS([zlib.h],[],[AC_MSG_ERROR([ZLib not found])])
+ AC_CHECK_HEADERS([jpeglib.h],[],[AC_MSG_ERROR([libjpeg not found])])
+
+ dnl ###########################################################################
+--- simple-scan.orig/src/Makefile.am
++++ simple-scan/src/Makefile.am
+@@ -40,6 +40,7 @@ simple_scan_LDADD = \
+ $(COLORD_LIBS) \
+ -lsane \
+ -ljpeg \
++ -lz \
+ -lm
+
+ CLEANFILES = \
diff --git a/debian/patches/20-lpi.patch b/debian/patches/20-lpi.patch
new file mode 100644
index 0000000..2570df8
--- /dev/null
+++ b/debian/patches/20-lpi.patch
@@ -0,0 +1,40 @@
+Origin: Ubuntu
+Description: Add launchpad-integration support.
+---
+ configure.ac | 1 +
+ src/Makefile.am | 1 +
+ src/ui.vala | 3 +++
+ 3 files changed, 5 insertions(+)
+
+--- simple-scan.orig/configure.ac
++++ simple-scan/configure.ac
+@@ -30,6 +30,7 @@ PKG_CHECK_MODULES(SIMPLE_SCAN, [
+ cairo
+ gdk-pixbuf-2.0
+ gudev-1.0
++ launchpad-integration-3.0
+ ])
+
+ PKG_CHECK_MODULES(COLORD, [
+--- simple-scan.orig/src/Makefile.am
++++ simple-scan/src/Makefile.am
+@@ -15,6 +15,7 @@ simple_scan_SOURCES = \
+
+ simple_scan_VALAFLAGS = \
+ --pkg=zlib \
++ --pkg=launchpad-integration-3.0 \
+ --pkg=gudev-1.0 \
+ --pkg=gio-2.0 \
+ --pkg=gtk+-3.0
+--- simple-scan.orig/src/ui.vala
++++ simple-scan/src/ui.vala
+@@ -1268,6 +1268,9 @@ public class SimpleScan
+ }
+ builder.connect_signals (this);
+
++ LaunchpadIntegration.set_sourcepackagename ("simple-scan");
++ LaunchpadIntegration.add_items ((Gtk.Widget) builder.get_object ("help_menu"), 1, true, true);
++
+ window = (Gtk.Window) builder.get_object ("simple_scan_window");
+ main_vbox = (Gtk.VBox) builder.get_object ("main_vbox");
+ page_move_left_menuitem = (Gtk.MenuItem) builder.get_object ("page_move_left_menuitem");
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f505775
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-zlib.patch
diff --git a/debian/patches/ubuntu.series b/debian/patches/ubuntu.series
new file mode 100644
index 0000000..0d508d3
--- /dev/null
+++ b/debian/patches/ubuntu.series
@@ -0,0 +1,2 @@
+01-zlib.patch
+20-lpi.patch