diff -u ipe-6.0pre28/debian/changelog ipe-6.0pre28/debian/changelog --- ipe-6.0pre28/debian/changelog +++ ipe-6.0pre28/debian/changelog @@ -1,3 +1,20 @@ +ipe (6.0pre28-4ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: (LP: #161191) + + debian/ipe.{desktop,png.uu}: (LP: #60878) + - added files to provides an icon and desktop file + + debian/control: (LP: #137255) + - Updated to match Ubuntu Maintainer Policy + - Added Build-Dep for sharutils + + debian/rules: + - Added lines to install desktop and png file. + * debian/ipe.desktop: + - removed "Encoding" line + * src/ipelib/ipestdstyles.cpp: (LP: #162213) + - added all colors to default stylesheet from colors.xml provided in doc. + + -- Stephan Hermann Sat, 10 Nov 2007 14:31:25 +0100 + ipe (6.0pre28-4) unstable; urgency=low * debian/control: Update depends and conflicts to new freetype (version @@ -15,6 +32,21 @@ -- Steve M. Robbins Tue, 10 Jul 2007 23:23:09 -0500 +ipe (6.0pre28-3ubuntu1) gutsy; urgency=low + + * debian/ipe.{desktop,png.uu}: (LP: #60878) + - added files to provides an icon and desktop file + * debian/control: (LP: #137255) + - Updated to match Ubuntu Maintainer Policy + - Removed Build-Deps-Conflicts against libfreetype6-dev >= 2.2.2 + - Removed Conflicts line against libfreetype6-dev >= 2.2.2 in package + libipe1c2a + - Added Build-Dep for sharutils + * debian/rules: + - Added lines to install desktop and png file. + + -- Stephan Hermann Tue, 04 Sep 2007 14:24:17 +0200 + ipe (6.0pre28-3) unstable; urgency=low * Apply patch http://tclab.kaist.ac.kr/ipe/pdftex1.40patches.zip diff -u ipe-6.0pre28/debian/control ipe-6.0pre28/debian/control --- ipe-6.0pre28/debian/control +++ ipe-6.0pre28/debian/control @@ -1,8 +1,9 @@ Source: ipe Section: graphics Priority: optional -Maintainer: Steve M. Robbins -Build-Depends: debhelper (>= 5), libqt4-dev, qt4-dev-tools, libfreetype6-dev (>= 2.3.5), zlib1g-dev +XSBC-Original-Maintainer: Steve M. Robbins +Maintainer: Ubuntu MOTU Developers +Build-Depends: debhelper (>= 5), libqt4-dev, qt4-dev-tools, libfreetype6-dev (>= 2.3.5), zlib1g-dev, sharutils Build-Conflicts: libipe1-dev, libfreetype6-dev (>= 2.3.6) Standards-Version: 3.6.1.0 diff -u ipe-6.0pre28/debian/rules ipe-6.0pre28/debian/rules --- ipe-6.0pre28/debian/rules +++ ipe-6.0pre28/debian/rules @@ -68,6 +68,10 @@ dh_installdirs $(MAKE) -C src install INSTALL_ROOT=`pwd`/debian/tmp + mkdir -p debian/ipe/usr/share/pixmaps/ + uudecode -o debian/ipe/usr/share/pixmaps/ipe.png debian/ipe.png.uu + mkdir -p debian/ipe/usr/share/applications + cp -v debian/ipe.desktop debian/ipe/usr/share/applications/ # Package: ipe dh_install -pipe debian/tmp/usr/bin only in patch2: unchanged: --- ipe-6.0pre28.orig/src/ipelib/ipestdstyles.cpp +++ ipe-6.0pre28/src/ipelib/ipestdstyles.cpp @@ -34,17 +34,663 @@ const char *StyleStandard[] = { "", - "", + "", "", "", "", - "", - "", - "", - "", - "", - "", - "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", "", "", "", only in patch2: unchanged: --- ipe-6.0pre28.orig/debian/ipe.png.uu +++ ipe-6.0pre28/debian/ipe.png.uu @@ -0,0 +1,11 @@ +begin 644 ipe.png +MB5!.1PT*&@H````-24A$4@```"`````@"`8```!S>GKT````!&=!34$``+&/ +M"_QA!0````9B2T=$`/\`_P#_H+VGDP````EP2%ES```+$P``"Q,!`)J<&``` +M``=T24U%!]<)!`L`(':FO#@```"G241!5%C#[59!#H`@#%N)__]RO9B(9L8P +M.C"&'D&VV;4#LX7)0/`<5?$@3!Z*66+)V5B3C@&J8VXF$`$Z1%AFNZ"(6X:A +M&J`?(,T%%'_75"VS'(9(_&40]TY8R +M!AR5#VT!,N9`\UWPQH+C`*2\B#Q'5,EAF>(BC7