diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2013-03-09 21:33:00 +0000 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2013-03-09 21:33:00 +0000 |
| commit | c4c229578cc9d8da99b84a1781029d67a6a6f83f (patch) | |
| tree | 761344f08510398ee8989d502e0229551ce8db1e | |
| parent | f311f37306ed823fc4bf2fb18429b3f6812e7827 (diff) | |
| download | aptitude-debian.tar.gz | |
aptitude (0.6.9.1-1+dyson2) unstable; urgency=lowdebian
* Fixed typo in patch name
* Use GNU strerror_r only if _GNU_SOURCE is defined,
do not check for Glibc; build depends on libc1-dev >= 2.10-11
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | debian/patches/0003-include-signal.h-for-kill.patch (renamed from debian/patches/0003-include-siagnal.h-for-kill.patch) | 0 | ||||
| -rw-r--r-- | debian/patches/0005-strerror_r.patch | 13 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
5 files changed, 16 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog index 1a6ceda2..1f3a09ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +aptitude (0.6.9.1-1+dyson2) unstable; urgency=low + + * Fixed typo in patch name + * Use GNU strerror_r only if _GNU_SOURCE is defined, + do not check for Glibc; build depends on libc1-dev >= 2.10-11 + + -- Igor Pashev <pashev.igor@gmail.com> Sat, 09 Mar 2013 21:32:40 +0000 + aptitude (0.6.9.1-1) experimental; urgency=low * Really silence errors when debtags is not installed diff --git a/debian/control b/debian/control index 82ed5f66..b1b01932 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,7 @@ Build-Depends: libapt-pkg-dev (>= 0.9.7), debhelper (>= 9), librsvg2-bin, libboost-dev, libboost-serialization-dev, libboost-python-dev, libboost-iostreams-dev, libboost-test-dev, libgtest-dev, google-mock, libsqlite3-dev, dpkg-dev (>= 1.16.1), + libc1-dev ( >= 2.10-11) [illumos-any], pkg-config Vcs-Git: git://git.debian.org/git/aptitude/aptitude.git Vcs-Browser: http://git.debian.org/?p=aptitude/aptitude.git;a=summary diff --git a/debian/patches/0003-include-siagnal.h-for-kill.patch b/debian/patches/0003-include-signal.h-for-kill.patch index bd13e572..bd13e572 100644 --- a/debian/patches/0003-include-siagnal.h-for-kill.patch +++ b/debian/patches/0003-include-signal.h-for-kill.patch diff --git a/debian/patches/0005-strerror_r.patch b/debian/patches/0005-strerror_r.patch index 8a6ce20c..0aba0d4c 100644 --- a/debian/patches/0005-strerror_r.patch +++ b/debian/patches/0005-strerror_r.patch @@ -6,17 +6,16 @@ Subject: strerror_r() src/generic/util/util.cc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) -diff --git a/src/generic/util/util.cc b/src/generic/util/util.cc -index 065d533..eea90a4 100644 ---- a/src/generic/util/util.cc -+++ b/src/generic/util/util.cc -@@ -208,10 +208,15 @@ string sstrerror(int errnum) +Index: aptitude/src/generic/util/util.cc +=================================================================== +--- aptitude.orig/src/generic/util/util.cc 2013-03-09 18:28:30.615140195 +0000 ++++ aptitude/src/generic/util/util.cc 2013-03-09 18:35:31.188026320 +0000 +@@ -208,10 +208,14 @@ while(bufsize < 512 * 512) { char *buf = new char[bufsize]; - -+// http://stackoverflow.com/questions/4266354/how-to-tell-if-glibc-is-used -+#if defined(__GLIBC__) && defined(_GNU_SOURCE) ++#if defined(_GNU_SOURCE) char *result = strerror_r(errnum, buf, bufsize); - - if(result == NULL) diff --git a/debian/patches/series b/debian/patches/series index c8d8af6d..a39fb171 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,5 @@ 0001-include-termios.h-for-TIOCGWINSZ.patch 0002-control-reaches-end-of-non-void-function.patch -0003-include-siagnal.h-for-kill.patch +0003-include-signal.h-for-kill.patch 0004-Invalid-Valid-Until-entry-in-Release-file.patch 0005-strerror_r.patch |