r33802 - in /desktop/unstable/librsvg/debian: changelog patches/20_Revert-Remove-obsolete-script.patch patches/99_ltmain_as-needed.patch patches/series
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Fri Mar 30 20:47:34 UTC 2012
Author: biebl
Date: Fri Mar 30 20:47:33 2012
New Revision: 33802
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=33802
Log:
Revert upstream commit which dropped the "rsvg" script until all reverse
dependencies have been fixed to use "rsvg-convert". Closes: #666276
Added:
desktop/unstable/librsvg/debian/patches/20_Revert-Remove-obsolete-script.patch
Modified:
desktop/unstable/librsvg/debian/changelog
desktop/unstable/librsvg/debian/patches/99_ltmain_as-needed.patch
desktop/unstable/librsvg/debian/patches/series
Modified: desktop/unstable/librsvg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/librsvg/debian/changelog?rev=33802&op=diff
==============================================================================
--- desktop/unstable/librsvg/debian/changelog [utf-8] (original)
+++ desktop/unstable/librsvg/debian/changelog [utf-8] Fri Mar 30 20:47:33 2012
@@ -1,3 +1,10 @@
+librsvg (2.36.0-2) UNRELEASED; urgency=low
+
+ * Revert upstream commit which dropped the "rsvg" script until all reverse
+ dependencies have been fixed to use "rsvg-convert". Closes: #666276
+
+ -- Michael Biebl <biebl at debian.org> Fri, 30 Mar 2012 22:44:59 +0200
+
librsvg (2.36.0-1) unstable; urgency=low
* New upstream release.
Added: desktop/unstable/librsvg/debian/patches/20_Revert-Remove-obsolete-script.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/librsvg/debian/patches/20_Revert-Remove-obsolete-script.patch?rev=33802&op=file
==============================================================================
--- desktop/unstable/librsvg/debian/patches/20_Revert-Remove-obsolete-script.patch (added)
+++ desktop/unstable/librsvg/debian/patches/20_Revert-Remove-obsolete-script.patch [utf-8] Fri Mar 30 20:47:33 2012
@@ -1,0 +1,122 @@
+From 63a950e536fe191f222f39a291ddd3e9e7b26d2f Mon Sep 17 00:00:00 2001
+From: Michael Biebl <biebl at debian.org>
+Date: Fri, 30 Mar 2012 22:36:42 +0200
+Subject: [PATCH] Revert "Remove obsolete script"
+
+This reverts commit fd76212e2dc8e41b2c23d6e76c02cc7803da4a12.
+---
+ Makefile.am | 1 +
+ configure.in | 4 ++++
+ rsvg.in | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 78 insertions(+)
+ create mode 100644 rsvg.in
+
+diff --git a/Makefile.am b/Makefile.am
+index 4b846df..b5ec811 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -168,6 +168,7 @@ EXTRA_DIST = \
+ TODO \
+ COPYING.LIB \
+ librsvg-zip.in \
++ rsvg.in \
+ librsvg.def \
+ gtk-doc.make
+
+diff --git a/configure.in b/configure.in
+index daaca26..c924209 100644
+--- a/configure.in
++++ b/configure.in
+@@ -321,6 +321,10 @@ doc/version.xml
+ AC_CONFIG_FILES([librsvg-${RSVG_API_VERSION}.pc:librsvg.pc.in],[],[RSVG_API_VERSION=$RSVG_API_VERSION])
+ AC_CONFIG_FILES([librsvg-${RSVG_API_VERSION}-uninstalled.pc:librsvg-uninstalled.pc.in],[],[RSVG_API_VERSION=$RSVG_API_VERSION])
+
++if test "$with_gtk" = "2.0"; then
++ AC_CONFIG_FILES([rsvg])
++fi
++
+ AC_OUTPUT
+
+ dnl =============================================================================================
+diff --git a/rsvg.in b/rsvg.in
+new file mode 100644
+index 0000000..70a5bec
+--- /dev/null
++++ b/rsvg.in
+@@ -0,0 +1,73 @@
++#!/usr/bin/env python
++
++#
++# This python script subsumes the old 'rsvg' C-based command-line program.
++# It should be considered deprecated in favor of 'rsvg-convert'.
++#
++
++import getopt, sys, os
++
++def usage():
++ print >> sys.stdout, """Usage: rsvg [-v?] [-d|--dpi-x <float>] [-p|--dpi-y <float>]
++ [-x|--x-zoom <float>] [-y|--y-zoom <float>] [-w|--width <int>]
++ [-h|--height <int>] [-q|--quality <int>] [-f|--format [png, jpeg]]
++ [-v|--version] [-?|--help] [--usage] [OPTIONS...] file.svg file.png"""
++
++def help():
++ print >> sys.stdout, """Usage: rsvg [OPTIONS...] file.svg file.png
++ -d, --dpi-x=<float> pixels per inch
++ -p, --dpi-y=<float> pixels per inch
++ -x, --x-zoom=<float> x zoom factor
++ -y, --y-zoom=<float> y zoom factor
++ -w, --width=<int> width
++ -h, --height=<int> height
++ -q, --quality=<int> JPEG quality
++ -f, --format=[png, jpeg] save format
++ -v, --version show version information
++
++Help options:
++ -?, --help Show this help message
++ --usage Display brief usage message
++""",
++
++def shellEscape(param):
++ """Escape a string parameter for the shell."""
++ return "'" + param.replace("'", "'\\''") + "'"
++
++def main():
++ try:
++ opts, args = getopt.getopt(sys.argv[1:], "d:p:x:y:w:h:q:f:v?", ["dpi-x=", "dpi-y=", "x-zoom=", "y-zoom=", "width=", "height=", "quality=", "format=", "version", "usage"])
++ except getopt.GetoptError:
++ help()
++ sys.exit(1)
++
++ command_str = ""
++
++ for o, a in opts:
++ if o in ("-v", "--version"):
++ print "rsvg version %s" % ("@VERSION@")
++ sys.exit(0)
++ elif o in ("--usage"):
++ usage()
++ sys.exit(0)
++ elif o in ("-?", "--help"):
++ help()
++ sys.exit(0)
++ elif (o in ("-f", "--format")):
++ if a in ("jpg", "jpeg"):
++ print >> sys.stderr, "The JPEG output format is no longer supported"
++ sys.exit(1)
++ elif (o in ("-q", "--quality")):
++ print "The --quality option is no longer supported"
++ sys.exit(1)
++ else:
++ command_str += " " + shellEscape(o) + " " + shellEscape(a)
++
++ if len(args) != 2:
++ help()
++ sys.exit(1)
++
++ return os.system("%s %s -o %s %s" % (shellEscape(os.path.join("@prefix@", "bin", "rsvg-convert")), command_str, shellEscape(args[1]), shellEscape(args[0])))
++
++if __name__ == "__main__":
++ main()
+--
+1.7.9.5
+
Modified: desktop/unstable/librsvg/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/librsvg/debian/patches/99_ltmain_as-needed.patch?rev=33802&op=diff
==============================================================================
--- desktop/unstable/librsvg/debian/patches/99_ltmain_as-needed.patch [utf-8] (original)
+++ desktop/unstable/librsvg/debian/patches/99_ltmain_as-needed.patch [utf-8] Fri Mar 30 20:47:33 2012
@@ -1,6 +1,8 @@
---- a/ltmain.sh
-+++ b/ltmain.sh
-@@ -4716,6 +4716,11 @@
+Index: librsvg-2.36.0/ltmain.sh
+===================================================================
+--- librsvg-2.36.0.orig/ltmain.sh 2012-02-03 13:14:50.000000000 +0100
++++ librsvg-2.36.0/ltmain.sh 2012-03-30 22:37:32.269507414 +0200
+@@ -5787,6 +5787,11 @@
arg=$func_stripname_result
;;
@@ -12,7 +14,7 @@
-Wl,*)
func_stripname '-Wl,' '' "$arg"
args=$func_stripname_result
-@@ -5067,6 +5072,15 @@
+@@ -6147,6 +6152,15 @@
lib=
found=no
case $deplib in
Modified: desktop/unstable/librsvg/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/librsvg/debian/patches/series?rev=33802&op=diff
==============================================================================
--- desktop/unstable/librsvg/debian/patches/series [utf-8] (original)
+++ desktop/unstable/librsvg/debian/patches/series [utf-8] Fri Mar 30 20:47:33 2012
@@ -1,2 +1,3 @@
10_rsvg-gz.patch
+20_Revert-Remove-obsolete-script.patch
99_ltmain_as-needed.patch
More information about the pkg-gnome-commits
mailing list