summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2012-04-08 23:13:51 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2012-04-08 23:13:51 +0000
commit4c1e855b99681ed96811964fc7cff43aa81ff4d1 (patch)
tree6e357685186bf68aa8e547d61fa3a33dfab1d188 /debian
parent86b0ea3d5e501a2fb627cbe89f8dbc635b59aa59 (diff)
Remove patches/console_utf-8.patch, merged upstream
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/console_utf-8.patch19
-rw-r--r--debian/patches/series1
3 files changed, 1 insertions, 20 deletions
diff --git a/debian/changelog b/debian/changelog
index 8e369bef..49f6d6fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ hurd (20120408-1) UNRELEASED; urgency=low
* New upstream snapshot.
- Fixes tmpfs, thanks Maksym!
+ - Remove patches/console_utf-8.patch, merged upstream.
* control:
- Bump Standards-Version to 3.9.3 (no changes).
- Set hurd-udeb XC-Package-Type to udeb.
diff --git a/debian/patches/console_utf-8.patch b/debian/patches/console_utf-8.patch
deleted file mode 100644
index 663e21bd..00000000
--- a/debian/patches/console_utf-8.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-2006-08-26 Michael Banck <mbanck@debian.org>
-
- * console.c (DEFAULT_ENCODING): Set to UTF-8.
-
----
- console/console.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/console/console.c
-+++ b/console/console.c
-@@ -58,7 +58,7 @@ int netfs_maxsymlinks = 16; /* Arbitrary
- /* Handy source of time. */
- volatile struct mapped_time_value *console_maptime;
-
--#define DEFAULT_ENCODING "ISO-8859-1"
-+#define DEFAULT_ENCODING "UTF-8"
- #define DEFAULT_INTENSITY CONS_ATTR_INTENSITY_NORMAL
- #define DEFAULT_UNDERLINED 0
- #define DEFAULT_BLINKING 0
diff --git a/debian/patches/series b/debian/patches/series
index 17312c59..22557825 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-console_utf-8.patch
diskfs_no_inherit_dir_group.patch
ext2fs_large_stores.patch
hurd_console_startup.patch