tags 385239 + patch
thanks

Attached is a diff with the debian changes related to the packaging of 
the new upstream version.  The source package is at 
http://ftp.logos-bg.net/debian-addons-bg/dists/sid/rssreader.app/

Things that are worrying me:

  * The rsskit.framwork metapackage seems like an overkill.  It's not 
    that hordes of developers are pushing to use this library, but I 
    made it so to be consistent with the other GNUstep 
    libraries/frameworks.  And RSSKit is not a typical GNUstep 
    framework...

  * The license blurb at RSSKit/GNUmakefile mentions LGPL and the 
    copyright holder is FSF.  It also says that this is part of the 
    GSCrypt library.  I think that upstream just made a mistake by 
    copying this blurb carelessly.  Gürkan, as the official maintainer, 
    could you write to upstream to confirm this?  We could include the 
    relevant part of his reply in debian/copyright, until it is resolved 
    with the next release.  Or I can write to him, if you agree.

  * The rssreader.app package installs fine on Debian testing, but the 
    /usr/bin/Grr symlink is broken since it points to a location that 
    does not exist.  I don't think we have to fix this by depending on 
    the new gnustep-make, since it was just uploaded and will hopefully 
    migrate to testing soon, in any event before rssreader.app.

  * Ideally, I'd include a get-orig-source target in debian/rules, but 
    since I hope that the RSSKit documentation issue will be resolved 
    Real Soon Now, I didn't make this change.

