tags 406955 + patch
tags 424544 + patch
tags 437475 + patch
thanks
Hi,
Attached is the diff for my linpopup 1.2.0-8.3 NMU.
diff -u linpopup-1.2.0/debian/dirs linpopup-1.2.0/debian/dirs
--- linpopup-1.2.0/debian/dirs
+++ linpopup-1.2.0/debian/dirs
@@ -4,3 +4,2 @@
usr/share/pixmaps
-usr/lib/menu
var/lib/linpopup
diff -u linpopup-1.2.0/debian/menu linpopup-1.2.0/debian/menu
--- linpopup-1.2.0/debian/menu
+++ linpopup-1.2.0/debian/menu
@@ -1,4 +1,4 @@
-?package(linpopup):needs="X11" section="Apps/Net"\
+?package(linpopup):needs="X11" section="Applications/Network/Communication"\
icon="/usr/share/pixmaps/linpopup-small.xpm"\
title="LinPopUp"\
longtitle="Messaging with Samba"\
diff -u linpopup-1.2.0/debian/prerm linpopup-1.2.0/debian/prerm
--- linpopup-1.2.0/debian/prerm
+++ linpopup-1.2.0/debian/prerm
@@ -2,6 +2,8 @@
set -e
+#DEBHELPER#
+
SMBCONF=/etc/smb.conf
if [ -e /etc/samba/smb.conf ]; then
SMBCONF=/etc/samba/smb.conf
diff -u linpopup-1.2.0/debian/postinst linpopup-1.2.0/debian/postinst
--- linpopup-1.2.0/debian/postinst
+++ linpopup-1.2.0/debian/postinst
@@ -3,6 +3,8 @@
set -e
+#DEBHELPER#
+
SMBCONF=/etc/smb.conf
if [ -e /etc/samba/smb.conf ]; then
SMBCONF=/etc/samba/smb.conf
diff -u linpopup-1.2.0/debian/postrm linpopup-1.2.0/debian/postrm
--- linpopup-1.2.0/debian/postrm
+++ linpopup-1.2.0/debian/postrm
@@ -3,6 +3,8 @@
set -e
+#DEBHELPER#
+
case "$1" in
remove)
;;
diff -u linpopup-1.2.0/debian/copyright linpopup-1.2.0/debian/copyright
--- linpopup-1.2.0/debian/copyright
+++ linpopup-1.2.0/debian/copyright
@@ -4,19 +4,19 @@
It was downloaded from http://www.chez.com/littleigloo/downloads.html
(now known as http://www.littleigloo.org/ )
-LinPopUp's author is Jean-Marc Jacquet <[EMAIL PROTECTED]> .
+Upstream Author:
-See THANKS for other contributors.
+ Jean-Marc Jacquet <[EMAIL PROTECTED]>
-Copyright statement from original package's README:
+Copyright:
-----------------------------------------------------------------------
-License
-=======
-This software is freely distributable under the GNU public license, a
-copy of which you should have received with this software (in a file
-called COPYING).
-----------------------------------------------------------------------
+ Copyright (c) 1998-2000 Jean-Marc Jacquet <[EMAIL PROTECTED]>
+
+License:
+
+ This software is freely distributable under the GNU public license, a
+ copy of which you should have received with this software (in a file
+ called COPYING).
The file COPYING mentioned above is available on Debian systems as
/usr/share/common-licenses/GPL .
diff -u linpopup-1.2.0/debian/preinst linpopup-1.2.0/debian/preinst
--- linpopup-1.2.0/debian/preinst
+++ linpopup-1.2.0/debian/preinst
@@ -3,6 +3,7 @@
set -e
+#DEBHELPER#
yesno() {
retval=$1
diff -u linpopup-1.2.0/debian/changelog linpopup-1.2.0/debian/changelog
--- linpopup-1.2.0/debian/changelog
+++ linpopup-1.2.0/debian/changelog
@@ -1,3 +1,33 @@
+linpopup (1.2.0-8.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/rules
+ - fixed FTBFS if built twice in a row (Closes: #424544)
+ - added dh_desktop call
+ - added dpatch stuff
+ * debian/linpopup.desktop
+ - added (Closes: #406955)
+ * debian/control
+ - bump Standards-Version to 3.7.3
+ - fixed spelling of Linux in long description
+ - added Homepage field
+ - added dpatch build-dep
+ * debian/dirs
+ - updated
+ * debian/menu
+ - updated section
+ * debian/copyright
+ - added copyright notice
+ - indented license and upstream author notices with 4 spaces
+ * debian/watch
+ - added
+ * debian/{preinst,prerm,postinst,postrm}
+ - added debhelper token
+ * debian/patches/10_bts-437475_handle_strip.dpatch
+ - added to handle nostrip build parameter (Closes: #437475)
+
+ -- Sandro Tosi <[EMAIL PROTECTED]> Mon, 07 Apr 2008 19:27:15 +0200
+
linpopup (1.2.0-8.2) unstable; urgency=low
* Non-maintainer upload to fix a pending l10n issue.
diff -u linpopup-1.2.0/debian/control linpopup-1.2.0/debian/control
--- linpopup-1.2.0/debian/control
+++ linpopup-1.2.0/debian/control
@@ -2,8 +2,9 @@
Section: net
Priority: optional
Maintainer: Paul Slootman <[EMAIL PROTECTED]>
-Standards-Version: 3.6.2
-Build-Depends: libgtk1.2-dev,po-debconf,libxmu-dev, debhelper (> 5.0.0)
+Standards-Version: 3.7.3
+Build-Depends: libgtk1.2-dev,po-debconf,libxmu-dev, debhelper (> 5.0.0), dpatch
+Homepage: http://www.littleigloo.org/
Package: linpopup
Architecture: any
@@ -11,7 +12,7 @@
Recommends: smbclient
Suggests: menu (>>1.5)
Description: X Window System port of Winpopup, running over Samba
- This allows a linux system to communicate with a windows computer that
+ This allows a Linux system to communicate with a windows computer that
runs Winpopup, sending or receiving message. It also provides an
alternative way to communicate between Linux computers that run Samba.
Note that LinPopUp is not only a port, as it includes several enhanced
diff -u linpopup-1.2.0/debian/rules linpopup-1.2.0/debian/rules
--- linpopup-1.2.0/debian/rules
+++ linpopup-1.2.0/debian/rules
@@ -4,15 +4,10 @@
topdir=$(shell pwd)
-configure:
+include /usr/share/dpatch/dpatch.make
-configure-stamp:
- dh_testdir
- touch configure-stamp
-
-
-build: configure-stamp build-stamp
-build-stamp:
+build: build-stamp
+build-stamp: patch-stamp
dh_testdir
# save these to minimize the diff; doesn't make any difference
@@ -36,11 +31,13 @@
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
-
dh_testroot
-rm -f build
+
+ rm -f configure-stamp build-stamp
+
-cd src; make clean PROGNAME=linpopup
-rm -f src/LinPopUp
-rm -f `find . -name "*~"`
@@ -83,6 +80,7 @@
dh_installchangelogs
dh_installdocs
dh_installmenu
+ dh_desktop
dh_strip
dh_compress
dh_fixperms
only in patch2:
unchanged:
--- linpopup-1.2.0.orig/debian/linpopup.desktop
+++ linpopup-1.2.0/debian/linpopup.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Linpopup
+Comment=Port of Winpopup, running over Samba
+Icon=linpopup
+Exec=LinPopUp
+Terminal=false
+Type=Application
+Categories=Application;Network;
only in patch2:
unchanged:
--- linpopup-1.2.0.orig/debian/patches/10_bts-437475_handle_strip.dpatch
+++ linpopup-1.2.0/debian/patches/10_bts-437475_handle_strip.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_bts-437475_handle_strip.dpatch by Sandro Tosi <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Handle nostrip param
+
[EMAIL PROTECTED]@
+diff -urNad linpopup-1.2.0~/src/Makefile linpopup-1.2.0/src/Makefile
+--- linpopup-1.2.0~/src/Makefile 2008-04-06 04:33:36.000000000 +0200
++++ linpopup-1.2.0/src/Makefile 2008-04-07 19:25:38.465846694 +0200
+@@ -29,7 +29,7 @@
+
+ install :
+ @echo
+- /usr/bin/install -s -m 755 $(PROGNAME) $(INSTALL_BINPATH)
++ /usr/bin/install -m 755 $(PROGNAME) $(INSTALL_BINPATH)
+ /usr/bin/install -m 644 ../$(PROGNAME).1 $(INSTALL_MANPATH)/man1
+ ln -fs $(PROGNAME) $(INSTALL_BINPATH)/$(PROGNAME_LNK)
+ ln -fs $(PROGNAME).1 $(INSTALL_MANPATH)/man1/$(PROGNAME_LNK).1
only in patch2:
unchanged:
--- linpopup-1.2.0.orig/debian/patches/00list
+++ linpopup-1.2.0/debian/patches/00list
@@ -0,0 +1 @@
+10_bts-437475_handle_strip
only in patch2:
unchanged:
--- linpopup-1.2.0.orig/debian/watch
+++ linpopup-1.2.0/debian/watch
@@ -0,0 +1,3 @@
+version=3
+#http://www.littleigloo.org/downloads_002.php3 LinPopUp-(.*).src.tar.gz
+http://www.littleigloo.org/downloads_002.php3 /dl.php\?u\=LinPopUp-(.*)\.src\.tar\.gz
