summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog4
-rw-r--r--debian/control2
-rw-r--r--debian/copyright2
-rw-r--r--debian/files1
-rw-r--r--debian/patches/0001_jam.patch2
-rw-r--r--debian/patches/0105_dispwin_segfault.patch2
-rw-r--r--debian/patches/0115_hurd_PATH_MAX.patch4
-rw-r--r--debian/patches/series2
8 files changed, 10 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog
index ba7b4bf..4bd2fce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-argyll (1.9.2+repack-2.1) UNRELEASED; urgency=medium
+argyll (2.0.0-1) UNRELEASED; urgency=medium
* Switch from repack to Files-Excluded.
+ * Refresh patches.
+ * Change to my new email address.
-- Jörg Frings-Fürst <debian@jff.email> Sat, 25 Nov 2017 10:10:30 +0100
diff --git a/debian/control b/debian/control
index 407baf4..0400b76 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: argyll
Section: graphics
Priority: optional
-Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Maintainer: Jörg Frings-Fürst <debian@jff.email>
Standards-Version: 4.0.1
Build-Depends:
debhelper (>= 10),
diff --git a/debian/copyright b/debian/copyright
index 57796ec..b1455cd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -154,7 +154,7 @@ License: public-domain
Files: debian/*
Copyright: 2006-2008 Christian Marillat <marillat@debian.org>
2008-2010 Roland Mas <lolando@debian.org>
- 2014-2017 Jörg Frings-Fürst <debian@jff-webhosting.net>
+ 2014-2017 Jörg Frings-Fürst <debian@jff.email>
License: GPL-3+
License: AGPL-3
diff --git a/debian/files b/debian/files
deleted file mode 100644
index f651ec4..0000000
--- a/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-argyll_1.9.2+repack-2_source.buildinfo graphics optional
diff --git a/debian/patches/0001_jam.patch b/debian/patches/0001_jam.patch
index 69156bd..b0469f3 100644
--- a/debian/patches/0001_jam.patch
+++ b/debian/patches/0001_jam.patch
@@ -47,7 +47,7 @@ Index: trunk/Jamtop
# Tell standalone libraries that they are part of Argyll:
DEFINES += ARGYLLCMS ;
-@@ -139,17 +140,82 @@ rule CheckForLibrary {
+@@ -152,17 +153,82 @@ rule CheckForLibrary {
}
if ! $(BUILTIN_$(UCASE)) && $(UNIX) {
diff --git a/debian/patches/0105_dispwin_segfault.patch b/debian/patches/0105_dispwin_segfault.patch
index 8134301..3ead582 100644
--- a/debian/patches/0105_dispwin_segfault.patch
+++ b/debian/patches/0105_dispwin_segfault.patch
@@ -10,7 +10,7 @@ Index: trunk/spectro/dispwin.c
===================================================================
--- trunk.orig/spectro/dispwin.c
+++ trunk/spectro/dispwin.c
-@@ -6055,6 +6055,7 @@ main(int argc, char *argv[]) {
+@@ -6277,6 +6277,7 @@ main(int argc, char *argv[]) {
/* Display number */
else if (argv[fa][1] == 'd') {
diff --git a/debian/patches/0115_hurd_PATH_MAX.patch b/debian/patches/0115_hurd_PATH_MAX.patch
index 3775edc..86f338d 100644
--- a/debian/patches/0115_hurd_PATH_MAX.patch
+++ b/debian/patches/0115_hurd_PATH_MAX.patch
@@ -38,7 +38,7 @@ Index: trunk/spectro/usbio_lx.c
===================================================================
--- trunk.orig/spectro/usbio_lx.c
+++ trunk/spectro/usbio_lx.c
-@@ -33,6 +33,10 @@
+@@ -34,6 +34,10 @@
#define poll_x poll
#endif
@@ -68,7 +68,7 @@ Index: trunk/spectro/hidio.c
===================================================================
--- trunk.orig/spectro/hidio.c
+++ trunk/spectro/hidio.c
-@@ -100,6 +100,10 @@
+@@ -101,6 +101,10 @@
#endif
#endif
diff --git a/debian/patches/series b/debian/patches/series
index 47582dd..2c9f69a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
0105_dispwin_segfault.patch
-0100_spelling.patch
+#0100_spelling.patch
0001_jam.patch
0115_hurd_PATH_MAX.patch
#0110_usb-db_new.patch