summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorAlessio Treglia <alessio@debian.org>2012-05-21 14:47:41 +0200
committerAlessio Treglia <alessio@debian.org>2012-05-21 14:47:41 +0200
commit5817d2d5cf35aa7c8f10f19114af6333bd2512f8 (patch)
treefaa39d850972b55919f838f20c271690d9da2a0c /debian
parent033348ddb06427db91430524f212649fb46fcf93 (diff)
Drop 20-lpi.patch as launchpad-integration has been removed from Ubuntu.
Closes: # Thanks: Jeremy Bicha for the great work.
Diffstat (limited to 'debian')
-rw-r--r--debian/patches/20-lpi.patch40
-rw-r--r--debian/patches/ubuntu.series3
2 files changed, 0 insertions, 43 deletions
diff --git a/debian/patches/20-lpi.patch b/debian/patches/20-lpi.patch
deleted file mode 100644
index 2570df8..0000000
--- a/debian/patches/20-lpi.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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/ubuntu.series b/debian/patches/ubuntu.series
deleted file mode 100644
index cc1010c..0000000
--- a/debian/patches/ubuntu.series
+++ /dev/null
@@ -1,3 +0,0 @@
-01-zlib.patch
-20-lpi.patch
-02-file-filter-labels.patch