[Python-modules-commits] r4611 - in packages/pynjb/trunk (7 files)

Sat Feb 23 15:59:47 UTC 2008

Date: Saturday, February 23, 2008 @ 15:59:46
  Author: morph-guest
Revision: 4611

latest fixes

Added:
  packages/pynjb/trunk/debian/patches/
  packages/pynjb/trunk/debian/patches/00list
  packages/pynjb/trunk/debian/patches/01_restore_pristine_code.dpatch
Modified:
  packages/pynjb/trunk/debian/changelog
  packages/pynjb/trunk/debian/control
  packages/pynjb/trunk/debian/rules
Deleted:
  packages/pynjb/trunk/Makefile

Deleted: packages/pynjb/trunk/Makefile
===================================================================

--- packages/pynjb/trunk/Makefile	2008-02-23 15:49:56 UTC (rev 4610)
+++ packages/pynjb/trunk/Makefile	2008-02-23 15:59:46 UTC (rev 4611)
@@ -1,52 +0,0 @@
-TARGET = pynjb.so
-OFILES = sippynjbcmodule.o sippynjbNJBTime.o sippynjbNJBEAXType.o sippynjbNJBDatafileTag.o sippynjbNJBPlaylist.o sippynjbNJBPlaylistTrack.o sippynjbNJBSong.o sippynjbNJBFrame.o sippynjbNJBDevice.o
-HFILES = sipAPIpynjb.h 
-
-CC = gcc
-CXX = g++
-LINK = g++
-CPPFLAGS = -I. -I/usr/include/python2.5
-CFLAGS =  -O2 -g -fPIC -Wall -W
-CXXFLAGS =  -O2 -g -fPIC -Wall -W
-LFLAGS = -shared -Wl,--version-script=pynjb.exp
-LIBS = -L. -lnjb
-.SUFFIXES: .c .o .cpp .cc .cxx .C
-
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
-
-$(TARGET): $(OFILES)
-	@echo '{ global: initpynjb; local: *; };' > pynjb.exp
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OFILES) $(LIBS)
-
-$(OFILES): $(HFILES)
-
-install: $(TARGET)
-	@test -d $(DESTDIR)/usr/lib/python2.5/site-packages || mkdir -p $(DESTDIR)/usr/lib/python2.5/site-packages
-	cp -f $(TARGET) $(DESTDIR)/usr/lib/python2.5/site-packages/$(TARGET)
-
-clean:
-	-rm -f $(TARGET)
-	-rm -f sippynjbcmodule.o
-	-rm -f sippynjbNJBTime.o
-	-rm -f sippynjbNJBEAXType.o
-	-rm -f sippynjbNJBDatafileTag.o
-	-rm -f sippynjbNJBPlaylist.o
-	-rm -f sippynjbNJBPlaylistTrack.o
-	-rm -f sippynjbNJBSong.o
-	-rm -f sippynjbNJBFrame.o
-	-rm -f sippynjbNJBDevice.o
-	-rm -f pynjb.exp

Modified: packages/pynjb/trunk/debian/changelog
===================================================================
--- packages/pynjb/trunk/debian/changelog	2008-02-23 15:49:56 UTC (rev 4610)
+++ packages/pynjb/trunk/debian/changelog	2008-02-23 15:59:46 UTC (rev 4611)
@@ -7,6 +7,7 @@
     - bump Standard-Version to 3.7.3
     - added Vcs-{Svn,Browser}
     - spelling fix for Python in long/short description
+    - added dpatch build-dep
   * debian/compat
     - bump to 5
   * debian/rules
@@ -20,6 +21,9 @@
     - build target now launch configure.py, make and make install for each
       supported python version
     - install target does nothing now
+    - added patch stuff
+  * debian/patches/01_restore_pristine_code.dpatch
+    - added to remove direct upstream code modification
 
  -- Sandro Tosi <matrixhasu at gmail.com>  Wed, 13 Feb 2008 07:28:49 +0100
 

Modified: packages/pynjb/trunk/debian/control
===================================================================
--- packages/pynjb/trunk/debian/control	2008-02-23 15:49:56 UTC (rev 4610)
+++ packages/pynjb/trunk/debian/control	2008-02-23 15:59:46 UTC (rev 4611)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Sandro Tosi <matrixhasu at gmail.com>
-Build-Depends: debhelper (>= 5.0.38), libnjb-dev (>= 2.2.2), sip4, python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), python-sip4-dev
+Build-Depends: debhelper (>= 5.0.38), libnjb-dev (>= 2.2.2), sip4, python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), python-sip4-dev, dpatch
 XS-Python-Version: all
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pynjb/trunk/

