From 746f9bd80132bba8108bd546b1fc65e06cd8cfa2 Mon Sep 17 00:00:00 2001 From: Alessio Treglia Date: Tue, 31 Aug 2010 01:08:57 +0200 Subject: Rename patches and change the order they apply. --- debian/patches/01-zlib.patch | 25 +++++++++++++++++++++++++ debian/patches/01_lpi.patch | 38 -------------------------------------- debian/patches/02-zlib.patch | 25 ------------------------- debian/patches/20-lpi.patch | 38 ++++++++++++++++++++++++++++++++++++++ debian/patches/series | 4 ++-- 5 files changed, 65 insertions(+), 65 deletions(-) create mode 100644 debian/patches/01-zlib.patch delete mode 100644 debian/patches/01_lpi.patch delete mode 100644 debian/patches/02-zlib.patch create mode 100644 debian/patches/20-lpi.patch 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/01_lpi.patch b/debian/patches/01_lpi.patch deleted file mode 100644 index 237803a..0000000 --- a/debian/patches/01_lpi.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 - #include - #include // TEMP: Needed for close() in get_temporary_filename() -+#include - - #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/02-zlib.patch b/debian/patches/02-zlib.patch deleted file mode 100644 index fb64fb6..0000000 --- a/debian/patches/02-zlib.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- - 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 + #include + #include // TEMP: Needed for close() in get_temporary_filename() ++#include + + #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 index a46cf4c..36f7660 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,2 @@ -# Empty -02-zlib.patch +01-zlib.patch +# 20-lpi.patch -- cgit v1.2.3