[Pkg-gmagick-svn-commit] r55 - branches/6.3.9.4.dfsg1-1/debian
naoliv at alioth.debian.org
naoliv at alioth.debian.org
Tue Mar 25 19:34:55 UTC 2008
Author: naoliv
Date: 2008-03-25 19:34:54 +0000 (Tue, 25 Mar 2008)
New Revision: 55
Added:
branches/6.3.9.4.dfsg1-1/debian/display.xpm
Modified:
branches/6.3.9.4.dfsg1-1/debian/TODO
branches/6.3.9.4.dfsg1-1/debian/changelog
branches/6.3.9.4.dfsg1-1/debian/imagemagick.install
branches/6.3.9.4.dfsg1-1/debian/imagemagick.menu
branches/6.3.9.4.dfsg1-1/debian/rules
Log:
Add menu icon
Modified: branches/6.3.9.4.dfsg1-1/debian/TODO
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/TODO 2008-03-25 17:07:03 UTC (rev 54)
+++ branches/6.3.9.4.dfsg1-1/debian/TODO 2008-03-25 19:34:54 UTC (rev 55)
@@ -2,5 +2,4 @@
- use symbol files; seems interesting:
http://wiki.debian.org/Projects/ImprovedDpkgShlibdeps
http://wiki.debian.org/UsingSymbolsFiles
-- menu icon
- nox packages (without having dependencies on X libs)
Modified: branches/6.3.9.4.dfsg1-1/debian/changelog
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/changelog 2008-03-25 17:07:03 UTC (rev 54)
+++ branches/6.3.9.4.dfsg1-1/debian/changelog 2008-03-25 19:34:54 UTC (rev 55)
@@ -15,6 +15,7 @@
* Image::Magick's manpage also makes reference to local documentation
(Closes: #205017);
* Update doc-base section;
+ * Include menu icon (Closes: #192644);
* Add transfig to suggests (Closes: #441155);
* Fix typo in manpages (Closes: #426552);
* Fix typo in composite.html (Closes: #436789);
Added: branches/6.3.9.4.dfsg1-1/debian/display.xpm
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/display.xpm (rev 0)
+++ branches/6.3.9.4.dfsg1-1/debian/display.xpm 2008-03-25 19:34:54 UTC (rev 55)
@@ -0,0 +1,170 @@
+/* XPM */
+static char * display[] = {
+"32 32 135 2",
+" c None",
+". c #FEFEFE",
+"+ c #FFFFFF",
+"@ c #F28283",
+"# c #FEFDFD",
+"$ c #E60001",
+"% c #FEFAFA",
+"& c #E60304",
+"* c #E50000",
+"= c #F28282",
+"- c #F7AEAF",
+"; c #EF6465",
+"> c #F49898",
+", c #F8BABA",
+"' c #E81415",
+") c #E70F10",
+"! c #F7B8B9",
+"~ c #FAD1D1",
+"{ c #E81819",
+"] c #E8191A",
+"^ c #EF6767",
+"/ c #F38686",
+"( c #F49191",
+"_ c #E60809",
+": c #F07070",
+"< c #E70E0F",
+"[ c #F9CECE",
+"} c #FDF6F6",
+"| c #E70B0C",
+"1 c #F9CFCF",
+"2 c #FDF5F5",
+"3 c #E71314",
+"4 c #FBDBDB",
+"5 c #FEFCFC",
+"6 c #E91F20",
+"7 c #EA2B2B",
+"8 c #F8C2C3",
+"9 c #EC4344",
+"0 c #F49697",
+"a c #F9C6C6",
+"b c #ED494A",
+"c c #EE5B5C",
+"d c #F7B4B5",
+"e c #E60405",
+"f c #F49192",
+"g c #E81718",
+"h c #E50001",
+"i c #F49494",
+"j c #E81A1B",
+"k c #E60203",
+"l c #E60002",
+"m c #E7090A",
+"n c #F38A8B",
+"o c #FDF5F6",
+"p c #E60708",
+"q c #E92728",
+"r c #F8C3C4",
+"s c #EC4243",
+"t c #F49495",
+"u c #F9C5C5",
+"v c #FEFFFF",
+"w c #FBD9D9",
+"x c #E40000",
+"y c #F07272",
+"z c #F17B7C",
+"A c #F9CCCC",
+"B c #F06E6F",
+"C c #F49A9B",
+"D c #E81B1C",
+"E c #E60102",
+"F c #E92223",
+"G c #FAD6D6",
+"H c #EA3031",
+"I c #F9C3C3",
+"J c #F7B9B9",
+"K c #E71112",
+"L c #F07373",
+"M c #F9CACB",
+"N c #F38A8A",
+"O c #FDF4F4",
+"P c #FFFEFE",
+"Q c #F3898A",
+"R c #F9CACA",
+"S c #E20000",
+"T c #F49393",
+"U c #F49797",
+"V c #F6A4A5",
+"W c #EA2F30",
+"X c #F49090",
+"Y c #FEFBFB",
+"Z c #E60607",
+"` c #F49394",
+" . c #EA2D2E",
+".. c #EA3536",
+"+. c #F38D8D",
+"@. c #FBE4E5",
+"#. c #EB3839",
+"$. c #EB393A",
+"%. c #F7B7B7",
+"&. c #FDECEC",
+"*. c #F49091",
+"=. c #F59899",
+"-. c #EF5F60",
+";. c #F7B6B6",
+">. c #EF5F5F",
+",. c #F49798",
+"'. c #F48E8E",
+"). c #FBDDDD",
+"!. c #EA3334",
+"~. c #F6A7A7",
+"{. c #F9CDCD",
+"]. c #F8C0C0",
+"^. c #E92B2C",
+"/. c #F49292",
+"(. c #F9CBCB",
+"_. c #E70C0D",
+":. c #F9CCCD",
+"<. c #F48F8F",
+"[. c #E50102",
+"}. c #FEF9F9",
+"|. c #E70D0E",
+"1. c #F28686",
+"2. c #EA3131",
+"3. c #F6A8A9",
+"4. c #E7080A",
+"5. c #F6AFB0",
+"6. c #E92324",
+"7. c #F38687",
+"8. c #F38586",
+"9. c #F38585",
+"0. c #F17475",
+"a. c #FBE0E1",
+"b. c #EB3536",
+"c. c #E81617",
+"d. c #FCEBEB",
+". + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+"+ . + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ",
+". + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". + . + . + . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". + + @ + # . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". + + $ + % + + + + + + + . + + + + . + + + + + . + + + + . + . ",
+". + + & + + * = $ - ; & > + , ' ) ! + ~ { ] ^ / + ( ' _ : + # . ",
+". + + & + + < [ } | 1 2 3 + 4 + 5 6 + 7 8 + 9 0 a b + + c d + . ",
+". + + & + + & + + e + + & + f < & g + h + + f i 0 j k l m n + . ",
+". + + & + + & + + & + + & + * + o p + q r + s t u b + + v w + . ",
+". + + x + + x + + x + + x + y $ z * + A { j B f + C D E F , + . ",
+". + # + # # + # # + # # + # + + + + + G + + H I . + + + + + + . ",
+". + + 5 + + 5 + + 5 + + 5 + . 5 . 5 + J K p L + # . 5 5 # . . . ",
+". + . . . . . . . . . . . . . . . . . + + + + . + . . . . . . . ",
+". + + + . + + + . . . . . . . . . . + # + % . + . . # + # + . . ",
+"+ M N O P 5 Q R + . . . . . . . . . . + S + 5 . . . + x + 5 . . ",
+"+ T H U + V W X + + + + + . + + + + + Y + Y + + + + + Z + + + + ",
+"+ ( ` .+ ..` +.+ , ' ) ! + ~ { ] ^ / + x + @.#.& $.+ E + %.j &.",
+"+ *.=.-.;.>.,.'.+ ).+ 5 6 + 7 8 + 9 ` + Z + !.~.+ {.+ p ].^.+ . ",
+"+ *./.(._.:.<.<.+ t < & g + h + + f <.+ & + [.+ }.+ + { |.+ 5 + ",
+"+ *.<.+ 1.+ '.<.+ k + o p + q r + s f + & + 2.3.+ [ + 4.5.6.+ . ",
+"+ 7.8.+ + + 8.9.+ 0.$ z * + A { j B f + x + a.b.& $.+ x + > c.d.",
+". + + . . . + + . + + + + + G + + H I # + # . + + + 5 + 5 + + + ",
+"+ # # + . + # # + . 5 . 5 + J K p L + . 5 + + # 5 # + 5 + . 5 . ",
+". + . . . . . . . . . . . . + + + + . + . . . . . . . . . . . . ",
+". + . . . . . . . . . . . + . 5 5 . + . . . . . . . . . . . . . ",
+". + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + "};
Modified: branches/6.3.9.4.dfsg1-1/debian/imagemagick.install
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/imagemagick.install 2008-03-25 17:07:03 UTC (rev 54)
+++ branches/6.3.9.4.dfsg1-1/debian/imagemagick.install 2008-03-25 19:34:54 UTC (rev 55)
@@ -23,3 +23,4 @@
usr/share/man/man1/mogrify.1
usr/share/man/man1/montage.1
usr/share/man/man1/stream.1
+usr/share/pixmaps/
Modified: branches/6.3.9.4.dfsg1-1/debian/imagemagick.menu
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/imagemagick.menu 2008-03-25 17:07:03 UTC (rev 54)
+++ branches/6.3.9.4.dfsg1-1/debian/imagemagick.menu 2008-03-25 19:34:54 UTC (rev 55)
@@ -1,2 +1,3 @@
-?package(imagemagick):needs="X11" section="Applications/Graphics"\
- title="ImageMagick" command="/usr/bin/display logo:" hints="Images"
+?package(imagemagick):needs="X11" section="Applications/Graphics" \
+ title="ImageMagick" command="/usr/bin/display logo:" hints="Images" \
+ icon="/usr/share/pixmaps/display.xpm"
Modified: branches/6.3.9.4.dfsg1-1/debian/rules
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/rules 2008-03-25 17:07:03 UTC (rev 54)
+++ branches/6.3.9.4.dfsg1-1/debian/rules 2008-03-25 19:34:54 UTC (rev 55)
@@ -11,6 +11,8 @@
IMAGEMAGICKVERSION=6.4.0
SOVERSION:=1
+DESTDIR=$(CURDIR)/debian/tmp
+
include /usr/share/quilt/quilt.make
build: build-stamp
@@ -86,28 +88,31 @@
cd $(CURDIR)/PerlMagick && \
$(MAKE) install_vendor \
- PREFIX=$(CURDIR)/debian/tmp/usr \
- SITEPREFIX=$(CURDIR)/debian/tmp/usr \
- INSTALLMAN3DIR=$(CURDIR)/debian/tmp/usr/share/man/man3 \
- INSTALLSITEMAN3DIR=$(CURDIR)/debian/tmp/usr/share/man/man3
+ PREFIX=$(DESTDIR)/usr \
+ SITEPREFIX=$(DESTDIR)/usr \
+ INSTALLMAN3DIR=$(DESTDIR)/usr/share/man/man3 \
+ INSTALLSITEMAN3DIR=$(DESTDIR)/usr/share/man/man3
+ mkdir -p $(DESTDIR)/usr/share/pixmaps/
+ install -m 644 $(CURDIR)/debian/display.xpm $(DESTDIR)/usr/share/pixmaps/
+
-find $(CURDIR)/debian -type f -name .packlist | xargs rm -f
# Fix HTML location inside manpages
sed -i 's/doc\/ImageMagick-$(IMAGEMAGICKVERSION)/doc\/imagemagick/' \
- $(CURDIR)/debian/tmp/usr/share/man/man*/*
+ $(DESTDIR)/usr/share/man/man*/*
sed -i 's/doc\/ImageMagick\\-$(IMAGEMAGICKVERSION)/doc\/imagemagick/' \
- $(CURDIR)/debian/tmp/usr/share/man/man*/*
+ $(DESTDIR)/usr/share/man/man*/*
# Use x-terminal emulator for editing (Bug #132947)
sed -i 's/xterm/\/etc\/alternatives\/x-terminal-emulator/' \
- $(CURDIR)/debian/tmp/usr/lib/ImageMagick-$(IMAGEMAGICKVERSION)/config/delegates.xml
+ $(DESTDIR)/usr/lib/ImageMagick-$(IMAGEMAGICKVERSION)/config/delegates.xml
# Remove empty directories in debian/tmp
- -find $(CURDIR)/debian/tmp -type d -empty | xargs rmdir -p
+ -find $(DESTDIR) -type d -empty | xargs rmdir -p
# Remove RPATH from Magick.so
- chrpath -d $(CURDIR)/debian/tmp/usr/lib/perl5/auto/Image/Magick/Magick.so
+ chrpath -d $(DESTDIR)/usr/lib/perl5/auto/Image/Magick/Magick.so
clean-tarball:
# Nuke logo binaries
More information about the pkg-gmagick-svn-commit
mailing list