Timothy Pearson
10 years ago
parent
f418587d09
commit
d13c79dd95
@ -0,0 +1,6 @@
|
||||
libr for Debian
|
||||
---------------
|
||||
|
||||
<possible notes regarding this package - if none, delete this file>
|
||||
|
||||
-- Erich Hoover <ehoover@mines.edu> Tue, 03 Nov 2009 20:26:31 -0700
|
||||
@ -0,0 +1,44 @@
|
||||
libr (4:0.6.0-2debian8.0.0+6~d) jessie; urgency=low
|
||||
|
||||
* Fix mangling of a critical elf library section on armhf
|
||||
|
||||
-- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sun, 30 Mar 2014 06:04:00 -0600
|
||||
|
||||
libr (4:0.6.0-1debian7.0.0+0) wheezy; urgency=low
|
||||
|
||||
* Fix FTBFS due to force build architecture
|
||||
* Changes pulled into a separate patches
|
||||
* Switch to quilt format
|
||||
|
||||
-- Slávek Banko <slavek.banko@axis.cz> Sun, 03 Nov 2013 14:43:31 +0100
|
||||
|
||||
libr (4:0.6.0-0ubuntu4~quantal) quantal; urgency=low
|
||||
|
||||
* Fix FTBFS on Ubuntu Quantal
|
||||
|
||||
-- Timothy Pearson <kb9vqf@pearsoncomputing.net> Tue, 12 Sep 2012 15:03:00 -0600
|
||||
|
||||
libr (4:0.6.0-0ubuntu3~quantal) quantal; urgency=low
|
||||
|
||||
* Fix crash on accessing malformed icon
|
||||
|
||||
-- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 02 Jan 2012 02:18:00 -0600
|
||||
|
||||
libr (4:0.6.0-0ubuntu2~lucid) lucid; urgency=low
|
||||
|
||||
* Fix armel builds
|
||||
|
||||
-- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sun, 01 Jan 2012 02:12:00 -0600
|
||||
|
||||
libr (4:0.6.0-0ubuntu1~lucid) lucid; urgency=low
|
||||
|
||||
* Fix stack smashing in edit mode
|
||||
|
||||
-- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 31 Dec 2011 20:42:00 -0600
|
||||
|
||||
libr (4:0.6.0-0ubuntu0~lucid) lucid; urgency=low
|
||||
|
||||
* Initial upload
|
||||
|
||||
-- Timothy Pearson <kb9vqf@pearsoncomputing.net> Fri, 30 Dec 2011 16:20:00 -0600
|
||||
|
||||
@ -0,0 +1 @@
|
||||
7
|
||||
@ -0,0 +1,22 @@
|
||||
Source: libr
|
||||
Priority: extra
|
||||
Maintainer: Erich E. Hoover <ehoover@mines.edu>
|
||||
Build-Depends: debhelper (>= 7), quilt, autotools-dev, pkg-config,
|
||||
libglade2-dev, binutils-dev, doxygen
|
||||
Standards-Version: 3.8.4
|
||||
Section: libs
|
||||
Homepage: http://www.compholio.com/elficon/
|
||||
|
||||
Package: libr-dev
|
||||
Section: libdevel
|
||||
Architecture: any
|
||||
Depends: libr0 (= ${binary:Version})
|
||||
Description: ELF binary resource library
|
||||
Store and retrieve resources from ELF binaries.
|
||||
|
||||
Package: libr0
|
||||
Section: libs
|
||||
Architecture: any
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}
|
||||
Description: ELF binary resource library
|
||||
Store and retrieve resources from ELF binaries.
|
||||
@ -0,0 +1,6 @@
|
||||
Copyright notice:
|
||||
|
||||
Copyright (c) 2008-2009, Erich Hoover
|
||||
|
||||
This package is licensed under the LGPL v2.1, for further details see:
|
||||
/usr/share/common-licenses/LGPL-2.1
|
||||
@ -0,0 +1,4 @@
|
||||
#
|
||||
# Regular cron jobs for the libr package
|
||||
#
|
||||
0 4 * * * root [ -x /usr/bin/libr_maintenance ] && /usr/bin/libr_maintenance
|
||||
@ -0,0 +1,2 @@
|
||||
usr/bin
|
||||
usr/sbin
|
||||
@ -0,0 +1,3 @@
|
||||
NEWS
|
||||
README
|
||||
ChangeLog.debian
|
||||
@ -0,0 +1,3 @@
|
||||
usr/lib
|
||||
usr/include
|
||||
usr/include/libr
|
||||
@ -0,0 +1,9 @@
|
||||
usr/include/*
|
||||
usr/include/libr/*
|
||||
usr/lib/lib*.a
|
||||
usr/lib/lib*.so
|
||||
usr/lib/*.la
|
||||
usr/lib/pkgconfig/*
|
||||
usr/share/man/man3/*.3
|
||||
#usr/share/pkgconfig/*
|
||||
|
||||
@ -0,0 +1,10 @@
|
||||
# Defaults for libr initscript
|
||||
# sourced by /etc/init.d/libr
|
||||
# installed at /etc/default/libr by the maintainer scripts
|
||||
|
||||
#
|
||||
# This is a POSIX shell fragment
|
||||
#
|
||||
|
||||
# Additional options that are passed to the Daemon.
|
||||
DAEMON_OPTS=""
|
||||
@ -0,0 +1,20 @@
|
||||
Document: libr
|
||||
Title: Debian libr Manual
|
||||
Author: <insert document author here>
|
||||
Abstract: This manual describes what libr is
|
||||
and how it can be used to
|
||||
manage online manuals on Debian systems.
|
||||
Section: unknown
|
||||
|
||||
Format: debiandoc-sgml
|
||||
Files: /usr/share/doc/libr/libr.sgml.gz
|
||||
|
||||
Format: postscript
|
||||
Files: /usr/share/doc/libr/libr.ps.gz
|
||||
|
||||
Format: text
|
||||
Files: /usr/share/doc/libr/libr.text.gz
|
||||
|
||||
Format: HTML
|
||||
Index: /usr/share/doc/libr/html/index.html
|
||||
Files: /usr/share/doc/libr/html/*.html
|
||||
@ -0,0 +1 @@
|
||||
usr/lib
|
||||
@ -0,0 +1 @@
|
||||
usr/lib/lib*.so.*
|
||||
@ -0,0 +1,24 @@
|
||||
diff -ru libr-0.6.0~maverick/src/libr-bfd.h libr-0.6.0/src/libr-bfd.h
|
||||
--- libr-0.6.0~maverick/src/libr-bfd.h 2009-12-03 18:51:50.000000000 +0000
|
||||
+++ libr-0.6.0/src/libr-bfd.h 2012-09-12 20:08:35.000000000 +0000
|
||||
@@ -1,6 +1,8 @@
|
||||
#ifndef __LIBR_BFD_H
|
||||
#define __LIBR_BFD_H
|
||||
|
||||
+#include "config.h"
|
||||
+
|
||||
#include <sys/types.h>
|
||||
#include <stdint.h>
|
||||
#include <bfd.h>
|
||||
diff -ru libr-0.6.0~maverick/src/libr-internal.h libr-0.6.0/src/libr-internal.h
|
||||
--- libr-0.6.0~maverick/src/libr-internal.h 2010-05-01 19:07:32.000000000 +0000
|
||||
+++ libr-0.6.0/src/libr-internal.h 2012-09-12 20:08:35.000000000 +0000
|
||||
@@ -7,7 +7,7 @@
|
||||
#define EXPORT_FN __attribute__((visibility ("protected")))
|
||||
#define INTERNAL_FN __attribute__ ((visibility ("internal")))
|
||||
#define LIBR_TEMPFILE "/tmp/libr-temp.XXXXXX"
|
||||
-#define LIBR_TEMPFILE_LEN 21
|
||||
+#define LIBR_TEMPFILE_LEN 22
|
||||
|
||||
#ifndef DOXYGEN_SHOULD_SKIP_THIS
|
||||
|
||||
@ -0,0 +1,56 @@
|
||||
diff -ru libr-0.6.0~maverick/configure libr-0.6.0/configure
|
||||
--- libr-0.6.0~maverick/configure 2011-03-05 20:21:12.000000000 +0000
|
||||
+++ libr-0.6.0/configure 2013-07-19 03:43:01.000000000 +0000
|
||||
@@ -13072,6 +13072,10 @@
|
||||
ARCH="i386";
|
||||
elif test "$UNAMEM" = "i686" ; then
|
||||
ARCH="i386";
|
||||
+elif test "$UNAMEM" = "armv5tejl" ; then
|
||||
+ ARCH="armel";
|
||||
+elif test "$UNAMEM" = "armv6l" ; then
|
||||
+ ARCH="armhf";
|
||||
elif test "$UNAMEM" = "x86_64"; then
|
||||
ARCH="amd64";
|
||||
fi
|
||||
@@ -13083,6 +13087,14 @@
|
||||
CFLAGS="$CFLAGS -m64";
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Ready for 64-bit compilation." >&5
|
||||
$as_echo "$as_me: Ready for 64-bit compilation." >&6;};
|
||||
+elif test "$ARCH" = "armel" ; then
|
||||
+ CFLAGS="$CFLAGS";
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for armel compilation." >&5
|
||||
+$as_echo "$as_me: Ready for armel compilation." >&6;};
|
||||
+elif test "$ARCH" = "armhf" ; then
|
||||
+ CFLAGS="$CFLAGS";
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for armhf compilation." >&5
|
||||
+$as_echo "$as_me: Ready for armhf compilation." >&6;};
|
||||
else
|
||||
as_fn_error $? "Target architecture ${ARCH} is invalid!" "$LINENO" 5 ;
|
||||
fi
|
||||
diff -ru libr-0.6.0~maverick/configure.ac libr-0.6.0/configure.ac
|
||||
--- libr-0.6.0~maverick/configure.ac 2011-03-05 20:20:50.000000000 +0000
|
||||
+++ libr-0.6.0/configure.ac 2013-07-19 03:41:27.000000000 +0000
|
||||
@@ -81,6 +81,10 @@
|
||||
ARCH="i386";
|
||||
elif test "$UNAMEM" = "i686" ; then
|
||||
ARCH="i386";
|
||||
+elif test "$UNAMEM" = "armv5tejl" ; then
|
||||
+ ARCH="armel";
|
||||
+elif test "$UNAMEM" = "armv6l" ; then
|
||||
+ ARCH="armhf";
|
||||
elif test "$UNAMEM" = "x86_64"; then
|
||||
ARCH="amd64";
|
||||
fi
|
||||
@@ -90,6 +94,12 @@
|
||||
elif test "$ARCH" = "amd64" ; then
|
||||
CFLAGS="$CFLAGS -m64";
|
||||
AC_MSG_NOTICE([Ready for 64-bit compilation.]);
|
||||
+elif test "$ARCH" = "armel" ; then
|
||||
+ CFLAGS="$CFLAGS";
|
||||
+ AC_MSG_NOTICE([Ready for armel compilation.]);
|
||||
+elif test "$ARCH" = "armhf" ; then
|
||||
+ CFLAGS="$CFLAGS";
|
||||
+ AC_MSG_NOTICE([Ready for armhf compilation.]);
|
||||
else
|
||||
AC_MSG_ERROR([Target architecture ${ARCH} is invalid!]);
|
||||
fi
|
||||
@ -0,0 +1,34 @@
|
||||
diff -ru libr-0.6.0~maverick/src/libr-icons.c libr-0.6.0/src/libr-icons.c
|
||||
--- libr-0.6.0~maverick/src/libr-icons.c 2011-03-02 22:22:33.000000000 +0000
|
||||
+++ libr-0.6.0/src/libr-icons.c 2012-09-12 20:08:35.000000000 +0000
|
||||
@@ -330,18 +330,20 @@
|
||||
if(entry->type == LIBR_SVG)
|
||||
{
|
||||
libr_icon *icon = libr_icon_geticon_byname(handle, entry->name);
|
||||
- libr_icon *icon_onecanvas;
|
||||
- char *buffer;
|
||||
+ if (icon) {
|
||||
+ libr_icon *icon_onecanvas;
|
||||
+ char *buffer;
|
||||
|
||||
- /* should we report the requested size for SVG? */
|
||||
- icon->icon_size = iconsize;
|
||||
+ /* should we report the requested size for SVG? */
|
||||
+ icon->icon_size = iconsize;
|
||||
|
||||
- /* if the SVG is a "one canvas" document then extract the correctly sized icon */
|
||||
- if((buffer = onecanvas_geticon_bysize(icon->buffer, iconsize)) != NULL)
|
||||
- {
|
||||
- libr_icon_close(icon);
|
||||
- icon_onecanvas = new_icon_handle(LIBR_SVG, iconsize, buffer, strlen(buffer));
|
||||
- return icon_onecanvas;
|
||||
+ /* if the SVG is a "one canvas" document then extract the correctly sized icon */
|
||||
+ if((buffer = onecanvas_geticon_bysize(icon->buffer, iconsize)) != NULL)
|
||||
+ {
|
||||
+ libr_icon_close(icon);
|
||||
+ icon_onecanvas = new_icon_handle(LIBR_SVG, iconsize, buffer, strlen(buffer));
|
||||
+ return icon_onecanvas;
|
||||
+ }
|
||||
}
|
||||
return icon;
|
||||
}
|
||||
@ -0,0 +1,12 @@
|
||||
diff -ru libr-0.6.0~maverick/src/libr-gtk.c libr-0.6.0/src/libr-gtk.c
|
||||
--- libr-0.6.0~maverick/src/libr-gtk.c 2009-12-01 23:11:37.000000000 +0000
|
||||
+++ libr-0.6.0/src/libr-gtk.c 2012-09-12 20:08:35.000000000 +0000
|
||||
@@ -33,7 +33,7 @@
|
||||
|
||||
/* For loading GTK/GDK images */
|
||||
#include <gdk-pixbuf/gdk-pixbuf.h>
|
||||
-#include <glib/gthread.h>
|
||||
+#include <glib.h>
|
||||
|
||||
/* For loading GLADE files */
|
||||
#include <glade/glade.h>
|
||||
@ -0,0 +1,138 @@
|
||||
Index: b/Makefile.in
|
||||
===================================================================
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -136,7 +136,6 @@
|
||||
ACLOCAL = @ACLOCAL@
|
||||
AMTAR = @AMTAR@
|
||||
AR = @AR@
|
||||
-ARCH = @ARCH@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
AUTOMAKE = @AUTOMAKE@
|
||||
Index: b/configure
|
||||
===================================================================
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -746,7 +746,6 @@
|
||||
am__EXEEXT_TRUE
|
||||
LTLIBOBJS
|
||||
LIBOBJS
|
||||
-ARCH
|
||||
BACKEND_PKG
|
||||
LIBR_BACKEND
|
||||
BACKEND_NAME
|
||||
@@ -13062,44 +13061,6 @@
|
||||
|
||||
|
||||
|
||||
-## Handle target architecture configuration
|
||||
-UNAMEM=`uname -m`;
|
||||
-if test "$UNAMEM" = "i386" ; then
|
||||
- ARCH="i386";
|
||||
-elif test "$UNAMEM" = "i486" ; then
|
||||
- ARCH="i386";
|
||||
-elif test "$UNAMEM" = "i586" ; then
|
||||
- ARCH="i386";
|
||||
-elif test "$UNAMEM" = "i686" ; then
|
||||
- ARCH="i386";
|
||||
-elif test "$UNAMEM" = "armv5tejl" ; then
|
||||
- ARCH="armel";
|
||||
-elif test "$UNAMEM" = "armv6l" ; then
|
||||
- ARCH="armhf";
|
||||
-elif test "$UNAMEM" = "x86_64"; then
|
||||
- ARCH="amd64";
|
||||
-fi
|
||||
-if test "$ARCH" = "i386" ; then
|
||||
- CFLAGS="$CFLAGS -m32";
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for 32-bit compilation." >&5
|
||||
-$as_echo "$as_me: Ready for 32-bit compilation." >&6;};
|
||||
-elif test "$ARCH" = "amd64" ; then
|
||||
- CFLAGS="$CFLAGS -m64";
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for 64-bit compilation." >&5
|
||||
-$as_echo "$as_me: Ready for 64-bit compilation." >&6;};
|
||||
-elif test "$ARCH" = "armel" ; then
|
||||
- CFLAGS="$CFLAGS";
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for armel compilation." >&5
|
||||
-$as_echo "$as_me: Ready for armel compilation." >&6;};
|
||||
-elif test "$ARCH" = "armhf" ; then
|
||||
- CFLAGS="$CFLAGS";
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for armhf compilation." >&5
|
||||
-$as_echo "$as_me: Ready for armhf compilation." >&6;};
|
||||
-else
|
||||
- as_fn_error $? "Target architecture ${ARCH} is invalid!" "$LINENO" 5 ;
|
||||
-fi
|
||||
-
|
||||
-## END Handle target architecture configuration
|
||||
|
||||
ac_config_headers="$ac_config_headers config.h"
|
||||
|
||||
Index: b/configure.ac
|
||||
===================================================================
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -71,40 +71,6 @@
|
||||
AC_SUBST(LIBR_BACKEND)
|
||||
AC_SUBST(BACKEND_PKG)
|
||||
|
||||
-## Handle target architecture configuration
|
||||
-UNAMEM=`uname -m`;
|
||||
-if test "$UNAMEM" = "i386" ; then
|
||||
- ARCH="i386";
|
||||
-elif test "$UNAMEM" = "i486" ; then
|
||||
- ARCH="i386";
|
||||
-elif test "$UNAMEM" = "i586" ; then
|
||||
- ARCH="i386";
|
||||
-elif test "$UNAMEM" = "i686" ; then
|
||||
- ARCH="i386";
|
||||
-elif test "$UNAMEM" = "armv5tejl" ; then
|
||||
- ARCH="armel";
|
||||
-elif test "$UNAMEM" = "armv6l" ; then
|
||||
- ARCH="armhf";
|
||||
-elif test "$UNAMEM" = "x86_64"; then
|
||||
- ARCH="amd64";
|
||||
-fi
|
||||
-if test "$ARCH" = "i386" ; then
|
||||
- CFLAGS="$CFLAGS -m32";
|
||||
- AC_MSG_NOTICE([Ready for 32-bit compilation.]);
|
||||
-elif test "$ARCH" = "amd64" ; then
|
||||
- CFLAGS="$CFLAGS -m64";
|
||||
- AC_MSG_NOTICE([Ready for 64-bit compilation.]);
|
||||
-elif test "$ARCH" = "armel" ; then
|
||||
- CFLAGS="$CFLAGS";
|
||||
- AC_MSG_NOTICE([Ready for armel compilation.]);
|
||||
-elif test "$ARCH" = "armhf" ; then
|
||||
- CFLAGS="$CFLAGS";
|
||||
- AC_MSG_NOTICE([Ready for armhf compilation.]);
|
||||
-else
|
||||
- AC_MSG_ERROR([Target architecture ${ARCH} is invalid!]);
|
||||
-fi
|
||||
-AC_SUBST(ARCH)
|
||||
-## END Handle target architecture configuration
|
||||
|
||||
AC_CONFIG_HEADERS(config.h)
|
||||
AC_OUTPUT(
|
||||
Index: b/man/Makefile.in
|
||||
===================================================================
|
||||
--- a/man/Makefile.in
|
||||
+++ b/man/Makefile.in
|
||||
@@ -81,7 +81,6 @@
|
||||
ACLOCAL = @ACLOCAL@
|
||||
AMTAR = @AMTAR@
|
||||
AR = @AR@
|
||||
-ARCH = @ARCH@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
AUTOMAKE = @AUTOMAKE@
|
||||
Index: b/src/Makefile.in
|
||||
===================================================================
|
||||
--- a/src/Makefile.in
|
||||
+++ b/src/Makefile.in
|
||||
@@ -103,7 +103,6 @@
|
||||
ACLOCAL = @ACLOCAL@
|
||||
AMTAR = @AMTAR@
|
||||
AR = @AR@
|
||||
-ARCH = @ARCH@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
AUTOMAKE = @AUTOMAKE@
|
||||
@ -0,0 +1,44 @@
|
||||
Index: libr-0.6.0/src/libr-bfd.c
|
||||
===================================================================
|
||||
--- libr-0.6.0.orig/src/libr-bfd.c 2011-03-02 22:06:52.000000000 +0000
|
||||
+++ libr-0.6.0/src/libr-bfd.c 2014-03-30 10:57:27.132041406 +0000
|
||||
@@ -159,7 +159,18 @@
|
||||
continue; /* Section has been marked for deletion */
|
||||
}
|
||||
/* Use SEC_LINKER_CREATED to ask the libbfd backend to take care of configuring the section */
|
||||
- oscn = bfd_make_section_anyway_with_flags(ohandle, iscn->name, iscn->flags | SEC_LINKER_CREATED);
|
||||
+
|
||||
+ // Keep the ARM_ATTRIBUTES section type intact on armhf systems
|
||||
+ // If this is not done, readelf -A will not print any architecture information for the modified library,
|
||||
+ // and ldd will report that the library cannot be found
|
||||
+ if (strcmp(iscn->name, ".ARM.attributes") == 0)
|
||||
+ {
|
||||
+ oscn = bfd_make_section_anyway_with_flags(ohandle, iscn->name, iscn->flags);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ oscn = bfd_make_section_anyway_with_flags(ohandle, iscn->name, iscn->flags | SEC_LINKER_CREATED);
|
||||
+ }
|
||||
if(oscn == NULL)
|
||||
{
|
||||
printf("failed to create out section: %s\n", bfd_errmsg(bfd_get_error()));
|
||||
@@ -262,6 +273,7 @@
|
||||
reloc_count = bfd_canonicalize_reloc(ihandle, iscn, reloc_buffer, symtab_buffer);
|
||||
bfd_set_reloc(ohandle, oscn, reloc_buffer, reloc_count);
|
||||
}
|
||||
+
|
||||
if(bfd_get_section_flags(ihandle, iscn) & SEC_HAS_CONTENTS)
|
||||
{
|
||||
/* NOTE: if the section is just being copied then do that, otherwise grab
|
||||
@@ -286,6 +298,11 @@
|
||||
return false;
|
||||
}
|
||||
free(buffer);
|
||||
+ if(!bfd_copy_private_section_data(ihandle, iscn, ohandle, oscn))
|
||||
+ {
|
||||
+ printf("failed to copy private section data: %s\n", bfd_errmsg(bfd_get_error()));
|
||||
+ return false;
|
||||
+ }
|
||||
}
|
||||
}
|
||||
if(!bfd_copy_private_bfd_data(ihandle, ohandle))
|
||||
@ -0,0 +1,6 @@
|
||||
000-fix-stack-smashing.diff
|
||||
001-fix-arm-builds.diff
|
||||
002-fix-crash-on-malformed-icon.diff
|
||||
003-fix-gtk-includes.diff
|
||||
004-fix-force-arch.diff
|
||||
005-fix-arm-mangled-section.diff
|
||||
@ -0,0 +1,39 @@
|
||||
#!/bin/sh
|
||||
# postinst script for libr
|
||||
#
|
||||
# see: dh_installdeb(1)
|
||||
|
||||
set -e
|
||||
|
||||
# summary of how this script can be called:
|
||||
# * <postinst> `configure' <most-recently-configured-version>
|
||||
# * <old-postinst> `abort-upgrade' <new version>
|
||||
# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
|
||||
# <new-version>
|
||||
# * <postinst> `abort-remove'
|
||||
# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
|
||||
# <failed-install-package> <version> `removing'
|
||||
# <conflicting-package> <version>
|
||||
# for details, see http://www.debian.org/doc/debian-policy/ or
|
||||
# the debian-policy package
|
||||
|
||||
|
||||
case "$1" in
|
||||
configure)
|
||||
;;
|
||||
|
||||
abort-upgrade|abort-remove|abort-deconfigure)
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "postinst called with unknown argument \`$1'" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# dh_installdeb will replace this with shell code automatically
|
||||
# generated by other debhelper scripts.
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
exit 0
|
||||
@ -0,0 +1,37 @@
|
||||
#!/bin/sh
|
||||
# postrm script for libr
|
||||
#
|
||||
# see: dh_installdeb(1)
|
||||
|
||||
set -e
|
||||
|
||||
# summary of how this script can be called:
|
||||
# * <postrm> `remove'
|
||||
# * <postrm> `purge'
|
||||
# * <old-postrm> `upgrade' <new-version>
|
||||
# * <new-postrm> `failed-upgrade' <old-version>
|
||||
# * <new-postrm> `abort-install'
|
||||
# * <new-postrm> `abort-install' <old-version>
|
||||
# * <new-postrm> `abort-upgrade' <old-version>
|
||||
# * <disappearer's-postrm> `disappear' <overwriter>
|
||||
# <overwriter-version>
|
||||
# for details, see http://www.debian.org/doc/debian-policy/ or
|
||||
# the debian-policy package
|
||||
|
||||
|
||||
case "$1" in
|
||||
purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "postrm called with unknown argument \`$1'" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# dh_installdeb will replace this with shell code automatically
|
||||
# generated by other debhelper scripts.
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
exit 0
|
||||
@ -0,0 +1,35 @@
|
||||
#!/bin/sh
|
||||
# preinst script for libr
|
||||
#
|
||||
# see: dh_installdeb(1)
|
||||
|
||||
set -e
|
||||
|
||||
# summary of how this script can be called:
|
||||
# * <new-preinst> `install'
|
||||
# * <new-preinst> `install' <old-version>
|
||||
# * <new-preinst> `upgrade' <old-version>
|
||||
# * <old-preinst> `abort-upgrade' <new-version>
|
||||
# for details, see http://www.debian.org/doc/debian-policy/ or
|
||||
# the debian-policy package
|
||||
|
||||
|
||||
case "$1" in
|
||||
install|upgrade)
|
||||
;;
|
||||
|
||||
abort-upgrade)
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "preinst called with unknown argument \`$1'" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# dh_installdeb will replace this with shell code automatically
|
||||
# generated by other debhelper scripts.
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
exit 0
|
||||
@ -0,0 +1,38 @@
|
||||
#!/bin/sh
|
||||
# prerm script for libr
|
||||
#
|
||||
# see: dh_installdeb(1)
|
||||
|
||||
set -e
|
||||
|
||||
# summary of how this script can be called:
|
||||
# * <prerm> `remove'
|
||||
# * <old-prerm> `upgrade' <new-version>
|
||||
# * <new-prerm> `failed-upgrade' <old-version>
|
||||
# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
|
||||
# * <deconfigured's-prerm> `deconfigure' `in-favour'
|
||||
# <package-being-installed> <version> `removing'
|
||||
# <conflicting-package> <version>
|
||||
# for details, see http://www.debian.org/doc/debian-policy/ or
|
||||
# the debian-policy package
|
||||
|
||||
|
||||
case "$1" in
|
||||
remove|upgrade|deconfigure)
|
||||
;;
|
||||
|
||||
failed-upgrade)
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "prerm called with unknown argument \`$1'" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# dh_installdeb will replace this with shell code automatically
|
||||
# generated by other debhelper scripts.
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
exit 0
|
||||
@ -0,0 +1,113 @@
|
||||
#!/usr/bin/make -f
|
||||
# -*- makefile -*-
|
||||
# Sample debian/rules that uses debhelper.
|
||||
# This file was originally written by Joey Hess and Craig Small.
|
||||
# As a special exception, when this file is copied by dh-make into a
|
||||
# dh-make output file, you may use that output file without restriction.
|
||||
# This special exception was added by Craig Small in version 0.37 of dh-make.
|
||||
|
||||
# Uncomment this to turn on verbose mode.
|
||||
#export DH_VERBOSE=1
|
||||
|
||||
|
||||
# These are used for cross-compiling and for saving the configure script
|
||||
# from having to guess our platform (since we know it already)
|
||||
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
|
||||
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
|
||||
ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
|
||||
CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
|
||||
else
|
||||
CROSS= --build $(DEB_BUILD_GNU_TYPE)
|
||||
endif
|
||||
|
||||
|
||||
|
||||
|
||||
# shared library versions, option 1
|
||||
version=2.0.5
|
||||
major=2
|
||||
# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
|
||||
#version=`ls src/.libs/lib*.so.* | \
|
||||
# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
|
||||
#major=`ls src/.libs/lib*.so.* | \
|
||||
# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
|
||||
|
||||
config.status: configure
|
||||
dh_testdir
|
||||
# Add here commands to configure the package.
|
||||
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
|
||||
cp -f /usr/share/misc/config.sub config.sub
|
||||
endif
|
||||
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
|
||||
cp -f /usr/share/misc/config.guess config.guess
|
||||
endif
|
||||
./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
|
||||
|
||||
|
||||
build: build-stamp
|
||||
build-stamp: config.status
|
||||
dh_testdir
|
||||
|
||||
# Add here commands to compile the package.
|
||||
#$(MAKE)
|
||||
|
||||
touch $@
|
||||
|
||||
clean:
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
rm -f build-stamp
|
||||
|
||||
# Add here commands to clean up after the build process.
|
||||
[ ! -f Makefile ] || $(MAKE) distclean
|
||||
rm -f config.sub config.guess
|
||||
|
||||
dh_clean
|
||||
|
||||
install: build
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
dh_prep
|
||||
dh_installdirs
|
||||
|
||||
# Add here commands to install the package into debian/tmp
|
||||
$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
|
||||
|
||||
|
||||
# Build architecture-independent files here.
|
||||
binary-indep: install
|
||||
# We have nothing to do by default.
|
||||
|
||||
# Build architecture-dependent files here.
|
||||
binary-arch: install
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
dh_installchangelogs ChangeLog
|
||||
dh_installdocs
|
||||
dh_installexamples
|
||||
dh_install
|
||||
# dh_installmenu
|
||||
# dh_installdebconf
|
||||
# dh_installlogrotate
|
||||
# dh_installemacsen
|
||||
# dh_installpam
|
||||
# dh_installmime
|
||||
# dh_installinit
|
||||
# dh_installcron
|
||||
# dh_installinfo
|
||||
dh_installman
|
||||
dh_link
|
||||
dh_strip
|
||||
dh_compress
|
||||
dh_fixperms
|
||||
# dh_perl
|
||||
# dh_python
|
||||
dh_makeshlibs
|
||||
dh_installdeb
|
||||
dh_shlibdeps
|
||||
dh_gencontrol
|
||||
dh_md5sums
|
||||
dh_builddeb
|
||||
|
||||
binary: binary-indep binary-arch
|
||||
.PHONY: build clean binary-indep binary-arch binary install
|
||||
@ -0,0 +1 @@
|
||||
liblibr 0 libr (>> 0-0), libr (<< 0-99)
|
||||
@ -0,0 +1 @@
|
||||
3.0 (quilt)
|
||||
@ -0,0 +1,6 @@
|
||||
# Use xz instead of gzip
|
||||
compression = "xz"
|
||||
compression-level = 9
|
||||
|
||||
# Don't run differences
|
||||
diff-ignore = .*
|
||||
@ -0,0 +1,23 @@
|
||||
# Example watch control file for uscan
|
||||
# Rename this file to "watch" and then you can run the "uscan" command
|
||||
# to check for upstream updates and more.
|
||||
# See uscan(1) for format
|
||||
|
||||
# Compulsory line, this is a version 3 file
|
||||
version=3
|
||||
|
||||
# Uncomment to examine a Webpage
|
||||
# <Webpage URL> <string match>
|
||||
#http://www.example.com/downloads.php libr-(.*)\.tar\.gz
|
||||
|
||||
# Uncomment to examine a Webserver directory
|
||||
#http://www.example.com/pub/libr-(.*)\.tar\.gz
|
||||
|
||||
# Uncommment to examine a FTP server
|
||||
#ftp://ftp.example.com/pub/libr-(.*)\.tar\.gz debian uupdate
|
||||
|
||||
# Uncomment to find new files on sourceforge, for devscripts >= 2.9
|
||||
# http://sf.net/libr/libr-(.*)\.tar\.gz
|
||||
|
||||
# Uncomment to find new files on GooglePages
|
||||
# http://example.googlepages.com/foo.html libr-(.*)\.tar\.gz
|
||||
@ -0,0 +1,6 @@
|
||||
libr for Debian
|
||||
---------------
|
||||
|
||||
<possible notes regarding this package - if none, delete this file>
|
||||
|
||||
-- Erich Hoover <ehoover@mines.edu> Tue, 03 Nov 2009 20:26:31 -0700
|
||||
@ -0,0 +1,44 @@
|
||||
libr (4:0.6.0-2debian8.0.0+6~d) jessie; urgency=low
|
||||
|
||||
* Fix mangling of a critical elf library section on armhf
|
||||
|
||||
-- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sun, 30 Mar 2014 06:04:00 -0600
|
||||
|
||||
libr (4:0.6.0-1debian7.0.0+0) wheezy; urgency=low
|
||||
|
||||
* Fix FTBFS due to force build architecture
|
||||
* Changes pulled into a separate patches
|
||||
* Switch to quilt format
|
||||
|
||||
-- Slávek Banko <slavek.banko@axis.cz> Sun, 03 Nov 2013 14:43:31 +0100
|
||||
|
||||
libr (4:0.6.0-0ubuntu4~quantal) quantal; urgency=low
|
||||
|
||||
* Fix FTBFS on Ubuntu Quantal
|
||||
|
||||
-- Timothy Pearson <kb9vqf@pearsoncomputing.net> Tue, 12 Sep 2012 15:03:00 -0600
|
||||
|
||||
libr (4:0.6.0-0ubuntu3~quantal) quantal; urgency=low
|
||||
|
||||
* Fix crash on accessing malformed icon
|
||||
|
||||
-- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 02 Jan 2012 02:18:00 -0600
|
||||
|
||||
libr (4:0.6.0-0ubuntu2~lucid) lucid; urgency=low
|
||||
|
||||
* Fix armel builds
|
||||
|
||||
-- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sun, 01 Jan 2012 02:12:00 -0600
|
||||
|
||||
libr (4:0.6.0-0ubuntu1~lucid) lucid; urgency=low
|
||||
|
||||
* Fix stack smashing in edit mode
|
||||
|
||||
-- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 31 Dec 2011 20:42:00 -0600
|
||||
|
||||
libr (4:0.6.0-0ubuntu0~lucid) lucid; urgency=low
|
||||
|
||||
* Initial upload
|
||||
|
||||
-- Timothy Pearson <kb9vqf@pearsoncomputing.net> Fri, 30 Dec 2011 16:20:00 -0600
|
||||
|
||||
@ -0,0 +1 @@
|
||||
7
|
||||
@ -0,0 +1,22 @@
|
||||
Source: libr
|
||||
Priority: extra
|
||||
Maintainer: Erich E. Hoover <ehoover@mines.edu>
|
||||
Build-Depends: debhelper (>= 7), quilt, autotools-dev, pkg-config,
|
||||
libglade2-dev, binutils-dev, doxygen
|
||||
Standards-Version: 3.8.4
|
||||
Section: libs
|
||||
Homepage: http://www.compholio.com/elficon/
|
||||
|
||||
Package: libr-dev
|
||||
Section: libdevel
|
||||
Architecture: any
|
||||
Depends: libr0 (= ${binary:Version})
|
||||
Description: ELF binary resource library
|
||||
Store and retrieve resources from ELF binaries.
|
||||
|
||||
Package: libr0
|
||||
Section: libs
|
||||
Architecture: any
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}
|
||||
Description: ELF binary resource library
|
||||
Store and retrieve resources from ELF binaries.
|
||||
@ -0,0 +1,6 @@
|
||||
Copyright notice:
|
||||
|
||||
Copyright (c) 2008-2009, Erich Hoover
|
||||
|
||||
This package is licensed under the LGPL v2.1, for further details see:
|
||||
/usr/share/common-licenses/LGPL-2.1
|
||||
@ -0,0 +1,4 @@
|
||||
#
|
||||
# Regular cron jobs for the libr package
|
||||
#
|
||||
0 4 * * * root [ -x /usr/bin/libr_maintenance ] && /usr/bin/libr_maintenance
|
||||
@ -0,0 +1,2 @@
|
||||
usr/bin
|
||||
usr/sbin
|
||||
@ -0,0 +1,3 @@
|
||||
NEWS
|
||||
README
|
||||
ChangeLog.debian
|
||||
@ -0,0 +1,3 @@
|
||||
usr/lib
|
||||
usr/include
|
||||
usr/include/libr
|
||||
@ -0,0 +1,9 @@
|
||||
usr/include/*
|
||||
usr/include/libr/*
|
||||
usr/lib/lib*.a
|
||||
usr/lib/lib*.so
|
||||
usr/lib/*.la
|
||||
usr/lib/pkgconfig/*
|
||||
usr/share/man/man3/*.3
|
||||
#usr/share/pkgconfig/*
|
||||
|
||||
@ -0,0 +1,10 @@
|
||||
# Defaults for libr initscript
|
||||
# sourced by /etc/init.d/libr
|
||||
# installed at /etc/default/libr by the maintainer scripts
|
||||
|
||||
#
|
||||
# This is a POSIX shell fragment
|
||||
#
|
||||
|
||||
# Additional options that are passed to the Daemon.
|
||||
DAEMON_OPTS=""
|
||||
@ -0,0 +1,20 @@
|
||||
Document: libr
|
||||
Title: Debian libr Manual
|
||||
Author: <insert document author here>
|
||||
Abstract: This manual describes what libr is
|
||||
and how it can be used to
|
||||
manage online manuals on Debian systems.
|
||||
Section: unknown
|
||||
|
||||
Format: debiandoc-sgml
|
||||
Files: /usr/share/doc/libr/libr.sgml.gz
|
||||
|
||||
Format: postscript
|
||||
Files: /usr/share/doc/libr/libr.ps.gz
|
||||
|
||||
Format: text
|
||||
Files: /usr/share/doc/libr/libr.text.gz
|
||||
|
||||
Format: HTML
|
||||
Index: /usr/share/doc/libr/html/index.html
|
||||
Files: /usr/share/doc/libr/html/*.html
|
||||
@ -0,0 +1 @@
|
||||
usr/lib
|
||||
@ -0,0 +1 @@
|
||||
usr/lib/lib*.so.*
|
||||
@ -0,0 +1,24 @@
|
||||
diff -ru libr-0.6.0~maverick/src/libr-bfd.h libr-0.6.0/src/libr-bfd.h
|
||||
--- libr-0.6.0~maverick/src/libr-bfd.h 2009-12-03 18:51:50.000000000 +0000
|
||||
+++ libr-0.6.0/src/libr-bfd.h 2012-09-12 20:08:35.000000000 +0000
|
||||
@@ -1,6 +1,8 @@
|
||||
#ifndef __LIBR_BFD_H
|
||||
#define __LIBR_BFD_H
|
||||
|
||||
+#include "config.h"
|
||||
+
|
||||
#include <sys/types.h>
|
||||
#include <stdint.h>
|
||||
#include <bfd.h>
|
||||
diff -ru libr-0.6.0~maverick/src/libr-internal.h libr-0.6.0/src/libr-internal.h
|
||||
--- libr-0.6.0~maverick/src/libr-internal.h 2010-05-01 19:07:32.000000000 +0000
|
||||
+++ libr-0.6.0/src/libr-internal.h 2012-09-12 20:08:35.000000000 +0000
|
||||
@@ -7,7 +7,7 @@
|
||||
#define EXPORT_FN __attribute__((visibility ("protected")))
|
||||
#define INTERNAL_FN __attribute__ ((visibility ("internal")))
|
||||
#define LIBR_TEMPFILE "/tmp/libr-temp.XXXXXX"
|
||||
-#define LIBR_TEMPFILE_LEN 21
|
||||
+#define LIBR_TEMPFILE_LEN 22
|
||||
|
||||
#ifndef DOXYGEN_SHOULD_SKIP_THIS
|
||||
|
||||
@ -0,0 +1,56 @@
|
||||
diff -ru libr-0.6.0~maverick/configure libr-0.6.0/configure
|
||||
--- libr-0.6.0~maverick/configure 2011-03-05 20:21:12.000000000 +0000
|
||||
+++ libr-0.6.0/configure 2013-07-19 03:43:01.000000000 +0000
|
||||
@@ -13072,6 +13072,10 @@
|
||||
ARCH="i386";
|
||||
elif test "$UNAMEM" = "i686" ; then
|
||||
ARCH="i386";
|
||||
+elif test "$UNAMEM" = "armv5tejl" ; then
|
||||
+ ARCH="armel";
|
||||
+elif test "$UNAMEM" = "armv6l" ; then
|
||||
+ ARCH="armhf";
|
||||
elif test "$UNAMEM" = "x86_64"; then
|
||||
ARCH="amd64";
|
||||
fi
|
||||
@@ -13083,6 +13087,14 @@
|
||||
CFLAGS="$CFLAGS -m64";
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Ready for 64-bit compilation." >&5
|
||||
$as_echo "$as_me: Ready for 64-bit compilation." >&6;};
|
||||
+elif test "$ARCH" = "armel" ; then
|
||||
+ CFLAGS="$CFLAGS";
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for armel compilation." >&5
|
||||
+$as_echo "$as_me: Ready for armel compilation." >&6;};
|
||||
+elif test "$ARCH" = "armhf" ; then
|
||||
+ CFLAGS="$CFLAGS";
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for armhf compilation." >&5
|
||||
+$as_echo "$as_me: Ready for armhf compilation." >&6;};
|
||||
else
|
||||
as_fn_error $? "Target architecture ${ARCH} is invalid!" "$LINENO" 5 ;
|
||||
fi
|
||||
diff -ru libr-0.6.0~maverick/configure.ac libr-0.6.0/configure.ac
|
||||
--- libr-0.6.0~maverick/configure.ac 2011-03-05 20:20:50.000000000 +0000
|
||||
+++ libr-0.6.0/configure.ac 2013-07-19 03:41:27.000000000 +0000
|
||||
@@ -81,6 +81,10 @@
|
||||
ARCH="i386";
|
||||
elif test "$UNAMEM" = "i686" ; then
|
||||
ARCH="i386";
|
||||
+elif test "$UNAMEM" = "armv5tejl" ; then
|
||||
+ ARCH="armel";
|
||||
+elif test "$UNAMEM" = "armv6l" ; then
|
||||
+ ARCH="armhf";
|
||||
elif test "$UNAMEM" = "x86_64"; then
|
||||
ARCH="amd64";
|
||||
fi
|
||||
@@ -90,6 +94,12 @@
|
||||
elif test "$ARCH" = "amd64" ; then
|
||||
CFLAGS="$CFLAGS -m64";
|
||||
AC_MSG_NOTICE([Ready for 64-bit compilation.]);
|
||||
+elif test "$ARCH" = "armel" ; then
|
||||
+ CFLAGS="$CFLAGS";
|
||||
+ AC_MSG_NOTICE([Ready for armel compilation.]);
|
||||
+elif test "$ARCH" = "armhf" ; then
|
||||
+ CFLAGS="$CFLAGS";
|
||||
+ AC_MSG_NOTICE([Ready for armhf compilation.]);
|
||||
else
|
||||
AC_MSG_ERROR([Target architecture ${ARCH} is invalid!]);
|
||||
fi
|
||||
@ -0,0 +1,34 @@
|
||||
diff -ru libr-0.6.0~maverick/src/libr-icons.c libr-0.6.0/src/libr-icons.c
|
||||
--- libr-0.6.0~maverick/src/libr-icons.c 2011-03-02 22:22:33.000000000 +0000
|
||||
+++ libr-0.6.0/src/libr-icons.c 2012-09-12 20:08:35.000000000 +0000
|
||||
@@ -330,18 +330,20 @@
|
||||
if(entry->type == LIBR_SVG)
|
||||
{
|
||||
libr_icon *icon = libr_icon_geticon_byname(handle, entry->name);
|
||||
- libr_icon *icon_onecanvas;
|
||||
- char *buffer;
|
||||
+ if (icon) {
|
||||
+ libr_icon *icon_onecanvas;
|
||||
+ char *buffer;
|
||||
|
||||
- /* should we report the requested size for SVG? */
|
||||
- icon->icon_size = iconsize;
|
||||
+ /* should we report the requested size for SVG? */
|
||||
+ icon->icon_size = iconsize;
|
||||
|
||||
- /* if the SVG is a "one canvas" document then extract the correctly sized icon */
|
||||
- if((buffer = onecanvas_geticon_bysize(icon->buffer, iconsize)) != NULL)
|
||||
- {
|
||||
- libr_icon_close(icon);
|
||||
- icon_onecanvas = new_icon_handle(LIBR_SVG, iconsize, buffer, strlen(buffer));
|
||||
- return icon_onecanvas;
|
||||
+ /* if the SVG is a "one canvas" document then extract the correctly sized icon */
|
||||
+ if((buffer = onecanvas_geticon_bysize(icon->buffer, iconsize)) != NULL)
|
||||
+ {
|
||||
+ libr_icon_close(icon);
|
||||
+ icon_onecanvas = new_icon_handle(LIBR_SVG, iconsize, buffer, strlen(buffer));
|
||||
+ return icon_onecanvas;
|
||||
+ }
|
||||
}
|
||||
return icon;
|
||||
}
|
||||
@ -0,0 +1,12 @@
|
||||
diff -ru libr-0.6.0~maverick/src/libr-gtk.c libr-0.6.0/src/libr-gtk.c
|
||||
--- libr-0.6.0~maverick/src/libr-gtk.c 2009-12-01 23:11:37.000000000 +0000
|
||||
+++ libr-0.6.0/src/libr-gtk.c 2012-09-12 20:08:35.000000000 +0000
|
||||
@@ -33,7 +33,7 @@
|
||||
|
||||
/* For loading GTK/GDK images */
|
||||
#include <gdk-pixbuf/gdk-pixbuf.h>
|
||||
-#include <glib/gthread.h>
|
||||
+#include <glib.h>
|
||||
|
||||
/* For loading GLADE files */
|
||||
#include <glade/glade.h>
|
||||
@ -0,0 +1,138 @@
|
||||
Index: b/Makefile.in
|
||||
===================================================================
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -136,7 +136,6 @@
|
||||
ACLOCAL = @ACLOCAL@
|
||||
AMTAR = @AMTAR@
|
||||
AR = @AR@
|
||||
-ARCH = @ARCH@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
AUTOMAKE = @AUTOMAKE@
|
||||
Index: b/configure
|
||||
===================================================================
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -746,7 +746,6 @@
|
||||
am__EXEEXT_TRUE
|
||||
LTLIBOBJS
|
||||
LIBOBJS
|
||||
-ARCH
|
||||
BACKEND_PKG
|
||||
LIBR_BACKEND
|
||||
BACKEND_NAME
|
||||
@@ -13062,44 +13061,6 @@
|
||||
|
||||
|
||||
|
||||
-## Handle target architecture configuration
|
||||
-UNAMEM=`uname -m`;
|
||||
-if test "$UNAMEM" = "i386" ; then
|
||||
- ARCH="i386";
|
||||
-elif test "$UNAMEM" = "i486" ; then
|
||||
- ARCH="i386";
|
||||
-elif test "$UNAMEM" = "i586" ; then
|
||||
- ARCH="i386";
|
||||
-elif test "$UNAMEM" = "i686" ; then
|
||||
- ARCH="i386";
|
||||
-elif test "$UNAMEM" = "armv5tejl" ; then
|
||||
- ARCH="armel";
|
||||
-elif test "$UNAMEM" = "armv6l" ; then
|
||||
- ARCH="armhf";
|
||||
-elif test "$UNAMEM" = "x86_64"; then
|
||||
- ARCH="amd64";
|
||||
-fi
|
||||
-if test "$ARCH" = "i386" ; then
|
||||
- CFLAGS="$CFLAGS -m32";
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for 32-bit compilation." >&5
|
||||
-$as_echo "$as_me: Ready for 32-bit compilation." >&6;};
|
||||
-elif test "$ARCH" = "amd64" ; then
|
||||
- CFLAGS="$CFLAGS -m64";
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for 64-bit compilation." >&5
|
||||
-$as_echo "$as_me: Ready for 64-bit compilation." >&6;};
|
||||
-elif test "$ARCH" = "armel" ; then
|
||||
- CFLAGS="$CFLAGS";
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for armel compilation." >&5
|
||||
-$as_echo "$as_me: Ready for armel compilation." >&6;};
|
||||
-elif test "$ARCH" = "armhf" ; then
|
||||
- CFLAGS="$CFLAGS";
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for armhf compilation." >&5
|
||||
-$as_echo "$as_me: Ready for armhf compilation." >&6;};
|
||||
-else
|
||||
- as_fn_error $? "Target architecture ${ARCH} is invalid!" "$LINENO" 5 ;
|
||||
-fi
|
||||
-
|
||||
-## END Handle target architecture configuration
|
||||
|
||||
ac_config_headers="$ac_config_headers config.h"
|
||||
|
||||
Index: b/configure.ac
|
||||
===================================================================
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -71,40 +71,6 @@
|
||||
AC_SUBST(LIBR_BACKEND)
|
||||
AC_SUBST(BACKEND_PKG)
|
||||
|
||||
-## Handle target architecture configuration
|
||||
-UNAMEM=`uname -m`;
|
||||
-if test "$UNAMEM" = "i386" ; then
|
||||
- ARCH="i386";
|
||||
-elif test "$UNAMEM" = "i486" ; then
|
||||
- ARCH="i386";
|
||||
-elif test "$UNAMEM" = "i586" ; then
|
||||
- ARCH="i386";
|
||||
-elif test "$UNAMEM" = "i686" ; then
|
||||
- ARCH="i386";
|
||||
-elif test "$UNAMEM" = "armv5tejl" ; then
|
||||
- ARCH="armel";
|
||||
-elif test "$UNAMEM" = "armv6l" ; then
|
||||
- ARCH="armhf";
|
||||
-elif test "$UNAMEM" = "x86_64"; then
|
||||
- ARCH="amd64";
|
||||
-fi
|
||||
-if test "$ARCH" = "i386" ; then
|
||||
- CFLAGS="$CFLAGS -m32";
|
||||
- AC_MSG_NOTICE([Ready for 32-bit compilation.]);
|
||||
-elif test "$ARCH" = "amd64" ; then
|
||||
- CFLAGS="$CFLAGS -m64";
|
||||
- AC_MSG_NOTICE([Ready for 64-bit compilation.]);
|
||||
-elif test "$ARCH" = "armel" ; then
|
||||
- CFLAGS="$CFLAGS";
|
||||
- AC_MSG_NOTICE([Ready for armel compilation.]);
|
||||
-elif test "$ARCH" = "armhf" ; then
|
||||
- CFLAGS="$CFLAGS";
|
||||
- AC_MSG_NOTICE([Ready for armhf compilation.]);
|
||||
-else
|
||||
- AC_MSG_ERROR([Target architecture ${ARCH} is invalid!]);
|
||||
-fi
|
||||
-AC_SUBST(ARCH)
|
||||
-## END Handle target architecture configuration
|
||||
|
||||
AC_CONFIG_HEADERS(config.h)
|
||||
AC_OUTPUT(
|
||||
Index: b/man/Makefile.in
|
||||
===================================================================
|
||||
--- a/man/Makefile.in
|
||||
+++ b/man/Makefile.in
|
||||
@@ -81,7 +81,6 @@
|
||||
ACLOCAL = @ACLOCAL@
|
||||
AMTAR = @AMTAR@
|
||||
AR = @AR@
|
||||
-ARCH = @ARCH@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
AUTOMAKE = @AUTOMAKE@
|
||||
Index: b/src/Makefile.in
|
||||
===================================================================
|
||||
--- a/src/Makefile.in
|
||||
+++ b/src/Makefile.in
|
||||
@@ -103,7 +103,6 @@
|
||||
ACLOCAL = @ACLOCAL@
|
||||
AMTAR = @AMTAR@
|
||||
AR = @AR@
|
||||
-ARCH = @ARCH@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
AUTOMAKE = @AUTOMAKE@
|
||||
@ -0,0 +1,44 @@
|
||||
Index: libr-0.6.0/src/libr-bfd.c
|
||||
===================================================================
|
||||
--- libr-0.6.0.orig/src/libr-bfd.c 2011-03-02 22:06:52.000000000 +0000
|
||||
+++ libr-0.6.0/src/libr-bfd.c 2014-03-30 10:57:27.132041406 +0000
|
||||
@@ -159,7 +159,18 @@
|
||||
continue; /* Section has been marked for deletion */
|
||||
}
|
||||
/* Use SEC_LINKER_CREATED to ask the libbfd backend to take care of configuring the section */
|
||||
- oscn = bfd_make_section_anyway_with_flags(ohandle, iscn->name, iscn->flags | SEC_LINKER_CREATED);
|
||||
+
|
||||
+ // Keep the ARM_ATTRIBUTES section type intact on armhf systems
|
||||
+ // If this is not done, readelf -A will not print any architecture information for the modified library,
|
||||
+ // and ldd will report that the library cannot be found
|
||||
+ if (strcmp(iscn->name, ".ARM.attributes") == 0)
|
||||
+ {
|
||||
+ oscn = bfd_make_section_anyway_with_flags(ohandle, iscn->name, iscn->flags);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ oscn = bfd_make_section_anyway_with_flags(ohandle, iscn->name, iscn->flags | SEC_LINKER_CREATED);
|
||||
+ }
|
||||
if(oscn == NULL)
|
||||
{
|
||||
printf("failed to create out section: %s\n", bfd_errmsg(bfd_get_error()));
|
||||
@@ -262,6 +273,7 @@
|
||||
reloc_count = bfd_canonicalize_reloc(ihandle, iscn, reloc_buffer, symtab_buffer);
|
||||
bfd_set_reloc(ohandle, oscn, reloc_buffer, reloc_count);
|
||||
}
|
||||
+
|
||||
if(bfd_get_section_flags(ihandle, iscn) & SEC_HAS_CONTENTS)
|
||||
{
|
||||
/* NOTE: if the section is just being copied then do that, otherwise grab
|
||||
@@ -286,6 +298,11 @@
|
||||
return false;
|
||||
}
|
||||
free(buffer);
|
||||
+ if(!bfd_copy_private_section_data(ihandle, iscn, ohandle, oscn))
|
||||
+ {
|
||||
+ printf("failed to copy private section data: %s\n", bfd_errmsg(bfd_get_error()));
|
||||
+ return false;
|
||||
+ }
|
||||
}
|
||||
}
|
||||
if(!bfd_copy_private_bfd_data(ihandle, ohandle))
|
||||
@ -0,0 +1,6 @@
|
||||
000-fix-stack-smashing.diff
|
||||
001-fix-arm-builds.diff
|
||||
002-fix-crash-on-malformed-icon.diff
|
||||
003-fix-gtk-includes.diff
|
||||
004-fix-force-arch.diff
|
||||
005-fix-arm-mangled-section.diff
|
||||
@ -0,0 +1,39 @@
|
||||
#!/bin/sh
|
||||
# postinst script for libr
|
||||
#
|
||||
# see: dh_installdeb(1)
|
||||
|
||||
set -e
|
||||
|
||||
# summary of how this script can be called:
|
||||
# * <postinst> `configure' <most-recently-configured-version>
|
||||
# * <old-postinst> `abort-upgrade' <new version>
|
||||
# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
|
||||
# <new-version>
|
||||
# * <postinst> `abort-remove'
|
||||
# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
|
||||
# <failed-install-package> <version> `removing'
|
||||
# <conflicting-package> <version>
|
||||
# for details, see http://www.debian.org/doc/debian-policy/ or
|
||||
# the debian-policy package
|
||||
|
||||
|
||||
case "$1" in
|
||||
configure)
|
||||
;;
|
||||
|
||||
abort-upgrade|abort-remove|abort-deconfigure)
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "postinst called with unknown argument \`$1'" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# dh_installdeb will replace this with shell code automatically
|
||||
# generated by other debhelper scripts.
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
exit 0
|
||||
@ -0,0 +1,37 @@
|
||||
#!/bin/sh
|
||||
# postrm script for libr
|
||||
#
|
||||
# see: dh_installdeb(1)
|
||||
|
||||
set -e
|
||||
|
||||
# summary of how this script can be called:
|
||||
# * <postrm> `remove'
|
||||
# * <postrm> `purge'
|
||||
# * <old-postrm> `upgrade' <new-version>
|
||||
# * <new-postrm> `failed-upgrade' <old-version>
|
||||
# * <new-postrm> `abort-install'
|
||||
# * <new-postrm> `abort-install' <old-version>
|
||||
# * <new-postrm> `abort-upgrade' <old-version>
|
||||
# * <disappearer's-postrm> `disappear' <overwriter>
|
||||
# <overwriter-version>
|
||||
# for details, see http://www.debian.org/doc/debian-policy/ or
|
||||
# the debian-policy package
|
||||
|
||||
|
||||
case "$1" in
|
||||
purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "postrm called with unknown argument \`$1'" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# dh_installdeb will replace this with shell code automatically
|
||||
# generated by other debhelper scripts.
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
exit 0
|
||||
@ -0,0 +1,35 @@
|
||||
#!/bin/sh
|
||||
# preinst script for libr
|
||||
#
|
||||
# see: dh_installdeb(1)
|
||||
|
||||
set -e
|
||||
|
||||
# summary of how this script can be called:
|
||||
# * <new-preinst> `install'
|
||||
# * <new-preinst> `install' <old-version>
|
||||
# * <new-preinst> `upgrade' <old-version>
|
||||
# * <old-preinst> `abort-upgrade' <new-version>
|
||||
# for details, see http://www.debian.org/doc/debian-policy/ or
|
||||
# the debian-policy package
|
||||
|
||||
|
||||
case "$1" in
|
||||
install|upgrade)
|
||||
;;
|
||||
|
||||
abort-upgrade)
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "preinst called with unknown argument \`$1'" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# dh_installdeb will replace this with shell code automatically
|
||||
# generated by other debhelper scripts.
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
exit 0
|
||||
@ -0,0 +1,38 @@
|
||||
#!/bin/sh
|
||||
# prerm script for libr
|
||||
#
|
||||
# see: dh_installdeb(1)
|
||||
|
||||
set -e
|
||||
|
||||
# summary of how this script can be called:
|
||||
# * <prerm> `remove'
|
||||
# * <old-prerm> `upgrade' <new-version>
|
||||
# * <new-prerm> `failed-upgrade' <old-version>
|
||||
# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
|
||||
# * <deconfigured's-prerm> `deconfigure' `in-favour'
|
||||
# <package-being-installed> <version> `removing'
|
||||
# <conflicting-package> <version>
|
||||
# for details, see http://www.debian.org/doc/debian-policy/ or
|
||||
# the debian-policy package
|
||||
|
||||
|
||||
case "$1" in
|
||||
remove|upgrade|deconfigure)
|
||||
;;
|
||||
|
||||
failed-upgrade)
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "prerm called with unknown argument \`$1'" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# dh_installdeb will replace this with shell code automatically
|
||||
# generated by other debhelper scripts.
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
exit 0
|
||||
@ -0,0 +1,113 @@
|
||||
#!/usr/bin/make -f
|
||||
# -*- makefile -*-
|
||||
# Sample debian/rules that uses debhelper.
|
||||
# This file was originally written by Joey Hess and Craig Small.
|
||||
# As a special exception, when this file is copied by dh-make into a
|
||||
# dh-make output file, you may use that output file without restriction.
|
||||
# This special exception was added by Craig Small in version 0.37 of dh-make.
|
||||
|
||||
# Uncomment this to turn on verbose mode.
|
||||
#export DH_VERBOSE=1
|
||||
|
||||
|
||||
# These are used for cross-compiling and for saving the configure script
|
||||
# from having to guess our platform (since we know it already)
|
||||
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
|
||||
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
|
||||
ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
|
||||
CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
|
||||
else
|
||||
CROSS= --build $(DEB_BUILD_GNU_TYPE)
|
||||
endif
|
||||
|
||||
|
||||
|
||||
|
||||
# shared library versions, option 1
|
||||
version=2.0.5
|
||||
major=2
|
||||
# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
|
||||
#version=`ls src/.libs/lib*.so.* | \
|
||||
# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
|
||||
#major=`ls src/.libs/lib*.so.* | \
|
||||
# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
|
||||
|
||||
config.status: configure
|
||||
dh_testdir
|
||||
# Add here commands to configure the package.
|
||||
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
|
||||
cp -f /usr/share/misc/config.sub config.sub
|
||||
endif
|
||||
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
|
||||
cp -f /usr/share/misc/config.guess config.guess
|
||||
endif
|
||||
./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
|
||||
|
||||
|
||||
build: build-stamp
|
||||
build-stamp: config.status
|
||||
dh_testdir
|
||||
|
||||
# Add here commands to compile the package.
|
||||
#$(MAKE)
|
||||
|
||||
touch $@
|
||||
|
||||
clean:
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
rm -f build-stamp
|
||||
|
||||
# Add here commands to clean up after the build process.
|
||||
[ ! -f Makefile ] || $(MAKE) distclean
|
||||
rm -f config.sub config.guess
|
||||
|
||||
dh_clean
|
||||
|
||||
install: build
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
dh_prep
|
||||
dh_installdirs
|
||||
|
||||
# Add here commands to install the package into debian/tmp
|
||||
$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
|
||||
|
||||
|
||||
# Build architecture-independent files here.
|
||||
binary-indep: install
|
||||
# We have nothing to do by default.
|
||||
|
||||
# Build architecture-dependent files here.
|
||||
binary-arch: install
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
dh_installchangelogs ChangeLog
|
||||
dh_installdocs
|
||||
dh_installexamples
|
||||
dh_install
|
||||
# dh_installmenu
|
||||
# dh_installdebconf
|
||||
# dh_installlogrotate
|
||||
# dh_installemacsen
|
||||
# dh_installpam
|
||||
# dh_installmime
|
||||
# dh_installinit
|
||||
# dh_installcron
|
||||
# dh_installinfo
|
||||
dh_installman
|
||||
dh_link
|
||||
dh_strip
|
||||
dh_compress
|
||||
dh_fixperms
|
||||
# dh_perl
|
||||
# dh_python
|
||||
dh_makeshlibs
|
||||
dh_installdeb
|
||||
dh_shlibdeps
|
||||
dh_gencontrol
|
||||
dh_md5sums
|
||||
dh_builddeb
|
||||
|
||||
binary: binary-indep binary-arch
|
||||
.PHONY: build clean binary-indep binary-arch binary install
|
||||
@ -0,0 +1 @@
|
||||
liblibr 0 libr (>> 0-0), libr (<< 0-99)
|
||||
@ -0,0 +1 @@
|
||||
3.0 (quilt)
|
||||
@ -0,0 +1,6 @@
|
||||
# Use xz instead of gzip
|
||||
compression = "xz"
|
||||
compression-level = 9
|
||||
|
||||
# Don't run differences
|
||||
diff-ignore = .*
|
||||
@ -0,0 +1,23 @@
|
||||
# Example watch control file for uscan
|
||||
# Rename this file to "watch" and then you can run the "uscan" command
|
||||
# to check for upstream updates and more.
|
||||
# See uscan(1) for format
|
||||
|
||||
# Compulsory line, this is a version 3 file
|
||||
version=3
|
||||
|
||||
# Uncomment to examine a Webpage
|
||||
# <Webpage URL> <string match>
|
||||
#http://www.example.com/downloads.php libr-(.*)\.tar\.gz
|
||||
|
||||
# Uncomment to examine a Webserver directory
|
||||
#http://www.example.com/pub/libr-(.*)\.tar\.gz
|
||||
|
||||
# Uncommment to examine a FTP server
|
||||
#ftp://ftp.example.com/pub/libr-(.*)\.tar\.gz debian uupdate
|
||||
|
||||
# Uncomment to find new files on sourceforge, for devscripts >= 2.9
|
||||
# http://sf.net/libr/libr-(.*)\.tar\.gz
|
||||
|
||||
# Uncomment to find new files on GooglePages
|
||||
# http://example.googlepages.com/foo.html libr-(.*)\.tar\.gz
|
||||
@ -0,0 +1,6 @@
|
||||
libr for Debian
|
||||
---------------
|
||||
|
||||
<possible notes regarding this package - if none, delete this file>
|
||||
|
||||
-- Erich Hoover <ehoover@mines.edu> Tue, 03 Nov 2009 20:26:31 -0700
|
||||
@ -0,0 +1,44 @@
|
||||
libr (4:0.6.0-2debian8.0.0+6~d) jessie; urgency=low
|
||||
|
||||
* Fix mangling of a critical elf library section on armhf
|
||||
|
||||
-- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sun, 30 Mar 2014 06:04:00 -0600
|
||||
|
||||
libr (4:0.6.0-1debian7.0.0+0) wheezy; urgency=low
|
||||
|
||||
* Fix FTBFS due to force build architecture
|
||||
* Changes pulled into a separate patches
|
||||
* Switch to quilt format
|
||||
|
||||
-- Slávek Banko <slavek.banko@axis.cz> Sun, 03 Nov 2013 14:43:31 +0100
|
||||
|
||||
libr (4:0.6.0-0ubuntu4~quantal) quantal; urgency=low
|
||||
|
||||
* Fix FTBFS on Ubuntu Quantal
|
||||
|
||||
-- Timothy Pearson <kb9vqf@pearsoncomputing.net> Tue, 12 Sep 2012 15:03:00 -0600
|
||||
|
||||
libr (4:0.6.0-0ubuntu3~quantal) quantal; urgency=low
|
||||
|
||||
* Fix crash on accessing malformed icon
|
||||
|
||||
-- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 02 Jan 2012 02:18:00 -0600
|
||||
|
||||
libr (4:0.6.0-0ubuntu2~lucid) lucid; urgency=low
|
||||
|
||||
* Fix armel builds
|
||||
|
||||
-- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sun, 01 Jan 2012 02:12:00 -0600
|
||||
|
||||
libr (4:0.6.0-0ubuntu1~lucid) lucid; urgency=low
|
||||
|
||||
* Fix stack smashing in edit mode
|
||||
|
||||
-- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 31 Dec 2011 20:42:00 -0600
|
||||
|
||||
libr (4:0.6.0-0ubuntu0~lucid) lucid; urgency=low
|
||||
|
||||
* Initial upload
|
||||
|
||||
-- Timothy Pearson <kb9vqf@pearsoncomputing.net> Fri, 30 Dec 2011 16:20:00 -0600
|
||||
|
||||
@ -0,0 +1 @@
|
||||
7
|
||||
@ -0,0 +1,22 @@
|
||||
Source: libr
|
||||
Priority: extra
|
||||
Maintainer: Erich E. Hoover <ehoover@mines.edu>
|
||||
Build-Depends: debhelper (>= 7), quilt, autotools-dev, pkg-config,
|
||||
libglade2-dev, binutils-dev, doxygen
|
||||
Standards-Version: 3.8.4
|
||||
Section: libs
|
||||
Homepage: http://www.compholio.com/elficon/
|
||||
|
||||
Package: libr-dev
|
||||
Section: libdevel
|
||||
Architecture: any
|
||||
Depends: libr0 (= ${binary:Version})
|
||||
Description: ELF binary resource library
|
||||
Store and retrieve resources from ELF binaries.
|
||||
|
||||
Package: libr0
|
||||
Section: libs
|
||||
Architecture: any
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}
|
||||
Description: ELF binary resource library
|
||||
Store and retrieve resources from ELF binaries.
|
||||
@ -0,0 +1,6 @@
|
||||
Copyright notice:
|
||||
|
||||
Copyright (c) 2008-2009, Erich Hoover
|
||||
|
||||
This package is licensed under the LGPL v2.1, for further details see:
|
||||
/usr/share/common-licenses/LGPL-2.1
|
||||
@ -0,0 +1,4 @@
|
||||
#
|
||||
# Regular cron jobs for the libr package
|
||||
#
|
||||
0 4 * * * root [ -x /usr/bin/libr_maintenance ] && /usr/bin/libr_maintenance
|
||||
@ -0,0 +1,2 @@
|
||||
usr/bin
|
||||
usr/sbin
|
||||
@ -0,0 +1,3 @@
|
||||
NEWS
|
||||
README
|
||||
ChangeLog.debian
|
||||
@ -0,0 +1,3 @@
|
||||
usr/lib
|
||||
usr/include
|
||||
usr/include/libr
|
||||
@ -0,0 +1,9 @@
|
||||
usr/include/*
|
||||
usr/include/libr/*
|
||||
usr/lib/lib*.a
|
||||
usr/lib/lib*.so
|
||||
usr/lib/*.la
|
||||
usr/lib/pkgconfig/*
|
||||
usr/share/man/man3/*.3
|
||||
#usr/share/pkgconfig/*
|
||||
|
||||
@ -0,0 +1,10 @@
|
||||
# Defaults for libr initscript
|
||||
# sourced by /etc/init.d/libr
|
||||
# installed at /etc/default/libr by the maintainer scripts
|
||||
|
||||
#
|
||||
# This is a POSIX shell fragment
|
||||
#
|
||||
|
||||
# Additional options that are passed to the Daemon.
|
||||
DAEMON_OPTS=""
|
||||
@ -0,0 +1,20 @@
|
||||
Document: libr
|
||||
Title: Debian libr Manual
|
||||
Author: <insert document author here>
|
||||
Abstract: This manual describes what libr is
|
||||
and how it can be used to
|
||||
manage online manuals on Debian systems.
|
||||
Section: unknown
|
||||
|
||||
Format: debiandoc-sgml
|
||||
Files: /usr/share/doc/libr/libr.sgml.gz
|
||||
|
||||
Format: postscript
|
||||
Files: /usr/share/doc/libr/libr.ps.gz
|
||||
|
||||
Format: text
|
||||
Files: /usr/share/doc/libr/libr.text.gz
|
||||
|
||||
Format: HTML
|
||||
Index: /usr/share/doc/libr/html/index.html
|
||||
Files: /usr/share/doc/libr/html/*.html
|
||||
@ -0,0 +1 @@
|
||||
usr/lib
|
||||
@ -0,0 +1 @@
|
||||
usr/lib/lib*.so.*
|
||||
@ -0,0 +1,24 @@
|
||||
diff -ru libr-0.6.0~maverick/src/libr-bfd.h libr-0.6.0/src/libr-bfd.h
|
||||
--- libr-0.6.0~maverick/src/libr-bfd.h 2009-12-03 18:51:50.000000000 +0000
|
||||
+++ libr-0.6.0/src/libr-bfd.h 2012-09-12 20:08:35.000000000 +0000
|
||||
@@ -1,6 +1,8 @@
|
||||
#ifndef __LIBR_BFD_H
|
||||
#define __LIBR_BFD_H
|
||||
|
||||
+#include "config.h"
|
||||
+
|
||||
#include <sys/types.h>
|
||||
#include <stdint.h>
|
||||
#include <bfd.h>
|
||||
diff -ru libr-0.6.0~maverick/src/libr-internal.h libr-0.6.0/src/libr-internal.h
|
||||
--- libr-0.6.0~maverick/src/libr-internal.h 2010-05-01 19:07:32.000000000 +0000
|
||||
+++ libr-0.6.0/src/libr-internal.h 2012-09-12 20:08:35.000000000 +0000
|
||||
@@ -7,7 +7,7 @@
|
||||
#define EXPORT_FN __attribute__((visibility ("protected")))
|
||||
#define INTERNAL_FN __attribute__ ((visibility ("internal")))
|
||||
#define LIBR_TEMPFILE "/tmp/libr-temp.XXXXXX"
|
||||
-#define LIBR_TEMPFILE_LEN 21
|
||||
+#define LIBR_TEMPFILE_LEN 22
|
||||
|
||||
#ifndef DOXYGEN_SHOULD_SKIP_THIS
|
||||
|
||||
@ -0,0 +1,56 @@
|
||||
diff -ru libr-0.6.0~maverick/configure libr-0.6.0/configure
|
||||
--- libr-0.6.0~maverick/configure 2011-03-05 20:21:12.000000000 +0000
|
||||
+++ libr-0.6.0/configure 2013-07-19 03:43:01.000000000 +0000
|
||||
@@ -13072,6 +13072,10 @@
|
||||
ARCH="i386";
|
||||
elif test "$UNAMEM" = "i686" ; then
|
||||
ARCH="i386";
|
||||
+elif test "$UNAMEM" = "armv5tejl" ; then
|
||||
+ ARCH="armel";
|
||||
+elif test "$UNAMEM" = "armv6l" ; then
|
||||
+ ARCH="armhf";
|
||||
elif test "$UNAMEM" = "x86_64"; then
|
||||
ARCH="amd64";
|
||||
fi
|
||||
@@ -13083,6 +13087,14 @@
|
||||
CFLAGS="$CFLAGS -m64";
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Ready for 64-bit compilation." >&5
|
||||
$as_echo "$as_me: Ready for 64-bit compilation." >&6;};
|
||||
+elif test "$ARCH" = "armel" ; then
|
||||
+ CFLAGS="$CFLAGS";
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for armel compilation." >&5
|
||||
+$as_echo "$as_me: Ready for armel compilation." >&6;};
|
||||
+elif test "$ARCH" = "armhf" ; then
|
||||
+ CFLAGS="$CFLAGS";
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for armhf compilation." >&5
|
||||
+$as_echo "$as_me: Ready for armhf compilation." >&6;};
|
||||
else
|
||||
as_fn_error $? "Target architecture ${ARCH} is invalid!" "$LINENO" 5 ;
|
||||
fi
|
||||
diff -ru libr-0.6.0~maverick/configure.ac libr-0.6.0/configure.ac
|
||||
--- libr-0.6.0~maverick/configure.ac 2011-03-05 20:20:50.000000000 +0000
|
||||
+++ libr-0.6.0/configure.ac 2013-07-19 03:41:27.000000000 +0000
|
||||
@@ -81,6 +81,10 @@
|
||||
ARCH="i386";
|
||||
elif test "$UNAMEM" = "i686" ; then
|
||||
ARCH="i386";
|
||||
+elif test "$UNAMEM" = "armv5tejl" ; then
|
||||
+ ARCH="armel";
|
||||
+elif test "$UNAMEM" = "armv6l" ; then
|
||||
+ ARCH="armhf";
|
||||
elif test "$UNAMEM" = "x86_64"; then
|
||||
ARCH="amd64";
|
||||
fi
|
||||
@@ -90,6 +94,12 @@
|
||||
elif test "$ARCH" = "amd64" ; then
|
||||
CFLAGS="$CFLAGS -m64";
|
||||
AC_MSG_NOTICE([Ready for 64-bit compilation.]);
|
||||
+elif test "$ARCH" = "armel" ; then
|
||||
+ CFLAGS="$CFLAGS";
|
||||
+ AC_MSG_NOTICE([Ready for armel compilation.]);
|
||||
+elif test "$ARCH" = "armhf" ; then
|
||||
+ CFLAGS="$CFLAGS";
|
||||
+ AC_MSG_NOTICE([Ready for armhf compilation.]);
|
||||
else
|
||||
AC_MSG_ERROR([Target architecture ${ARCH} is invalid!]);
|
||||
fi
|
||||
@ -0,0 +1,34 @@
|
||||
diff -ru libr-0.6.0~maverick/src/libr-icons.c libr-0.6.0/src/libr-icons.c
|
||||
--- libr-0.6.0~maverick/src/libr-icons.c 2011-03-02 22:22:33.000000000 +0000
|
||||
+++ libr-0.6.0/src/libr-icons.c 2012-09-12 20:08:35.000000000 +0000
|
||||
@@ -330,18 +330,20 @@
|
||||
if(entry->type == LIBR_SVG)
|
||||
{
|
||||
libr_icon *icon = libr_icon_geticon_byname(handle, entry->name);
|
||||
- libr_icon *icon_onecanvas;
|
||||
- char *buffer;
|
||||
+ if (icon) {
|
||||
+ libr_icon *icon_onecanvas;
|
||||
+ char *buffer;
|
||||
|
||||
- /* should we report the requested size for SVG? */
|
||||
- icon->icon_size = iconsize;
|
||||
+ /* should we report the requested size for SVG? */
|
||||
+ icon->icon_size = iconsize;
|
||||
|
||||
- /* if the SVG is a "one canvas" document then extract the correctly sized icon */
|
||||
- if((buffer = onecanvas_geticon_bysize(icon->buffer, iconsize)) != NULL)
|
||||
- {
|
||||
- libr_icon_close(icon);
|
||||
- icon_onecanvas = new_icon_handle(LIBR_SVG, iconsize, buffer, strlen(buffer));
|
||||
- return icon_onecanvas;
|
||||
+ /* if the SVG is a "one canvas" document then extract the correctly sized icon */
|
||||
+ if((buffer = onecanvas_geticon_bysize(icon->buffer, iconsize)) != NULL)
|
||||
+ {
|
||||
+ libr_icon_close(icon);
|
||||
+ icon_onecanvas = new_icon_handle(LIBR_SVG, iconsize, buffer, strlen(buffer));
|
||||
+ return icon_onecanvas;
|
||||
+ }
|
||||
}
|
||||
return icon;
|
||||
}
|
||||
@ -0,0 +1,12 @@
|
||||
diff -ru libr-0.6.0~maverick/src/libr-gtk.c libr-0.6.0/src/libr-gtk.c
|
||||
--- libr-0.6.0~maverick/src/libr-gtk.c 2009-12-01 23:11:37.000000000 +0000
|
||||
+++ libr-0.6.0/src/libr-gtk.c 2012-09-12 20:08:35.000000000 +0000
|
||||
@@ -33,7 +33,7 @@
|
||||
|
||||
/* For loading GTK/GDK images */
|
||||
#include <gdk-pixbuf/gdk-pixbuf.h>
|
||||
-#include <glib/gthread.h>
|
||||
+#include <glib.h>
|
||||
|
||||
/* For loading GLADE files */
|
||||
#include <glade/glade.h>
|
||||
@ -0,0 +1,138 @@
|
||||
Index: b/Makefile.in
|
||||
===================================================================
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -136,7 +136,6 @@
|
||||
ACLOCAL = @ACLOCAL@
|
||||
AMTAR = @AMTAR@
|
||||
AR = @AR@
|
||||
-ARCH = @ARCH@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
AUTOMAKE = @AUTOMAKE@
|
||||
Index: b/configure
|
||||
===================================================================
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -746,7 +746,6 @@
|
||||
am__EXEEXT_TRUE
|
||||
LTLIBOBJS
|
||||
LIBOBJS
|
||||
-ARCH
|
||||
BACKEND_PKG
|
||||
LIBR_BACKEND
|
||||
BACKEND_NAME
|
||||
@@ -13062,44 +13061,6 @@
|
||||
|
||||
|
||||
|
||||
-## Handle target architecture configuration
|
||||
-UNAMEM=`uname -m`;
|
||||
-if test "$UNAMEM" = "i386" ; then
|
||||
- ARCH="i386";
|
||||
-elif test "$UNAMEM" = "i486" ; then
|
||||
- ARCH="i386";
|
||||
-elif test "$UNAMEM" = "i586" ; then
|
||||
- ARCH="i386";
|
||||
-elif test "$UNAMEM" = "i686" ; then
|
||||
- ARCH="i386";
|
||||
-elif test "$UNAMEM" = "armv5tejl" ; then
|
||||
- ARCH="armel";
|
||||
-elif test "$UNAMEM" = "armv6l" ; then
|
||||
- ARCH="armhf";
|
||||
-elif test "$UNAMEM" = "x86_64"; then
|
||||
- ARCH="amd64";
|
||||
-fi
|
||||
-if test "$ARCH" = "i386" ; then
|
||||
- CFLAGS="$CFLAGS -m32";
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for 32-bit compilation." >&5
|
||||
-$as_echo "$as_me: Ready for 32-bit compilation." >&6;};
|
||||
-elif test "$ARCH" = "amd64" ; then
|
||||
- CFLAGS="$CFLAGS -m64";
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for 64-bit compilation." >&5
|
||||
-$as_echo "$as_me: Ready for 64-bit compilation." >&6;};
|
||||
-elif test "$ARCH" = "armel" ; then
|
||||
- CFLAGS="$CFLAGS";
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for armel compilation." >&5
|
||||
-$as_echo "$as_me: Ready for armel compilation." >&6;};
|
||||
-elif test "$ARCH" = "armhf" ; then
|
||||
- CFLAGS="$CFLAGS";
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for armhf compilation." >&5
|
||||
-$as_echo "$as_me: Ready for armhf compilation." >&6;};
|
||||
-else
|
||||
- as_fn_error $? "Target architecture ${ARCH} is invalid!" "$LINENO" 5 ;
|
||||
-fi
|
||||
-
|
||||
-## END Handle target architecture configuration
|
||||
|
||||
ac_config_headers="$ac_config_headers config.h"
|
||||
|
||||
Index: b/configure.ac
|
||||
===================================================================
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -71,40 +71,6 @@
|
||||
AC_SUBST(LIBR_BACKEND)
|
||||
AC_SUBST(BACKEND_PKG)
|
||||
|
||||
-## Handle target architecture configuration
|
||||
-UNAMEM=`uname -m`;
|
||||
-if test "$UNAMEM" = "i386" ; then
|
||||
- ARCH="i386";
|
||||
-elif test "$UNAMEM" = "i486" ; then
|
||||
- ARCH="i386";
|
||||
-elif test "$UNAMEM" = "i586" ; then
|
||||
- ARCH="i386";
|
||||
-elif test "$UNAMEM" = "i686" ; then
|
||||
- ARCH="i386";
|
||||
-elif test "$UNAMEM" = "armv5tejl" ; then
|
||||
- ARCH="armel";
|
||||
-elif test "$UNAMEM" = "armv6l" ; then
|
||||
- ARCH="armhf";
|
||||
-elif test "$UNAMEM" = "x86_64"; then
|
||||
- ARCH="amd64";
|
||||
-fi
|
||||
-if test "$ARCH" = "i386" ; then
|
||||
- CFLAGS="$CFLAGS -m32";
|
||||
- AC_MSG_NOTICE([Ready for 32-bit compilation.]);
|
||||
-elif test "$ARCH" = "amd64" ; then
|
||||
- CFLAGS="$CFLAGS -m64";
|
||||
- AC_MSG_NOTICE([Ready for 64-bit compilation.]);
|
||||
-elif test "$ARCH" = "armel" ; then
|
||||
- CFLAGS="$CFLAGS";
|
||||
- AC_MSG_NOTICE([Ready for armel compilation.]);
|
||||
-elif test "$ARCH" = "armhf" ; then
|
||||
- CFLAGS="$CFLAGS";
|
||||
- AC_MSG_NOTICE([Ready for armhf compilation.]);
|
||||
-else
|
||||
- AC_MSG_ERROR([Target architecture ${ARCH} is invalid!]);
|
||||
-fi
|
||||
-AC_SUBST(ARCH)
|
||||
-## END Handle target architecture configuration
|
||||
|
||||
AC_CONFIG_HEADERS(config.h)
|
||||
AC_OUTPUT(
|
||||
Index: b/man/Makefile.in
|
||||
===================================================================
|
||||
--- a/man/Makefile.in
|
||||
+++ b/man/Makefile.in
|
||||
@@ -81,7 +81,6 @@
|
||||
ACLOCAL = @ACLOCAL@
|
||||
AMTAR = @AMTAR@
|
||||
AR = @AR@
|
||||
-ARCH = @ARCH@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
AUTOMAKE = @AUTOMAKE@
|
||||
Index: b/src/Makefile.in
|
||||
===================================================================
|
||||
--- a/src/Makefile.in
|
||||
+++ b/src/Makefile.in
|
||||
@@ -103,7 +103,6 @@
|
||||
ACLOCAL = @ACLOCAL@
|
||||
AMTAR = @AMTAR@
|
||||
AR = @AR@
|
||||
-ARCH = @ARCH@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
AUTOMAKE = @AUTOMAKE@
|
||||
@ -0,0 +1,44 @@
|
||||
Index: libr-0.6.0/src/libr-bfd.c
|
||||
===================================================================
|
||||
--- libr-0.6.0.orig/src/libr-bfd.c 2011-03-02 22:06:52.000000000 +0000
|
||||
+++ libr-0.6.0/src/libr-bfd.c 2014-03-30 10:57:27.132041406 +0000
|
||||
@@ -159,7 +159,18 @@
|
||||
continue; /* Section has been marked for deletion */
|
||||
}
|
||||
/* Use SEC_LINKER_CREATED to ask the libbfd backend to take care of configuring the section */
|
||||
- oscn = bfd_make_section_anyway_with_flags(ohandle, iscn->name, iscn->flags | SEC_LINKER_CREATED);
|
||||
+
|
||||
+ // Keep the ARM_ATTRIBUTES section type intact on armhf systems
|
||||
+ // If this is not done, readelf -A will not print any architecture information for the modified library,
|
||||
+ // and ldd will report that the library cannot be found
|
||||
+ if (strcmp(iscn->name, ".ARM.attributes") == 0)
|
||||
+ {
|
||||
+ oscn = bfd_make_section_anyway_with_flags(ohandle, iscn->name, iscn->flags);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ oscn = bfd_make_section_anyway_with_flags(ohandle, iscn->name, iscn->flags | SEC_LINKER_CREATED);
|
||||
+ }
|
||||
if(oscn == NULL)
|
||||
{
|
||||
printf("failed to create out section: %s\n", bfd_errmsg(bfd_get_error()));
|
||||
@@ -262,6 +273,7 @@
|
||||
reloc_count = bfd_canonicalize_reloc(ihandle, iscn, reloc_buffer, symtab_buffer);
|
||||
bfd_set_reloc(ohandle, oscn, reloc_buffer, reloc_count);
|
||||
}
|
||||
+
|
||||
if(bfd_get_section_flags(ihandle, iscn) & SEC_HAS_CONTENTS)
|
||||
{
|
||||
/* NOTE: if the section is just being copied then do that, otherwise grab
|
||||
@@ -286,6 +298,11 @@
|
||||
return false;
|
||||
}
|
||||
free(buffer);
|
||||
+ if(!bfd_copy_private_section_data(ihandle, iscn, ohandle, oscn))
|
||||
+ {
|
||||
+ printf("failed to copy private section data: %s\n", bfd_errmsg(bfd_get_error()));
|
||||
+ return false;
|
||||
+ }
|
||||
}
|
||||
}
|
||||
if(!bfd_copy_private_bfd_data(ihandle, ohandle))
|
||||
@ -0,0 +1,6 @@
|
||||
000-fix-stack-smashing.diff
|
||||
001-fix-arm-builds.diff
|
||||
002-fix-crash-on-malformed-icon.diff
|
||||
003-fix-gtk-includes.diff
|
||||
004-fix-force-arch.diff
|
||||
005-fix-arm-mangled-section.diff
|
||||
@ -0,0 +1,39 @@
|
||||
#!/bin/sh
|
||||
# postinst script for libr
|
||||
#
|
||||
# see: dh_installdeb(1)
|
||||
|
||||
set -e
|
||||
|
||||
# summary of how this script can be called:
|
||||
# * <postinst> `configure' <most-recently-configured-version>
|
||||
# * <old-postinst> `abort-upgrade' <new version>
|
||||
# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
|
||||
# <new-version>
|
||||
# * <postinst> `abort-remove'
|
||||
# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
|
||||
# <failed-install-package> <version> `removing'
|
||||
# <conflicting-package> <version>
|
||||
# for details, see http://www.debian.org/doc/debian-policy/ or
|
||||
# the debian-policy package
|
||||
|
||||
|
||||
case "$1" in
|
||||
configure)
|
||||
;;
|
||||
|
||||
abort-upgrade|abort-remove|abort-deconfigure)
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "postinst called with unknown argument \`$1'" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# dh_installdeb will replace this with shell code automatically
|
||||
# generated by other debhelper scripts.
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
exit 0
|
||||
@ -0,0 +1,37 @@
|
||||
#!/bin/sh
|
||||
# postrm script for libr
|
||||
#
|
||||
# see: dh_installdeb(1)
|
||||
|
||||
set -e
|
||||
|
||||
# summary of how this script can be called:
|
||||
# * <postrm> `remove'
|
||||
# * <postrm> `purge'
|
||||
# * <old-postrm> `upgrade' <new-version>
|
||||
# * <new-postrm> `failed-upgrade' <old-version>
|
||||
# * <new-postrm> `abort-install'
|
||||
# * <new-postrm> `abort-install' <old-version>
|
||||
# * <new-postrm> `abort-upgrade' <old-version>
|
||||
# * <disappearer's-postrm> `disappear' <overwriter>
|
||||
# <overwriter-version>
|
||||
# for details, see http://www.debian.org/doc/debian-policy/ or
|
||||
# the debian-policy package
|
||||
|
||||
|
||||
case "$1" in
|
||||
purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "postrm called with unknown argument \`$1'" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# dh_installdeb will replace this with shell code automatically
|
||||
# generated by other debhelper scripts.
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
exit 0
|
||||
@ -0,0 +1,35 @@
|
||||
#!/bin/sh
|
||||
# preinst script for libr
|
||||
#
|
||||
# see: dh_installdeb(1)
|
||||
|
||||
set -e
|
||||
|
||||
# summary of how this script can be called:
|
||||
# * <new-preinst> `install'
|
||||
# * <new-preinst> `install' <old-version>
|
||||
# * <new-preinst> `upgrade' <old-version>
|
||||
# * <old-preinst> `abort-upgrade' <new-version>
|
||||
# for details, see http://www.debian.org/doc/debian-policy/ or
|
||||
# the debian-policy package
|
||||
|
||||
|
||||
case "$1" in
|
||||
install|upgrade)
|
||||
;;
|
||||
|
||||
abort-upgrade)
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "preinst called with unknown argument \`$1'" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# dh_installdeb will replace this with shell code automatically
|
||||
# generated by other debhelper scripts.
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
exit 0
|
||||
@ -0,0 +1,38 @@
|
||||
#!/bin/sh
|
||||
# prerm script for libr
|
||||
#
|
||||
# see: dh_installdeb(1)
|
||||
|
||||
set -e
|
||||
|
||||
# summary of how this script can be called:
|
||||
# * <prerm> `remove'
|
||||
# * <old-prerm> `upgrade' <new-version>
|
||||
# * <new-prerm> `failed-upgrade' <old-version>
|
||||
# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
|
||||
# * <deconfigured's-prerm> `deconfigure' `in-favour'
|
||||
# <package-being-installed> <version> `removing'
|
||||
# <conflicting-package> <version>
|
||||
# for details, see http://www.debian.org/doc/debian-policy/ or
|
||||
# the debian-policy package
|
||||
|
||||
|
||||
case "$1" in
|
||||
remove|upgrade|deconfigure)
|
||||
;;
|
||||
|
||||
failed-upgrade)
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "prerm called with unknown argument \`$1'" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# dh_installdeb will replace this with shell code automatically
|
||||
# generated by other debhelper scripts.
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
exit 0
|
||||
@ -0,0 +1,113 @@
|
||||
#!/usr/bin/make -f
|
||||
# -*- makefile -*-
|
||||
# Sample debian/rules that uses debhelper.
|
||||
# This file was originally written by Joey Hess and Craig Small.
|
||||
# As a special exception, when this file is copied by dh-make into a
|
||||
# dh-make output file, you may use that output file without restriction.
|
||||
# This special exception was added by Craig Small in version 0.37 of dh-make.
|
||||
|
||||
# Uncomment this to turn on verbose mode.
|
||||
#export DH_VERBOSE=1
|
||||
|
||||
|
||||
# These are used for cross-compiling and for saving the configure script
|
||||
# from having to guess our platform (since we know it already)
|
||||
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
|
||||
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
|
||||
ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
|
||||
CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
|
||||
else
|
||||
CROSS= --build $(DEB_BUILD_GNU_TYPE)
|
||||
endif
|
||||
|
||||
|
||||
|
||||
|
||||
# shared library versions, option 1
|
||||
version=2.0.5
|
||||
major=2
|
||||
# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
|
||||
#version=`ls src/.libs/lib*.so.* | \
|
||||
# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
|
||||
#major=`ls src/.libs/lib*.so.* | \
|
||||
# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
|
||||
|
||||
config.status: configure
|
||||
dh_testdir
|
||||
# Add here commands to configure the package.
|
||||
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
|
||||
cp -f /usr/share/misc/config.sub config.sub
|
||||
endif
|
||||
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
|
||||
cp -f /usr/share/misc/config.guess config.guess
|
||||
endif
|
||||
./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
|
||||
|
||||
|
||||
build: build-stamp
|
||||
build-stamp: config.status
|
||||
dh_testdir
|
||||
|
||||
# Add here commands to compile the package.
|
||||
#$(MAKE)
|
||||
|
||||
touch $@
|
||||
|
||||
clean:
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
rm -f build-stamp
|
||||
|
||||
# Add here commands to clean up after the build process.
|
||||
[ ! -f Makefile ] || $(MAKE) distclean
|
||||
rm -f config.sub config.guess
|
||||
|
||||
dh_clean
|
||||
|
||||
install: build
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
dh_prep
|
||||
dh_installdirs
|
||||
|
||||
# Add here commands to install the package into debian/tmp
|
||||
$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
|
||||
|
||||
|
||||
# Build architecture-independent files here.
|
||||
binary-indep: install
|
||||
# We have nothing to do by default.
|
||||
|
||||
# Build architecture-dependent files here.
|
||||
binary-arch: install
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
dh_installchangelogs ChangeLog
|
||||
dh_installdocs
|
||||
dh_installexamples
|
||||
dh_install
|
||||
# dh_installmenu
|
||||
# dh_installdebconf
|
||||
# dh_installlogrotate
|
||||
# dh_installemacsen
|
||||
# dh_installpam
|
||||
# dh_installmime
|
||||
# dh_installinit
|
||||
# dh_installcron
|
||||
# dh_installinfo
|
||||
dh_installman
|
||||
dh_link
|
||||
dh_strip
|
||||
dh_compress
|
||||
dh_fixperms
|
||||
# dh_perl
|
||||
# dh_python
|
||||
dh_makeshlibs
|
||||
dh_installdeb
|
||||
dh_shlibdeps
|
||||
dh_gencontrol
|
||||
dh_md5sums
|
||||
dh_builddeb
|
||||
|
||||
binary: binary-indep binary-arch
|
||||
.PHONY: build clean binary-indep binary-arch binary install
|
||||
@ -0,0 +1 @@
|
||||
liblibr 0 libr (>> 0-0), libr (<< 0-99)
|
||||
@ -0,0 +1 @@
|
||||
3.0 (quilt)
|
||||
@ -0,0 +1,6 @@
|
||||
# Use xz instead of gzip
|
||||
compression = "xz"
|
||||
compression-level = 9
|
||||
|
||||
# Don't run differences
|
||||
diff-ignore = .*
|
||||
@ -0,0 +1,23 @@
|
||||
# Example watch control file for uscan
|
||||
# Rename this file to "watch" and then you can run the "uscan" command
|
||||
# to check for upstream updates and more.
|
||||
# See uscan(1) for format
|
||||
|
||||
# Compulsory line, this is a version 3 file
|
||||
version=3
|
||||
|
||||
# Uncomment to examine a Webpage
|
||||
# <Webpage URL> <string match>
|
||||
#http://www.example.com/downloads.php libr-(.*)\.tar\.gz
|
||||
|
||||
# Uncomment to examine a Webserver directory
|
||||
#http://www.example.com/pub/libr-(.*)\.tar\.gz
|
||||
|
||||
# Uncommment to examine a FTP server
|
||||
#ftp://ftp.example.com/pub/libr-(.*)\.tar\.gz debian uupdate
|
||||
|
||||
# Uncomment to find new files on sourceforge, for devscripts >= 2.9
|
||||
# http://sf.net/libr/libr-(.*)\.tar\.gz
|
||||
|
||||
# Uncomment to find new files on GooglePages
|
||||
# http://example.googlepages.com/foo.html libr-(.*)\.tar\.gz
|
||||
Loading…
Reference in new issue