diff options
Diffstat (limited to 'debian/patches')
-rw-r--r-- | debian/patches/01_lpi.patch | 38 | ||||
-rw-r--r-- | debian/patches/02-zlib.patch | 39 | ||||
-rw-r--r-- | debian/patches/series | 2 |
3 files changed, 79 insertions, 0 deletions
diff --git a/debian/patches/01_lpi.patch b/debian/patches/01_lpi.patch new file mode 100644 index 0000000..73067ec --- /dev/null +++ b/debian/patches/01_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" +@@ -1526,6 +1527,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_delete_menuitem = GTK_WIDGET (gtk_builder_get_object (builder, "page_delete_menuitem")); diff --git a/debian/patches/02-zlib.patch b/debian/patches/02-zlib.patch new file mode 100644 index 0000000..c853fc0 --- /dev/null +++ b/debian/patches/02-zlib.patch @@ -0,0 +1,39 @@ +--- + debian/patches/02_zlib.patch | 32 ++++++++++++++++++++++++++++++++ + 1 file changed, 32 insertions(+) + +--- /dev/null ++++ simple-scan/debian/patches/02_zlib.patch +@@ -0,0 +1,32 @@ ++Index: simple-scan-2.31.4/configure.ac ++=================================================================== ++--- simple-scan-2.31.4.orig/configure.ac 2010-07-01 10:41:07.647854281 +1000 +++++ simple-scan-2.31.4/configure.ac 2010-07-01 10:41:47.307854280 +1000 ++@@ -30,7 +30,6 @@ ++ gconf-2.0 ++ gmodule-export-2.0 ++ gthread-2.0 ++- zlib, ++ cairo ++ gdk-pixbuf-2.0 ++ cairo-pdf ++@@ -41,6 +40,7 @@ ++ ++ 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 ########################################################################### ++Index: simple-scan-2.31.4/src/Makefile.am ++=================================================================== ++--- simple-scan-2.31.4.orig/src/Makefile.am 2010-07-01 10:41:14.017854282 +1000 +++++ simple-scan-2.31.4/src/Makefile.am 2010-07-01 10:41:23.817854281 +1000 ++@@ -30,6 +30,7 @@ ++ $(SIMPLE_SCAN_LIBS) \ ++ -lsane \ ++ -ljpeg \ +++ -lz \ ++ -lm ++ ++ DISTCLEANFILES = \ diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..a46cf4c --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +# Empty +02-zlib.patch |