diff -u noteedit-2.8.0/debian/changelog noteedit-2.8.0/debian/changelog --- noteedit-2.8.0/debian/changelog +++ noteedit-2.8.0/debian/changelog @@ -1,3 +1,11 @@ +noteedit (2.8.0-1ubuntu1) dapper; urgency=low + + * Resynchronize with Debian. + * Drop 01gcc4.dpatch (integrated upstream) + * Drop 03kde_acinclude.dpatch (integrated upstream) + + -- Seth Kinast Fri, 9 Dec 2005 03:08:34 -0600 + noteedit (2.8.0-1) unstable; urgency=low * New upstream release (closes: #327587) @@ -34,6 +42,24 @@ -- Paul Brossier Thu, 16 Jun 2005 21:09:58 +0100 +noteedit (2.7.1-2ubuntu1) breezy; urgency=low + + * Rebuild to fix unmet dependencies + * Include patch to fix compilation with gcc4 in configure.in.in, + requires automake and autoconf + * Include acinclude.m4.in from kde svn to build with autoconf2.59 + * Include patch for noteedit/icons/Makefile.am to build + with acinclude.m4.in from kde svn + * Sponsored upload for Moritz Breit + + -- Jonathan Riddell Wed, 3 Aug 2005 13:34:55 +0200 + +noteedit (2.7.1-2build1) breezy; urgency=low + + * Rebuild for new C++ ABI + + -- Matthias Klose Tue, 7 Jun 2005 14:22:43 +0000 + noteedit (2.7.1-2) unstable; urgency=low * Orphan this package. diff -u noteedit-2.8.0/debian/rules noteedit-2.8.0/debian/rules --- noteedit-2.8.0/debian/rules +++ noteedit-2.8.0/debian/rules @@ -17,6 +17,9 @@ # This has to be exported to make some magic below work. export DH_OPTIONS +# Includes dpatch for the gcc4 fix +include /usr/share/dpatch/dpatch.make + # 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) @@ -34,8 +37,11 @@ CONFDEBUG := --with-debug endif -config.status: configure +config.status: patch configure dh_testdir + + make -f admin/Makefile.common cvs + CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr \ @@ -74,7 +80,7 @@ #$(MAKE) doc touch build-indep-stamp -clean: +clean: unpatch dh_testdir dh_testroot rm -f build-arch-stamp build-indep-stamp stamp-h diff -u noteedit-2.8.0/debian/control noteedit-2.8.0/debian/control --- noteedit-2.8.0/debian/control +++ noteedit-2.8.0/debian/control @@ -2,7 +2,7 @@ Section: sound Priority: optional Maintainer: Paul Brossier -Build-Depends: debhelper (>= 4.0.0), autoconf, libqt3-mt-dev (>=3.3.4-8), libqt3-compat-headers (>=3.3.4-8), kdelibs4-dev (>= 4:3.1.1), xlibs-dev (>= 4.0.0), libtse3-dev (>= 0.2.7-5), gettext, libasound2-dev, flex, bison +Build-Depends: debhelper (>= 4.0.0), libqt3-mt-dev (>=3.3.4-8), libqt3-compat-headers (>=3.3.4-8), kdelibs4-dev (>= 4:3.1.1), xlibs-dev (>= 4.0.0), libtse3-dev (>= 0.2.7-5), gettext, libasound2-dev, flex, bison, dpatch, libarts1-dev, zlib1g-dev (>= 1:1.1.3), kdemultimedia-dev, autoconf, automake1.9 Standards-Version: 3.6.2.0 Package: noteedit only in patch2: unchanged: --- noteedit-2.8.0.orig/debian/patches/00list +++ noteedit-2.8.0/debian/patches/00list @@ -0,0 +1 @@ +02new_kde_admin_fix.dpatch only in patch2: unchanged: --- noteedit-2.8.0.orig/debian/patches/02new_kde_admin_fix.dpatch +++ noteedit-2.8.0/debian/patches/02new_kde_admin_fix.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02new_kde_admin_fix.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad noteedit-2.8.0~/noteedit/icons/Makefile.am noteedit-2.8.0/noteedit/icons/Makefile.am +--- noteedit-2.8.0~/noteedit/icons/Makefile.am 2005-07-05 13:46:34.000000000 -0500 ++++ noteedit-2.8.0/noteedit/icons/Makefile.am 2005-12-09 02:49:05.000000000 -0600 +@@ -1,5 +1,5 @@ + # Add all of your pixmaps here +-data_ICON = 128thnote 32ndnote 64thnote arpegg beamednote breve chordnames cleficon cross dottednote doublebar doublecross doubledottednote doubleflat editicon eightnote endbar fermatenote flat fullnote halfnote hiddenrest kbicon keyicon midikeyboard natur noteedit pedofficon pedonicon perccross perccross2 perccrosscirc percrect perctrian portatonote quarternote recordicon redkbicon repclose repntimes repopen repopenclose rivet selector sforzandonote sforzatonote singlekey sixteenthnote slurednote speaker staccatonote stemdownicon stemupicon strpizzicatonote tiednote timeicon tinyeight tinysixteenth tinystroke tripletnotes voichange ++noteeditdata_ICON = 128thnote 32ndnote 64thnote arpegg beamednote breve chordnames cleficon cross dottednote doublebar doublecross doubledottednote doubleflat editicon eightnote endbar fermatenote flat fullnote halfnote hiddenrest kbicon keyicon midikeyboard natur noteedit pedofficon pedonicon perccross perccross2 perccrosscirc percrect perctrian portatonote quarternote recordicon redkbicon repclose repntimes repopen repopenclose rivet selector sforzandonote sforzatonote singlekey sixteenthnote slurednote speaker staccatonote stemdownicon stemupicon strpizzicatonote tiednote timeicon tinyeight tinysixteenth tinystroke tripletnotes voichange + + # This is where it will all be installed +-datadir = ${prefix}/share/apps/noteedit/icons ++noteeditdatadir = ${prefix}/share/apps/noteedit/icons