diff -u knemo-0.5.2/debian/control knemo-0.5.2/debian/control --- knemo-0.5.2/debian/control +++ knemo-0.5.2/debian/control @@ -1,14 +1,12 @@ Source: knemo Section: kde Priority: optional -Maintainer: Debian KDE Extras Team -Uploaders: Achim Bohnet , Mark Purcell -Build-Depends: debhelper (>> 7), autotools-dev, cdbs, pkg-kde-tools, kdelibs5-dev, net-tools, wireless-tools, libiw-dev -Standards-Version: 3.8.1 +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian KDE Extras Team +Build-Depends: debhelper (>= 7), cdbs, pkg-kde-tools, kdelibs5-dev, net-tools, + wireless-tools, libiw-dev, kdebase-workspace-dev Homepage: http://extragear.kde.org/apps/knemo/ -Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/knemo/trunk/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/knemo/?op=log - +Standards-Version: 3.8.1 Package: knemo Architecture: any reverted: --- knemo-0.5.2/debian/README.Debian +++ knemo-0.5.2.orig/debian/README.Debian @@ -1,107 +0,0 @@ -Debian kde-extras Team ----------------------- - -1. Contacts ------------ - -General help requests - mailing list - #debian-kde on irc - -Packaging queries - mailing list - #debian-qt-kde on irc - -Maintainers - mailing list - - -2. Subversion repository ------------------------- - -You can browse it only at: - -http://svn.debian.org/wsvn/pkg-kde/kde-extras/ - -To "checkout" the repository use these commands: - - $ svn co svn+ssh://${ALIOTH_USERNAME}@svn.debian.org/svn/pkg-kde/kde-extras - -Authorized SSH keys are controlled at https://alioth.debian.org/account/ - -The repository layout is: - -- packagename/ -    - trunk/ -    - branches/ -    - tags/ -        - 0.7.2-1/ -        - 0.7.2-2/ -        - 0.7.2-2ubuntu1/ -        - 0.7.2-2ubuntu2/ -        - 0.7.2-2ubuntu3/ -        - 0.8.0/ -        ... - -If only one version of the package is available at the time, development must -be made at trunk/ dir, copying the dir to tags/'pkg-version' each time a new -release is made. - -When, at some point, the need to have two different versions at the same time -arises (for example, if we need a version to be in unstable and a different one -to be in experimental), experimental development will be made in trunk/ and -if a new unstable package needs to be cooked, copying -tag/'latest_version_in_sid' to tag/'latest_version_in_sid'+1 will make the -trick. - -3. Using svn-buildpackage --------------------------- - -Packages with an upstream tarball will require you to set the mergeWithUpstream -property first (from the package root) so that svn-buildpackage will look for -the .orig.tar.gz in the ../tarballs directory. - - % svn propset mergeWithUpstream 1 debian - -Please note that this only works for packages which have only the debian/ -directory committed. Consequently, you must use CDBS's simple-patchsys.mk or -dpatch to modify the upstream sources. - -After you have finished and committed your Debian patches via - - % svn commit [PACKAGE] - -as well as copying the orig.tar.gz to ../tarballs/ if necessary, you may build -your package with the following commands: - - % svn-buildpackage --svn-ignore-new -rfakeroot - -Please, don't commit tarballs/ or build-area/ directories to SVN. - -4. Tarballs and Build-area directories ------------------------------------- - -During pkg development before uploaded to debian the tarballs can be found at: - - http://pkg-kde.alioth.debian.org/kde-extra/orig.tar.gz/ - -You need to place those dirs in the parent directory of the one from which you're -running svn-buildpackage. Usually this means placing tarballs/ and build-area/ dirs -in 'pkgname'/ dir, at the same level as trunk/ - -If you want to compile inside one version in tags/ dir, you'll need to place those -dirs inside that dir. Of course the easiest and cleanest way of doing it is -by making a symlink of those dirs inside tags/ dir. - -5. Using svn-inject -------------------- - -To inject a new package into the Debian KDE Extras svn archive you should use svn-inject(1) -as follows: - - svn-inject -o .dsc svn+ssh://${ALIOTH_USERNAME}@svn.debian.org/svn/pkg-kde/kde-extras - -Type in your alioth password a few hundred times :-) and your package should be -uploaded to the archive. Note you will also need to manually copy the -package.orig.tar.gz to your tarballs directory. The -o option is important as -this ensures that we 'Only keep modified files under SVN control' reverted: --- knemo-0.5.2/debian/dirs +++ knemo-0.5.2.orig/debian/dirs @@ -1 +0,0 @@ -usr/share/applications/kde diff -u knemo-0.5.2/debian/changelog knemo-0.5.2/debian/changelog --- knemo-0.5.2/debian/changelog +++ knemo-0.5.2/debian/changelog @@ -1,3 +1,22 @@ +knemo (0.5.2-1ubuntu1) karmic; urgency=low + + * Merge with debian (LP: #373361) + * Debian changes: + - add pkg-kde-tools, wireless-tools to build-deps + - bump Standards-Version to 3.8.1 + - improve long description + - add systemsettings and ${misc:Depends} to depends + - remove systemsettings to recommends + - update copyright + * Ubuntu differences: + - add kdebase-workspace-dev to build-deps + - autotools-dev is no need to build-deps + - transition from kde4.mk to pkg-kde-tools + - debian/rules: Change '/usr/share/cdbs/1/class/kde4.mk' to + '/usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk' + + -- Alessandro Ghersi Sat, 09 May 2009 17:29:25 +0200 + knemo (0.5.2-1) unstable; urgency=low * New upstream release @@ -15,6 +34,20 @@ -- Mark Purcell Wed, 18 Mar 2009 22:32:35 +1100 +knemo (0.5.0-0ubuntu2) jaunty; urgency=low + + * Added net-tools build-dep: + - Fixed FTBFS with launchpad build-system + + -- Anthony Mercatante Mon, 09 Mar 2009 23:37:57 +0100 + +knemo (0.5.0-0ubuntu1) jaunty; urgency=low + + * New upstream release + * Packaging ported to KDE4 + + -- Anthony Mercatante Tue, 24 Feb 2009 13:22:11 +0100 + knemo (0.4.8-1) unstable; urgency=low * New upstream release diff -u knemo-0.5.2/debian/rules knemo-0.5.2/debian/rules --- knemo-0.5.2/debian/rules +++ knemo-0.5.2/debian/rules @@ -3,4 +3 @@ -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk - -DEB_INSTALL_DOCS_knemo = -XNEWS +include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk