X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=bin%2Ffreeside-debian-releases.sh;h=ed4c005264d9e06b5e6505db8a4d9b9d2db2ed12;hb=619510b250ae7173a43ac13c3473995ca732a557;hp=82465266f3905b54181572f0e8dc67ef3deaed79;hpb=917ff4fd80bac4f492d30ab251d626095f4dd939;p=freeside.git

diff --git a/bin/freeside-debian-releases.sh b/bin/freeside-debian-releases.sh
index 82465266f..ed4c00526 100755
--- a/bin/freeside-debian-releases.sh
+++ b/bin/freeside-debian-releases.sh
@@ -12,7 +12,7 @@ fi
 
 DATE=`date +"%Y%m%d"`
 DIR="/home/autobuild/packages/staging/freeside$FS_VERSION/$FS_REPO"
-TARGET="/home/jeremyd/public_html/freeside$FS_VERSION-$DISTRO-$FS_REPO"
+TARGET="/home/autobuild/public_html/freeside$FS_VERSION-$DISTRO-$FS_REPO"
 
 if [ ! -d "$DIR" -a -d $TARGET ]; then
 
@@ -27,18 +27,14 @@ rm -fr $DIR/freeside/debian/freeside-ng-selfservice.conffiles
 
 # Pull any changes
 cd $DIR/freeside
-STATUS=`git pull`
-
-#Assign the proper config files for freeside-ng-selfservice
-if [ $DISTRO = "wheezy" ]; then
-	ln -s $DIR/freeside/debian/freeside-ng-selfservice.deb7 $DIR/freeside/debian/freeside-ng-selfservice.conffiles
-else
-	ln -s $DIR/freeside/debian/freeside-ng-selfservice.deb8 $DIR/freeside/debian/freeside-ng-selfservice.conffiles
-fi
+git checkout -- debian/changelog
+git pull
+#STATUS=`git pull`
 
 # Add the build information to changelog
-
-dch -b --newversion $GIT_VERSION~$DATE "Auto-Build"
+if [ $FS_REPO != "stable" ]; then
+	dch -b --newversion $GIT_VERSION-$DATE "Auto-Build"
+fi
 
 # Using pbuilder and pdebuild in chroot instead of building directly : dpkg-buildpackage -b -rfakeroot -uc -us
 
@@ -46,7 +42,11 @@ pdebuild --pbuilderroot sudo --debbuildopts "-b -rfakeroot -uc -us" --buildresul
 
 #--buildresult gets the file where it needs to be, may need to clean up DIR
 
-cd $DIR; rm -f freeside_*
-cd $TARGET; rm -f *.gz
+cd $DIR && rm -f freeside_*
+cd $TARGET && rm -f *.gz
 
-$TARGET/APT
+apt-ftparchive -qq packages ./ | gzip >Packages.gz
+apt-ftparchive -qq sources ./ | gzip >Sources.gz
+apt-ftparchive -qq packages ./ | bzip2 >Packages.bz2
+apt-ftparchive -qq sources ./ | bzip2 >Sources.bz2
+apt-ftparchive -qq release ./ >Release