diff -u kde-style-qtcurve-0.59.3/debian/rules kde-style-qtcurve-0.59.3/debian/rules --- kde-style-qtcurve-0.59.3/debian/rules +++ kde-style-qtcurve-0.59.3/debian/rules @@ -27,8 +27,18 @@ builddir/config.h: CMakeLists.txt config.h.cmake dh_testdir # Add here commands to configure the package. - mkdir -p builddir tmp - cd builddir && HOME=$(CURDIR)/tmp cmake .. + + patch -p3 < debian/patches/kubuntu_01_default_settings.diff + +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + mkdir -p builddir + cd builddir && cmake .. + touch config.status build: build-stamp @@ -46,7 +56,10 @@ # Add here commands to clean up after the build process. rm -f build-stamp - rm -rf builddir tmp + rm -rf builddir + rm -f config.sub config.guess + -patch -p3 -R < debian/patches/kubuntu_01_default_settings.diff + rm -f config.status dh_clean @@ -96,4 +109,8 @@ dh_builddeb +get-orig-source: + debian/scan-version get-orig-source + + binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff -u kde-style-qtcurve-0.59.3/debian/control kde-style-qtcurve-0.59.3/debian/control --- kde-style-qtcurve-0.59.3/debian/control +++ kde-style-qtcurve-0.59.3/debian/control @@ -1,7 +1,8 @@ Source: kde-style-qtcurve Section: kde Priority: optional -Maintainer: Bastian Venthur +Maintainer: Kubuntu Developers +XSBC-Original-Maintainer: Bastian Venthur Build-Depends: debhelper (>= 5), kdelibs4-dev, cmake Standards-Version: 3.8.0 diff -u kde-style-qtcurve-0.59.3/debian/changelog kde-style-qtcurve-0.59.3/debian/changelog --- kde-style-qtcurve-0.59.3/debian/changelog +++ kde-style-qtcurve-0.59.3/debian/changelog @@ -1,3 +1,10 @@ +kde-style-qtcurve (0.59.3-1.1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: (LP: #307635) + - kubuntu_01_default_settings.diff and rules to apply + + -- Bhavani Shankar Sat, 13 Dec 2008 11:56:46 +0530 + kde-style-qtcurve (0.59.3-1.1) unstable; urgency=low * Non-maintainer upload. @@ -7,6 +14,15 @@ -- Jurij Smakov Sun, 24 Aug 2008 08:54:58 +0100 +kde-style-qtcurve (0.59.3-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - kubuntu_01_default_settings.diff and rules to apply + * Dropped our version of build in !=srcdir since Debian does it. + * Closes LP: #233972 + + -- Ryan Kavanagh Thu, 17 Jul 2008 10:55:31 -0400 + kde-style-qtcurve (0.59.3-1) unstable; urgency=low * Acknowledge NMU, thanks Sune and Peter (Closes: #469494) @@ -23,6 +39,14 @@ -- Peter Eisentraut Mon, 16 Jun 2008 13:10:09 +0200 +kde-style-qtcurve (0.55.2-2ubuntu1) intrepid; urgency=low + + * Merge with Debian, remaining changes: + - Add kubuntu_01_default_settings.diff and rules to apply + - build in !=srcdir + + -- Jonathan Riddell Wed, 11 Jun 2008 14:14:15 +0000 + kde-style-qtcurve (0.55.2-2) unstable; urgency=low * Bumped standards version @@ -32,12 +56,62 @@ -- Bastian Venthur Wed, 26 Mar 2008 16:08:30 +0100 +kde-style-qtcurve (0.55.2-1ubuntu3) hardy; urgency=low + + * Set toolbar handles to sunken lines by default in + kubuntu_01_default_settings.diff + + -- Jonathan Riddell Mon, 31 Mar 2008 13:04:55 +0100 + +kde-style-qtcurve (0.55.2-1ubuntu2) hardy; urgency=low + + * Add kubuntu_01_default_settings.diff for nicer defaults. Flat + toolbars and don't darken menubars. + * Build in !=srcdir so it can clean properly + + -- Jonathan Riddell Mon, 17 Mar 2008 14:54:33 +0000 + +kde-style-qtcurve (0.55.2-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/scan-version: Script to scan and download new upstream releases + (uscan will not work with links from kde-look.org). + - debian/copyright: + - Replaced FSF address. + - Removed dh_make comments. + - debian/rules: + - Added get-orig-source rule. + - Use cmake to build. + - debian/dirs: + - Deleted, not needed (and creates empty /usr/bin). + + -- Stephan Hermann Mon, 21 Jan 2008 19:23:02 +0100 + kde-style-qtcurve (0.55.2-1) unstable; urgency=low * New upstream version (Closes: #449309) -- Bastian Venthur Sun, 20 Jan 2008 17:17:49 +0100 +kde-style-qtcurve (0.55.1-0ubuntu1) hardy; urgency=low + + * New upstream release. (LP: #179655) + * debian/scan-version: Script to scan and download new upstream releases + (uscan will not work with links from kde-look.org). + * debian/control: + - Build-depend on cmake. + - Updated Standards-Version. + * debian/copyright: + - Replaced FSF address. + - Removed dh_make comments. + * debian/rules: + - Added get-orig-source rule. + - Use cmake to build. + * debian/dirs: + - Deleted, not needed (and creates empty /usr/bin). + + -- Matvey Kozhev Tue, 01 Jan 2008 17:08:56 +0600 + kde-style-qtcurve (0.52.3-1) unstable; urgency=low * Don't lighten border of disabled check/radio buttons. only in patch2: unchanged: --- kde-style-qtcurve-0.59.3.orig/debian/patches/kubuntu_01_default_settings.diff +++ kde-style-qtcurve-0.59.3/debian/patches/kubuntu_01_default_settings.diff @@ -0,0 +1,22 @@ +diff -Nurp /tmp/old/common/config_file.c /tmp/new/common/config_file.c +--- /tmp/old/common/config_file.c 2008-07-04 18:59:38.000000000 -0400 ++++ /tmp/new/common/config_file.c 2008-07-17 10:44:56.000000000 -0400 +@@ -1164,15 +1164,15 @@ static void defaultSettings(Options *opt + opts->sliderAppearance=APPEARANCE_DULL_GLASS; + opts->menubarAppearance=APPEARANCE_GRADIENT; + opts->menuitemAppearance=APPEARANCE_DULL_GLASS; +- opts->toolbarAppearance=APPEARANCE_GRADIENT; ++ opts->toolbarAppearance=APPEARANCE_FLAT; + opts->progressAppearance=APPEARANCE_DULL_GLASS; + opts->progressGrooveAppearance=APPEARANCE_INVERTED; + opts->progressGrooveColor=ECOLOR_BASE; + opts->defBtnIndicator=IND_TINT; + opts->sliderThumbs=LINE_FLAT; +- opts->handles=LINE_DOTS; ++ opts->handles=LINE_SUNKEN; + opts->shadeSliders=SHADE_BLEND_SELECTED; +- opts->shadeMenubars=SHADE_DARKEN; ++ opts->shadeMenubars=SHADE_NONE; + opts->shadeCheckRadio=SHADE_NONE; + opts->toolbarBorders=TB_NONE; + opts->toolbarSeparators=LINE_NONE;