[SCM] wxMaxima packaging branch, master, updated. debian/0.7.1-1-12-g7b910af
Frank S. Thomas
fst at debian.org
Fri Jun 26 12:53:48 UTC 2009
The following commit has been merged in the master branch:
commit 7b910af99bbe7527c1c0659ab0a09858c2c0abd0
Author: Frank S. Thomas <fst at debian.org>
Date: Fri Jun 26 14:49:57 2009 +0200
Use dh and quilt to minimize debian/rules.
debian/control:
* Use dh and quilt's new debhelper addon instead of CDBS to minimize
debian/rules. This required to build-depend on debhelper (>= 7.0.50) and
quilt (>= 0.46-7).
* debian/patches/:
- Added 201_fix_desktop_file.patch that changes wxmaxima.desktop so that it
is valid according to the latest freedesktop.org specs. (closes: #466997)
diff --git a/debian/changelog b/debian/changelog
index 396e26f..8c1498c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
wxmaxima (0.8.2-1) UNRELEASED; urgency=low
* New upstream release. (closes: #484281, #508181)
+ - Does not fail to build from source. (closes: #527708)
* debian/control:
- Took over package from Rafa Rodríguez Galván with his permission. Thanks
Rafa and Marco for all your work! Set Debian Science Maintainers as
@@ -12,6 +13,12 @@ wxmaxima (0.8.2-1) UNRELEASED; urgency=low
* debian/wxmaxima.menu:
- Changed section "Apps/Math" to "Applications/Science/Mathematics".
- Use 16x16 and 32x32 wxMaxima icons. (closes: #428820)
+ * Use dh and quilt's new debhelper addon instead of CDBS to minimize
+ debian/rules. This required to build-depend on debhelper (>= 7.0.50) and
+ quilt (>= 0.46-7).
+ * debian/patches/:
+ - Added 201_fix_desktop_file.patch that changes wxmaxima.desktop so that it
+ is valid according to the latest freedesktop.org specs. (closes: #466997)
-- Frank S. Thomas <fst at debian.org> Wed, 24 Jun 2009 12:56:42 +0200
diff --git a/debian/compat b/debian/compat
index b8626c4..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7
diff --git a/debian/control b/debian/control
index d0c37e4..6610263 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: math
Priority: optional
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Frank S. Thomas <fst at debian.org>
-Build-Depends: cdbs, patchutils (>= 0.2.25), debhelper (>= 4.1.0),
+Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7),
libwxgtk2.8-dev (>= 2.8.4), libxml2-dev (>= 2.5.0)
Standards-Version: 3.7.2
Vcs-Git: git://git.debian.org/git/debian-science/packages/wxmaxima.git
diff --git a/debian/maximaicon.xpm b/debian/maximaicon.xpm
deleted file mode 100644
index 7c063c1..0000000
--- a/debian/maximaicon.xpm
+++ /dev/null
@@ -1,420 +0,0 @@
-/* XPM */
-static char * maximaicon_xpm[] = {
-"32 32 385 2",
-" c None",
-". c #2E2976",
-"+ c #3B3595",
-"@ c #0E0D27",
-"# c #231F69",
-"$ c #403AA2",
-"% c #030309",
-"& c #000000",
-"* c #25216A",
-"= c #403AB2",
-"- c #4740C6",
-"; c #201C64",
-"> c #39348A",
-", c #4039A7",
-"' c #06050E",
-") c #36309B",
-"! c #4139CA",
-"~ c #443DCF",
-"{ c #4C45D1",
-"] c #181645",
-"^ c #585184",
-"/ c #37327D",
-"( c #2D287F",
-"_ c #36327E",
-": c #3D387C",
-"< c #413D79",
-"[ c #312C77",
-"} c #2A2673",
-"| c #363272",
-"1 c #262267",
-"2 c #27236B",
-"3 c #2A2662",
-"4 c #282461",
-"5 c #26225F",
-"6 c #272355",
-"7 c #453FAF",
-"8 c #3D37AE",
-"9 c #3D37B2",
-"0 c #4740C9",
-"a c #433CD1",
-"b c #3B34B7",
-"c c #1B184C",
-"d c #6B639D",
-"e c #675DF7",
-"f c #4F46F5",
-"g c #665DF3",
-"h c #665EC7",
-"i c #645DBE",
-"j c #413BB9",
-"k c #4C46B4",
-"l c #4C46AE",
-"m c #3D37AF",
-"n c #4F48BE",
-"o c #5951CA",
-"p c #5149C5",
-"q c #443DB1",
-"r c #141229",
-"s c #4A43BC",
-"t c #2B2779",
-"u c #131137",
-"v c #0C0B1E",
-"w c #010104",
-"x c #6258E5",
-"y c #5A50FB",
-"z c #756AFD",
-"A c #423D73",
-"B c #020204",
-"C c #100E27",
-"D c #363199",
-"E c #3F38BE",
-"F c #332E79",
-"G c #423D8D",
-"H c #010102",
-"I c #2E297A",
-"J c #6A60FC",
-"K c #8A7FFE",
-"L c #978CF0",
-"M c #14122C",
-"N c #0F0D2C",
-"O c #423BC1",
-"P c #07060F",
-"Q c #3C369E",
-"R c #1B1842",
-"S c #742929",
-"T c #7B2F2E",
-"U c #803432",
-"V c #823332",
-"W c #655DBF",
-"X c #AA9FFE",
-"Y c #9287FD",
-"Z c #4A43A9",
-"` c #411515",
-" . c #813331",
-".. c #7F3736",
-"+. c #773231",
-"@. c #5D2626",
-"#. c #3D3898",
-"$. c #0D0C1A",
-"%. c #423D9A",
-"&. c #262354",
-"*. c #260D0D",
-"=. c #953332",
-"-. c #BD4543",
-";. c #C24B49",
-">. c #481D1C",
-",. c #34304D",
-"'. c #C5B7F6",
-"). c #8175FD",
-"!. c #867BDA",
-"~. c #9E3A3B",
-"{. c #BF4F4D",
-"]. c #AB4645",
-"^. c #2F1313",
-"/. c #070303",
-"(. c #04040A",
-"_. c #2B276D",
-":. c #4841C0",
-"<. c #141233",
-"[. c #3B3593",
-"}. c #703153",
-"|. c #C13735",
-"1. c #CD4443",
-"2. c #A13F3D",
-"3. c #6A6295",
-"4. c #A899FE",
-"5. c #7B4E7D",
-"6. c #CF504E",
-"7. c #C54B4A",
-"8. c #7D2E2D",
-"9. c #3E398C",
-"0. c #5C54DC",
-"a. c #6056EF",
-"b. c #6E63FD",
-"c. c #7A4172",
-"d. c #B83A39",
-"e. c #D83735",
-"f. c #E74A47",
-"g. c #4E1F1E",
-"h. c #8579BA",
-"i. c #BA5053",
-"j. c #C74B49",
-"k. c #CC4746",
-"l. c #792B2A",
-"m. c #252258",
-"n. c #544CCE",
-"o. c #413C94",
-"p. c #2D295E",
-"q. c #433D8F",
-"r. c #6F3150",
-"s. c #7F2928",
-"t. c #C63F3D",
-"u. c #F63E3B",
-"v. c #B63A38",
-"w. c #653435",
-"x. c #C34E4C",
-"y. c #9A3231",
-"z. c #D54C4A",
-"A. c #7C3433",
-"B. c #262350",
-"C. c #5C55CD",
-"D. c #262357",
-"E. c #000001",
-"F. c #6B2726",
-"G. c #7C2A29",
-"H. c #671D1C",
-"I. c #FB4F4C",
-"J. c #F95955",
-"K. c #4C1B1A",
-"L. c #C65C59",
-"M. c #4C1F1E",
-"N. c #9D4745",
-"O. c #DC5B59",
-"P. c #81302F",
-"Q. c #4841B5",
-"R. c #2D2964",
-"S. c #832C2B",
-"T. c #812B2A",
-"U. c #E15A57",
-"V. c #FD716C",
-"W. c #B0605D",
-"X. c #765D5C",
-"Y. c #C9837F",
-"Z. c #0A080D",
-"`. c #A8393B",
-" + c #E84B49",
-".+ c #862F2D",
-"++ c #201D68",
-"@+ c #352EB6",
-"#+ c #020104",
-"$+ c #802E2D",
-"%+ c #7F2C2B",
-"&+ c #953836",
-"*+ c #FD7C78",
-"=+ c #FAADA7",
-"-+ c #4B3F3E",
-";+ c #C57E7A",
-">+ c #4F2B2A",
-",+ c #4C437D",
-"'+ c #AF333A",
-")+ c #EA3E3B",
-"!+ c #842524",
-"~+ c #342F91",
-"{+ c #2B277A",
-"]+ c #823130",
-"^+ c #7F302F",
-"/+ c #EA7D78",
-"(+ c #FEB6B0",
-"_+ c #A79797",
-":+ c #736A6A",
-"<+ c #CB918C",
-"[+ c #322E32",
-"}+ c #AB9BEF",
-"|+ c #AE363C",
-"1+ c #E7413F",
-"2+ c #842827",
-"3+ c #4741A8",
-"4+ c #302C6D",
-"5+ c #7E2625",
-"6+ c #7D2423",
-"7+ c #A25B58",
-"8+ c #FE9F99",
-"9+ c #F7D2CE",
-"0+ c #3D2F2E",
-"a+ c #C8817D",
-"b+ c #523F3E",
-"c+ c #978BB2",
-"d+ c #7B7289",
-"e+ c #A23432",
-"f+ c #E44745",
-"g+ c #832A29",
-"h+ c #4A43AA",
-"i+ c #403A90",
-"j+ c #7D2F2E",
-"k+ c #ED928D",
-"l+ c #FD847F",
-"m+ c #A46562",
-"n+ c #583E3D",
-"o+ c #CA6965",
-"p+ c #231A36",
-"q+ c #7869C7",
-"r+ c #050407",
-"s+ c #A23D3B",
-"t+ c #DE4A47",
-"u+ c #802A29",
-"v+ c #443E92",
-"w+ c #5E56CA",
-"x+ c #171535",
-"y+ c #782C2B",
-"z+ c #772B2A",
-"A+ c #A33C3A",
-"B+ c #FC6460",
-"C+ c #F87A75",
-"D+ c #CF9793",
-"E+ c #532928",
-"F+ c #786EA2",
-"G+ c #110E24",
-"H+ c #A43C3A",
-"I+ c #D65956",
-"J+ c #7C3332",
-"K+ c #201D46",
-"L+ c #3B3588",
-"M+ c #292569",
-"N+ c #443DC9",
-"O+ c #4039C2",
-"P+ c #23206B",
-"Q+ c #672322",
-"R+ c #722524",
-"S+ c #EF524E",
-"T+ c #FD615D",
-"U+ c #CE7C78",
-"V+ c #231E37",
-"W+ c #3C3657",
-"X+ c #9B2B2A",
-"Y+ c #CD4240",
-"Z+ c #782D2C",
-"`+ c #110F2C",
-" @ c #3E38A5",
-".@ c #1F1C4E",
-"+@ c #3B35AB",
-"@@ c #3E37CF",
-"#@ c #3A33D7",
-"$@ c #3830E0",
-"%@ c #433BE9",
-"&@ c #6359F4",
-"*@ c #763958",
-"=@ c #80302F",
-"-@ c #4B44A9",
-";@ c #483EC5",
-">@ c #393457",
-",@ c #AC3A37",
-"'@ c #FA504C",
-")@ c #542C2B",
-"!@ c #514899",
-"~@ c #4D458E",
-"{@ c #3D3690",
-"]@ c #6D65A1",
-"^@ c #9A3232",
-"/@ c #C43C3B",
-"(@ c #822B2A",
-"_@ c #1C176C",
-":@ c #2C25A7",
-"<@ c #2E298B",
-"[@ c #332E9F",
-"}@ c #413AC8",
-"|@ c #4841C7",
-"1@ c #0A0918",
-"2@ c #322BAE",
-"3@ c #3C35D4",
-"4@ c #4D46DB",
-"5@ c #5C4FC5",
-"6@ c #5D3A70",
-"7@ c #9E4041",
-"8@ c #B44B4A",
-"9@ c #592952",
-"0@ c #6F5AC6",
-"a@ c #7E73E9",
-"b@ c #1C192B",
-"c@ c #B53735",
-"d@ c #151134",
-"e@ c #7568FA",
-"f@ c #6D60FD",
-"g@ c #674EB9",
-"h@ c #7F3F5F",
-"i@ c #C03533",
-"j@ c #BD413F",
-"k@ c #AD3B3A",
-"l@ c #532446",
-"m@ c #3C2CB3",
-"n@ c #372EDD",
-"o@ c #3E37D2",
-"p@ c #463ECD",
-"q@ c #3832A0",
-"r@ c #24215D",
-"s@ c #423D98",
-"t@ c #4A3573",
-"u@ c #4E2020",
-"v@ c #542525",
-"w@ c #552423",
-"x@ c #571D1C",
-"y@ c #361113",
-"z@ c #7067E0",
-"A@ c #403B79",
-"B@ c #171546",
-"C@ c #402D43",
-"D@ c #2E288B",
-"E@ c #594FCD",
-"F@ c #4F46CD",
-"G@ c #56264C",
-"H@ c #5E1F1E",
-"I@ c #551818",
-"J@ c #541B1A",
-"K@ c #52201F",
-"L@ c #4E1C1B",
-"M@ c #311414",
-"N@ c #2D2894",
-"O@ c #2E28A8",
-"P@ c #352FA5",
-"Q@ c #1F1B55",
-"R@ c #1C1941",
-"S@ c #796EFA",
-"T@ c #3F389D",
-"U@ c #5C53DA",
-"V@ c #302A8C",
-"W@ c #15132B",
-"X@ c #524AE2",
-"Y@ c #1A164B",
-"Z@ c #302B87",
-"`@ c #423C96",
-" # c #322D85",
-".# c #342F7D",
-"+# c #4C46B7",
-"@# c #4039C0",
-"## c #020205",
-"$# c #4F47C2",
-"%# c #534CC7",
-"&# c #4941CC",
-"*# c #564ECF",
-"=# c #5049CD",
-"-# c #121035",
-";# c #3C3788",
-"># c #4740BB",
-",# c #4C45C1",
-"'# c #4640A6",
-")# c #151336",
-"!# c #080713",
-" ",
-" ",
-" . + @ ",
-" # $ % & * = - ; ",
-" > , ' ) ! ~ { ] ^ / ( _ : < [ } | 1 2 3 4 5 ",
-" 6 7 8 9 0 a b c & d e f g h i j k l m n o p q & ",
-" r s t u v w & x y z A & & & & & B C D E & ",
-" F G H I J K L M N O P ",
-" Q R S T U V W X Y Z ` ...+. at . #.$. ",
-" %.&. *.=.-.;.>. ,.'.).!.~.{.].^./. (. ",
-" _.:.<. [.}.|.1.2. 3.4.5.6.7.8.& ",
-" 9.0.a.b.c.d.e.f.g. h.i.j.k.l. ",
-" m.n.o.p.q.r.s.t.u.v. w.x.y.z.A. ",
-" B.C.D.E. F.G.H.I.J.K. L.M.N.O.P. ",
-" Q.R.& S.T. U.V.W. X.Y.Z.`. +.+ ",
-" ++ at +#+ $+%+ &+*+=+-+ ;+>+,+'+)+!+ ",
-" ~+{+& ]+^+ /+(+_+ :+<+[+}+|+1+2+ ",
-" 3+4+ 5+6+ 7+8+9+0+ a+b+c+d+e+f+g+ ",
-" h+i+ j+T k+l+m+n+o+p+q+r+s+t+u+ ",
-" v+w+x+ y+z+ A+B+C+D+E+F+G+ H+I+J+ K+L+& ",
-" M+N+O+P+ Q+R+ S+T+U+V+W+& X+Y+Z+ `+ @.@ ",
-" +@@@#@$@%@&@*@=@-@;@>@ ,@'@)@!@~@{@]@^@/@(@_@:@<@[@}@|@1@ ",
-" 2 at 3@4 at 5@6 at 7@8 at 9@0 at a@b@ c at d@e at f@g at h@i at j@k at l@m at n@o at p@q@& ",
-" r at s@t at u@v at w@x at y@z at A@B at C@D at E@F at G@H at I@J at K@L at M@N at O@P at Q@& ",
-" & & & & & R at S@T@& & & & & & & & & & & & & & & & ",
-" U at V@ ",
-" W at X@Y@ ",
-" Z@`@ #.#+#@### ",
-" $#%#&#*#=#-#& ",
-" ;#>#,#'#)#& ",
-" !#!#H & ",
-" "};
diff --git a/debian/patches/00wxmaxima.desktop.patch b/debian/patches/00wxmaxima.desktop.patch
deleted file mode 100644
index 397ada7..0000000
--- a/debian/patches/00wxmaxima.desktop.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nur wxMaxima-0.6.2/wxmaxima.desktop wxMaxima-0.6.2.new/wxmaxima.desktop
---- wxMaxima-0.6.2/wxmaxima.desktop 2005-09-05 14:58:56.000000000 -0400
-+++ wxMaxima-0.6.2.new/wxmaxima.desktop 2005-10-25 15:33:48.000000000 -0400
-@@ -2,8 +2,8 @@
- Name=wxMaxima
- Comment=wxWidgets interface for CAS maxima
- Exec=wxmaxima
--Icon=maxima-new.png
-+Icon=maximaicon.xpm
- Terminal=0
- Type=Application
- Encoding=UTF-8
--Categories=Application;Utility;X-Red-Hat-Base;X-Red-Hat-Base-Only;
-\ No newline at end of file
-+Categories=Application;Math;
diff --git a/debian/patches/201_fix_desktop_file.patch b/debian/patches/201_fix_desktop_file.patch
new file mode 100644
index 0000000..4e1d4f0
--- /dev/null
+++ b/debian/patches/201_fix_desktop_file.patch
@@ -0,0 +1,22 @@
+Author: Frank S. Thomas <fst at debian.org>
+Description: Make wxmaxima.desktop valid according to the latest
+ freedesktop.org Desktop Entry and Desktop Menu specifications. Also added the
+ full path of wxMaxima's icon so that desktops can find and display it.
+Bug: #466997
+Index: b/wxmaxima.desktop
+===================================================================
+--- a/wxmaxima.desktop
++++ b/wxmaxima.desktop
+@@ -2,8 +2,7 @@
+ Name=wxMaxima
+ Comment=Perform symbolic and numeric calculations using Maxima
+ Exec=wxmaxima
+-Icon=wxmaxima.png
+-Terminal=0
++Icon=/usr/share/wxMaxima/wxmaxima.png
++Terminal=false
+ Type=Application
+-Encoding=UTF-8
+-Categories=Application;Utility;X-Red-Hat-Base;X-Red-Hat-Base-Only;
+\ No newline at end of file
++Categories=Education;Science;Math;
diff --git a/debian/patches/config.patch b/debian/patches/config.patch
deleted file mode 100644
index 5a4fb88..0000000
--- a/debian/patches/config.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Nur wxmaxima-0.7.1/src/Config.cpp wxmaxima-0.7.1.new/src/Config.cpp
---- wxmaxima-0.7.1/src/Config.cpp 2007-02-26 12:54:03.000000000 +0000
-+++ wxmaxima-0.7.1.new/src/Config.cpp 2007-02-26 13:46:22.000000000 +0000
-@@ -242,7 +242,8 @@
- m_maximaProgram->SetValue(wxT("maxima.bat"));
- }
- #else
-- if (mp.Length())
-+ /* Fix for wxmaxima-0.7.0a, where the maxima parameter was always set to "1"*/
-+ if (mp.Length() && !mp.IsSameAs(wxT("1")))
- m_maximaProgram->SetValue(mp);
- else
- m_maximaProgram->SetValue(wxT("maxima"));
-diff -Nur wxmaxima-0.7.1/src/wxMaxima.cpp wxmaxima-0.7.1.new/src/wxMaxima.cpp
---- wxmaxima-0.7.1/src/wxMaxima.cpp 2007-02-26 13:45:48.000000000 +0000
-+++ wxmaxima-0.7.1.new/src/wxMaxima.cpp 2007-02-26 13:48:09.000000000 +0000
-@@ -1039,7 +1039,7 @@
- wxString command, parameters;
- bool have_config = config->Read(wxT("maxima"), &command);
-
-- if (!have_config)
-+ if (!have_config || (have_config && command.IsSameAs (wxT("1"))))
- {
- command = wxT("maxima");
- config->Write(wxT("maxima"), command);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a114ba3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+201_fix_desktop_file.patch
diff --git a/debian/rules b/debian/rules
index 5386105..a667ef0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,27 +1,8 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses cdbs. Originaly written by Robert Millan.
-# This file is public domain.
-DEB_TAR_SRCDIR := wxmaxima-0.7.1
-DEB_AUTO_CLEANUP_RCS := yes
+%:
+ dh $@ --with quilt
-#DEB_DH_INSTALL_SOURCEDIR := debian/wxmaxima
-DEB_DH_INSTALL_ARGS := -v
-# Add here any variable or target overrides you need
-
-DEB_CONFIGURE_EXTRA_FLAGS := --disable-dnd
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-
-
-binary-predeb/wxmaxima::
- rm -fr $(DEB_DESTDIR)/usr/share/wxMaxima/COPYING
- mkdir $(DEB_DESTDIR)/usr/share/wxMaxima/icons
- cp debian/maximaicon.xpm $(DEB_DESTDIR)/usr/share/wxMaxima/icons
-
-binary-install/wxmaxima::
- rm -rf $(DEB_DESTDIR)/usr/share/doc/wxmaxima/NEWS
- mv $(DEB_DESTDIR)/usr/share/wxMaxima/README $(DEB_DESTDIR)/usr/share/doc/wxmaxima/
- dh_desktop -pwxmaxima
+override_dh_auto_install:
+ dh_auto_install
+ rm debian/wxmaxima/usr/share/wxMaxima/COPYING
diff --git a/debian/wxmaxima.links b/debian/wxmaxima.links
new file mode 100644
index 0000000..b1534b0
--- /dev/null
+++ b/debian/wxmaxima.links
@@ -0,0 +1,2 @@
+usr/share/common-licenses/GPL-2 usr/share/wxMaxima/COPYING
+usr/share/wxMaxima/README usr/share/doc/wxmaxima/README
--
wxMaxima packaging
More information about the debian-science-commits
mailing list