Added: packages/pynjb/trunk/debian/patches/00list
===================================================================
--- packages/pynjb/trunk/debian/patches/00list	                        (rev 0)
+++ packages/pynjb/trunk/debian/patches/00list	2008-02-23 15:59:46 UTC (rev 4611)
@@ -0,0 +1 @@
+01_restore_pristine_code

Added: packages/pynjb/trunk/debian/patches/01_restore_pristine_code.dpatch
===================================================================
--- packages/pynjb/trunk/debian/patches/01_restore_pristine_code.dpatch	                        (rev 0)
+++ packages/pynjb/trunk/debian/patches/01_restore_pristine_code.dpatch	2008-02-23 15:59:46 UTC (rev 4611)
@@ -0,0 +1,52 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_restore_pristine_code.dpatch by Sandro Tosi <matrixhasu at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: New patch generated from pynjb 0.1.0-3 diff.gz
+
+ at DPATCH@
+
+--- pynjb-0.1.0.orig/Makefile
++++ pynjb-0.1.0/Makefile
+@@ -1,14 +1,14 @@
+ TARGET = pynjb.so
+ OFILES = sippynjbcmodule.o sippynjbNJBTime.o sippynjbNJBEAXType.o sippynjbNJBDatafileTag.o sippynjbNJBPlaylist.o sippynjbNJBPlaylistTrack.o sippynjbNJBSong.o sippynjbNJBFrame.o sippynjbNJBDevice.o
+-HFILES = sipAPIpynjb.h sippynjbNJBTime.h sippynjbNJBEAXType.h sippynjbNJBDatafileTag.h sippynjbNJBPlaylist.h sippynjbNJBPlaylistTrack.h sippynjbNJBSong.h sippynjbNJBFrame.h sippynjbNJBDevice.h 
++HFILES = sipAPIpynjb.h 
+ 
+ CC = gcc
+ CXX = g++
+ LINK = g++
+-CPPFLAGS = -I. -I/usr/include/python2.3
+-CFLAGS = -pipe -fPIC -O2 -Wall -W
+-CXXFLAGS = -pipe -fPIC -O2 -Wall -W
+-LFLAGS = -shared
++CPPFLAGS = -I. -I/usr/include/python2.5
++CFLAGS =  -O2 -g -fPIC -Wall -W
++CXXFLAGS =  -O2 -g -fPIC -Wall -W
++LFLAGS = -shared -Wl,--version-script=pynjb.exp
+ LIBS = -L. -lnjb
+ .SUFFIXES: .c .o .cpp .cc .cxx .C
+ 
+@@ -29,13 +29,14 @@
+ 	$(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
+ 
+ $(TARGET): $(OFILES)
++	@echo '{ global: initpynjb; local: *; };' > pynjb.exp
+ 	$(LINK) $(LFLAGS) -o $(TARGET) $(OFILES) $(LIBS)
+ 
+ $(OFILES): $(HFILES)
+ 
+ install: $(TARGET)
+-	@test -d $(DESTDIR)/usr/lib/python2.3/site-packages || mkdir -p $(DESTDIR)/usr/lib/python2.3/site-packages
+-	cp -f $(TARGET) $(DESTDIR)/usr/lib/python2.3/site-packages/$(TARGET)
++	@test -d $(DESTDIR)/usr/lib/python2.5/site-packages || mkdir -p $(DESTDIR)/usr/lib/python2.5/site-packages
++	cp -f $(TARGET) $(DESTDIR)/usr/lib/python2.5/site-packages/$(TARGET)
+ 
+ clean:
+ 	-rm -f $(TARGET)
+@@ -48,3 +49,4 @@
+ 	-rm -f sippynjbNJBSong.o
+ 	-rm -f sippynjbNJBFrame.o
+ 	-rm -f sippynjbNJBDevice.o
++	-rm -f pynjb.exp


Property changes on: packages/pynjb/trunk/debian/patches/01_restore_pristine_code.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages/pynjb/trunk/debian/rules
===================================================================
--- packages/pynjb/trunk/debian/rules	2008-02-23 15:49:56 UTC (rev 4610)
+++ packages/pynjb/trunk/debian/rules	2008-02-23 15:59:46 UTC (rev 4611)
@@ -3,6 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/dpatch/dpatch.make
+
 PYVERS=$(shell pyversions -r)
 
 CFLAGS = -Wall -g
@@ -24,7 +26,7 @@
 #
 #	touch configure-stamp
 
-build: build-stamp
+build: patch build-stamp
 build-stamp:
 	dh_testdir
 
@@ -39,7 +41,7 @@
 
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp


