diff options
Diffstat (limited to 'debian/patches')
-rw-r--r-- | debian/patches/01-zlib.patch | 25 | ||||
-rw-r--r-- | debian/patches/20-lpi.patch | 38 | ||||
-rw-r--r-- | debian/patches/series | 1 | ||||
-rw-r--r-- | debian/patches/ubuntu.series | 2 |
4 files changed, 66 insertions, 0 deletions
diff --git a/debian/patches/01-zlib.patch b/debian/patches/01-zlib.patch new file mode 100644 index 0000000..fb64fb6 --- /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 +@@ -40,6 +40,7 @@ PKG_CHECK_MODULES(SIMPLE_SCAN, [ + + 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 +@@ -30,6 +30,7 @@ simple_scan_LDADD = \ + $(SIMPLE_SCAN_LIBS) \ + -lsane \ + -ljpeg \ ++ -lz \ + -lm + + DISTCLEANFILES = \ diff --git a/debian/patches/20-lpi.patch b/debian/patches/20-lpi.patch new file mode 100644 index 0000000..237803a --- /dev/null +++ b/debian/patches/20-lpi.patch @@ -0,0 +1,38 @@ +Origin: Ubuntu +Description: Add launchpad-integration support. +--- + configure.ac | 1 + + src/ui.c | 5 +++++ + 2 files changed, 6 insertions(+) + +--- simple-scan.orig/configure.ac ++++ simple-scan/configure.ac +@@ -36,6 +36,7 @@ PKG_CHECK_MODULES(SIMPLE_SCAN, [ + cairo-pdf + dbus-glib-1 + gudev-1.0 ++ launchpad-integration + ]) + + AC_CHECK_HEADERS([sane/sane.h],[],[AC_MSG_ERROR([SANE not found])]) +--- simple-scan.orig/src/ui.c ++++ simple-scan/src/ui.c +@@ -16,6 +16,7 @@ + #include <gconf/gconf-client.h> + #include <math.h> + #include <unistd.h> // TEMP: Needed for close() in get_temporary_filename() ++#include <launchpad-integration.h> + + #include "ui.h" + #include "book-view.h" +@@ -1581,6 +1582,10 @@ ui_load (SimpleScan *ui) + } + gtk_builder_connect_signals (builder, ui); + ++ /* Add Launchpad integration */ ++ launchpad_integration_set_sourcepackagename ("simple-scan"); ++ launchpad_integration_add_items (GTK_WIDGET (gtk_builder_get_object (builder, "help_menu")), 1, TRUE, TRUE); ++ + ui->priv->window = GTK_WIDGET (gtk_builder_get_object (builder, "simple_scan_window")); + ui->priv->main_vbox = GTK_WIDGET (gtk_builder_get_object (builder, "main_vbox")); + ui->priv->page_move_left_menuitem = GTK_WIDGET (gtk_builder_get_object (builder, "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 |