The new GNUstep packages are in NEW and will be ACCEPTed soon, I think.  
So I'll wait a week for you to ack/accept these changes, or revert with 
comments, and then I'll ask for a sponsor on -mentors.
--- rssreader.app-0.2.2/debian/changelog        2006-09-08 20:47:45.000000000 
+0300
+++ rssreader.app-0.6.2.dfsg/debian/changelog   2006-09-08 20:17:39.000000000 
+0300
@@ -1,3 +1,47 @@
+rssreader.app (0.6.2.dfsg-1) unstable; urgency=low
+
+  * New upstream release.
+    + Doesn't segfault on startup anymore (Closes: #385239).
+    + Fixes various hangups when adding a feed (Closes: #310979).
+  * Urgency set to low instead of medium since it is a new upstream
+    release with a lot of changes.
+  * Acknowledge NMU, thanks Luk Claes (Closes: #352392, #356538).
+  * Repackage the upstream tarball, removing the RSSKit documentation; it
+    currently has no license.  The app was renamed to Grr (Günther's RSS
+    Reader), but the Debian source/binary packages remain the same.
+  * Split the package and build three more binary packages --
+    rsskit.framework, librrskit0 and librsskit0-dev.
+  * Add debian/rsskit.framework.README explaining the reason for the
+    repackaging.
+  * Build-depend on libgnustep-gui-dev, instead of libgnustep-gui0.10-dev.
+  * Upgrade to debhelper v5, adjust the build-dependancy accordingly and bump
+    debian/compat.
+  * Pass "-LRSSKit/shared_obj" to the linker in order to find the shared
+    libs, thanks to Damyan Ivanov for the hint.
+  * Append "messages=yes" to $(MAKE) in order to track curious build
+    failures on the autobuilders.
+  * Rework the long description to fix a lintian warning, also mention
+    the new name and fixed the Homepage.
+  * Escape Gürkan's and upstream author's names in the manpage to fix a
+    lintian warning; rename it to Grr.1 and substitute the name accordingly.
+  * Remove debian/dirs and debian/docs, split the latter into
+    $binary_package.docs.
+  * Include /usr/share/GNUstep/debian/config.mk in debian/rules.
+  * Move Resources to /usr/share/GNUstep/Grr.app and make a compatibility
+    symlink.
+  * Replace the symlynk to /usr/bin/gnustep-app-wrapper with
+    $(GS_SYSTEM_ROOT)/Makefiles/gnustep-app-wrapper, the former will
+    be removed after the release of Etch.
+  * Add icon to debian/menu and a hint as well.  Build-depend on
+    imagemagick for the conversion to .xpm format.
+  * [debian/copyright]: Clarify that the license is GPLv2 only,
+    unfortunately, and change the link to point to it.  Add the standard
+    blurb as well.
+  * Add myself to Uploaders: as agreed with the maintainer.
+  * Bump Standards-Version to 3.7.2, no changes needed.
+
+ -- Yavor Doganov <[EMAIL PROTECTED]>  Fri,  8 Sep 2006 20:17:14 +0300
+
 rssreader.app (0.2.2-1.1) unstable; urgency=high
 
   * Non-maintainer upload.
--- rssreader.app-0.2.2/debian/control  2006-09-08 20:47:45.000000000 +0300
+++ rssreader.app-0.6.2.dfsg/debian/control     2006-09-07 01:31:53.000000000 
+0300
@@ -2,13 +2,50 @@
 Section: net
 Priority: optional
 Maintainer: Gürkan Sengün <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), libgnustep-gui0.10-dev, gnustep-make (>= 
1.11.1-1)
-Standards-Version: 3.6.1
+Uploaders: Yavor Doganov <[EMAIL PROTECTED]>
+Build-Depends: debhelper (>= 5.0.0), libgnustep-gui-dev, gnustep-make (>= 
1.11.1-1), imagemagick
+Standards-Version: 3.7.2
 
 Package: rssreader.app
+Section: net
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: RSS reader for GNUstep
- This is a simple RSS reader for GNUstep.
+ RSS Reader is a simple application for GNUstep for reading RSS feeds.
+ It is also known as Grr (Günther's RSS Reader)
+ .
+  Homepage: http://www.unix-ag.uni-kl.de/~guenther/rssreader.html
+
+Package: rsskit.framework
+Section: libs
+Architecture: all
+Depends: librsskit0, librsskit0-dev
+Description: GNUstep framework for parsing and manipulating RSS feeds
+ RSSKit is a framework for GNUstep applications for reading different
+ types of RSS file formats.
+ .
+ This is a metapackage that depends on the runtime library and
+ development package.
+
+Package: librsskit0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: GNUstep framework for parsing and manipulating RSS feeds (library 
files)
+ RSSKit is a framework for GNUstep applications for reading different
+ types of RSS file formats.
+ .
+ This package contains the runtime library files.
+
+Package: librsskit0-dev
+Section: libdevel
+Architecture: any
+Depends: librsskit0 (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
+Provides: librsskit-dev
+Conflicts: librsskit-dev
+Description: GNUstep framework for parsing and manipulating RSS feeds 
(development files)
+ RSSKit is a framework for GNUstep applications for reading different
+ types of RSS file formats.
  .
- Homepage: http://www.unix-ag.uni-kl.de/~guenther/rssreader.html
+ This package contains the files required to develop applications that
+ use RSSKit.
--- rssreader.app-0.2.2/debian/copyright        2006-09-08 20:47:45.000000000 
+0300
+++ rssreader.app-0.6.2.dfsg/debian/copyright   2006-09-07 01:59:50.000000000 
+0300
@@ -3,9 +3,22 @@
 
 It was downloaded from http://www.unix-ag.uni-kl.de/~guenther/rssreader.html
 
-Upstream Author: Günther Noack <[EMAIL PROTECTED]>
+Copyright Holder: Günther Noack <[EMAIL PROTECTED]>
 
-Copyright (C) 2004 Günther Noack
+License:
 
-Released under the GNU GPL.
-Please see /usr/share/common-licenses/GPL for the full license.
+   This package is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License version
+   2 as published by the Free Software Foundation.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
--- rssreader.app-0.2.2/debian/dirs     2006-09-08 20:47:45.000000000 +0300
+++ rssreader.app-0.6.2.dfsg/debian/dirs        1970-01-01 02:00:00.000000000 
+0200
@@ -1,3 +0,0 @@
-usr/bin
-usr/lib/GNUstep/System
-usr/share/lintian/overrides
--- rssreader.app-0.2.2/debian/docs     2006-09-08 20:47:45.000000000 +0300
+++ rssreader.app-0.6.2.dfsg/debian/docs        1970-01-01 02:00:00.000000000 
+0200
@@ -1 +0,0 @@
-README
--- rssreader.app-0.2.2/debian/Grr.1    1970-01-01 02:00:00.000000000 +0200
+++ rssreader.app-0.6.2.dfsg/debian/Grr.1       2006-09-07 01:17:03.000000000 
+0300
@@ -0,0 +1,22 @@
+.TH GRR 1 "December  6, 2004"
+.SH NAME
+Grr \- an RSS reader for GNUstep
+.SH SYNOPSIS
+.B Grr
+.SH DESCRIPTION
+This manual page documents briefly the
+.B Grr
+command.
+This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP
+\fBGrr\fP is a program that you can manage RSS feeds with.  It
+is also known as \fBRSS Reader\fP or G\[:u]nther's RSS Reader.
+.SH SEE ALSO
+.BR GNUstep (7).
+.br
+.SH AUTHOR
+Grr was written by G\[:u]nther Noack <[EMAIL PROTECTED]>.
+.PP
+This manual page was written by G\[:u]rkan Seng\[:u]n <[EMAIL PROTECTED]>,
+for the Debian project (but may be used by others).
--- rssreader.app-0.2.2/debian/librsskit0-dev.docs      1970-01-01 
02:00:00.000000000 +0200
+++ rssreader.app-0.6.2.dfsg/debian/librsskit0-dev.docs 2006-09-07 
00:04:55.000000000 +0300
@@ -0,0 +1,2 @@
+RSSKit/INTRO
+RSSKit/TODO
--- rssreader.app-0.2.2/debian/librsskit0-dev.install   1970-01-01 
02:00:00.000000000 +0200
+++ rssreader.app-0.6.2.dfsg/debian/librsskit0-dev.install      2006-09-06 
22:55:31.000000000 +0300
@@ -0,0 +1,2 @@
+usr/lib/GNUstep/System/Library/Libraries/*.so
+usr/lib/GNUstep/System/Library/Headers/*
--- rssreader.app-0.2.2/debian/librsskit0.install       1970-01-01 
02:00:00.000000000 +0200
+++ rssreader.app-0.6.2.dfsg/debian/librsskit0.install  2006-09-06 
21:37:51.000000000 +0300
@@ -0,0 +1,2 @@
+usr/lib/GNUstep/System/Library/Libraries/*.so.*
+
--- rssreader.app-0.2.2/debian/manpages 2006-09-08 20:47:45.000000000 +0300
+++ rssreader.app-0.6.2.dfsg/debian/manpages    2006-09-07 01:58:04.000000000 
+0300
@@ -1 +1 @@
-debian/RSSReader.1
+debian/Grr.1
--- rssreader.app-0.2.2/debian/menu     2006-09-08 20:47:45.000000000 +0300
+++ rssreader.app-0.6.2.dfsg/debian/menu        2006-09-07 01:29:31.000000000 
+0300
@@ -1,2 +1,4 @@
-?package(rssreader.app):needs="X11" section="Apps/Net"\
-  title="RSS Reader" command="/usr/bin/RSSReader"
+?package(rssreader.app):needs="X11" section="Apps/Net" \
+  title="Grr" command="/usr/bin/Grr" \
+  icon="/usr/share/pixmaps/Grr.xpm" \
+  longtitle="RSS reader for GNUstep"
--- rssreader.app-0.2.2/debian/rsskit.framework.README.Debian   1970-01-01 
02:00:00.000000000 +0200
+++ rssreader.app-0.6.2.dfsg/debian/rsskit.framework.README.Debian      
2006-09-08 19:49:48.000000000 +0300
@@ -0,0 +1,6 @@
+The upstream tarball was repackaged, excluding the directory
+RSSKit/Documentation as it currently has no license.  This is probably
+a temporary move, since hopefully upstream will resolve the issue with
+the next release.
+
+-- Yavor Doganov <[EMAIL PROTECTED]>
--- rssreader.app-0.2.2/debian/RSSReader.1      2006-09-08 20:47:45.000000000 
+0300
+++ rssreader.app-0.6.2.dfsg/debian/RSSReader.1 1970-01-01 02:00:00.000000000 
+0200
@@ -1,19 +0,0 @@
-.TH RSSREADER 1 "December  6, 2004"
-.SH NAME
-RSSReader \- an RSS reader for GNUstep
-.SH SYNOPSIS
-.B RSSReader
-.SH DESCRIPTION
-This manual page documents briefly the
-.B RSSReader
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-\fBRSSReader\fP is a program that you can manage RSS feeds with.
-.SH SEE ALSO
-.BR GNUstep (7).
-.br
-.SH AUTHOR
-This manual page was written by G�rkan Seng�n <[EMAIL PROTECTED]>,
-for the Debian project (but may be used by others).
--- rssreader.app-0.2.2/debian/rssreader.app.docs       1970-01-01 
02:00:00.000000000 +0200
+++ rssreader.app-0.6.2.dfsg/debian/rssreader.app.docs  2006-09-07 
00:05:42.000000000 +0300
@@ -0,0 +1,2 @@
+README
+TODO
--- rssreader.app-0.2.2/debian/rssreader.app.install    1970-01-01 
02:00:00.000000000 +0200
+++ rssreader.app-0.6.2.dfsg/debian/rssreader.app.install       2006-09-06 
17:25:33.000000000 +0300
@@ -0,0 +1 @@
+usr/lib/GNUstep/System/Applications/*
--- rssreader.app-0.2.2/debian/rules    2006-09-08 20:47:45.000000000 +0300
+++ rssreader.app-0.6.2.dfsg/debian/rules       2006-09-08 20:16:43.000000000 
+0300
@@ -6,6 +6,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/GNUstep/debian/config.mk
+
+DESTDIR=$(CURDIR)/debian/tmpdir
+PNGICON = Resources/rssreader.png
+XPMICON = $(PNGICON:.png=.xpm)
 
 CFLAGS = -Wall -g
 
@@ -26,7 +31,8 @@
 build-stamp: configure-stamp 
        dh_testdir
        . /usr/lib/GNUstep/System/Library/Makefiles/GNUstep.sh ; \
-       $(MAKE)
+       $(MAKE) LDFLAGS="-LRSSKit/shared_obj" messages=yes
+       convert $(PNGICON) -resize 32x32 xpm:$(XPMICON)
        touch build-stamp
 
 clean:
@@ -35,6 +41,8 @@
        rm -f build-stamp configure-stamp
        . /usr/lib/GNUstep/System/Library/Makefiles/GNUstep.sh ; \
        $(MAKE) distclean clean
+       rm -rf $(DESTDIR)
+       rm -f $(XPMICON)
        dh_clean 
 
 install: build
@@ -43,33 +51,57 @@
        dh_clean -k 
        dh_installdirs
        . /usr/lib/GNUstep/System/Library/Makefiles/GNUstep.sh ; \
-       $(MAKE) install 
GNUSTEP_INSTALLATION_DIR=`pwd`/debian/rssreader.app/usr/lib/GNUstep/System
-
+       $(MAKE) install GNUSTEP_INSTALLATION_DIR=$(DESTDIR)$(GS_SYSTEM_ROOT)
 
 # Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
+       dh_testdir -i
+       dh_testroot -i
+       dh_installchangelogs -i RSSKit/ChangeLog
+       dh_installdocs -i
+       dh_link -i
+       dh_strip -i
+       dh_compress -i
+       dh_fixperms -i
+       dh_gencontrol -i
+       dh_md5sums -i
+       dh_builddeb -i
 
 # Build architecture-dependent files here.
 binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs 
-       install -m 644 debian/lintian-override 
$(CURDIR)/debian/rssreader.app/usr/share/lintian/overrides/rssreader.app
-       dh_installdocs
-       gsdh_gnustep
-       dh_installexamples
+       dh_testdir -a
+       dh_testroot -a
+       dh_installchangelogs -a 
+       dh_installchangelogs -prssreader.app ChangeLog 
+       dh_installchangelogs -plibrsskit0-dev RSSKit/ChangeLog
+       dh_installdocs -a
+       dh_installexamples -a
+       dh_install -a --sourcedir=$(DESTDIR)
+       dh_installdirs -prssreader.app usr/share/pixmaps
+       install -m 644 $(XPMICON) 
$(CURDIR)/debian/rssreader.app/usr/share/pixmaps/Grr.xpm
        dh_installmenu
-       dh_installman
-       dh_link -prssreader.app usr/bin/gnustep-app-wrapper usr/bin/RSSReader
-       dh_strip
-       dh_compress
-       dh_fixperms
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
+       dh_installman 
+       gsdh_gnustep -a
+       dh_installdirs -prssreader.app usr/share/lintian/overrides
+       install -m 644 debian/lintian-override 
$(CURDIR)/debian/rssreader.app/usr/share/lintian/overrides/rssreader.app
+       dh_link -prssreader.app $(GS_SYSTEM_ROOT)/Makefiles/gnustep-app-wrapper 
usr/bin/Grr
+
+ifndef DEB_GNUSTEP_NO_MOVE
+       dh_installdirs -prssreader.app usr/share/GNUstep
+       mv debian/rssreader.app$(GS_SYSTEM_ROOT)/Applications/Grr.app/Resources 
debian/rssreader.app/usr/share/GNUstep/Grr.app
+       rm -rf 
debian/rssreader.app$(GS_SYSTEM_ROOT)/Applications/Grr.app/Resources
+       dh_link -prssreader.app usr/share/GNUstep/Grr.app 
usr/lib/GNUstep/System/Applications/Grr.app/Resources
+endif
+
+       dh_strip -a 
+       dh_compress -a 
+       dh_fixperms -a
+       dh_makeshlibs -a -V
+       dh_installdeb -a
+       dh_shlibdeps -a -l$(DESTDIR)/usr/lib/GNUstep/System/Library/Libraries
+       dh_gencontrol -a
+       dh_md5sums -a 
+       dh_builddeb -a
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure

Reply via email to