tags 424322 + patch
tags 449861 + patch
thanks

Hi,

Attached is the diff for my gjots2 2.3.4-2.1 NMU.

It's a little bigger then it should, but that's due to a package not
"touched" since too much time.
diff -u gjots2-2.3.4/debian/menu gjots2-2.3.4/debian/menu
--- gjots2-2.3.4/debian/menu
+++ gjots2-2.3.4/debian/menu
@@ -1,2 +1,2 @@
-?package(gjots2):needs="X11" section="Apps/Tools"\
+?package(gjots2):needs="X11" section="Applications/Data Management"\
   title="gjots2" command="/usr/bin/gjots2"
diff -u gjots2-2.3.4/debian/control gjots2-2.3.4/debian/control
--- gjots2-2.3.4/debian/control
+++ gjots2-2.3.4/debian/control
@@ -4,7 +4,8 @@
 Maintainer: Khalid El Fathi <[EMAIL PROTECTED]>
 Build-Depends: debhelper (>= 5.0.37.2)
 Build-Depends-Indep: python-all-dev (>= 2.3.5-11), python-support (>= 0.3)
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
+Homepage: http://bhepple.freeshell.org/gjots/
 
 Package: gjots2
 Architecture: all
@@ -32,2 +32,0 @@
- .
- Homepage: http://bhepple.freeshell.org/gjots/
diff -u gjots2-2.3.4/debian/watch gjots2-2.3.4/debian/watch
--- gjots2-2.3.4/debian/watch
+++ gjots2-2.3.4/debian/watch
@@ -1,22 +1,5 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
 version=3
 
-# Uncomment to examine a Webpage 
-# <Webpage URL> <string match>
-#http://www.example.com/downloads.php gjots2-(.*)\.tar\.gz
-
-# Uncomment to examine a Webserver directory
-http://bhepple.freeshell.org/gjots/gjots2-(.*)\.tgz
-
-# Uncommment to examine a FTP server
-#ftp://ftp.example.com/pub/gjots2-(.*)\.tar\.gz debian uupdate
-
-# Uncomment to find new files on sourceforge, for debscripts >= 2.9
-# http://sf.net/gjots2/gjots2-(.*)\.tar\.gz
+http://bhepple.freeshell.org/gjots/download.html gjots2-(.*)\.tgz
 
 
diff -u gjots2-2.3.4/debian/changelog gjots2-2.3.4/debian/changelog
--- gjots2-2.3.4/debian/changelog
+++ gjots2-2.3.4/debian/changelog
@@ -1,3 +1,19 @@
+gjots2 (2.3.4-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/watch
+    - cleaned up from commented lines
+    - fixed (Closes: #449861)
+  * debian/control
+    - moved Homepage field to source stanza
+    - bump Standard-Version to 3.7.3
+  * debian/rules
+    - added removal of compiled python source files (Closes: #424322)
+    - cleaned up from commented dh_* calls and other lines
+    - switch building from binary-arch to binary-indep
+
+ -- Sandro Tosi <[EMAIL PROTECTED]>  Sat, 05 Apr 2008 12:18:56 +0200
+
 gjots2 (2.3.4-2) unstable; urgency=low
 
   * Update to the new Python Policy (Closes: #380817).
diff -u gjots2-2.3.4/debian/rules gjots2-2.3.4/debian/rules
--- gjots2-2.3.4/debian/rules
+++ gjots2-2.3.4/debian/rules
@@ -1,17 +1,8 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-
-
-
 CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -47,6 +38,9 @@
 	# Add here commands to clean up after the build process.
 	#-$(MAKE) clean
 
+	find . -name *\.py[co] -exec rm -f {} \;
+	[ ! -d build ] || rm -rf build
+
 	dh_clean 
 
 install: build
@@ -63,38 +57,23 @@
 	rm $(CURDIR)/debian/gjots2/usr/share/doc/gjots2/ChangeLog
 
 
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
 # Build architecture-dependent files here.
 binary-arch: build install
+
+# Build architecture-independent files here.
+binary-indep: build install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs ChangeLog
 	dh_installdocs
-#	dh_installexamples
-#	dh_install
 	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
 	dh_installman
-#	dh_link
 	dh_strip
 	dh_compress --exclude=gjots2.gjots
 	dh_fixperms
-#	dh_perl
 	dh_pysupport -pgjots2 /usr/lib/gjots2/
 	dh_python
-#	dh_makeshlibs
 	dh_installdeb
-#	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Reply via email to